Index: shared/scripts/names.py
===================================================================
diff -u -r151dbbd47b6a62cd0f35d482b23f1b4456115db4 -r924a4689193e14669a4639d2a90c437e5c46c704
--- shared/scripts/names.py	(.../names.py)	(revision 151dbbd47b6a62cd0f35d482b23f1b4456115db4)
+++ shared/scripts/names.py	(.../names.py)	(revision 924a4689193e14669a4639d2a90c437e5c46c704)
@@ -887,6 +887,7 @@
 o_fluid_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "Volume Delivered", "type": "Text", "unnamed": 1, "visible": True}
 o_cumulative_fluid_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "Cumulative Delivered", "type": "Text", "unnamed": 1, "visible": True}
 o_mainItem_Item = {"container": o_Gui_MainView, "id": "_mainItem", "type": "Item", "unnamed": 1, "visible": True}
+o_PreTreatmentBase_mouseArea_MouseArea = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "id": "_mouseArea", "occurrence": 2, "type": "MouseArea", "unnamed": 1, "visible": True}
 
 #cloud_sync_device_registeration
 
Index: tst_patient_id/test.py
===================================================================
diff -u -r852a5bea765cd55d4d10ad926cc80f36d0422f3b -r924a4689193e14669a4639d2a90c437e5c46c704
--- tst_patient_id/test.py	(.../test.py)	(revision 852a5bea765cd55d4d10ad926cc80f36d0422f3b)
+++ tst_patient_id/test.py	(.../test.py)	(revision 924a4689193e14669a4639d2a90c437e5c46c704)
@@ -132,7 +132,7 @@
     test.log("Patient id should be ->" + expected_value)
     
     verify_continue_button_based_on_patient_id(expected_value)
-    mouseClick(waitForObject(names.o_continue_text_button))
+    mouseClick(waitForObject(names.o_PreTreatmentBase_confirmButton_TouchRect_2))
     
     custom_treatment = waitForObject(names.o_custom_treatment)
     test.compare("Create a Custom Treatment", custom_treatment.text)
@@ -155,7 +155,7 @@
         if skip_button_status.enabled == True:
             test.passes("Skip button enabled without patient id")
     else:
-        continue_button_status = waitForObject(names.o_continue_text_button)
+        continue_button_status = waitForObject(names.o_PreTreatmentBase_confirmButton_TouchRect_2)
         if continue_button_status.enabled == True:
             test.passes("Continue button enabled with patient id ->  " + str(patient_id))
         else:
@@ -187,6 +187,13 @@
     
     hd.cmd_send_hd_operation_mode(4, 0)
     utils.waitForGUI(1)
+    mouseClick(waitForObject(names.o_PreTreatmentBase_confirmButton_TouchRect_2))
+    utils.waitForGUI(0.2)    
+    mouseClick(waitForObject(names.o_PreTreatmentCreate_backButton_BackButton))
+    utils.waitForGUI(0.2)
+    mouseClick(waitForObject(names.o_PreTreatmentPatientid_back_button))
+    hd.cmd_send_hd_operation_mode(4, 0)
+    utils.waitForGUI(1)
     
     mouseClick(waitForObject(names.o_input_patient_id))
     for expected_patient_id, actual_patient_id in config.PATIENT_ID_COMBINATION.items():