Index: leahi_dialin/fp/modules/water_pumps.py
===================================================================
diff -u -ra291930ba38e329e2b373f6d2b2a7564a6b7a09a -r38e8dd31728056dbb7f9304c98ab16d7147b75a2
--- leahi_dialin/fp/modules/water_pumps.py	(.../water_pumps.py)	(revision a291930ba38e329e2b373f6d2b2a7564a6b7a09a)
+++ leahi_dialin/fp/modules/water_pumps.py	(.../water_pumps.py)	(revision 38e8dd31728056dbb7f9304c98ab16d7147b75a2)
@@ -15,13 +15,14 @@
 ############################################################################
 
 from logging import Logger
+from enum import unique
 
 from leahi_dialin.common.constants import NO_RESET
-from leahi_dialin.common.fp_defs import FPPumpNames
+from leahi_dialin.common.fp_defs 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 DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem
+from leahi_dialin.utils.base import AbstractSubSystem, DialinEnum
 from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray
 
 
@@ -55,7 +56,7 @@
         pmp = integer_to_bytearray(pump)
         payload = rst + rpm + pmp
 
-        pump_name = FPPumpNames(pump).name
+        pump_name = fp_enum_repository.FPAllPumpNames(pump).name
         return cmd_generic_override(
             payload = payload,
             reset = reset,
@@ -82,7 +83,7 @@
         pmp = integer_to_bytearray(pump)
         payload = pmp + spd
 
-        pump_name = FPPumpNames(pump).name
+        pump_name = fp_enum_repository.FPAllPumpNames(pump).name
         return cmd_generic_override(
             payload = payload,
             reset = NO_RESET,
@@ -110,7 +111,7 @@
         pmp = integer_to_bytearray(pump)
         payload = rst + rpwm + pmp
 
-        pump_name = FPPumpNames(pump).name
+        pump_name = fp_enum_repository.FPAllPumpNames(pump).name
         return cmd_generic_override(
             payload = payload,
             reset = reset,