diff --git a/DRAMSys/library/library.pro b/DRAMSys/library/library.pro
index b1ab01a0..2c4050f5 100644
--- a/DRAMSys/library/library.pro
+++ b/DRAMSys/library/library.pro
@@ -86,9 +86,7 @@ QMAKE_CXXFLAGS += -isystem $${systemc_home}/include
 
 SOURCES += \
     src/common/third_party/tinyxml2/tinyxml2.cpp \
-    src/common/Utils.cpp \
     src/common/TlmRecorder.cpp \
-    src/common/dramExtension.cpp \
     src/common/DebugManager.cpp \
     src/controller/core/configuration/Configuration.cpp \
     src/controller/core/powerdown/PowerDownManagerTimeout.cpp \
@@ -110,7 +108,6 @@ SOURCES += \
     src/controller/core/scheduling/checker/PreBChecker.cpp \
     src/controller/core/scheduling/checker/ActBChecker.cpp \
     src/controller/core/scheduling/ScheduledCommand.cpp \
-    src/controller/core/TimingCalculation.cpp \
     src/controller/core/Slots.cpp \
     src/controller/core/ControllerCore.cpp \
     src/simulation/MemoryManager.cpp \
@@ -143,15 +140,16 @@ SOURCES += \
     src/simulation/RecordableDram.cpp \
     src/simulation/Arbiter.cpp \
     src/common/CongenAddressDecoder.cpp \
-    src/common/XmlAddressDecoder.cpp
+    src/common/XmlAddressDecoder.cpp \
+    src/common/rename_utils.cpp \
+    src/controller/core/timingCalculations.cpp \
+    src/common/dramExtensions.cpp
 
 HEADERS += \
     src/common/third_party/tinyxml2/tinyxml2.h \
-    src/common/Utils.h \
     src/common/TlmRecorder.h \
     src/common/tlm2_base_protocol_checker.h \
     src/common/protocol.h \
-    src/common/dramExtension.h \
     src/common/DebugManager.h \
     src/controller/core/configuration/Configuration.h \
     src/controller/core/powerdown/PowerDownManagerTimeout.h \
@@ -177,7 +175,6 @@ HEADERS += \
     src/controller/core/scheduling/checker/ActBChecker.h \
     src/controller/core/scheduling/Trigger.h \
     src/controller/core/scheduling/ScheduledCommand.h \
-    src/controller/core/TimingCalculation.h \
     src/controller/core/Slots.h \
     src/controller/core/ControllerCore.h \
     src/simulation/TracePlayer.h \
@@ -221,7 +218,10 @@ HEADERS += \
     src/simulation/RecordableDram.h \
     src/common/AddressDecoder.h \
     src/common/CongenAddressDecoder.h \
-    src/common/XmlAddressDecoder.h
+    src/common/XmlAddressDecoder.h \
+    src/common/rename_utils.h \
+    src/controller/core/timingCalculations.h \
+    src/common/dramExtensions.h
     #src/common/third_party/json/include/nlohmann/json.hpp \
 
 thermalsim = $$(THERMALSIM)
diff --git a/DRAMSys/library/src/common/CongenAddressDecoder.cpp b/DRAMSys/library/src/common/CongenAddressDecoder.cpp
index 6d71e39b..8ca2ce74 100644
--- a/DRAMSys/library/src/common/CongenAddressDecoder.cpp
+++ b/DRAMSys/library/src/common/CongenAddressDecoder.cpp
@@ -34,7 +34,7 @@
  */
 
 #include "CongenAddressDecoder.h"
-#include "Utils.h"
+#include "rename_utils.h"
 
 #include <fstream>
 
diff --git a/DRAMSys/library/src/common/DebugManager.h b/DRAMSys/library/src/common/DebugManager.h
index be40527b..f3810dee 100644
--- a/DRAMSys/library/src/common/DebugManager.h
+++ b/DRAMSys/library/src/common/DebugManager.h
@@ -34,13 +34,13 @@
  *    Matthias Jung
  */
 
-#ifndef DEBUGMANAGER_H_
-#define DEBUGMANAGER_H_
+#ifndef DEBUGMANAGER_H
+#define DEBUGMANAGER_H
 
 #include <systemc.h>
 #include <string>
 #include <set>
-#include "Utils.h"
+#include "rename_utils.h"
 
 class DebugManager
 {
@@ -63,4 +63,4 @@ private:
     ofstream debugFile;
 };
 
-#endif /* DEBUGMANAGER_H_ */
+#endif // DEBUGMANAGER_H
diff --git a/DRAMSys/library/src/common/TlmRecorder.cpp b/DRAMSys/library/src/common/TlmRecorder.cpp
index f32ec20f..c365c060 100644
--- a/DRAMSys/library/src/common/TlmRecorder.cpp
+++ b/DRAMSys/library/src/common/TlmRecorder.cpp
@@ -41,7 +41,7 @@
 
 #include "TlmRecorder.h"
 #include "protocol.h"
-#include "dramExtension.h"
+#include "dramExtensions.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 f6b97c91..8b8ef016 100644
--- a/DRAMSys/library/src/common/TlmRecorder.h
+++ b/DRAMSys/library/src/common/TlmRecorder.h
@@ -36,8 +36,8 @@
  *    Eder F. Zulian
  */
 
-#ifndef TLMPHASERECORDER_H
-#define TLMPHASERECORDER_H
+#ifndef TLMRECORDER_H
+#define TLMRECORDER_H
 
 #include <iostream>
 #include <ostream>
@@ -51,7 +51,7 @@
 #include <systemc.h>
 #include "XmlAddressDecoder.h"
 #include "DebugManager.h"
-#include "Utils.h"
+#include "rename_utils.h"
 
 using namespace std;
 
@@ -150,5 +150,5 @@ private:
         insertDebugMessageString, updateDataStrobeString, insertPowerString;
 };
 
-#endif
+#endif // TLMRECORDER_H
 
diff --git a/DRAMSys/library/src/common/XmlAddressDecoder.cpp b/DRAMSys/library/src/common/XmlAddressDecoder.cpp
index 1f487f65..caa49062 100644
--- a/DRAMSys/library/src/common/XmlAddressDecoder.cpp
+++ b/DRAMSys/library/src/common/XmlAddressDecoder.cpp
@@ -37,7 +37,7 @@
 
 #include "XmlAddressDecoder.h"
 #include <systemc.h>
-#include "Utils.h"
+#include "rename_utils.h"
 #include "bitset"
 #include "../controller/core/configuration/Configuration.h"
 
diff --git a/DRAMSys/library/src/common/XmlAddressDecoder.h b/DRAMSys/library/src/common/XmlAddressDecoder.h
index 6f87bcd5..488eb4a7 100644
--- a/DRAMSys/library/src/common/XmlAddressDecoder.h
+++ b/DRAMSys/library/src/common/XmlAddressDecoder.h
@@ -35,12 +35,12 @@
  *    Matthias Jung
  */
 
-#ifndef _XMLADDRESSDECODER_H
-#define _XMLADDRESSDECODER_H
+#ifndef XMLADDRESSDECODER_H
+#define XMLADDRESSDECODER_H
 
 #include <math.h>
 
-#include "Utils.h"
+#include "rename_utils.h"
 #include "third_party/tinyxml2/tinyxml2.h"
 #include "AddressDecoder.h"
 
@@ -71,4 +71,4 @@ public:
     virtual void print();
 };
 
-#endif
+#endif // XMLADDRESSDECODER_H
diff --git a/DRAMSys/library/src/common/dramExtension.cpp b/DRAMSys/library/src/common/dramExtensions.cpp
similarity index 99%
rename from DRAMSys/library/src/common/dramExtension.cpp
rename to DRAMSys/library/src/common/dramExtensions.cpp
index bfb7b7c4..51ee8578 100644
--- a/DRAMSys/library/src/common/dramExtension.cpp
+++ b/DRAMSys/library/src/common/dramExtensions.cpp
@@ -35,10 +35,10 @@
  *    Matthias Jung
  */
 
-#include "dramExtension.h"
+#include "dramExtensions.h"
 #include "../controller/core/configuration/Configuration.h"
 #include "map"
-#include "Utils.h"
+#include "rename_utils.h"
 
 using namespace tlm;
 
diff --git a/DRAMSys/library/src/common/dramExtension.h b/DRAMSys/library/src/common/dramExtensions.h
similarity index 98%
rename from DRAMSys/library/src/common/dramExtension.h
rename to DRAMSys/library/src/common/dramExtensions.h
index c990e912..2f62ab94 100644
--- a/DRAMSys/library/src/common/dramExtension.h
+++ b/DRAMSys/library/src/common/dramExtensions.h
@@ -34,8 +34,8 @@
  *    Matthias Jung
  */
 
-#ifndef DRAMEXTENSION_H_
-#define DRAMEXTENSION_H_
+#ifndef DRAMEXTENSIONS_H
+#define DRAMEXTENSIONS_H
 
 #include <tlm.h>
 #include <iostream>
@@ -238,4 +238,4 @@ bool operator!=(const Row &lhs, const Row &rhs);
 bool operator==(const Column &lhs, const Column &rhs);
 bool operator!=(const Column &lhs, const Column &rhs);
 
-#endif /* DRAMEXTENSION_H_ */
+#endif // DRAMEXTENSIONS_H
diff --git a/DRAMSys/library/src/common/protocol.h b/DRAMSys/library/src/common/protocol.h
index 00b03c36..06af9c30 100644
--- a/DRAMSys/library/src/common/protocol.h
+++ b/DRAMSys/library/src/common/protocol.h
@@ -35,8 +35,8 @@
  *    Matthias Jung
  */
 
-#ifndef EXTENDED_PHASE_DRAM
-#define EXTENDED_PHASE_DRAM
+#ifndef PROTOCOL_H
+#define PROTOCOL_H
 
 // DRAM Control Phases
 DECLARE_EXTENDED_PHASE(BEGIN_PREB);
