Index: leahi_dialin/dd/modules/dialysate_pump.py
===================================================================
diff -u -r6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1 -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943
--- leahi_dialin/dd/modules/dialysate_pump.py	(.../dialysate_pump.py)	(revision 6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1)
+++ leahi_dialin/dd/modules/dialysate_pump.py	(.../dialysate_pump.py)	(revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943)
@@ -91,31 +91,30 @@
         @return: None
         """
         sensor_list =[]
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D12_PUMP, dd_enum_repository.DDConductivitySensorNames.TARGET_RPM,             DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D48_PUMP, dd_enum_repository.DDConductivitySensorNames.TARGET_RPM,             DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D12_PUMP, dd_enum_repository.DDConductivitySensorNames.MEASURED_SPEED,         DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D48_PUMP, dd_enum_repository.DDConductivitySensorNames.MEASURED_SPEED,         DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D12_PUMP, dd_enum_repository.DDConductivitySensorNames.CURRENT_SPEED,          DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D48_PUMP, dd_enum_repository.DDConductivitySensorNames.CURRENT_SPEED,          DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D12_PUMP, dd_enum_repository.DDConductivitySensorNames.STATE,                  DataTypes.U32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D48_PUMP, dd_enum_repository.DDConductivitySensorNames.STATE,                  DataTypes.U32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D12_PUMP, dd_enum_repository.DDConductivitySensorNames.TARGET_PRESSURE,        DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D48_PUMP, dd_enum_repository.DDConductivitySensorNames.TARGET_PRESSURE,        DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D12_PUMP, dd_enum_repository.DDConductivitySensorNames.MEASURED_PRESSURE,      DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D48_PUMP, dd_enum_repository.DDConductivitySensorNames.MEASURED_PRESSURE,      DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D12_PUMP, dd_enum_repository.DDConductivitySensorNames.MEASURED_CURRENT,       DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D48_PUMP, dd_enum_repository.DDConductivitySensorNames.MEASURED_CURRENT,       DataTypes.F32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D12_PUMP, dd_enum_repository.DDConductivitySensorNames.CONTROL,                DataTypes.U32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D48_PUMP, dd_enum_repository.DDConductivitySensorNames.CONTROL,                DataTypes.U32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D12_PUMP, dd_enum_repository.DDConductivitySensorNames.DIRECTION_ERROR_COUNT,  DataTypes.U32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D48_PUMP, dd_enum_repository.DDConductivitySensorNames.DIRECTION_ERROR_COUNT,  DataTypes.U32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D12_PUMP, dd_enum_repository.DDConductivitySensorNames.MEASURED_DIRECTION,     DataTypes.U32))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D48_PUMP, dd_enum_repository.DDConductivitySensorNames.MEASURED_DIRECTION,     DataTypes.U32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D12_PUMP.name, dd_enum_repository.DDConductivitySensorNames.TARGET_RPM.name,               DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D48_PUMP.name, dd_enum_repository.DDConductivitySensorNames.TARGET_RPM.name,               DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D12_PUMP.name, dd_enum_repository.DDConductivitySensorNames.MEASURED_SPEED.name,           DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D48_PUMP.name, dd_enum_repository.DDConductivitySensorNames.MEASURED_SPEED.name,           DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D12_PUMP.name, dd_enum_repository.DDConductivitySensorNames.CURRENT_SPEED.name,            DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D48_PUMP.name, dd_enum_repository.DDConductivitySensorNames.CURRENT_SPEED.name,            DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D12_PUMP.name, dd_enum_repository.DDConductivitySensorNames.STATE.name,                    DataTypes.U32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D48_PUMP.name, dd_enum_repository.DDConductivitySensorNames.STATE.name,                    DataTypes.U32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D12_PUMP.name, dd_enum_repository.DDConductivitySensorNames.TARGET_PRESSURE.name,          DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D48_PUMP.name, dd_enum_repository.DDConductivitySensorNames.TARGET_PRESSURE.name,          DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D12_PUMP.name, dd_enum_repository.DDConductivitySensorNames.MEASURED_PRESSURE.name,        DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D48_PUMP.name, dd_enum_repository.DDConductivitySensorNames.MEASURED_PRESSURE.name,        DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D12_PUMP.name, dd_enum_repository.DDConductivitySensorNames.MEASURED_CURRENT.name,         DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D48_PUMP.name, dd_enum_repository.DDConductivitySensorNames.MEASURED_CURRENT.name,         DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D12_PUMP.name, dd_enum_repository.DDConductivitySensorNames.CONTROL.name,                  DataTypes.U32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D48_PUMP.name, dd_enum_repository.DDConductivitySensorNames.CONTROL.name,                  DataTypes.U32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D12_PUMP.name, dd_enum_repository.DDConductivitySensorNames.DIRECTION_ERROR_COUNT.name,    DataTypes.U32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D48_PUMP.name, dd_enum_repository.DDConductivitySensorNames.DIRECTION_ERROR_COUNT.name,    DataTypes.U32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D12_PUMP.name, dd_enum_repository.DDConductivitySensorNames.MEASURED_DIRECTION.name,       DataTypes.U32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D48_PUMP.name, dd_enum_repository.DDConductivitySensorNames.MEASURED_DIRECTION.name,       DataTypes.U32))
 
         self.process_into_dict(dict_to_update = self.dd_dialysate_pumps,
-                               msg_list = sensor_list,
+                               decoder_list = sensor_list,
                                message = message)
-
         self.dd_dialysate_pump_timestamp = timestamp