Index: firmware/App/Services/NVRecordsDD.h
===================================================================
diff -u -r2f1c3a32a7e6f196fb0ca6f28fdb91b5ff237c07 -r3b7c92408ac36d501987a526bca1dab2bc9782eb
--- firmware/App/Services/NVRecordsDD.h	(.../NVRecordsDD.h)	(revision 2f1c3a32a7e6f196fb0ca6f28fdb91b5ff237c07)
+++ firmware/App/Services/NVRecordsDD.h	(.../NVRecordsDD.h)	(revision 3b7c92408ac36d501987a526bca1dab2bc9782eb)
@@ -133,28 +133,6 @@
     NUM_OF_NV_DD_DATA                                                           ///< Number of non-volatile data.
 } NV_DATA_T;
 
-/// DD acid concentrate enumeration.
-typedef enum DD_acid_concentrate
-{
-    CAL_DATA_ACID_CONCENTRATE_1 = 0,                                            ///< Acid concentrate 1.
-    CAL_DATA_ACID_CONCENTRATE_2,                                                ///< Acid concentrate 2.
-    CAL_DATA_ACID_CONCENTRATE_3,                                                ///< Acid concentrate 3.
-    CAL_DATA_ACID_CONCENTRATE_4,                                                ///< Acid concentrate 4.
-    CAL_DATA_ACID_CONCENTRATE_5,                                                ///< Acid concentrate 5.
-    NUM_OF_CAL_DATA_ACID_CONCENTRATES                                           ///< Number of acid concentrates.
-} CAL_DATA_DD_ACID_CONCENTRATES_T;
-
-/// DD bicarb concentrate enumeration.
-typedef enum DD_bicarb_concentrate
-{
-    CAL_DATA_BICARB_CONCENTRATE_1 = 0,                                          ///< Bicarb concentrate 1.
-    CAL_DATA_BICARB_CONCENTRATE_2,                                              ///< Bicarb concentrate 2.
-    CAL_DATA_BICARB_CONCENTRATE_3,                                              ///< Bicarb concentrate 3.
-    CAL_DATA_BICARB_CONCENTRATE_4,                                              ///< Bicarb concentrate 4.
-    CAL_DATA_BICARB_CONCENTRATE_5,                                              ///< Bicarb concentrate 5.
-    NUM_OF_CAL_DATA_BICARB_CONCENTRATES                                         ///< Number of bicarb concentrates.
-} CAL_DATA_DD_BICARB_CONCENTRATES_T;
-
 /// DD scheduled runs enumeration.
 typedef enum DD_scheduled_runs
 {
@@ -244,13 +222,13 @@
 /// DD acid concentrates
 typedef struct
 {
-    DD_ACID_CONCENTRATE_T acidConcentrate[ NUM_OF_CAL_DATA_ACID_CONCENTRATES ]; ///< DD acid concentrates.
+    DD_ACID_CONCENTRATE_T acidConcentrate[ NUM_OF_ACID_TYPE ];                  ///< DD acid concentrates.
 } DD_ACID_CONCENTRATES_RECORD_T;
 
 /// DD bicarb concentrates
 typedef struct
 {
-    DD_BICARB_CONCENTRATE_T bicarbConcentrate[ NUM_OF_CAL_DATA_BICARB_CONCENTRATES ]; ///< DD bicarb concentrates.
+    DD_BICARB_CONCENTRATE_T bicarbConcentrate[ NUM_OF_BICARB_TYPE ];            ///< DD bicarb concentrates.
 } DD_BICARB_CONCENTRATES_RECORD_T;
 
 /// HD accelerometer sensor calibration record