Index: leahi_dialin/td/modules/ejector.py
===================================================================
diff -u -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df -rc5bfcf84ed942ca5841bf9de155aa0f495b4d28d
--- leahi_dialin/td/modules/ejector.py	(.../ejector.py)	(revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df)
+++ leahi_dialin/td/modules/ejector.py	(.../ejector.py)	(revision c5bfcf84ed942ca5841bf9de155aa0f495b4d28d)
@@ -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 TDEjectorNames, TDEjectorAttributes
+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, float_to_bytearray
@@ -48,11 +48,11 @@
                                                                        self._handler_ejector_sync)
 
         self.h5_motor = {
-            TDEjectorNames.H5_MOTOR.name: {
-                TDEjectorAttributes.STATE.name: 0,
-                TDEjectorAttributes.SET_SPEED.name: 0.0,
-                TDEjectorAttributes.OPT_SNSR_RETRACT: 0,    # H25 Optical Sensor
-                TDEjectorAttributes.OPT_SNSR_ENGAGE: 0      # H24 Optical Sensor
+            td_enum_repository.TDEjectorNames.H5_MOTOR.name: {
+                td_enum_repository.TDEjectorAttributes.STATE.name: 0,
+                td_enum_repository.TDEjectorAttributes.SET_SPEED.name: 0.0,
+                td_enum_repository.TDEjectorAttributes.OPT_SNSR_RETRACT: 0,         # H25 Optical Sensor
+                td_enum_repository.TDEjectorAttributes.OPT_SNSR_ENGAGE: 0           # H24 Optical Sensor
             }
         }
         self.td_ejector_timestamp = 0
@@ -66,13 +66,13 @@
         @param message:  published ejector data message as: ejector state
         @return: None
         """
-        self.h5_motor[TDEjectorNames.H5_MOTOR.name][TDEjectorAttributes.STATE.name] = struct.unpack('i', bytearray(
+        self.h5_motor[td_enum_repository.TDEjectorNames.H5_MOTOR.name][td_enum_repository.TDEjectorAttributes.STATE.name] = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
-        self.h5_motor[TDEjectorNames.H5_MOTOR.name][TDEjectorAttributes.SET_SPEED.name] = struct.unpack('f', bytearray(
+        self.h5_motor[td_enum_repository.TDEjectorNames.H5_MOTOR.name][td_enum_repository.TDEjectorAttributes.SET_SPEED.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
-        self.h5_motor[TDEjectorNames.H5_MOTOR.name][TDEjectorAttributes.OPT_SNSR_RETRACT.name] = struct.unpack('i', bytearray(
+        self.h5_motor[td_enum_repository.TDEjectorNames.H5_MOTOR.name][td_enum_repository.TDEjectorAttributes.OPT_SNSR_RETRACT.name] = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
-        self.h5_motor[TDEjectorNames.H5_MOTOR.name][TDEjectorAttributes.OPT_SNSR_ENGAGE.name] = struct.unpack('i', bytearray(
+        self.h5_motor[td_enum_repository.TDEjectorNames.H5_MOTOR.name][td_enum_repository.TDEjectorAttributes.OPT_SNSR_ENGAGE.name] = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
 
         self.td_ejector_timestamp = timestamp