@@ -100,5 +100,5 @@ DECLARE_EXTENDED_PHASE(REF_TRIGGER);
 DECLARE_EXTENDED_PHASE(PDN_TRIGGER);
 
 
-#endif
+#endif // PROTOCOL_H
 
diff --git a/DRAMSys/library/src/common/Utils.cpp b/DRAMSys/library/src/common/rename_utils.cpp
similarity index 99%
rename from DRAMSys/library/src/common/Utils.cpp
rename to DRAMSys/library/src/common/rename_utils.cpp
index 6634201b..9e0c19a8 100644
--- a/DRAMSys/library/src/common/Utils.cpp
+++ b/DRAMSys/library/src/common/rename_utils.cpp
@@ -35,11 +35,11 @@
  *    Matthias Jung
  */
 
-#include "Utils.h"
+#include "rename_utils.h"
 #include <string>
 #include <tlm.h>
 #include <fstream>
-#include "dramExtension.h"
+#include "dramExtensions.h"
 #include "../controller/Controller.h"
 
 using namespace std;
diff --git a/DRAMSys/library/src/common/Utils.h b/DRAMSys/library/src/common/rename_utils.h
similarity index 97%
rename from DRAMSys/library/src/common/Utils.h
rename to DRAMSys/library/src/common/rename_utils.h
index ac7a71a1..79bf1c5b 100644
--- a/DRAMSys/library/src/common/Utils.h
+++ b/DRAMSys/library/src/common/rename_utils.h
@@ -35,8 +35,8 @@
  *    Eder F. Zulian
  */
 
-#ifndef UTILS_COMMON_UTILS_H_
-#define UTILS_COMMON_UTILS_H_
+#ifndef UTILS_H
+#define UTILS_H
 
 #include <systemc.h>
 #include <map>
@@ -44,7 +44,7 @@
 #include <ostream>
 #include <tlm.h>
 #include <iomanip>
-#include "dramExtension.h"
+#include "dramExtensions.h"
 #include "third_party/tinyxml2/tinyxml2.h"
 
 #define DEF_SINGLETON( NAME )  \
@@ -148,5 +148,5 @@ double queryDoubleParameter(tinyxml2::XMLElement *node, std::string name);
 
 void setUpDummy(tlm::tlm_generic_payload &payload, Bank &bank);
 
-#endif /* UTILS_COMMON_H_ */
+#endif // UTILS_H
 
diff --git a/DRAMSys/library/src/controller/Command.h b/DRAMSys/library/src/controller/Command.h
index da66fef4..c2b87464 100644
--- a/DRAMSys/library/src/controller/Command.h
+++ b/DRAMSys/library/src/controller/Command.h
@@ -33,8 +33,8 @@
  *    Janik Schlemminger
  *    Matthias Jung
  */
-#ifndef COMMAND_H_
-#define COMMAND_H_
+#ifndef COMMAND_H
+#define COMMAND_H
 
 #include <string>
 #include <vector>
@@ -64,4 +64,4 @@ std::string commandToString(Command command);
 const std::vector<Command> &getAllCommands();
 bool commandIsIn(Command command, std::vector<Command> commands);
 
-#endif /* COMMAND_H_ */
+#endif // COMMAND_H
diff --git a/DRAMSys/library/src/controller/Controller.h b/DRAMSys/library/src/controller/Controller.h
index 3b604c63..0a743632 100644
--- a/DRAMSys/library/src/controller/Controller.h
+++ b/DRAMSys/library/src/controller/Controller.h
@@ -35,8 +35,8 @@
  *    Eder F. Zulian
  */
 
-#ifndef CONTROLLERWRAPPER_H_
-#define CONTROLLERWRAPPER_H_
+#ifndef CONTROLLER_H
+#define CONTROLLER_H
 
 #include <map>
 #include <string>
@@ -49,11 +49,11 @@
 #include <tlm_utils/simple_initiator_socket.h>
 #include <tlm_utils/simple_target_socket.h>
 
-#include "../common/dramExtension.h"
+#include "../common/dramExtensions.h"
 #include "../common/DebugManager.h"
 #include "../common/protocol.h"
 #include "../common/TlmRecorder.h"
-#include "../common/Utils.h"
+#include "../common/rename_utils.h"
 #include "core/configuration/Configuration.h"
 #include "core/configuration/MemSpec.h"
 #include "Command.h"
@@ -63,7 +63,7 @@
 #include "core/powerdown/IPowerDownManager.h"
 #include "core/scheduling/ScheduledCommand.h"
 #include "core/scheduling/Trigger.h"
-#include "core/TimingCalculation.h"
+#include "core/timingCalculations.h"
 #include "scheduler/Fifo.h"
 #include "scheduler/Grp.h"
 #include "scheduler/FifoStrict.h"
@@ -171,5 +171,5 @@ protected:
     static const unsigned int controllerThreadId = INT_MAX;
 };
 
-#endif /* CONTROLLERWRAPPER_H_ */
+#endif // CONTROLLER_H
 
diff --git a/DRAMSys/library/src/controller/ControllerState.cpp b/DRAMSys/library/src/controller/ControllerState.cpp
index efff0548..a94905f8 100644
--- a/DRAMSys/library/src/controller/ControllerState.cpp
+++ b/DRAMSys/library/src/controller/ControllerState.cpp
@@ -37,7 +37,7 @@
 
 #include "ControllerState.h"
 #include <algorithm>
-#include "core/TimingCalculation.h"
+#include "core/timingCalculations.h"
 
 using namespace std;
 
diff --git a/DRAMSys/library/src/controller/ControllerState.h b/DRAMSys/library/src/controller/ControllerState.h
index fff61882..77b99799 100644
--- a/DRAMSys/library/src/controller/ControllerState.h
+++ b/DRAMSys/library/src/controller/ControllerState.h
@@ -34,8 +34,8 @@
  *    Matthias Jung
  */
 
-#ifndef CONTROLLER_STATE_H_
-#define CONTROLLER_STATE_H_
+#ifndef CONTROLLERSTATE_H
+#define CONTROLLERSTATE_H
 
 #include <systemc.h>
 #include "RowBufferStates.h"
@@ -84,5 +84,5 @@ private:
     void printDebugMessage(std::string message);
 };
 
-#endif /* CONTROLLER_STATE_H_ */
+#endif // CONTROLLERSTATE_H
 
diff --git a/DRAMSys/library/src/controller/IController.h b/DRAMSys/library/src/controller/IController.h
index ded2de7b..4504c4c3 100644
--- a/DRAMSys/library/src/controller/IController.h
+++ b/DRAMSys/library/src/controller/IController.h
@@ -42,7 +42,7 @@
 #include <systemc.h>
 #include "core/scheduling/ScheduledCommand.h"
 #include "core/scheduling/Trigger.h"
-#include "../common/dramExtension.h"
+#include "../common/dramExtensions.h"
 
 
 // Utiliy class to pass around the Controller class to the controller Core and various schedulers, without having to propagate the template defintions
diff --git a/DRAMSys/library/src/controller/RowBufferStates.cpp b/DRAMSys/library/src/controller/RowBufferStates.cpp
index 2948203a..4c57d257 100644
--- a/DRAMSys/library/src/controller/RowBufferStates.cpp
+++ b/DRAMSys/library/src/controller/RowBufferStates.cpp
@@ -37,7 +37,7 @@
 #include "RowBufferStates.h"
 #include "core/ControllerCore.h"
 #include "../common/DebugManager.h"
-#include "../common/Utils.h"
+#include "../common/rename_utils.h"
 
 using namespace std;
 
diff --git a/DRAMSys/library/src/controller/RowBufferStates.h b/DRAMSys/library/src/controller/RowBufferStates.h
index 63de434e..f2670dec 100644
--- a/DRAMSys/library/src/controller/RowBufferStates.h
+++ b/DRAMSys/library/src/controller/RowBufferStates.h
@@ -34,11 +34,11 @@
  *    Matthias Jung
  */
 
-#ifndef ROWBUFFERSTATES_H_
-#define ROWBUFFERSTATES_H_
+#ifndef ROWBUFFERSTATES_H
+#define ROWBUFFERSTATES_H
 
 #include <map>
-#include "../common/dramExtension.h"
+#include "../common/dramExtensions.h"
 
 class RowBufferState
 {
@@ -60,5 +60,5 @@ private:
     void printDebugMessage(std::string message);
 };
 
-#endif /* BANKSTATES_H_ */
+#endif // ROWBUFFERSTATES_H
 
diff --git a/DRAMSys/library/src/controller/core/ControllerCore.cpp b/DRAMSys/library/src/controller/core/ControllerCore.cpp
index ba8d1ebe..92dfe1a1 100644
--- a/DRAMSys/library/src/controller/core/ControllerCore.cpp
+++ b/DRAMSys/library/src/controller/core/ControllerCore.cpp
@@ -49,9 +49,9 @@
 #include "refresh/RefreshManagerBankwise.h"
 #include "refresh/RefreshManager.h"
 #include "refresh/RGR.h"
-#include "../../common/dramExtension.h"
-#include "../../common/Utils.h"
-#include "TimingCalculation.h"
+#include "../../common/dramExtensions.h"
+#include "../../common/rename_utils.h"
+#include "timingCalculations.h"
 
 #include "powerdown/PowerDownManager.h"
 #include "powerdown/PowerDownManagerTimeout.h"
diff --git a/DRAMSys/library/src/controller/core/ControllerCore.h b/DRAMSys/library/src/controller/core/ControllerCore.h
index 7b00f1ea..f0b7dc99 100644
--- a/DRAMSys/library/src/controller/core/ControllerCore.h
+++ b/DRAMSys/library/src/controller/core/ControllerCore.h
@@ -34,8 +34,8 @@
  *    Matthias Jung
  */
 
