diff --git a/src/DebugToolDrivers/CMakeLists.txt b/src/DebugToolDrivers/CMakeLists.txt
index 0a38ea5f..e2a7d221 100755
--- a/src/DebugToolDrivers/CMakeLists.txt
+++ b/src/DebugToolDrivers/CMakeLists.txt
@@ -51,6 +51,6 @@ target_sources(
         ${CMAKE_CURRENT_SOURCE_DIR}/Wch/WchLinkE/WchLinkE.cpp
 
         # RISC-V Debug Translator implementation
-        ${CMAKE_CURRENT_SOURCE_DIR}/Protocols/RiscVDebugSpec/DebugTranslatorConfig.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/Protocols/RiscVDebugSpec/DebugTranslator.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/Protocols/RiscVDebug/DebugTranslatorConfig.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/Protocols/RiscVDebug/DebugTranslator.cpp
 )
diff --git a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/Common.hpp b/src/DebugToolDrivers/Protocols/RiscVDebug/Common.hpp
similarity index 82%
rename from src/DebugToolDrivers/Protocols/RiscVDebugSpec/Common.hpp
rename to src/DebugToolDrivers/Protocols/RiscVDebug/Common.hpp
index cab4d4a2..85c4ebb3 100644
--- a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/Common.hpp
+++ b/src/DebugToolDrivers/Protocols/RiscVDebug/Common.hpp
@@ -2,7 +2,7 @@
 
 #include <cstdint>
 
