Index: shared/scripts/configuration/utility.py
===================================================================
diff -u -r0f06b360b4e6dc3bbcd153c5773d8b6f9e953e65 -r8161dad7c8e82558df7e562ce5862b919a5d8ebf
--- shared/scripts/configuration/utility.py	(.../utility.py)	(revision 0f06b360b4e6dc3bbcd153c5773d8b6f9e953e65)
+++ shared/scripts/configuration/utility.py	(.../utility.py)	(revision 8161dad7c8e82558df7e562ce5862b919a5d8ebf)
@@ -513,33 +513,34 @@
     test.endSection()
        
 
-def verify_page_step_indicator(screen_obj, pre_treatment_step):
+def verify_page_step_indicator(screen_obj, treatment_step, treatment_screens):
     """    
     Method to verify the Page Step indicators [the object on top of the screen which indicates the steps passed, current, remained]
-    @param pre_treatment_step : (int) indicates the Current pre-treatment step 
+    @param treatment_step : (int) indicates the Current treatment step 
     """    
+
     test.startSection("verification of page step indicators")
-    for page in range(len(config.PRE_TREATMENT_SCREENS)):
+    for page in range(len(treatment_screens)):
         bullet_children = object.children(squish.waitForObjectExists(get_bullet_object(screen_obj, page)))
         bullet_circle_color = bullet_children[0].color.name 
         bullet_border_color = bullet_children[0].border.color.name
-        step_title =  squish.waitForObjectExists(get_text_object(screen_obj, config.PRE_TREATMENT_SCREENS[page])) 
-        #To verify the step indicators of the completed pre treatment screens
-        if page < pre_treatment_step:
+        step_title =  squish.waitForObjectExists(get_text_object(screen_obj, treatment_screens[page])) 
+        #To verify the step indicators of the completed treatment screens
+        if page < treatment_step:
             test.verify(squish.waitForObjectExists(get_bullet_object(screen_obj, page)).complete)
             test.verify(not squish.waitForObjectExists(get_bullet_object(screen_obj, page)).current)
             test.compare(bullet_circle_color, config.COMPLETE_COLOR)
-            test.compare(bullet_border_color, config.COMPLETE_COLOR) 
-            test.compare(step_title.color.name, config.ENABLED_COLOR)
-        #To verify the step indicators of the current pre treatment screen
-        elif page == pre_treatment_step:
+            test.compare(bullet_border_color,config.COMPLETE_COLOR) 
+            test.compare(step_title.color.name,config.ENABLED_COLOR)
+        #To verify the step indicators of the current treatment screen
+        elif page == treatment_step:
             test.verify(squish.waitForObjectExists(get_bullet_object(screen_obj, page)).current,)
             test.verify(not squish.waitForObjectExists(get_bullet_object(screen_obj, page)).complete)
             test.compare(bullet_circle_color, config.CURRENT_COLOR)
             test.compare(bullet_border_color, config.COMPLETE_COLOR)
             test.compare(step_title.color.name, config.ENABLED_COLOR)
             test.verify(step_title.font.bold)  
-        #To verify the step indicators of the remaining pre-treatment screens   
+        #To verify the step indicators of the remaining treatment screens   
         else:
             test.verify(not squish.waitForObjectExists(get_bullet_object(screen_obj, page)).current,)
             test.verify(not squish.waitForObjectExists(get_bullet_object(screen_obj, page)).complete,)
@@ -931,7 +932,7 @@
             test.compare(step_title.color.name, config.ENABLED_COLOR, " the text color must be " + str(config.ENABLED_COLOR))
 
         elif page == post_treatment_step:
-            test.log("To verify the step indicators of the current post-treatment screen " + config.POST_TREATMENT_SCREENS[page]) 
+            test.log("To verify the step indicators of the current treatment screen " + treatment_screens[page]) 
             test.verify(squish.waitForObjectExists(get_bullet_object(screen_obj, page)).current)
             test.verify(not squish.waitForObjectExists(get_bullet_object(screen_obj, page)).complete)
             test.compare(bullet_circle_color,config.CURRENT_COLOR," the bullet color must be " + str(config.CURRENT_COLOR))
@@ -940,7 +941,7 @@
             test.verify(step_title.font.bold, " the current text must be in bold")  
 
         else:
-            test.log("To verify the step indicators of the remaining post-treatment screen " + config.POST_TREATMENT_SCREENS[page])
+            test.log("To verify the step indicators of the remaining treatment screen " + treatment_screens[page])
             test.verify(not squish.waitForObjectExists(get_bullet_object(screen_obj, page)).current,)
             test.verify(not squish.waitForObjectExists(get_bullet_object(screen_obj, page)).complete,)
             test.compare(step_title.color.name,config.INCOMPLETE_COLOR, " the text color must be " + str(config.INCOMPLETE_COLOR))