Index: firmware/App/Modes/ConsumableSelfTest.c
===================================================================
diff -u -r43a84133216095b12529dbfcc957bb3738bbc3a2 -r77e28c0ec13e24ec286d68d3460230f6992aa4fd
--- firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 43a84133216095b12529dbfcc957bb3738bbc3a2)
+++ firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 77e28c0ec13e24ec286d68d3460230f6992aa4fd)
@@ -105,21 +105,21 @@
             break;
 
         case CONSUMABLE_SELF_TESTS_WATER_QUALITY_CHECK_STATE:
-            if ( ( DG_MODE_FILL == getDGOpMode() ) && ( getDGSubMode() >= DG_FILL_MODE_STATE_BICARB_PUMP_CHECK ) )
+            if ( ( DG_MODE_FILL == getDGOpMode() ) && ( getDGSubMode() >= DG_FILL_MODE_STATE_TEST_BICARB_CONDUCTIVITY ) )
             {
                 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_ACID_PUMP_CHECK ) )
+            if ( ( DG_MODE_FILL == getDGOpMode() ) && ( getDGSubMode() >= DG_FILL_MODE_STATE_TEST_ACID_CONDUCTIVITY ) )
             {
                 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_DIALYSATE_PRODUCTION ) )
+            if ( ( DG_MODE_FILL == getDGOpMode() ) && ( getDGSubMode() >= DG_FILL_MODE_STATE_PRODUCE_DIALYSATE ) )
             {
                 currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_COMPLETE_STATE;
                 cmdStopDGFill();