Index: shared/scripts/names.py
===================================================================
diff -u -r924a4689193e14669a4639d2a90c437e5c46c704 -r66579e2dfbba8c77673add25b3fa6ebaba4b4f10
--- shared/scripts/names.py	(.../names.py)	(revision 924a4689193e14669a4639d2a90c437e5c46c704)
+++ shared/scripts/names.py	(.../names.py)	(revision 66579e2dfbba8c77673add25b3fa6ebaba4b4f10)
@@ -936,12 +936,16 @@
 o_EndTreatmentBase_RECONNECT_Text = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "text": "RECONNECT", "type": "Text", "unnamed": 1, "visible": True}
 #Reconnect button text
 o_EndTreatmentBase_Reconnect_Text = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "text": "Reconnect", "type": "Text", "unnamed": 1, "visible": True}
+o_EndTreatmentBase_TouchRect = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "type": "TouchRect", "unnamed": 1, "visible": True}
 #End Treatment button text
 o_EndTreatmentBase_END_TREATMENT_Text = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "text": "END TREATMENT", "type": "Text", "unnamed": 1, "visible": True}
+o_EndTreatmentBase_mouseArea_MouseArea = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "id": "_mouseArea", "occurrence": 2, "type": "MouseArea", "unnamed": 1, "visible": True}
 #Back to recirculate button text
 o_EndTreatmentBase_BACK_TO_RECIRCULATE_Text = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "text": "BACK TO RECIRCULATE", "type": "Text", "unnamed": 1, "visible": True}
+o_EndTreatmentBase_mouseArea_MouseArea_2 = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "id": "_mouseArea", "type": "MouseArea", "unnamed": 1, "visible": True}
 #Recirculate stop state confirm button text
 o_EndTreatmentBase_confirm_Text = {"container": o_EndTreatmentRecirculateStack_EndTreatmentRecirculateStack, "type": "Text", "unnamed": 1, "visible": True}
+o_EndTreatmentBase_mouseArea_MouseArea_3 = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "id": "_mouseArea", "occurrence": 3, "type": "MouseArea", "unnamed": 1, "visible": True}
 #Recirculate timer seconds object
 o_EndTreatmentBase_TimeText_minute_Text = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "objectName": "_TimeText_minute", "type": "Text", "visible": True}
 #Recirculate timer minutes object
@@ -950,6 +954,8 @@
 o_recirculate_rejection_msg = {"container":  o_EndTreatmentRecirculateStack_EndTreatmentRecirculateStack, "type": "Text", "unnamed": 1, "visible": True}
 o_postModeScreen_ScreenItem = {"container": o_Gui_MainView, "id": "_postModeScreen", "type": "ScreenItem", "unnamed": 1, "visible": True}
 
+
+
 #alarm minimize button
 o_minimize_button = {"container": o_Overlay, "id": "_image", "source": "qrc:/images/iChevronDown", "type": "Image", "unnamed": 1, "visible": True}
 o_SettingsHome_SettingsHome = {"container": o_Gui_MainView, "objectName": "_SettingsHome", "type": "SettingsHome", "visible": True}
@@ -1057,6 +1063,7 @@
 o_back_button_text = {"container": o_Gui_MainView, "text":"BACK", "type": "Text", "unnamed": 1, "visible": True}
 o_preTreatmentDisposablesStack_preTreatmentDisposablesSalineBag_TreatmentFlowBase = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "objectName": "_preTreatmentDisposablesSalineBag", "type": "TreatmentFlowBase", "visible": True}
 o_confirm_button_text = {"container": o_preTreatmentDisposablesStack_preTreatmentDisposablesSalineBag_TreatmentFlowBase, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True}
+o_patientDisconnectionConfirm_confirmButton_TouchRect = {"container": o_PostTreatmentStack_patientDisconnectionConfirm_TreatmentFlowBase, "gradient": 0, "objectName": "_confirmButton", "type": "TouchRect", "visible": True}
 
 
 