-#ifndef CONTROLLER_H_
-#define CONTROLLER_H_
+#ifndef CONTROLLERCORE_H
+#define CONTROLLERCORE_H
 
 #include <tlm.h>
 #include <map>
@@ -88,5 +88,5 @@ private:
     void printDebugMessage(string message);
 };
 
-#endif /* CONTROLLER_H_ */
+#endif // CONTROLLERCORE_H
 
diff --git a/DRAMSys/library/src/controller/core/Slots.cpp b/DRAMSys/library/src/controller/core/Slots.cpp
index 20126eab..d74ce9e9 100644
--- a/DRAMSys/library/src/controller/core/Slots.cpp
+++ b/DRAMSys/library/src/controller/core/Slots.cpp
@@ -35,7 +35,7 @@
  */
 
 #include "Slots.h"
-#include "TimingCalculation.h"
+#include "timingCalculations.h"
 
 
 Slots::Slots(sc_time clk) :
diff --git a/DRAMSys/library/src/controller/core/Slots.h b/DRAMSys/library/src/controller/core/Slots.h
index 5a821a4b..61663568 100644
--- a/DRAMSys/library/src/controller/core/Slots.h
+++ b/DRAMSys/library/src/controller/core/Slots.h
@@ -34,13 +34,13 @@
  *    Matthias Jung
  */
 
-#ifndef SLOTS_H_
-#define SLOTS_H_
+#ifndef SLOTS_H
+#define SLOTS_H
+
 #include <systemc.h>
 #include <set>
 #include "scheduling/ScheduledCommand.h"
 
-
 class Slots
 {
 public:
@@ -60,4 +60,4 @@ private:
 };
 
 
-#endif /* SLOTS_H_ */
+#endif // SLOTS_H
diff --git a/DRAMSys/library/src/controller/core/configuration/Configuration.h b/DRAMSys/library/src/controller/core/configuration/Configuration.h
index 37b7f4ea..6472a4c5 100644
--- a/DRAMSys/library/src/controller/core/configuration/Configuration.h
+++ b/DRAMSys/library/src/controller/core/configuration/Configuration.h
@@ -36,15 +36,15 @@
  *    Felipe S. Prado
  */
 
-#ifndef CONFIGURATION_H_
-#define CONFIGURATION_H_
+#ifndef CONFIGURATION_H
+#define CONFIGURATION_H
 
 #include <systemc.h>
 #include <string>
 #include <cstdint>
 #include "MemSpec.h"
 #include "thermalSimConfig.h"
-#include "../../../common/Utils.h"
+#include "../../../common/rename_utils.h"
 
 #include "../../../error/eccbaseclass.h"
 
@@ -164,5 +164,5 @@ private:
     unsigned int powerDownTimeoutInClk = 3;
 };
 
-#endif /* CONFIGURATION_H_ */
+#endif // CONFIGURATION_H
 
diff --git a/DRAMSys/library/src/controller/core/configuration/ConfigurationLoader.cpp b/DRAMSys/library/src/controller/core/configuration/ConfigurationLoader.cpp
index 31f478b7..a8fb37c8 100644
--- a/DRAMSys/library/src/controller/core/configuration/ConfigurationLoader.cpp
+++ b/DRAMSys/library/src/controller/core/configuration/ConfigurationLoader.cpp
@@ -36,7 +36,7 @@
 
 #include "ConfigurationLoader.h"
 #include "MemSpec.h"
-#include "../TimingCalculation.h"
+#include "../timingCalculations.h"
 
 using namespace tinyxml2;
 using namespace std;
diff --git a/DRAMSys/library/src/controller/core/configuration/ConfigurationLoader.h b/DRAMSys/library/src/controller/core/configuration/ConfigurationLoader.h
index 8334cb4e..fe701b59 100644
--- a/DRAMSys/library/src/controller/core/configuration/ConfigurationLoader.h
+++ b/DRAMSys/library/src/controller/core/configuration/ConfigurationLoader.h
@@ -34,12 +34,12 @@
  *    Matthias Jung
  */
 
-#ifndef CONFIGURATIONLOADER_H_
-#define CONFIGURATIONLOADER_H_
+#ifndef CONFIGURATIONLOADER_H
+#define CONFIGURATIONLOADER_H
 
 #include <string>
 #include "../../../common/third_party/tinyxml2/tinyxml2.h"
-#include "../../../common/Utils.h"
+#include "../../../common/rename_utils.h"
 #include "Configuration.h"
 
 class ConfigurationLoader
@@ -74,4 +74,4 @@ private:
 };
 
 
-#endif /* CONFIGURATIONLOADER_H_ */
+#endif // CONFIGURATIONLOADER_H
diff --git a/DRAMSys/library/src/controller/core/configuration/MemSpec.h b/DRAMSys/library/src/controller/core/configuration/MemSpec.h
index 434cb508..79b10329 100644
--- a/DRAMSys/library/src/controller/core/configuration/MemSpec.h
+++ b/DRAMSys/library/src/controller/core/configuration/MemSpec.h
@@ -39,7 +39,7 @@
 
 #include <systemc.h>
 #include <map>
-#include "../../../common/dramExtension.h"
+#include "../../../common/dramExtensions.h"
 
 
 struct RefreshTiming {
diff --git a/DRAMSys/library/src/controller/core/configuration/thermalSimConfig.h b/DRAMSys/library/src/controller/core/configuration/thermalSimConfig.h
index 6d202dbc..8d13a77d 100644
--- a/DRAMSys/library/src/controller/core/configuration/thermalSimConfig.h
+++ b/DRAMSys/library/src/controller/core/configuration/thermalSimConfig.h
@@ -43,7 +43,7 @@
 
 #include "../../../common/DebugManager.h"
 #include "../../../common/third_party/tinyxml2/tinyxml2.h"
-#include "../../../common/Utils.h"
+#include "../../../common/rename_utils.h"
 
 struct TemperatureSimConfig {
 
diff --git a/DRAMSys/library/src/controller/core/powerdown/IPowerDownManager.h b/DRAMSys/library/src/controller/core/powerdown/IPowerDownManager.h
index 1de77427..9ff8bd39 100644
--- a/DRAMSys/library/src/controller/core/powerdown/IPowerDownManager.h
+++ b/DRAMSys/library/src/controller/core/powerdown/IPowerDownManager.h
@@ -34,11 +34,11 @@
  *    Matthias Jung
  */
 
-#ifndef IPOWERDOWNMANAGER_H_
-#define IPOWERDOWNMANAGER_H_
+#ifndef IPOWERDOWNMANAGER_H
+#define IPOWERDOWNMANAGER_H
 
 #include <systemc.h>
-#include "../../../common/dramExtension.h"
+#include "../../../common/dramExtensions.h"
 #include "../../Command.h"
 
 
@@ -126,4 +126,4 @@ inline std::string powerDownStateToString(PowerDownState powerDownState)
 }
 
 
-#endif /* IPOWERDOWNMANAGER_H_ */
+#endif // IPOWERDOWNMANAGER_H
diff --git a/DRAMSys/library/src/controller/core/powerdown/NoPowerDown.h b/DRAMSys/library/src/controller/core/powerdown/NoPowerDown.h
index 13b9db16..e68d344a 100644
--- a/DRAMSys/library/src/controller/core/powerdown/NoPowerDown.h
+++ b/DRAMSys/library/src/controller/core/powerdown/NoPowerDown.h
@@ -40,7 +40,7 @@
 
 #include "PowerDownManager.h"
 #include <systemc.h>
-#include "../../../common/dramExtension.h"
+#include "../../../common/dramExtensions.h"
 #include "../scheduling/ScheduledCommand.h"
 
 
diff --git a/DRAMSys/library/src/controller/core/powerdown/PowerDownManager.cpp b/DRAMSys/library/src/controller/core/powerdown/PowerDownManager.cpp
index 93cab1a6..9d3a5258 100644
--- a/DRAMSys/library/src/controller/core/powerdown/PowerDownManager.cpp
+++ b/DRAMSys/library/src/controller/core/powerdown/PowerDownManager.cpp
@@ -39,10 +39,10 @@
 #include <string>
 #include "PowerDownManager.h"
 #include "../ControllerCore.h"
-#include "../TimingCalculation.h"
+#include "../timingCalculations.h"
 #include "../../../common/DebugManager.h"
 #include <algorithm>
-#include "../../../common/Utils.h"
+#include "../../../common/rename_utils.h"
 
 using namespace tlm;
 using namespace std;
diff --git a/DRAMSys/library/src/controller/core/powerdown/PowerDownManager.h b/DRAMSys/library/src/controller/core/powerdown/PowerDownManager.h
index a8a77e20..ee90629e 100644
--- a/DRAMSys/library/src/controller/core/powerdown/PowerDownManager.h
+++ b/DRAMSys/library/src/controller/core/powerdown/PowerDownManager.h
@@ -34,8 +34,8 @@
  *    Matthias Jung
  */
 
-#ifndef POWERDOWNMANAGER_H_
-#define POWERDOWNMANAGER_H_
+#ifndef POWERDOWNMANAGER_H
+#define POWERDOWNMANAGER_H
 
 #include "PowerDownManagerBankwise.h"
 
@@ -68,4 +68,4 @@ protected:
 };
 
 
-#endif /* POWERDOWNMANAGER_H_ */
+#endif // POWERDOWNMANAGER_H
diff --git a/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerBankwise.cpp b/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerBankwise.cpp
index 57490c88..344b1700 100644
--- a/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerBankwise.cpp
+++ b/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerBankwise.cpp
@@ -36,9 +36,9 @@
 
 #include "PowerDownManager.h"
 #include "../ControllerCore.h"
-#include "../../../common/Utils.h"
+#include "../../../common/rename_utils.h"
 #include "../../../common/DebugManager.h"
-#include "../TimingCalculation.h"
+#include "../timingCalculations.h"
 
 using namespace tlm;
 
