Index: dialin/common/alarm_defs.py
===================================================================
diff -u -r3e417366945dde4c04322c298d6908de0463fca2 -r051f4c21475026a57613a4bf181b94fff1d6cb4e
--- dialin/common/alarm_defs.py	(.../alarm_defs.py)	(revision 3e417366945dde4c04322c298d6908de0463fca2)
+++ dialin/common/alarm_defs.py	(.../alarm_defs.py)	(revision 051f4c21475026a57613a4bf181b94fff1d6cb4e)
@@ -234,7 +234,7 @@
     ALARM_ID_HD_BLOOD_SITTING_WARNING = 211
     ALARM_ID_HD_END_OF_TREATMENT_ALARM = 212
     ALARM_ID_HD_PRIME_COMPLETED_MEDIUM = 213
-    ALARM_ID_AVAILABLE_30 = 214
+    ALARM_ID_DG_CONCENTRATE_PUMPS_INVALID_CAL_RECORD = 214
     ALARM_ID_AVAILABLE_31 = 215
     ALARM_ID_HD_END_TREATMENT_TIMEOUT_ALARM = 216
     ALARM_ID_AVAILABLE_32 = 217
Index: dialin/dg/calibration_record.py
===================================================================
diff -u -r86ad2fdd0d79eec7966e09f843bacd8944d14c12 -r051f4c21475026a57613a4bf181b94fff1d6cb4e
--- dialin/dg/calibration_record.py	(.../calibration_record.py)	(revision 86ad2fdd0d79eec7966e09f843bacd8944d14c12)
+++ dialin/dg/calibration_record.py	(.../calibration_record.py)	(revision 051f4c21475026a57613a4bf181b94fff1d6cb4e)
@@ -530,16 +530,20 @@
 
         @return: DG pumps hardware group dictionary and the byte size of this hardware group
         """
-        hardware_names = ['concentrate_1', 'concentrate_2', 'drain', 'ro']
+        hardware_names = ['conc_pump_1_acid', 'conc_pump_2_bicarb', 'drain', 'ro']
         group_byte_size = 0
         group_name = 'pumps'
         hardware_group = OrderedDict({group_name: OrderedDict()})
         hardware = OrderedDict()
 
         for i in hardware_names:
             # Different pumps have different calibration_record values
-            if i == 'concentrate_1' or i == 'concentrate_2':
-                hardware[i] = {'step_speed_2_flow_ratio': ['<f', self._DEFAULT_RATIO_VALUE],
+            if i == 'conc_pump_1_acid' or i == 'conc_pump_2_bicarb':
+                hardware[i] = {'fourth_order': ['<f', self._DEFAULT_HIGH_ORDER_GAIN_VALUE],
+                               'third_order': ['<f', self._DEFAULT_HIGH_ORDER_GAIN_VALUE],
+                               'second_order': ['<f', self._DEFAULT_HIGH_ORDER_GAIN_VALUE],
+                               'gain': ['<f', self._DEFAULT_GAIN_VALUE],
+                               'offset': ['<f', self._DEFAULT_OFFSET_VALUE],
                                'cal_time': ['<i', self._DEFAULT_TIME_VALUE],
                                'crc': ['<H', self._DEFAULT_CRC_VALUE]}
             elif i == 'drain':