Index: shared/scripts/names.py
===================================================================
diff -u -r5347ee52338d76725d5f4cdca3f8077ef2997ba3 -r7ff6faa03b4fcdd55c3c229ebf2c79e2b1059f79
--- shared/scripts/names.py	(.../names.py)	(revision 5347ee52338d76725d5f4cdca3f8077ef2997ba3)
+++ shared/scripts/names.py	(.../names.py)	(revision 7ff6faa03b4fcdd55c3c229ebf2c79e2b1059f79)
@@ -84,8 +84,8 @@
 #patient connection training section
 o_PreTreatmentBase_swipeview_SwipeView = {"container": o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_swipeview", "type": "SwipeView", "unnamed": 1, "visible": True}
 o_swipeview_tutorial_text = {"container": o_PreTreatmentBase_swipeview_SwipeView, "type": "Text", "unnamed": 1, "visible": True}
-o_PreTreatmentBase_rightImage_Image = {"container": o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_rightImage", "source": "qrc:/images/iArrowRight", "type": "Image", "unnamed": 1, "visible": True}
-o_PreTreatmentBase_leftImage_Image = {"container": o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_leftImage", "source": "qrc:/images/iArrowLeft", "type": "Image", "unnamed": 1, "visible": True}
+o_patient_connection_PreTreatmentBase_rightImage_Image = {"container": o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_rightImage", "source": "qrc:/images/iArrowRight", "type": "Image", "unnamed": 1, "visible": True}
+o_patient_connection_PreTreatmentBase_leftImage_Image = {"container": o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_leftImage", "source": "qrc:/images/iArrowLeft", "type": "Image", "unnamed": 1, "visible": True}
 o_PreTreatmentUltrafiltration_Indicators = {"container": o_pretreatmentConnectionStack_PreTreatmentUltrafiltration_PreTreatmentUltrafiltration, "id": "_nextStepsBullet", "type": "StepBullet", "unnamed": 1, "visible": True}
 o_PreTreatmentFlowBase_Indicators = {"container":o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_nextStepsBullet", "type": "StepBullet", "unnamed": 1, "visible": True}
 o_PreTreatmentUltrafiltration_NotificationBar_NotificationBar = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "objectName": "NotificationBar", "type": "NotificationBar", "visible": True}
Index: tst_pre_treatment_patient_connection/test.py
===================================================================
diff -u -r5347ee52338d76725d5f4cdca3f8077ef2997ba3 -r7ff6faa03b4fcdd55c3c229ebf2c79e2b1059f79
--- tst_pre_treatment_patient_connection/test.py	(.../test.py)	(revision 5347ee52338d76725d5f4cdca3f8077ef2997ba3)
+++ tst_pre_treatment_patient_connection/test.py	(.../test.py)	(revision 7ff6faa03b4fcdd55c3c229ebf2c79e2b1059f79)
@@ -19,10 +19,11 @@
 from dialin.ui import utils
 from configuration import config, utility
 from builtins import str as pyStr
+from dialin.common.hd_defs import HDOpModes, PreTreatmentSubModes
 
 hd_simulator    = HDSimulator()
 
-PRE_TREATMENT_PATIENT_CONNECTION_MODE = 8
+PRE_TREATMENT_PATIENT_CONNECTION_MODE = PreTreatmentSubModes.HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE.value
 UF_PRE_TREATMENT_STEPS = 5
 BP_HR_PRE_TREATMENT_STEPS = 6
 CONNECTION_PRE_TREATMENT_STEPS = 7
@@ -138,7 +139,7 @@
     for screen_indicator in range(instruction_screen):
         #Forward navigation of tutorial pages
         for instruction_screen in range(screen_indicator):
-            mouseClick(waitForObject(names.o_PreTreatmentBase_rightImage_Image))
+            mouseClick(waitForObject(names.o_patient_connection_PreTreatmentBase_rightImage_Image))
     
         test.compare(waitForObjectExists(names.o_PreTreatmentBase_Patient_Connection_Text).text, config.PATIENT_CONNECTION_TEXT, "Patient connection text should be {msg}".format(msg=config.PATIENT_CONNECTION_TEXT))
         test.compare(waitForObjectExists(names.o_swipeview_tutorial_text).enabled, True, "Tutorial text should be enabled.")
@@ -150,7 +151,7 @@
     
         #Reverse navigation of tutorial pages
         for instruction_screen in range(screen_indicator):
-            mouseClick(waitForObject(names.o_PreTreatmentBase_leftImage_Image))
+            mouseClick(waitForObject(names.o_patient_connection_PreTreatmentBase_leftImage_Image))
     
     test.endSection()
 
@@ -256,7 +257,7 @@
     utils.waitForGUI(1)
     
     #navigate to pre treatment  
-    hd_simulator.cmd_set_hd_operation_mode_data(5,0)
+    hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_PRET.value,0)
     
     #navigate to patient connection sub mode
     navigate_patient_connection(PRE_TREATMENT_PATIENT_CONNECTION_MODE)