Index: leahi_dialin/td/modules/switches.py
===================================================================
diff -u -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df -r38e8dd31728056dbb7f9304c98ab16d7147b75a2
--- leahi_dialin/td/modules/switches.py	(.../switches.py)	(revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df)
+++ leahi_dialin/td/modules/switches.py	(.../switches.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 TDSwitchStatus, TDSwitchesNames
+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
@@ -46,7 +46,7 @@
             self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_switches_data,
                                                                        self._handler_switches_sync)
 
-        self.td_switches_status = {TDSwitchesNames.H9_FRONT_DOOR.name: TDSwitchStatus.CLOSED.value}
+        self.td_switches_status = {td_enum_repository.TDSwitchNames.H9_FRONT_DOOR.name: td_enum_repository.TDSwitchStatus.CLOSED.value}
         self.td_switches_timestamp = 0.0
 
 
@@ -61,7 +61,7 @@
         front_door = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
 
-        self.td_switches_status[TDSwitchesNames.H9_FRONT_DOOR.name] = TDSwitchStatus(front_door).value
+        self.td_switches_status[td_enum_repository.TDSwitchNames.H9_FRONT_DOOR.name] = td_enum_repository.TDSwitchStatus(front_door).value
         self.td_switches_timestamp = timestamp
 
 
@@ -102,7 +102,7 @@
         st = integer_to_bytearray(status)
         payload = reset_value + st + sw
 
-        switch_name = TDSwitchesNames(switch).name
+        switch_name = td_enum_repository.TDSwitchNames(switch).name
         return cmd_generic_override(
             payload = payload,
             reset = NO_RESET,