Index: leahi_dialin/fp/modules/water_pumps.py
===================================================================
diff -u -rfe37f0a0f2c683696f41f6a349cf2756ed09d5d7 -r6a52211a23690bbac89018520763d210c1aaf5c0
--- leahi_dialin/fp/modules/water_pumps.py	(.../water_pumps.py)	(revision fe37f0a0f2c683696f41f6a349cf2756ed09d5d7)
+++ leahi_dialin/fp/modules/water_pumps.py	(.../water_pumps.py)	(revision 6a52211a23690bbac89018520763d210c1aaf5c0)
@@ -62,7 +62,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")
@@ -101,7 +101,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))
@@ -137,7 +137,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))
@@ -157,47 +157,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