diff --git a/DRAMSys/library/library.pro b/DRAMSys/library/library.pro
index 6ea08e13..b1ab01a0 100644
--- a/DRAMSys/library/library.pro
+++ b/DRAMSys/library/library.pro
@@ -142,8 +142,8 @@ SOURCES += \
     src/simulation/Dram.cpp \
     src/simulation/RecordableDram.cpp \
     src/simulation/Arbiter.cpp \
-    src/common/rename_CongenAddressDecoder.cpp \
-    src/common/rename_XmlAddressDecoder.cpp
+    src/common/CongenAddressDecoder.cpp \
+    src/common/XmlAddressDecoder.cpp
 
 HEADERS += \
     src/common/third_party/tinyxml2/tinyxml2.h \
@@ -220,8 +220,8 @@ HEADERS += \
     src/controller/RecordableController.h \
     src/simulation/RecordableDram.h \
     src/common/AddressDecoder.h \
-    src/common/rename_CongenAddressDecoder.h \
-    src/common/rename_XmlAddressDecoder.h
+    src/common/CongenAddressDecoder.h \
+    src/common/XmlAddressDecoder.h
     #src/common/third_party/json/include/nlohmann/json.hpp \
 
 thermalsim = $$(THERMALSIM)
diff --git a/DRAMSys/library/src/common/AddressDecoder.cpp b/DRAMSys/library/src/common/AddressDecoder.cpp
index ee6b4b38..b0a3b98f 100644
--- a/DRAMSys/library/src/common/AddressDecoder.cpp
+++ b/DRAMSys/library/src/common/AddressDecoder.cpp
@@ -34,8 +34,8 @@
  */
 
 #include "AddressDecoder.h"
-#include "rename_XmlAddressDecoder.h"
-#include "rename_CongenAddressDecoder.h"
+#include "XmlAddressDecoder.h"
+#include "CongenAddressDecoder.h"
 
 AddressDecoder *AddressDecoder::m_pInstance = nullptr;
 
diff --git a/DRAMSys/library/src/common/rename_CongenAddressDecoder.cpp b/DRAMSys/library/src/common/CongenAddressDecoder.cpp
similarity index 99%
rename from DRAMSys/library/src/common/rename_CongenAddressDecoder.cpp
rename to DRAMSys/library/src/common/CongenAddressDecoder.cpp
index 071967f8..6d71e39b 100644
--- a/DRAMSys/library/src/common/rename_CongenAddressDecoder.cpp
+++ b/DRAMSys/library/src/common/CongenAddressDecoder.cpp
@@ -33,7 +33,7 @@
  *    Johannes Feldmann
  */
 
-#include "rename_CongenAddressDecoder.h"
+#include "CongenAddressDecoder.h"
 #include "Utils.h"
 
 #include <fstream>
diff --git a/DRAMSys/library/src/common/rename_CongenAddressDecoder.h b/DRAMSys/library/src/common/CongenAddressDecoder.h
similarity index 100%
rename from DRAMSys/library/src/common/rename_CongenAddressDecoder.h
rename to DRAMSys/library/src/common/CongenAddressDecoder.h
diff --git a/DRAMSys/library/src/common/TlmRecorder.cpp b/DRAMSys/library/src/common/TlmRecorder.cpp
index 3709a487..f32ec20f 100644
--- a/DRAMSys/library/src/common/TlmRecorder.cpp
+++ b/DRAMSys/library/src/common/TlmRecorder.cpp
@@ -42,7 +42,7 @@
 #include "TlmRecorder.h"
 #include "protocol.h"
 #include "dramExtension.h"
-#include "rename_XmlAddressDecoder.h"
+#include "XmlAddressDecoder.h"
 #include "../controller/core/configuration/Configuration.h"
 #include "../controller/Controller.h"
 
diff --git a/DRAMSys/library/src/common/TlmRecorder.h b/DRAMSys/library/src/common/TlmRecorder.h
index 150e0c3b..f6b97c91 100644
--- a/DRAMSys/library/src/common/TlmRecorder.h
+++ b/DRAMSys/library/src/common/TlmRecorder.h
@@ -49,7 +49,7 @@
 #include <cerrno>
 #include <tlm.h>
 #include <systemc.h>
-#include "rename_XmlAddressDecoder.h"
+#include "XmlAddressDecoder.h"
 #include "DebugManager.h"
 #include "Utils.h"
 
diff --git a/DRAMSys/library/src/common/rename_XmlAddressDecoder.cpp b/DRAMSys/library/src/common/XmlAddressDecoder.cpp
similarity index 99%
rename from DRAMSys/library/src/common/rename_XmlAddressDecoder.cpp
rename to DRAMSys/library/src/common/XmlAddressDecoder.cpp
index 403ac560..1f487f65 100644
--- a/DRAMSys/library/src/common/rename_XmlAddressDecoder.cpp
+++ b/DRAMSys/library/src/common/XmlAddressDecoder.cpp
@@ -35,7 +35,7 @@
  *    Matthias Jung
  */
 
-#include "rename_XmlAddressDecoder.h"
+#include "XmlAddressDecoder.h"
 #include <systemc.h>
 #include "Utils.h"
 #include "bitset"
