diff --git a/src/DRAMPower/DRAMPower/memspec/MemSpec.h b/src/DRAMPower/DRAMPower/memspec/MemSpec.h
index 6b4adc0d..009f6c15 100644
--- a/src/DRAMPower/DRAMPower/memspec/MemSpec.h
+++ b/src/DRAMPower/DRAMPower/memspec/MemSpec.h
@@ -54,7 +54,7 @@ namespace DRAMPower {
 
 struct MemSpecContainer
 {
-    DRAMUtils::Config::MemSpecVariant memspec;
+    DRAMUtils::MemSpec::MemSpecVariant memspec;
 };
 NLOHMANN_JSONIFY_ALL_THINGS(MemSpecContainer, memspec)
 
diff --git a/src/DRAMPower/DRAMPower/memspec/MemSpecDDR4.cpp b/src/DRAMPower/DRAMPower/memspec/MemSpecDDR4.cpp
index 5f5ed574..0165bd7f 100644
--- a/src/DRAMPower/DRAMPower/memspec/MemSpecDDR4.cpp
+++ b/src/DRAMPower/DRAMPower/memspec/MemSpecDDR4.cpp
@@ -40,7 +40,7 @@ using namespace DRAMPower;
 using json = nlohmann::json;
     
 
-MemSpecDDR4::MemSpecDDR4(const DRAMUtils::Config::MemSpecDDR4 &memspec)
+MemSpecDDR4::MemSpecDDR4(const DRAMUtils::MemSpec::MemSpecDDR4 &memspec)
     : MemSpec(memspec)
 {
 
@@ -120,7 +120,7 @@ MemSpecDDR4::MemSpecDDR4(const DRAMUtils::Config::MemSpecDDR4 &memspec)
     parsePrePostamble(memspec);
 }
 
-void MemSpecDDR4::parseImpedanceSpec(const DRAMUtils::Config::MemSpecDDR4 &memspec) {
+void MemSpecDDR4::parseImpedanceSpec(const DRAMUtils::MemSpec::MemSpecDDR4 &memspec) {
     memImpedanceSpec.C_total_cb = memspec.memimpedancespec.C_total_cb;
     memImpedanceSpec.C_total_ck = memspec.memimpedancespec.C_total_ck;
     memImpedanceSpec.C_total_dqs = memspec.memimpedancespec.C_total_dqs;
@@ -134,7 +134,7 @@ void MemSpecDDR4::parseImpedanceSpec(const DRAMUtils::Config::MemSpecDDR4 &memsp
     memImpedanceSpec.R_eq_wb = memspec.memimpedancespec.R_eq_wb;
 }
 
-void MemSpecDDR4::parsePrePostamble(const DRAMUtils::Config::MemSpecDDR4 &memspec)
+void MemSpecDDR4::parsePrePostamble(const DRAMUtils::MemSpec::MemSpecDDR4 &memspec)
 {
     prePostamble.read_zeroes = memspec.prepostamble.read_zeroes;
     prePostamble.write_zeroes = memspec.prepostamble.write_zeroes;
diff --git a/src/DRAMPower/DRAMPower/memspec/MemSpecDDR4.h b/src/DRAMPower/DRAMPower/memspec/MemSpecDDR4.h
index 3922339c..d8c1fe67 100644
--- a/src/DRAMPower/DRAMPower/memspec/MemSpecDDR4.h
+++ b/src/DRAMPower/DRAMPower/memspec/MemSpecDDR4.h
@@ -45,7 +45,7 @@
 using json = nlohmann::json;
 namespace DRAMPower {
 
-class MemSpecDDR4 final : public MemSpec<DRAMUtils::Config::MemSpecDDR4>
+class MemSpecDDR4 final : public MemSpec<DRAMUtils::MemSpec::MemSpecDDR4>
 {
 public:
 
@@ -57,7 +57,7 @@ class MemSpecDDR4 final : public MemSpec<DRAMUtils::Config::MemSpecDDR4>
 public:
     MemSpecDDR4() = delete;
     
-	MemSpecDDR4(const DRAMUtils::Config::MemSpecDDR4 &memspec);
+	MemSpecDDR4(const DRAMUtils::MemSpec::MemSpecDDR4 &memspec);
 
 	MemSpecDDR4(json &data) = delete;
 	MemSpecDDR4(const json &data) = delete;
@@ -156,8 +156,8 @@ class MemSpecDDR4 final : public MemSpec<DRAMUtils::Config::MemSpecDDR4>
 	PrePostamble prePostamble;
 	BankWiseParams bwParams;
 private:
-	void parseImpedanceSpec(const DRAMUtils::Config::MemSpecDDR4 &memspec);
-	void parsePrePostamble(const DRAMUtils::Config::MemSpecDDR4 &memspec);
+	void parseImpedanceSpec(const DRAMUtils::MemSpec::MemSpecDDR4 &memspec);
+	void parsePrePostamble(const DRAMUtils::MemSpec::MemSpecDDR4 &memspec);
 };
 
 }
diff --git a/src/DRAMPower/DRAMPower/memspec/MemSpecDDR5.cpp b/src/DRAMPower/DRAMPower/memspec/MemSpecDDR5.cpp
index bf74e591..8eb7878d 100644
--- a/src/DRAMPower/DRAMPower/memspec/MemSpecDDR5.cpp
+++ b/src/DRAMPower/DRAMPower/memspec/MemSpecDDR5.cpp
@@ -3,7 +3,7 @@ using namespace DRAMPower;
 using json = nlohmann::json;
 
 
-MemSpecDDR5::MemSpecDDR5(const DRAMUtils::Config::MemSpecDDR5 &memspec)
+MemSpecDDR5::MemSpecDDR5(const DRAMUtils::MemSpec::MemSpecDDR5 &memspec)
         : MemSpec(memspec)
 {
     numberOfBankGroups      = memspec.memarchitecturespec.nbrOfBankGroups;
@@ -99,7 +99,7 @@ uint64_t MemSpecDDR5::timeToCompletion(DRAMPower::CmdType type)
     return offset;
 }
 
-void MemSpecDDR5::parseImpedanceSpec(const DRAMUtils::Config::MemSpecDDR5 &memspec) {
+void MemSpecDDR5::parseImpedanceSpec(const DRAMUtils::MemSpec::MemSpecDDR5 &memspec) {
     memImpedanceSpec.C_total_cb = memspec.memimpedancespec.C_total_cb;
     memImpedanceSpec.C_total_ck = memspec.memimpedancespec.C_total_ck;
     memImpedanceSpec.C_total_dqs = memspec.memimpedancespec.C_total_dqs;
@@ -113,7 +113,7 @@ void MemSpecDDR5::parseImpedanceSpec(const DRAMUtils::Config::MemSpecDDR5 &memsp
     memImpedanceSpec.R_eq_wb = memspec.memimpedancespec.R_eq_wb;
 }
 
-void MemSpecDDR5::parseDataRateSpec(const DRAMUtils::Config::MemSpecDDR5 &memspec) {
+void MemSpecDDR5::parseDataRateSpec(const DRAMUtils::MemSpec::MemSpecDDR5 &memspec) {
     if (!memspec.dataratespec.has_value()) {
         dataRateSpec = {2, 2, 2};
         return;
diff --git a/src/DRAMPower/DRAMPower/memspec/MemSpecDDR5.h b/src/DRAMPower/DRAMPower/memspec/MemSpecDDR5.h
index 4e4b1e8d..591e56bb 100644
--- a/src/DRAMPower/DRAMPower/memspec/MemSpecDDR5.h
+++ b/src/DRAMPower/DRAMPower/memspec/MemSpecDDR5.h
@@ -7,7 +7,7 @@
 
 namespace DRAMPower {
 
-    class MemSpecDDR5 final : public MemSpec<DRAMUtils::Config::MemSpecDDR5> {
+    class MemSpecDDR5 final : public MemSpec<DRAMUtils::MemSpec::MemSpecDDR5> {
     public:
 
         enum VoltageDomain {
@@ -18,7 +18,7 @@ namespace DRAMPower {
     public:
         MemSpecDDR5() = delete;
 
-        MemSpecDDR5(const DRAMUtils::Config::MemSpecDDR5 &memspec);
+        MemSpecDDR5(const DRAMUtils::MemSpec::MemSpecDDR5 &memspec);
 
         MemSpecDDR5(json &data) = delete;
         MemSpecDDR5(const json &data) = delete;
@@ -102,8 +102,8 @@ namespace DRAMPower {
         BankWiseParams bwParams;
 
     private:
-        void parseImpedanceSpec(const DRAMUtils::Config::MemSpecDDR5 &memspec);
-        void parseDataRateSpec(const DRAMUtils::Config::MemSpecDDR5 &memspec);
+        void parseImpedanceSpec(const DRAMUtils::MemSpec::MemSpecDDR5 &memspec);
+        void parseDataRateSpec(const DRAMUtils::MemSpec::MemSpecDDR5 &memspec);
     };
 
 }
diff --git a/src/DRAMPower/DRAMPower/memspec/MemSpecLPDDR4.cpp b/src/DRAMPower/DRAMPower/memspec/MemSpecLPDDR4.cpp
index a0833ce2..a987f0d0 100644
--- a/src/DRAMPower/DRAMPower/memspec/MemSpecLPDDR4.cpp
+++ b/src/DRAMPower/DRAMPower/memspec/MemSpecLPDDR4.cpp
@@ -3,7 +3,7 @@ using namespace DRAMPower;
 using json = nlohmann::json;
 
 
-MemSpecLPDDR4::MemSpecLPDDR4(const DRAMUtils::Config::MemSpecLPDDR4 &memspec)
+MemSpecLPDDR4::MemSpecLPDDR4(const DRAMUtils::MemSpec::MemSpecLPDDR4 &memspec)
     : MemSpec(memspec), memImpedanceSpec{}
 {
     numberOfBankGroups     = memspec.memarchitecturespec.nbrOfBankGroups;
@@ -65,7 +65,7 @@ MemSpecLPDDR4::MemSpecLPDDR4(const DRAMUtils::Config::MemSpecLPDDR4 &memspec)
         bwParams.flgPASR = memspec.bankwisespec.value().hasPASR.value_or(false);
         if (memspec.bankwisespec.value().pasrMode.has_value())
         {
-           if(memspec.bankwisespec.value().pasrMode.value() == DRAMUtils::Config::pasrModesType::Invalid)
+           if(memspec.bankwisespec.value().pasrMode.value() == DRAMUtils::MemSpec::pasrModesType::Invalid)
            {
                 // pasrMode invalid
                 bwParams.pasrMode = 0;
@@ -217,7 +217,7 @@ uint64_t MemSpecLPDDR4::timeToCompletion(DRAMPower::CmdType type)
     return offset;
 } // MemSpecLPDDR4::timeToCompletion
 
-void MemSpecLPDDR4::parseImpedanceSpec(const DRAMUtils::Config::MemSpecLPDDR4 &memspec) {
+void MemSpecLPDDR4::parseImpedanceSpec(const DRAMUtils::MemSpec::MemSpecLPDDR4 &memspec) {
     memImpedanceSpec.C_total_cb = memspec.memimpedancespec.C_total_cb;
     memImpedanceSpec.C_total_ck = memspec.memimpedancespec.C_total_ck;
     memImpedanceSpec.C_total_dqs = memspec.memimpedancespec.C_total_dqs;
diff --git a/src/DRAMPower/DRAMPower/memspec/MemSpecLPDDR4.h b/src/DRAMPower/DRAMPower/memspec/MemSpecLPDDR4.h
index 101b06d9..9742272c 100644
--- a/src/DRAMPower/DRAMPower/memspec/MemSpecLPDDR4.h
+++ b/src/DRAMPower/DRAMPower/memspec/MemSpecLPDDR4.h
@@ -7,7 +7,7 @@
 
 namespace DRAMPower {
 
-class MemSpecLPDDR4 final : public MemSpec<DRAMUtils::Config::MemSpecLPDDR4>
+class MemSpecLPDDR4 final : public MemSpec<DRAMUtils::MemSpec::MemSpecLPDDR4>
 {
 public:
 
@@ -19,7 +19,7 @@ class MemSpecLPDDR4 final : public MemSpec<DRAMUtils::Config::MemSpecLPDDR4>
 public:
 	MemSpecLPDDR4() = delete;
 	
-	MemSpecLPDDR4(const DRAMUtils::Config::MemSpecLPDDR4 &memspec);
+	MemSpecLPDDR4(const DRAMUtils::MemSpec::MemSpecLPDDR4 &memspec);
 	
 	MemSpecLPDDR4(json &data) = delete;
 	MemSpecLPDDR4(const json &data) = delete;
@@ -116,7 +116,7 @@ class MemSpecLPDDR4 final : public MemSpec<DRAMUtils::Config::MemSpecLPDDR4>
 	BankWiseParams bwParams;
 
 private:
-    void parseImpedanceSpec(const DRAMUtils::Config::MemSpecLPDDR4 &memspec);
+    void parseImpedanceSpec(const DRAMUtils::MemSpec::MemSpecLPDDR4 &memspec);
 };
 
 }
diff --git a/src/DRAMPower/DRAMPower/memspec/MemSpecLPDDR5.cpp b/src/DRAMPower/DRAMPower/memspec/MemSpecLPDDR5.cpp
index 3ed17ffb..0745889e 100644
--- a/src/DRAMPower/DRAMPower/memspec/MemSpecLPDDR5.cpp
+++ b/src/DRAMPower/DRAMPower/memspec/MemSpecLPDDR5.cpp
@@ -3,7 +3,7 @@
 using namespace DRAMPower;
 using json = nlohmann::json;
 
-MemSpecLPDDR5::MemSpecLPDDR5(const DRAMUtils::Config::MemSpecLPDDR5 &memspec)
+MemSpecLPDDR5::MemSpecLPDDR5(const DRAMUtils::MemSpec::MemSpecLPDDR5 &memspec)
         : MemSpec(memspec)
 {
     numberOfBankGroups      = memspec.memarchitecturespec.nbrOfBankGroups;
@@ -147,7 +147,7 @@ uint64_t MemSpecLPDDR5::timeToCompletion(DRAMPower::CmdType type)
     return offset;
 }
 
-void MemSpecLPDDR5::parseImpedanceSpec(const DRAMUtils::Config::MemSpecLPDDR5 &memspec) {
+void MemSpecLPDDR5::parseImpedanceSpec(const DRAMUtils::MemSpec::MemSpecLPDDR5 &memspec) {
 
     memImpedanceSpec.C_total_cb = memspec.memimpedancespec.C_total_cb;
     memImpedanceSpec.C_total_ck = memspec.memimpedancespec.C_total_ck;
diff --git a/src/DRAMPower/DRAMPower/memspec/MemSpecLPDDR5.h b/src/DRAMPower/DRAMPower/memspec/MemSpecLPDDR5.h
index 43462d52..af43542e 100644
--- a/src/DRAMPower/DRAMPower/memspec/MemSpecLPDDR5.h
+++ b/src/DRAMPower/DRAMPower/memspec/MemSpecLPDDR5.h
@@ -6,7 +6,7 @@
 
 namespace DRAMPower {
 
-    class MemSpecLPDDR5 final : public MemSpec<DRAMUtils::Config::MemSpecLPDDR5> {
+    class MemSpecLPDDR5 final : public MemSpec<DRAMUtils::MemSpec::MemSpecLPDDR5> {
     public:
         enum VoltageDomain {
             VDD1 = 0,
@@ -23,7 +23,7 @@ namespace DRAMPower {
     public:
         MemSpecLPDDR5() = delete;
 
-        MemSpecLPDDR5(const DRAMUtils::Config::MemSpecLPDDR5 &memspec);
+        MemSpecLPDDR5(const DRAMUtils::MemSpec::MemSpecLPDDR5 &memspec);
 	
         MemSpecLPDDR5(json &data) = delete;
         MemSpecLPDDR5(const json &data) = delete;
@@ -107,7 +107,7 @@ namespace DRAMPower {
         BankWiseParams bwParams;
 
        private:
-        void parseImpedanceSpec(const DRAMUtils::Config::MemSpecLPDDR5 &memspec);
+        void parseImpedanceSpec(const DRAMUtils::MemSpec::MemSpecLPDDR5 &memspec);
     };
 
 }  // namespace DRAMPower
diff --git a/src/cli/main.cpp b/src/cli/main.cpp
index 1b81b174..64e4568f 100644
--- a/src/cli/main.cpp
+++ b/src/cli/main.cpp
@@ -43,24 +43,24 @@ std::unique_ptr<dram_base<CmdType>> getMemory(const json &data)
 		std::unique_ptr<dram_base<CmdType>> result = nullptr;
 		std::visit( [&result] (auto&& arg) {
 			using T = std::decay_t<decltype(arg)>;
-			if constexpr (std::is_same_v<T, DRAMUtils::Config::MemSpecDDR4>)
+			if constexpr (std::is_same_v<T, DRAMUtils::MemSpec::MemSpecDDR4>)
 			{
-				MemSpecDDR4 ddr (static_cast<DRAMUtils::Config::MemSpecDDR4>(arg));
+				MemSpecDDR4 ddr (static_cast<DRAMUtils::MemSpec::MemSpecDDR4>(arg));
 				result = std::make_unique<DDR4>(ddr);
 			}
-			else if constexpr (std::is_same_v<T, DRAMUtils::Config::MemSpecDDR5>)
+			else if constexpr (std::is_same_v<T, DRAMUtils::MemSpec::MemSpecDDR5>)
 			{
-				MemSpecDDR5 ddr (static_cast<DRAMUtils::Config::MemSpecDDR5>(arg));
+				MemSpecDDR5 ddr (static_cast<DRAMUtils::MemSpec::MemSpecDDR5>(arg));
 				result = std::make_unique<DDR5>(ddr);
 			}
-			else if constexpr (std::is_same_v<T, DRAMUtils::Config::MemSpecLPDDR4>)
+			else if constexpr (std::is_same_v<T, DRAMUtils::MemSpec::MemSpecLPDDR4>)
 			{
-				MemSpecLPDDR4 ddr (static_cast<DRAMUtils::Config::MemSpecLPDDR4>(arg));
+				MemSpecLPDDR4 ddr (static_cast<DRAMUtils::MemSpec::MemSpecLPDDR4>(arg));
 				result = std::make_unique<LPDDR4>(ddr);
 			}
-			else if constexpr (std::is_same_v<T, DRAMUtils::Config::MemSpecLPDDR5>)
+			else if constexpr (std::is_same_v<T, DRAMUtils::MemSpec::MemSpecLPDDR5>)
 			{
-				MemSpecLPDDR5 ddr (static_cast<DRAMUtils::Config::MemSpecLPDDR5>(arg));
+				MemSpecLPDDR5 ddr (static_cast<DRAMUtils::MemSpec::MemSpecLPDDR5>(arg));
 				result = std::make_unique<LPDDR5>(ddr);
 			}
 		}, memspec.memspec.getVariant());
diff --git a/tests/tests_drampower/base/test_pattern_pre_cycles.cpp b/tests/tests_drampower/base/test_pattern_pre_cycles.cpp
index df42e257..50bee06d 100644
--- a/tests/tests_drampower/base/test_pattern_pre_cycles.cpp
+++ b/tests/tests_drampower/base/test_pattern_pre_cycles.cpp
@@ -38,7 +38,7 @@ class DramPowerTest_Pre_Cycles : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
 		memSpec.numberOfRanks = 1;
 		memSpec.numberOfBanks = 2;
 		memSpec.numberOfBankGroups = 2;
diff --git a/tests/tests_drampower/core/DDR4/ddr4_multidevice_tests.cpp b/tests/tests_drampower/core/DDR4/ddr4_multidevice_tests.cpp
index 2c68ce28..eb452e50 100644
--- a/tests/tests_drampower/core/DDR4/ddr4_multidevice_tests.cpp
+++ b/tests/tests_drampower/core/DDR4/ddr4_multidevice_tests.cpp
@@ -65,7 +65,7 @@ class DramPowerTest_DDR4_MultiDevice : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
         memSpec.numberOfDevices = 5;
 
         numberOfDevices = memSpec.numberOfDevices;
diff --git a/tests/tests_drampower/core/DDR4/ddr4_multirank_tests.cpp b/tests/tests_drampower/core/DDR4/ddr4_multirank_tests.cpp
index 2c7aef79..cbb53980 100644
--- a/tests/tests_drampower/core/DDR4/ddr4_multirank_tests.cpp
+++ b/tests/tests_drampower/core/DDR4/ddr4_multirank_tests.cpp
@@ -38,7 +38,7 @@ class DDR4_MultirankTests : public ::testing::Test {
         }
         json data = json::parse(f);
         DRAMPower::MemSpecContainer memspeccontainer = data;
-        spec = std::make_unique<MemSpecDDR4>(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        spec = std::make_unique<MemSpecDDR4>(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
         spec->numberOfRanks = 2;
         ddr = std::make_unique<DDR4>(*spec);
     }
diff --git a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_0.cpp b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_0.cpp
index ff8244c1..033c602d 100644
--- a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_0.cpp
+++ b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_0.cpp
@@ -37,7 +37,7 @@ class DramPowerTest_DDR4_0 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<DDR4>(memSpec);
     }
diff --git a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_1.cpp b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_1.cpp
index e5eae1a7..dc29206f 100644
--- a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_1.cpp
+++ b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_1.cpp
@@ -38,7 +38,7 @@ class DramPowerTest_DDR4_1 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<DDR4>(memSpec);
     }
diff --git a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_10.cpp b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_10.cpp
index 0e4762fd..7ae814ff 100644
--- a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_10.cpp
+++ b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_10.cpp
@@ -47,7 +47,7 @@ class DramPowerTest_DDR4_10 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
         memSpec.numberOfRanks = 1;
 		memSpec.numberOfDevices = 1;
         memSpec.numberOfBanks = 8;
diff --git a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_11.cpp b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_11.cpp
index 82de2620..3b81a759 100644
--- a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_11.cpp
+++ b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_11.cpp
@@ -60,7 +60,7 @@ class DramPowerTest_DDR4_11 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
 		memSpec.numberOfRanks = 1;
 		memSpec.numberOfDevices = 1;
         memSpec.numberOfBanks = 8;
diff --git a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_12.cpp b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_12.cpp
index 95364f49..1f1cc1fd 100644
--- a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_12.cpp
+++ b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_12.cpp
@@ -46,7 +46,7 @@ class DramPowerTest_DDR4_12 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
 
 		memSpec.bitWidth = 16;
 		
diff --git a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_13.cpp b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_13.cpp
index 0796c78e..c04df209 100644
--- a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_13.cpp
+++ b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_13.cpp
@@ -40,7 +40,7 @@ class DramPowerTest_DDR4_13 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
 		memSpec.numberOfRanks = 1;
 		memSpec.numberOfDevices = 1;
         memSpec.numberOfBanks = 8;
diff --git a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_14.cpp b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_14.cpp
index 1232f3c0..d8aaa9c3 100644
--- a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_14.cpp
+++ b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_14.cpp
@@ -38,7 +38,7 @@ class DramPowerTest_DDR4_14 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
 		memSpec.numberOfRanks = 1;
 		memSpec.numberOfDevices = 1;
         memSpec.numberOfBanks = 8;
diff --git a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_15.cpp b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_15.cpp
index 0bbad30d..e0ce1adc 100644
--- a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_15.cpp
+++ b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_15.cpp
@@ -39,7 +39,7 @@ class DramPowerTest_DDR4_15 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
 
 		memSpec.bitWidth = 16;
 
diff --git a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_2.cpp b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_2.cpp
index 5c5c75fa..c9cf947d 100644
--- a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_2.cpp
+++ b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_2.cpp
@@ -39,7 +39,7 @@ class DramPowerTest_DDR4_2 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<DDR4>(memSpec);
     }
diff --git a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_3.cpp b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_3.cpp
index 9421cef9..1e6063ea 100644
--- a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_3.cpp
+++ b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_3.cpp
@@ -41,7 +41,7 @@ class DramPowerTest_DDR4_3 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<DDR4>(memSpec);
     }
diff --git a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_4.cpp b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_4.cpp
index a76973f8..5b281d19 100644
--- a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_4.cpp
+++ b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_4.cpp
@@ -42,7 +42,7 @@ class DramPowerTest_DDR4_4 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<DDR4>(memSpec);
     }
diff --git a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_5.cpp b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_5.cpp
index d3b0e002..c0c2938e 100644
--- a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_5.cpp
+++ b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_5.cpp
@@ -43,7 +43,7 @@ class DramPowerTest_DDR4_5 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<DDR4>(memSpec);
     }
diff --git a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_6.cpp b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_6.cpp
index 27eb456f..220c42a1 100644
--- a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_6.cpp
+++ b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_6.cpp
@@ -42,7 +42,7 @@ class DramPowerTest_DDR4_6 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<DDR4>(memSpec);
     }
diff --git a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_7.cpp b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_7.cpp
index 49302c80..de12360a 100644
--- a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_7.cpp
+++ b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_7.cpp
@@ -38,7 +38,7 @@ class DramPowerTest_DDR4_7 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<DDR4>(memSpec);
     }
diff --git a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_8.cpp b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_8.cpp
index 645e83c3..18fc1a14 100644
--- a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_8.cpp
+++ b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_8.cpp
@@ -43,7 +43,7 @@ class DramPowerTest_DDR4_8 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<DDR4>(memSpec);
     }
diff --git a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_9.cpp b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_9.cpp
index 3ec7d10f..e4931725 100644
--- a/tests/tests_drampower/core/DDR4/ddr4_test_pattern_9.cpp
+++ b/tests/tests_drampower/core/DDR4/ddr4_test_pattern_9.cpp
@@ -47,7 +47,7 @@ class DramPowerTest_DDR4_9 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<DDR4>(memSpec);
     }
diff --git a/tests/tests_drampower/core/DDR5/ddr5_multidevice_tests.cpp b/tests/tests_drampower/core/DDR5/ddr5_multidevice_tests.cpp
index 1f4c8fbf..606eb46a 100644
--- a/tests/tests_drampower/core/DDR5/ddr5_multidevice_tests.cpp
+++ b/tests/tests_drampower/core/DDR5/ddr5_multidevice_tests.cpp
@@ -65,7 +65,7 @@ class DramPowerTest_DDR5_MultiDevice : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
         memSpec.numberOfDevices = 5;
 
         numberOfDevices = memSpec.numberOfDevices;
diff --git a/tests/tests_drampower/core/DDR5/ddr5_multirank_tests.cpp b/tests/tests_drampower/core/DDR5/ddr5_multirank_tests.cpp
index 644f2504..efb76f3b 100644
--- a/tests/tests_drampower/core/DDR5/ddr5_multirank_tests.cpp
+++ b/tests/tests_drampower/core/DDR5/ddr5_multirank_tests.cpp
@@ -47,7 +47,7 @@ class DDR5_MultirankTests : public ::testing::Test {
         json data = json::parse(f);
         DRAMPower::MemSpecContainer memspeccontainer = data;
         
-        spec = std::make_unique<MemSpecDDR5>(std::get<DRAMUtils::Config::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
+        spec = std::make_unique<MemSpecDDR5>(std::get<DRAMUtils::MemSpec::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
         spec->numberOfRanks = 2;
     }
 
diff --git a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_0.cpp b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_0.cpp
index 6caf99f5..e4b8e256 100644
--- a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_0.cpp
+++ b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_0.cpp
@@ -38,7 +38,7 @@ class DramPowerTest_DDR5_0 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<DDR5>(memSpec);
     }
diff --git a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_1.cpp b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_1.cpp
index fdf024b6..3c3b2909 100644
--- a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_1.cpp
+++ b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_1.cpp
@@ -39,7 +39,7 @@ class DramPowerTest_DDR5_1 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<DDR5>(memSpec);
     }
diff --git a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_10.cpp b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_10.cpp
index 14bf5f70..b2a3a5ea 100644
--- a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_10.cpp
+++ b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_10.cpp
@@ -42,7 +42,7 @@ class DramPowerTest_DDR5_10 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<DDR5>(memSpec);
     }
diff --git a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_11.cpp b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_11.cpp
index 779ac627..8a20c4c6 100644
--- a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_11.cpp
+++ b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_11.cpp
@@ -44,7 +44,7 @@ class DramPowerTest_DDR5_11 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<DDR5>(memSpec);
     }
diff --git a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_12.cpp b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_12.cpp
index ed76d431..a53bbece 100644
--- a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_12.cpp
+++ b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_12.cpp
@@ -43,7 +43,7 @@ class DramPowerTest_DDR5_12 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
 		memSpec.bitWidth = 16;
 		memSpec.numberOfDevices = 1;
         memSpec.numberOfRanks = 1;
diff --git a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_13.cpp b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_13.cpp
index d3d6125a..5b1dd98f 100644
--- a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_13.cpp
+++ b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_13.cpp
@@ -60,7 +60,7 @@ class DramPowerTest_DDR5_13 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
 		memSpec.bitWidth = 16;
 		memSpec.numberOfDevices = 1;
 		memSpec.numberOfRanks = 1;
diff --git a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_14.cpp b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_14.cpp
index df0cc69f..4f0e8dbe 100644
--- a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_14.cpp
+++ b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_14.cpp
@@ -46,7 +46,7 @@ class DramPowerTest_DDR5_14 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
 		memSpec.bitWidth = 16;
 		memSpec.numberOfDevices = 1;
 		memSpec.numberOfRanks = 1;
diff --git a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_15.cpp b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_15.cpp
index f1375878..bdbd6a9e 100644
--- a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_15.cpp
+++ b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_15.cpp
@@ -40,7 +40,7 @@ class DramPowerTest_DDR5_15 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
 		memSpec.bitWidth = 16;
 		memSpec.numberOfDevices = 1;
 		memSpec.numberOfRanks = 1;
diff --git a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_16.cpp b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_16.cpp
index e990e740..951914f1 100644
--- a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_16.cpp
+++ b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_16.cpp
@@ -39,7 +39,7 @@ class DramPowerTest_DDR5_16 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
 		memSpec.bitWidth = 16;
 		memSpec.numberOfDevices = 1;
         memSpec.numberOfRanks = 1;
diff --git a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_17.cpp b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_17.cpp
index 848f36bb..06d6ebd6 100644
--- a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_17.cpp
+++ b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_17.cpp
@@ -38,7 +38,7 @@ class DramPowerTest_DDR5_17 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
 		memSpec.bitWidth = 16;
 		memSpec.numberOfDevices = 1;
 		memSpec.numberOfRanks = 1;
diff --git a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_18.cpp b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_18.cpp
index a8b7f99d..c8f82f56 100644
--- a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_18.cpp
+++ b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_18.cpp
@@ -39,7 +39,7 @@ class DramPowerTest_DDR5_18 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
 		memSpec.bitWidth = 16;
 		memSpec.numberOfDevices = 1;
 		memSpec.numberOfRanks = 1;
diff --git a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_2.cpp b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_2.cpp
index 8ac3fc1c..78fa3e70 100644
--- a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_2.cpp
+++ b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_2.cpp
@@ -39,7 +39,7 @@ class DramPowerTest_DDR5_2 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<DDR5>(memSpec);
     }
diff --git a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_3.cpp b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_3.cpp
index c7a38a84..c308bcbf 100644
--- a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_3.cpp
+++ b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_3.cpp
@@ -41,7 +41,7 @@ class DramPowerTest_DDR5_3 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<DDR5>(memSpec);
     }
diff --git a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_4.cpp b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_4.cpp
index b651064f..723bc4a2 100644
--- a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_4.cpp
+++ b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_4.cpp
@@ -42,7 +42,7 @@ class DramPowerTest_DDR5_4 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<DDR5>(memSpec);
     }
diff --git a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_5.cpp b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_5.cpp
index 95e2557b..4a8d29cf 100644
--- a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_5.cpp
+++ b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_5.cpp
@@ -43,7 +43,7 @@ class DramPowerTest_DDR5_5 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<DDR5>(memSpec);
     }
diff --git a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_6.cpp b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_6.cpp
index 794e102d..078424ea 100644
--- a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_6.cpp
+++ b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_6.cpp
@@ -42,7 +42,7 @@ class DramPowerTest_DDR5_6 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<DDR5>(memSpec);
     }
diff --git a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_7.cpp b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_7.cpp
index a0fc60c5..64a6d204 100644
--- a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_7.cpp
+++ b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_7.cpp
@@ -38,7 +38,7 @@ class DramPowerTest_DDR5_7 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<DDR5>(memSpec);
     }
diff --git a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_8.cpp b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_8.cpp
index 93d466f4..d9cdd3cd 100644
--- a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_8.cpp
+++ b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_8.cpp
@@ -40,7 +40,7 @@ class DramPowerTest_DDR5_8 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<DDR5>(memSpec);
     }
diff --git a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_9.cpp b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_9.cpp
index 0a7f909d..56eb5d0f 100644
--- a/tests/tests_drampower/core/DDR5/ddr5_test_pattern_9.cpp
+++ b/tests/tests_drampower/core/DDR5/ddr5_test_pattern_9.cpp
@@ -46,7 +46,7 @@ class DramPowerTest_DDR5_9 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<DDR5>(memSpec);
     }
diff --git a/tests/tests_drampower/core/LPDDR4/lpddr4_multidevice_tests.cpp b/tests/tests_drampower/core/LPDDR4/lpddr4_multidevice_tests.cpp
index 0755fb74..746167b2 100644
--- a/tests/tests_drampower/core/LPDDR4/lpddr4_multidevice_tests.cpp
+++ b/tests/tests_drampower/core/LPDDR4/lpddr4_multidevice_tests.cpp
@@ -65,7 +65,7 @@ class DramPowerTest_LPDDR4_MultiDevice : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
         memSpec.numberOfDevices = 5;
 
         numberOfDevices = memSpec.numberOfDevices;
diff --git a/tests/tests_drampower/core/LPDDR4/lpddr4_multirank_test.cpp b/tests/tests_drampower/core/LPDDR4/lpddr4_multirank_test.cpp
index 216e7bc7..651433e3 100644
--- a/tests/tests_drampower/core/LPDDR4/lpddr4_multirank_test.cpp
+++ b/tests/tests_drampower/core/LPDDR4/lpddr4_multirank_test.cpp
@@ -46,7 +46,7 @@ class LPDDR4_MultirankTests : public ::testing::Test {
         }
         json data = json::parse(f);
         DRAMPower::MemSpecContainer memspeccontainer = data;
-        spec = std::make_unique<MemSpecLPDDR4>(std::get<DRAMUtils::Config::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
+        spec = std::make_unique<MemSpecLPDDR4>(std::get<DRAMUtils::MemSpec::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
         spec->numberOfRanks = 2;
     }
 
diff --git a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_0.cpp b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_0.cpp
index e72b7fdc..b0d5179b 100644
--- a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_0.cpp
+++ b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_0.cpp
@@ -37,7 +37,7 @@ class DramPowerTest_LPDDR4_0 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<LPDDR4>(memSpec);
     }
diff --git a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_1.cpp b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_1.cpp
index 73333110..de463a38 100644
--- a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_1.cpp
+++ b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_1.cpp
@@ -38,7 +38,7 @@ class DramPowerTest_LPDDR4_1 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<LPDDR4>(memSpec);
     }
diff --git a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_10.cpp b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_10.cpp
index a6caf61a..3a9c3439 100644
--- a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_10.cpp
+++ b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_10.cpp
@@ -42,7 +42,7 @@ class DramPowerTest_LPDDR4_10 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<LPDDR4>(memSpec);
     }
diff --git a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_11.cpp b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_11.cpp
index 1695003e..e9046064 100644
--- a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_11.cpp
+++ b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_11.cpp
@@ -45,7 +45,7 @@ class DramPowerTest_LPDDR4_11 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
         memSpec.numberOfRanks = 1;
         memSpec.numberOfBanks = 8;
         memSpec.banksPerGroup = 8;
diff --git a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_12.cpp b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_12.cpp
index bff2c9d1..5580e529 100644
--- a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_12.cpp
+++ b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_12.cpp
@@ -60,7 +60,7 @@ class DramPowerTest_LPDDR4_12 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
 		memSpec.numberOfRanks = 1;
         memSpec.numberOfBanks = 8;
         memSpec.banksPerGroup = 8;
diff --git a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_13.cpp b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_13.cpp
index 80469a87..a64e53d1 100644
--- a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_13.cpp
+++ b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_13.cpp
@@ -46,7 +46,7 @@ class DramPowerTest_LPDDR4_13 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
 		memSpec.numberOfRanks = 1;
         memSpec.numberOfBanks = 8;
         memSpec.banksPerGroup = 8;
diff --git a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_14.cpp b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_14.cpp
index 5e979dd7..1c4d34c4 100644
--- a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_14.cpp
+++ b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_14.cpp
@@ -40,7 +40,7 @@ class DramPowerTest_LPDDR4_14 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
 		memSpec.numberOfRanks = 1;
         memSpec.numberOfBanks = 8;
         memSpec.banksPerGroup = 8;
diff --git a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_15.cpp b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_15.cpp
index 8ab4954c..aefb00b3 100644
--- a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_15.cpp
+++ b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_15.cpp
@@ -42,7 +42,7 @@ class DramPowerTest_LPDDR4_15 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
 		memSpec.numberOfRanks = 1;
         memSpec.numberOfBanks = 8;
         memSpec.banksPerGroup = 8;
diff --git a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_16.cpp b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_16.cpp
index ab3cdebd..684222e9 100644
--- a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_16.cpp
+++ b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_16.cpp
@@ -38,7 +38,7 @@ class DramPowerTest_LPDDR4_16  : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
 		memSpec.numberOfRanks = 1;
         memSpec.numberOfBanks = 8;
         memSpec.numberOfBankGroups = 2;
diff --git a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_17.cpp b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_17.cpp
index d16a81d9..526650c1 100644
--- a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_17.cpp
+++ b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_17.cpp
@@ -39,7 +39,7 @@ class DramPowerTest_LPDDR4_17 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
 		memSpec.numberOfRanks = 1;
         memSpec.numberOfBanks = 8;
         memSpec.numberOfBankGroups = 2;
diff --git a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_18.cpp b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_18.cpp
index c3a48655..2d991b89 100644
--- a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_18.cpp
+++ b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_18.cpp
@@ -37,7 +37,7 @@ class DramPowerTest_LPDDR4_18 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
 		memSpec.numberOfRanks = 1;
         memSpec.numberOfBanks = 8;
         memSpec.numberOfBankGroups = 2;
diff --git a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_2.cpp b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_2.cpp
index 8dc3979f..27c55e40 100644
--- a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_2.cpp
+++ b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_2.cpp
@@ -39,7 +39,7 @@ class DramPowerTest_LPDDR4_2 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<LPDDR4>(memSpec);
     }
diff --git a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_3.cpp b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_3.cpp
index 0d4fa272..cb7f08a3 100644
--- a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_3.cpp
+++ b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_3.cpp
@@ -41,7 +41,7 @@ class DramPowerTest_LPDDR4_3 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<LPDDR4>(memSpec);
     }
