Index: suite_leahi/shared/scripts/names.py
===================================================================
diff -u -r3c726f3c26d2910ac6148bd72cae713582899ec8 -re82a2e9bb2d083c36604e19a090f8e620ad770fb
--- suite_leahi/shared/scripts/names.py	(.../names.py)	(revision 3c726f3c26d2910ac6148bd72cae713582899ec8)
+++ suite_leahi/shared/scripts/names.py	(.../names.py)	(revision e82a2e9bb2d083c36604e19a090f8e620ad770fb)
@@ -331,22 +331,20 @@
 o_preTreatmentStack_repeater_Repeater                           = {"container": o_preTreatmentStack_PreTreatmentStack,                                   "id": "repeater",                                                                                                                                      "type": "Repeater",                                                   "unnamed": 1           }
 
 #New design create Rx
-o_createHDTreatment_TouchRect = {"container": o_standByScreen_MainHome, "id": "_createHDTreatment", "type": "TouchRect", "unnamed": 1}
-o_PreTreatmentCreate_leftColumn_Column = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_leftColumn", "type": "Column", "unnamed": 1}
-o_PreTreatmentCreate_rightColumn_Column = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_rightColumn", "type": "Column", "unnamed": 1}
-# o_heparinType_LabelUnitContainer = {"container": o_Overlay, "id": "_heparinType", "type": "LabelUnitContainer", "unnamed": 1}
-# o_heparinBolusVolume_LabelUnitContainer ={"container": o_Overlay, "id": "_heparinBolusVolume", "type": "LabelUnitContainer", "unnamed": 1}
-# o_heparinDispensingRate_LabelUnitContainer ={"container": o_Overlay, "id": "_heparinDispensingRate", "type": "LabelUnitContainer", "unnamed": 1}
-# o_heparinDeliveryDuration_LabelUnitContainer ={"container": o_Overlay, "id": "_heparinDeliveryDuration", "type": "LabelUnitContainer", "unnamed": 1}
-o_LabelUnitValueAdjuster_LabelUnitValueAdjuster = {"container": o_Overlay, "objectName": "_LabelUnitValueAdjuster", "type": "LabelUnitValueAdjuster"}
-# o_valueAdjuster_ValueAdjuster = {"container": o_Overlay, "objectName": "_valueAdjuster", "type": "ValueAdjuster", "visible": True}
-o_heparinDispensingRate_LabelUnitValueAdjuster = {"container": o_Overlay, "objectName": "_LabelUnitValueAdjuster","id": "_heparinDispensingRate", "type": "LabelUnitValueAdjuster"}
-o_heparinDeliveryDuration_LabelUnitValueAdjuster ={"container": o_Overlay, "objectName": "_LabelUnitValueAdjuster","id": "_heparinDeliveryDuration", "type": "LabelUnitValueAdjuster"}
-o_PreTreatmentCreate_leftColumn_Column_2 = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_leftColumn", "type": "Column", "unnamed": 1}
-o_PreTreatmentCreate_rightColumn_Column_2 = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_rightColumn", "type": "Column", "unnamed": 1}
-o_PreTreatmentCreate_bpMeasurementInterval_LabelUnitContainer = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bpMeasurementIntervalControl", "type": "ValueAdjusterCustom", "unnamed": 1}
-o_PreTreatmentCreate_hepatitusStatus_LabelUnitContainer = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_hepatitusStatusControl", "type": "ValueAdjusterCustom", "unnamed": 1, "visible": True}
-o_PreTreatmentCreate_sodium_LabelUnitValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_sodium","objectName": "_LabelUnitValueAdjuster", "type": "LabelUnitValueAdjuster"}
-o_PreTreatmentCreate_bicarbonate_LabelUnitValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bicarbonate","objectName": "_LabelUnitValueAdjuster", "type": "LabelUnitValueAdjuster"}
-o_PreTreatmentCreate_fluidBolusVolume_LabelUnitValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_fluidBolusVolume","objectName": "_LabelUnitValueAdjuster", "type": "LabelUnitValueAdjuster"}
-o_PreTreatmentCreate_primeRinsebackVolume_LabelUnitValueAdjuster= {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_primeRinsebackVolume","objectName": "_LabelUnitValueAdjuster", "type": "LabelUnitValueAdjuster"}
+o_createHDTreatment_TouchRect                                   = {"container": o_standByScreen_MainHome,                                               "id": "_createHDTreatment",                                                                                                                             "type": "TouchRect",                                                  "unnamed": 1           }
+o_PreTreatmentCreate_leftColumn_Column                          = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_leftColumn",                                                                                                                                    "type": "Column",                                                     "unnamed": 1           }
+o_PreTreatmentCreate_rightColumn_Column                         = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_rightColumn",                                                                                                                                   "type": "Column",                                                     "unnamed": 1           }
+o_LabelUnitValueAdjuster_LabelUnitValueAdjuster                 = {"container": o_Overlay, "objectName": "_LabelUnitValueAdjuster",                                                                                                                                                                             "type": "LabelUnitValueAdjuster"                                                             }
+o_heparinDispensingRate_LabelUnitValueAdjuster                  = {"container": o_Overlay, "objectName": "_LabelUnitValueAdjuster",                     "id": "_heparinDispensingRate",                                                                                                                         "type": "LabelUnitValueAdjuster"                                                             }
+o_heparinDeliveryDuration_LabelUnitValueAdjuster                = {"container": o_Overlay, "objectName": "_LabelUnitValueAdjuster",                     "id": "_heparinDeliveryDuration",                                                                                                                       "type": "LabelUnitValueAdjuster"                                                             }
+o_PreTreatmentCreate_leftColumn_Column_2                        = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_leftColumn",                                                                                                                                    "type": "Column",                                                     "unnamed": 1           }
+o_PreTreatmentCreate_rightColumn_Column_2                       = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_rightColumn",                                                                                                                                   "type": "Column",                                                     "unnamed": 1           }
+o_PreTreatmentCreate_sodium_LabelUnitValueAdjuster              = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_sodium",                                                    "objectName": "_LabelUnitValueAdjuster",                                            "type": "LabelUnitValueAdjuster"                                                             }
+o_PreTreatmentCreate_bicarbonate_LabelUnitValueAdjuster         = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_bicarbonate",                                               "objectName": "_LabelUnitValueAdjuster",                                            "type": "LabelUnitValueAdjuster"                                                             }
+o_PreTreatmentCreate_fluidBolusVolume_LabelUnitValueAdjuster    = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_fluidBolusVolume",                                          "objectName": "_LabelUnitValueAdjuster",                                            "type": "LabelUnitValueAdjuster"                                                             }
+o_PreTreatmentCreate_primeRinsebackVolume_LabelUnitValueAdjuster= {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_primeRinsebackVolume",                                      "objectName": "_LabelUnitValueAdjuster",                                             "type": "LabelUnitValueAdjuster"                                                            }
+o_PreTreatmentCreate_listView_ListView                          = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_listView",                                                                                                                                      "type": "ListView",                                                   "unnamed": 1           }
+o_createHDFTreatment_TouchRect                                  = {"container": o_standByScreen_MainHome,                                               "id": "_createHDFTreatment",                                                                                                                            "type": "TouchRect",                                                  "unnamed": 1           }
+o_PreTreatmentCreate_hdfTreatmentMode_LabelUnitContainer        = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_hdfTreatmentMode",                                                                                                                              "type": "LabelUnitContainer",                                         "unnamed": 1           }
+o_PreTreatmentCreate_treatmentModalityComboBox_BaseComboBox     = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_treatmentModalityComboBox",                                                                                                                     "type": "BaseComboBox",                                               "unnamed": 1           }
+