diff --git a/src/Application.cpp b/src/Application.cpp
index 114c5524..80f1b05b 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -390,12 +390,12 @@ namespace Bloom
     }
 
     void Application::startDebugServer() {
-        this->debugServer = std::make_unique<DebugServers::DebugServerComponent>(
+        this->debugServer = std::make_unique<DebugServer::DebugServerComponent>(
             this->debugServerConfig.value()
         );
 
         this->debugServerThread = std::thread(
-            &DebugServers::DebugServerComponent::run,
+            &DebugServer::DebugServerComponent::run,
             this->debugServer.get()
         );
 
diff --git a/src/Application.hpp b/src/Application.hpp
index 87755547..7facc281 100644
--- a/src/Application.hpp
+++ b/src/Application.hpp
@@ -85,7 +85,7 @@ namespace Bloom
          *
          * See the DebugServer and GdbRspDebugServer class for more on this.
          */
-        std::unique_ptr<DebugServers::DebugServerComponent> debugServer = nullptr;
+        std::unique_ptr<DebugServer::DebugServerComponent> debugServer = nullptr;
         std::thread debugServerThread;
 
         /**
diff --git a/src/DebugServers/DebugServerComponent.cpp b/src/DebugServers/DebugServerComponent.cpp
index 096fb89e..0badb1f6 100644
--- a/src/DebugServers/DebugServerComponent.cpp
+++ b/src/DebugServers/DebugServerComponent.cpp
@@ -8,7 +8,7 @@
 #include "src/Exceptions/InvalidConfig.hpp"
 #include "src/Logger/Logger.hpp"
 
-namespace Bloom::DebugServers
+namespace Bloom::DebugServer
 {
     using namespace Bloom::Events;
 
@@ -38,7 +38,7 @@ namespace Bloom::DebugServers
             {
                 "avr-gdb-rsp",
                 [this] () -> std::unique_ptr<ServerInterface> {
-                    return std::make_unique<DebugServers::Gdb::AvrGdb::AvrGdbRsp>(
+                    return std::make_unique<DebugServer::Gdb::AvrGdb::AvrGdbRsp>(
                         this->debugServerConfig,
                         *(this->eventListener.get())
                     );
diff --git a/src/DebugServers/DebugServerComponent.hpp b/src/DebugServers/DebugServerComponent.hpp
index 7a894596..974fafd3 100644
--- a/src/DebugServers/DebugServerComponent.hpp
+++ b/src/DebugServers/DebugServerComponent.hpp
@@ -17,7 +17,7 @@
 
 #include "ServerInterface.hpp"
 
-namespace Bloom::DebugServers
+namespace Bloom::DebugServer
 {
     /**
      * The DebugServer exposes the connected target to third-party debugging software such as IDEs.
diff --git a/src/DebugServers/GdbRsp/AvrGdb/AvrGdbRsp.cpp b/src/DebugServers/GdbRsp/AvrGdb/AvrGdbRsp.cpp
index 36a27cc1..c6c2cf1d 100644
--- a/src/DebugServers/GdbRsp/AvrGdb/AvrGdbRsp.cpp
+++ b/src/DebugServers/GdbRsp/AvrGdb/AvrGdbRsp.cpp
@@ -4,7 +4,7 @@
 #include "CommandPackets/ReadMemory.hpp"
 #include "CommandPackets/WriteMemory.hpp"
 
-namespace Bloom::DebugServers::Gdb::AvrGdb
+namespace Bloom::DebugServer::Gdb::AvrGdb
 {
     using namespace Bloom::Exceptions;
 
@@ -19,7 +19,7 @@ namespace Bloom::DebugServers::Gdb::AvrGdb
     {}
 
     void AvrGdbRsp::init() {
-        DebugServers::Gdb::GdbRspDebugServer::init();
+        DebugServer::Gdb::GdbRspDebugServer::init();
 
         this->gdbTargetDescriptor = TargetDescriptor(
             this->targetControllerConsole.getTargetDescriptor()
diff --git a/src/DebugServers/GdbRsp/AvrGdb/AvrGdbRsp.hpp b/src/DebugServers/GdbRsp/AvrGdb/AvrGdbRsp.hpp
index 6a8af03d..0bdff606 100644
--- a/src/DebugServers/GdbRsp/AvrGdb/AvrGdbRsp.hpp
+++ b/src/DebugServers/GdbRsp/AvrGdb/AvrGdbRsp.hpp
@@ -6,7 +6,7 @@
 
 #include "src/DebugServers/GdbRsp/GdbRspDebugServer.hpp"
 
-namespace Bloom::DebugServers::Gdb::AvrGdb
+namespace Bloom::DebugServer::Gdb::AvrGdb
 {
     /**
      * The AVR GDB client (avr-gdb) defines a set of parameters relating to AVR targets. These parameters are
diff --git a/src/DebugServers/GdbRsp/AvrGdb/CommandPackets/AbstractMemoryAccessPacket.cpp b/src/DebugServers/GdbRsp/AvrGdb/CommandPackets/AbstractMemoryAccessPacket.cpp
index 6c440b42..1372a1c7 100644
--- a/src/DebugServers/GdbRsp/AvrGdb/CommandPackets/AbstractMemoryAccessPacket.cpp
+++ b/src/DebugServers/GdbRsp/AvrGdb/CommandPackets/AbstractMemoryAccessPacket.cpp
@@ -7,7 +7,7 @@
 #include "src/Logger/Logger.hpp"
 #include "src/Exceptions/Exception.hpp"
 
-namespace Bloom::DebugServers::Gdb::CommandPackets
+namespace Bloom::DebugServer::Gdb::CommandPackets
 {
     using ResponsePackets::ErrorResponsePacket;
 
diff --git a/src/DebugServers/GdbRsp/AvrGdb/CommandPackets/AbstractMemoryAccessPacket.hpp b/src/DebugServers/GdbRsp/AvrGdb/CommandPackets/AbstractMemoryAccessPacket.hpp
index 3c6ef84e..ef256dc5 100644
--- a/src/DebugServers/GdbRsp/AvrGdb/CommandPackets/AbstractMemoryAccessPacket.hpp
+++ b/src/DebugServers/GdbRsp/AvrGdb/CommandPackets/AbstractMemoryAccessPacket.hpp
@@ -7,13 +7,13 @@
 
 #include "src/Targets/TargetMemory.hpp"
 
-namespace Bloom::DebugServers::Gdb::AvrGdb::CommandPackets
+namespace Bloom::DebugServer::Gdb::AvrGdb::CommandPackets
 {
     /**
      * The ReadMemory class implements a structure for "m" packets. Upon receiving these packets, the server is
      * expected to read memory from the target and send it the client.
      */
-    class AbstractMemoryAccessPacket: public Bloom::DebugServers::Gdb::CommandPackets::CommandPacket
+    class AbstractMemoryAccessPacket: public Bloom::DebugServer::Gdb::CommandPackets::CommandPacket
     {
     public:
         explicit AbstractMemoryAccessPacket(const std::vector<unsigned char>& rawPacket): CommandPacket(rawPacket) {};
diff --git a/src/DebugServers/GdbRsp/AvrGdb/CommandPackets/ReadMemory.cpp b/src/DebugServers/GdbRsp/AvrGdb/CommandPackets/ReadMemory.cpp
index 0addb77a..81ab8a0e 100644
--- a/src/DebugServers/GdbRsp/AvrGdb/CommandPackets/ReadMemory.cpp
+++ b/src/DebugServers/GdbRsp/AvrGdb/CommandPackets/ReadMemory.cpp
@@ -6,7 +6,7 @@
 #include "src/Logger/Logger.hpp"
 #include "src/Exceptions/Exception.hpp"
 
-namespace Bloom::DebugServers::Gdb::AvrGdb::CommandPackets
+namespace Bloom::DebugServer::Gdb::AvrGdb::CommandPackets
 {
     using ResponsePackets::ErrorResponsePacket;
     using ResponsePackets::ResponsePacket;
diff --git a/src/DebugServers/GdbRsp/AvrGdb/CommandPackets/ReadMemory.hpp b/src/DebugServers/GdbRsp/AvrGdb/CommandPackets/ReadMemory.hpp
index f9658b3a..4e0ab717 100644
--- a/src/DebugServers/GdbRsp/AvrGdb/CommandPackets/ReadMemory.hpp
+++ b/src/DebugServers/GdbRsp/AvrGdb/CommandPackets/ReadMemory.hpp
@@ -5,7 +5,7 @@
 
 #include "AbstractMemoryAccessPacket.hpp"
 
-namespace Bloom::DebugServers::Gdb::AvrGdb::CommandPackets
+namespace Bloom::DebugServer::Gdb::AvrGdb::CommandPackets
 {
     /**
      * The ReadMemory class implements a structure for "m" packets. Upon receiving these packets, the server is
diff --git a/src/DebugServers/GdbRsp/AvrGdb/CommandPackets/WriteMemory.cpp b/src/DebugServers/GdbRsp/AvrGdb/CommandPackets/WriteMemory.cpp
index 48491dc9..6927d3d5 100644
--- a/src/DebugServers/GdbRsp/AvrGdb/CommandPackets/WriteMemory.cpp
+++ b/src/DebugServers/GdbRsp/AvrGdb/CommandPackets/WriteMemory.cpp
@@ -6,7 +6,7 @@
 #include "src/Logger/Logger.hpp"
 #include "src/Exceptions/Exception.hpp"
 
-namespace Bloom::DebugServers::Gdb::AvrGdb::CommandPackets
+namespace Bloom::DebugServer::Gdb::AvrGdb::CommandPackets
 {
     using ResponsePackets::ErrorResponsePacket;
     using ResponsePackets::OkResponsePacket;
diff --git a/src/DebugServers/GdbRsp/AvrGdb/CommandPackets/WriteMemory.hpp b/src/DebugServers/GdbRsp/AvrGdb/CommandPackets/WriteMemory.hpp
index e9dfb3b7..b1944269 100644
--- a/src/DebugServers/GdbRsp/AvrGdb/CommandPackets/WriteMemory.hpp
+++ b/src/DebugServers/GdbRsp/AvrGdb/CommandPackets/WriteMemory.hpp
@@ -5,7 +5,7 @@
 
 #include "AbstractMemoryAccessPacket.hpp"
 
-namespace Bloom::DebugServers::Gdb::AvrGdb::CommandPackets
+namespace Bloom::DebugServer::Gdb::AvrGdb::CommandPackets
 {
     /**
      * The WriteMemory class implements the structure for "M" packets. Upon receiving this packet, the server is
diff --git a/src/DebugServers/GdbRsp/AvrGdb/TargetDescriptor.cpp b/src/DebugServers/GdbRsp/AvrGdb/TargetDescriptor.cpp
index 847ef0a2..42832e35 100644
--- a/src/DebugServers/GdbRsp/AvrGdb/TargetDescriptor.cpp
+++ b/src/DebugServers/GdbRsp/AvrGdb/TargetDescriptor.cpp
@@ -5,7 +5,7 @@
 #include "src/Exceptions/Exception.hpp"
 #include "src/Logger/Logger.hpp"
 
-namespace Bloom::DebugServers::Gdb::AvrGdb
+namespace Bloom::DebugServer::Gdb::AvrGdb
 {
     using Bloom::Targets::TargetRegisterDescriptor;
     using Bloom::Targets::TargetRegisterType;
@@ -13,7 +13,7 @@ namespace Bloom::DebugServers::Gdb::AvrGdb
     using Bloom::Exceptions::Exception;
 
     TargetDescriptor::TargetDescriptor(const Bloom::Targets::TargetDescriptor& targetDescriptor)
-        : DebugServers::Gdb::TargetDescriptor(targetDescriptor)
+        : DebugServer::Gdb::TargetDescriptor(targetDescriptor)
     {
         this->loadRegisterMappings();
     }
diff --git a/src/DebugServers/GdbRsp/AvrGdb/TargetDescriptor.hpp b/src/DebugServers/GdbRsp/AvrGdb/TargetDescriptor.hpp
index 8c57c188..9057365b 100644
--- a/src/DebugServers/GdbRsp/AvrGdb/TargetDescriptor.hpp
+++ b/src/DebugServers/GdbRsp/AvrGdb/TargetDescriptor.hpp
@@ -4,9 +4,9 @@
 
 #include "src/Helpers/BiMap.hpp"
 
-namespace Bloom::DebugServers::Gdb::AvrGdb
+namespace Bloom::DebugServer::Gdb::AvrGdb
 {
-    class TargetDescriptor: public DebugServers::Gdb::TargetDescriptor
+    class TargetDescriptor: public DebugServer::Gdb::TargetDescriptor
     {
     public:
         BiMap<GdbRegisterNumberType, RegisterDescriptor> registerDescriptorsByGdbNumber = {};
diff --git a/src/DebugServers/GdbRsp/BreakpointType.hpp b/src/DebugServers/GdbRsp/BreakpointType.hpp
index 5789fc2d..65abdd45 100644
--- a/src/DebugServers/GdbRsp/BreakpointType.hpp
+++ b/src/DebugServers/GdbRsp/BreakpointType.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace Bloom::DebugServers::Gdb
+namespace Bloom::DebugServer::Gdb
 {
     enum class BreakpointType: int
     {
diff --git a/src/DebugServers/GdbRsp/CommandPackets/CommandPacket.cpp b/src/DebugServers/GdbRsp/CommandPackets/CommandPacket.cpp
index 95a47a09..c8528192 100644
--- a/src/DebugServers/GdbRsp/CommandPackets/CommandPacket.cpp
+++ b/src/DebugServers/GdbRsp/CommandPackets/CommandPacket.cpp
@@ -10,7 +10,7 @@
 #include "src/Logger/Logger.hpp"
 #include "src/Exceptions/Exception.hpp"
 
-namespace Bloom::DebugServers::Gdb::CommandPackets
+namespace Bloom::DebugServer::Gdb::CommandPackets
 {
     using ResponsePackets::ResponsePacket;
     using ResponsePackets::OkResponsePacket;
diff --git a/src/DebugServers/GdbRsp/CommandPackets/CommandPacket.hpp b/src/DebugServers/GdbRsp/CommandPackets/CommandPacket.hpp
index 074debe5..fbf248ae 100644
--- a/src/DebugServers/GdbRsp/CommandPackets/CommandPacket.hpp
+++ b/src/DebugServers/GdbRsp/CommandPackets/CommandPacket.hpp
@@ -8,7 +8,7 @@
 
 #include "src/TargetController/TargetControllerConsole.hpp"
 
-namespace Bloom::DebugServers::Gdb::CommandPackets
+namespace Bloom::DebugServer::Gdb::CommandPackets
 {
     /**
      * GDB RSP command packets are sent to the server, from the GDB client. These packets carry instructions that the
diff --git a/src/DebugServers/GdbRsp/CommandPackets/ContinueExecution.cpp b/src/DebugServers/GdbRsp/CommandPackets/ContinueExecution.cpp
index 54049243..8c687650 100644
--- a/src/DebugServers/GdbRsp/CommandPackets/ContinueExecution.cpp
+++ b/src/DebugServers/GdbRsp/CommandPackets/ContinueExecution.cpp
@@ -5,7 +5,7 @@
 #include "src/Logger/Logger.hpp"
 #include "src/Exceptions/Exception.hpp"
 
-namespace Bloom::DebugServers::Gdb::CommandPackets
+namespace Bloom::DebugServer::Gdb::CommandPackets
 {
     using ResponsePackets::ErrorResponsePacket;
     using Exceptions::Exception;
diff --git a/src/DebugServers/GdbRsp/CommandPackets/ContinueExecution.hpp b/src/DebugServers/GdbRsp/CommandPackets/ContinueExecution.hpp
index 8a36ec6f..cc03acd4 100644
--- a/src/DebugServers/GdbRsp/CommandPackets/ContinueExecution.hpp
+++ b/src/DebugServers/GdbRsp/CommandPackets/ContinueExecution.hpp
@@ -5,7 +5,7 @@
 
 #include "CommandPacket.hpp"
 
-namespace Bloom::DebugServers::Gdb::CommandPackets
+namespace Bloom::DebugServer::Gdb::CommandPackets
 {
     /**
      * The ContinueExecution class implements a structure for "c" packets. These packets instruct the server
diff --git a/src/DebugServers/GdbRsp/CommandPackets/InterruptExecution.cpp b/src/DebugServers/GdbRsp/CommandPackets/InterruptExecution.cpp
index c5ae2412..2a4d280b 100644
--- a/src/DebugServers/GdbRsp/CommandPackets/InterruptExecution.cpp
+++ b/src/DebugServers/GdbRsp/CommandPackets/InterruptExecution.cpp
@@ -7,7 +7,7 @@
 #include "src/Logger/Logger.hpp"
 #include "src/Exceptions/Exception.hpp"
 
-namespace Bloom::DebugServers::Gdb::CommandPackets
+namespace Bloom::DebugServer::Gdb::CommandPackets
 {
     using ResponsePackets::TargetStopped;
     using ResponsePackets::ErrorResponsePacket;
diff --git a/src/DebugServers/GdbRsp/CommandPackets/InterruptExecution.hpp b/src/DebugServers/GdbRsp/CommandPackets/InterruptExecution.hpp
index 27f121d1..f7c96870 100644
--- a/src/DebugServers/GdbRsp/CommandPackets/InterruptExecution.hpp
+++ b/src/DebugServers/GdbRsp/CommandPackets/InterruptExecution.hpp
@@ -2,7 +2,7 @@
 
 #include "CommandPacket.hpp"
 
-namespace Bloom::DebugServers::Gdb::CommandPackets
+namespace Bloom::DebugServer::Gdb::CommandPackets
 {
     /**
      * The InterruptException class represents interrupt command packets. Upon receiving an interrupt packet, the
diff --git a/src/DebugServers/GdbRsp/CommandPackets/ReadRegisters.cpp b/src/DebugServers/GdbRsp/CommandPackets/ReadRegisters.cpp
index 59ca2d54..10353df8 100644
--- a/src/DebugServers/GdbRsp/CommandPackets/ReadRegisters.cpp
+++ b/src/DebugServers/GdbRsp/CommandPackets/ReadRegisters.cpp
@@ -8,7 +8,7 @@
 #include "src/Logger/Logger.hpp"
 #include "src/Exceptions/Exception.hpp"
 
-namespace Bloom::DebugServers::Gdb::CommandPackets
+namespace Bloom::DebugServer::Gdb::CommandPackets
 {
     using Targets::TargetRegister;
     using Targets::TargetRegisterDescriptors;
diff --git a/src/DebugServers/GdbRsp/CommandPackets/ReadRegisters.hpp b/src/DebugServers/GdbRsp/CommandPackets/ReadRegisters.hpp
index 9c6bd285..61a95798 100644
--- a/src/DebugServers/GdbRsp/CommandPackets/ReadRegisters.hpp
+++ b/src/DebugServers/GdbRsp/CommandPackets/ReadRegisters.hpp
@@ -6,7 +6,7 @@
 
 #include "src/DebugServers/GdbRsp/RegisterDescriptor.hpp"
 
-namespace Bloom::DebugServers::Gdb::CommandPackets
+namespace Bloom::DebugServer::Gdb::CommandPackets
 {
     /**
      * The ReadRegisters class implements a structure for "g" and "p" command packets. In response to these
diff --git a/src/DebugServers/GdbRsp/CommandPackets/RemoveBreakpoint.cpp b/src/DebugServers/GdbRsp/CommandPackets/RemoveBreakpoint.cpp
index 9915f237..5263c073 100644
--- a/src/DebugServers/GdbRsp/CommandPackets/RemoveBreakpoint.cpp
+++ b/src/DebugServers/GdbRsp/CommandPackets/RemoveBreakpoint.cpp
@@ -10,7 +10,7 @@
 #include "src/Logger/Logger.hpp"
 #include "src/Exceptions/Exception.hpp"
 
-namespace Bloom::DebugServers::Gdb::CommandPackets
+namespace Bloom::DebugServer::Gdb::CommandPackets
 {
     using Targets::TargetBreakpoint;
 
diff --git a/src/DebugServers/GdbRsp/CommandPackets/RemoveBreakpoint.hpp b/src/DebugServers/GdbRsp/CommandPackets/RemoveBreakpoint.hpp
index d441248e..d8be6c55 100644
--- a/src/DebugServers/GdbRsp/CommandPackets/RemoveBreakpoint.hpp
+++ b/src/DebugServers/GdbRsp/CommandPackets/RemoveBreakpoint.hpp
@@ -7,7 +7,7 @@
 #include "CommandPacket.hpp"
 #include "src/DebugServers/GdbRsp/BreakpointType.hpp"
 
-namespace Bloom::DebugServers::Gdb::CommandPackets
+namespace Bloom::DebugServer::Gdb::CommandPackets
 {
     /**
      * The RemoveBreakpoint class implements the structure for "z" command packets. Upon receiving this command, the
diff --git a/src/DebugServers/GdbRsp/CommandPackets/SetBreakpoint.cpp b/src/DebugServers/GdbRsp/CommandPackets/SetBreakpoint.cpp
index d11390f1..cb622a84 100644
--- a/src/DebugServers/GdbRsp/CommandPackets/SetBreakpoint.cpp
+++ b/src/DebugServers/GdbRsp/CommandPackets/SetBreakpoint.cpp
@@ -10,7 +10,7 @@
 #include "src/Logger/Logger.hpp"
 #include "src/Exceptions/Exception.hpp"
 
-namespace Bloom::DebugServers::Gdb::CommandPackets
+namespace Bloom::DebugServer::Gdb::CommandPackets
 {
     using Targets::TargetBreakpoint;
 
diff --git a/src/DebugServers/GdbRsp/CommandPackets/SetBreakpoint.hpp b/src/DebugServers/GdbRsp/CommandPackets/SetBreakpoint.hpp
index e046c288..b26c65d5 100644
--- a/src/DebugServers/GdbRsp/CommandPackets/SetBreakpoint.hpp
+++ b/src/DebugServers/GdbRsp/CommandPackets/SetBreakpoint.hpp
@@ -7,7 +7,7 @@
 #include "CommandPacket.hpp"
 #include "src/DebugServers/GdbRsp/BreakpointType.hpp"
 
-namespace Bloom::DebugServers::Gdb::CommandPackets
+namespace Bloom::DebugServer::Gdb::CommandPackets
 {
     /**
      * The SetBreakpoint class implements the structure for "Z" command packets. Upon receiving this command, the
diff --git a/src/DebugServers/GdbRsp/CommandPackets/StepExecution.cpp b/src/DebugServers/GdbRsp/CommandPackets/StepExecution.cpp
index cd64a1ef..6ab4056b 100644
--- a/src/DebugServers/GdbRsp/CommandPackets/StepExecution.cpp
+++ b/src/DebugServers/GdbRsp/CommandPackets/StepExecution.cpp
@@ -5,7 +5,7 @@
 #include "src/Logger/Logger.hpp"
 #include "src/Exceptions/Exception.hpp"
 
-namespace Bloom::DebugServers::Gdb::CommandPackets
+namespace Bloom::DebugServer::Gdb::CommandPackets
 {
     using ResponsePackets::ErrorResponsePacket;
 
diff --git a/src/DebugServers/GdbRsp/CommandPackets/StepExecution.hpp b/src/DebugServers/GdbRsp/CommandPackets/StepExecution.hpp
index a9f626d0..97f59000 100644
--- a/src/DebugServers/GdbRsp/CommandPackets/StepExecution.hpp
+++ b/src/DebugServers/GdbRsp/CommandPackets/StepExecution.hpp
@@ -5,7 +5,7 @@
 
 #include "CommandPacket.hpp"
 
-namespace Bloom::DebugServers::Gdb::CommandPackets
+namespace Bloom::DebugServer::Gdb::CommandPackets
 {
     /**
      * The StepExecution class implements the structure for "s" command packets. Upon receiving this command, the
diff --git a/src/DebugServers/GdbRsp/CommandPackets/SupportedFeaturesQuery.cpp b/src/DebugServers/GdbRsp/CommandPackets/SupportedFeaturesQuery.cpp
index a14fa22a..d1a913f0 100644
--- a/src/DebugServers/GdbRsp/CommandPackets/SupportedFeaturesQuery.cpp
+++ b/src/DebugServers/GdbRsp/CommandPackets/SupportedFeaturesQuery.cpp
@@ -11,7 +11,7 @@
 #include "src/Exceptions/Exception.hpp"
 #include "src/DebugServers/GdbRsp/Exceptions/ClientNotSupported.hpp"
 
-namespace Bloom::DebugServers::Gdb::CommandPackets
+namespace Bloom::DebugServer::Gdb::CommandPackets
 {
     using ResponsePackets::SupportedFeaturesResponse;
     using ResponsePackets::ErrorResponsePacket;
diff --git a/src/DebugServers/GdbRsp/CommandPackets/SupportedFeaturesQuery.hpp b/src/DebugServers/GdbRsp/CommandPackets/SupportedFeaturesQuery.hpp
index 46d215df..8911a698 100644
--- a/src/DebugServers/GdbRsp/CommandPackets/SupportedFeaturesQuery.hpp
+++ b/src/DebugServers/GdbRsp/CommandPackets/SupportedFeaturesQuery.hpp
@@ -6,7 +6,7 @@
 #include "CommandPacket.hpp"
 #include "../Feature.hpp"
 
-namespace Bloom::DebugServers::Gdb::CommandPackets
+namespace Bloom::DebugServer::Gdb::CommandPackets
 {
     /**
      * The SupportedFeaturesQuery command packet is a query from the GDB client, requesting a list of GDB features
diff --git a/src/DebugServers/GdbRsp/CommandPackets/WriteRegister.cpp b/src/DebugServers/GdbRsp/CommandPackets/WriteRegister.cpp
index 2dc3343e..f28a3bd7 100644
--- a/src/DebugServers/GdbRsp/CommandPackets/WriteRegister.cpp
+++ b/src/DebugServers/GdbRsp/CommandPackets/WriteRegister.cpp
@@ -9,7 +9,7 @@
 #include "src/Logger/Logger.hpp"
 #include "src/Exceptions/Exception.hpp"
 
-namespace Bloom::DebugServers::Gdb::CommandPackets
+namespace Bloom::DebugServer::Gdb::CommandPackets
 {
     using Targets::TargetRegister;
     using Targets::TargetRegisterDescriptors;
diff --git a/src/DebugServers/GdbRsp/CommandPackets/WriteRegister.hpp b/src/DebugServers/GdbRsp/CommandPackets/WriteRegister.hpp
index d00ff5da..f38b21f9 100644
--- a/src/DebugServers/GdbRsp/CommandPackets/WriteRegister.hpp
+++ b/src/DebugServers/GdbRsp/CommandPackets/WriteRegister.hpp
@@ -5,7 +5,7 @@
 #include "CommandPacket.hpp"
 #include "src/Targets/TargetRegister.hpp"
 
-namespace Bloom::DebugServers::Gdb::CommandPackets
+namespace Bloom::DebugServer::Gdb::CommandPackets
 {
     /**
      * The WriteRegisters class implements the structure for "P" packets. Upon receiving this packet,
diff --git a/src/DebugServers/GdbRsp/Connection.cpp b/src/DebugServers/GdbRsp/Connection.cpp
index cb547ec4..d49e384e 100644
--- a/src/DebugServers/GdbRsp/Connection.cpp
+++ b/src/DebugServers/GdbRsp/Connection.cpp
@@ -12,7 +12,7 @@
 
 #include "src/Logger/Logger.hpp"
 
-namespace Bloom::DebugServers::Gdb
+namespace Bloom::DebugServer::Gdb
 {
     using namespace Exceptions;
     using namespace Bloom::Exceptions;
diff --git a/src/DebugServers/GdbRsp/Connection.hpp b/src/DebugServers/GdbRsp/Connection.hpp
index a46951b5..e2214af9 100644
--- a/src/DebugServers/GdbRsp/Connection.hpp
+++ b/src/DebugServers/GdbRsp/Connection.hpp
@@ -15,7 +15,7 @@
 #include "src/DebugServers/GdbRsp/Packet.hpp"
 #include "src/DebugServers/GdbRsp/ResponsePackets/ResponsePacket.hpp"
 
-namespace Bloom::DebugServers::Gdb
+namespace Bloom::DebugServer::Gdb
 {
     /**
      * The Connection class represents an active connection between the GDB RSP server and client.
diff --git a/src/DebugServers/GdbRsp/DebugSession.cpp b/src/DebugServers/GdbRsp/DebugSession.cpp
index 169b8774..4a61a367 100644
--- a/src/DebugServers/GdbRsp/DebugSession.cpp
+++ b/src/DebugServers/GdbRsp/DebugSession.cpp
@@ -2,7 +2,7 @@
 
 #include "src/Logger/Logger.hpp"
 
-namespace Bloom::DebugServers::Gdb
+namespace Bloom::DebugServer::Gdb
 {
     DebugSession::DebugSession(Connection&& connection, const TargetDescriptor& targetDescriptor)
         : connection(std::move(connection))
diff --git a/src/DebugServers/GdbRsp/DebugSession.hpp b/src/DebugServers/GdbRsp/DebugSession.hpp
index a4d74c3a..3d78710a 100644
--- a/src/DebugServers/GdbRsp/DebugSession.hpp
+++ b/src/DebugServers/GdbRsp/DebugSession.hpp
@@ -5,7 +5,7 @@
 #include "TargetDescriptor.hpp"
 #include "Connection.hpp"
 
-namespace Bloom::DebugServers::Gdb
+namespace Bloom::DebugServer::Gdb
 {
     class DebugSession
     {
diff --git a/src/DebugServers/GdbRsp/Exceptions/ClientCommunicationError.hpp b/src/DebugServers/GdbRsp/Exceptions/ClientCommunicationError.hpp
index 54861872..3d7e9090 100644
--- a/src/DebugServers/GdbRsp/Exceptions/ClientCommunicationError.hpp
+++ b/src/DebugServers/GdbRsp/Exceptions/ClientCommunicationError.hpp
@@ -2,7 +2,7 @@
 
 #include "src/Exceptions/Exception.hpp"
 
-namespace Bloom::DebugServers::Gdb::Exceptions
+namespace Bloom::DebugServer::Gdb::Exceptions
 {
     /**
      * In the event that communication between the GDB RSP client and Bloom fails, a ClientCommunicationFailure
diff --git a/src/DebugServers/GdbRsp/Exceptions/ClientDisconnected.hpp b/src/DebugServers/GdbRsp/Exceptions/ClientDisconnected.hpp
index d7fd865f..33c991c7 100644
--- a/src/DebugServers/GdbRsp/Exceptions/ClientDisconnected.hpp
+++ b/src/DebugServers/GdbRsp/Exceptions/ClientDisconnected.hpp
@@ -2,7 +2,7 @@
 
 #include "src/Exceptions/Exception.hpp"
 
-namespace Bloom::DebugServers::Gdb::Exceptions
+namespace Bloom::DebugServer::Gdb::Exceptions
 {
     /**
      * When a GDB RSP client unexpectedly drops the connection in the middle of an IO operation, a ClientDisconnected
diff --git a/src/DebugServers/GdbRsp/Exceptions/ClientNotSupported.hpp b/src/DebugServers/GdbRsp/Exceptions/ClientNotSupported.hpp
index 1efe7261..1ec88c81 100644
--- a/src/DebugServers/GdbRsp/Exceptions/ClientNotSupported.hpp
+++ b/src/DebugServers/GdbRsp/Exceptions/ClientNotSupported.hpp
@@ -2,7 +2,7 @@
 
 #include "src/Exceptions/Exception.hpp"
 
-namespace Bloom::DebugServers::Gdb::Exceptions
+namespace Bloom::DebugServer::Gdb::Exceptions
 {
     /**
      * In the event that the GDB debug server determines that the connected client cannot be served,
diff --git a/src/DebugServers/GdbRsp/Exceptions/DebugSessionAborted.hpp b/src/DebugServers/GdbRsp/Exceptions/DebugSessionAborted.hpp
index 5cd406a2..844a6854 100644
--- a/src/DebugServers/GdbRsp/Exceptions/DebugSessionAborted.hpp
+++ b/src/DebugServers/GdbRsp/Exceptions/DebugSessionAborted.hpp
@@ -2,7 +2,7 @@
 
 #include "src/Exceptions/Exception.hpp"
 
-namespace Bloom::DebugServers::Gdb::Exceptions
+namespace Bloom::DebugServer::Gdb::Exceptions
 {
     /**
      * The GDB server may abort a debug session with the client, if an internal error occurs. One circumstance where
diff --git a/src/DebugServers/GdbRsp/Feature.hpp b/src/DebugServers/GdbRsp/Feature.hpp
index 3091ae4e..91ce17cb 100644
--- a/src/DebugServers/GdbRsp/Feature.hpp
+++ b/src/DebugServers/GdbRsp/Feature.hpp
@@ -2,7 +2,7 @@
 
 #include "src/Helpers/BiMap.hpp"
 
-namespace Bloom::DebugServers::Gdb
+namespace Bloom::DebugServer::Gdb
 {
     enum class Feature: int
     {
diff --git a/src/DebugServers/GdbRsp/GdbDebugServerConfig.cpp b/src/DebugServers/GdbRsp/GdbDebugServerConfig.cpp
index 3d244013..7869becd 100644
--- a/src/DebugServers/GdbRsp/GdbDebugServerConfig.cpp
+++ b/src/DebugServers/GdbRsp/GdbDebugServerConfig.cpp
@@ -1,6 +1,6 @@
 #include "GdbDebugServerConfig.hpp"
 
-namespace Bloom::DebugServers::Gdb
+namespace Bloom::DebugServer::Gdb
 {
     GdbDebugServerConfig::GdbDebugServerConfig(const DebugServerConfig& debugServerConfig)
         : DebugServerConfig(debugServerConfig)
diff --git a/src/DebugServers/GdbRsp/GdbDebugServerConfig.hpp b/src/DebugServers/GdbRsp/GdbDebugServerConfig.hpp
index e9814e88..babde8ca 100644
--- a/src/DebugServers/GdbRsp/GdbDebugServerConfig.hpp
+++ b/src/DebugServers/GdbRsp/GdbDebugServerConfig.hpp
@@ -2,7 +2,7 @@
 
 #include "src/ProjectConfig.hpp"
 
-namespace Bloom::DebugServers::Gdb
+namespace Bloom::DebugServer::Gdb
 {
     /**
      * Extending the generic DebugServerConfig struct to accommodate GDB debug server configuration parameters.
diff --git a/src/DebugServers/GdbRsp/GdbRspDebugServer.cpp b/src/DebugServers/GdbRsp/GdbRspDebugServer.cpp
index d636faf2..5dd360f8 100644
--- a/src/DebugServers/GdbRsp/GdbRspDebugServer.cpp
+++ b/src/DebugServers/GdbRsp/GdbRspDebugServer.cpp
@@ -28,7 +28,7 @@
 // Response packets
 #include "ResponsePackets/TargetStopped.hpp"
 
-namespace Bloom::DebugServers::Gdb
+namespace Bloom::DebugServer::Gdb
 {
     using namespace Exceptions;
     using namespace Bloom::Exceptions;
diff --git a/src/DebugServers/GdbRsp/GdbRspDebugServer.hpp b/src/DebugServers/GdbRsp/GdbRspDebugServer.hpp
index 512d83d7..9ae7a30e 100644
--- a/src/DebugServers/GdbRsp/GdbRspDebugServer.hpp
+++ b/src/DebugServers/GdbRsp/GdbRspDebugServer.hpp
@@ -27,7 +27,7 @@
 
 #include "src/Helpers/BiMap.hpp"
 
-namespace Bloom::DebugServers::Gdb
+namespace Bloom::DebugServer::Gdb
 {
     /**
      * The GdbRspDebugServer is an implementation of a GDB server using the GDB Remote Serial Protocol.
diff --git a/src/DebugServers/GdbRsp/Packet.hpp b/src/DebugServers/GdbRsp/Packet.hpp
index 2619f6fe..d82a7791 100644
--- a/src/DebugServers/GdbRsp/Packet.hpp
+++ b/src/DebugServers/GdbRsp/Packet.hpp
@@ -7,7 +7,7 @@
 #include <sstream>
 #include <iomanip>
 
-namespace Bloom::DebugServers::Gdb
+namespace Bloom::DebugServer::Gdb
 {
     using RawPacketType = std::vector<unsigned char>;
 
diff --git a/src/DebugServers/GdbRsp/RegisterDescriptor.hpp b/src/DebugServers/GdbRsp/RegisterDescriptor.hpp
index e6675efd..3bae4a01 100644
--- a/src/DebugServers/GdbRsp/RegisterDescriptor.hpp
+++ b/src/DebugServers/GdbRsp/RegisterDescriptor.hpp
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <string>
 
-namespace Bloom::DebugServers::Gdb
+namespace Bloom::DebugServer::Gdb
 {
     using GdbRegisterNumberType = int;
 
@@ -56,10 +56,10 @@ namespace std
      * class).
      */
     template<>
-    class hash<Bloom::DebugServers::Gdb::RegisterDescriptor>
+    class hash<Bloom::DebugServer::Gdb::RegisterDescriptor>
     {
     public:
-        std::size_t operator () (const Bloom::DebugServers::Gdb::RegisterDescriptor& descriptor) const {
+        std::size_t operator () (const Bloom::DebugServer::Gdb::RegisterDescriptor& descriptor) const {
             // We use the GDB register number as the hash, as it is unique to the register.
             return static_cast<size_t>(descriptor.number);
         }
diff --git a/src/DebugServers/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp b/src/DebugServers/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp
index 99d6c79e..5a604c0f 100644
--- a/src/DebugServers/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp
+++ b/src/DebugServers/GdbRsp/ResponsePackets/ErrorResponsePacket.hpp
@@ -2,7 +2,7 @@
 
 #include "ResponsePacket.hpp"
 
-namespace Bloom::DebugServers::Gdb::ResponsePackets
+namespace Bloom::DebugServer::Gdb::ResponsePackets
 {
     /**
      * Error response packet expected by the GDB client, to indicate an error, in response to certain commands.
diff --git a/src/DebugServers/GdbRsp/ResponsePackets/OkResponsePacket.hpp b/src/DebugServers/GdbRsp/ResponsePackets/OkResponsePacket.hpp
index 6288656e..a2c7c257 100644
--- a/src/DebugServers/GdbRsp/ResponsePackets/OkResponsePacket.hpp
+++ b/src/DebugServers/GdbRsp/ResponsePackets/OkResponsePacket.hpp
@@ -2,7 +2,7 @@
 
 #include "ResponsePacket.hpp"
 
-namespace Bloom::DebugServers::Gdb::ResponsePackets
+namespace Bloom::DebugServer::Gdb::ResponsePackets
 {
     /**
      * OK response packet expected by the GDB client, in response to certain commands.
diff --git a/src/DebugServers/GdbRsp/ResponsePackets/ResponsePacket.hpp b/src/DebugServers/GdbRsp/ResponsePackets/ResponsePacket.hpp
index d685a9cf..7226598b 100644
--- a/src/DebugServers/GdbRsp/ResponsePackets/ResponsePacket.hpp
+++ b/src/DebugServers/GdbRsp/ResponsePackets/ResponsePacket.hpp
@@ -5,7 +5,7 @@
 
 #include "src/DebugServers/GdbRsp/Packet.hpp"
 
-namespace Bloom::DebugServers::Gdb::ResponsePackets
+namespace Bloom::DebugServer::Gdb::ResponsePackets
 {
     /**
      * Upon receiving a CommandPacket from the connected GDB RSP client, the server is expected to respond with a
diff --git a/src/DebugServers/GdbRsp/ResponsePackets/SupportedFeaturesResponse.cpp b/src/DebugServers/GdbRsp/ResponsePackets/SupportedFeaturesResponse.cpp
index 17c30709..40b386b8 100644
--- a/src/DebugServers/GdbRsp/ResponsePackets/SupportedFeaturesResponse.cpp
+++ b/src/DebugServers/GdbRsp/ResponsePackets/SupportedFeaturesResponse.cpp
@@ -1,6 +1,6 @@
 #include "SupportedFeaturesResponse.hpp"
 
-namespace Bloom::DebugServers::Gdb::ResponsePackets
+namespace Bloom::DebugServer::Gdb::ResponsePackets
 {
     std::vector<unsigned char> SupportedFeaturesResponse::getData() const {
         std::string output = "qSupported:";
diff --git a/src/DebugServers/GdbRsp/ResponsePackets/SupportedFeaturesResponse.hpp b/src/DebugServers/GdbRsp/ResponsePackets/SupportedFeaturesResponse.hpp
index b36bcfa8..ead21ba2 100644
--- a/src/DebugServers/GdbRsp/ResponsePackets/SupportedFeaturesResponse.hpp
+++ b/src/DebugServers/GdbRsp/ResponsePackets/SupportedFeaturesResponse.hpp
@@ -6,7 +6,7 @@
 #include "ResponsePacket.hpp"
 #include "../Feature.hpp"
 
-namespace Bloom::DebugServers::Gdb::ResponsePackets
+namespace Bloom::DebugServer::Gdb::ResponsePackets
 {
     /**
      * The SupportedFeaturesResponse class implements the response packet structure for the "qSupported" command.
diff --git a/src/DebugServers/GdbRsp/ResponsePackets/TargetStopped.hpp b/src/DebugServers/GdbRsp/ResponsePackets/TargetStopped.hpp
index 2d9566fb..f7fd638e 100644
--- a/src/DebugServers/GdbRsp/ResponsePackets/TargetStopped.hpp
+++ b/src/DebugServers/GdbRsp/ResponsePackets/TargetStopped.hpp
@@ -5,7 +5,7 @@
 #include "../StopReason.hpp"
 #include "src/Targets/TargetRegister.hpp"
 
-namespace Bloom::DebugServers::Gdb::ResponsePackets
+namespace Bloom::DebugServer::Gdb::ResponsePackets
 {
     /**
      * The TargetStopped class implements the response packet structure for any commands that expect a "StopReply"
diff --git a/src/DebugServers/GdbRsp/Signal.hpp b/src/DebugServers/GdbRsp/Signal.hpp
index 403acc03..8a485688 100644
--- a/src/DebugServers/GdbRsp/Signal.hpp
+++ b/src/DebugServers/GdbRsp/Signal.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace Bloom::DebugServers::Gdb
+namespace Bloom::DebugServer::Gdb
 {
     enum class Signal: unsigned char
     {
diff --git a/src/DebugServers/GdbRsp/StopReason.hpp b/src/DebugServers/GdbRsp/StopReason.hpp
index 80d085a2..9b8a0573 100644
--- a/src/DebugServers/GdbRsp/StopReason.hpp
+++ b/src/DebugServers/GdbRsp/StopReason.hpp
@@ -2,7 +2,7 @@
 
 #include "src/Helpers/BiMap.hpp"
 
-namespace Bloom::DebugServers::Gdb
+namespace Bloom::DebugServer::Gdb
 {
     enum class StopReason: int
     {
diff --git a/src/DebugServers/GdbRsp/TargetDescriptor.hpp b/src/DebugServers/GdbRsp/TargetDescriptor.hpp
index fe6d29f0..75fac5a2 100644
--- a/src/DebugServers/GdbRsp/TargetDescriptor.hpp
+++ b/src/DebugServers/GdbRsp/TargetDescriptor.hpp
@@ -9,7 +9,7 @@
 
 #include "RegisterDescriptor.hpp"
 
-namespace Bloom::DebugServers::Gdb
+namespace Bloom::DebugServer::Gdb
 {
     struct TargetDescriptor
     {
diff --git a/src/DebugServers/ServerInterface.hpp b/src/DebugServers/ServerInterface.hpp
index 478f29a8..4e3ec933 100644
--- a/src/DebugServers/ServerInterface.hpp
+++ b/src/DebugServers/ServerInterface.hpp
@@ -2,7 +2,7 @@
 
 #include <string>
 
-namespace Bloom::DebugServers
+namespace Bloom::DebugServer
 {
     class ServerInterface
     {