Index: leahi_dialin/td/modules/air_pump.py
===================================================================
diff -u -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df -r38e8dd31728056dbb7f9304c98ab16d7147b75a2
--- leahi_dialin/td/modules/air_pump.py	(.../air_pump.py)	(revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df)
+++ leahi_dialin/td/modules/air_pump.py	(.../air_pump.py)	(revision 38e8dd31728056dbb7f9304c98ab16d7147b75a2)
@@ -20,7 +20,7 @@
 from leahi_dialin.common.constants import NO_RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
-from leahi_dialin.common.td_defs import TDAirPumpNames, TDAirPumpAttributes
+from leahi_dialin.common.td_defs import td_enum_repository
 from leahi_dialin.protocols.CAN import DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish
 from leahi_dialin.utils.conversions import integer_to_bytearray
@@ -48,9 +48,9 @@
                                                                        self._handler_air_pump_sync)
 
         self.td_air_pump = {
-            TDAirPumpNames.H12_AIR_PUMP.name: {
-                TDAirPumpAttributes.STATE.name: 0,
-                TDAirPumpAttributes.POWER.name: 0
+            td_enum_repository.TDAirPumpNames.H12_AIR_PUMP.name: {
+                td_enum_repository.TDAirPumpAttributes.STATE.name: 0,
+                td_enum_repository.TDAirPumpAttributes.POWER.name: 0
             }
         }
 
@@ -70,8 +70,8 @@
         app = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))
 
-        self.td_air_pump[TDAirPumpNames.H12_AIR_PUMP.name][TDAirPumpAttributes.STATE.name] = aps[0]
-        self.td_air_pump[TDAirPumpNames.H12_AIR_PUMP.name][TDAirPumpAttributes.POWER.name] = app[0]
+        self.td_air_pump[td_enum_repository.TDAirPumpNames.H12_AIR_PUMP.name][td_enum_repository.TDAirPumpAttributes.STATE.name] = aps[0]
+        self.td_air_pump[td_enum_repository.TDAirPumpNames.H12_AIR_PUMP.name][td_enum_repository.TDAirPumpAttributes.POWER.name] = app[0]
         self.td_air_pump_timestamp = timestamp