Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r6243741f212fb7284825999bb7edef6cd09ad72e -r7d4711edd7b40cd3e29f43e766f79a8a09586fe9
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 6243741f212fb7284825999bb7edef6cd09ad72e)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 7d4711edd7b40cd3e29f43e766f79a8a09586fe9)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2023 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2024 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    ModeStandby.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      14-Sep-2023
+* @date    (last)      10-Nov-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -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;