diff --git a/src/DebugServer/CMakeLists.txt b/src/DebugServer/CMakeLists.txt
index 62e804ed..01b405b4 100755
--- a/src/DebugServer/CMakeLists.txt
+++ b/src/DebugServer/CMakeLists.txt
@@ -23,8 +23,8 @@ target_sources(
         ${CMAKE_CURRENT_SOURCE_DIR}/Gdb/CommandPackets/BloomVersion.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/Gdb/CommandPackets/BloomVersionMachine.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/Gdb/CommandPackets/Detach.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/Gdb/CommandPackets/ReadRegistersMonitor.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/Gdb/CommandPackets/ListRegistersMonitor.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/Gdb/CommandPackets/ReadRegistersMonitor.cpp
 
         # AVR GDB RSP Server
         ${CMAKE_CURRENT_SOURCE_DIR}/Gdb/AvrGdb/AvrGdbRsp.cpp
diff --git a/src/DebugServer/Gdb/CommandPackets/ListRegistersMonitor.cpp b/src/DebugServer/Gdb/CommandPackets/ListRegistersMonitor.cpp
index 9ab77230..cab8e439 100644
--- a/src/DebugServer/Gdb/CommandPackets/ListRegistersMonitor.cpp
+++ b/src/DebugServer/Gdb/CommandPackets/ListRegistersMonitor.cpp
@@ -30,7 +30,7 @@ namespace DebugServer::Gdb::CommandPackets
         const Targets::TargetDescriptor& targetDescriptor,
         TargetControllerService& targetControllerService
     ) {
-        Logger::info("Handling ReadRegisterMonitor packet");
+        Logger::info("Handling ListRegistersMonitor packet");
 
         try {
             const auto argCount = this->commandArguments.size();
diff --git a/src/DebugServer/Gdb/CommandPackets/ReadRegistersMonitor.cpp b/src/DebugServer/Gdb/CommandPackets/ReadRegistersMonitor.cpp
index 1a8c53f0..e0472a9c 100644
--- a/src/DebugServer/Gdb/CommandPackets/ReadRegistersMonitor.cpp
+++ b/src/DebugServer/Gdb/CommandPackets/ReadRegistersMonitor.cpp
@@ -34,7 +34,7 @@ namespace DebugServer::Gdb::CommandPackets
         const Targets::TargetDescriptor& targetDescriptor,
         TargetControllerService& targetControllerService
     ) {
-        Logger::info("Handling ReadRegisterMonitor packet");
+        Logger::info("Handling ReadRegistersMonitor packet");
 
         try {
             const auto argCount = this->commandArguments.size();
diff --git a/src/DebugServer/Gdb/GdbRspDebugServer.cpp b/src/DebugServer/Gdb/GdbRspDebugServer.cpp
index 060f5b92..046362f7 100644
--- a/src/DebugServer/Gdb/GdbRspDebugServer.cpp
+++ b/src/DebugServer/Gdb/GdbRspDebugServer.cpp
@@ -29,8 +29,8 @@
 #include "CommandPackets/BloomVersion.hpp"
 #include "CommandPackets/BloomVersionMachine.hpp"
 #include "CommandPackets/Detach.hpp"
-#include "CommandPackets/ReadRegistersMonitor.hpp"
 #include "CommandPackets/ListRegistersMonitor.hpp"
+#include "CommandPackets/ReadRegistersMonitor.hpp"
 
 #ifndef EXCLUDE_INSIGHT
 #include "CommandPackets/ActivateInsight.hpp"
@@ -293,14 +293,14 @@ namespace DebugServer::Gdb
                 return std::make_unique<CommandPackets::ResetTarget>(std::move(*(monitorCommand.release())));
             }
 
-            if (monitorCommand->command.find("rr") == 0) {
-                return std::make_unique<CommandPackets::ReadRegistersMonitor>(std::move(*(monitorCommand.release())));
-            }
-
             if (monitorCommand->command.find("lr") == 0) {
                 return std::make_unique<CommandPackets::ListRegistersMonitor>(std::move(*(monitorCommand.release())));
             }
 
+            if (monitorCommand->command.find("rr") == 0) {
+                return std::make_unique<CommandPackets::ReadRegistersMonitor>(std::move(*(monitorCommand.release())));
+            }
+
 #ifndef EXCLUDE_INSIGHT
             if (monitorCommand->command.find("insight") == 0) {
                 return std::make_unique<CommandPackets::ActivateInsight>(std::move(*(monitorCommand.release())));