Index: NVDataMgmt.c
===================================================================
diff -u -r3b70d6b53c78039aa9b7b2546a0137e906966519 -r422418f4e178fb05df16d7701f2808feee274a3c
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 3b70d6b53c78039aa9b7b2546a0137e906966519)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 422418f4e178fb05df16d7701f2808feee274a3c)
@@ -597,7 +597,6 @@
 static BOOL isDGServiceRecordValid( void );
 static BOOL isDGUsageRecordValid( void );
 static BOOL isDGCalibrationRecordValid( void );
-static BOOL isDGConcPumpRecordValid( DG_CONC_PUMPS_CAL_DATA_T* record );
 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 +3120,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                = &concPump->concentratePumps[ i ];
+        isHardwareRecordValid = isPolynomialRecordValid( record );
         isCalRecordValid      = isCalRecordValid == FALSE ? FALSE : isHardwareRecordValid;
     }
 
@@ -3230,35 +3230,6 @@
 
 /*********************************************************************//**
  * @brief
- * The isDGConcPumpRecordValid function checks whether the calibration
- * record of concentrate pump is valid or not.
- * @details Inputs: none
- * @details Outputs: none
- * @param record: DG_CONC_PUMPS_CAL_DATA_T pointer
- * @return TRUE if the record is valid otherwise FALSE
- *************************************************************************/
-static BOOL isDGConcPumpRecordValid( DG_CONC_PUMPS_CAL_DATA_T* record )
-{
-    BOOL status   = TRUE;
-    U16 calcCRC   = crc16 ( (U08*)record, sizeof( DG_CONC_PUMPS_CAL_DATA_T ) - sizeof( U16 ) );
-    U16 recordCRC = record->crc;
-
-    if ( calcCRC != recordCRC )
-    {
-        // CRC did not pass so set all values to default
-        record->stepSpeed2FlowRatio = RECORD_DEFAULT_RATIO;
-        record->calibrationTime     = RECORD_DEFAULT_TIME;
-        record->crc                 = crc16 ( (U08*)record, sizeof( DG_CONC_PUMPS_CAL_DATA_T ) - sizeof( U16 ) );
-
-        // Set the to FALSE since the record is not valid
-        status = FALSE;
-    }
-
-    return status;
-}
-
-/*********************************************************************//**
- * @brief
  * The isDGDrainPumpRecordValid function checks whether the calibration
  * record of drain pump is valid or not.
  * @details Inputs: none
Index: NVDataMgmtDGRecords.h
===================================================================
diff -u -r5f45d973e05e0f6d1b4482950552f7678320812e -r422418f4e178fb05df16d7701f2808feee274a3c
--- NVDataMgmtDGRecords.h	(.../NVDataMgmtDGRecords.h)	(revision 5f45d973e05e0f6d1b4482950552f7678320812e)
+++ NVDataMgmtDGRecords.h	(.../NVDataMgmtDGRecords.h)	(revision 422418f4e178fb05df16d7701f2808feee274a3c)
@@ -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;
 
@@ -297,18 +297,10 @@
     U16 crc;                                                                                                    ///< CRC for the conductivity sensors temperature compensation cal payload.
 } DG_COND_SENSOR_TEMP_COMP_CAL_PAYLOAD_T;
 
-/// DG concentrate pumps one-gain payload
-typedef struct
-{
-    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 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