Index: leahi_dialin/fp/modules/water_pumps.py
===================================================================
diff -u -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6
--- leahi_dialin/fp/modules/water_pumps.py	(.../water_pumps.py)	(revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943)
+++ leahi_dialin/fp/modules/water_pumps.py	(.../water_pumps.py)	(revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6)
@@ -22,7 +22,7 @@
 from leahi_dialin.common import fp_enum_repository
 from leahi_dialin.common.msg_defs import MsgIds
 from leahi_dialin.common.override_templates import cmd_generic_override
-from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels
+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
 
@@ -32,7 +32,7 @@
         Dialin API sub-class for FP water pump driver related commands.
     """
 
-    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
+    def __init__(self, can_interface: CanMessenger, logger: Logger):
         """
         FPPumps constructor
         """
@@ -61,7 +61,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_SPEED_OVERRIDE_REQUEST,
             entity_name = f'FP {pump_name} Water Pump speed',
             override_text = str(rpm),
@@ -88,7 +88,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),
@@ -116,7 +116,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),