diff --git a/src/DebugServer/CMakeLists.txt b/src/DebugServer/CMakeLists.txt
index 4ba62c18..aa741892 100755
--- a/src/DebugServer/CMakeLists.txt
+++ b/src/DebugServer/CMakeLists.txt
@@ -2,6 +2,8 @@ target_sources(
     Bloom
     PRIVATE
         ${CMAKE_CURRENT_SOURCE_DIR}/DebugServerComponent.cpp
+
+        # GDB RSP Server
         ${CMAKE_CURRENT_SOURCE_DIR}/Gdb/GdbRspDebugServer.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/Gdb/GdbDebugServerConfig.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/Gdb/Connection.cpp
@@ -19,7 +21,7 @@ target_sources(
         ${CMAKE_CURRENT_SOURCE_DIR}/Gdb/CommandPackets/ResetTarget.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/Gdb/ResponsePackets/SupportedFeaturesResponse.cpp
 
-        # AVR GDB Server
+        # AVR GDB RSP Server
         ${CMAKE_CURRENT_SOURCE_DIR}/Gdb/AvrGdb/AvrGdbRsp.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/Gdb/AvrGdb/TargetDescriptor.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/Gdb/AvrGdb/CommandPackets/ReadMemory.cpp
diff --git a/src/DebugServer/Gdb/README.md b/src/DebugServer/Gdb/README.md
index 241d798d..cf087cf7 100644
--- a/src/DebugServer/Gdb/README.md
+++ b/src/DebugServer/Gdb/README.md
@@ -30,9 +30,9 @@ Commands and responses are delivered in packets. The
 [`Bloom::DebugServer::Gdb::CommandPackets::CommandPacket`](./CommandPackets/CommandPacket.hpp) and
 [`Bloom::DebugServer::Gdb::ResponsePackets::ResponsePacket`](./ResponsePackets/ResponsePacket.hpp) classes are base
 classes for these packets. For most GDB commands supported by this server implementation, there is a specific command
-packet that can be found in [/src/DebugServer/Gdb/CommandPackets](./CommandPackets). When the server receives a command
-packet from the GDB client, the appropriate (`CommandPacket` derived) object is constructed, which encapsulates all of
-the relevant information for the particular command.
+packet class that can be found in [/src/DebugServer/Gdb/CommandPackets](./CommandPackets). When the server receives a
+command packet from the GDB client, the appropriate (`CommandPacket` derived) object is constructed, which encapsulates
+all of the relevant information for the particular command.
 
 Consider the [`Bloom::DebugServer::Gdb::CommandPackets::SetBreakpoint`](./CommandPackets/SetBreakpoint.hpp) command
 packet class: