Index: leahi_dialin/td/modules/air_trap.py
===================================================================
diff -u -re7d16bd6881619e5fc2a0bc1a7fd578a9978498e -r52aa7af16b98730ba59fc2577dbe8f73b5959775
--- leahi_dialin/td/modules/air_trap.py	(.../air_trap.py)	(revision e7d16bd6881619e5fc2a0bc1a7fd578a9978498e)
+++ leahi_dialin/td/modules/air_trap.py	(.../air_trap.py)	(revision 52aa7af16b98730ba59fc2577dbe8f73b5959775)
@@ -19,7 +19,7 @@
 
 from .constants import RESET, NO_RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
-from leahi_dialin.common.td_defs import AirTrapValves, AirTrapLevelSensors, AirTrapLevelSensorsAttributes, AirTrapState
+from leahi_dialin.common.td_defs import TDAirTrapValves, TDAirTrapLevelSensors, TDAirTrapLevelSensorsAttributes, TDAirTrapState
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum
 from leahi_dialin.utils.checks import check_broadcast_interval_override_ms
@@ -53,18 +53,18 @@
                                                                        self._handler_air_trap_sync)
 
         self.air_trap_level_sensors = {
-            AirTrapLevelSensors.H17_LEVEL.name: {
-                AirTrapLevelSensorsAttributes.LEVEL.name: self.AIR_DETECTED_AT_LEVEL,
-                AirTrapLevelSensorsAttributes.RAW.name: self.AIR_DETECTED_AT_LEVEL
+            TDAirTrapLevelSensors.H17_LEVEL.name: {
+                TDAirTrapLevelSensorsAttributes.LEVEL.name: self.AIR_DETECTED_AT_LEVEL,
+                TDAirTrapLevelSensorsAttributes.RAW.name: self.AIR_DETECTED_AT_LEVEL
             },
-            AirTrapLevelSensors.H16_LEVEL.name: {
-                AirTrapLevelSensorsAttributes.LEVEL.name: self.AIR_DETECTED_AT_LEVEL,
-                AirTrapLevelSensorsAttributes.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
             }
         }
         self.air_trap_valve_states = {
-            AirTrapValves.H13_VALV.name: 0,
-            AirTrapValves.H20_VALV.name: 0
+            TDAirTrapValves.H13_VALV.name: 0,
+            TDAirTrapValves.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[AirTrapLevelSensors.H17_LEVEL.name][AirTrapLevelSensorsAttributes.LEVEL.name] = lower[0]
-        self.air_trap_level_sensors[AirTrapLevelSensors.H16_LEVEL.name][AirTrapLevelSensorsAttributes.LEVEL.name] = upper[0]
-        self.air_trap_level_sensors[AirTrapLevelSensors.H17_LEVEL.name][AirTrapLevelSensorsAttributes.RAW.name] = raw_lower[0]
-        self.air_trap_level_sensors[AirTrapLevelSensors.H16_LEVEL.name][AirTrapLevelSensorsAttributes.RAW.name] = raw_upper[0]
-        self.air_trap_valve_states[AirTrapValves.H13_VALV.name] = h13_vlv_st[0]
-        self.air_trap_valve_states[AirTrapValves.H20_VALV.name] = h20_vlv_st[0]
+        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_control = controlling[0]
         self.td_air_trap_timestamp = timestamp
 
@@ -218,8 +218,8 @@
             self.logger.debug("Timeout!!!!")
             return False
 
-    def cmd_set_td_air_trap_valve(self, valve: int = AirTrapValves.H13_VALV.value,
-                                  valve_state: int = AirTrapState.STATE_CLOSED.value) -> int:
+    def cmd_set_td_air_trap_valve(self, valve: int = TDAirTrapValves.H13_VALV.value,
+                                  valve_state: int = TDAirTrapState.STATE_CLOSED.value) -> int:
         """
         Constructs and sends an open/close command to the TD air trap valves.