-namespace DebugToolDrivers::Protocols::RiscVDebugSpec
+namespace DebugToolDrivers::Protocols::RiscVDebug
 {
     using RegisterValue = std::uint32_t;
     using RegisterNumber = std::uint16_t;
diff --git a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/DebugModule.hpp b/src/DebugToolDrivers/Protocols/RiscVDebug/DebugModule/DebugModule.hpp
similarity index 92%
rename from src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/DebugModule.hpp
rename to src/DebugToolDrivers/Protocols/RiscVDebug/DebugModule/DebugModule.hpp
index adc06014..01dcf20d 100644
--- a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/DebugModule.hpp
+++ b/src/DebugToolDrivers/Protocols/RiscVDebug/DebugModule/DebugModule.hpp
@@ -2,7 +2,7 @@
 
 #include <cstdint>
 
-namespace DebugToolDrivers::Protocols::RiscVDebugSpec::DebugModule
+namespace DebugToolDrivers::Protocols::RiscVDebug::DebugModule
 {
     using RegisterAddress = std::uint8_t;
     using RegisterValue = std::uint32_t;
diff --git a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/Registers/AbstractCommandAutoExecuteRegister.hpp b/src/DebugToolDrivers/Protocols/RiscVDebug/DebugModule/Registers/AbstractCommandAutoExecuteRegister.hpp
similarity index 97%
rename from src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/Registers/AbstractCommandAutoExecuteRegister.hpp
rename to src/DebugToolDrivers/Protocols/RiscVDebug/DebugModule/Registers/AbstractCommandAutoExecuteRegister.hpp
index d01b17e4..ca9703de 100644
--- a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/Registers/AbstractCommandAutoExecuteRegister.hpp
+++ b/src/DebugToolDrivers/Protocols/RiscVDebug/DebugModule/Registers/AbstractCommandAutoExecuteRegister.hpp
@@ -2,9 +2,9 @@
 
 #include <cstdint>
 
-#include "src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/DebugModule.hpp"
+#include "src/DebugToolDrivers/Protocols/RiscVDebug/DebugModule/DebugModule.hpp"
 
-namespace DebugToolDrivers::Protocols::RiscVDebugSpec::DebugModule::Registers
+namespace DebugToolDrivers::Protocols::RiscVDebug::DebugModule::Registers
 {
     struct AbstractCommandAutoExecuteRegister
     {
diff --git a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/Registers/AbstractCommandRegister.hpp b/src/DebugToolDrivers/Protocols/RiscVDebug/DebugModule/Registers/AbstractCommandRegister.hpp
similarity index 85%
rename from src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/Registers/AbstractCommandRegister.hpp
rename to src/DebugToolDrivers/Protocols/RiscVDebug/DebugModule/Registers/AbstractCommandRegister.hpp
index c5a4273e..4b3474ba 100644
--- a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/Registers/AbstractCommandRegister.hpp
+++ b/src/DebugToolDrivers/Protocols/RiscVDebug/DebugModule/Registers/AbstractCommandRegister.hpp
@@ -3,9 +3,9 @@
 #include <cstdint>
 #include <cassert>
 
-#include "src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/DebugModule.hpp"
+#include "src/DebugToolDrivers/Protocols/RiscVDebug/DebugModule/DebugModule.hpp"
 
-namespace DebugToolDrivers::Protocols::RiscVDebugSpec::DebugModule::Registers
+namespace DebugToolDrivers::Protocols::RiscVDebug::DebugModule::Registers
 {
     struct AbstractCommandRegister
     {
diff --git a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/Registers/AbstractControlStatusRegister.hpp b/src/DebugToolDrivers/Protocols/RiscVDebug/DebugModule/Registers/AbstractControlStatusRegister.hpp
similarity index 89%
rename from src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/Registers/AbstractControlStatusRegister.hpp
rename to src/DebugToolDrivers/Protocols/RiscVDebug/DebugModule/Registers/AbstractControlStatusRegister.hpp
index b063cdbe..15d4df78 100644
--- a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/Registers/AbstractControlStatusRegister.hpp
+++ b/src/DebugToolDrivers/Protocols/RiscVDebug/DebugModule/Registers/AbstractControlStatusRegister.hpp
@@ -2,9 +2,9 @@
 
 #include <cstdint>
 
-#include "src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/DebugModule.hpp"
+#include "src/DebugToolDrivers/Protocols/RiscVDebug/DebugModule/DebugModule.hpp"
 
-namespace DebugToolDrivers::Protocols::RiscVDebugSpec::DebugModule::Registers
+namespace DebugToolDrivers::Protocols::RiscVDebug::DebugModule::Registers
 {
     struct AbstractControlStatusRegister
     {
diff --git a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/Registers/ControlRegister.hpp b/src/DebugToolDrivers/Protocols/RiscVDebug/DebugModule/Registers/ControlRegister.hpp
similarity index 95%
rename from src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/Registers/ControlRegister.hpp
rename to src/DebugToolDrivers/Protocols/RiscVDebug/DebugModule/Registers/ControlRegister.hpp
index a1cef1ba..7c37fed5 100644
--- a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/Registers/ControlRegister.hpp
+++ b/src/DebugToolDrivers/Protocols/RiscVDebug/DebugModule/Registers/ControlRegister.hpp
@@ -3,9 +3,9 @@
 #include <cstdint>
 #include <cassert>
 
-#include "src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/DebugModule.hpp"
+#include "src/DebugToolDrivers/Protocols/RiscVDebug/DebugModule/DebugModule.hpp"
 
-namespace DebugToolDrivers::Protocols::RiscVDebugSpec::DebugModule::Registers
+namespace DebugToolDrivers::Protocols::RiscVDebug::DebugModule::Registers
 {
     struct ControlRegister
     {
diff --git a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/Registers/MemoryAccessControlField.hpp b/src/DebugToolDrivers/Protocols/RiscVDebug/DebugModule/Registers/MemoryAccessControlField.hpp
similarity index 89%
rename from src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/Registers/MemoryAccessControlField.hpp
rename to src/DebugToolDrivers/Protocols/RiscVDebug/DebugModule/Registers/MemoryAccessControlField.hpp
index dfeb2732..2ecf9f16 100644
--- a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/Registers/MemoryAccessControlField.hpp
+++ b/src/DebugToolDrivers/Protocols/RiscVDebug/DebugModule/Registers/MemoryAccessControlField.hpp
@@ -2,9 +2,9 @@
 
 #include <cstdint>
 
-#include "src/DebugToolDrivers/Protocols/RiscVDebugSpec/Common.hpp"
+#include "src/DebugToolDrivers/Protocols/RiscVDebug/Common.hpp"
 
-namespace DebugToolDrivers::Protocols::RiscVDebugSpec::DebugModule::Registers
+namespace DebugToolDrivers::Protocols::RiscVDebug::DebugModule::Registers
 {
     struct MemoryAccessControlField
     {
diff --git a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/Registers/RegisterAccessControlField.hpp b/src/DebugToolDrivers/Protocols/RiscVDebug/DebugModule/Registers/RegisterAccessControlField.hpp
similarity index 92%
rename from src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/Registers/RegisterAccessControlField.hpp
rename to src/DebugToolDrivers/Protocols/RiscVDebug/DebugModule/Registers/RegisterAccessControlField.hpp
index e1843f09..01375fe2 100644
--- a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/Registers/RegisterAccessControlField.hpp
+++ b/src/DebugToolDrivers/Protocols/RiscVDebug/DebugModule/Registers/RegisterAccessControlField.hpp
@@ -2,9 +2,9 @@
 
 #include <cstdint>
 
-#include "src/DebugToolDrivers/Protocols/RiscVDebugSpec/Common.hpp"
+#include "src/DebugToolDrivers/Protocols/RiscVDebug/Common.hpp"
 
-namespace DebugToolDrivers::Protocols::RiscVDebugSpec::DebugModule::Registers
+namespace DebugToolDrivers::Protocols::RiscVDebug::DebugModule::Registers
 {
     struct RegisterAccessControlField
     {
diff --git a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/Registers/RegisterAddresses.hpp b/src/DebugToolDrivers/Protocols/RiscVDebug/DebugModule/Registers/RegisterAddresses.hpp
similarity index 88%
rename from src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/Registers/RegisterAddresses.hpp
rename to src/DebugToolDrivers/Protocols/RiscVDebug/DebugModule/Registers/RegisterAddresses.hpp
index 2801a459..ba866634 100644
--- a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/Registers/RegisterAddresses.hpp
+++ b/src/DebugToolDrivers/Protocols/RiscVDebug/DebugModule/Registers/RegisterAddresses.hpp
@@ -2,9 +2,9 @@
 
 #include <cstdint>
 
-#include "src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/DebugModule.hpp"
+#include "src/DebugToolDrivers/Protocols/RiscVDebug/DebugModule/DebugModule.hpp"
 
-namespace DebugToolDrivers::Protocols::RiscVDebugSpec::DebugModule::Registers
+namespace DebugToolDrivers::Protocols::RiscVDebug::DebugModule::Registers
 {
     enum class RegisterAddress: RegisterAddress
     {
diff --git a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/Registers/StatusRegister.hpp b/src/DebugToolDrivers/Protocols/RiscVDebug/DebugModule/Registers/StatusRegister.hpp
similarity index 96%
rename from src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/Registers/StatusRegister.hpp
rename to src/DebugToolDrivers/Protocols/RiscVDebug/DebugModule/Registers/StatusRegister.hpp
index 72f0649d..eea38071 100644
--- a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/Registers/StatusRegister.hpp
+++ b/src/DebugToolDrivers/Protocols/RiscVDebug/DebugModule/Registers/StatusRegister.hpp
@@ -2,9 +2,9 @@
 
 #include <cstdint>
 
-#include "src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/DebugModule.hpp"
+#include "src/DebugToolDrivers/Protocols/RiscVDebug/DebugModule/DebugModule.hpp"
 
-namespace DebugToolDrivers::Protocols::RiscVDebugSpec::DebugModule::Registers
+namespace DebugToolDrivers::Protocols::RiscVDebug::DebugModule::Registers
 {
     struct StatusRegister
     {
diff --git a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModuleDescriptor.hpp b/src/DebugToolDrivers/Protocols/RiscVDebug/DebugModuleDescriptor.hpp
similarity index 92%
rename from src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModuleDescriptor.hpp
rename to src/DebugToolDrivers/Protocols/RiscVDebug/DebugModuleDescriptor.hpp
index 9b98d1db..f770a7bd 100644
--- a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModuleDescriptor.hpp
+++ b/src/DebugToolDrivers/Protocols/RiscVDebug/DebugModuleDescriptor.hpp
@@ -12,7 +12,7 @@
 
 #include "src/Targets/TargetMemory.hpp"
 
-namespace DebugToolDrivers::Protocols::RiscVDebugSpec
+namespace DebugToolDrivers::Protocols::RiscVDebug
 {
     struct DebugModuleDescriptor
     {
diff --git a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugTranslator.cpp b/src/DebugToolDrivers/Protocols/RiscVDebug/DebugTranslator.cpp
similarity index 99%
rename from src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugTranslator.cpp
rename to src/DebugToolDrivers/Protocols/RiscVDebug/DebugTranslator.cpp
index 306f1036..7330d073 100644
--- a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugTranslator.cpp
+++ b/src/DebugToolDrivers/Protocols/RiscVDebug/DebugTranslator.cpp
@@ -37,7 +37,7 @@
 
 #include "src/Logger/Logger.hpp"
 
-namespace DebugToolDrivers::Protocols::RiscVDebugSpec
+namespace DebugToolDrivers::Protocols::RiscVDebug
 {
     using Registers::DebugControlStatusRegister;
 
diff --git a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugTranslator.hpp b/src/DebugToolDrivers/Protocols/RiscVDebug/DebugTranslator.hpp
similarity index 99%
rename from src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugTranslator.hpp
rename to src/DebugToolDrivers/Protocols/RiscVDebug/DebugTranslator.hpp
index 4e5d746e..2b341c4d 100644
--- a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugTranslator.hpp
+++ b/src/DebugToolDrivers/Protocols/RiscVDebug/DebugTranslator.hpp
@@ -39,7 +39,7 @@
 
 #include "src/Helpers/Expected.hpp"
 
-namespace DebugToolDrivers::Protocols::RiscVDebugSpec
+namespace DebugToolDrivers::Protocols::RiscVDebug
 {
     /**
      * Implementation of a RISC-V debug translator
diff --git a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugTranslatorConfig.cpp b/src/DebugToolDrivers/Protocols/RiscVDebug/DebugTranslatorConfig.cpp
similarity index 95%
rename from src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugTranslatorConfig.cpp
rename to src/DebugToolDrivers/Protocols/RiscVDebug/DebugTranslatorConfig.cpp
index 2912ae62..5dffe7a6 100644
--- a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugTranslatorConfig.cpp
+++ b/src/DebugToolDrivers/Protocols/RiscVDebug/DebugTranslatorConfig.cpp
@@ -5,7 +5,7 @@
 
 #include "src/Logger/Logger.hpp"
 
-namespace DebugToolDrivers::Protocols::RiscVDebugSpec
+namespace DebugToolDrivers::Protocols::RiscVDebug
 {
     DebugTranslatorConfig::DebugTranslatorConfig(const YAML::Node& configNode) {
         if (configNode["target_response_timeout"]) {
diff --git a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugTranslatorConfig.hpp b/src/DebugToolDrivers/Protocols/RiscVDebug/DebugTranslatorConfig.hpp
similarity index 91%
rename from src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugTranslatorConfig.hpp
rename to src/DebugToolDrivers/Protocols/RiscVDebug/DebugTranslatorConfig.hpp
index 3725900e..a16347e5 100644
--- a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugTranslatorConfig.hpp
+++ b/src/DebugToolDrivers/Protocols/RiscVDebug/DebugTranslatorConfig.hpp
@@ -6,7 +6,7 @@
 
 #include "DebugModule/DebugModule.hpp"
 
-namespace DebugToolDrivers::Protocols::RiscVDebugSpec
+namespace DebugToolDrivers::Protocols::RiscVDebug
 {
     struct DebugTranslatorConfig
     {
diff --git a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugTransportModuleInterface.hpp b/src/DebugToolDrivers/Protocols/RiscVDebug/DebugTransportModuleInterface.hpp
similarity index 96%
rename from src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugTransportModuleInterface.hpp
rename to src/DebugToolDrivers/Protocols/RiscVDebug/DebugTransportModuleInterface.hpp
index b1ef787e..4a4c4f7c 100644
--- a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugTransportModuleInterface.hpp
+++ b/src/DebugToolDrivers/Protocols/RiscVDebug/DebugTransportModuleInterface.hpp
@@ -7,7 +7,7 @@
 #include "DebugModule/DebugModule.hpp"
 #include "DebugModule/Registers/RegisterAddresses.hpp"
 
-namespace DebugToolDrivers::Protocols::RiscVDebugSpec
+namespace DebugToolDrivers::Protocols::RiscVDebug
 {
     /**
      * Provides access to the RISC-V target's debug transport module (DTM).
diff --git a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/Registers/CpuRegisterNumbers.hpp b/src/DebugToolDrivers/Protocols/RiscVDebug/Registers/CpuRegisterNumbers.hpp
similarity index 72%
rename from src/DebugToolDrivers/Protocols/RiscVDebugSpec/Registers/CpuRegisterNumbers.hpp
rename to src/DebugToolDrivers/Protocols/RiscVDebug/Registers/CpuRegisterNumbers.hpp
index 56879cb6..fc162d2e 100644
--- a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/Registers/CpuRegisterNumbers.hpp
+++ b/src/DebugToolDrivers/Protocols/RiscVDebug/Registers/CpuRegisterNumbers.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "src/DebugToolDrivers/Protocols/RiscVDebugSpec/Common.hpp"
+#include "src/DebugToolDrivers/Protocols/RiscVDebug/Common.hpp"
 
-namespace DebugToolDrivers::Protocols::RiscVDebugSpec::Registers
+namespace DebugToolDrivers::Protocols::RiscVDebug::Registers
 {
     enum class CpuRegisterNumber: RegisterNumber
     {
diff --git a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/Registers/DebugControlStatusRegister.hpp b/src/DebugToolDrivers/Protocols/RiscVDebug/Registers/DebugControlStatusRegister.hpp
similarity index 95%
rename from src/DebugToolDrivers/Protocols/RiscVDebugSpec/Registers/DebugControlStatusRegister.hpp
rename to src/DebugToolDrivers/Protocols/RiscVDebug/Registers/DebugControlStatusRegister.hpp
index 688e80b6..3a72c67b 100644
--- a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/Registers/DebugControlStatusRegister.hpp
+++ b/src/DebugToolDrivers/Protocols/RiscVDebug/Registers/DebugControlStatusRegister.hpp
@@ -2,9 +2,9 @@
 
 #include <cstdint>
 
-#include "src/DebugToolDrivers/Protocols/RiscVDebugSpec/Common.hpp"
+#include "src/DebugToolDrivers/Protocols/RiscVDebug/Common.hpp"
 
-namespace DebugToolDrivers::Protocols::RiscVDebugSpec::Registers
+namespace DebugToolDrivers::Protocols::RiscVDebug::Registers
 {
     struct DebugControlStatusRegister
     {
diff --git a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/TriggerModule/Registers/MatchControl.hpp b/src/DebugToolDrivers/Protocols/RiscVDebug/TriggerModule/Registers/MatchControl.hpp
similarity index 95%
rename from src/DebugToolDrivers/Protocols/RiscVDebugSpec/TriggerModule/Registers/MatchControl.hpp
rename to src/DebugToolDrivers/Protocols/RiscVDebug/TriggerModule/Registers/MatchControl.hpp
index 43606b41..ab8c93cf 100644
--- a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/TriggerModule/Registers/MatchControl.hpp
+++ b/src/DebugToolDrivers/Protocols/RiscVDebug/TriggerModule/Registers/MatchControl.hpp
@@ -3,9 +3,9 @@
 #include <cstdint>
 #include <optional>
 
-#include "src/DebugToolDrivers/Protocols/RiscVDebugSpec/TriggerModule/TriggerModule.hpp"
+#include "src/DebugToolDrivers/Protocols/RiscVDebug/TriggerModule/TriggerModule.hpp"
 
-namespace DebugToolDrivers::Protocols::RiscVDebugSpec::TriggerModule::Registers
+namespace DebugToolDrivers::Protocols::RiscVDebug::TriggerModule::Registers
 {
     struct MatchControl
     {
diff --git a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/TriggerModule/Registers/TriggerData1.hpp b/src/DebugToolDrivers/Protocols/RiscVDebug/TriggerModule/Registers/TriggerData1.hpp
similarity index 86%
rename from src/DebugToolDrivers/Protocols/RiscVDebugSpec/TriggerModule/Registers/TriggerData1.hpp
rename to src/DebugToolDrivers/Protocols/RiscVDebug/TriggerModule/Registers/TriggerData1.hpp
index aea98911..353ba1a7 100644
--- a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/TriggerModule/Registers/TriggerData1.hpp
+++ b/src/DebugToolDrivers/Protocols/RiscVDebug/TriggerModule/Registers/TriggerData1.hpp
@@ -3,9 +3,9 @@
 #include <cstdint>
 #include <optional>
 
-#include "src/DebugToolDrivers/Protocols/RiscVDebugSpec/TriggerModule/TriggerModule.hpp"
+#include "src/DebugToolDrivers/Protocols/RiscVDebug/TriggerModule/TriggerModule.hpp"
 
-namespace DebugToolDrivers::Protocols::RiscVDebugSpec::TriggerModule::Registers
+namespace DebugToolDrivers::Protocols::RiscVDebug::TriggerModule::Registers
 {
     struct TriggerData1
     {
diff --git a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/TriggerModule/Registers/TriggerInfo.hpp b/src/DebugToolDrivers/Protocols/RiscVDebug/TriggerModule/Registers/TriggerInfo.hpp
similarity index 89%
rename from src/DebugToolDrivers/Protocols/RiscVDebugSpec/TriggerModule/Registers/TriggerInfo.hpp
rename to src/DebugToolDrivers/Protocols/RiscVDebug/TriggerModule/Registers/TriggerInfo.hpp
index 6b82340a..08b5405c 100644
--- a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/TriggerModule/Registers/TriggerInfo.hpp
+++ b/src/DebugToolDrivers/Protocols/RiscVDebug/TriggerModule/Registers/TriggerInfo.hpp
@@ -4,9 +4,9 @@
 #include <set>
 #include <array>
 
-#include "src/DebugToolDrivers/Protocols/RiscVDebugSpec/TriggerModule/TriggerModule.hpp"
+#include "src/DebugToolDrivers/Protocols/RiscVDebug/TriggerModule/TriggerModule.hpp"
 
-namespace DebugToolDrivers::Protocols::RiscVDebugSpec::TriggerModule::Registers
+namespace DebugToolDrivers::Protocols::RiscVDebug::TriggerModule::Registers
 {
     struct TriggerInfo
     {
diff --git a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/TriggerModule/Registers/TriggerSelect.hpp b/src/DebugToolDrivers/Protocols/RiscVDebug/TriggerModule/Registers/TriggerSelect.hpp
similarity index 72%
rename from src/DebugToolDrivers/Protocols/RiscVDebugSpec/TriggerModule/Registers/TriggerSelect.hpp
rename to src/DebugToolDrivers/Protocols/RiscVDebug/TriggerModule/Registers/TriggerSelect.hpp
index d90b1876..baef0f88 100644
--- a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/TriggerModule/Registers/TriggerSelect.hpp
+++ b/src/DebugToolDrivers/Protocols/RiscVDebug/TriggerModule/Registers/TriggerSelect.hpp
@@ -2,9 +2,9 @@
 
 #include <cstdint>
 
-#include "src/DebugToolDrivers/Protocols/RiscVDebugSpec/TriggerModule/TriggerModule.hpp"
+#include "src/DebugToolDrivers/Protocols/RiscVDebug/TriggerModule/TriggerModule.hpp"
 
-namespace DebugToolDrivers::Protocols::RiscVDebugSpec::TriggerModule::Registers
+namespace DebugToolDrivers::Protocols::RiscVDebug::TriggerModule::Registers
 {
     /**
      * TODO: Given the single, full width bit field, is this struct really necessary? Review.
diff --git a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/TriggerModule/TriggerDescriptor.hpp b/src/DebugToolDrivers/Protocols/RiscVDebug/TriggerModule/TriggerDescriptor.hpp
similarity index 84%
rename from src/DebugToolDrivers/Protocols/RiscVDebugSpec/TriggerModule/TriggerDescriptor.hpp
rename to src/DebugToolDrivers/Protocols/RiscVDebug/TriggerModule/TriggerDescriptor.hpp
index 9065d300..bd604d1a 100644
--- a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/TriggerModule/TriggerDescriptor.hpp
+++ b/src/DebugToolDrivers/Protocols/RiscVDebug/TriggerModule/TriggerDescriptor.hpp
@@ -5,7 +5,7 @@
 
 #include "TriggerModule.hpp"
 
-namespace DebugToolDrivers::Protocols::RiscVDebugSpec::TriggerModule
+namespace DebugToolDrivers::Protocols::RiscVDebug::TriggerModule
 {
     struct TriggerDescriptor
     {
diff --git a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/TriggerModule/TriggerModule.hpp b/src/DebugToolDrivers/Protocols/RiscVDebug/TriggerModule/TriggerModule.hpp
similarity index 89%
rename from src/DebugToolDrivers/Protocols/RiscVDebugSpec/TriggerModule/TriggerModule.hpp
rename to src/DebugToolDrivers/Protocols/RiscVDebug/TriggerModule/TriggerModule.hpp
index 781d74fd..dbe17e0b 100644
--- a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/TriggerModule/TriggerModule.hpp
+++ b/src/DebugToolDrivers/Protocols/RiscVDebug/TriggerModule/TriggerModule.hpp
@@ -2,7 +2,7 @@
 
 #include <cstdint>
 
-namespace DebugToolDrivers::Protocols::RiscVDebugSpec::TriggerModule
+namespace DebugToolDrivers::Protocols::RiscVDebug::TriggerModule
 {
     using RegisterValue = std::uint32_t;
     using TriggerIndex = std::uint32_t;
diff --git a/src/DebugToolDrivers/Wch/Protocols/WchLink/Commands/DebugModuleInterfaceOperation.hpp b/src/DebugToolDrivers/Wch/Protocols/WchLink/Commands/DebugModuleInterfaceOperation.hpp
index faa59c69..26e38028 100644
--- a/src/DebugToolDrivers/Wch/Protocols/WchLink/Commands/DebugModuleInterfaceOperation.hpp
+++ b/src/DebugToolDrivers/Wch/Protocols/WchLink/Commands/DebugModuleInterfaceOperation.hpp
@@ -6,7 +6,7 @@
 #include "src/DebugToolDrivers/Wch/Protocols/WchLink/Commands/Command.hpp"
 #include "src/DebugToolDrivers/Wch/Protocols/WchLink/Responses/DebugModuleInterfaceOperationResponse.hpp"
 
-#include "src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/DebugModule.hpp"
+#include "src/DebugToolDrivers/Protocols/RiscVDebug/DebugModule/DebugModule.hpp"
 
 namespace DebugToolDrivers::Wch::Protocols::WchLink::Commands
 {
@@ -16,9 +16,9 @@ namespace DebugToolDrivers::Wch::Protocols::WchLink::Commands
         using ExpectedResponseType = Responses::DebugModuleInterfaceOperationResponse;
 
         DebugModuleInterfaceOperation(
-            DebugToolDrivers::Protocols::RiscVDebugSpec::DebugModule::DmiOperation operation,
-            DebugToolDrivers::Protocols::RiscVDebugSpec::DebugModule::RegisterAddress address,
-            std::optional<DebugToolDrivers::Protocols::RiscVDebugSpec::DebugModule::RegisterValue> value = std::nullopt
+            DebugToolDrivers::Protocols::RiscVDebug::DebugModule::DmiOperation operation,
+            DebugToolDrivers::Protocols::RiscVDebug::DebugModule::RegisterAddress address,
+            std::optional<DebugToolDrivers::Protocols::RiscVDebug::DebugModule::RegisterValue> value = std::nullopt
         )
             : Command(0x08)
         {
diff --git a/src/DebugToolDrivers/Wch/Protocols/WchLink/Responses/DebugModuleInterfaceOperationResponse.hpp b/src/DebugToolDrivers/Wch/Protocols/WchLink/Responses/DebugModuleInterfaceOperationResponse.hpp
index fb576d84..3b748b95 100644
--- a/src/DebugToolDrivers/Wch/Protocols/WchLink/Responses/DebugModuleInterfaceOperationResponse.hpp
+++ b/src/DebugToolDrivers/Wch/Protocols/WchLink/Responses/DebugModuleInterfaceOperationResponse.hpp
@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include "src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/DebugModule.hpp"
+#include "src/DebugToolDrivers/Protocols/RiscVDebug/DebugModule/DebugModule.hpp"
 #include "src/Services/StringService.hpp"
 
 #include "src/TargetController/Exceptions/DeviceCommunicationFailure.hpp"
@@ -12,12 +12,12 @@ namespace DebugToolDrivers::Wch::Protocols::WchLink::Responses
     class DebugModuleInterfaceOperationResponse
     {
     public:
-        DebugToolDrivers::Protocols::RiscVDebugSpec::DebugModule::DmiOperationStatus operationStatus;
-        DebugToolDrivers::Protocols::RiscVDebugSpec::DebugModule::RegisterAddress address;
-        DebugToolDrivers::Protocols::RiscVDebugSpec::DebugModule::RegisterValue value;
+        DebugToolDrivers::Protocols::RiscVDebug::DebugModule::DmiOperationStatus operationStatus;
+        DebugToolDrivers::Protocols::RiscVDebug::DebugModule::RegisterAddress address;
+        DebugToolDrivers::Protocols::RiscVDebug::DebugModule::RegisterValue value;
 
         explicit DebugModuleInterfaceOperationResponse(const std::vector<unsigned char>& payload) {
-            using DebugToolDrivers::Protocols::RiscVDebugSpec::DebugModule::DmiOperationStatus;
+            using DebugToolDrivers::Protocols::RiscVDebug::DebugModule::DmiOperationStatus;
 
             if (payload.size() != 6) {
                 throw Exceptions::DeviceCommunicationFailure{
@@ -38,7 +38,7 @@ namespace DebugToolDrivers::Wch::Protocols::WchLink::Responses
 
             this->operationStatus = static_cast<DmiOperationStatus>(status);
             this->address = payload[0];
-            this->value = static_cast<DebugToolDrivers::Protocols::RiscVDebugSpec::DebugModule::RegisterValue>(
+            this->value = static_cast<DebugToolDrivers::Protocols::RiscVDebug::DebugModule::RegisterValue>(
                 (payload[1] << 24) | (payload[2] << 16) | (payload[3] << 8) | (payload[4])
             );
         }
diff --git a/src/DebugToolDrivers/Wch/Protocols/WchLink/WchLinkInterface.cpp b/src/DebugToolDrivers/Wch/Protocols/WchLink/WchLinkInterface.cpp
index 62570de1..5c3c42ed 100644
--- a/src/DebugToolDrivers/Wch/Protocols/WchLink/WchLinkInterface.cpp
+++ b/src/DebugToolDrivers/Wch/Protocols/WchLink/WchLinkInterface.cpp
@@ -25,7 +25,7 @@
 
 namespace DebugToolDrivers::Wch::Protocols::WchLink
 {
-    using namespace ::DebugToolDrivers::Protocols::RiscVDebugSpec;
+    using namespace ::DebugToolDrivers::Protocols::RiscVDebug;
     using namespace Exceptions;
 
     using DebugModule::DmiOperation;
diff --git a/src/DebugToolDrivers/Wch/Protocols/WchLink/WchLinkInterface.hpp b/src/DebugToolDrivers/Wch/Protocols/WchLink/WchLinkInterface.hpp
index be1aba6b..2fe1eae8 100644
--- a/src/DebugToolDrivers/Wch/Protocols/WchLink/WchLinkInterface.hpp
+++ b/src/DebugToolDrivers/Wch/Protocols/WchLink/WchLinkInterface.hpp
@@ -7,7 +7,7 @@
 #include <span>
 #include <utility>
 
-#include "src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugTransportModuleInterface.hpp"
+#include "src/DebugToolDrivers/Protocols/RiscVDebug/DebugTransportModuleInterface.hpp"
 
 #include "src/DebugToolDrivers/Usb/UsbInterface.hpp"
 #include "src/DebugToolDrivers/Usb/UsbDevice.hpp"
@@ -27,7 +27,7 @@ namespace DebugToolDrivers::Wch::Protocols::WchLink
      * Implementation of the WCH-Link protocol, which provides an implementation of a RISC-V DTM interface.
      */
     class WchLinkInterface
-        : public ::DebugToolDrivers::Protocols::RiscVDebugSpec::DebugTransportModuleInterface
+        : public ::DebugToolDrivers::Protocols::RiscVDebug::DebugTransportModuleInterface
     {
     public:
         static constexpr auto MAX_PARTIAL_BLOCK_WRITE_SIZE = Targets::TargetMemorySize{64};
@@ -37,12 +37,12 @@ namespace DebugToolDrivers::Wch::Protocols::WchLink
         DeviceInfo getDeviceInfo();
         void setClockSpeed(WchLinkTargetClockSpeed speed, WchTargetId targetId);
 
-        ::DebugToolDrivers::Protocols::RiscVDebugSpec::DebugModule::RegisterValue readDebugModuleRegister(
-            ::DebugToolDrivers::Protocols::RiscVDebugSpec::DebugModule::RegisterAddress address
+        ::DebugToolDrivers::Protocols::RiscVDebug::DebugModule::RegisterValue readDebugModuleRegister(
+            ::DebugToolDrivers::Protocols::RiscVDebug::DebugModule::RegisterAddress address
         ) override;
         void writeDebugModuleRegister(
-            ::DebugToolDrivers::Protocols::RiscVDebugSpec::DebugModule::RegisterAddress address,
-            ::DebugToolDrivers::Protocols::RiscVDebugSpec::DebugModule::RegisterValue value
+            ::DebugToolDrivers::Protocols::RiscVDebug::DebugModule::RegisterAddress address,
+            ::DebugToolDrivers::Protocols::RiscVDebug::DebugModule::RegisterValue value
         ) override;
 
         void writeFlashPartialBlock(Targets::TargetMemoryAddress startAddress, Targets::TargetMemoryBufferSpan buffer);
diff --git a/src/DebugToolDrivers/Wch/WchLinkDebugInterface.cpp b/src/DebugToolDrivers/Wch/WchLinkDebugInterface.cpp
index b6fc4c21..22533419 100644
--- a/src/DebugToolDrivers/Wch/WchLinkDebugInterface.cpp
+++ b/src/DebugToolDrivers/Wch/WchLinkDebugInterface.cpp
@@ -54,7 +54,7 @@ namespace DebugToolDrivers::Wch
         , targetDescriptionFile(targetDescriptionFile)
         , wchLinkInterface(wchLinkInterface)
         , riscVTranslator(
-            ::DebugToolDrivers::Protocols::RiscVDebugSpec::DebugTranslator{
+            ::DebugToolDrivers::Protocols::RiscVDebug::DebugTranslator{
                 this->wchLinkInterface,
                 this->toolConfig.riscVDebugTranslatorConfig,
                 this->targetDescriptionFile,
@@ -389,7 +389,7 @@ namespace DebugToolDrivers::Wch
         Targets::TargetMemoryBufferSpan buffer
     ) {
         using Services::AlignmentService;
-        using namespace ::DebugToolDrivers::Protocols::RiscVDebugSpec;
+        using namespace ::DebugToolDrivers::Protocols::RiscVDebug;
 
         if (buffer.empty()) {
             return;
@@ -527,7 +527,7 @@ namespace DebugToolDrivers::Wch
     ) {
         using Services::AlignmentService;
         using Services::StringService;
-        using namespace ::DebugToolDrivers::Protocols::RiscVDebugSpec;
+        using namespace ::DebugToolDrivers::Protocols::RiscVDebug;
 
         if (buffer.empty()) {
             return;
diff --git a/src/DebugToolDrivers/Wch/WchLinkDebugInterface.hpp b/src/DebugToolDrivers/Wch/WchLinkDebugInterface.hpp
index 3184ca6f..4ea64624 100644
--- a/src/DebugToolDrivers/Wch/WchLinkDebugInterface.hpp
+++ b/src/DebugToolDrivers/Wch/WchLinkDebugInterface.hpp
@@ -9,7 +9,7 @@
 #include "Protocols/WchLink/WchLinkInterface.hpp"
 
 #include "WchLinkToolConfig.hpp"
-#include "src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugTranslator.hpp"
+#include "src/DebugToolDrivers/Protocols/RiscVDebug/DebugTranslator.hpp"
 
 #include "src/Targets/TargetMemory.hpp"
 #include "src/Targets/TargetAddressSpaceDescriptor.hpp"
@@ -89,7 +89,7 @@ namespace DebugToolDrivers::Wch
         const Targets::RiscV::TargetDescriptionFile& targetDescriptionFile;
 
         Protocols::WchLink::WchLinkInterface& wchLinkInterface;
-        DebugToolDrivers::Protocols::RiscVDebugSpec::DebugTranslator riscVTranslator;
+        DebugToolDrivers::Protocols::RiscVDebug::DebugTranslator riscVTranslator;
 
         DeviceInfo toolInfo;
 
diff --git a/src/DebugToolDrivers/Wch/WchLinkToolConfig.cpp b/src/DebugToolDrivers/Wch/WchLinkToolConfig.cpp
index e1081801..55cdd26a 100644
--- a/src/DebugToolDrivers/Wch/WchLinkToolConfig.cpp
+++ b/src/DebugToolDrivers/Wch/WchLinkToolConfig.cpp
@@ -12,7 +12,7 @@ namespace DebugToolDrivers::Wch
         }
 
         if (toolNode["riscv_debug_translator"]) {
-            this->riscVDebugTranslatorConfig = ::DebugToolDrivers::Protocols::RiscVDebugSpec::DebugTranslatorConfig{
+            this->riscVDebugTranslatorConfig = ::DebugToolDrivers::Protocols::RiscVDebug::DebugTranslatorConfig{
                 toolNode["riscv_debug_translator"]
             };
         }
diff --git a/src/DebugToolDrivers/Wch/WchLinkToolConfig.hpp b/src/DebugToolDrivers/Wch/WchLinkToolConfig.hpp
index 94684f2f..5c1e5ce0 100644
--- a/src/DebugToolDrivers/Wch/WchLinkToolConfig.hpp
+++ b/src/DebugToolDrivers/Wch/WchLinkToolConfig.hpp
@@ -3,7 +3,7 @@
 #include <yaml-cpp/yaml.h>
 
 #include "src/ProjectConfig.hpp"
-#include "src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugTranslatorConfig.hpp"
+#include "src/DebugToolDrivers/Protocols/RiscVDebug/DebugTranslatorConfig.hpp"
 
 namespace DebugToolDrivers::Wch
 {
@@ -13,7 +13,7 @@ namespace DebugToolDrivers::Wch
     struct WchLinkToolConfig: public DebugToolConfig
     {
         bool exitIapMode = true;
-        ::DebugToolDrivers::Protocols::RiscVDebugSpec::DebugTranslatorConfig riscVDebugTranslatorConfig = {};
+        ::DebugToolDrivers::Protocols::RiscVDebug::DebugTranslatorConfig riscVDebugTranslatorConfig = {};
 
         explicit WchLinkToolConfig(const DebugToolConfig& toolConfig);
     };