diff --git a/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerBankwise.h b/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerBankwise.h
index 5f532b00..69382538 100644
--- a/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerBankwise.h
+++ b/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerBankwise.h
@@ -34,15 +34,15 @@
  *    Matthias Jung
  */
 
-#ifndef POWERDOWNMANAGERBANKWISE_H_
-#define POWERDOWNMANAGERBANKWISE_H_
+#ifndef POWERDOWNMANAGERBANKWISE_H
+#define POWERDOWNMANAGERBANKWISE_H
 
 #include <systemc.h>
 #include <tlm.h>
 #include <map>
 #include <string>
 #include "../../Command.h"
-#include "../../../common/dramExtension.h"
+#include "../../../common/dramExtensions.h"
 #include "../scheduling/ScheduledCommand.h"
 #include "IPowerDownManager.h"
 
@@ -82,5 +82,5 @@ protected:
     void printDebugMessage(std::string message);
 };
 
-#endif /* POWERDOWNMANAGERBANKWISE_H_ */
+#endif // POWERDOWNMANAGERBANKWISE_H
 
diff --git a/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerTimeout.cpp b/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerTimeout.cpp
index c694d13f..88a97766 100644
--- a/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerTimeout.cpp
+++ b/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerTimeout.cpp
@@ -38,9 +38,9 @@
 
 #include "PowerDownManagerTimeout.h"
 #include "../ControllerCore.h"
-#include "../../../common/Utils.h"
+#include "../../../common/rename_utils.h"
 #include "../../../common/DebugManager.h"
-#include "../TimingCalculation.h"
+#include "../timingCalculations.h"
 
 using namespace tlm;
 
diff --git a/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerTimeout.h b/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerTimeout.h
index 538df00c..d56675f5 100644
--- a/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerTimeout.h
+++ b/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerTimeout.h
@@ -36,12 +36,12 @@
  *    Felipe S. Prado
  */
 
-#ifndef POWERDOWNMANAGERTIMEOUT_H_
-#define POWERDOWNMANAGERTIMEOUT_H_
+#ifndef POWERDOWNMANAGERTIMEOUT_H
+#define POWERDOWNMANAGERTIMEOUT_H
 
 #include "PowerDownManager.h"
 #include <systemc.h>
-#include "../../../common/dramExtension.h"
+#include "../../../common/dramExtensions.h"
 #include "../scheduling/ScheduledCommand.h"
 #include <map>
 
@@ -60,4 +60,4 @@ public:
 
 
 
-#endif /* POWERDOWNMANAGERTIMEOUT_H_ */
+#endif // POWERDOWNMANAGERTIMEOUT_H
diff --git a/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerTimeoutBankwise.cpp b/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerTimeoutBankwise.cpp
index 56a8b9b3..2e4a2a1a 100644
--- a/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerTimeoutBankwise.cpp
+++ b/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerTimeoutBankwise.cpp
@@ -38,9 +38,9 @@
 
 #include "PowerDownManagerTimeoutBankwise.h"
 #include "../ControllerCore.h"
-#include "../../../common/Utils.h"
+#include "../../../common/rename_utils.h"
 #include "../../../common/DebugManager.h"
-#include "../TimingCalculation.h"
+#include "../timingCalculations.h"
 
 using namespace tlm;
 
diff --git a/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerTimeoutBankwise.h b/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerTimeoutBankwise.h
index 3c1fb76b..e4a43bed 100644
--- a/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerTimeoutBankwise.h
+++ b/DRAMSys/library/src/controller/core/powerdown/PowerDownManagerTimeoutBankwise.h
@@ -36,12 +36,12 @@
  *    Felipe S. Prado
  */
 
-#ifndef POWERDOWNMANAGERTIMEOUTBANKWISE_H_
-#define POWERDOWNMANAGERTIMEOUTBANKWISE_H_
+#ifndef POWERDOWNMANAGERTIMEOUTBANKWISE_H
+#define POWERDOWNMANAGERTIMEOUTBANKWISE_H
 
 #include "PowerDownManager.h"
 #include <systemc.h>
-#include "../../../common/dramExtension.h"
+#include "../../../common/dramExtensions.h"
 #include "../scheduling/ScheduledCommand.h"
 #include <map>
 
@@ -60,4 +60,4 @@ public:
 
 
 
-#endif /* POWERDOWNMANAGERTIMEOUTBANKWISE_H_ */
+#endif // POWERDOWNMANAGERTIMEOUTBANKWISE_H
diff --git a/DRAMSys/library/src/controller/core/refresh/IRefreshManager.h b/DRAMSys/library/src/controller/core/refresh/IRefreshManager.h
index 1668ef61..9b2f581b 100644
--- a/DRAMSys/library/src/controller/core/refresh/IRefreshManager.h
+++ b/DRAMSys/library/src/controller/core/refresh/IRefreshManager.h
@@ -35,8 +35,8 @@
  *    Matthias Jung
  */
 
-#ifndef IREFRESHMANAGER_H_
-#define IREFRESHMANAGER_H_
+#ifndef IREFRESHMANAGER_H
+#define IREFRESHMANAGER_H
 
 #include <systemc.h>
 #include "../scheduling/ScheduledCommand.h"
@@ -62,5 +62,5 @@ public:
     virtual bool isInvalidated(tlm::tlm_generic_payload &payload, sc_time time) = 0;
 };
 
-#endif /* IREFRESHMANAGER_H_ */
+#endif // IREFRESHMANAGER_H
 
diff --git a/DRAMSys/library/src/controller/core/refresh/RGR.cpp b/DRAMSys/library/src/controller/core/refresh/RGR.cpp
index 37b552e4..ff4c72e5 100644
--- a/DRAMSys/library/src/controller/core/refresh/RGR.cpp
+++ b/DRAMSys/library/src/controller/core/refresh/RGR.cpp
@@ -36,8 +36,8 @@
 
 #include "RGR.h"
 #include "../ControllerCore.h"
-#include "../TimingCalculation.h"
-#include "../../../common/Utils.h"
+#include "../timingCalculations.h"
+#include "../../../common/rename_utils.h"
 
 #define TRUE 1
 #define FALSE !(TRUE)
diff --git a/DRAMSys/library/src/controller/core/refresh/RGR.h b/DRAMSys/library/src/controller/core/refresh/RGR.h
index 96ad8cdb..bfe8e444 100644
--- a/DRAMSys/library/src/controller/core/refresh/RGR.h
+++ b/DRAMSys/library/src/controller/core/refresh/RGR.h
@@ -32,12 +32,15 @@
  * Author: Éder F. Zulian
  */
 
-#ifndef RGR_MANAGER_H_
-#define RGR_MANAGER_H_
-#include "../../../common/dramExtension.h"
+#ifndef RGR_H
+#define RGR_H
+
+#include "../../../common/dramExtensions.h"
 #include "../configuration/MemSpec.h"
 #include "IRefreshManager.h"
+
 class ControllerCore;
+
 class RGR : public IRefreshManager, public sc_module
 {
 public:
@@ -73,5 +76,6 @@ private:
     void planNextRefresh(Bank b, sc_time t, bool align);
     void printDebugMessage(std::string message);
 };
-#endif /* RGR_MANAGER_H_ */
+
+#endif // RGR_H
 
diff --git a/DRAMSys/library/src/controller/core/refresh/RefreshManager.cpp b/DRAMSys/library/src/controller/core/refresh/RefreshManager.cpp
index b07ed332..ad1cea5b 100644
--- a/DRAMSys/library/src/controller/core/refresh/RefreshManager.cpp
+++ b/DRAMSys/library/src/controller/core/refresh/RefreshManager.cpp
@@ -39,8 +39,8 @@
 
 #include "RefreshManager.h"
 #include "../ControllerCore.h"
-#include "../TimingCalculation.h"
-#include "../../../common/Utils.h"
+#include "../timingCalculations.h"
+#include "../../../common/rename_utils.h"
 
 using namespace tlm;
 
diff --git a/DRAMSys/library/src/controller/core/refresh/RefreshManager.h b/DRAMSys/library/src/controller/core/refresh/RefreshManager.h
index c5fb5905..c89fa12b 100644
--- a/DRAMSys/library/src/controller/core/refresh/RefreshManager.h
+++ b/DRAMSys/library/src/controller/core/refresh/RefreshManager.h
@@ -35,8 +35,8 @@
  *    Éder F. Zulian
  */
 
-#ifndef REFRESHMANAGER_H_
-#define REFRESHMANAGER_H_
+#ifndef REFRESHMANAGER_H
+#define REFRESHMANAGER_H
 
 #include "IRefreshManager.h"
 #include "../configuration/MemSpec.h"
@@ -78,5 +78,5 @@ private:
     void printDebugMessage(std::string message);
 };
 
-#endif /* REFRESHMANAGER_H_ */
+#endif // REFRESHMANAGER_H
 
diff --git a/DRAMSys/library/src/controller/core/refresh/RefreshManagerBankwise.cpp b/DRAMSys/library/src/controller/core/refresh/RefreshManagerBankwise.cpp
index 533b7859..ab878ff0 100644
--- a/DRAMSys/library/src/controller/core/refresh/RefreshManagerBankwise.cpp
+++ b/DRAMSys/library/src/controller/core/refresh/RefreshManagerBankwise.cpp
@@ -37,8 +37,8 @@
 
 #include "RefreshManagerBankwise.h"
 #include "../ControllerCore.h"
-#include "../TimingCalculation.h"
-#include "../../../common/Utils.h"
+#include "../timingCalculations.h"
+#include "../../../common/rename_utils.h"
 
 using namespace std;
 
