Index: NVDataMgmtDGRecords.h
===================================================================
diff -u -rff5e595afd7ad79dd7693dfa598b24fdeacad95d -rd4aea540d447203cfd9aca91281d1dc9e9e9bc1d
--- NVDataMgmtDGRecords.h	(.../NVDataMgmtDGRecords.h)	(revision ff5e595afd7ad79dd7693dfa598b24fdeacad95d)
+++ NVDataMgmtDGRecords.h	(.../NVDataMgmtDGRecords.h)	(revision d4aea540d447203cfd9aca91281d1dc9e9e9bc1d)
@@ -3,7 +3,6 @@
 #define FWCOMMON_NVDATAMGMTDGRECORDS_H_
 
 #include "Common.h"
-#include "ConcentratePumps.h"
 
 /**
  *  @defgroup NVDataMgmtDGRecords NVDataMgmtDGRecords
@@ -95,10 +94,8 @@
 /// DG pumps enumeration.
 typedef enum dg_pumps
 {
-    CAL_DATA_CONC_PUMP_1 = 0,                                                                                  ///< Concentrate pump 1.
-    CAL_DATA_CONC_PUMP_2,                                                                                      ///< Concentrate pump 2.
-    CAL_DATA_DRAIN_PUMP,                                                                                       ///< Drain pump.
-    CAL_DATA_RO_PUMP,                                                                                          ///< RO pump.
+    CAL_DATA_CONC_PUMP_CP1 = 0,                                                                                ///< Concentrate pump 1.
+    CAL_DATA_CONC_PUMP_CP2,                                                                                    ///< Concentrate pump 2.
     NUM_OF_CAL_DATA_DG_PUMPS                                                                                   ///< Number of DG pump.
 } CAL_DATA_DG_PUMPS_T;
 
@@ -162,7 +159,7 @@
 /// DG concentrate pumps calibration record
 typedef struct
 {
-    DG_CONC_PUMPS_CAL_DATA_T concentratePump[ NUM_OF_CONCENTRATE_PUMPS ];                                       ///< DG concentrate pumps calibration data.
+    DG_CONC_PUMPS_CAL_DATA_T concentratePumps[ NUM_OF_CAL_DATA_DG_PUMPS ];                                     ///< DG concentrate pumps calibration data.
 } DG_CONC_PUMPS_CAL_RECORD_T;
 
 /// DG drain pump two-gain payload