Index: sources/drydemo/StateControllerTreatment.cpp
===================================================================
diff -u -r6e845078107f7d15a3e471be421d5bce31fc51da -rbb80bbccaf1c911be48493868c18c656d84b2ec1
--- sources/drydemo/StateControllerTreatment.cpp	(.../StateControllerTreatment.cpp)	(revision 6e845078107f7d15a3e471be421d5bce31fc51da)
+++ sources/drydemo/StateControllerTreatment.cpp	(.../StateControllerTreatment.cpp)	(revision bb80bbccaf1c911be48493868c18c656d84b2ec1)
@@ -96,11 +96,11 @@
         quint32 fluidBolusCmd = extractU32DataFromReceivedMessage(ID_UI_FLUID_BOLUS_RQST, 0);
 
         // Assume the fluid bolus is not in progress
-        _treatmentStatus.fluidBolusState = FLUID_BOLUS_IDLE_STATE;
+        _treatmentSubStates.fluidBolusState = FLUID_BOLUS_IDLE_STATE;
 
         if (fluidBolusCmd == FLUID_BOLUS_START_CMD){
-            _treatmentStatus.fluidBolusState  = FLUID_BOLUS_SALINE_IN_PROGRESS_STATE;
-            _treatmentStatus.dialysisSubState = DIALYSIS_UF_FLUID_BOLUS_STATE;
+            _treatmentSubStates.fluidBolusState  = FLUID_BOLUS_SALINE_IN_PROGRESS_STATE;
+            _treatmentSubStates.dialysisSubState = DIALYSIS_UF_FLUID_BOLUS_STATE;
         }
         else { _treatmentStatus.totalFluidBolusDeliveredML += _treatmentStatus.accumFluidBolusDeliveredML; }
 
@@ -129,8 +129,8 @@
     float deliveredFluidML = qAbs(_treatmentStatus.totalFluidBolusDeliveredML - _treatmentStatus.accumFluidBolusDeliveredML);
 
     if (deliveredFluidML >= _treatmentParams.fluidBlousVolumeML) {
-        _treatmentStatus.fluidBolusState             = FLUID_BOLUS_IDLE_STATE;
-        _treatmentStatus.dialysisSubState            = DIALYSIS_UF_STATE;
+        _treatmentSubStates.fluidBolusState          = FLUID_BOLUS_IDLE_STATE;
+        _treatmentSubStates.dialysisSubState         = DIALYSIS_UF_STATE;
         _treatmentStatus.accumFluidBolusDeliveredML  = 0.0;
         _treatmentStatus.totalFluidBolusDeliveredML += _treatmentStatus.accumFluidBolusDeliveredML;
     }
@@ -212,7 +212,6 @@
     _treatmentRcvdMessages[ID_UI_TREATMENT_SET_POINT_BLOOD_FLOW_CHANGE_RQST].clear();
 }
 
-
 void StateController::handleSetPointDialysateFlowChange()
 {
     if (_treatmentRcvdMessages[ID_UI_TREATMENT_SET_POINT_DIALYSATE_FLOW_CHANGE_RQST].isNull()) { return; }
@@ -245,14 +244,14 @@
     quint32 acceptReject = REJECT_VALUE;
     QVariantList reason;
 
-    if (_treatmentStatus.txState == TREAT_DIALYSIS_STATE) {
+    if (_treatmentSubStates.txStates == TREAT_DIALYSIS_STATE) {
         // Assume the default state is UF state
-        _treatmentStatus.dialysisSubState = DIALYSIS_UF_STATE;
-        _treatmentStatus.dialysisSubState = (cmd == 0 ? DIALYSIS_UF_PAUSED_STATE : _treatmentStatus.dialysisSubState);
-        acceptReject                      = ACCEPT_VALUE;
-        qDebug() << "UF Pa" << _treatmentStatus.dialysisSubState;
+        _treatmentSubStates.dialysisSubState = DIALYSIS_UF_STATE;
+        _treatmentSubStates.dialysisSubState = (cmd == 0 ? DIALYSIS_UF_PAUSED_STATE : _treatmentSubStates.dialysisSubState);
+        acceptReject                         = ACCEPT_VALUE;
+        qDebug() << "UF Pa" << _treatmentSubStates.dialysisSubState;
     }
-    else if (_treatmentStatus.txState != TREAT_DIALYSIS_STATE) { reason.append(REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE); }
+    else if (_treatmentSubStates.txStates != TREAT_DIALYSIS_STATE) { reason.append(REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE); }
     else {
         quint32 r = (cmd == 0 ? REQUEST_REJECT_REASON_UF_NOT_IN_PROGESS : REQUEST_REJECT_REASON_UF_NOT_PAUSED);
         reason.append(r);