Index: leahi_dialin/fp/modules/ro_pump.py
===================================================================
diff -u -ra291930ba38e329e2b373f6d2b2a7564a6b7a09a -rc5bfcf84ed942ca5841bf9de155aa0f495b4d28d
--- leahi_dialin/fp/modules/ro_pump.py	(.../ro_pump.py)	(revision a291930ba38e329e2b373f6d2b2a7564a6b7a09a)
+++ leahi_dialin/fp/modules/ro_pump.py	(.../ro_pump.py)	(revision c5bfcf84ed942ca5841bf9de155aa0f495b4d28d)
@@ -18,7 +18,7 @@
 from logging import Logger
 
 from leahi_dialin.common.constants import NO_RESET
-from leahi_dialin.common.fp_defs import ROPumpNames, FPPumpAttributes
+from leahi_dialin.common.fp_defs import fp_enum_repository
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
 from leahi_dialin.protocols.CAN import DenaliChannels
@@ -46,16 +46,16 @@
                                                                        self._handler_pump_sync)
 
         self.ro_pump = {
-            ROPumpNames.P12_PUMP.name: {
-                FPPumpAttributes.STATE.name: 0,
-                FPPumpAttributes.DUTY_CYCLE.name: 0,
-                FPPumpAttributes.FB_DUTY_CYCLE.name: 0,
-                FPPumpAttributes.SPEED.name: 0.0,
-                FPPumpAttributes.TARGET_PRES.name: 0.0,
-                FPPumpAttributes.TARGET_FLOW.name: 0.0,
-                FPPumpAttributes.TARGET_DUTY_CYCLE.name: 0.0,
-                FPPumpAttributes.DUTY_CYCLE_PCT.name: 0.0,
-                FPPumpAttributes.FB_DUTY_CYCLE_PCT.name: 0.0
+            fp_enum_repository.FPROPumpNames.P12_PUMP.name: {
+                fp_enum_repository.FPPumpAttributes.STATE.name: 0,
+                fp_enum_repository.FPPumpAttributes.DUTY_CYCLE.name: 0,
+                fp_enum_repository.FPPumpAttributes.FB_DUTY_CYCLE.name: 0,
+                fp_enum_repository.FPPumpAttributes.SPEED.name: 0.0,
+                fp_enum_repository.FPPumpAttributes.TARGET_PRES.name: 0.0,
+                fp_enum_repository.FPPumpAttributes.TARGET_FLOW.name: 0.0,
+                fp_enum_repository.FPPumpAttributes.TARGET_DUTY_CYCLE.name: 0.0,
+                fp_enum_repository.FPPumpAttributes.DUTY_CYCLE_PCT.name: 0.0,
+                fp_enum_repository.FPPumpAttributes.FB_DUTY_CYCLE_PCT.name: 0.0
             }
         }
 
@@ -71,23 +71,24 @@
         @param message:  published FP ro pump data message
         @return: none
         """
-        self.ro_pump[ROPumpNames.P12_PUMP.name][FPPumpAttributes.STATE.name] = struct.unpack('i', bytearray(
+
+        self.ro_pump[fp_enum_repository.FPROPumpNames.P12_PUMP.name][fp_enum_repository.FPPumpAttributes.STATE.name] = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
-        self.ro_pump[ROPumpNames.P12_PUMP.name][FPPumpAttributes.DUTY_CYCLE.name] = struct.unpack('i', bytearray(
+        self.ro_pump[fp_enum_repository.FPROPumpNames.P12_PUMP.name][fp_enum_repository.FPPumpAttributes.DUTY_CYCLE.name] = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
-        self.ro_pump[ROPumpNames.P12_PUMP.name][FPPumpAttributes.FB_DUTY_CYCLE.name] = struct.unpack('i', bytearray(
+        self.ro_pump[fp_enum_repository.FPROPumpNames.P12_PUMP.name][fp_enum_repository.FPPumpAttributes.FB_DUTY_CYCLE.name] = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
-        self.ro_pump[ROPumpNames.P12_PUMP.name][FPPumpAttributes.SPEED.name] = struct.unpack('f', bytearray(
+        self.ro_pump[fp_enum_repository.FPROPumpNames.P12_PUMP.name][fp_enum_repository.FPPumpAttributes.SPEED.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
-        self.ro_pump[ROPumpNames.P12_PUMP.name][FPPumpAttributes.TARGET_PRES.name] = struct.unpack('f', bytearray(
+        self.ro_pump[fp_enum_repository.FPROPumpNames.P12_PUMP.name][fp_enum_repository.FPPumpAttributes.TARGET_PRES.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
-        self.ro_pump[ROPumpNames.P12_PUMP.name][FPPumpAttributes.TARGET_FLOW.name] = struct.unpack('f', bytearray(
+        self.ro_pump[fp_enum_repository.FPROPumpNames.P12_PUMP.name][fp_enum_repository.FPPumpAttributes.TARGET_FLOW.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0]
-        self.ro_pump[ROPumpNames.P12_PUMP.name][FPPumpAttributes.TARGET_DUTY_CYCLE.name] = struct.unpack('f', bytearray(
+        self.ro_pump[fp_enum_repository.FPROPumpNames.P12_PUMP.name][fp_enum_repository.FPPumpAttributes.TARGET_DUTY_CYCLE.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0]
-        self.ro_pump[ROPumpNames.P12_PUMP.name][FPPumpAttributes.DUTY_CYCLE_PCT.name] = struct.unpack('f', bytearray(
+        self.ro_pump[fp_enum_repository.FPROPumpNames.P12_PUMP.name][fp_enum_repository.FPPumpAttributes.DUTY_CYCLE_PCT.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0]
-        self.ro_pump[ROPumpNames.P12_PUMP.name][FPPumpAttributes.FB_DUTY_CYCLE_PCT.name] = struct.unpack('f', bytearray(
+        self.ro_pump[fp_enum_repository.FPROPumpNames.P12_PUMP.name][fp_enum_repository.FPPumpAttributes.FB_DUTY_CYCLE_PCT.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0]
 
         self.ro_pump_timestamp = timestamp