Index: leahi_dialin/common/td_defs.py
===================================================================
diff -u -r3458640ba0ed2d88dc8806b203929295fb061ac3 -rfb12484da4c40826d78b90cec075dee8b42157eb
--- leahi_dialin/common/td_defs.py	(.../td_defs.py)	(revision 3458640ba0ed2d88dc8806b203929295fb061ac3)
+++ leahi_dialin/common/td_defs.py	(.../td_defs.py)	(revision fb12484da4c40826d78b90cec075dee8b42157eb)
@@ -1146,41 +1146,37 @@
 
 @unique
 class TDValvePositions(DialinEnum):
-    VALVE_POSITION_NOT_IN_POSITION  = 0                         # Valve not in Position
-    VALVE_POSITION_A_INSERT_LOAD    = 1                         # Insert/Eject Valve Position
-    VALVE_POSITION_B_OPEN_BLOOD     = 2                         # Open Valve Position
-    VALVE_POSITION_C_CLOSE_SALINE   = 3                         # Closed Valve Position
-    NUM_OF_VALVE_POSITIONS          = 4                         # Partial Close Valve Position
+    NOT_IN_POSITION                 = 0                         # Valve not in Position
+    A_INSERT_INSERT_EJECT           = 1                         # Insert/Eject Valve Position
+    B_OPEN_BLOOD                    = 2                         # Open Valve Position
+    C_CLOSE                         = 3                         # Closed Valve Position
+    NUM_OF_VALVE_POSITIONS          = 4                         # Number of valve positions
 
 TDValvePositions._str_list = {
     # Official Name :       Accepted strings
-    'VALVE_POSITION_NOT_IN_POSITION': ['not in position'],
-    'VALVE_POSITION_A_INSERT_LOAD': ['a', 'insert/eject', 'insert', 'eject', 'load'],
+    'NOT_IN_POSITION': ['not in position'],
+    'A_INSERT_INSERT_EJECT': ['a', 'insert/eject', 'insert', 'eject', 'load'],
     'VALVE_POSITION_B_OPEN_BLOOD': ['b', 'open', 'blood'],
-    'VALVE_POSITION_C_CLOSE_SALINE': ['c', 'close', 'closed', 'saline'],
-    'VALVE_POSITION_C_PARTIAL_CLOSE': [],
+    'B_OPEN_BLOOD': ['c', 'close', 'closed', 'saline'],
     'NUM_OF_VALVE_POSITIONS': [],
 }
 
 
 @unique
 class TDValveStates(DialinEnum):
-    VALVE_STATE_WAIT_FOR_POST                   = 0             # Waiting for POST Valve State
-    VALVE_STATE_HOMING_NOT_HOMED                = 1             # Valve state homing not homed.
-    VALVE_STATE_IDLE                            = 2             # Idle Valve State.
-    VALVE_STATE_IN_TRANSITION                   = 3             # Valve state in transition.
+    WAIT_FOR_POST                   = 0             # Waiting for POST Valve State
+    HOMING_NOT_HOMED                = 1             # Valve state homing not homed.
+    IDLE                            = 2             # Idle Valve State.
+    IN_TRANSITION                   = 3             # Valve state in transition.
+    NUM_OF_VALVE_STATES             = 4             # Number of valve states.
 
 TDValveStates._str_list = {
     # Official Name :       Accepted strings
-    'VALVE_STATE_WAIT_FOR_POST': ['wait', 'wait for post'],
-    'VALVE_STATE_RESET_VALVE': ['reset valve'],
-    'VALVE_STATE_RESET_ENCODER': ['reset encoder'],
-    'VALVE_STATE_ENABLE_VALVE': ['enable', 'enable valve'],
-    'VALVE_STATE_HOMING_NOT_STARTED': ['homing not started', 'not started'],
-    'VALVE_STATE_HOMING_FIND_ENERGIZED_EDGE': ['homing find energized edge'],
-    'VALVE_STATE_HOMING_FIND_DEENERGIZED_EDGE': ['homing find deenergized edge'],
-    'VALVE_STATE_IDLE': ['idle'],
-    'VALVE_STATE_IN_TRANSITION': [],
+    'WAIT_FOR_POST': ['wait', 'wait for post'],
+    'HOMING_NOT_HOMED': ['homing not started', 'not started'],
+    'IDLE': ['idle'],
+    'IN_TRANSITION': [],
+    'NUM_OF_VALVE_STATES': [],
 }