Index: leahi_dialin/td/modules/air_trap.py
===================================================================
diff -u -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df -r38e8dd31728056dbb7f9304c98ab16d7147b75a2
--- leahi_dialin/td/modules/air_trap.py	(.../air_trap.py)	(revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df)
+++ leahi_dialin/td/modules/air_trap.py	(.../air_trap.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 TDAirTrapValves, TDAirTrapLevelSensors, TDAirTrapLevelSensorsAttributes, TDAirTrapState
+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
@@ -52,18 +52,18 @@
                                                                        self._handler_air_trap_sync)
 
         self.air_trap_level_sensors = {
-            TDAirTrapLevelSensors.H17_LEVEL.name: {
-                TDAirTrapLevelSensorsAttributes.LEVEL.name: self.AIR_DETECTED_AT_LEVEL,
-                TDAirTrapLevelSensorsAttributes.RAW.name: self.AIR_DETECTED_AT_LEVEL
+            td_enum_repository.TDAirTrapLevelSensorNames.H17_LEVEL.name: {
+                td_enum_repository.TDAirTrapLevelSensorAttributes.LEVEL.name: self.AIR_DETECTED_AT_LEVEL,
+                td_enum_repository.TDAirTrapLevelSensorAttributes.RAW.name: self.AIR_DETECTED_AT_LEVEL
             },
-            TDAirTrapLevelSensors.H16_LEVEL.name: {
-                TDAirTrapLevelSensorsAttributes.LEVEL.name: self.AIR_DETECTED_AT_LEVEL,
-                TDAirTrapLevelSensorsAttributes.RAW.name: self.AIR_DETECTED_AT_LEVEL
+            td_enum_repository.TDAirTrapLevelSensorNames.H16_LEVEL.name: {
+                td_enum_repository.TDAirTrapLevelSensorAttributes.LEVEL.name: self.AIR_DETECTED_AT_LEVEL,
+                td_enum_repository.TDAirTrapLevelSensorAttributes.RAW.name: self.AIR_DETECTED_AT_LEVEL
             }
         }
         self.air_trap_valve_states = {
-            TDAirTrapValves.H13_VALV.name: 0,
-            TDAirTrapValves.H20_VALV.name: 0
+            td_enum_repository.TDAirTrapValveNames.H13_VALV.name: 0,
+            td_enum_repository.TDAirTrapValveNames.H20_VALV.name: 0
         }
         self.air_control = 0
         self.td_air_trap_timestamp = 0.0
@@ -97,12 +97,12 @@
         controlling = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))
 
-        self.air_trap_level_sensors[TDAirTrapLevelSensors.H17_LEVEL.name][TDAirTrapLevelSensorsAttributes.LEVEL.name] = lower[0]
-        self.air_trap_level_sensors[TDAirTrapLevelSensors.H16_LEVEL.name][TDAirTrapLevelSensorsAttributes.LEVEL.name] = upper[0]
-        self.air_trap_level_sensors[TDAirTrapLevelSensors.H17_LEVEL.name][TDAirTrapLevelSensorsAttributes.RAW.name] = raw_lower[0]
-        self.air_trap_level_sensors[TDAirTrapLevelSensors.H16_LEVEL.name][TDAirTrapLevelSensorsAttributes.RAW.name] = raw_upper[0]
-        self.air_trap_valve_states[TDAirTrapValves.H13_VALV.name] = h13_vlv_st[0]
-        self.air_trap_valve_states[TDAirTrapValves.H20_VALV.name] = h20_vlv_st[0]
+        self.air_trap_level_sensors[td_enum_repository.TDAirTrapLevelSensorNames.H17_LEVEL.name][td_enum_repository.TDAirTrapLevelSensorAttributes.LEVEL.name] = lower[0]
+        self.air_trap_level_sensors[td_enum_repository.TDAirTrapLevelSensorNames.H16_LEVEL.name][td_enum_repository.TDAirTrapLevelSensorAttributes.LEVEL.name] = upper[0]
+        self.air_trap_level_sensors[td_enum_repository.TDAirTrapLevelSensorNames.H17_LEVEL.name][td_enum_repository.TDAirTrapLevelSensorAttributes.RAW.name] = raw_lower[0]
+        self.air_trap_level_sensors[td_enum_repository.TDAirTrapLevelSensorNames.H16_LEVEL.name][td_enum_repository.TDAirTrapLevelSensorAttributes.RAW.name] = raw_upper[0]
+        self.air_trap_valve_states[td_enum_repository.TDAirTrapValveNames.H13_VALV.name] = h13_vlv_st[0]
+        self.air_trap_valve_states[td_enum_repository.TDAirTrapValveNames.H20_VALV.name] = h20_vlv_st[0]
         self.air_control = controlling[0]
         self.td_air_trap_timestamp = timestamp
 
@@ -144,7 +144,7 @@
         idx = integer_to_bytearray(sensor)
         payload = rst + det + idx
 
-        sensor_name = TDAirTrapLevelSensors(sensor).name.split('_')[0]
+        sensor_name = td_enum_repository.TDAirTrapLevelSensorNames(sensor).name.split('_')[0]
         return cmd_generic_override(
             payload = payload,
             reset = reset,
@@ -172,7 +172,7 @@
         idx = integer_to_bytearray(sensor)
         payload = rst + det + idx
 
-        sensor_name = TDAirTrapLevelSensors(sensor).name.split('_')[0]
+        sensor_name = td_enum_repository.TDAirTrapLevelSensorNames(sensor).name.split('_')[0]
         return cmd_generic_override(
             payload = payload,
             reset = reset,
@@ -184,8 +184,8 @@
             can_interface = self.can_interface)
 
 
-    def cmd_set_td_air_trap_valve(self, valve: int = TDAirTrapValves.H13_VALV.value,
-                                  valve_state: int = TDAirTrapState.STATE_CLOSED.value) -> int:
+    def cmd_set_td_air_trap_valve(self, valve: int = td_enum_repository.TDAirTrapValveNames.H13_VALV.value,
+                                  valve_state: int = td_enum_repository.TDAirTrapState.STATE_CLOSED.value) -> int:
         """
         Constructs and sends an open/close command to the TD air trap valves.
 
@@ -197,7 +197,7 @@
         sts = integer_to_bytearray(valve_state)
         payload = vlv + sts
 
-        valve_name = TDAirTrapValves(valve).name.split('_')[0]
+        valve_name = td_enum_repository.TDAirTrapValveNames(valve).name.split('_')[0]
         return cmd_generic_override(
             payload = payload,
             reset = NO_RESET,