Index: TreatmentParameters/loader.py
===================================================================
diff -u -rbbec641c7f9e0c870581448fd953809b06a1c3b3 -r9307b8315113adb7ad1823a19d58df6ea7e4ef8b
--- TreatmentParameters/loader.py	(.../loader.py)	(revision bbec641c7f9e0c870581448fd953809b06a1c3b3)
+++ TreatmentParameters/loader.py	(.../loader.py)	(revision 9307b8315113adb7ad1823a19d58df6ea7e4ef8b)
@@ -15,8 +15,7 @@
 
 # dialin
 from leahi_dialin.ui.td_messaging   import TD_Messaging
-from leahi_dialin.common.td_defs    import TDOpModes
-from leahi_dialin.common.td_defs    import TDStandbyStates
+from leahi_dialin.common.td_defs    import TD_Defs
 from leahi_dialin.utils             import conversions
 from leahi_dialin.protocols         import CAN
 
@@ -88,17 +87,17 @@
     @Slot()
     def do_standby(self):
         self.td_interface.td_operation_mode(
-            TDOpModes.MODE_STAN.value,
-            TDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE.value
+            TD_Defs.TDOpModes.MODE_STAN.value,
+            TD_Defs.TDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE.value
         )
     
     @Slot()
     def do_create(self):
         if self.spnCreateRxRejectReason.value() == 0 :
             self.td_interface.td_Treatment_Parameters_CreateRx (0)
             self.td_interface.td_operation_mode(
-                TDOpModes.MODE_PRET.value,
-                TDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE.value
+                TD_Defs.TDOpModes.MODE_PRET.value,
+                TD_Defs.TDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE.value
             )
         else:
             self.td_interface.td_Treatment_Parameters_CreateRx (self.spnCreateRxRejectReason.value())
@@ -110,8 +109,8 @@
     @Slot()
     def do_confirm(self):
         self.td_interface.td_operation_mode(
-            TDOpModes.MODE_TREA.value,
-            TDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE.value
+            TD_Defs.TDOpModes.MODE_TREA.value,
+            TD_Defs.TDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE.value
         )
     
     @Slot()