diff --git a/DRAMSys/simulator/src/controller/Controller.h b/DRAMSys/simulator/src/controller/Controller.h
index 7fc07d8a..577e3964 100644
--- a/DRAMSys/simulator/src/controller/Controller.h
+++ b/DRAMSys/simulator/src/controller/Controller.h
@@ -102,8 +102,8 @@ public:
     virtual void send(const ScheduledCommand& command, tlm_generic_payload& payload) override;
     virtual void send(Trigger trigger, sc_time time, tlm_generic_payload& payload) override;
 
-    tlm_utils::simple_initiator_socket<Controller, BUSWIDTH, tlm::tlm_base_protocol_types> iSocket;
-    tlm_utils::simple_target_socket<Controller, BUSWIDTH, tlm::tlm_base_protocol_types> tSocket;
+    tlm_utils::simple_initiator_socket<Controller> iSocket;
+    tlm_utils::simple_target_socket<Controller> tSocket;
     unsigned int getTotalNumberOfPayloadsInSystem();
 
 private:
diff --git a/DRAMSys/simulator/src/simulation/Arbiter.h b/DRAMSys/simulator/src/simulation/Arbiter.h
index 5e190451..86016cc9 100644
--- a/DRAMSys/simulator/src/simulation/Arbiter.h
+++ b/DRAMSys/simulator/src/simulation/Arbiter.h
@@ -57,8 +57,8 @@ using namespace tlm;
 template<unsigned int BUSWIDTH = 128>
 struct Arbiter: public sc_module {
 public:
-    tlm_utils::multi_passthrough_initiator_socket<Arbiter, BUSWIDTH> iSocket;
-    tlm_utils::multi_passthrough_target_socket<Arbiter, BUSWIDTH> tSocket;
+    tlm_utils::multi_passthrough_initiator_socket<Arbiter> iSocket;
+    tlm_utils::multi_passthrough_target_socket<Arbiter> tSocket;
 
     SC_CTOR(Arbiter) : payloadEventQueue(this, &Arbiter::peqCallback) {
         // The arbiter communicates with one or more memory unity through one or more sockets (one or more memory channels).
diff --git a/DRAMSys/simulator/src/simulation/Dram.h b/DRAMSys/simulator/src/simulation/Dram.h
index 0d7f95a6..7258e090 100644
--- a/DRAMSys/simulator/src/simulation/Dram.h
+++ b/DRAMSys/simulator/src/simulation/Dram.h
@@ -65,7 +65,7 @@ template<unsigned int BUSWIDTH = 128>
 struct Dram : sc_module
 {
     // TLM Related:
-    tlm_utils::simple_target_socket<Dram, BUSWIDTH, tlm::tlm_base_protocol_types> tSocket;
+    tlm_utils::simple_target_socket<Dram> tSocket;
 
     // Power Model related
     bool powerAnalysis = Configuration::getInstance().PowerAnalysis;
diff --git a/DRAMSys/simulator/src/simulation/ReorderBuffer.h b/DRAMSys/simulator/src/simulation/ReorderBuffer.h
index 744a4517..7f20577d 100644
--- a/DRAMSys/simulator/src/simulation/ReorderBuffer.h
+++ b/DRAMSys/simulator/src/simulation/ReorderBuffer.h
@@ -49,8 +49,8 @@ template<unsigned int BUSWIDTH = 128>
 struct ReorderBuffer: public sc_module
 {
 public:
-    tlm_utils::simple_initiator_socket<ReorderBuffer,BUSWIDTH, tlm::tlm_base_protocol_types> iSocket;
-    tlm_utils::simple_target_socket<ReorderBuffer, BUSWIDTH, tlm::tlm_base_protocol_types> tSocket;
+    tlm_utils::simple_initiator_socket<ReorderBuffer> iSocket;
+    tlm_utils::simple_target_socket<ReorderBuffer> tSocket;
 
     SC_CTOR(ReorderBuffer) :
             payloadEventQueue(this, &ReorderBuffer::peqCallback), responseIsPendingInInitator(false)
diff --git a/DRAMSys/simulator/src/simulation/TracePlayer.h b/DRAMSys/simulator/src/simulation/TracePlayer.h
index 070b8127..515373a2 100644
--- a/DRAMSys/simulator/src/simulation/TracePlayer.h
+++ b/DRAMSys/simulator/src/simulation/TracePlayer.h
@@ -59,7 +59,7 @@ template<unsigned int BUSWIDTH = 128>
 struct TracePlayer: public sc_module
 {
 public:
-    tlm_utils::simple_initiator_socket<TracePlayer, BUSWIDTH, tlm::tlm_base_protocol_types> iSocket;
+    tlm_utils::simple_initiator_socket<TracePlayer> iSocket;
     TracePlayer(TracePlayerListener* listener);
     virtual void nextPayload() = 0;