diff --git a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/RiscVGeneric.hpp b/src/DebugToolDrivers/Protocols/RiscVDebugSpec/Common.hpp
similarity index 100%
rename from src/DebugToolDrivers/Protocols/RiscVDebugSpec/RiscVGeneric.hpp
rename to src/DebugToolDrivers/Protocols/RiscVDebugSpec/Common.hpp
diff --git a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/Registers/MemoryAccessControlField.hpp b/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/Registers/MemoryAccessControlField.hpp
index 5ac19d01..dfeb2732 100644
--- a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/Registers/MemoryAccessControlField.hpp
+++ b/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/Registers/MemoryAccessControlField.hpp
@@ -2,7 +2,7 @@
 
 #include <cstdint>
 
-#include "src/DebugToolDrivers/Protocols/RiscVDebugSpec/RiscVGeneric.hpp"
+#include "src/DebugToolDrivers/Protocols/RiscVDebugSpec/Common.hpp"
 
 namespace DebugToolDrivers::Protocols::RiscVDebugSpec::DebugModule::Registers
 {
diff --git a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/Registers/RegisterAccessControlField.hpp b/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/Registers/RegisterAccessControlField.hpp
index 32a89886..79e29881 100644
--- a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/Registers/RegisterAccessControlField.hpp
+++ b/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugModule/Registers/RegisterAccessControlField.hpp
@@ -2,7 +2,7 @@
 
 #include <cstdint>
 
-#include "src/DebugToolDrivers/Protocols/RiscVDebugSpec/RiscVGeneric.hpp"
+#include "src/DebugToolDrivers/Protocols/RiscVDebugSpec/Common.hpp"
 
 namespace DebugToolDrivers::Protocols::RiscVDebugSpec::DebugModule::Registers
 {
diff --git a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugTranslator.hpp b/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugTranslator.hpp
index 54ba2193..d34c4e4e 100644
--- a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugTranslator.hpp
+++ b/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugTranslator.hpp
@@ -17,7 +17,7 @@
 #include "src/Targets/RiscV/TargetDescriptionFile.hpp"
 #include "src/Targets/RiscV/RiscVTargetConfig.hpp"
 
-#include "RiscVGeneric.hpp"
+#include "Common.hpp"
 #include "Registers/CpuRegisterNumbers.hpp"
 #include "Registers/DebugControlStatusRegister.hpp"
 
diff --git a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugTransportModuleInterface.hpp b/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugTransportModuleInterface.hpp
index 0458ac7c..bf5a9ff9 100644
--- a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugTransportModuleInterface.hpp
+++ b/src/DebugToolDrivers/Protocols/RiscVDebugSpec/DebugTransportModuleInterface.hpp
@@ -3,7 +3,7 @@
 #include <cstdint>
 #include <string>
 
-#include "RiscVGeneric.hpp"
+#include "Common.hpp"
 #include "DebugModule/DebugModule.hpp"
 #include "DebugModule/Registers/RegisterAddresses.hpp"
 
diff --git a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/Registers/CpuRegisterNumbers.hpp b/src/DebugToolDrivers/Protocols/RiscVDebugSpec/Registers/CpuRegisterNumbers.hpp
index 1df04d69..cf1e455e 100644
--- a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/Registers/CpuRegisterNumbers.hpp
+++ b/src/DebugToolDrivers/Protocols/RiscVDebugSpec/Registers/CpuRegisterNumbers.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "src/DebugToolDrivers/Protocols/RiscVDebugSpec/RiscVGeneric.hpp"
+#include "src/DebugToolDrivers/Protocols/RiscVDebugSpec/Common.hpp"
 
 namespace DebugToolDrivers::Protocols::RiscVDebugSpec::Registers
 {
diff --git a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/Registers/DebugControlStatusRegister.hpp b/src/DebugToolDrivers/Protocols/RiscVDebugSpec/Registers/DebugControlStatusRegister.hpp
index 5fa94048..688e80b6 100644
--- a/src/DebugToolDrivers/Protocols/RiscVDebugSpec/Registers/DebugControlStatusRegister.hpp
+++ b/src/DebugToolDrivers/Protocols/RiscVDebugSpec/Registers/DebugControlStatusRegister.hpp
@@ -2,7 +2,7 @@
 
 #include <cstdint>
 
-#include "src/DebugToolDrivers/Protocols/RiscVDebugSpec/RiscVGeneric.hpp"
+#include "src/DebugToolDrivers/Protocols/RiscVDebugSpec/Common.hpp"
 
 namespace DebugToolDrivers::Protocols::RiscVDebugSpec::Registers
 {