Index: NVDataMgmt.c
===================================================================
diff -u -r3b70d6b53c78039aa9b7b2546a0137e906966519 -r19f9abb8e8c09a0d703eb330aab85bb89a7a9807
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 3b70d6b53c78039aa9b7b2546a0137e906966519)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 19f9abb8e8c09a0d703eb330aab85bb89a7a9807)
@@ -597,7 +597,7 @@
 static BOOL isDGServiceRecordValid( void );
 static BOOL isDGUsageRecordValid( void );
 static BOOL isDGCalibrationRecordValid( void );
-static BOOL isDGConcPumpRecordValid( DG_CONC_PUMPS_CAL_DATA_T* record );
+static BOOL isDGConcPumpRecordValid( DG_CONC_PUMPS_CAL_DATA_T* record );  // TODO Remove
 static BOOL isDGDrainPumpRecordValid( DG_DRAIN_PUMP_CAL_RECORD_T* record );
 static BOOL isDGROPumpRecordValid( DG_RO_PUMP_CAL_RECORD_T* record );
 static BOOL isDGPreROPurgeVolumeRecordValid( DG_PRE_RO_PURGE_VOLUME_T* record );
@@ -3121,7 +3121,8 @@
     DG_CONC_PUMPS_CAL_RECORD_T* concPump = &dgCalibrationRecord.dgCalibrationGroups.concentratePumpsRecord;
     for ( i = 0; i < NUM_OF_CAL_DATA_DG_CONC_PUMPS; i++ )
     {
-        isHardwareRecordValid = isDGConcPumpRecordValid( &concPump->concentratePumps[ i ] );
+        record                = (POLYNOMIAL_CAL_PAYLOAD_T*)&concPump->concentratePumps[ i ];
+        isHardwareRecordValid = isPolynomialRecordValid( record );
         isCalRecordValid      = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;
     }
 
Index: NVDataMgmtDGRecords.h
===================================================================
diff -u -r5f45d973e05e0f6d1b4482950552f7678320812e -r19f9abb8e8c09a0d703eb330aab85bb89a7a9807
--- NVDataMgmtDGRecords.h	(.../NVDataMgmtDGRecords.h)	(revision 5f45d973e05e0f6d1b4482950552f7678320812e)
+++ NVDataMgmtDGRecords.h	(.../NVDataMgmtDGRecords.h)	(revision 19f9abb8e8c09a0d703eb330aab85bb89a7a9807)
@@ -179,8 +179,8 @@
 /// DG pumps enumeration.
 typedef enum dg_pumps
 {
-    CAL_DATA_CONC_PUMP_CP1 = 0,                                                                                ///< Concentrate pump 1.
-    CAL_DATA_CONC_PUMP_CP2,                                                                                    ///< Concentrate pump 2.
+    CAL_DATA_CONC_PUMP_CP1_ACID = 0,                                                                           ///< Concentrate pump 1.
+    CAL_DATA_CONC_PUMP_CP2_BICARB,                                                                             ///< Concentrate pump 2.
     NUM_OF_CAL_DATA_DG_CONC_PUMPS                                                                              ///< Number of DG concentrate pumps.
 } CAL_DATA_DG_PUMPS_T;
 
@@ -303,12 +303,12 @@
     F32 stepSpeed2FlowRatio;                                                                                    ///< Step speed to flow ratio.
     U32 calibrationTime;                                                                                        ///< Calibration time.
     U16 crc;                                                                                                    ///< CRC for the DG concentrate pumps calibration data.
-} DG_CONC_PUMPS_CAL_DATA_T;
+} DG_CONC_PUMPS_CAL_DATA_T; // TODO remove
 
 /// DG concentrate pumps calibration record
 typedef struct
 {
-    DG_CONC_PUMPS_CAL_DATA_T concentratePumps[ NUM_OF_CAL_DATA_DG_CONC_PUMPS ];                                 ///< DG concentrate pumps calibration data.
+    POLYNOMIAL_CAL_PAYLOAD_T concentratePumps[ NUM_OF_CAL_DATA_DG_CONC_PUMPS ];                                 ///< DG concentrate pumps calibration data.
 } DG_CONC_PUMPS_CAL_RECORD_T;
 
 /// DG drain pump two-gain payload