Index: firmware/App/Modes/ConsumableSelfTest.c
===================================================================
diff -u -rcc4f8440e8ad7fa8f2ced2467d922be7422c344c -r78c879b8a6c86f5951f79607d8eb21409ecf0830
--- firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision cc4f8440e8ad7fa8f2ced2467d922be7422c344c)
+++ firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 78c879b8a6c86f5951f79607d8eb21409ecf0830)
@@ -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();
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rcc4f8440e8ad7fa8f2ced2467d922be7422c344c -r78c879b8a6c86f5951f79607d8eb21409ecf0830
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision cc4f8440e8ad7fa8f2ced2467d922be7422c344c)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 78c879b8a6c86f5951f79607d8eb21409ecf0830)
@@ -72,25 +72,6 @@
 /// Multiplier to conver flow (mL/min) into volume (mL) for period of general task interval.
 static const F32 SELF_TEST_FLOW_INTEGRATOR = ( ( 1.0 * TASK_GENERAL_INTERVAL ) / ( SEC_PER_MIN * MS_PER_SECOND ) );
 
-/// Wet self-tests state machine.
-typedef enum Wet_Self_Tests_State
-{
-    WET_SELF_TESTS_START_STATE = 0,                         ///< Wet self-tests starting state.
-    WET_SELF_TESTS_SETUP_STATE,                             ///< Setup reservoirs for wet self-tests.
-    WET_SELF_TESTS_BUBBLES_STATE,                           ///< Wet self-test air bubble detectors state.
-    WET_SELF_TESTS_PRIME_CHECK_STATE,                       ///< Prime check wet self-tests state, checks for primed patient lines.
-    WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE,               ///< Blood leak detector self-test state.
-    WET_SELF_TESTS_FIRST_DISPLACEMENT_SETUP_STATE,          ///< Setup valve and start dialysate pump for first displacement.
-    WET_SELF_TESTS_FIRST_DISPLACEMENT_STATE,                ///< Fill reservoir 2 with 100 mL of dialysate from reservoir 1 state.
-    WET_SELF_TESTS_FIRST_DISPLACEMENT_VERIFY_STATE,         ///< After first displacement completed verify state.
-    WET_SELF_TESTS_SECOND_DISPLACEMENT_SETUP_STATE,         ///< Setup valve and start dialysate pump for second displacement.
-    WET_SELF_TESTS_SECOND_DISPLACEMENT_STATE,               ///< Fill reservoir 1 with 300 mL of dialysate from reservoir 2 state.
-    WET_SELF_TESTS_SECOND_DISPLACEMENT_VERIFY_STATE,        ///< After first displacement completed verify state.
-    WET_SELF_TESTS_STOPPED_STATE,                           ///< Wet self-test stopped state.
-    WET_SELF_TESTS_COMPLETE_STATE,                          ///< Wet self-test complete state.
-    NUM_OF_WET_SELF_TESTS_STATES                            ///< Number of wet self-tests states.
-} WET_SELF_TESTS_STATE_T;
-
 // ********** private data **********
 
 static NO_CART_SELF_TESTS_STATE_T currentNoCartSelfTestsState;      ///< Current state of the no cartridge self-tests state machine.