Index: suite_leahi/shared/scripts/names.py
===================================================================
diff -u -r4b929ef6eef32479f10e84325b0ad12173474a4d -r4f9e56b35635368ce440e2cfffdaba7631b5d120
--- suite_leahi/shared/scripts/names.py	(.../names.py)	(revision 4b929ef6eef32479f10e84325b0ad12173474a4d)
+++ suite_leahi/shared/scripts/names.py	(.../names.py)	(revision 4f9e56b35635368ce440e2cfffdaba7631b5d120)
@@ -90,8 +90,9 @@
 o_uf_Volume_LabelValue                                          = {"container": mainTreatmentScreen,                                                     "id": "_ufVolume",                                                                                                                                      "type": "LabelValue",                                                 "unnamed": 1       }
 o_uf_Rate_LabelValue                                            = {"container": mainTreatmentScreen,                                                     "id": "_ufRate",                                                                                                                                        "type": "LabelValue",                                                 "unnamed": 1       }
 o_volume_Delivered                                              = {"container": mainTreatmentScreen,                                                     "id": "_valueText",                                                                                                                                     "type": "Text",                                                       "unnamed": 1       }
-o_ufVolumeRemovedItem_ValueItem                                 = {"container": o_Overlay,                                                               "id": "_ufVolumeRemovedItem",                                                                                                                           "type": "ValueItem",                                                  "unnamed": 1       }
-o_ufVolumeGoalItem_ValueItem                                    = {"container": o_Overlay,                                                               "id": "_ufVolumeGoalItem",                                                                                                                              "type": "ValueItem",                                                  "unnamed": 1       }
+o_left_LabelUnitText                                            = {"container": o_Overlay,                                                                                                                                  "objectName": "_left",                                                               "type": "LabelUnitText"                                                                  }
+o_right_LabelUnitText                                           = {"container": o_Overlay,                                                                                                                                  "objectName": "_right",                                                              "type": "LabelUnitText"                                                                  }
+o_newValues_TreatmentAdjustmentUltrafiltrationMetrics           = {"container": o_Overlay,                                                                                                                                  "objectName": "_newValues",                                                          "type": "TreatmentAdjustmentUltrafiltrationMetrics"                                      }
 o_editButton_TouchRect                                          = {"container": o_Overlay,                                                                                                                                  "objectName": "_editButton",                                                         "type": "TouchRect"                                                                      }
 o_volumeGoalAdjuster_ValueAdjuster                              = {"container": o_Overlay,                                                                                                                                  "objectName": "_volumeGoalAdjuster",                                                 "type": "ValueAdjuster"                                                                  }
 o_continueButton_TouchRect                                      = {"container": o_Overlay,                                                                                                                                  "objectName": "_continueButton",                                                     "type": "TouchRect"                                                                      }
@@ -188,7 +189,7 @@
 o_dialysateTemperatureControl_ValueAdjuster                     = {"container": o_Overlay,                                                               "id": "_dialysateTemperatureControl",                                                                                                                  "type": "ValueAdjuster",                                             "unnamed": 1           }
 o_dialyzerTypeComboBox_BaseComboBox                             = {"container": o_Overlay,                                                               "id": "_dialyzerTypeComboBox",                                                                                                                         "type": "BaseComboBox",                                              "unnamed": 1           }
 o_salineBolusVolumeControl_ValueAdjuster                        = {"container": o_Overlay,                                                               "id": "_salineBolusVolumeControl",                                                                                                                     "type": "ValueAdjuster",                                             "unnamed": 1           }
-o_bpMeasurementIntervalControl_BaseComboBox                     = {"container": o_Overlay,                                                               "id": "_bpMeasurementIntervalControl",                                                                                                                 "type": "BaseComboBox",                                              "unnamed": 1           }
+o_bpMeasurementIntervalControl_ValueAdjusterCustom              = {"container": o_Overlay,                                                               "id": "_bpMeasurementIntervalControl",                                                                                                                 "type": "ValueAdjusterCustom",                                       "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           }
 o_qrCode_Image                                                  = {"container": o_Overlay,                                                               "id": "_qrCode",                                                                                                                                       "type": "Image",                                                     "unnamed": 1           }
@@ -300,7 +301,7 @@
 o_preTreatmentStack_PreTreatmentSampleStack_PreTreatmentWaterSample     = {"container": o_preTreatmentStack_PreTreatmentStack,                                                                                                  "objectName": "_PreTreatmentSampleStack",                                               "type": "PreTreatmentWaterSample"                                                                             }
 o_PreTreatmentSampleStack_failContainer_WaterSampleContainer            = {"container": o_preTreatmentStack_PreTreatmentSampleStack_PreTreatmentWaterSample,    "id": "_failContainer",                                                                                                                                 "type": "WaterSampleContainer",                                      "unnamed": 1                             }
 o_PreTreatmentSampleStack_button_TouchRect                              = {"container": o_preTreatmentStack_PreTreatmentSampleStack_PreTreatmentWaterSample,    "id": "_button",                                                                                                                                        "type": "TouchRect",                                                 "unnamed": 1                             }
-o_PreTreatmentCreate_bpMeasurementIntervalControl_ValueAdjusterCustom   = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_bpMeasurementIntervalControl",                                                                                                                  "type": "ValueAdjusterCustom",                                       "unnamed": 1                             }
+# o_PreTreatmentCreate_bpMeasurementIntervalControl_ValueAdjusterCustom   = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,              "id": "_bpMeasurementIntervalControl",                                                                                                                  "type": "ValueAdjusterCustom",                                       "unnamed": 1                             }
 #The `visible` property must remain in place. It ensures the element is rendered and interactable; without it, the element may not be clickable, which impactsboth user interaction and automated test execution.
 o_preTreatmentStack_confirmButton_ConfirmButton                         = {"container": o_preTreatmentStack_PreTreatmentStack,                                                                                                  "objectName": "_confirmButton",                                                         "type": "ConfirmButton",                                             "visible": True                          }