Index: suite_leahi/shared/scripts/names.py
===================================================================
diff -u -r27ae7dca3c68d5c05f14db44bc5fc9ab69dcdb59 -r0e7de4782caa04625d499efc5b8f913e6f352d80
--- suite_leahi/shared/scripts/names.py	(.../names.py)	(revision 27ae7dca3c68d5c05f14db44bc5fc9ab69dcdb59)
+++ suite_leahi/shared/scripts/names.py	(.../names.py)	(revision 0e7de4782caa04625d499efc5b8f913e6f352d80)
@@ -2,14 +2,13 @@
 
 from objectmaphelper import *
 
-o_Gui_MainView              = {"type": "Gui::MainView",                                                                                 "unnamed": 1,   "visible": True}
+o_Gui_MainView              = {                                                                             "type": "Gui::MainView",    "unnamed": 1,   "visible": True}
 standByScreen_MainHome      = {"container": o_Gui_MainView,                                                 "type": "MainHome",                         "visible": True}
 treatmentStack              = {"container": o_Gui_MainView,                                                 "type": "TreatmentStack",                   "visible": True}
 startTreatmentButton        = {"container": standByScreen_MainHome, "id": "_startTreatmentRect",            "type": "TouchRect",        "unnamed": 1,   "visible": True}
 mainTreatmentScreen         = {"container": treatmentStack,         "id": "_treatmentHome",                 "type": "TreatmentHome",    "unnamed": 1,   "visible": True}
 startFluidButton            = {"container": mainTreatmentScreen,    "id": "_startFluidButton",              "type": "TouchRect",        "unnamed": 1,   "visible": True}
-totalSalineDelivered_Text   = {"container": mainTreatmentScreen,    "text": "Total Saline Delivered",       "type": "Text",             "unnamed": 1,   "visible": True}
-deliveringSaline_Text       = {"container": mainTreatmentScreen,    "text": "<i>Delivering Saline</i>",     "type": "Text",             "unnamed": 1,   "visible": True}
-currentBolusVolume          = {"container": mainTreatmentScreen,    "text": 75,                             "type": "Label",            "unnamed": 1,   "visible": True}
+salineDeliveredText         = {"container": mainTreatmentScreen,    "objectName": "salineDescriptionText",  "type": "Text",                             "visible": True}
+currentBolusVolume          = {"container": mainTreatmentScreen,                                            "type": "Label",            "unnamed": 1,   "visible": True}
 treatmentSaline             = {"container": mainTreatmentScreen,    "objectName": "treatmentSaline",        "type": "TreatmentSaline",                  "visible": True}
 salineProgressBar           = {"container": mainTreatmentScreen,    "id": "_fluidProgressBar",              "type": "ProgressBar",      "unnamed": 1,   "visible": True}
Index: suite_leahi/tst_solution_infusion/test.py
===================================================================
diff -u -r27ae7dca3c68d5c05f14db44bc5fc9ab69dcdb59 -r0e7de4782caa04625d499efc5b8f913e6f352d80
--- suite_leahi/tst_solution_infusion/test.py	(.../test.py)	(revision 27ae7dca3c68d5c05f14db44bc5fc9ab69dcdb59)
+++ suite_leahi/tst_solution_infusion/test.py	(.../test.py)	(revision 0e7de4782caa04625d499efc5b8f913e6f352d80)
@@ -45,13 +45,14 @@
     test.verify(waitForObjectExists(names.mainTreatmentScreen), "In Main Treatment")
 
     # verify saline text
-    salineTextObj = waitForObject(names.totalSalineDelivered_Text) 
+    salineTextObj = waitForObject(names.salineDeliveredText) 
     test.compare(salineTextObj.text, "Total Saline Delivered")
     
     # verify send start bolus req message
     mouseClick(waitForObject(names.startFluidButton))    
     test.verify(waitFor("'salineBolusStartState == 1'", 5000))
 
+    # change state to in progress
     td_interface.td_tx_state(
         TDTreatmentStates.TREATMENT_DIALYSIS_STATE.value    ,
         0       ,
@@ -70,8 +71,7 @@
     test.compare(treatmentSaline.isStarted, True)
     
     # verify text
-    salineDeliveryTextObj = waitForObject(names.deliveringSaline_Text)  
-    test.compare(salineDeliveryTextObj.text, "<i>Delivering Saline</i>")
+    test.compare(salineTextObj.text, "<i>Delivering Saline</i>")
 
     # verify saline data
     bolusValueInTest = 75
@@ -94,6 +94,7 @@
     mouseClick(waitForObject(names.startFluidButton))
     test.verify(waitFor("'salineBolusStartState == 0'", 5000))
 
+    # change state to idle
     td_interface.td_tx_state(
         TDTreatmentStates.TREATMENT_DIALYSIS_STATE.value    ,
         0       ,