Index: shared/scripts/names.py
===================================================================
diff -u -ra8541b2c93c33c10d993dea8aa3d6b10a4c8e9b0 -re074ab4641bebc4796543ddaeeb7afae5411e77d
--- shared/scripts/names.py	(.../names.py)	(revision a8541b2c93c33c10d993dea8aa3d6b10a4c8e9b0)
+++ shared/scripts/names.py	(.../names.py)	(revision e074ab4641bebc4796543ddaeeb7afae5411e77d)
@@ -298,25 +298,32 @@
 o_treatment_duration = {"container": o_treatmentHome, "objectName": "TreatmentTime", "type": "TreatmentTime", "visible": True}
 
 #Heparin
-cumulative_fluid = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "Cumulative Delivered", "type": "Text", "unnamed": 1, "visible": True}
-heparin_value = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "occurrence": 2, "text": "Volume Delivered", "type": "Text", "unnamed": 1, "visible": True}
-o_QQuickView = {"type": "QQuickView"}
+#o_heparin_value = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "Volume Delivered", "type": "Text", "unnamed": 1, "visible": True}
+o_heparin_value_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text":" Volume Delivered " ,"type": "Text", "unnamed": 1, "visible": True}
+o_heparin_value = {"container": o_treatmentStack_treatmentHome_TreatmentHome,"type": "Text", "unnamed": 1, "visible": True}
+o_QQuickView = {"type": "QQuickView"}                                             
 o_treatmentStart_TreatmentStart = {"container": o_QQuickView, "id": "_treatmentStart", "type": "TreatmentStart", "unnamed": 1, "visible": True}
 o_treatmentStart_HeparinSection = {"container": o_treatmentStart_TreatmentStart , "id": "_heparinTouchArea", "type": "TreatmentFluid" }
+
 #Heparin_Messages_on_Button
-state0_heparin_delivery_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "HEPARIN DELIVERY", "type": "Text", "unnamed": 1, "visible": True}
-state2_heparin_state_paused_text = {"container":  o_treatmentStack_treatmentHome_TreatmentHome, "text": "RESUME DELIVERY", "type": "Text", "unnamed": 1, "visible": True}
-state4_heparin_state_dispensing_text = {"container":  o_treatmentStack_treatmentHome_TreatmentHome, "text": "PAUSE DELIVERY", "type": "Text", "unnamed": 1, "visible": True}
+o_state0_heparin_delivery_Off_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "OFF", "type": "Text", "unnamed": 1, "visible": True}
+o_state1_heparin_delivery_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "HEPARIN DELIVERY", "type": "Text", "unnamed": 1, "visible": True}
+o_state2_heparin_state_paused_text = {"container":  o_treatmentStack_treatmentHome_TreatmentHome, "text": "RESUME DELIVERY", "type": "Text", "unnamed": 1, "visible": True}
+o_state4_heparin_state_dispensing_text = {"container":  o_treatmentStack_treatmentHome_TreatmentHome, "text": "PAUSE DELIVERY", "type": "Text", "unnamed": 1, "visible": True}
+
 #Heparin_Statewise_Messages
-state0_heparin_delivery_Off_text = {"container":  o_treatmentStack_treatmentHome_TreatmentHome, "text": "Heparin Delivery Off", "type": "Text", "unnamed": 1, "visible": True}
-state_one_text = {"container":  o_treatmentStack_treatmentHome_TreatmentHome, "text": "Heparin Delivery Stopped", "type": "Text", "unnamed": 1, "visible": True}
-state3_heparin_state_initial_bolus_text = {"container":  o_treatmentStack_treatmentHome_TreatmentHome, "text": "Heparin Bolus Active", "type": "Text", "unnamed": 1, "visible": True}
-state5_heparin_state_completed_text = {"container":  o_treatmentStack_treatmentHome_TreatmentHome, "text": "Maximum Cumulative Heparin Volume Delivered", "type": "Text", "unnamed": 1, "visible": True}
-state6_heparin_state_empty_text = {"container":  o_treatmentStack_treatmentHome_TreatmentHome, "text": "Heparin Syringe Empty", "type": "Text", "unnamed": 1, "visible": True}
+#o_state0_heparin_delivery_Off_text = {"container":  o_treatmentStack_treatmentHome_TreatmentHome, "text": "OFF", "type": "Text", "unnamed": 1, "visible": True}
+o_state_one_text = {"container":  o_treatmentStack_treatmentHome_TreatmentHome, "text": "Delivery Stopped", "type": "Text", "unnamed": 1, "visible": True}
+o_state2_resume_delivery_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "Delivery Paused", "type": "Text", "unnamed": 1, "visible": True}
+o_state3_heparin_state_initial_bolus_text = {"container":  o_treatmentStack_treatmentHome_TreatmentHome, "text": "Bolus Active", "type": "Text", "unnamed": 1, "visible": True}
+o_state4_heparin_state_dispensing_active_text ={"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "Dispensing Active", "type": "Text", "unnamed": 1, "visible": True}
+o_state5_heparin_state_completed_text = {"container":  o_treatmentStack_treatmentHome_TreatmentHome, "text": "Maximum Cumulative Heparin Volume Delivered", "type": "Text", "unnamed": 1, "visible": True}
+o_state6_heparin_state_empty_text = {"container":  o_treatmentStack_treatmentHome_TreatmentHome, "text": "Syringe Empty", "type": "Text", "unnamed": 1, "visible": True}
 #Heparin Rejection Message
-rejection_msg = {"container":  o_treatmentStack_treatmentHome_TreatmentHome, "type": "Text", "unnamed": 1, "visible": True}
+o_rejection_msg = {"container":  o_treatmentStack_treatmentHome_TreatmentHome, "type": "Text", "unnamed": 1, "visible": True}
 
 
+
 #post screen
 o_busy_indicator = {"container": o_initialModeScreen_ScreenItem, "id": "_busyIndicator", "source": "qrc:/images/iBusy", "type": "Image", "unnamed": 1, "visible": True}
 o_done_indicator = {"container": o_initialModeScreen_ScreenItem, "id": "_checkIndicator", "source": "qrc:/images/iBusyDone", "type": "Image", "unnamed": 1, "visible": True}