Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -rdd02afaf66a118eb50deb9313e6a809dd17b5864 -r62797b3c6e0539e22a04404e16daa7c4465e178f
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision dd02afaf66a118eb50deb9313e6a809dd17b5864)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 62797b3c6e0539e22a04404e16daa7c4465e178f)
@@ -33,10 +33,10 @@
     objectName: "TreatmentStack"
 
     onVisibleChanged        : { // this should never happen by design, but in tests it can easily happen and will block the screen touch.
-        _treatmentAdjustmentFlow            .close()
+        _treatmentAdjustmentSetPoints       .close()
         _treatmentAdjustmentVitals          .close()
         _treatmentAdjustmentPressuresLimits .close()
-        _treatmentAdjustmentSaline          .close()
+        _treatmentAdjustmentBolusVolume     .close()
         _treatmentAdjustmentDuration        .close()
         _treatmentAdjustmentUltrafiltration .close()
 
@@ -65,7 +65,7 @@
 
     Connections                 { target: _treatmentHome
         function onSectionFlowClicked               ( vValue ) {
-            _treatmentAdjustmentFlow.open()
+            _treatmentAdjustmentSetPoints.open()
         }
         function onSectionVitalsClicked             ( vValue ) {
             _treatmentAdjustmentVitalsInterval.open()
@@ -74,7 +74,7 @@
             _treatmentAdjustmentPressuresLimits.open()
         }
         function onSectionSalineClicked             ( vValue ) {
-            _treatmentAdjustmentSaline.open()
+            _treatmentAdjustmentBolusVolume.open()
         }
         function onSectionTimeClicked               ( vValue ) {
             _treatmentAdjustmentDuration.open()
@@ -88,15 +88,17 @@
     ScreenItem                  { id: _treatmentHeparin     } // TODO: make me!
 
     //// Treatment Adjustment Dialogs
-    TreatmentAdjustmentFlow             { id:       _treatmentAdjustmentFlow            }
+    TreatmentAdjustmentSetPoints        { id:       _treatmentAdjustmentSetPoints       }
     TreatmentAdjustmentPressuresLimits  { id:       _treatmentAdjustmentPressuresLimits }
-    TreatmentAdjustmentSaline           { id:       _treatmentAdjustmentSaline          }
+    TreatmentAdjustmentBolusVolume      { id:       _treatmentAdjustmentBolusVolume     }
     TreatmentAdjustmentUltrafiltration  { id:       _treatmentAdjustmentUltrafiltration }
 
-    Connections                 { target:   _treatmentAdjustmentFlow
-        function onConfirmClicked                   ( vValue ) { vTreatmentAdjustmentFlows.doAdjustment(
-                                            _treatmentAdjustmentFlow.bloodFlowRateValue     ,
-                                            _treatmentAdjustmentFlow.dialysateFlowRateValue )
+    Connections                 { target:   _treatmentAdjustmentSetPoints
+        function onConfirmClicked                   ( vValue ) {
+            vTreatmentAdjustmentSetPointss.doAdjustment(
+                _treatmentAdjustmentSetPoints.bloodFlowRateValue     ,
+                _treatmentAdjustmentSetPoints.dialysateFlowRateValue
+            )
         }
     }
     Connections                 { target:   _treatmentAdjustmentPressuresLimits
@@ -109,9 +111,9 @@
             )
         }
     }
-    Connections                 { target:   _treatmentAdjustmentSaline
+    Connections                 { target:   _treatmentAdjustmentBolusVolume
         function onConfirmClicked                   ( vValue ) {
-            vTreatmentAdjustmentBolusVolume.doAdjustment(_treatmentAdjustmentSaline.fluidBolusVolume)
+            vTreatmentAdjustmentBolusVolume.doAdjustment(_treatmentAdjustmentBolusVolume.fluidBolusVolume)
         }
     }
 
@@ -123,10 +125,10 @@
     Connections { target: vTreatmentAdjustmentBolusVolume
         function onAdjustmentTriggered              ( vValue ) {
             if ( vTreatmentAdjustmentBolusVolume.adjustment_Accepted ) {
-                _treatmentAdjustmentSaline.close()
+                _treatmentAdjustmentBolusVolume.close()
             }
             else {
-                _treatmentAdjustmentSaline.notification.text = vTreatmentAdjustmentBolusVolume.adjustment_ReasonText
+                _treatmentAdjustmentBolusVolume.notification.text = vTreatmentAdjustmentBolusVolume.adjustment_ReasonText
             }
         }
     }