diff --git a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_4.cpp b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_4.cpp
index 6e5f1c2c..cf2b7cd5 100644
--- a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_4.cpp
+++ b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_4.cpp
@@ -42,7 +42,7 @@ class DramPowerTest_LPDDR4_4 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<LPDDR4>(memSpec);
     }
diff --git a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_5.cpp b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_5.cpp
index 5bafa8ee..7317582e 100644
--- a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_5.cpp
+++ b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_5.cpp
@@ -43,7 +43,7 @@ class DramPowerTest_LPDDR4_5 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<LPDDR4>(memSpec);
     }
diff --git a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_6.cpp b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_6.cpp
index bc78cb8d..e4c475a5 100644
--- a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_6.cpp
+++ b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_6.cpp
@@ -42,7 +42,7 @@ class DramPowerTest_LPDDR4_6 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<LPDDR4>(memSpec);
     }
diff --git a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_7.cpp b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_7.cpp
index ab029795..a1b3e729 100644
--- a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_7.cpp
+++ b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_7.cpp
@@ -38,7 +38,7 @@ class DramPowerTest_LPDDR4_7 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<LPDDR4>(memSpec);
     }
diff --git a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_8.cpp b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_8.cpp
index 5ea6c738..9d8dd5a3 100644
--- a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_8.cpp
+++ b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_8.cpp
@@ -40,7 +40,7 @@ class DramPowerTest_LPDDR4_8 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<LPDDR4>(memSpec);
     }
