Index: HDDefs.h
===================================================================
diff -u -rc95071efc070744afe5afcc6ac632307f7051c69 -r0f6ec87250fb9c748e52742849c5492d54e2f061
--- HDDefs.h	(.../HDDefs.h)	(revision c95071efc070744afe5afcc6ac632307f7051c69)
+++ HDDefs.h	(.../HDDefs.h)	(revision 0f6ec87250fb9c748e52742849c5492d54e2f061)
@@ -270,8 +270,8 @@
 enum Wet_Self_Tests_States
 {
     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_BUBBLE_CHECK_SETUP_STATE,                ///< Setup for wet air bubble self-test state.
+    WET_SELF_TESTS_BUBBLE_CHECK_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.
@@ -406,8 +406,7 @@
 /// Enumeration of ultrafiltration states.
 enum UF_States
 {
-    UF_START_STATE = 0,                                 ///< Start state of the ultrafiltration state machine
-    UF_PAUSED_STATE,                                    ///< Paused state of the ultrafiltration state machine
+    UF_PAUSED_STATE = 0,                                ///< Paused state of the ultrafiltration state machine
     UF_RUNNING_STATE,                                   ///< Running state of the ultrafiltration state machine
     NUM_OF_UF_STATES                                    ///< Number of ultrafiltration states
 };