Index: suite_leahi/shared/scripts/names.py
===================================================================
diff -u -rd75105d743a558f0e9260e0b0339611bc99ae586 -r5262e5d8ab63730fc628ebb6a9059bcdccfe2e09
--- suite_leahi/shared/scripts/names.py	(.../names.py)	(revision d75105d743a558f0e9260e0b0339611bc99ae586)
+++ suite_leahi/shared/scripts/names.py	(.../names.py)	(revision 5262e5d8ab63730fc628ebb6a9059bcdccfe2e09)
@@ -84,29 +84,27 @@
 o_heparinStopTime_OffText                   = {"container": o_heparinStopTimeControl_ValueAdjuster,                                                                          "type": "Text",                 "unnamed": 1}
 o_acidConcentrate_LabelUnitContainer        = {"container": o_Overlay,                                  "id": "_acidConcentrate",                                            "type": "LabelUnitContainer",   "unnamed": 1}
 o_acidConcentrateComboBox_BaseComboBox      = {"container": o_Overlay,                                  "id": "_acidConcentrateComboBox",                                    "type": "BaseComboBox",         "unnamed": 1}
-o_icon_Image                                = {"container": o_Overlay,                                  "id": "_icon", "source": "qrc:/images/iChevronDown",                 "type": "Image",                "unnamed": 1}
+
 o_potassiumValueControl_ValueAdjuster       = {"container": o_Overlay,                                  "id": "_potassiumValueControl",                                      "type": "ValueAdjuster",        "unnamed": 1}
 o_calciumValueControl_ValueAdjuster         = {"container": o_Overlay,                                  "id": "_calciumValueControl",                                        "type": "ValueAdjuster",        "unnamed": 1}
 o_save_button                               = {"container": o_Overlay,                                  "id": "_saveButton",                                                 "type": "TouchRect",            "unnamed": 1}
-o_iconImage_Image_2                         = {"container": o_Gui_MainView,                             "id": "_iconImage", "source": "qrc:/images/iPrescription",           "type": "Image",                "unnamed": 1}
+
 o_editImage                                 = {"container": o_acidConcentrate_LabelUnitContainer,                  "id": "_iconImage", "source": "qrc:/images/iEdit",        "type": "Image",                "unnamed": 1}
-o_iconImage_Image_4                         = {"container": o_Overlay,                                  "id": "_iconImage", "occurrence": 9, "source": "qrc:/images/iArrowRight", "type": "Image",          "unnamed": 1}
+
 o_dialyzerTypeComboBox_BaseComboBox         = {"container": o_Overlay,                                  "id": "_dialyzerTypeComboBox",                                      "type": "BaseComboBox",         "unnamed": 1}
 o_potassium_LabelUnitContainer              = {"container": o_Overlay,                                  "id": "_potassium",                                                 "type": "LabelUnitContainer",   "unnamed": 1}
-o_leftArrow_IconButton                      = {"container": o_potassium_LabelUnitContainer,             "id": "_leftArrow",                                                 "type": "IconButton",           "unnamed": 1}
+o_potassium_leftIconButton                  = {"container": o_potassium_LabelUnitContainer,             "id": "_leftArrow",                                                 "type": "IconButton",           "unnamed": 1}
 o_calcium_LabelUnitContainer                = {"container": o_Overlay,                                  "id": "_calcium",                                                   "type": "LabelUnitContainer",   "unnamed": 1}
-o_leftArrow_IconButton2                     = {"container": o_calcium_LabelUnitContainer,               "id": "_leftArrow",                                                 "type": "IconButton",           "unnamed": 1}
+o_calcium_leftIconButton                    = {"container": o_calcium_LabelUnitContainer,               "id": "_leftArrow",                                                 "type": "IconButton",           "unnamed": 1}
 o_dialyzerType_LabelUnitContainer           = {"container": o_Overlay,                                  "id": "_dialyzerType",                                              "type": "LabelUnitContainer",   "unnamed": 1}
 o_qrCode_Image                              = {"container": o_Overlay,                                  "id": "_qrCode",                                                    "type": "Image"                             }