diff --git a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_9.cpp b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_9.cpp
index 915963e6..eb49ccad 100644
--- a/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_9.cpp
+++ b/tests/tests_drampower/core/LPDDR4/lpddr4_test_pattern_9.cpp
@@ -46,7 +46,7 @@ class DramPowerTest_LPDDR4_9 : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<LPDDR4>(memSpec);
     }
diff --git a/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_12.cpp b/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_12.cpp
index e7a27594..58d07d1e 100644
--- a/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_12.cpp
+++ b/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_12.cpp
@@ -47,7 +47,7 @@ class DramPowerTest_LPDDR5_12 : public ::testing::Test {
         }
         json data = json::parse(f);
         DRAMPower::MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
         memSpec.numberOfRanks = 1;
         memSpec.numberOfBanks = 8;
         memSpec.banksPerGroup = 8;
diff --git a/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_13.cpp b/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_13.cpp
index 857535e9..e82478e0 100644
--- a/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_13.cpp
+++ b/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_13.cpp
@@ -60,7 +60,7 @@ class DramPowerTest_LPDDR5_13 : public ::testing::Test {
         }
         json data = json::parse(f);
         DRAMPower::MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
 		memSpec.numberOfRanks = 1;
         memSpec.numberOfBanks = 8;
         memSpec.banksPerGroup = 8;
