Index: leahi_dialin/td/modules/ejector.py
===================================================================
diff -u -r956757fac807b52aec078e84127089db5dff069f -r52aa7af16b98730ba59fc2577dbe8f73b5959775
--- leahi_dialin/td/modules/ejector.py	(.../ejector.py)	(revision 956757fac807b52aec078e84127089db5dff069f)
+++ leahi_dialin/td/modules/ejector.py	(.../ejector.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 EjectorNames, EjectorAttributes
+from leahi_dialin.common.td_defs import TDEjectorNames, TDEjectorAttributes
 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,9 +49,9 @@
                                                                        self._handler_ejector_sync)
 
         self.h5_motor = {
-            EjectorNames.H5_MOTOR.name: {
-                EjectorAttributes.STATE.name: 0,
-                EjectorAttributes.SET_SPEED.name: 0.0
+            TDEjectorNames.H5_MOTOR.name: {
+                TDEjectorAttributes.STATE.name: 0,
+                TDEjectorAttributes.SET_SPEED.name: 0.0
             }
         }
         self.td_ejector_timestamp = 0
@@ -64,9 +64,9 @@
         @param message:  published ejector data message as: ejector state
         @return: None
         """
-        self.h5_motor[EjectorNames.H5_MOTOR.name][EjectorAttributes.STATE.name] = struct.unpack('i', bytearray(
+        self.h5_motor[TDEjectorNames.H5_MOTOR.name][TDEjectorAttributes.STATE.name] = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
-        self.h5_motor[EjectorNames.H5_MOTOR.name][EjectorAttributes.SET_SPEED.name] = struct.unpack('f', bytearray(
+        self.h5_motor[TDEjectorNames.H5_MOTOR.name][TDEjectorAttributes.SET_SPEED.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
 
         self.td_ejector_timestamp = timestamp