Index: leahi_dialin/fp/modules/water_pumps.py
===================================================================
diff -u -r68422d08c4141999a13496343264483a32314d37 -r9ac39d94327325e5b882318bc0e5126668eec66e
--- leahi_dialin/fp/modules/water_pumps.py	(.../water_pumps.py)	(revision 68422d08c4141999a13496343264483a32314d37)
+++ leahi_dialin/fp/modules/water_pumps.py	(.../water_pumps.py)	(revision 9ac39d94327325e5b882318bc0e5126668eec66e)
@@ -16,20 +16,17 @@
 import struct
 from enum import unique
 from logging import Logger
+from enum import unique
 
+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.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
 from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray
 
-@unique
-class FPPumpNames(DialinEnum):
-    P12_PUMP_RO = 0
-    P40_PUMP_BOOSTER = 1
 
-
 class FPPumps(AbstractSubSystem):
     """
         Dialin API sub-class for FP water pump driver related commands.
@@ -60,7 +57,7 @@
         payload = rst + rpm + pmp
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id,
-                                              message_id=MsgIds.MSG_ID_FP_BOOST_PUMP_SPEED_OVERRIDE_REQUEST.value,
+                                              message_id=MsgIds.MSG_ID_FP_FLUID_PUMP_SPEED_OVERRIDE_REQUEST.value,
                                               payload=payload)
 
         self.logger.debug("override pump set speed rate point")
@@ -99,7 +96,7 @@
         payload = pmp + spd
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id,
-                                              message_id=MsgIds.MSG_ID_FP_BOOST_PUMP_SET_PWM_REQUEST.value,
+                                              message_id=MsgIds.MSG_ID_FP_FLUID_PUMP_SET_PWM_REQUEST.value,
                                               payload=payload)
 
         self.logger.debug("setting pump {} to pwm count {}".format(pump,pwm))
@@ -135,7 +132,7 @@
         payload = rst + rpwm + pmp
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id,
-                                              message_id=MsgIds.MSG_ID_FP_BOOST_PUMP_READ_PWM_OVERRIDE_REQUEST.value,
+                                              message_id=MsgIds.MSG_ID_FP_FLUID_PUMP_READ_PWM_OVERRIDE_REQUEST.value,
                                               payload=payload)
 
         self.logger.debug("override read pwm for pump".format(pump))
@@ -155,47 +152,4 @@
             return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
         else:
             self.logger.debug("Timeout!!!!")
-            return False
-
-    def cmd_pump_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
-        """
-        Constructs and sends the FP 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).
-
-        @param ms:  integer - interval (in ms) to override with
-        @param reset:  integer - 1 to reset a previous override, 0 to override
-        @return: 1 if successful, zero otherwise
-        """
-
-        if not check_broadcast_interval_override_ms(ms):
-            return False
-
-        rst = integer_to_bytearray(reset)
-        mis = integer_to_bytearray(ms)
-        payload = rst + mis
-
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id,
-                                              message_id=MsgIds.MSG_ID_FP_BOOST_PUMPS_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value,
-                                              payload=payload)
-
-        self.logger.debug("override FP pump broadcast interval")
-
-        # Send message
-        received_message = self.can_interface.send(message)
-
-        # If there is content...
-        if received_message is not None:
-            # self.logger.debug(received_message)
-            if reset == RESET:
-                str_res = "reset back to normal"
-            else:
-                str_res = str(mis)
-
-            self.logger.debug("broadcast overridden to " + str_res)
-            # response payload is OK or not OK
-            return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
-        else:
-            self.logger.debug("Timeout!!!!")
             return False
\ No newline at end of file