Index: HDDefs.h
===================================================================
diff -u -rc17457e75bce15199acd967951319c7aedd177a1 -rcc61014d5c5f5d994a5adad62fe3a598864aa5ee
--- HDDefs.h	(.../HDDefs.h)	(revision c17457e75bce15199acd967951319c7aedd177a1)
+++ HDDefs.h	(.../HDDefs.h)	(revision cc61014d5c5f5d994a5adad62fe3a598864aa5ee)
@@ -94,10 +94,6 @@
 enum HD_Standby_States
 {
     STANDBY_START_STATE = 0,                            ///< Start standby
-    STANDBY_FLUSH_DG_LINES_STATE,                       ///< Flush DG lines
-    STANDBY_DRAIN_RESERVOIR_STATE,                      ///< Drain reservoirs
-    STANDBY_WAIT_FOR_PRIME_STATE,                       ///< Wait for prime
-    STANDBY_FILL_RESERVOIR_STATE,                       ///< Fill reservoir
     STANDBY_WAIT_FOR_TREATMENT_STATE,                   ///< Wait for treatment
     NUM_OF_STANDBY_STATES                               ///< Number of standby states (sub-modes)
 };
@@ -128,20 +124,21 @@
  */
 
 /// Enumeration of pre-treatment mode states (sub-mode).
-enum Pre_Treatment_Mode_States
+enum HD_Pre_Treatment_Mode_States
 {
-    PRE_TREATMENT_START_STATE = 0,                                       ///< Start pre-treatment mode state
-    PRE_TREATMENT_WATER_SAMPLE_STATE,                                    ///< Water sample state
-    PRE_TREATMENT_SELF_TEST_NO_CART_STATE,                               ///< Self tests with no cartridge state
-    PRE_TREATMENT_CART_INSTALL_STATE,                                    ///< Consumable and cartridge installation state
-    PRE_TREATMENT_SELF_TEST_DRY_STATE,                                   ///< Self tests dry-run state
-    PRE_TREATMENT_PRIME_STATE,                                           ///< Prime both blood and dialysate circuits state
-    PRE_TREATMENT_SELF_TEST_WET_STATE,                                   ///< Self tests wet-run state
-    PRE_TREATMENT_RECIRC_STATE,                                          ///< Re-circulate blood and dialysate circuits state
-    PRE_TREATMENT_PATIENT_CONNECTION_STATE,                              ///< Patient connection state
-    NUM_OF_PRE_TREATMENT_STATES                                          ///< Number of 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_SELF_TEST_NO_CART_STATE,                               ///< Self tests with no cartridge state
+    HD_PRE_TREATMENT_CART_INSTALL_STATE,                                    ///< Consumable and cartridge installation state
+    HD_PRE_TREATMENT_SELF_TEST_DRY_STATE,                                   ///< Self tests dry-run state
+    HD_PRE_TREATMENT_PRIME_STATE,                                           ///< Prime both blood and dialysate circuits state
+    HD_PRE_TREATMENT_RECIRCULATE_START_STATE,                               ///< Re-circulate starting state, change valves and heater settings
+    HD_PRE_TREATMENT_RECIRCULATE_STATE,                                     ///< Re-circulate blood and dialysate circuits state
+    HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE,                              ///< Patient connection state
+    HD_PRE_TREATMENT_PAUSE_STATE,                                           ///< Pre-treatment pause state
+    NUM_OF_HD_PRE_TREATMENT_STATES                                          ///< Number of pre-treatment mode states
 };
-typedef enum Pre_Treatment_Mode_States PRE_TREATMENT_MODE_STATE_T;       ///< Type for HD pre-treatment mode states enumeration
+typedef enum HD_Pre_Treatment_Mode_States HD_PRE_TREATMENT_MODE_STATE_T;    ///< Type for HD pre-treatment mode states enumeration
 
 /**@}*/
 
@@ -151,17 +148,21 @@
  */
 
 /// Enumeration of prime sub-mode states.
-enum Pre_Treatment_Prime_States
+enum HD_Pre_Treatment_Prime_States
 {
-    PRIME_START_STATE = 0,                                              ///< Prime start state
-    PRIME_SALINE_SETUP_STATE,                                           ///< Saline setup state
-    PRIME_SALINE_PURGE_AIR_STATE,                                       ///< Saline purge air state
-    PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE,                              ///< Circulate blood circuit state
-    PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE,                            ///< Wait for reservoir 1 fill complete
-    PRIME_DIALYSATE_DIALYZER_STATE,                                     ///< Dialysate dialyzer state
-    NUM_OF_PRIME_STATES                                                 ///< Number of prime sub-mode states
+    HD_PRIME_START_STATE = 0,                                               ///< Prime start 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
+    HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE,                             ///< Wait for reservoir 1 fill complete
+    HD_PRIME_DIALYSATE_DIALYZER_STATE,                                      ///< Dialysate dialyzer fluid path state
+    HD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE,                             ///< Wait for reservoir 2 fill complete
+    HD_PRIME_DIALYSATE_BYPASS_STATE,                                        ///< Dialysate bypass fluid path state
+    HD_PRIME_WET_SELF_TESTS_STATE,                                          ///< Perform wet self-tests after priming complete
+    HD_PRIME_PAUSE,                                                         ///< Prime pause state, waits to be resumed
+    NUM_OF_HD_PRIME_STATES                                                  ///< Number of prime sub-mode states
 };
-typedef enum Pre_Treatment_Prime_States PRE_TREATMENT_PRIME_STATE_T;    ///< Type for HD pre-treatment prime sub-mode states enumeration
+typedef enum HD_Pre_Treatment_Prime_States HD_PRE_TREATMENT_PRIME_STATE_T;  ///< Type for HD pre-treatment prime sub-mode states enumeration
 
 /**@}*/