diff --git a/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_14.cpp b/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_14.cpp
index 9b109679..46c9b04d 100644
--- a/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_14.cpp
+++ b/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_14.cpp
@@ -46,7 +46,7 @@ class DramPowerTest_LPDDR5_14 : public ::testing::Test {
         }
         json data = json::parse(f);
         DRAMPower::MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
 		memSpec.numberOfRanks = 1;
         memSpec.numberOfBanks = 8;
         memSpec.banksPerGroup = 8;
diff --git a/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_15.cpp b/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_15.cpp
index bd254dfc..11abb69c 100644
--- a/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_15.cpp
+++ b/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_15.cpp
@@ -40,7 +40,7 @@ class DramPowerTest_LPDDR5_15 : public ::testing::Test {
         }
         json data = json::parse(f);
         DRAMPower::MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
 		memSpec.numberOfRanks = 1;
         memSpec.numberOfBanks = 8;
         memSpec.banksPerGroup = 8;
diff --git a/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_16.cpp b/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_16.cpp
index c2429dfd..10af5dce 100644
--- a/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_16.cpp
+++ b/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_16.cpp
@@ -42,7 +42,7 @@ class DramPowerTest_LPDDR5_16 : public ::testing::Test {
         }
         json data = json::parse(f);
         DRAMPower::MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
 		memSpec.numberOfRanks = 1;
         memSpec.numberOfBanks = 8;
         memSpec.banksPerGroup = 8;
