Index: leahi_dialin/fp/modules/boost_pump.py
===================================================================
diff -u -ra5b83ae0f9728df7705cda897c4d02cfea4dd017 -r52aa7af16b98730ba59fc2577dbe8f73b5959775
--- leahi_dialin/fp/modules/boost_pump.py	(.../boost_pump.py)	(revision a5b83ae0f9728df7705cda897c4d02cfea4dd017)
+++ leahi_dialin/fp/modules/boost_pump.py	(.../boost_pump.py)	(revision 52aa7af16b98730ba59fc2577dbe8f73b5959775)
@@ -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 BoostPumpNames, FPPumpAttributes
+from leahi_dialin.common.fp_defs import FPBoostPumpNames, 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
@@ -47,7 +47,7 @@
                                                                        self._handler_pump_sync)
         self.boost_pump_timestamp = 0.0
         self.boost_pump = {
-            BoostPumpNames.P40_PUMP.name: {
+            FPBoostPumpNames.P40_PUMP.name: {
                 FPPumpAttributes.STATE.name: 0,
                 FPPumpAttributes.DUTY_CYCLE.name: 0,
                 FPPumpAttributes.FB_DUTY_CYCLE.name: 0,
@@ -70,23 +70,23 @@
         @return: none
         """
 
-        self.boost_pump[BoostPumpNames.P40_PUMP.name][FPPumpAttributes.STATE.name] = struct.unpack('i', bytearray(
+        self.boost_pump[FPBoostPumpNames.P40_PUMP.name][FPPumpAttributes.STATE.name] = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
-        self.boost_pump[BoostPumpNames.P40_PUMP.name][FPPumpAttributes.DUTY_CYCLE.name] = struct.unpack('i', bytearray(
+        self.boost_pump[FPBoostPumpNames.P40_PUMP.name][FPPumpAttributes.DUTY_CYCLE.name] = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
-        self.boost_pump[BoostPumpNames.P40_PUMP.name][FPPumpAttributes.FB_DUTY_CYCLE.name] = struct.unpack('i', bytearray(
+        self.boost_pump[FPBoostPumpNames.P40_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.boost_pump[BoostPumpNames.P40_PUMP.name][FPPumpAttributes.SPEED.name] = struct.unpack('f', bytearray(
+        self.boost_pump[FPBoostPumpNames.P40_PUMP.name][FPPumpAttributes.SPEED.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
-        self.boost_pump[BoostPumpNames.P40_PUMP.name][FPPumpAttributes.TARGET_PRESSURE.name] = struct.unpack('f', bytearray(
+        self.boost_pump[FPBoostPumpNames.P40_PUMP.name][FPPumpAttributes.TARGET_PRESSURE.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
-        self.boost_pump[BoostPumpNames.P40_PUMP.name][FPPumpAttributes.TARGET_FLOW.name] = struct.unpack('f', bytearray(
+        self.boost_pump[FPBoostPumpNames.P40_PUMP.name][FPPumpAttributes.TARGET_FLOW.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0]
-        self.boost_pump[BoostPumpNames.P40_PUMP.name][FPPumpAttributes.TARGET_DUTY_CYCLE.name] = struct.unpack('f', bytearray(
+        self.boost_pump[FPBoostPumpNames.P40_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.boost_pump[BoostPumpNames.P40_PUMP.name][FPPumpAttributes.DUTY_CYCLE_PCT.name] = struct.unpack('f', bytearray(
+        self.boost_pump[FPBoostPumpNames.P40_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.boost_pump[BoostPumpNames.P40_PUMP.name][FPPumpAttributes.FB_DUTY_CYCLE_PCT.name] = struct.unpack('f', bytearray(
+        self.boost_pump[FPBoostPumpNames.P40_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.boost_pump_timestamp = timestamp