diff --git a/DRAMSys/library/src/controller/core/refresh/RefreshManagerBankwise.h b/DRAMSys/library/src/controller/core/refresh/RefreshManagerBankwise.h
index 6b8558a1..1c84d83e 100644
--- a/DRAMSys/library/src/controller/core/refresh/RefreshManagerBankwise.h
+++ b/DRAMSys/library/src/controller/core/refresh/RefreshManagerBankwise.h
@@ -35,8 +35,8 @@
  *    Éder F. Zulian
  */
 
-#ifndef BANKWISEREFRESHMANAGER_H_
-#define BANKWISEREFRESHMANAGER_H_
+#ifndef BANKWISEREFRESHMANAGER_H
+#define BANKWISEREFRESHMANAGER_H
 
 //#include "../../../common/dramExtension.h"
 #include "IRefreshManager.h"
@@ -79,5 +79,5 @@ private:
     void printDebugMessage(std::string message);
 };
 
-#endif /* BANKWISEREFRESHMANAGER_H_ */
+#endif // BANKWISEREFRESHMANAGER_H
 
diff --git a/DRAMSys/library/src/controller/core/scheduling/ScheduledCommand.cpp b/DRAMSys/library/src/controller/core/scheduling/ScheduledCommand.cpp
index 3b367eda..718e25f3 100644
--- a/DRAMSys/library/src/controller/core/scheduling/ScheduledCommand.cpp
+++ b/DRAMSys/library/src/controller/core/scheduling/ScheduledCommand.cpp
@@ -35,8 +35,8 @@
  */
 
 #include "ScheduledCommand.h"
-#include "../TimingCalculation.h"
-#include "../../../common/Utils.h"
+#include "../timingCalculations.h"
+#include "../../../common/rename_utils.h"
 #include "../configuration/Configuration.h"
 
 bool ScheduledCommand::isNoCommand() const
diff --git a/DRAMSys/library/src/controller/core/scheduling/ScheduledCommand.h b/DRAMSys/library/src/controller/core/scheduling/ScheduledCommand.h
index c2a5a2fc..aa2f1121 100644
--- a/DRAMSys/library/src/controller/core/scheduling/ScheduledCommand.h
+++ b/DRAMSys/library/src/controller/core/scheduling/ScheduledCommand.h
@@ -34,14 +34,14 @@
  *    Matthias Jung
  */
 
-#ifndef SCHEDULEDCOMMAND_H_
-#define SCHEDULEDCOMMAND_H_
+#ifndef SCHEDULEDCOMMAND_H
+#define SCHEDULEDCOMMAND_H
 
 #include <systemc.h>
 #include <tlm.h>
 #include "../../Command.h"
-#include "../../../common/dramExtension.h"
-#include "../../../common/Utils.h"
+#include "../../../common/dramExtensions.h"
+#include "../../../common/rename_utils.h"
 
 class ScheduledCommand
 {
@@ -98,5 +98,5 @@ private:
     DramExtension extension;
 };
 
-#endif /* SCHEDULEDCOMMAND_H_ */
+#endif // SCHEDULEDCOMMAND_H
 
diff --git a/DRAMSys/library/src/controller/core/scheduling/Trigger.h b/DRAMSys/library/src/controller/core/scheduling/Trigger.h
index b0026be8..3900bdbe 100644
--- a/DRAMSys/library/src/controller/core/scheduling/Trigger.h
+++ b/DRAMSys/library/src/controller/core/scheduling/Trigger.h
@@ -34,11 +34,11 @@
  *    Matthias Jung
  */
 
-#ifndef TRIGGER_H_
-#define TRIGGER_H_
+#ifndef TRIGGER_H
+#define TRIGGER_H
 
 
 enum Trigger {REFTrigger, PDNTrigger};
 
 
-#endif /* TRIGGER_H_ */
+#endif // TRIGGER_H
diff --git a/DRAMSys/library/src/controller/core/scheduling/checker/ActBChecker.cpp b/DRAMSys/library/src/controller/core/scheduling/checker/ActBChecker.cpp
index fff23cde..2313d6cb 100644
--- a/DRAMSys/library/src/controller/core/scheduling/checker/ActBChecker.cpp
+++ b/DRAMSys/library/src/controller/core/scheduling/checker/ActBChecker.cpp
@@ -36,10 +36,10 @@
 #include <algorithm>
 #include <set>
 #include "ActBChecker.h"
-#include "../../TimingCalculation.h"
+#include "../../timingCalculations.h"
 #include "../../../../common/DebugManager.h"
 #include "../../../Command.h"
-#include "../../../../common/Utils.h"
+#include "../../../../common/rename_utils.h"
 
 using namespace std;
 
diff --git a/DRAMSys/library/src/controller/core/scheduling/checker/ActBChecker.h b/DRAMSys/library/src/controller/core/scheduling/checker/ActBChecker.h
index 0c83d71d..f1a04859 100644
--- a/DRAMSys/library/src/controller/core/scheduling/checker/ActBChecker.h
+++ b/DRAMSys/library/src/controller/core/scheduling/checker/ActBChecker.h
@@ -31,8 +31,9 @@
  *
  * Author: Éder F. Zulian
  */
-#ifndef ACTB_CHECKER_H_
-#define ACTB_CHECKER_H_
+
+#ifndef ACTBCHECKER_H
+#define ACTBCHECKER_H
 
 #include <map>
 #include "ICommandChecker.h"
@@ -56,4 +57,4 @@ private:
     bool satisfies_nActivateWindow(ScheduledCommand &command) const;
 };
 
-#endif /* ACTB_CHECKER_H_ */
+#endif // ACTBCHECKER_H
diff --git a/DRAMSys/library/src/controller/core/scheduling/checker/ActivateChecker.cpp b/DRAMSys/library/src/controller/core/scheduling/checker/ActivateChecker.cpp
index 2e29c114..51a10ea7 100644
--- a/DRAMSys/library/src/controller/core/scheduling/checker/ActivateChecker.cpp
+++ b/DRAMSys/library/src/controller/core/scheduling/checker/ActivateChecker.cpp
@@ -38,10 +38,10 @@
 #include <algorithm>
 #include <set>
 #include "ActivateChecker.h"
-#include "../../TimingCalculation.h"
+#include "../../timingCalculations.h"
 #include "../../../../common/DebugManager.h"
 #include "../../../Command.h"
-#include "../../../../common/Utils.h"
+#include "../../../../common/rename_utils.h"
 
 using namespace std;
 
diff --git a/DRAMSys/library/src/controller/core/scheduling/checker/ActivateChecker.h b/DRAMSys/library/src/controller/core/scheduling/checker/ActivateChecker.h
index ed62f98d..1312505d 100644
--- a/DRAMSys/library/src/controller/core/scheduling/checker/ActivateChecker.h
+++ b/DRAMSys/library/src/controller/core/scheduling/checker/ActivateChecker.h
@@ -34,8 +34,8 @@
  *    Matthias Jung
  */
 
-#ifndef ACTIVATESCHEDULER_H_
-#define ACTIVATESCHEDULER_H_
+#ifndef ACTIVATECHECKER_H
+#define ACTIVATECHECKER_H
 
 #include <map>
 #include "ICommandChecker.h"
@@ -61,4 +61,4 @@ private:
     bool satisfies_nActivateWindow(ScheduledCommand &command) const;
 };
 
-#endif /* ACTIVATESCHEDULER_H_ */
+#endif // ACTIVATECHECKER_H
diff --git a/DRAMSys/library/src/controller/core/scheduling/checker/ICommandChecker.h b/DRAMSys/library/src/controller/core/scheduling/checker/ICommandChecker.h
index 833077cb..3f38f93b 100644
--- a/DRAMSys/library/src/controller/core/scheduling/checker/ICommandChecker.h
+++ b/DRAMSys/library/src/controller/core/scheduling/checker/ICommandChecker.h
@@ -34,8 +34,8 @@
  *    Matthias Jung
  */
 
-#ifndef ICOMMANDSCHEDULER_H_
-#define ICOMMANDSCHEDULER_H_
+#ifndef ICOMMANDCHECKER_H
+#define ICOMMANDCHECKER_H
 
 #include <systemc.h>
 #include "../ScheduledCommand.h"
@@ -50,4 +50,4 @@ public:
 
 
 
-#endif /* ICOMMANDSCHEDULER_H_ */
+#endif // ICOMMANDCHECKER_H
diff --git a/DRAMSys/library/src/controller/core/scheduling/checker/PowerDownChecker.cpp b/DRAMSys/library/src/controller/core/scheduling/checker/PowerDownChecker.cpp
index 6b92cd96..7a430ac6 100644
--- a/DRAMSys/library/src/controller/core/scheduling/checker/PowerDownChecker.cpp
+++ b/DRAMSys/library/src/controller/core/scheduling/checker/PowerDownChecker.cpp
@@ -36,7 +36,7 @@
  */
 
 #include "PowerDownChecker.h"
-#include "../../TimingCalculation.h"
+#include "../../timingCalculations.h"
 
 sc_time PowerDownChecker::getTimeConstraintToEnterPowerDown(Command lastCmd,
                                                             Command pdnCmd) const
diff --git a/DRAMSys/library/src/controller/core/scheduling/checker/PowerDownChecker.h b/DRAMSys/library/src/controller/core/scheduling/checker/PowerDownChecker.h
index df7a2a9a..a1b5f53d 100644
--- a/DRAMSys/library/src/controller/core/scheduling/checker/PowerDownChecker.h
+++ b/DRAMSys/library/src/controller/core/scheduling/checker/PowerDownChecker.h
@@ -34,8 +34,8 @@
  *    Matthias Jung
  */
 
-#ifndef POWERDOWNCHECKER_H_
-#define POWERDOWNCHECKER_H_
+#ifndef POWERDOWNCHECKER_H
+#define POWERDOWNCHECKER_H
 
 #include <systemc>
 
@@ -60,5 +60,5 @@ private:
                                               Command pdnCmd) const;
 };
 
-#endif /* POWERDOWNCHECKER_H_ */
+#endif // POWERDOWNCHECKER_H
 