Index: tst_recirculate/test.py
===================================================================
diff -u -rf2eeafd6fa6977184f7cb090f97a4f7c1a04b1cb -r66579e2dfbba8c77673add25b3fa6ebaba4b4f10
--- tst_recirculate/test.py	(.../test.py)	(revision f2eeafd6fa6977184f7cb090f97a4f7c1a04b1cb)
+++ tst_recirculate/test.py	(.../test.py)	(revision 66579e2dfbba8c77673add25b3fa6ebaba4b4f10)
@@ -52,10 +52,10 @@
     test.compare(str(waitForObject(names.o_recirculate_text).text), config.RECIRCULATE_TEXT, "Recirculate text must be {}".format(config.RECIRCULATE_TEXT))
     test.compare(str(waitForObjectExists(names.o_EndTreatmentBase_RECONNECT_Text).text), config.RECONNECT_BUTTON_TEXT, "Reconnect button text must be {}".format(config.RECONNECT_BUTTON_TEXT))
     test.verify(waitForObjectExists(names.o_EndTreatmentBase_RECONNECT_Text).enabled, "Reconnect button must be active")
-    mouseClick(waitForObject(names.o_EndTreatmentBase_RECONNECT_Text))
+    mouseClick(waitForObject(names.o_EndTreatmentBase_mouseArea_MouseArea_2))
     test.compare(str(waitForObjectExists(names.o_EndTreatmentBase_END_TREATMENT_Text).text), config.END_TREATMENT_BUTTON_TEXT, "End Treatment button text must be {}".format(config.END_TREATMENT_BUTTON_TEXT))
     test.verify(waitForObjectExists(names.o_EndTreatmentBase_END_TREATMENT_Text).enabled, "End Treatment button on recirculate state screen must be active")
-    mouseClick(waitForObject(names.o_EndTreatmentBase_END_TREATMENT_Text))
+    mouseClick(waitForObject(names.o_EndTreatmentBase_mouseArea_MouseArea))
     verify_right_instruction_in_recirculate_state(NUM_OF_INSTRUCTION)
     verify_left_instruction_in_recirculate_state(NUM_OF_INSTRUCTION)
     verify_right_instruction_in_recirculate_state(NUM_OF_INSTRUCTION)
@@ -83,12 +83,12 @@
     test.compare(str(waitForObject(names.o_EndTreatmentBase_Reconnect_Text).text), config.RECONNECT_TEXT, "Reconnect text must be {}".format(config.RECONNECT_TEXT))
     test.compare(str(waitForObjectExists(names.o_EndTreatmentBase_BACK_TO_RECIRCULATE_Text).text), config.BACK_TO_RECIRCULATE_TEXT, "Back to recirculate button text must be {}".format(config.BACK_TO_RECIRCULATE_TEXT))
     test.verify(waitForObjectExists(names.o_EndTreatmentBase_BACK_TO_RECIRCULATE_Text).enabled, "Back to recirculate button must be active")
-    mouseClick(waitForObject(names.o_EndTreatmentBase_BACK_TO_RECIRCULATE_Text))
+    mouseClick(waitForObject(names.o_EndTreatmentBase_mouseArea_MouseArea_2))
     test.compare(str(waitForObjectExists(names.o_EndTreatmentBase_END_TREATMENT_Text).text), config.END_TREATMENT_BUTTON_TEXT, "End Treatment button text must be {}".format(config.END_TREATMENT_BUTTON_TEXT))
     test.verify(waitForObjectExists(names.o_EndTreatmentBase_END_TREATMENT_Text).enabled, "End Treatment button on recirculate stopped state screen must be active")
-    mouseClick(waitForObject(names.o_EndTreatmentBase_END_TREATMENT_Text))
+    mouseClick(waitForObject(names.o_EndTreatmentBase_mouseArea_MouseArea))
     test.verify(waitForObjectExists(names.o_EndTreatmentBase_confirm_Text).enabled, "Confirm button on recirculate stopped state screen must be active")
-    mouseClick(waitForObject(names.o_EndTreatmentBase_confirm_Text))
+    mouseClick(waitForObject(names.o_EndTreatmentBase_mouseArea_MouseArea_3))
     verify_rejection_messages_for_recirculate()
     test.endSection()