Index: leahi_dialin/common/td_defs.py
===================================================================
diff -u -r956757fac807b52aec078e84127089db5dff069f -r52aa7af16b98730ba59fc2577dbe8f73b5959775
--- leahi_dialin/common/td_defs.py	(.../td_defs.py)	(revision 956757fac807b52aec078e84127089db5dff069f)
+++ leahi_dialin/common/td_defs.py	(.../td_defs.py)	(revision 52aa7af16b98730ba59fc2577dbe8f73b5959775)
@@ -191,30 +191,30 @@
     NUM_OF_AIR_PUMP_ATTRIBUTES                              = 2     # Number of Air Pump attributes
 
 @unique
-class AirTrapValves(DialinEnum):
+class TDAirTrapValves(DialinEnum):
     H13_VALV                                                = 0     # Air trap intake valve
     H20_VALV                                                = 1     # Air trap outlet valve
     NUM_OF_AIR_TRAP_VALVES                                  = 2     # Number of Air Trap Valves
 
 @unique
-class AirTrapLevelSensors(DialinEnum):
+class TDAirTrapLevelSensors(DialinEnum):
     H17_LEVEL                                               = 0     # Lower Level Sensor
     H16_LEVEL                                               = 1     # Upper Level Sensor
     NUM_OF_AIR_TRAP_LEVEL_SENSORS                           = 2     # Number of TD Air Trap Level Sensors
 
 @unique
-class AirTrapLevelSensorsAttributes(DialinEnum):
+class TDAirTrapLevelSensorsAttributes(DialinEnum):
     LEVEL                                                   = 0     # Level attribute for Air Trap Level Sensor
     RAW                                                     = 1     # Raw reading attribute for Air Trap Level Sensor
     NUM_OF_AIR_TRAP_LEVEL_SENSOR_ATTRIBUTES                 = 2     # Number of Air Trap Level Sensor attributes
 
 @unique
-class AirTrapState(DialinEnum):
+class TDAirTrapState(DialinEnum):
     STATE_CLOSED                                            = 0     # Closed state for Air Trap
     STATE_OPEN                                              = 1     # Open state for Air Trap
 
 @unique
-class BloodFlowMotorAttributes(DialinEnum):
+class TDBloodFlowMotorAttributes(DialinEnum):
     SET_BLOOD_FLOW_RATE                                     = 0     # Set Blood Flow Rate for Blood Flow Motor
     MEASURED_BLOOD_FLOW_RATE                                = 1     # Measured Blood Flow Rate for Blood Flow Motor
     MEASURED_BLOOD_PUMP_ROTOR_SPEED                         = 2     # Measured Bloop Pump Rotor Speed for Blood Flow Motor
@@ -238,12 +238,12 @@
     NUM_OF_AIR_BUBBLE_DETECTOR_ATTRIBUTES                   = 2     # Number of Air Bubble Detector Attributes
 
 @unique
-class EjectorNames(DialinEnum):
+class TDEjectorNames(DialinEnum):
     H5_MOTOR                                                = 0     # TD Ejector Motor
     NUM_OF_EJECTOR_MOTORS                                   = 1     # Number of Ejector Motors
 
 @unique
-class EjectorAttributes(DialinEnum):
+class TDEjectorAttributes(DialinEnum):
     STATE                                                   = 0     # Ejector State to command
     SET_SPEED                                               = 1     # Ejector Set Speed
     NUM_OF_EJECTOR_ATTRIBUTES                               = 2     # Number of Ejector Attributes
@@ -297,19 +297,19 @@
     NUM_OF_TREATMENT_PARAMS                                 = 20    # Total number of treatment parameters
 
 @unique
-class ValvesEnum(DialinEnum):
+class TDValvesEnum(DialinEnum):
     H1_VALV                                                 = 0     # H1 Valve for TD
     H19_VALV                                                = 1     # H19 Valve for TD
 
 @unique
-class ValvesPositions(DialinEnum):
+class TDValvesPositions(DialinEnum):
     VALVE_POSITION_NOT_IN_POSITION                          = 0     # Valve not in Position
     VALVE_POSITION_A_INSERT_EJECT                           = 1     # Insert/Eject Valve Position
     VALVE_POSITION_B_OPEN                                   = 2     # Open Valve Position
     VALVE_POSITION_C_CLOSE                                  = 3     # Closed Valve Position
 
 @unique
-class ValvesStates(DialinEnum):
+class TDValvesStates(DialinEnum):
     VALVE_STATE_WAIT_FOR_POST                               = 0     # Waiting for POST Valve State
     VALVE_STATE_HOMING_NOT_STARTED                          = 1     # Homing not started Valve State
     VALVE_STATE_HOMING_FIND_ENERGIZED_EDGE                  = 2     # Homing Find Energized Edge Valve State