Index: tst_patient_id/test.py
===================================================================
diff -u -r505c37597370bce35a380ab1313fbc9ef07d1db4 -r852a5bea765cd55d4d10ad926cc80f36d0422f3b
--- tst_patient_id/test.py	(.../test.py)	(revision 505c37597370bce35a380ab1313fbc9ef07d1db4)
+++ tst_patient_id/test.py	(.../test.py)	(revision 852a5bea765cd55d4d10ad926cc80f36d0422f3b)
@@ -110,8 +110,8 @@
             utils.waitForGUI(.2)
         
     test.compare(actual_value, (patient_id_input.text), "Patient id should be -> "+ str(actual_value))
-    verify_confirm_button_based_on_patient_id(expected_value)
-    mouseClick(waitForObject(names.o_confirm_button))
+    verify_continue_button_based_on_patient_id(expected_value)
+    mouseClick(waitForObject(names.o_continue_text_button))
     
     custom_treatment = waitForObject(names.o_custom_treatment)
     test.compare("Create a Custom Treatment", custom_treatment.text)
@@ -131,8 +131,8 @@
     test.compare(actual_value, (patient_id_input.text))
     test.log("Patient id should be ->" + expected_value)
     
-    verify_confirm_button_based_on_patient_id(expected_value)
-    mouseClick(waitForObject(names.o_confirm_button))
+    verify_continue_button_based_on_patient_id(expected_value)
+    mouseClick(waitForObject(names.o_continue_text_button))
     
     custom_treatment = waitForObject(names.o_custom_treatment)
     test.compare("Create a Custom Treatment", custom_treatment.text)
@@ -141,27 +141,25 @@
     mouseClick(waitForObject(names.o_create_back_button))
 
 
-def verify_confirm_button_based_on_patient_id(patient_id):
+def verify_continue_button_based_on_patient_id(patient_id):
     """
-        Tests verifies confirm button based on patient id.
+        Tests verifies skip and continue button based on patient id.
         @input : patient id to be set
         @return: N/A
     """
     utils.waitForGUI(1)
     if patient_id is None:
         mouseClick( waitForObject(names.o_input_patient_id))
         type( waitForObject(names.o_input_patient_id), " ")
-        confirm_button_status = findObject(names.o_confirm_button)
-        if confirm_button_status.enabled == True:
-            test.passes("Confirm button disabled without patient id")
-        else:
-            test.fail("Confirm button enabled without patient id")
+        skip_button_status = findObject(names.o_skip_text_button)
+        if skip_button_status.enabled == True:
+            test.passes("Skip button enabled without patient id")
     else:
-        confirm_button_status = waitForObject(names.o_confirm_button)
-        if confirm_button_status.enabled == True:
-            test.passes("Confirm button enabled with patient id ->  " + str(patient_id))
+        continue_button_status = waitForObject(names.o_continue_text_button)
+        if continue_button_status.enabled == True:
+            test.passes("Continue button enabled with patient id ->  " + str(patient_id))
         else:
-            test.fail("Confirm button disabled with patient id -> " + str(patient_id))
+            test.fail("Continue button disabled with patient id -> " + str(patient_id))
         
         
 def verify_invalid_patient_id_through_user_input(expected_value):
@@ -196,8 +194,8 @@
         mouseClick(waitForObject(names.o_PreTreatmentPatientid_back_button))
         verify_valid_patient_id_through_user_input(expected_patient_id, actual_patient_id)
 
-    #verification of confirm button without giving patient id
-    verify_confirm_button_based_on_patient_id(patient_id = None)
+    #verification of continue button without giving patient id
+    verify_continue_button_based_on_patient_id(patient_id = None)
     
     utils.tstDone()