Index: shared/scripts/names.py
===================================================================
diff -u -r7102ce1220edcd2ae6a08e13f8e815528dba654f -rdc194f1ceb84a009dae78a5cb864c835223d4cd7
--- shared/scripts/names.py	(.../names.py)	(revision 7102ce1220edcd2ae6a08e13f8e815528dba654f)
+++ shared/scripts/names.py	(.../names.py)	(revision dc194f1ceb84a009dae78a5cb864c835223d4cd7)
@@ -53,9 +53,9 @@
 
 #instructions for water sample
 o_instruction_title = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "Water Sample", "type": "Text", "unnamed": 1, "visible": True}
-o_instruction_one = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "Place cup in the water sampling pocket. Press and hold the \"Water Sample\" button.", "type": "Text", "unnamed": 1, "visible": True}
+o_instruction_ws_screen_one = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "Place cup in the water sampling pocket. Press and hold the \"Water Sample\" button.", "type": "Text", "unnamed": 1, "visible": True}
+o_instruction_ws_screen_two = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "Test the water sample per your clinic's instructions and enter the result.", "type": "Text", "unnamed": 1, "visible": True}
+o_instruction_ws_screen_three = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "Water sample result failed.", "type": "Text", "unnamed": 1, "visible": True}
 o_next_button = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "NEXT", "type": "Text", "unnamed": 1, "visible": True}
-o_instruction_two = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "Test the water sample per your clinic's instructions and enter the result.", "type": "Text", "unnamed": 1, "visible": True}
-o_instruction_three = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "Water sample result failed.", "type": "Text", "unnamed": 1, "visible": True}
 o_fail_button = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "FAIL", "type": "Text", "unnamed": 1, "visible": True}
 
Index: tst_instructions_poc/test.py
===================================================================
diff -u -r7102ce1220edcd2ae6a08e13f8e815528dba654f -rdc194f1ceb84a009dae78a5cb864c835223d4cd7
--- tst_instructions_poc/test.py	(.../test.py)	(revision 7102ce1220edcd2ae6a08e13f8e815528dba654f)
+++ tst_instructions_poc/test.py	(.../test.py)	(revision dc194f1ceb84a009dae78a5cb864c835223d4cd7)
@@ -11,22 +11,22 @@
 hd_simulator = HDSimulator()
 contents = []
 instructions = []
-instruction_textobj = [names.o_instruction_one,names.o_instruction_two,names.o_instruction_three]
+instruction_textobj = [names.o_instruction_ws_screen_one,names.o_instruction_ws_screen_two,names.o_instruction_ws_screen_three]
 conf_dict = {}
 
 def verify_instruction():
     utils.waitForGUI(0.2)
-    with open(utility.INSTRUCTION_CONF_LOCATION, 'r') as f:
-        contents = f.readlines()
-        for i in contents: 
-            length =len(i)
-            if i[0] =="[":
+    with open(utility.INSTRUCTION_CONF_LOCATION, 'r') as conf_file:
+        contents = conf_file.readlines()
+        for line in contents: 
+            length =len(line)
+            if line[0] =="[":
                 continue
             else:
-                p = i.split("=")
+                conf_data = line.split("=")
                 if length > 2:
-                    conf_dict.update([(p[1],p[0])])
-                    instructions.append(conf_dict.get(p[1]))
+                    conf_dict.update([(conf_data[1],conf_data[0])])
+                    instructions.append(conf_dict.get(conf_data[1]))
         return instructions
     
 def verify_instruction_watersample(instruction_list):