-o_prescriptionMenu_BaseComboBox             = {"container": o_Overlay,                                  "id": "_prescriptionMenu",                                          "type": "BaseComboBox",         "unnamed": 1}
+
 o_bicarbonateConcentrate_LabelUnitContainer = {"container": o_Overlay,                                  "id": "_bicarbonateConcentrate",                                    "type": "LabelUnitContainer",   "unnamed": 1}
-o_bicarbonateConcentrateComboBox_BaseComboBox={"container": o_Overlay,                                 "id": "_bicarbonateConcentrateComboBox",                            "type": "BaseComboBox",         "unnamed": 1}
-o_icon_Image_2                              = {"container": o_bicarbonateConcentrateComboBox_BaseComboBox, "id": "_icon", "source": "qrc:/images/iChevronDown",             "type": "Image",                "unnamed": 1}
+o_bicarbonateConcentrateComboBox_BaseComboBox={"container": o_Overlay,                                  "id": "_bicarbonateConcentrateComboBox",                            "type": "BaseComboBox",         "unnamed": 1}
+
 o_confirmButton_ConfirmButton               = {"container": o_Overlay,                                   "id": "_confirmButton",                                            "type": "ConfirmButton",        "unnamed": 1}
-keyboard_input                              = {"container": o_Gui_MainView,                                                                                                 "type": "Text",             "unnamed": 1,     "visible": True                           }
-keyboard_switch                             = {"container": o_Gui_MainView,                             "id": "_shiftKeyIcon", "source": "qrc:/plugins/QtQuick/VirtualKeyboard/Styles/denali/images/iShiftNormal.svg", "type": "Image", "unnamed": 1, "visible": True}
-keyboard_switch2                            = {"container": o_Gui_MainView,                             "id": "_shiftKeyIcon", "source": "qrc:/plugins/QtQuick/VirtualKeyboard/Styles/denali/images/iShiftActive.svg", "type": "Image", "unnamed": 1, "visible": True}
-o_delegate_ItemDelegate                     = {"checkable": False, "container": o_Overlay,              "id": "_delegate",                                                   "type": "ItemDelegate",        "unnamed": 1 }
-o_delegate_ItemDelegate_2                   = {"checkable": False, "container": o_Overlay,              "id": "_delegate", "occurrence": 2,                                  "type": "ItemDelegate",        "unnamed": 1 }
-o_delegate_ItemDelegate_3                   = {"checkable": False, "container": o_Overlay,              "id": "_delegate", "occurrence": 4,                                  "type": "ItemDelegate",        "unnamed": 1 }
-o_delegate_ItemDelegate_4                   = {"checkable": False, "container": o_Overlay,           "id": "_delegate", "occurrence": 3,                                     "type": "ItemDelegate",        "unnamed": 1 }
\ No newline at end of file
+keyboard_input                              = {"container": o_Gui_MainView,                                                                                                 "type": "Text",                 "unnamed": 1,     "visible": True  }
+keyboard_switch                             = {"container": o_Gui_MainView,                             "id": "_shiftKeyIcon", "source": "qrc:/plugins/QtQuick/VirtualKeyboard/Styles/denali/images/iShiftNormal.svg", "type": "Image", "unnamed": 1}
+keyboard_switch2                            = {"container": o_Gui_MainView,                             "id": "_shiftKeyIcon", "source": "qrc:/plugins/QtQuick/VirtualKeyboard/Styles/denali/images/iShiftActive.svg", "type": "Image", "unnamed": 1}
+o_option_combo_box                          = {"container": o_Overlay,                                                                                                      "type": "Text",                 "unnamed": 1 }
+o_prescriptionMenu_BaseComboBox             = {"container": o_Overlay,                                  "id": "_prescriptionMenu",                                          "type": "BaseComboBox",             "unnamed": 1}