Index: sources/drydemo/StateControllerStandby.cpp
===================================================================
diff -u -ra271469db538bfc35eba9a56308760893ecbc68e -rbb80bbccaf1c911be48493868c18c656d84b2ec1
--- sources/drydemo/StateControllerStandby.cpp	(.../StateControllerStandby.cpp)	(revision a271469db538bfc35eba9a56308760893ecbc68e)
+++ sources/drydemo/StateControllerStandby.cpp	(.../StateControllerStandby.cpp)	(revision bb80bbccaf1c911be48493868c18c656d84b2ec1)
@@ -77,9 +77,9 @@
     _treatmentStatus.stateTransitionEvent       = "";
     _treatmentStatus.totalFluidBolusDeliveredML = 0.0;
     _treatmentStatus.accumFluidBolusDeliveredML = 0.0;
-    _treatmentStatus.fluidBolusState            = FLUID_BOLUS_IDLE_STATE;
-    _treatmentStatus.txState                    = TREAT_START_STATE;
-    _treatmentStatus.rinsebackState             = RINSEBACK_STOP_INIT_STATE;
+    _treatmentSubStates.fluidBolusState         = FLUID_BOLUS_IDLE_STATE;
+    _treatmentSubStates.txStates                 = TREAT_START_STATE;
+    _treatmentSubStates.rinsebackState          = RINSEBACK_STOP_INIT_STATE;
     _treatmentStatus.ufVolDeliveredL            = 0.0;
     _treatmentStatus.hasRecircBeenRequested     = false;
 }
@@ -114,8 +114,8 @@
 
     switch (userAction) {
         case ALARM_USER_ACTION_RESUME:
-            _treatmentStatus.dialysisSubState     = DIALYSIS_UF_STATE;
-            _treatmentStatus.txState              = TREAT_DIALYSIS_STATE;
+            _treatmentSubStates.dialysisSubState  = DIALYSIS_UF_STATE;
+            _treatmentSubStates.txStates           = TREAT_DIALYSIS_STATE;
             _treatmentStatus.stateTransitionEvent = "T_TP_2_Tx";
             break;