Index: shared/scripts/configuration/utility.py
===================================================================
diff -u -rf8060c14b5c90ebd48576d210e9b1803f5fa807a -r4346cb9ced50b3a6444997cde14e850c8313e72f
--- shared/scripts/configuration/utility.py	(.../utility.py)	(revision f8060c14b5c90ebd48576d210e9b1803f5fa807a)
+++ shared/scripts/configuration/utility.py	(.../utility.py)	(revision 4346cb9ced50b3a6444997cde14e850c8313e72f)
@@ -70,28 +70,28 @@
     raise LookupError("zone object is not in view to the user after " + \
              "trying 100 times")
     
-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 : indicates the Current pre-treatment step 
+    @param treatment_step : indicates the Current treatment step 
     """  
     test.startSection("verification of page step indicators")
-    for page in range(config.NUM_OF_PRETREATMENT_BULLETS):
+    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])) 
+        step_title =  squish.waitForObjectExists(get_text_object(screen_obj, treatment_screens[page])) 
         
-        if page < pre_treatment_step:
-            test.log("To verify the step indicator of the completed pre-treatment screen " + config.PRE_TREATMENT_SCREENS[page]) 
+        if page < treatment_step:
+            test.log("To verify the step indicator of the completed treatment screen " + treatment_screens[page]) 
             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, " the bullet color must be " + str(config.COMPLETE_COLOR))
             test.compare(bullet_border_color, config.COMPLETE_COLOR," the bullet border color must be " + str(config.COMPLETE_COLOR)) 
             test.compare(step_title.color.name, config.ENABLED_COLOR, " the text color must be " + str(config.ENABLED_COLOR))
 
-        elif page == pre_treatment_step:
-            test.log("To verify the step indicators of the current pre-treatment screen " + config.PRE_TREATMENT_SCREENS[page]) 
+        elif page == treatment_step:
+            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))
@@ -100,7 +100,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 pre-treatment screen " + config.PRE_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))