diff --git a/DRAMSys/tests/DDR3/configs/mcconfigs/fifoStrict.xml b/DRAMSys/tests/DDR3/configs/mcconfigs/fifoStrict.xml
index dee4f5d4..ed869b57 100644
--- a/DRAMSys/tests/DDR3/configs/mcconfigs/fifoStrict.xml
+++ b/DRAMSys/tests/DDR3/configs/mcconfigs/fifoStrict.xml
@@ -1,7 +1,7 @@
 <mcconfig>
     <OpenPagePolicy value="1" />
     <MaxNrOfTransactions value="8" />
-    <Scheduler value="FIFO_STRICT" />
+    <Scheduler value="FifoStrict" />
     <Capsize value="5" />
     <!-- 4 Modes: NoPowerDown, Staggered, TimeoutPDN, TimeoutSREF -->
     <PowerDownMode value="NoPowerDown" />
diff --git a/DRAMSys/tests/DDR3/configs/mcconfigs/fr_fcfs.xml b/DRAMSys/tests/DDR3/configs/mcconfigs/fr_fcfs.xml
index e5a6579e..20db08cd 100644
--- a/DRAMSys/tests/DDR3/configs/mcconfigs/fr_fcfs.xml
+++ b/DRAMSys/tests/DDR3/configs/mcconfigs/fr_fcfs.xml
@@ -1,7 +1,7 @@
 <mcconfig>
     <OpenPagePolicy value="1" />
     <MaxNrOfTransactions value="8" />
-    <Scheduler value="FR_FCFS" />
+    <Scheduler value="FrFcfs" />
     <Capsize value="5" />
     <!-- 4 Modes: NoPowerDown, Staggered, TimeoutPDN, TimeoutSREF -->
     <PowerDownMode value="NoPowerDown" />
diff --git a/DRAMSys/tests/TLM_compliance/fifoStrict.xml b/DRAMSys/tests/TLM_compliance/fifoStrict.xml
index d5814755..440f465a 100644
--- a/DRAMSys/tests/TLM_compliance/fifoStrict.xml
+++ b/DRAMSys/tests/TLM_compliance/fifoStrict.xml
@@ -2,7 +2,7 @@
     <BankwiseLogic value="0"/>
     <OpenPagePolicy value="1" />
     <MaxNrOfTransactions value="8" />
-    <Scheduler value="FIFO_STRICT" />
+    <Scheduler value="FifoStrict" />
     <Capsize value="5" />
     <PowerDownMode value="NoPowerDown" />
     <PowerDownTimeout value="100" />
diff --git a/DRAMSys/tests/WIDEIO/configs/mcconfigs/fifoStrict.xml b/DRAMSys/tests/WIDEIO/configs/mcconfigs/fifoStrict.xml
index dee4f5d4..ed869b57 100644
--- a/DRAMSys/tests/WIDEIO/configs/mcconfigs/fifoStrict.xml
+++ b/DRAMSys/tests/WIDEIO/configs/mcconfigs/fifoStrict.xml
@@ -1,7 +1,7 @@
 <mcconfig>
     <OpenPagePolicy value="1" />
     <MaxNrOfTransactions value="8" />
-    <Scheduler value="FIFO_STRICT" />
+    <Scheduler value="FifoStrict" />
     <Capsize value="5" />
     <!-- 4 Modes: NoPowerDown, Staggered, TimeoutPDN, TimeoutSREF -->
     <PowerDownMode value="NoPowerDown" />
diff --git a/DRAMSys/tests/error/fr_fcfs.xml b/DRAMSys/tests/error/fr_fcfs.xml
index c2861799..9066796c 100644
--- a/DRAMSys/tests/error/fr_fcfs.xml
+++ b/DRAMSys/tests/error/fr_fcfs.xml
@@ -2,7 +2,7 @@
     <BankwiseLogic value="0"/>
     <OpenPagePolicy value="1" />
     <MaxNrOfTransactions value="8" />
-    <Scheduler value="FR_FCFS" />
+    <Scheduler value="FrFcfs" />
     <Capsize value="5" />
     <PowerDownMode value="NoPowerDown" />
     <PowerDownTimeout value="100" />
diff --git a/DRAMSys/tests/simple/fifoStrict.xml b/DRAMSys/tests/simple/fifoStrict.xml
index 43744c7d..247c4de3 100644
--- a/DRAMSys/tests/simple/fifoStrict.xml
+++ b/DRAMSys/tests/simple/fifoStrict.xml
@@ -2,7 +2,7 @@
     <BankwiseLogic value="0"/>
     <OpenPagePolicy value="1" />
     <MaxNrOfTransactions value="8" />
-    <Scheduler value="FIFO_STRICT" />
+    <Scheduler value="FifoStrict" />
     <Capsize value="5" />
     <PowerDownMode value="NoPowerDown" />
     <PowerDownTimeout value="100" />
diff --git a/DRAMSys/tests/timing_compliance/fifoStrict.xml b/DRAMSys/tests/timing_compliance/fifoStrict.xml
index 2c84267e..fc213074 100644
--- a/DRAMSys/tests/timing_compliance/fifoStrict.xml
+++ b/DRAMSys/tests/timing_compliance/fifoStrict.xml
@@ -2,7 +2,7 @@
     <BankwiseLogic value="1"/>
     <OpenPagePolicy value="1" />
     <MaxNrOfTransactions value="8" />
-    <Scheduler value="FIFO_STRICT" />
+    <Scheduler value="FifoStrict" />
     <Capsize value="5" />
     <PowerDownMode value="TimeoutSREF" />
     <PowerDownTimeout value="100" />