diff --git a/include/DRAMUtils/DRAMUtils/memspec/standards/MemSpecDDR4.h b/include/DRAMUtils/DRAMUtils/memspec/standards/MemSpecDDR4.h
index 0fb14d9..d995ec9 100644
--- a/include/DRAMUtils/DRAMUtils/memspec/standards/MemSpecDDR4.h
+++ b/include/DRAMUtils/DRAMUtils/memspec/standards/MemSpecDDR4.h
@@ -193,18 +193,18 @@ struct MemImpedanceSpecTypeDDR4 {
     double ck_dyn_E;
 
     // Commandbus
-    bool cb_termination;
-    double cb_R_eq;
-    double cb_dyn_E;
+    bool ca_termination;
+    double ca_R_eq;
+    double ca_dyn_E;
 
     // Data bus read
-    bool rb_termination;
-    double rb_R_eq;
-    double rb_dyn_E;
+    bool rdq_termination;
+    double rdq_R_eq;
+    double rdq_dyn_E;
     // Data bus write
-    bool wb_termination;
-    double wb_R_eq;
-    double wb_dyn_E;
+    bool wdq_termination;
+    double wdq_R_eq;
+    double wdq_dyn_E;
 
     // DQS read
     bool rdqs_termination;
@@ -215,7 +215,7 @@ struct MemImpedanceSpecTypeDDR4 {
     double wdqs_R_eq;
     double wdqs_dyn_E;
 };
-NLOHMANN_JSONIFY_ALL_THINGS(MemImpedanceSpecTypeDDR4, ck_termination, ck_R_eq, ck_dyn_E, cb_termination, cb_R_eq, cb_dyn_E, rb_termination, rb_R_eq, rb_dyn_E, wb_termination, wb_R_eq, wb_dyn_E, rdqs_termination, rdqs_R_eq, rdqs_dyn_E, wdqs_termination, wdqs_R_eq, wdqs_dyn_E)
+NLOHMANN_JSONIFY_ALL_THINGS(MemImpedanceSpecTypeDDR4, ck_termination, ck_R_eq, ck_dyn_E, ca_termination, ca_R_eq, ca_dyn_E, rdq_termination, rdq_R_eq, rdq_dyn_E, wdq_termination, wdq_R_eq, wdq_dyn_E, rdqs_termination, rdqs_R_eq, rdqs_dyn_E, wdqs_termination, wdqs_R_eq, wdqs_dyn_E)
 
 struct MemSpecDDR4 : BaseMemSpec
 {
diff --git a/include/DRAMUtils/DRAMUtils/memspec/standards/MemSpecDDR5.h b/include/DRAMUtils/DRAMUtils/memspec/standards/MemSpecDDR5.h
index 61777e5..028a068 100644
--- a/include/DRAMUtils/DRAMUtils/memspec/standards/MemSpecDDR5.h
+++ b/include/DRAMUtils/DRAMUtils/memspec/standards/MemSpecDDR5.h
@@ -190,18 +190,18 @@ struct MemImpedanceSpecTypeDDR5 {
     double ck_dyn_E;
 
     // Commandbus
-    bool cb_termination;
-    double cb_R_eq;
-    double cb_dyn_E;
+    bool ca_termination;
+    double ca_R_eq;
+    double ca_dyn_E;
 
     // Data bus read
-    bool rb_termination;
-    double rb_R_eq;
-    double rb_dyn_E;
+    bool rdq_termination;
+    double rdq_R_eq;
+    double rdq_dyn_E;
     // Data bus write
-    bool wb_termination;
-    double wb_R_eq;
-    double wb_dyn_E;
+    bool wdq_termination;
+    double wdq_R_eq;
+    double wdq_dyn_E;
 
     // DQS read
     bool rdqs_termination;
@@ -212,7 +212,7 @@ struct MemImpedanceSpecTypeDDR5 {
     double wdqs_R_eq;
     double wdqs_dyn_E;
 };
-NLOHMANN_JSONIFY_ALL_THINGS(MemImpedanceSpecTypeDDR5, ck_termination, ck_R_eq, ck_dyn_E, cb_termination, cb_R_eq, cb_dyn_E, rb_termination, rb_R_eq, rb_dyn_E, wb_termination, wb_R_eq, wb_dyn_E, rdqs_termination, rdqs_R_eq, rdqs_dyn_E, wdqs_termination, wdqs_R_eq, wdqs_dyn_E)
+NLOHMANN_JSONIFY_ALL_THINGS(MemImpedanceSpecTypeDDR5, ck_termination, ck_R_eq, ck_dyn_E, ca_termination, ca_R_eq, ca_dyn_E, rdq_termination, rdq_R_eq, rdq_dyn_E, wdq_termination, wdq_R_eq, wdq_dyn_E, rdqs_termination, rdqs_R_eq, rdqs_dyn_E, wdqs_termination, wdqs_R_eq, wdqs_dyn_E)
 
 struct DataRateSpecTypeDDR5 {
     uint64_t ca_bus_rate;
diff --git a/include/DRAMUtils/DRAMUtils/memspec/standards/MemSpecLPDDR4.h b/include/DRAMUtils/DRAMUtils/memspec/standards/MemSpecLPDDR4.h
index 6326ab5..2712e8f 100644
--- a/include/DRAMUtils/DRAMUtils/memspec/standards/MemSpecLPDDR4.h
+++ b/include/DRAMUtils/DRAMUtils/memspec/standards/MemSpecLPDDR4.h
@@ -68,18 +68,18 @@ struct MemImpedanceSpecTypeLPDDR4 {
     double ck_dyn_E;
 
     // Commandbus
-    bool cb_termination;
-    double cb_R_eq;
-    double cb_dyn_E;
+    bool ca_termination;
+    double ca_R_eq;
+    double ca_dyn_E;
 
     // Data bus read
-    bool rb_termination;
-    double rb_R_eq;
-    double rb_dyn_E;
+    bool rdq_termination;
+    double rdq_R_eq;
+    double rdq_dyn_E;
     // Data bus write
-    bool wb_termination;
-    double wb_R_eq;
-    double wb_dyn_E;
+    bool wdq_termination;
+    double wdq_R_eq;
+    double wdq_dyn_E;
 
     // DQS read
     bool rdqs_termination;
@@ -90,7 +90,7 @@ struct MemImpedanceSpecTypeLPDDR4 {
     double wdqs_R_eq;
     double wdqs_dyn_E;
 };
-NLOHMANN_JSONIFY_ALL_THINGS(MemImpedanceSpecTypeLPDDR4, ck_termination, ck_R_eq, ck_dyn_E, cb_termination, cb_R_eq, cb_dyn_E, rb_termination, rb_R_eq, rb_dyn_E, wb_termination, wb_R_eq, wb_dyn_E, rdqs_termination, rdqs_R_eq, rdqs_dyn_E, wdqs_termination, wdqs_R_eq, wdqs_dyn_E)
+NLOHMANN_JSONIFY_ALL_THINGS(MemImpedanceSpecTypeLPDDR4, ck_termination, ck_R_eq, ck_dyn_E, ca_termination, ca_R_eq, ca_dyn_E, rdq_termination, rdq_R_eq, rdq_dyn_E, wdq_termination, wdq_R_eq, wdq_dyn_E, rdqs_termination, rdqs_R_eq, rdqs_dyn_E, wdqs_termination, wdqs_R_eq, wdqs_dyn_E)
 
 struct MemTimingSpecTypeLPDDR4
 {
diff --git a/include/DRAMUtils/DRAMUtils/memspec/standards/MemSpecLPDDR5.h b/include/DRAMUtils/DRAMUtils/memspec/standards/MemSpecLPDDR5.h
index 1ff962d..7da22ae 100644
--- a/include/DRAMUtils/DRAMUtils/memspec/standards/MemSpecLPDDR5.h
+++ b/include/DRAMUtils/DRAMUtils/memspec/standards/MemSpecLPDDR5.h
@@ -71,18 +71,18 @@ struct MemImpedanceSpecTypeLPDDR5
     double ck_dyn_E;
 
     // Commandbus
-    bool cb_termination;
-    double cb_R_eq;
-    double cb_dyn_E;
+    bool ca_termination;
+    double ca_R_eq;
+    double ca_dyn_E;
 
     // Data bus read
-    bool rb_termination;
-    double rb_R_eq;
-    double rb_dyn_E;
+    bool rdq_termination;
+    double rdq_R_eq;
+    double rdq_dyn_E;
     // Data bus write
-    bool wb_termination;
-    double wb_R_eq;
-    double wb_dyn_E;
+    bool wdq_termination;
+    double wdq_R_eq;
+    double wdq_dyn_E;
 
     // DQS read
     bool rdqs_termination;
@@ -93,7 +93,7 @@ struct MemImpedanceSpecTypeLPDDR5
     double wck_R_eq;
     double wck_dyn_E;
 };
-NLOHMANN_JSONIFY_ALL_THINGS(MemImpedanceSpecTypeLPDDR5, ck_termination, ck_R_eq, ck_dyn_E, cb_termination, cb_R_eq, cb_dyn_E, rb_termination, rb_R_eq, rb_dyn_E, wb_termination, wb_R_eq, wb_dyn_E, rdqs_termination, rdqs_R_eq, rdqs_dyn_E, wck_termination, wck_R_eq, wck_dyn_E)
+NLOHMANN_JSONIFY_ALL_THINGS(MemImpedanceSpecTypeLPDDR5, ck_termination, ck_R_eq, ck_dyn_E, ca_termination, ca_R_eq, ca_dyn_E, rdq_termination, rdq_R_eq, rdq_dyn_E, wdq_termination, wdq_R_eq, wdq_dyn_E, rdqs_termination, rdqs_R_eq, rdqs_dyn_E, wck_termination, wck_R_eq, wck_dyn_E)
 
 struct MemTimingSpecTypeLPDDR5
 {