Index: HDDefs.h
===================================================================
diff -u -r0f6ec87250fb9c748e52742849c5492d54e2f061 -r2249a37a4490d3a1fc57b3f82bc9ef8d274a12bc
--- HDDefs.h	(.../HDDefs.h)	(revision 0f6ec87250fb9c748e52742849c5492d54e2f061)
+++ HDDefs.h	(.../HDDefs.h)	(revision 2249a37a4490d3a1fc57b3f82bc9ef8d274a12bc)
@@ -139,8 +139,7 @@
 /// Enumeration of treatment parameters mode states.
 enum HD_Treatment_Parameters_Mode_States
 {
-    HD_TREATMENT_PARAMS_MODE_STATE_START = 0,                                      ///< Start treatment params mode state
-    HD_TREATMENT_PARAMS_MODE_STATE_WAIT_4_UI_2_SEND,                               ///< Wait for UI to send treatment params mode state
+    HD_TREATMENT_PARAMS_MODE_STATE_WAIT_4_UI_2_SEND = 0,                           ///< Wait for UI to send treatment params mode state
     HD_TREATMENT_PARAMS_MODE_STATE_WAIT_4_UI_2_CONFIRM,                            ///< Wait for UI to confirm treatment params mode state
     NUM_OF_HD_TREATMENT_PARAMS_MODE_STATES                                         ///< Number of treatment params mode states
 };
@@ -156,8 +155,7 @@
 /// Enumeration of pre-treatment mode states (sub-mode).
 enum HD_Pre_Treatment_Mode_States
 {
-    HD_PRE_TREATMENT_START_STATE = 0,                                       ///< Start pre-treatment mode state
-    HD_PRE_TREATMENT_WATER_SAMPLE_STATE,                                    ///< Water sample state
+    HD_PRE_TREATMENT_WATER_SAMPLE_STATE = 0,                                ///< Water sample state
     HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE,                            ///< Consumable self-tests state
     HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE,                               ///< No cartridge self-tests state
     HD_PRE_TREATMENT_CART_INSTALL_STATE,                                    ///< Consumable and cartridge installation state
@@ -208,8 +206,7 @@
 enum HD_Pre_Treatment_Consumable_Self_Test_States
 {
     CONSUMABLE_SELF_TESTS_INSTALL_STATE = 0,                      ///< Consumable self-tests install state
-    CONSUMABLE_SELF_TESTS_FILL_CMD_STATE,                         ///< Send command to DG to fill reservoir state
-    CONSUMABLE_SELF_TESTS_WATER_QUALITY_CHECK_STATE,              ///< Consumable self-tests water quality check state
+    CONSUMABLE_SELF_TESTS_PRIME_STATE,                            ///< Consumable self-tests prime concentrate lines state
     CONSUMABLE_SELF_TESTS_BICARB_PUMP_CHECK_STATE,                ///< Consumable self-tests bicarbonate concentrate pump check state
     CONSUMABLE_SELF_TESTS_ACID_PUMP_CHECK_STATE,                  ///< Consumable self-tests acid concentrate pump check state
     CONSUMABLE_SELF_TESTS_COMPLETE_STATE,                         ///< Consumable self-tests complete state
@@ -228,8 +225,7 @@
 /// Enumeration of no cartridge self-tests sub-mode states.
 enum HD_Pre_Treatment_No_Cart_Self_Tests_States
 {
-    NO_CART_SELF_TESTS_START_STATE = 0,                     ///< No cartridge self-tests starting state
-    NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE,           ///< Wait for door to be closed before running self-tests
+    NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE = 0,       ///< Wait for door to be closed before running self-tests
     NO_CART_SELF_TESTS_PRESSURE_CHECKS_STATE,               ///< No cartridge pressure sensors self-test state
     NO_CART_SELF_TESTS_HOME_VALVES_STATE,                   ///< No cartridge home valves state
     NO_CART_SELF_TESTS_HOME_SYRINGE_PUMP_STATE,             ///< No cartridge home syringe pump state
@@ -248,7 +244,7 @@
     DRY_SELF_TESTS_START_STATE = 0,                         ///< Dry self-tests starting state
     DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE,               ///< Wait for door to close before executing self-tests
     DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE,              ///< Used cartridge check dry self-test state
-    DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE,                 ///< Occlusion sensors dry self-test state
+    DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE,            ///< Cartridge loaded check dry self-test state
     DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_SETUP_STATE,     ///< Pressure sensor setup state.
     DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS_SETUP_STATE,     ///< Venous pressure sensor dry self-test setup valves and pump state
     DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS,                 ///< Venous pressure sensor dry self-test
@@ -297,8 +293,7 @@
 /// Enumeration of prime sub-mode states.
 enum HD_Pre_Treatment_Prime_States
 {
-    HD_PRIME_START_STATE = 0,                                               ///< Prime start state
-    HD_PRIME_WAIT_FOR_USER_START_STATE,                                     ///< Wait for user to start prime state
+    HD_PRIME_WAIT_FOR_USER_START_STATE = 0,                                 ///< Wait for user to start prime state
     HD_PRIME_SALINE_SETUP_STATE,                                            ///< Saline setup state
     HD_PRIME_SALINE_PURGE_AIR_STATE,                                        ///< Saline purge air state
     HD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE,                               ///< Circulate blood circuit state