Index: leahi_dialin/common/td_defs.py
===================================================================
diff -u -r28a21f1f2ca4ef02e6d54bae30b738fddb7bdb3a -rd10bf8fc145e54979dbeadaedfbaccf0f45d8234
--- leahi_dialin/common/td_defs.py	(.../td_defs.py)	(revision 28a21f1f2ca4ef02e6d54bae30b738fddb7bdb3a)
+++ leahi_dialin/common/td_defs.py	(.../td_defs.py)	(revision d10bf8fc145e54979dbeadaedfbaccf0f45d8234)
@@ -1137,24 +1137,24 @@
 # Syringe pump operations
 @unique
 class TDSyringePumpStates(DialinEnum):
-    SYRINGE_PUMP_OP_STOP       = 0                              # Stop syringe pump
-    SYRINGE_PUMP_OP_RETRACT    = 1                              # Retract syringe pump
-    SYRINGE_PUMP_OP_SEEK       = 2                              # Seek plunger
-    SYRINGE_PUMP_OP_PRIME      = 3                              # Prime Heparin line
-    SYRINGE_PUMP_OP_BOLUS      = 4                              # Deliver Heparin bolus of set volume over 5 minutes
-    SYRINGE_PUMP_OP_CONTINUOUS = 5                              # Continuous dispense of Heparin at set rate
-    SYRINGE_PUMP_OP_PRELOAD    = 6                              # Preload syringe pump
-    NUM_OF_SYRINGE_PUMP_STATES = 7                              # Number of Syringe pump States
+    STOP                        = 0                             # Stop syringe pump
+    RETRACT                     = 1                             # Retract syringe pump
+    SEEK                        = 2                             # Seek plunger
+    PRIME                       = 3                             # Prime Heparin line
+    BOLUS                       = 4                             # Deliver Heparin bolus of set volume over 5 minutes
+    CONTINUOUS                  = 5                             # Continuous dispense of Heparin at set rate
+    PRELOAD                     = 6                             # Preload syringe pump
+    NUM_OF_SYRINGE_PUMP_STATES  = 7                             # Number of Syringe pump States
 
 TDSyringePumpStates._str_list = {
     # Official Name :       Accepted strings
-    'SYRINGE_PUMP_OP_STOP': ['stop'],
-    'SYRINGE_PUMP_OP_RETRACT': ['retract'],
-    'SYRINGE_PUMP_OP_SEEK': ['seek'],
-    'SYRINGE_PUMP_OP_PRIME': ['prime'],
-    'SYRINGE_PUMP_OP_BOLUS': ['bolus'],
-    'SYRINGE_PUMP_OP_CONTINUOUS': ['continuous'],
-    'SYRINGE_PUMP_OP_PRELOAD': ['preload'],
+    'STOP': [],
+    'RETRACT': [],
+    'SEEK': [],
+    'PRIME': [],
+    'BOLUS': [],
+    'CONTINUOUS': [],
+    'PRELOAD': [],
     'NUM_OF_SYRINGE_PUMP_STATES': [],
 }