diff --git a/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_17.cpp b/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_17.cpp
index 4ee752d7..3095b153 100644
--- a/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_17.cpp
+++ b/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_17.cpp
@@ -36,7 +36,7 @@ class DramPowerTest_LPDDR5_17 : public ::testing::Test {
         }
         json data = json::parse(f);
         DRAMPower::MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
 		memSpec.numberOfRanks = 1;
         memSpec.numberOfBanks = 8;
         memSpec.numberOfBankGroups = 2;
diff --git a/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_18.cpp b/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_18.cpp
index 768f7fb8..0f790927 100644
--- a/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_18.cpp
+++ b/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_18.cpp
@@ -38,7 +38,7 @@ class DramPowerTest_LPDDR5_18 : public ::testing::Test {
         }
         json data = json::parse(f);
         DRAMPower::MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
 		memSpec.numberOfRanks = 1;
         memSpec.numberOfBanks = 8;
         memSpec.numberOfBankGroups = 2;
diff --git a/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_19.cpp b/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_19.cpp
index 335eee49..e7ac859e 100644
--- a/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_19.cpp
+++ b/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_19.cpp
@@ -39,7 +39,7 @@ class DramPowerTest_LPDDR5_19 : public ::testing::Test {
         }
         json data = json::parse(f);
         DRAMPower::MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
 		memSpec.numberOfRanks = 1;
         memSpec.numberOfBanks = 8;
         memSpec.numberOfBankGroups = 2;
