Index: leahi_dialin/fp/modules/ro_pump.py
===================================================================
diff -u -re7d16bd6881619e5fc2a0bc1a7fd578a9978498e -r956757fac807b52aec078e84127089db5dff069f
--- leahi_dialin/fp/modules/ro_pump.py	(.../ro_pump.py)	(revision e7d16bd6881619e5fc2a0bc1a7fd578a9978498e)
+++ leahi_dialin/fp/modules/ro_pump.py	(.../ro_pump.py)	(revision 956757fac807b52aec078e84127089db5dff069f)
@@ -21,7 +21,7 @@
 from leahi_dialin.utils.base import DialinEnum
 from .constants import RESET, NO_RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
-from leahi_dialin.common.fp_defs import ROPumpNames, ROPumpAttributes
+from leahi_dialin.common.fp_defs import ROPumpNames, FPPumpAttributes
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum
 from leahi_dialin.utils.checks import check_broadcast_interval_override_ms
@@ -48,15 +48,15 @@
 
         self.ro_pump = {
             ROPumpNames.P12_PUMP.name: {
-                ROPumpAttributes.STATE.name: 0,
-                ROPumpAttributes.DUTY_CYCLE.name: 0,
-                ROPumpAttributes.FB_DUTY_CYCLE.name: 0,
-                ROPumpAttributes.SPEED.name: 0.0,
-                ROPumpAttributes.TARGET_PRES.name: 0.0,
-                ROPumpAttributes.TARGET_FLOW.name: 0.0,
-                ROPumpAttributes.TARGET_DUTY_CYCLE.name: 0.0,
-                ROPumpAttributes.DUTY_CYCLE_PCT.name: 0.0,
-                ROPumpAttributes.FB_DUTY_CYCLE_PCT.name: 0.0
+                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
             }
         }
 
@@ -72,23 +72,23 @@
         @return: none
         """
 
-        self.ro_pump[ROPumpNames.P12_PUMP.name][ROPumpAttributes.STATE.name] = struct.unpack('i', bytearray(
+        self.ro_pump[ROPumpNames.P12_PUMP.name][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][ROPumpAttributes.DUTY_CYCLE.name] = struct.unpack('i', bytearray(
+        self.ro_pump[ROPumpNames.P12_PUMP.name][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][ROPumpAttributes.FB_DUTY_CYCLE.name] = struct.unpack('i', bytearray(
+        self.ro_pump[ROPumpNames.P12_PUMP.name][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][ROPumpAttributes.SPEED.name] = struct.unpack('f', bytearray(
+        self.ro_pump[ROPumpNames.P12_PUMP.name][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][ROPumpAttributes.TARGET_PRES.name] = struct.unpack('f', bytearray(
+        self.ro_pump[ROPumpNames.P12_PUMP.name][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][ROPumpAttributes.TARGET_FLOW.name] = struct.unpack('f', bytearray(
+        self.ro_pump[ROPumpNames.P12_PUMP.name][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][ROPumpAttributes.TARGET_DUTY_CYCLE.name] = struct.unpack('f', bytearray(
+        self.ro_pump[ROPumpNames.P12_PUMP.name][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][ROPumpAttributes.DUTY_CYCLE_PCT.name] = struct.unpack('f', bytearray(
+        self.ro_pump[ROPumpNames.P12_PUMP.name][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][ROPumpAttributes.FB_DUTY_CYCLE_PCT.name] = struct.unpack('f', bytearray(
+        self.ro_pump[ROPumpNames.P12_PUMP.name][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