Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -rba9d98d32561f9e9fb62068c3e08e1993d39462a -rc39ed7a93d564db5ba2de199799b69ee308ad008
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision ba9d98d32561f9e9fb62068c3e08e1993d39462a)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision c39ed7a93d564db5ba2de199799b69ee308ad008)
@@ -555,7 +555,7 @@
             // Using the caps switch to disable the chemical disinfect date checks
             // This is for debug builds only to simulate that a chem flush has been done after chem
             usageInfo.lastChemDisFlushCompleteDateEpoch = 40;
-            usageInfo.lastChemDisCompleteDateEpoch      = 32;
+            usageInfo.lastChemDisStartDateEpoch         = 32;
         }
 #endif
 
@@ -565,7 +565,7 @@
             cmdResponse.rejectCode = ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ? REQUEST_REJECT_REASON_DG_DIALYSATE_CAP_OPEN :
                                                                                         REQUEST_REJECT_REASON_DG_CONCENTRATE_CAP_OPEN );
         }
-        else if ( usageInfo.lastChemDisFlushCompleteDateEpoch < usageInfo.lastChemDisCompleteDateEpoch )
+        else if ( usageInfo.lastChemDisFlushCompleteDateEpoch < usageInfo.lastChemDisStartDateEpoch )
         {
             cmdResponse.rejected   = TRUE;
             cmdResponse.rejectCode = REQUEST_REJECT_REASON_DG_CHEM_FLUSH_NOT_COMPLETED;
@@ -615,7 +615,7 @@
             // Using the caps switch to disable the chemical disinfect date checks
             // This is for debug builds only to simulate that a chem flush has been done after chem
             usageInfo.lastChemDisFlushCompleteDateEpoch = 40;
-            usageInfo.lastChemDisCompleteDateEpoch      = 32;
+            usageInfo.lastChemDisStartDateEpoch         = 32;
         }
 #endif
 
@@ -625,7 +625,7 @@
             cmdResponse.rejectCode = ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ? REQUEST_REJECT_REASON_DG_DIALYSATE_CAP_OPEN :
                                                                                         REQUEST_REJECT_REASON_DG_CONCENTRATE_CAP_OPEN );
         }
-        else if ( usageInfo.lastChemDisFlushCompleteDateEpoch < usageInfo.lastChemDisCompleteDateEpoch )
+        else if ( usageInfo.lastChemDisFlushCompleteDateEpoch < usageInfo.lastChemDisStartDateEpoch )
         {
             cmdResponse.rejected   = TRUE;
             cmdResponse.rejectCode = REQUEST_REJECT_REASON_DG_CHEM_FLUSH_NOT_COMPLETED;
@@ -676,7 +676,7 @@
             // Using the caps switch to disable the chemical disinfect date checks
             // This is for debug builds only to simulate that a chem flush has been done after chem
             usageInfo.lastChemDisFlushCompleteDateEpoch = 40;
-            usageInfo.lastChemDisCompleteDateEpoch      = 32;
+            usageInfo.lastChemDisStartDateEpoch         = 32;
         }
 #endif
 
@@ -686,7 +686,7 @@
             cmdResponse.rejectCode = ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ? REQUEST_REJECT_REASON_DG_DIALYSATE_CAP_OPEN :
                                                                                         REQUEST_REJECT_REASON_DG_CONCENTRATE_CAP_OPEN );
         }
-        else if ( usageInfo.lastChemDisFlushCompleteDateEpoch < usageInfo.lastChemDisCompleteDateEpoch )
+        else if ( usageInfo.lastChemDisFlushCompleteDateEpoch < usageInfo.lastChemDisStartDateEpoch )
         {
             cmdResponse.rejected   = TRUE;
             cmdResponse.rejectCode = REQUEST_REJECT_REASON_DG_CHEM_FLUSH_NOT_COMPLETED;
@@ -837,7 +837,7 @@
             // Using the caps switch to disable the chemical disinfect date checks.
             // This is for debug builds only to simulate that a chem flush has been done after chem
             usageInfo.lastChemDisFlushCompleteDateEpoch = 40;
-            usageInfo.lastChemDisCompleteDateEpoch      = 32;
+            usageInfo.lastChemDisStartDateEpoch         = 32;
         }
 #endif
 
@@ -847,7 +847,7 @@
             cmdResponse.rejectCode = ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ? REQUEST_REJECT_REASON_DG_DIALYSATE_CAP_OPEN :
                                                                                         REQUEST_REJECT_REASON_DG_CONCENTRATE_CAP_OPEN );
         }
-        else if ( usageInfo.lastChemDisFlushCompleteDateEpoch < usageInfo.lastChemDisCompleteDateEpoch )
+        else if ( usageInfo.lastChemDisFlushCompleteDateEpoch < usageInfo.lastChemDisStartDateEpoch )
         {
             cmdResponse.rejected   = TRUE;
             cmdResponse.rejectCode = REQUEST_REJECT_REASON_DG_CHEM_FLUSH_NOT_COMPLETED;