diff --git a/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_20.cpp b/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_20.cpp
index f67be0d5..d9061de0 100644
--- a/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_20.cpp
+++ b/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_20.cpp
@@ -37,7 +37,7 @@ class DramPowerTest_LPDDR5_20 : public ::testing::Test {
         }
         json data = json::parse(f);
         DRAMPower::MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
 		memSpec.numberOfRanks = 1;
         memSpec.numberOfBanks = 8;
         memSpec.numberOfBankGroups = 2;
diff --git a/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_21.cpp b/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_21.cpp
index 319ae0ca..fc968ffb 100644
--- a/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_21.cpp
+++ b/tests/tests_drampower/core/LPDDR5/LPDDR5_test_pattern_21.cpp
@@ -38,7 +38,7 @@ class DramPowerTest_LPDDR5_21 : public ::testing::Test {
         }
         json data = json::parse(f);
         DRAMPower::MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
         memSpec.numberOfRanks = 1;
         memSpec.numberOfBanks = 8;
         memSpec.numberOfBankGroups = 2;
diff --git a/tests/tests_drampower/core/LPDDR5/lpddr5_multidevice_tests.cpp b/tests/tests_drampower/core/LPDDR5/lpddr5_multidevice_tests.cpp
index d410506f..e13fe7f3 100644
--- a/tests/tests_drampower/core/LPDDR5/lpddr5_multidevice_tests.cpp
+++ b/tests/tests_drampower/core/LPDDR5/lpddr5_multidevice_tests.cpp
@@ -65,7 +65,7 @@ class DramPowerTest_LPDDR5_MultiDevice : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
         memSpec.numberOfDevices = 5;
 
         numberOfDevices = memSpec.numberOfDevices;
