Index: firmware/App/Modes/ConsumableSelfTest.c
===================================================================
diff -u -rcc7f1bd82e346521f0102b3398bd030fb3bb0e6f -r52a40b3e01e67899cdeabdf64f4efddbe4654007
--- firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision cc7f1bd82e346521f0102b3398bd030fb3bb0e6f)
+++ firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 52a40b3e01e67899cdeabdf64f4efddbe4654007)
@@ -110,21 +110,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;
+                currentConsumableSelfTestState = DG_FILL_MODE_STATE_TEST_ACID_CONDUCTIVITY;
             }
             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();