diff --git a/DRAMSys/library/src/controller/core/scheduling/checker/PreBChecker.cpp b/DRAMSys/library/src/controller/core/scheduling/checker/PreBChecker.cpp
index 97c8a103..f559bf38 100644
--- a/DRAMSys/library/src/controller/core/scheduling/checker/PreBChecker.cpp
+++ b/DRAMSys/library/src/controller/core/scheduling/checker/PreBChecker.cpp
@@ -33,7 +33,7 @@
  */
 
 #include "PreBChecker.h"
-#include "../../TimingCalculation.h"
+#include "../../timingCalculations.h"
 void PreBChecker::delayToSatisfyConstraints(ScheduledCommand &cmd) const
 {
     sc_assert(cmd.getCommand() == Command::PreB);
diff --git a/DRAMSys/library/src/controller/core/scheduling/checker/PreBChecker.h b/DRAMSys/library/src/controller/core/scheduling/checker/PreBChecker.h
index f37241d9..980901a3 100644
--- a/DRAMSys/library/src/controller/core/scheduling/checker/PreBChecker.h
+++ b/DRAMSys/library/src/controller/core/scheduling/checker/PreBChecker.h
@@ -31,11 +31,14 @@
  *
  * Author: Éder F. Zulian
  */
-#ifndef PREB_CHECKER_H_
-#define PREB_CHECKER_H_
+
+#ifndef PREBCHECKER_H
+#define PREBCHECKER_H
+
 #include "ICommandChecker.h"
 #include "../../configuration/Configuration.h"
 #include "../../../ControllerState.h"
+
 class PreBChecker: public ICommandChecker
 {
 public:
@@ -48,4 +51,5 @@ private:
     const Configuration &config;
     ControllerState &state;
 };
-#endif /* PREB_CHECKER_H_ */
+
+#endif // PREBCHECKER_H
diff --git a/DRAMSys/library/src/controller/core/scheduling/checker/PrechargeAllChecker.cpp b/DRAMSys/library/src/controller/core/scheduling/checker/PrechargeAllChecker.cpp
index 31b5732e..f666408d 100644
--- a/DRAMSys/library/src/controller/core/scheduling/checker/PrechargeAllChecker.cpp
+++ b/DRAMSys/library/src/controller/core/scheduling/checker/PrechargeAllChecker.cpp
@@ -36,7 +36,7 @@
  */
 
 #include "PrechargeAllChecker.h"
-#include "../../TimingCalculation.h"
+#include "../../timingCalculations.h"
 
 
 void PrechargeAllChecker::delayToSatisfyConstraints(ScheduledCommand &command)
diff --git a/DRAMSys/library/src/controller/core/scheduling/checker/PrechargeAllChecker.h b/DRAMSys/library/src/controller/core/scheduling/checker/PrechargeAllChecker.h
index 62e8a0f2..41133b4b 100644
--- a/DRAMSys/library/src/controller/core/scheduling/checker/PrechargeAllChecker.h
+++ b/DRAMSys/library/src/controller/core/scheduling/checker/PrechargeAllChecker.h
@@ -34,14 +34,13 @@
  *    Matthias Jung
  */
 
-#ifndef PRECHARGEALLCHECKER_H_
-#define PRECHARGEALLCHECKER_H_
+#ifndef PRECHARGEALLCHECKER_H
+#define PRECHARGEALLCHECKER_H
 
 #include "ICommandChecker.h"
 #include "../../configuration/Configuration.h"
 #include "../../../ControllerState.h"
 
-
 class PrechargeAllChecker: public ICommandChecker
 {
 public:
@@ -62,4 +61,4 @@ private:
 };
 
 
-#endif /* PRECHARGEALLCHECKER_H_ */
+#endif // PRECHARGEALLCHECKER_H
diff --git a/DRAMSys/library/src/controller/core/scheduling/checker/PrechargeChecker.cpp b/DRAMSys/library/src/controller/core/scheduling/checker/PrechargeChecker.cpp
index c51fb2b1..6767be1f 100644
--- a/DRAMSys/library/src/controller/core/scheduling/checker/PrechargeChecker.cpp
+++ b/DRAMSys/library/src/controller/core/scheduling/checker/PrechargeChecker.cpp
@@ -35,7 +35,7 @@
  */
 
 #include "PrechargeChecker.h"
-#include "../../TimingCalculation.h"
+#include "../../timingCalculations.h"
 
 
 void PrechargeChecker::delayToSatisfyConstraints(ScheduledCommand &command)
diff --git a/DRAMSys/library/src/controller/core/scheduling/checker/PrechargeChecker.h b/DRAMSys/library/src/controller/core/scheduling/checker/PrechargeChecker.h
index 4977dd55..05b94dc1 100644
--- a/DRAMSys/library/src/controller/core/scheduling/checker/PrechargeChecker.h
+++ b/DRAMSys/library/src/controller/core/scheduling/checker/PrechargeChecker.h
@@ -34,14 +34,13 @@
  *    Matthias Jung
  */
 
-#ifndef PRECHARGECHECKER_H_
-#define PRECHARGECHECKER_H_
+#ifndef PRECHARGECHECKER_H
+#define PRECHARGECHECKER_H
 
 #include "ICommandChecker.h"
 #include "../../configuration/Configuration.h"
 #include "../../../ControllerState.h"
 
-
 class PrechargeChecker: public ICommandChecker
 {
 public:
@@ -57,4 +56,4 @@ private:
 };
 
 
-#endif /* PRECHARGECHECKER_H_ */
+#endif // PRECHARGECHECKER_
diff --git a/DRAMSys/library/src/controller/core/scheduling/checker/ReadChecker.cpp b/DRAMSys/library/src/controller/core/scheduling/checker/ReadChecker.cpp
index b5917e42..f8ea3319 100644
--- a/DRAMSys/library/src/controller/core/scheduling/checker/ReadChecker.cpp
+++ b/DRAMSys/library/src/controller/core/scheduling/checker/ReadChecker.cpp
@@ -35,8 +35,8 @@
  */
 
 #include "ReadChecker.h"
-#include "../../TimingCalculation.h"
-#include "../../../../common/Utils.h"
+#include "../../timingCalculations.h"
+#include "../../../../common/rename_utils.h"
 #include "WriteChecker.h"
 
 using namespace std;
diff --git a/DRAMSys/library/src/controller/core/scheduling/checker/ReadChecker.h b/DRAMSys/library/src/controller/core/scheduling/checker/ReadChecker.h
index 1fd31f2b..d9c9cce8 100644
--- a/DRAMSys/library/src/controller/core/scheduling/checker/ReadChecker.h
+++ b/DRAMSys/library/src/controller/core/scheduling/checker/ReadChecker.h
@@ -34,8 +34,8 @@
  *    Matthias Jung
  */
 
-#ifndef READCHECKER_H_
-#define READCHECKER_H_
+#ifndef READCHECKER_H
+#define READCHECKER_H
 
 #include "ICommandChecker.h"
 #include "../../configuration/Configuration.h"
@@ -65,5 +65,5 @@ private:
                                    ScheduledCommand &strobeCommand) const;
 };
 
-#endif /* READCHECKER_H_ */
+#endif // READCHECKER_H
 
diff --git a/DRAMSys/library/src/controller/core/scheduling/checker/RefreshChecker.cpp b/DRAMSys/library/src/controller/core/scheduling/checker/RefreshChecker.cpp
index f7d110f0..aad23f4a 100644
--- a/DRAMSys/library/src/controller/core/scheduling/checker/RefreshChecker.cpp
+++ b/DRAMSys/library/src/controller/core/scheduling/checker/RefreshChecker.cpp
@@ -36,7 +36,7 @@
  */
 
 #include "RefreshChecker.h"