diff --git a/tests/tests_drampower/core/LPDDR5/lpddr5_multirank_test.cpp b/tests/tests_drampower/core/LPDDR5/lpddr5_multirank_test.cpp
index 3a44a95e..520e99a4 100644
--- a/tests/tests_drampower/core/LPDDR5/lpddr5_multirank_test.cpp
+++ b/tests/tests_drampower/core/LPDDR5/lpddr5_multirank_test.cpp
@@ -46,7 +46,7 @@ class LPDDR5_MultirankTests : public ::testing::Test {
         }
         json data = json::parse(f);
         DRAMPower::MemSpecContainer memspeccontainer = data;
-        spec = std::make_unique<MemSpecLPDDR5>(std::get<DRAMUtils::Config::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
+        spec = std::make_unique<MemSpecLPDDR5>(std::get<DRAMUtils::MemSpec::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
         spec->numberOfRanks = 2;
     }
 
diff --git a/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_0.cpp b/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_0.cpp
index b6079e82..2bca8a5c 100644
--- a/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_0.cpp
+++ b/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_0.cpp
@@ -37,7 +37,7 @@ class DramPowerTest_LPDDR5_0 : public ::testing::Test {
         }
         json data = json::parse(f);
         DRAMPower::MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<LPDDR5>(memSpec);
     }
diff --git a/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_1.cpp b/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_1.cpp
index db271f0f..397fb232 100644
--- a/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_1.cpp
+++ b/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_1.cpp
@@ -38,7 +38,7 @@ class DramPowerTest_LPDDR5_1 : public ::testing::Test {
         }
         json data = json::parse(f);
         DRAMPower::MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<LPDDR5>(memSpec);
     }
diff --git a/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_10.cpp b/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_10.cpp
index ddca7313..d100c31a 100644
--- a/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_10.cpp
+++ b/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_10.cpp
@@ -42,7 +42,7 @@ class DramPowerTest_LPDDR5_10 : public ::testing::Test {
         }
         json data = json::parse(f);
         DRAMPower::MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<LPDDR5>(memSpec);
     }
diff --git a/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_11.cpp b/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_11.cpp
index 89d63fae..7a745e5c 100644
--- a/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_11.cpp
+++ b/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_11.cpp
@@ -42,7 +42,7 @@ class DramPowerTest_LPDDR5_11 : public ::testing::Test {
         }
         json data = json::parse(f);
         DRAMPower::MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<LPDDR5>(memSpec);
     }
diff --git a/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_2.cpp b/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_2.cpp
index 170e027f..2bf269a5 100644
--- a/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_2.cpp
+++ b/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_2.cpp
@@ -39,7 +39,7 @@ class DramPowerTest_LPDDR5_2 : public ::testing::Test {
         }
         json data = json::parse(f);
         DRAMPower::MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<LPDDR5>(memSpec);
     }
diff --git a/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_3.cpp b/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_3.cpp
index 17f0435b..5cc49ed0 100644
--- a/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_3.cpp
+++ b/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_3.cpp
@@ -41,7 +41,7 @@ class DramPowerTest_LPDDR5_3 : public ::testing::Test {
         }
         json data = json::parse(f);
         DRAMPower::MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<LPDDR5>(memSpec);
     }
