Index: TDDefs.h
===================================================================
diff -u -rcb36235b4b58396a6bd8e51bf5c65475a4fd50c3 -r849e2060af41e7dc2159be88e5046b80ad09931b
--- TDDefs.h	(.../TDDefs.h)	(revision cb36235b4b58396a6bd8e51bf5c65475a4fd50c3)
+++ TDDefs.h	(.../TDDefs.h)	(revision 849e2060af41e7dc2159be88e5046b80ad09931b)
@@ -275,25 +275,30 @@
  *  @{
  */
 
-/// Enumeration of prime sub-mode states.
-enum TD_Pre_Treatment_Prime_States
+/// Enumeration of prime service states.
+enum TD_Prime_States
 {
-    TD_PRIME_WAIT_FOR_USER_START_STATE = 0,                                 ///< Wait for user to start prime state
-    TD_PRIME_SALINE_SETUP_STATE,                                            ///< Saline setup state
-    TD_PRIME_SALINE_PURGE_AIR_STATE,                                        ///< Saline purge air state
-    TD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE,                               ///< Circulate blood circuit state
-    TD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE,                             ///< Wait for reservoir 1 fill complete
-    TD_PRIME_DIALYSATE_DIALYZER_STATE,                                      ///< Dialysate dialyzer fluid path state
-    TD_PRIME_SALINE_DIALYZER_SETUP_STATE,                                   ///< Saline dialyzer setup state
-    TD_PRIME_SALINE_DIALYZER_STATE,                                         ///< Saline dialyzer fluid path state
-    TD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE,                             ///< Wait for reservoir 2 fill complete
-    TD_PRIME_DIALYSATE_BYPASS_STATE,                                        ///< Dialysate bypass fluid path state
-    TD_PRIME_WET_SELF_TESTS_STATE,                                          ///< Perform wet self-tests after priming complete
-    TD_PRIME_PAUSE,                                                         ///< Prime pause state, waits to be resumed
-    TD_PRIME_COMPLETE,                                                      ///< Prime complete state
-    NUM_OF_TD_PRIME_STATES                                                  ///< Number of prime sub-mode states
+    PRIME_START_STATE = 0,                                  ///< Init (start) state.
+    PRIME_BC_INITIAL_REVERSE_STATE,                         ///< Blood circuit initial reverse prime state.
+    PRIME_BC_AIR_TRAP_LOWER_STATE,                          ///< Air Trap lower state
+    PRIME_BC_INITIAL_DIALYZER_STATE,                        ///< Blood circuit initial dialyzer prime state
+    PRIME_BC_FILL_STATE,                                    ///< Blood circuit fill state
+    PRIME_BC_CLEAR_STATE1,                                  ///< Blood circuit air clear stage 1 prime state
+    PRIME_BC_CLEAR_STATE2,                                  ///< Blood circuit air clear stage 2 prime state
+    PRIME_BC_CLEAR_STATE3,                                  ///< Blood circuit air clear stage 3 prime state
+    PRIME_WAIT_FOR_DIALYSATE_READY_STATE,                   ///< Wait for dialysate ready state
+    PRIME_DC_INITIAL_DIALYSATE_STATE,                       ///< Dialysate circuit Initial dialysate prime state
+    PRIME_DC_DEPRESSURIZE_STATE,                            ///< De-pressurize state
+    PRIME_WAIT_FOR_AIR_TRAP_FILL_STATE,                     ///< Wait for air trap fill state
+    PRIME_BC2_FORWARD_RECIRC_STATE,                         ///< Blood circuit 2 forward recirc state
+    PRIME_BC2_PAUSE_TO_ROTATE_OPP_DIR_STATE,                ///< Pause to rotate opp dir state
+    PRIME_BC2_REVERSE_RECIRC_STATE,                         ///< Blood circuit 2 reverse recirc state
+    PRIME_DC_DISCARD_AND_REVERSE_PRIME_STATE,               ///< Priming Fluid Discard and Reverse Prime state
+    PRIME_PAUSE_STATE,                                      ///< Prime pause state
+    PRIME_COMPLETE_STATE,                                   ///< Prime complete state.
+    NUM_OF_PRIME_STATES                                     ///< Number of Prime states.
 };
-typedef enum TD_Pre_Treatment_Prime_States TD_PRE_TREATMENT_PRIME_STATE_T;  ///< Type for TD pre-treatment prime sub-mode states enumeration
+typedef enum TD_Prime_States TD_PRIME_STATE_T;              ///< Type for TD prime service states enumeration
 
 /**@}*/