Index: leahi_dialin/td/modules/ejector.py
===================================================================
diff -u -r6944f314294da17334cb50aea33b044c83daa95d -r71975b0c600fd9bd4b2a43cc707e6b0a2012f8b0
--- leahi_dialin/td/modules/ejector.py	(.../ejector.py)	(revision 6944f314294da17334cb50aea33b044c83daa95d)
+++ leahi_dialin/td/modules/ejector.py	(.../ejector.py)	(revision 71975b0c600fd9bd4b2a43cc707e6b0a2012f8b0)
@@ -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 TDEjectorNames, TDEjectorAttributes
+from leahi_dialin.common.td_defs import td_enum_repository
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish
 from leahi_dialin.utils.checks import check_broadcast_interval_override_ms
@@ -49,11 +49,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