Index: firmware/App/Modes/ConsumableSelfTest.c
===================================================================
diff -u -r23016be42e59935da5aa53b26b8cb31e2a240858 -r1699da4737a1a176ed842cb30a887c9c2ffdfc94
--- firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 23016be42e59935da5aa53b26b8cb31e2a240858)
+++ firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 1699da4737a1a176ed842cb30a887c9c2ffdfc94)
@@ -7,8 +7,8 @@
 *
 * @file    ConsumableSelfTest.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      04-Jan-2022
+* @author  (last)      Michael Garthwaite
+* @date    (last)      10-Mar-2022
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  06-Mar-2021
@@ -105,21 +105,21 @@
             break;
 
         case CONSUMABLE_SELF_TESTS_WATER_QUALITY_CHECK_STATE:
-            if ( ( DG_MODE_FILL == getDGOpMode() ) && ( getDGSubMode() >= DG_FILL_MODE_STATE_TEST_BICARB_CONDUCTIVITY ) )
+            if ( ( DG_MODE_FILL == getDGOpMode() ) && ( getDGSubMode() >= DG_FILL_MODE_STATE_BICARB_PUMP_CHECK ) )
             {
                 currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_BICARB_PUMP_CHECK_STATE;
             }
             break;
 
         case CONSUMABLE_SELF_TESTS_BICARB_PUMP_CHECK_STATE:
-            if ( ( DG_MODE_FILL == getDGOpMode() ) && ( getDGSubMode() >= DG_FILL_MODE_STATE_TEST_ACID_CONDUCTIVITY ) )
+            if ( ( DG_MODE_FILL == getDGOpMode() ) && ( getDGSubMode() >= DG_FILL_MODE_STATE_ACID_PUMP_CHECK ) )
             {
                 currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_ACID_PUMP_CHECK_STATE;
             }
             break;
 
         case CONSUMABLE_SELF_TESTS_ACID_PUMP_CHECK_STATE:
-            if ( ( DG_MODE_FILL == getDGOpMode() ) && ( getDGSubMode() >= DG_FILL_MODE_STATE_PRODUCE_DIALYSATE ) )
+            if ( ( DG_MODE_FILL == getDGOpMode() ) && ( getDGSubMode() >= DG_FILL_MODE_STATE_DIALYSATE_PRODUCTION ) )
             {
                 currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_COMPLETE_STATE;
                 cmdStopDGFill();