diff --git a/DRAMSys/library/src/common/configuration/CMakeLists.txt b/DRAMSys/library/src/common/configuration/CMakeLists.txt
index 4b8f7fa6..ce990f0f 100644
--- a/DRAMSys/library/src/common/configuration/CMakeLists.txt
+++ b/DRAMSys/library/src/common/configuration/CMakeLists.txt
@@ -42,7 +42,7 @@ if (DRAMSYS_CONFIGURATION_TESTS)
 endif()
 
 add_library(DRAMSysConfiguration STATIC
-    Configuration.cpp
+    DRAMSysConfiguration.cpp
     AddressMapping.cpp
     McConfig.cpp
     SimConfig.cpp
diff --git a/DRAMSys/library/src/common/configuration/Configuration.cpp b/DRAMSys/library/src/common/configuration/DRAMSysConfiguration.cpp
similarity index 99%
rename from DRAMSys/library/src/common/configuration/Configuration.cpp
rename to DRAMSys/library/src/common/configuration/DRAMSysConfiguration.cpp
index ed331aaf..1403fd46 100644
--- a/DRAMSys/library/src/common/configuration/Configuration.cpp
+++ b/DRAMSys/library/src/common/configuration/DRAMSysConfiguration.cpp
@@ -33,7 +33,7 @@
  *    Derek Christ
  */
 
-#include "Configuration.h"
+#include "DRAMSysConfiguration.h"
 
 #include <exception>
 #include <fstream>
diff --git a/DRAMSys/library/src/common/configuration/Configuration.h b/DRAMSys/library/src/common/configuration/DRAMSysConfiguration.h
similarity index 94%
rename from DRAMSys/library/src/common/configuration/Configuration.h
rename to DRAMSys/library/src/common/configuration/DRAMSysConfiguration.h
index 657f11be..6d6bd799 100644
--- a/DRAMSys/library/src/common/configuration/Configuration.h
+++ b/DRAMSys/library/src/common/configuration/DRAMSysConfiguration.h
@@ -33,8 +33,8 @@
  *    Derek Christ
  */
 
-#ifndef DRAMSYSCONFIGURATION_CONFIGURATION_H
-#define DRAMSYSCONFIGURATION_CONFIGURATION_H
+#ifndef DRAMSYSCONFIGURATION_DRAMSYSCONFIGURATION_H
+#define DRAMSYSCONFIGURATION_DRAMSYSCONFIGURATION_H
 
 #include "AddressMapping.h"
 #include "McConfig.h"
@@ -85,4 +85,4 @@ Configuration from_path(const std::string &path, const std::string &resourceDire
 
 } // namespace DRAMSysConfiguration
 
-#endif // DRAMSYSCONFIGURATION_CONFIGURATION_H
+#endif // DRAMSYSCONFIGURATION_DRAMSYSCONFIGURATION_H
diff --git a/DRAMSys/library/src/common/configuration/McConfig.cpp b/DRAMSys/library/src/common/configuration/McConfig.cpp
index b87be4ea..e2f684fb 100644
--- a/DRAMSys/library/src/common/configuration/McConfig.cpp
+++ b/DRAMSys/library/src/common/configuration/McConfig.cpp
@@ -34,7 +34,7 @@
  */
 
 #include "McConfig.h"
-#include <iostream>
+
 namespace DRAMSysConfiguration
 {
 
diff --git a/DRAMSys/library/src/common/configuration/tests/converter.cpp b/DRAMSys/library/src/common/configuration/tests/converter.cpp
index 08516eb5..647e3f5c 100644
--- a/DRAMSys/library/src/common/configuration/tests/converter.cpp
+++ b/DRAMSys/library/src/common/configuration/tests/converter.cpp
@@ -36,7 +36,7 @@
 #include <nlohmann/json.hpp>
 #include <fstream>
 #include <iostream>
-#include <Configuration.h>
+#include <DRAMSysConfiguration.h>
 
 int main(int argc, char **argv)
 {
diff --git a/DRAMSys/library/src/common/configuration/tests/simpletest.cpp b/DRAMSys/library/src/common/configuration/tests/simpletest.cpp
index c0a9ac95..8bac3858 100644
--- a/DRAMSys/library/src/common/configuration/tests/simpletest.cpp
+++ b/DRAMSys/library/src/common/configuration/tests/simpletest.cpp
@@ -33,7 +33,7 @@
  *    Derek Christ
  */
 
-#include <Configuration.h>
+#include <DRAMSysConfiguration.h>
 #include <fstream>
 #include <iostream>
 
diff --git a/DRAMSys/library/src/common/configuration/util.cpp b/DRAMSys/library/src/common/configuration/util.cpp
index 26ce32e1..1b444917 100644
--- a/DRAMSys/library/src/common/configuration/util.cpp
+++ b/DRAMSys/library/src/common/configuration/util.cpp
@@ -34,7 +34,7 @@
  */
 
 #include "util.h"
-#include "Configuration.h"
+#include "DRAMSysConfiguration.h"
 
 #include <fstream>
 #include <iostream>
diff --git a/DRAMSys/library/src/configuration/Configuration.h b/DRAMSys/library/src/configuration/Configuration.h
index dacee9a9..fbad1cd5 100644
--- a/DRAMSys/library/src/configuration/Configuration.h
+++ b/DRAMSys/library/src/configuration/Configuration.h
@@ -43,7 +43,7 @@
 #define CONFIGURATION_H
 
 #include <string>
-#include <Configuration.h>
+#include <DRAMSysConfiguration.h>
 #include <systemc>
 #include "memspec/MemSpec.h"
 #include "TemperatureSimConfig.h"
diff --git a/DRAMSys/library/src/configuration/TemperatureSimConfig.h b/DRAMSys/library/src/configuration/TemperatureSimConfig.h
index 9f0e67bf..ac090b02 100644
--- a/DRAMSys/library/src/configuration/TemperatureSimConfig.h
+++ b/DRAMSys/library/src/configuration/TemperatureSimConfig.h
@@ -41,7 +41,7 @@
 
 #include <string>
 #include <vector>
-#include <Configuration.h>
+#include <DRAMSysConfiguration.h>
 #include <systemc>
 #include <utility>
 #include "../common/DebugManager.h"
diff --git a/DRAMSys/library/src/configuration/memspec/MemSpec.h b/DRAMSys/library/src/configuration/memspec/MemSpec.h
index 8aa64853..560c5a0e 100644
--- a/DRAMSys/library/src/configuration/memspec/MemSpec.h
+++ b/DRAMSys/library/src/configuration/memspec/MemSpec.h
@@ -41,7 +41,7 @@
 
 #include <vector>
 #include <string>
-#include <Configuration.h>
+#include <DRAMSysConfiguration.h>
 #include <systemc>
 #include <tlm>
 #include "../../common/utils.h"
diff --git a/DRAMSys/library/src/configuration/memspec/MemSpecDDR3.h b/DRAMSys/library/src/configuration/memspec/MemSpecDDR3.h
index beb5629f..fc9818a6 100644
--- a/DRAMSys/library/src/configuration/memspec/MemSpecDDR3.h
+++ b/DRAMSys/library/src/configuration/memspec/MemSpecDDR3.h
@@ -40,7 +40,7 @@
 #include "MemSpec.h"
 
 #include <systemc>
-#include <Configuration.h>
+#include <DRAMSysConfiguration.h>
 
 class MemSpecDDR3 final : public MemSpec
 {
diff --git a/DRAMSys/library/src/simulation/AddressDecoder.h b/DRAMSys/library/src/simulation/AddressDecoder.h
index 8989190d..d6d66606 100644
--- a/DRAMSys/library/src/simulation/AddressDecoder.h
+++ b/DRAMSys/library/src/simulation/AddressDecoder.h
@@ -41,7 +41,7 @@
 
 #include <vector>
 #include <utility>
-#include <Configuration.h>
+#include <DRAMSysConfiguration.h>
 #include "../configuration/Configuration.h"
 
 struct DecodedAddress
diff --git a/DRAMSys/library/src/simulation/Arbiter.cpp b/DRAMSys/library/src/simulation/Arbiter.cpp
index 2a1620f4..c6595c6a 100644
--- a/DRAMSys/library/src/simulation/Arbiter.cpp
+++ b/DRAMSys/library/src/simulation/Arbiter.cpp
@@ -41,7 +41,7 @@
 #include "AddressDecoder.h"
 #include "../configuration/Configuration.h"
 
-#include <Configuration.h>
+#include <DRAMSysConfiguration.h>
 
 using namespace sc_core;
 using namespace tlm;
diff --git a/DRAMSys/library/src/simulation/DRAMSys.h b/DRAMSys/library/src/simulation/DRAMSys.h
index d0c8ec74..b4392449 100644
--- a/DRAMSys/library/src/simulation/DRAMSys.h
+++ b/DRAMSys/library/src/simulation/DRAMSys.h
@@ -49,7 +49,7 @@
 #include "../controller/ControllerIF.h"
 #include "TemperatureController.h"
 
-#include <Configuration.h>
+#include <DRAMSysConfiguration.h>
 #include <string>
 #include <systemc>
 #include <list>
diff --git a/DRAMSys/library/src/simulation/DRAMSysRecordable.h b/DRAMSys/library/src/simulation/DRAMSysRecordable.h
index 9340a8d3..a01f9d99 100644
--- a/DRAMSys/library/src/simulation/DRAMSysRecordable.h
+++ b/DRAMSys/library/src/simulation/DRAMSysRecordable.h
@@ -40,7 +40,7 @@
 #include "DRAMSys.h"
 #include "../common/TlmRecorder.h"
 
-#include <Configuration.h>
+#include <DRAMSysConfiguration.h>
 
 class DRAMSysRecordable : public DRAMSys
 {
diff --git a/DRAMSys/simulator/TraceSetup.h b/DRAMSys/simulator/TraceSetup.h
index 2aacffbf..d443c440 100644
--- a/DRAMSys/simulator/TraceSetup.h
+++ b/DRAMSys/simulator/TraceSetup.h
@@ -37,7 +37,7 @@
 #ifndef TRACESETUP_H
 #define TRACESETUP_H
 
-#include <Configuration.h>
+#include <DRAMSysConfiguration.h>
 #include <vector>
 #include <string>
 #include <memory>
diff --git a/DRAMSys/simulator/main.cpp b/DRAMSys/simulator/main.cpp
index 5d8e5772..b60156ee 100644
--- a/DRAMSys/simulator/main.cpp
+++ b/DRAMSys/simulator/main.cpp
@@ -44,7 +44,7 @@
 #include <vector>
 #include <list>
 #include <chrono>
-#include <Configuration.h>
+#include <DRAMSysConfiguration.h>
 #include <memory>
 #include <systemc>
 
diff --git a/DRAMSys/traceAnalyzer/simulationdialog.h b/DRAMSys/traceAnalyzer/simulationdialog.h
index 311714d3..168ceb55 100644
--- a/DRAMSys/traceAnalyzer/simulationdialog.h
+++ b/DRAMSys/traceAnalyzer/simulationdialog.h
@@ -38,7 +38,7 @@
 
 #include "ui_simulationdialog.h"
 
-#include <Configuration.h>
+#include <DRAMSysConfiguration.h>
 #include <QFileInfo>
 #include <QPointer>
 #include <QProcess>