-#include "../../TimingCalculation.h"
+#include "../../timingCalculations.h"
 
 void RefreshChecker::delayToSatisfyConstraints(ScheduledCommand &command) const
 {
diff --git a/DRAMSys/library/src/controller/core/scheduling/checker/RefreshChecker.h b/DRAMSys/library/src/controller/core/scheduling/checker/RefreshChecker.h
index 1dd8655d..919531da 100644
--- a/DRAMSys/library/src/controller/core/scheduling/checker/RefreshChecker.h
+++ b/DRAMSys/library/src/controller/core/scheduling/checker/RefreshChecker.h
@@ -34,15 +34,14 @@
  *    Matthias Jung
  */
 
-#ifndef REFRESHCHECKER_H_
-#define REFRESHCHECKER_H_
+#ifndef REFRESHCHECKER_H
+#define REFRESHCHECKER_H
 
 #include "ICommandChecker.h"
 #include "../../../ControllerState.h"
 #include "../../configuration/Configuration.h"
 #include <systemc>
 
-
 class RefreshChecker: public ICommandChecker
 {
 public:
@@ -64,4 +63,4 @@ private:
 };
 
 
-#endif /* REFRESHCHECKER_H_ */
+#endif // REFRESHCHECKER_H
diff --git a/DRAMSys/library/src/controller/core/scheduling/checker/WriteChecker.cpp b/DRAMSys/library/src/controller/core/scheduling/checker/WriteChecker.cpp
index 226d24aa..d793041b 100644
--- a/DRAMSys/library/src/controller/core/scheduling/checker/WriteChecker.cpp
+++ b/DRAMSys/library/src/controller/core/scheduling/checker/WriteChecker.cpp
@@ -35,8 +35,8 @@
  */
 
 #include "WriteChecker.h"
-#include "../../TimingCalculation.h"
-#include "../../../../common/Utils.h"
+#include "../../timingCalculations.h"
+#include "../../../../common/rename_utils.h"
 #include "ReadChecker.h"
 
 using namespace std;
diff --git a/DRAMSys/library/src/controller/core/scheduling/checker/WriteChecker.h b/DRAMSys/library/src/controller/core/scheduling/checker/WriteChecker.h
index 5b8c46f8..fa7eafba 100644
--- a/DRAMSys/library/src/controller/core/scheduling/checker/WriteChecker.h
+++ b/DRAMSys/library/src/controller/core/scheduling/checker/WriteChecker.h
@@ -34,14 +34,13 @@
  *    Matthias Jung
  */
 
-#ifndef WRITECHECKER_H_
-#define WRITECHECKER_H_
+#ifndef WRITECHECKER_H
+#define WRITECHECKER_H
 
 #include "ICommandChecker.h"
 #include "../../configuration/Configuration.h"
 #include "../../../ControllerState.h"
 
-
 class WriteChecker: public ICommandChecker
 {
 public:
@@ -64,4 +63,4 @@ private:
 };
 
 
-#endif /* WRITECHECKER_H_ */
+#endif // WRITECHECKER_H
diff --git a/DRAMSys/library/src/controller/core/TimingCalculation.cpp b/DRAMSys/library/src/controller/core/timingCalculations.cpp
similarity index 98%
rename from DRAMSys/library/src/controller/core/TimingCalculation.cpp
rename to DRAMSys/library/src/controller/core/timingCalculations.cpp
index 224fd7b1..6a94cbc0 100644
--- a/DRAMSys/library/src/controller/core/TimingCalculation.cpp
+++ b/DRAMSys/library/src/controller/core/timingCalculations.cpp
@@ -34,12 +34,12 @@
  *    Matthias Jung
  */
 
-#include "TimingCalculation.h"
+#include "timingCalculations.h"
 #include "configuration/MemSpec.h"
 #include "ControllerCore.h"
 #include "../../common/DebugManager.h"
 #include "configuration/Configuration.h"
-#include "../../common/Utils.h"
+#include "../../common/rename_utils.h"
 
 
 
diff --git a/DRAMSys/library/src/controller/core/TimingCalculation.h b/DRAMSys/library/src/controller/core/timingCalculations.h
similarity index 94%
rename from DRAMSys/library/src/controller/core/TimingCalculation.h
rename to DRAMSys/library/src/controller/core/timingCalculations.h
index 03fa1918..7a938f8b 100644
--- a/DRAMSys/library/src/controller/core/TimingCalculation.h
+++ b/DRAMSys/library/src/controller/core/timingCalculations.h
@@ -34,12 +34,12 @@
  *    Matthias Jung
  */
 
-#ifndef UTILS_H_
-#define UTILS_H_
+#ifndef TIMINGCALCULATIONS_H
+#define TIMINGCALCULATIONS_H
 
 #include <systemc.h>
 #include <tlm.h>
-#include "../../common/dramExtension.h"
+#include "../../common/dramExtensions.h"
 #include "../Command.h"
 
 
@@ -56,4 +56,4 @@ const sc_time clkAlign(sc_time time, Alignment alignment = UP);
 bool isClkAligned(sc_time time, sc_time clk);
 const sc_time FrequencyToClk(double frequencyMhz);
 
-#endif /* UTILS_H_ */
+#endif // TIMINGCALCULATIONS_H
diff --git a/DRAMSys/library/src/controller/scheduler/Fifo.h b/DRAMSys/library/src/controller/scheduler/Fifo.h
index 14a9f34c..83f14124 100644
--- a/DRAMSys/library/src/controller/scheduler/Fifo.h
+++ b/DRAMSys/library/src/controller/scheduler/Fifo.h
@@ -34,8 +34,8 @@
  *    Matthias Jung
  */
 
-#ifndef FIFO_H_
-#define FIFO_H_
+#ifndef FIFO_H
+#define FIFO_H
 
 #include <deque>
 #include <map>
@@ -60,4 +60,4 @@ private:
     std::map<Bank, std::deque<gp *>> buffer;
 };
 
-#endif /* FIFO_H_ */
+#endif // FIFO_H
diff --git a/DRAMSys/library/src/controller/scheduler/FifoStrict.h b/DRAMSys/library/src/controller/scheduler/FifoStrict.h
index 4adf3990..2cf8c3dd 100644
--- a/DRAMSys/library/src/controller/scheduler/FifoStrict.h
+++ b/DRAMSys/library/src/controller/scheduler/FifoStrict.h
@@ -65,5 +65,5 @@ private:
     std::deque<std::pair<Bank, tlm::tlm_generic_payload *>> buffer;
 };
 
-#endif /* FIFOSTRICT_H */
+#endif // FIFOSTRICT_H
 
diff --git a/DRAMSys/library/src/controller/scheduler/FrFcfs.cpp b/DRAMSys/library/src/controller/scheduler/FrFcfs.cpp
index c51b9192..6aefbe29 100644
--- a/DRAMSys/library/src/controller/scheduler/FrFcfs.cpp
+++ b/DRAMSys/library/src/controller/scheduler/FrFcfs.cpp
@@ -36,7 +36,7 @@
  */
 
 #include "FrFcfs.h"
-#include "../../common/dramExtension.h"
+#include "../../common/dramExtensions.h"
 #include "../core/configuration/Configuration.h"
 #include <algorithm>
 
diff --git a/DRAMSys/library/src/controller/scheduler/FrFcfs.h b/DRAMSys/library/src/controller/scheduler/FrFcfs.h
index ea8d250e..92fd34f3 100644
--- a/DRAMSys/library/src/controller/scheduler/FrFcfs.h
+++ b/DRAMSys/library/src/controller/scheduler/FrFcfs.h
@@ -35,8 +35,8 @@
  *    Matthias Jung
  */
 
-#ifndef FRFCFS_H_
-#define  FRFCFS_H_
+#ifndef FRFCFS_H
+#define FRFCFS_H
 
 #include "IScheduler.h"
 #include "../core/ControllerCore.h"
@@ -63,4 +63,4 @@ private:
 
 };
 
-#endif // FRFCFS_H_
+#endif // FRFCFS_H
diff --git a/DRAMSys/library/src/controller/scheduler/IScheduler.h b/DRAMSys/library/src/controller/scheduler/IScheduler.h
index 0b0cf0f5..80b6debd 100644
--- a/DRAMSys/library/src/controller/scheduler/IScheduler.h
+++ b/DRAMSys/library/src/controller/scheduler/IScheduler.h
@@ -40,7 +40,7 @@
 
 
 #include <tlm.h>
-#include "../../common/dramExtension.h"
+#include "../../common/dramExtensions.h"
 #include "../Command.h"
 #include "../core/ControllerCore.h"
 
diff --git a/DRAMSys/library/src/controller/scheduler/SMS.h b/DRAMSys/library/src/controller/scheduler/SMS.h
index d60c033a..4019836b 100644
--- a/DRAMSys/library/src/controller/scheduler/SMS.h
+++ b/DRAMSys/library/src/controller/scheduler/SMS.h
@@ -7,7 +7,7 @@
 #include "IScheduler.h"
 #include "../core/ControllerCore.h"
 #include "../core/configuration/Configuration.h"
-#include "../../common/dramExtension.h"
+#include "../../common/dramExtensions.h"
 #include "../../common/DebugManager.h"
 
 #define LOW_SYSTEM_LOAD 16
diff --git a/DRAMSys/library/src/simulation/Arbiter.h b/DRAMSys/library/src/simulation/Arbiter.h
index 86d1d1c9..672862c8 100644
--- a/DRAMSys/library/src/simulation/Arbiter.h
+++ b/DRAMSys/library/src/simulation/Arbiter.h
@@ -35,8 +35,8 @@
  *    Eder F. Zulian
  */
 
-#ifndef ARBITER_H_
-#define ARBITER_H_
+#ifndef ARBITER_H
+#define ARBITER_H
 
 #include <tlm.h>
 #include <systemc.h>
@@ -47,8 +47,8 @@
 #include <tlm_utils/multi_passthrough_initiator_socket.h>
 #include <tlm_utils/peq_with_cb_and_phase.h>
 #include "../common/XmlAddressDecoder.h"
-#include "../common/dramExtension.h"
-#include "../controller/core/TimingCalculation.h"
+#include "../common/dramExtensions.h"
+#include "../controller/core/timingCalculations.h"
 #include "../controller/core/configuration/ConfigurationLoader.h"
 
 using namespace std;
@@ -102,4 +102,4 @@ private:
     void printDebugMessage(std::string message);
 };
 
-#endif /* ARBITER_H_ */
+#endif // ARBITER_H
diff --git a/DRAMSys/library/src/simulation/DRAMSys.cpp b/DRAMSys/library/src/simulation/DRAMSys.cpp
index 1e3e5d1b..a01a1cc8 100644
--- a/DRAMSys/library/src/simulation/DRAMSys.cpp
+++ b/DRAMSys/library/src/simulation/DRAMSys.cpp
@@ -50,7 +50,7 @@
 #include "../common/CongenAddressDecoder.h"
 #include "../controller/core/ControllerCore.h"
 #include "../controller/core/configuration/ConfigurationLoader.h"
-#include "../common/Utils.h"
+#include "../common/rename_utils.h"
 #include "../simulation/TemperatureController.h"
 #include "../controller/Controller.h"
 #include "../error/ecchamming.h"
diff --git a/DRAMSys/library/src/simulation/DRAMSys.h b/DRAMSys/library/src/simulation/DRAMSys.h
index 774e60d3..a2fead62 100644
--- a/DRAMSys/library/src/simulation/DRAMSys.h
+++ b/DRAMSys/library/src/simulation/DRAMSys.h
@@ -36,8 +36,8 @@
  *    Felipe S. Prado
  */
 
-#ifndef DRAMSYS_H_
-#define DRAMSYS_H_
+#ifndef DRAMSYS_H
+#define DRAMSYS_H
 
 #include <string>
 #include <systemc.h>
@@ -108,4 +108,4 @@ private:
     void setupDebugManager(const string &traceName);
 };
 
