Index: leahi_dialin/fp/modules/boost_pump.py
===================================================================
diff -u -r0f08c28544b557b2bbd8c04b10cff284f41e4fb9 -r1a719e5c0a00853453a57ebd7b01cc6394ebbcc5
--- leahi_dialin/fp/modules/boost_pump.py	(.../boost_pump.py)	(revision 0f08c28544b557b2bbd8c04b10cff284f41e4fb9)
+++ leahi_dialin/fp/modules/boost_pump.py	(.../boost_pump.py)	(revision 1a719e5c0a00853453a57ebd7b01cc6394ebbcc5)
@@ -25,26 +25,25 @@
 from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray
 
 @unique
-class FPPumpNames(DialinEnum):
+class ROPumpNames(DialinEnum):
     P12_PUMP_RO = 0
     P40_PUMP_BOOSTER = 1
 
-
-class FPPumps(AbstractSubSystem):
+class ROPumps(AbstractSubSystem):
     """
         Dialin API sub-class for RO pump related commands.
     """
 
     def __init__(self, can_interface, logger: Logger):
         """
-        FPPumps constructor
+        ROPumps constructor
         """
         super().__init__()
         self.can_interface = can_interface
         self.logger = logger
 
         if self.can_interface is not None:
-            channel_id = DenaliChannels.fp_sync_broadcast_ch_id
+            channel_id = DenaliChannels.ro_sync_broadcast_ch_id
             msg_id = MsgIds.MSG_ID_RO_PUMP_DATA.value
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_boost_pump_sync)
@@ -104,7 +103,7 @@
         """
         Constructs and sends the boost pump set point command
         Constraints:
-            Must be logged into FP.
+            Must be logged into RO.
 
         @param rpm:  integer - speed set point (in rpm)
         @return: 1 if successful, zero otherwise
@@ -114,7 +113,7 @@
         pmp = integer_to_bytearray(pump)
         payload = rst + rpm + pmp
 
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id,
+        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_ro_ch_id,
                                               message_id=MsgIds.MSG_ID_RO_BOOST_PUMP_SPEED_OVERRIDE_REQUEST.value,
                                               payload=payload)
 
@@ -142,7 +141,7 @@
         Constructs and sends set pwm request for RO pumps \n
         command.
         Constraints:
-            Must be logged into FP.
+            Must be logged into RO.
 
         @param pwm:  integer - counts to override the pwm ( 0 - 500 )
         @param reset:  integer - 1 to reset a previous override, 0 to override
@@ -153,7 +152,7 @@
         pmp = integer_to_bytearray(pump)
         payload = pmp + spd
 
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id,
+        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_ro_ch_id,
                                               message_id=MsgIds.MSG_ID_RO_BOOST_PUMP_SET_PWM_REQUEST.value,
                                               payload=payload)
 
@@ -177,7 +176,7 @@
         Constructs and sends the read pwm override for the RO pumps \n
         command.
         Constraints:
-            Must be logged into FP.
+            Must be logged into RO.
 
         @param pwm:  float - pwm in percentage to override with
         @param reset:  integer - 1 to reset a previous override, 0 to override
@@ -189,7 +188,7 @@
         pmp = integer_to_bytearray(pump)
         payload = rst + rpwm + pmp
 
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id,
+        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_ro_ch_id,
                                               message_id=MsgIds.MSG_ID_RO_BOOST_PUMP_READ_PWM_OVERRIDE_REQUEST.value,
                                               payload=payload)
 
@@ -216,8 +215,8 @@
         """
         Constructs and sends the RO pump broadcast interval override command
         Constraints:
-            Must be logged into FP.
-            Given interval must be non-zero and a multiple of the FP general task interval (50 ms).
+            Must be logged into RO.
+            Given interval must be non-zero and a multiple of the RO general task interval (50 ms).
 
         @param ms:  integer - interval (in ms) to override with
         @param reset:  integer - 1 to reset a previous override, 0 to override
@@ -231,11 +230,11 @@
         mis = integer_to_bytearray(ms)
         payload = rst + mis
 
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id,
+        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_ro_ch_id,
                                               message_id=MsgIds.MSG_ID_RO_BOOST_PUMPS_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value,
                                               payload=payload)
 
-        self.logger.debug("override FP pump broadcast interval")
+        self.logger.debug("override RO pump broadcast interval")
 
         # Send message
         received_message = self.can_interface.send(message)