Index: TD_OpMode/loader.py
===================================================================
diff -u -r9307b8315113adb7ad1823a19d58df6ea7e4ef8b -r2804a0aa7699197ae2cbaf2d68cd1f9dd30172dd
--- TD_OpMode/loader.py	(.../loader.py)	(revision 9307b8315113adb7ad1823a19d58df6ea7e4ef8b)
+++ TD_OpMode/loader.py	(.../loader.py)	(revision 2804a0aa7699197ae2cbaf2d68cd1f9dd30172dd)
@@ -12,7 +12,7 @@
 from engine.dynamicloader   import DynamicLoader
 
 # plugin specific
-from leahi_dialin.common.td_defs import td_enum_repository as TD_Defs
+from leahi_dialin.common.td_defs import TDOpModes, TDStandbyStates
 
 # dialin
 from leahi_dialin.ui.td_messaging import TD_Messaging
@@ -54,9 +54,9 @@
         initializes the widgets' properties
         :return: none
         """
-        self.tblOpMode.setCurrentCell(TD_Defs.TDOpModes.MODE_INIT.value, 0)
+        self.tblOpMode.setCurrentCell(TDOpModes.MODE_INIT.value, 0)
         self.tblOpMode.horizontalHeaderItem(0).setTextAlignment(QtCore.Qt.AlignLeft)
-        self.tblSubMode.setCurrentCell(TD_Defs.TDStandbyStates.STANDBY_START_STATE.value, 0)
+        self.tblSubMode.setCurrentCell(TDStandbyStates.STANDBY_START_STATE.value, 0)
         self.tblSubMode.horizontalHeaderItem(0).setTextAlignment(QtCore.Qt.AlignLeft)
 
     @Slot()
Index: TD_TreatmentStates/loader.py
===================================================================
diff -u -r9307b8315113adb7ad1823a19d58df6ea7e4ef8b -r2804a0aa7699197ae2cbaf2d68cd1f9dd30172dd
--- TD_TreatmentStates/loader.py	(.../loader.py)	(revision 9307b8315113adb7ad1823a19d58df6ea7e4ef8b)
+++ TD_TreatmentStates/loader.py	(.../loader.py)	(revision 2804a0aa7699197ae2cbaf2d68cd1f9dd30172dd)
@@ -10,7 +10,7 @@
 from engine.dynamicloader   import DynamicLoader
 
 # plugin specific
-from leahi_dialin.common.td_defs import td_enum_repository as TD_Defs
+from leahi_dialin.common.td_defs import TDTreatmentStates, TDDialysisStates
 
 # hd Simulator
 from leahi_dialin.ui.td_messaging import TD_Messaging
@@ -71,9 +71,9 @@
         initializes the widgets' properties
         :return: none
         """
-        self.tblSubMode            .setCurrentCell(TD_Defs.TDTreatmentStates.TREATMENT_START_STATE   .value  , 0)
+        self.tblSubMode            .setCurrentCell(TDTreatmentStates.TREATMENT_START_STATE   .value  , 0)
         self.tblBloodPrimeStates   .setCurrentCell(0                                        , 0)
-        self.tblDialysisStates     .setCurrentCell(TD_Defs.TDDialysisStates.DIALYSIS_UF_STATE     .value  , 0)
+        self.tblDialysisStates     .setCurrentCell(TDDialysisStates.DIALYSIS_UF_STATE     .value  , 0)
         self.tblUFStates           .setCurrentCell(0                                        , 0)
         self.tblTreatmentStopStates.setCurrentCell(0                                        , 0)
         self.tblRinsebackStates    .setCurrentCell(0                                        , 0)