-#endif /* SIMULATIONMANAGER_H_ */
+#endif // DRAMSYS_H
diff --git a/DRAMSys/library/src/simulation/Dram.cpp b/DRAMSys/library/src/simulation/Dram.cpp
index 68b3acb0..0c7388d1 100644
--- a/DRAMSys/library/src/simulation/Dram.cpp
+++ b/DRAMSys/library/src/simulation/Dram.cpp
@@ -49,12 +49,12 @@
 #include <cstdint>
 #include <stdlib.h>
 #include "../common/DebugManager.h"
-#include "../common/dramExtension.h"
+#include "../common/dramExtensions.h"
 #include "../controller/Controller.h"
-#include "../controller/core/TimingCalculation.h"
+#include "../controller/core/timingCalculations.h"
 #include "../controller/core/configuration/Configuration.h"
 #include "../common/protocol.h"
-#include "../common/Utils.h"
+#include "../common/rename_utils.h"
 #include "../common/third_party/DRAMPower/src/libdrampower/LibDRAMPower.h"
 #include "../error/errormodel.h"
 
diff --git a/DRAMSys/library/src/simulation/Dram.h b/DRAMSys/library/src/simulation/Dram.h
index 20817be9..6712070d 100644
--- a/DRAMSys/library/src/simulation/Dram.h
+++ b/DRAMSys/library/src/simulation/Dram.h
@@ -37,8 +37,8 @@
  *    Felipe S. Prado
  */
 
-#ifndef DRAM_H_
-#define DRAM_H_
+#ifndef DRAM_H
+#define DRAM_H
 
 #include <tlm>
 #include <systemc>
@@ -97,5 +97,5 @@ public:
     void setDramController(Controller *contr);
 };
 
-#endif /* DRAM_H_ */
+#endif // DRAM_H
 
diff --git a/DRAMSys/library/src/simulation/ExampleInitiator.h b/DRAMSys/library/src/simulation/ExampleInitiator.h
index f8b60b9e..6440d5a7 100644
--- a/DRAMSys/library/src/simulation/ExampleInitiator.h
+++ b/DRAMSys/library/src/simulation/ExampleInitiator.h
@@ -1,11 +1,11 @@
-#ifndef EXAMPLEINITIATOR
-#define EXAMPLEINITIATOR
+#ifndef EXAMPLEINITIATOR_H
+#define EXAMPLEINITIATOR_H
 
 #include <stdlib.h>
 #include <iostream>
 
 #include "MemoryManager.h"
-#include "../common/dramExtension.h"
+#include "../common/dramExtensions.h"
 #include "TracePlayer.h"
 
 using namespace std;
@@ -202,4 +202,4 @@ struct ExampleInitiator: sc_module {
     tlm_utils::peq_with_cb_and_phase<ExampleInitiator> m_peq;
 };
 
-#endif // EXAMPLEINITIATOR
+#endif // EXAMPLEINITIATOR_H
diff --git a/DRAMSys/library/src/simulation/IArbiter.h b/DRAMSys/library/src/simulation/IArbiter.h
index 88c1231b..5dc93a6a 100644
--- a/DRAMSys/library/src/simulation/IArbiter.h
+++ b/DRAMSys/library/src/simulation/IArbiter.h
@@ -34,8 +34,8 @@
  *    Matthias Jung
  */
 
-#ifndef IARBITER_H_
-#define IARBITER_H_
+#ifndef IARBITER_H
+#define IARBITER_H
 
 #include <tlm.h>
 #include <systemc.h>
@@ -139,4 +139,4 @@ protected:
     }
 };
 
-#endif /* IARBITER_H_ */
+#endif // IARBITER_H
diff --git a/DRAMSys/library/src/simulation/MemoryManager.h b/DRAMSys/library/src/simulation/MemoryManager.h
index 8b431ca5..83baa275 100644
--- a/DRAMSys/library/src/simulation/MemoryManager.h
+++ b/DRAMSys/library/src/simulation/MemoryManager.h
@@ -34,8 +34,8 @@
  *    Matthias Jung
  */
 
-#ifndef MEMORYMANAGER_H_
-#define MEMORYMANAGER_H_
+#ifndef MEMORYMANAGER_H
+#define MEMORYMANAGER_H
 
 #include <tlm.h>
 #include <vector>
@@ -55,4 +55,4 @@ private:
     std::vector<gp *> freePayloads;
 };
 
-#endif /* MEMORYMANAGER_H_ */
+#endif // MEMORYMANAGER_H
diff --git a/DRAMSys/library/src/simulation/RecordableDram.h b/DRAMSys/library/src/simulation/RecordableDram.h
index 669eb3cc..191fc868 100644
--- a/DRAMSys/library/src/simulation/RecordableDram.h
+++ b/DRAMSys/library/src/simulation/RecordableDram.h
@@ -34,8 +34,8 @@
  *    Matthias Jung
  */
 
-#ifndef RECORDABLEDRAM_H_
-#define RECORDABLEDRAM_H_
+#ifndef RECORDABLEDRAM_H
+#define RECORDABLEDRAM_H
 
 #include "Dram.h"
 #include "../common/TlmRecorder.h"
@@ -74,5 +74,5 @@ private:
     void recordPower();
 };
 
-#endif /* RECORDABLEDRAM_H_ */
+#endif // RECORDABLEDRAM_H
 
diff --git a/DRAMSys/library/src/simulation/Setup.h b/DRAMSys/library/src/simulation/Setup.h
index a8398686..8b8542ce 100644
--- a/DRAMSys/library/src/simulation/Setup.h
+++ b/DRAMSys/library/src/simulation/Setup.h
@@ -39,7 +39,7 @@
 #include <vector>
 #include <string>
 
-#include "../common/Utils.h"
+#include "../common/rename_utils.h"
 #include "TracePlayer.h"
 #include "StlPlayer.h"
 
diff --git a/DRAMSys/library/src/simulation/SimpleArbiter.h b/DRAMSys/library/src/simulation/SimpleArbiter.h
index bc2f7b9e..5434576b 100644
--- a/DRAMSys/library/src/simulation/SimpleArbiter.h
+++ b/DRAMSys/library/src/simulation/SimpleArbiter.h
@@ -39,8 +39,8 @@
 
 #include "IArbiter.h"
 #include "../common/XmlAddressDecoder.h"
-#include "../common/dramExtension.h"
-#include "../controller/core/TimingCalculation.h"
+#include "../common/dramExtensions.h"
+#include "../controller/core/timingCalculations.h"
 
 using namespace std;
 using namespace tlm;
diff --git a/DRAMSys/library/src/simulation/TemperatureController.h b/DRAMSys/library/src/simulation/TemperatureController.h
index d26dc2d7..3f510d97 100644
--- a/DRAMSys/library/src/simulation/TemperatureController.h
+++ b/DRAMSys/library/src/simulation/TemperatureController.h
@@ -34,8 +34,8 @@
  *    Matthias Jung
  */
 
-#ifndef TEMPERATURE_CONTROLLER_H_
-#define TEMPERATURE_CONTROLLER_H_
+#ifndef TEMPERATURECONTROLLER_H
+#define TEMPERATURECONTROLLER_H
 
 #include <systemc.h>
 #include <iostream>
@@ -43,7 +43,7 @@
 #include <fstream>
 
 #include "../common/DebugManager.h"
-#include "../common/Utils.h"
+#include "../common/rename_utils.h"
 #include "../controller/core/configuration/Configuration.h"
 
 #ifdef THERMALSIM
@@ -152,5 +152,5 @@ private:
     void printDebugMessage(std::string message);
 };
 
-#endif /* TEMPERATURE_CONTROLLER_H_ */
+#endif // TEMPERATURECONTROLLER_H
 
diff --git a/DRAMSys/library/src/simulation/TraceGenerator.h b/DRAMSys/library/src/simulation/TraceGenerator.h
index 04d9cc49..3019b6f5 100644
--- a/DRAMSys/library/src/simulation/TraceGenerator.h
+++ b/DRAMSys/library/src/simulation/TraceGenerator.h
@@ -86,5 +86,5 @@ private:
     unsigned int transCounter;
 };
 
-#endif
+#endif // TRACEGENERATOR_H
 
diff --git a/DRAMSys/library/src/simulation/TracePlayer.h b/DRAMSys/library/src/simulation/TracePlayer.h
index 5adbd09e..5a34df28 100644
--- a/DRAMSys/library/src/simulation/TracePlayer.h
+++ b/DRAMSys/library/src/simulation/TracePlayer.h
@@ -36,8 +36,8 @@
  *    Felipe S. Prado
  */
 
-#ifndef TRACEPLAYER_H_
-#define TRACEPLAYER_H_
+#ifndef TRACEPLAYER_H
+#define TRACEPLAYER_H
 
 #include <deque>
 #include <tlm.h>
@@ -50,7 +50,7 @@
 #include "../controller/core/configuration/Configuration.h"
 #include "../common/DebugManager.h"
 #include "../common/XmlAddressDecoder.h"
-#include "../controller/core/TimingCalculation.h"
+#include "../controller/core/timingCalculations.h"
 #include "TracePlayerListener.h"
 
 using namespace std;
@@ -85,4 +85,4 @@ private:
     bool finished;
 };
 
-#endif /* TRACEPLAYER_H_ */
+#endif // TRACEPLAYER_H
diff --git a/DRAMSys/library/src/simulation/TraceSetup.h b/DRAMSys/library/src/simulation/TraceSetup.h
index 901b6756..c4c39279 100644
--- a/DRAMSys/library/src/simulation/TraceSetup.h
+++ b/DRAMSys/library/src/simulation/TraceSetup.h
@@ -39,7 +39,7 @@
 #include <vector>
 #include <string>
 
-#include "../common/Utils.h"
+#include "../common/rename_utils.h"
 #include "TracePlayer.h"
 #include "StlPlayer.h"