Index: leahi_dialin/fp/modules/water_pumps.py
===================================================================
diff -u -rfc671af6d1a18c900812e68c42ca14da3280e4f1 -re45b20cdc5d4c5dcff8cef530b173ca94cb2e422
--- leahi_dialin/fp/modules/water_pumps.py	(.../water_pumps.py)	(revision fc671af6d1a18c900812e68c42ca14da3280e4f1)
+++ leahi_dialin/fp/modules/water_pumps.py	(.../water_pumps.py)	(revision e45b20cdc5d4c5dcff8cef530b173ca94cb2e422)
@@ -8,21 +8,23 @@
 # @file    water_pumps.py
 #
 # @author  (last)      Zoltan Miskolci
-# @date    (last)      09-Jan-2026
+# @date    (last)      05-May-2026
 # @author  (original)  Peter Lucia
 # @date    (original)  02-Apr-2020
 #
 ############################################################################
 
+# Module imports
 from logging import Logger
 from enum import unique
 
+# Project imports
 from leahi_dialin.common.constants import NO_RESET
 from leahi_dialin.common import fp_enum_repository
-from leahi_dialin.common.msg_defs import MsgIds
+from leahi_dialin.common.msg_ids import MsgIds
 from leahi_dialin.common.override_templates import cmd_generic_override
-from leahi_dialin.protocols.CAN import DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, DialinEnum
+from leahi_dialin.protocols.CAN import CanMessenger, CanChannels
+from leahi_dialin.utils.abstract_classes import AbstractSubSystem
 from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray
 
 
@@ -31,7 +33,7 @@
         Dialin API sub-class for FP water pump driver related commands.
     """
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: CanMessenger, logger: Logger):
         """
         FPPumps constructor
         """
@@ -42,25 +44,25 @@
         # no current registered call back methods
 
 
-    def cmd_pump_set_speed_rate_override(self, pump: int, rpm: int, reset: int = NO_RESET) -> int:
+    def cmd_pump_set_speed_rate_override(self, pump: int, speed: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the boost pump set speed rate command
         Constraints:
             Must be logged into FP.
 
-        @param rpm:  integer - speed set point (in rpm)
+        @param speed:  integer - speed set point (in rpm)
         @return: 1 if successful, zero otherwise
         """
         rst = integer_to_bytearray(reset)
-        rpm = integer_to_bytearray(rpm)
+        rpm = integer_to_bytearray(speed)
         pmp = integer_to_bytearray(pump)
         payload = rst + rpm + pmp
 
         pump_name = fp_enum_repository.FPAllPumpNames(pump).name
         return cmd_generic_override(
             payload = payload,
             reset = reset,
-            channel_id = DenaliChannels.dialin_to_fp_ch_id,
+            channel_id = CanChannels.dialin_to_fp_ch_id,
             msg_id = MsgIds.MSG_ID_FP_FLUID_PUMP_SPEED_OVERRIDE_REQUEST,
             entity_name = f'FP {pump_name} Water Pump speed',
             override_text = str(rpm),
@@ -87,7 +89,7 @@
         return cmd_generic_override(
             payload = payload,
             reset = NO_RESET,
-            channel_id = DenaliChannels.dialin_to_fp_ch_id,
+            channel_id = CanChannels.dialin_to_fp_ch_id,
             msg_id = MsgIds.MSG_ID_FP_FLUID_PUMP_SET_PWM_REQUEST,
             entity_name = f'FP {pump_name} Water Pump PWM',
             override_text = str(pwm),
@@ -115,7 +117,7 @@
         return cmd_generic_override(
             payload = payload,
             reset = reset,
-            channel_id = DenaliChannels.dialin_to_fp_ch_id,
+            channel_id = CanChannels.dialin_to_fp_ch_id,
             msg_id = MsgIds.MSG_ID_FP_FLUID_PUMP_SET_PWM_REQUEST,
             entity_name = f'FP {pump_name} Water Pump read PWM',
             override_text = str(pwm),