diff --git a/DRAMSys/library/src/common/rename_XmlAddressDecoder.h b/DRAMSys/library/src/common/XmlAddressDecoder.h
similarity index 100%
rename from DRAMSys/library/src/common/rename_XmlAddressDecoder.h
rename to DRAMSys/library/src/common/XmlAddressDecoder.h
diff --git a/DRAMSys/library/src/controller/core/configuration/Configuration.cpp b/DRAMSys/library/src/controller/core/configuration/Configuration.cpp
index fa69feae..52904001 100644
--- a/DRAMSys/library/src/controller/core/configuration/Configuration.cpp
+++ b/DRAMSys/library/src/controller/core/configuration/Configuration.cpp
@@ -40,7 +40,7 @@
 
 #include "Configuration.h"
 #include "ConfigurationLoader.h"
-#include "../../../common/rename_XmlAddressDecoder.h"
+#include "../../../common/XmlAddressDecoder.h"
 
 using namespace std;
 
diff --git a/DRAMSys/library/src/error/eccbaseclass.h b/DRAMSys/library/src/error/eccbaseclass.h
index 4219d8c3..720be2d7 100644
--- a/DRAMSys/library/src/error/eccbaseclass.h
+++ b/DRAMSys/library/src/error/eccbaseclass.h
@@ -8,7 +8,7 @@
 
 #include "ECC/ECC.h"
 
-#include "../common/rename_XmlAddressDecoder.h"
+#include "../common/XmlAddressDecoder.h"
 #include "../common/DebugManager.h"
 
 using namespace std;
diff --git a/DRAMSys/library/src/error/errormodel.h b/DRAMSys/library/src/error/errormodel.h
index 5f942b14..e562401c 100644
--- a/DRAMSys/library/src/error/errormodel.h
+++ b/DRAMSys/library/src/error/errormodel.h
@@ -40,7 +40,7 @@
 #include <iostream>
 #include <systemc.h>
 #include "../controller/core/configuration/Configuration.h"
-#include "../common/rename_XmlAddressDecoder.h"
+#include "../common/XmlAddressDecoder.h"
 #include "../common/third_party/DRAMPower/src/libdrampower/LibDRAMPower.h"
 
 class errorModel : public sc_module
diff --git a/DRAMSys/library/src/simulation/Arbiter.h b/DRAMSys/library/src/simulation/Arbiter.h
index feeedec3..86d1d1c9 100644
--- a/DRAMSys/library/src/simulation/Arbiter.h
+++ b/DRAMSys/library/src/simulation/Arbiter.h
@@ -46,7 +46,7 @@
 #include <tlm_utils/multi_passthrough_target_socket.h>
 #include <tlm_utils/multi_passthrough_initiator_socket.h>
 #include <tlm_utils/peq_with_cb_and_phase.h>
-#include "../common/rename_XmlAddressDecoder.h"
+#include "../common/XmlAddressDecoder.h"
 #include "../common/dramExtension.h"
 #include "../controller/core/TimingCalculation.h"
 #include "../controller/core/configuration/ConfigurationLoader.h"
diff --git a/DRAMSys/library/src/simulation/DRAMSys.cpp b/DRAMSys/library/src/simulation/DRAMSys.cpp
index dc798194..1e3e5d1b 100644
--- a/DRAMSys/library/src/simulation/DRAMSys.cpp
+++ b/DRAMSys/library/src/simulation/DRAMSys.cpp
@@ -46,8 +46,8 @@
 #include "Setup.h"
 #include "../common/TlmRecorder.h"
 #include "../common/DebugManager.h"
-#include "../common/rename_XmlAddressDecoder.h"
-#include "../common/rename_CongenAddressDecoder.h"
+#include "../common/XmlAddressDecoder.h"
+#include "../common/CongenAddressDecoder.h"
 #include "../controller/core/ControllerCore.h"
 #include "../controller/core/configuration/ConfigurationLoader.h"
 #include "../common/Utils.h"
diff --git a/DRAMSys/library/src/simulation/SimpleArbiter.h b/DRAMSys/library/src/simulation/SimpleArbiter.h
index ed2f01b5..bc2f7b9e 100644
--- a/DRAMSys/library/src/simulation/SimpleArbiter.h
+++ b/DRAMSys/library/src/simulation/SimpleArbiter.h
@@ -38,7 +38,7 @@
 #define SIMPLEARBITER_H
 
 #include "IArbiter.h"
-#include "../common/rename_XmlAddressDecoder.h"
+#include "../common/XmlAddressDecoder.h"
 #include "../common/dramExtension.h"
 #include "../controller/core/TimingCalculation.h"
 
diff --git a/DRAMSys/library/src/simulation/StlPlayer.h b/DRAMSys/library/src/simulation/StlPlayer.h
index 9b7de8a9..b8b0e9a8 100644
--- a/DRAMSys/library/src/simulation/StlPlayer.h
+++ b/DRAMSys/library/src/simulation/StlPlayer.h
@@ -40,7 +40,7 @@
 #ifndef STLPLAYER_H
 #define STLPLAYER_H
 
-#include "../common/rename_XmlAddressDecoder.h"
+#include "../common/XmlAddressDecoder.h"
 #include "TracePlayer.h"
 
 using namespace std;
diff --git a/DRAMSys/library/src/simulation/TracePlayer.h b/DRAMSys/library/src/simulation/TracePlayer.h
index f73516b3..5adbd09e 100644
--- a/DRAMSys/library/src/simulation/TracePlayer.h
+++ b/DRAMSys/library/src/simulation/TracePlayer.h
@@ -49,7 +49,7 @@
 #include "MemoryManager.h"
 #include "../controller/core/configuration/Configuration.h"
 #include "../common/DebugManager.h"
-#include "../common/rename_XmlAddressDecoder.h"
+#include "../common/XmlAddressDecoder.h"
 #include "../controller/core/TimingCalculation.h"
 #include "TracePlayerListener.h"