Index: leahi_dialin/dd/modules/dialysate_pump.py
===================================================================
diff -u -re48e2e9af260dc96a407bf4a26f4a18713318ae6 -r8ef0478470000c7e0de4dc05440521c955e18107
--- leahi_dialin/dd/modules/dialysate_pump.py	(.../dialysate_pump.py)	(revision e48e2e9af260dc96a407bf4a26f4a18713318ae6)
+++ leahi_dialin/dd/modules/dialysate_pump.py	(.../dialysate_pump.py)	(revision 8ef0478470000c7e0de4dc05440521c955e18107)
@@ -91,26 +91,26 @@
         @return: None
         """
         sensor_list =[]
-        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))
+        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.TARGET_RPM.name,               DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.TARGET_RPM.name,               DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_SPEED.name,           DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_SPEED.name,           DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.CURRENT_SPEED.name,            DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.CURRENT_SPEED.name,            DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.STATE.name,                    DataTypes.U32))
+        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.STATE.name,                    DataTypes.U32))
+        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.TARGET_PRESSURE.name,          DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.TARGET_PRESSURE.name,          DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_PRESSURE.name,        DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_PRESSURE.name,        DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_CURRENT.name,         DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_CURRENT.name,         DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.CONTROL.name,                  DataTypes.U32))
+        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.CONTROL.name,                  DataTypes.U32))
+        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.DIRECTION_ERROR_COUNT.name,    DataTypes.U32))
+        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.DIRECTION_ERROR_COUNT.name,    DataTypes.U32))
+        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_DIRECTION.name,       DataTypes.U32))
+        sensor_list.append((dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, dd_enum_repository.DDDialysatePumpAttributes.MEASURED_DIRECTION.name,       DataTypes.U32))
 
         self.process_into_dict(dict_to_update = self.dd_dialysate_pumps,
                                decoder_list = sensor_list,