Index: leahi_dialin/common/td_defs.py
===================================================================
diff -u -r95205b22fbcf8ce097fd7dba0a34156e5f9008a5 -rb24b5cd51889ebf8087f52adaf864b4bec02b2e2
--- leahi_dialin/common/td_defs.py	(.../td_defs.py)	(revision 95205b22fbcf8ce097fd7dba0a34156e5f9008a5)
+++ leahi_dialin/common/td_defs.py	(.../td_defs.py)	(revision b24b5cd51889ebf8087f52adaf864b4bec02b2e2)
@@ -371,37 +371,45 @@
 # TDPreTreatmentModesStates.PRIME_STATE sub states
 unique
 class TDPreTreaPrimeStates(DialinEnum):
-    WAIT_FOR_USER_START_STATE           = 0                     # Wait for user to start prime state
-    SALINE_SETUP_STATE                  = 1                     # Saline setup state
-    SALINE_PURGE_AIR_STATE              = 2                     # Saline purge air state
-    SALINE_CIRC_BLOOD_CIRCUIT_STATE     = 3                     # Circulate blood circuit state
-    RESERVOIR_ONE_FILL_COMPLETE_STATE   = 4                     # Wait for reservoir 1 fill complete
-    DIALYSATE_DIALYZER_STATE            = 5                     # Dialysate dialyzer fluid path state
-    SALINE_DIALYZER_SETUP_STATE         = 6                     # Saline dialyzer setup state
-    SALINE_DIALYZER_STATE               = 7                     # Saline dialyzer fluid path state
-    RESERVOIR_TWO_FILL_COMPLETE_STATE   = 8                     # Wait for reservoir 2 fill complete
-    DIALYSATE_BYPASS_STATE              = 9                     # Dialysate bypass fluid path state
-    WET_SELF_TESTS_STATE                = 10                    # Perform wet self-tests after priming complete
-    PAUSE                               = 11                    # Prime pause state, waits to be resumed
-    COMPLETE                            = 12                    # Prime complete state
-    NUM_OF_TD_PRIME_STATES              = 13                    # Number of prime sub-mode states
+    START                           = 0                         # Init (start) state.
+    BC_INITIAL_REVERSE              = 1                         # Blood circuit initial reverse prime state.
+    BC_AIR_TRAP_LOWER               = 2                         # Air Trap lower state
+    BC_INITIAL_DIALYZER             = 3                         # Blood circuit initial dialyzer prime state
+    BC_FILL                         = 4                         # Blood circuit fill state
+    BC_CLEAR_1                      = 5                         # Blood circuit air clear stage 1 prime state
+    BC_CLEAR_2                      = 6                         # Blood circuit air clear stage 2 prime state
+    BC_CLEAR_3                      = 7                         # Blood circuit air clear stage 3 prime state
+    WAIT_FOR_DIALYSATE_READY        = 8                         # Wait for dialysate ready state
+    DC_INITIAL_DIALYSATE            = 9                         # Dialysate circuit Initial dialysate prime state
+    WAIT_FOR_AIR_TRAP_FILL          = 10                        # Wait for air trap fill state
+    BC2_FORWARD_RECIRC              = 11                        # Blood circuit 2 forward recirc state
+    BC2_PAUSE_TO_ROTATE_OPP_DIR     = 12                        # Pause to rotate opp dir state
+    BC2_REVERSE_RECIRC              = 13                        # Blood circuit 2 reverse recirc state
+    DC_DISCARD_AND_REVERSE_PRIME    = 14                        # Priming Fluid Discard and Reverse Prime state
+    PAUSE                           = 15                        # Prime pause state
+    COMPLETE                        = 16                        # Prime complete state.
+    NUM_OF_PRIME_STATES             = 17                        # Number of Prime states.
 
 TDPreTreaPrimeStates._str_list = {
     # Official Name :       Accepted strings
-    'WAIT_FOR_USER_START_STATE': ['wait for user', 'wait for user to start'],
-    'SALINE_SETUP_STATE': ['saline setup', 'saline bolus setup'],
-    'SALINE_PURGE_AIR_STATE': ['saline purge air', 'saline bolus air purge'],
-    'SALINE_CIRC_BLOOD_CIRCUIT_STATE': ['saline circulate blood', 'saline bolus circulate blood'],
-    'RESERVOIR_ONE_FILL_COMPLETE_STATE': ['reservoir 1 fill complete'],
-    'DIALYSATE_DIALYZER_STATE': ['dialysate dialyzer', 'dialyzer setup'],
-    'SALINE_DIALYZER_SETUP_STATE': ['fill dialyzer with saline bolus', 'saline dialyzer setup'],
-    'SALINE_DIALYZER_STATE': ['saline dialyzer'],
-    'RESERVOIR_TWO_FILL_COMPLETE_STATE': ['reservoir 2 fill complete'],
-    'DIALYSATE_BYPASS_STATE': ['dialysate bypass'],
-    'WET_SELF_TESTS_STATE': ['wet self tests'],
-    'PAUSE': ['prime paused', 'priming paused'],
-    'COMPLETE': ['prime completed', 'priming completed'],
-    'NUM_OF_TD_PRIME_STATES': [],
+    'START': [],
+    'BC_INITIAL_REVERSE': [],
+    'BC_AIR_TRAP_LOWER': [],
+    'BC_INITIAL_DIALYZER': [],
+    'BC_FILL': [],
+    'BC_CLEAR_1': [],
+    'BC_CLEAR_2': [],
+    'BC_CLEAR_3': [],
+    'WAIT_FOR_DIALYSATE_READY': [],
+    'DC_INITIAL_DIALYSATE': [],
+    'WAIT_FOR_AIR_TRAP_FILL': [],
+    'BC2_FORWARD_RECIRC': [],
+    'BC2_PAUSE_TO_ROTATE_OPP_DIR': [],
+    'BC2_REVERSE_RECIRC': [],
+    'DC_DISCARD_AND_REVERSE_PRIME': [],
+    'PAUSE': [],
+    'COMPLETE': [],
+    'NUM_OF_PRIME_STATES': []
 }