Index: TD_TreatmentStates/loader.py
===================================================================
diff -u -r03501309d607343ba120663e0abce74faeb34f59 -r9307b8315113adb7ad1823a19d58df6ea7e4ef8b
--- TD_TreatmentStates/loader.py	(.../loader.py)	(revision 03501309d607343ba120663e0abce74faeb34f59)
+++ TD_TreatmentStates/loader.py	(.../loader.py)	(revision 9307b8315113adb7ad1823a19d58df6ea7e4ef8b)
@@ -10,8 +10,7 @@
 from engine.dynamicloader   import DynamicLoader
 
 # plugin specific
-from leahi_dialin.common.td_defs  import TDTreatmentStates as TXStates
-from leahi_dialin.common.td_defs  import TDDialysisStates as DialStates
+from leahi_dialin.common.td_defs import td_enum_repository as TD_Defs
 
 # hd Simulator
 from leahi_dialin.ui.td_messaging import TD_Messaging
@@ -72,9 +71,9 @@
         initializes the widgets' properties
         :return: none
         """
-        self.tblSubMode            .setCurrentCell(TXStates.TREATMENT_START_STATE   .value  , 0)
+        self.tblSubMode            .setCurrentCell(TD_Defs.TDTreatmentStates.TREATMENT_START_STATE   .value  , 0)
         self.tblBloodPrimeStates   .setCurrentCell(0                                        , 0)
-        self.tblDialysisStates     .setCurrentCell(DialStates.DIALYSIS_UF_STATE     .value  , 0)
+        self.tblDialysisStates     .setCurrentCell(TD_Defs.TDDialysisStates.DIALYSIS_UF_STATE     .value  , 0)
         self.tblUFStates           .setCurrentCell(0                                        , 0)
         self.tblTreatmentStopStates.setCurrentCell(0                                        , 0)
         self.tblRinsebackStates    .setCurrentCell(0                                        , 0)
@@ -111,4 +110,4 @@
             tx_end_state         ,
             tx_saline_state      ,
             tx_heparin_state 
-        )
\ No newline at end of file
+        )