Index: simulator/plugins/hdOpMode/loader.py
===================================================================
diff -u -r967521dff94783ce48b50abc8db6bcd67bb501bf -r9696f8b120608ac427f8b85d4f8ed2fd259e5d9e
--- simulator/plugins/hdOpMode/loader.py	(.../loader.py)	(revision 967521dff94783ce48b50abc8db6bcd67bb501bf)
+++ simulator/plugins/hdOpMode/loader.py	(.../loader.py)	(revision 9696f8b120608ac427f8b85d4f8ed2fd259e5d9e)
@@ -12,7 +12,7 @@
 from simulator.interface import SimulationInterface
 # plugin specific
 from dialin.common.hd_defs import HDOpModes
-from dialin.common.hd_defs import HD_Standby_States
+from dialin.common.hd_defs import StandbyStates
 
 
 class Loader(DynamicLoader):
@@ -55,7 +55,7 @@
         """
         self.tblOpMode.setCurrentCell(HDOpModes.MODE_INIT.value, 0)
         self.tblOpMode.horizontalHeaderItem(0).setTextAlignment(QtCore.Qt.AlignLeft)
-        self.tblSubMode.setCurrentCell(HD_Standby_States.STANDBY_START_STATE.value, 0)
+        self.tblSubMode.setCurrentCell(StandbyStates.STANDBY_START_STATE.value, 0)
         self.tblSubMode.horizontalHeaderItem(0).setTextAlignment(QtCore.Qt.AlignLeft)
 
     @Slot()
Index: simulator/plugins/pretreatmentstates/loader.py
===================================================================
diff -u -r967521dff94783ce48b50abc8db6bcd67bb501bf -r9696f8b120608ac427f8b85d4f8ed2fd259e5d9e
--- simulator/plugins/pretreatmentstates/loader.py	(.../loader.py)	(revision 967521dff94783ce48b50abc8db6bcd67bb501bf)
+++ simulator/plugins/pretreatmentstates/loader.py	(.../loader.py)	(revision 9696f8b120608ac427f8b85d4f8ed2fd259e5d9e)
@@ -78,15 +78,15 @@
         initializes the widgets' properties
         :return: none
         """
-        self.tblSubMode.setCurrentCell(HD_Pre_Treatment_Mode_States.HD_PRE_TREATMENT_START_STATE.value, 0)
-        self.tblWaterSampleStates.setCurrentCell(HD_Pre_Treatment_Sample_Water_States.SAMPLE_WATER_SETUP_STATE.value, 0)
-        self.tblConsumablesSelfTestStates.setCurrentCell(HD_Pre_Treatment_Consumable_Self_Test_States.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, 0)
-        self.tblNoCartridgeSelfTestStates.setCurrentCell(HD_Pre_Treatment_No_Cart_Self_Tests_States.NO_CART_SELF_TESTS_START_STATE.value, 0)
-        self.tblInstallationStates.setCurrentCell(HD_Pre_Treatment_Cartridge_Install_States.CARTRIDGE_INSTALL_STATE.value, 0)
-        self.tblDrySelfTestStates.setCurrentCell(HD_Pre_Treatment_Dry_Self_Tests_States.DRY_SELF_TESTS_START_STATE.value, 0)
-        self.tblPrimeStates.setCurrentCell(HD_Pre_Treatment_Prime_States.HD_PRIME_START_STATE.value, 0)
-        self.tblRecirculateStates.setCurrentCell(HD_Pre_Treatment_Recirc_States.PRE_TREATMENT_RECIRC_STATE.value, 0)
-        self.tblPatientConnectionStates.setCurrentCell(HD_Pre_Treatment_Patient_Connection_States.PATIENT_CONNECTION_STATE.value, 0)
+        self.tblSubMode.setCurrentCell(PreTreatmentModeStates.HD_PRE_TREATMENT_START_STATE.value, 0)
+        self.tblWaterSampleStates.setCurrentCell(PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value, 0)
+        self.tblConsumablesSelfTestStates.setCurrentCell(PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, 0)
+        self.tblNoCartridgeSelfTestStates.setCurrentCell(PreTreatmentNoCartSelfTestsStates.NO_CART_SELF_TESTS_START_STATE.value, 0)
+        self.tblInstallationStates.setCurrentCell(PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, 0)
+        self.tblDrySelfTestStates.setCurrentCell(PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, 0)
+        self.tblPrimeStates.setCurrentCell(PreTreatmentPrimeStates.HD_PRIME_START_STATE.value, 0)
+        self.tblRecirculateStates.setCurrentCell(PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, 0)
+        self.tblPatientConnectionStates.setCurrentCell(PreTreatmentPatientConnectionStates.PATIENT_CONNECTION_STATE.value, 0)
 
         self.tblSubMode.horizontalHeaderItem(0).setTextAlignment(QtCore.Qt.AlignLeft)
         self.tblWaterSampleStates.horizontalHeaderItem(0).setTextAlignment(QtCore.Qt.AlignLeft)
Index: simulator/plugins/rinseback/loader.py
===================================================================
diff -u -r967521dff94783ce48b50abc8db6bcd67bb501bf -r9696f8b120608ac427f8b85d4f8ed2fd259e5d9e
--- simulator/plugins/rinseback/loader.py	(.../loader.py)	(revision 967521dff94783ce48b50abc8db6bcd67bb501bf)
+++ simulator/plugins/rinseback/loader.py	(.../loader.py)	(revision 9696f8b120608ac427f8b85d4f8ed2fd259e5d9e)
@@ -107,4 +107,4 @@
         timeout_total = self.sldTimeoutTotal.value()
         timeout_countdown = self.sldTimeoutCountDown.value()
 
-        self.interface.hd.cmd_send_treatment_rinseback_data(target, current, rate, timeout_total, timeout_countdown)
+        self.interface.hd.cmd_send_treatment_rinseback_data(target, current, rate, timeout_total, timeout_countdown, 0)
Index: tst_HomeScreen/test.py
===================================================================
diff -u -r2cebcfa1c6995bc48c71bcf7367e2695a8d1cb24 -r9696f8b120608ac427f8b85d4f8ed2fd259e5d9e
--- tst_HomeScreen/test.py	(.../test.py)	(revision 2cebcfa1c6995bc48c71bcf7367e2695a8d1cb24)
+++ tst_HomeScreen/test.py	(.../test.py)	(revision 9696f8b120608ac427f8b85d4f8ed2fd259e5d9e)
@@ -21,7 +21,7 @@
     
     startApplication(names.AUT_NAME)
     utils.waitForGUI(1)
-
+    
     test.compare(    waitForObjectExists(names.o_treatmentHome).visible, True)
     test.compare(str(waitForObjectExists(names.o_treatmentHome_startTreatment ).text.text), "START TREATMENT"           , utils.SRSUI(24))
     test.compare(str(waitForObjectExists(names.o_treatmentHome_createTreatment).text.text), "CREATE TREATMENT"          , utils.SRSUI(532))