diff --git a/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_4.cpp b/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_4.cpp
index 164855dc..945fdfef 100644
--- a/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_4.cpp
+++ b/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_4.cpp
@@ -42,7 +42,7 @@ class DramPowerTest_LPDDR5_4 : public ::testing::Test {
         }
         json data = json::parse(f);
         DRAMPower::MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<LPDDR5>(memSpec);
     }
diff --git a/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_5.cpp b/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_5.cpp
index dd1ee883..445b44c0 100644
--- a/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_5.cpp
+++ b/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_5.cpp
@@ -43,7 +43,7 @@ class DramPowerTest_LPDDR5_5 : public ::testing::Test {
         }
         json data = json::parse(f);
         DRAMPower::MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<LPDDR5>(memSpec);
     }
diff --git a/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_6.cpp b/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_6.cpp
index 7222ee02..99b3614c 100644
--- a/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_6.cpp
+++ b/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_6.cpp
@@ -42,7 +42,7 @@ class DramPowerTest_LPDDR5_6 : public ::testing::Test {
         }
         json data = json::parse(f);
         DRAMPower::MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<LPDDR5>(memSpec);
     }
diff --git a/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_7.cpp b/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_7.cpp
index 69e40edc..dae127ec 100644
--- a/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_7.cpp
+++ b/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_7.cpp
@@ -38,7 +38,7 @@ class DramPowerTest_LPDDR5_7 : public ::testing::Test {
         }
         json data = json::parse(f);
         DRAMPower::MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<LPDDR5>(memSpec);
     }
diff --git a/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_8.cpp b/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_8.cpp
index 833639fd..760a5539 100644
--- a/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_8.cpp
+++ b/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_8.cpp
@@ -40,7 +40,7 @@ class DramPowerTest_LPDDR5_8 : public ::testing::Test {
         }
         json data = json::parse(f);
         DRAMPower::MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<LPDDR5>(memSpec);
     }
diff --git a/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_9.cpp b/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_9.cpp
index e78dae46..1692db25 100644
--- a/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_9.cpp
+++ b/tests/tests_drampower/core/LPDDR5/lpddr5_test_pattern_9.cpp
@@ -46,7 +46,7 @@ class DramPowerTest_LPDDR5_9 : public ::testing::Test {
         }
         json data = json::parse(f);
         DRAMPower::MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR5 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
 
         ddr = std::make_unique<LPDDR5>(memSpec);
     }
diff --git a/tests/tests_drampower/interface/test_interface_ddr4.cpp b/tests/tests_drampower/interface/test_interface_ddr4.cpp
index 23ed6962..32a317a6 100644
--- a/tests/tests_drampower/interface/test_interface_ddr4.cpp
+++ b/tests/tests_drampower/interface/test_interface_ddr4.cpp
@@ -89,7 +89,7 @@ class DDR4_WindowStats_Tests : public ::testing::Test {
         }
         json data = json::parse(f);
         DRAMPower::MemSpecContainer memspeccontainer = data;
-        spec = std::make_unique<MemSpecDDR4>(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        spec = std::make_unique<MemSpecDDR4>(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
     }
 
     void runCommands(const std::vector<Command> &commands) {
@@ -414,7 +414,7 @@ class DDR4_Energy_Tests : public ::testing::Test {
         }
         json data = json::parse(f);
         DRAMPower::MemSpecContainer memspeccontainer = data;
-        spec = std::make_unique<MemSpecDDR4>(std::get<DRAMUtils::Config::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
+        spec = std::make_unique<MemSpecDDR4>(std::get<DRAMUtils::MemSpec::MemSpecDDR4>(memspeccontainer.memspec.getVariant()));
 
         t_CK = spec->memTimingSpec.tCK;
         voltage = spec->memPowerSpec[MemSpecDDR4::VoltageDomain::VDD].vXX;
diff --git a/tests/tests_drampower/interface/test_interface_ddr5.cpp b/tests/tests_drampower/interface/test_interface_ddr5.cpp
index 139535bd..8cee791e 100644
--- a/tests/tests_drampower/interface/test_interface_ddr5.cpp
+++ b/tests/tests_drampower/interface/test_interface_ddr5.cpp
@@ -73,7 +73,7 @@ class DDR5_WindowStats_Tests : public ::testing::Test {
         }
         json data = json::parse(f);
         DRAMPower::MemSpecContainer memspeccontainer = data;
-        spec = std::make_unique<MemSpecDDR5>(std::get<DRAMUtils::Config::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
+        spec = std::make_unique<MemSpecDDR5>(std::get<DRAMUtils::MemSpec::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
         spec->bitWidth = 16;
     }
 
@@ -190,7 +190,7 @@ class DDR5_Energy_Tests : public ::testing::Test {
         }
         json data = json::parse(f);
         DRAMPower::MemSpecContainer memspeccontainer = data;
-        spec = std::make_unique<MemSpecDDR5>(std::get<DRAMUtils::Config::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
+        spec = std::make_unique<MemSpecDDR5>(std::get<DRAMUtils::MemSpec::MemSpecDDR5>(memspeccontainer.memspec.getVariant()));
 
         t_CK = spec->memTimingSpec.tCK;
         voltage = spec->vddq;
diff --git a/tests/tests_drampower/interface/test_interface_lpddr4.cpp b/tests/tests_drampower/interface/test_interface_lpddr4.cpp
index 8dbfafff..f155941d 100644
--- a/tests/tests_drampower/interface/test_interface_lpddr4.cpp
+++ b/tests/tests_drampower/interface/test_interface_lpddr4.cpp
@@ -78,7 +78,7 @@ class DramPowerTest_Interface_LPDDR4 : public ::testing::Test {
         }
         json data = json::parse(f);
         DRAMPower::MemSpecContainer memspeccontainer = data;
-        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::Config::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
+        MemSpecLPDDR4 memSpec(std::get<DRAMUtils::MemSpec::MemSpecLPDDR4>(memspeccontainer.memspec.getVariant()));
 		memSpec.numberOfRanks = 1;
 		memSpec.numberOfBanks = 2;
 		memSpec.bitWidth = 16;
diff --git a/tests/tests_drampower/interface/test_interface_lpddr5.cpp b/tests/tests_drampower/interface/test_interface_lpddr5.cpp
index a544bfbb..7f75b294 100644
--- a/tests/tests_drampower/interface/test_interface_lpddr5.cpp
+++ b/tests/tests_drampower/interface/test_interface_lpddr5.cpp
@@ -84,7 +84,7 @@ class LPDDR5_WindowStats_Tests : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        spec = std::make_unique<MemSpecLPDDR5>(std::get<DRAMUtils::Config::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
+        spec = std::make_unique<MemSpecLPDDR5>(std::get<DRAMUtils::MemSpec::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
 
         spec->numberOfDevices = 1;
         spec->bitWidth = 16;
@@ -341,7 +341,7 @@ class LPDDR5_Energy_Tests : public ::testing::Test {
         }
         json data = json::parse(f);
         MemSpecContainer memspeccontainer = data;
-        spec = std::make_unique<MemSpecLPDDR5>(std::get<DRAMUtils::Config::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
+        spec = std::make_unique<MemSpecLPDDR5>(std::get<DRAMUtils::MemSpec::MemSpecLPDDR5>(memspeccontainer.memspec.getVariant()));
 
         t_CK = spec->memTimingSpec.tCK;
         t_WCK = spec->memTimingSpec.tWCK;