Index: dialin/common/hd_defs.py
===================================================================
diff -u -redf140bce432f8267b9e6fd4ab321d25d34f4d8d -rf89e8d2a1489e14dffb07ed0dc5115699bdb1574
--- dialin/common/hd_defs.py	(.../hd_defs.py)	(revision edf140bce432f8267b9e6fd4ab321d25d34f4d8d)
+++ dialin/common/hd_defs.py	(.../hd_defs.py)	(revision f89e8d2a1489e14dffb07ed0dc5115699bdb1574)
@@ -135,13 +135,7 @@
     WET_SELF_TESTS_STOPPED_STATE = 11
     WET_SELF_TESTS_COMPLETE_STATE = 12
 
-@unique
-class PreTreatmentRecircStates(DialinEnum):
-    PRE_TREATMENT_RECIRC_STATE                              =  0    # Pre-treatment recirculate state
-    PRE_TREATMENT_RECIRC_STOPPED_STATE                      =  1    # Pre-treatment recirculate stopped state
-    NUM_OF_PRE_TREATMENT_RECIRC_STATES                      =  2    # Number of pre-treatment recirculate states
 
-
 # Heparin states
 @unique
 class HeparinStates(DialinEnum):
@@ -245,6 +239,15 @@
 
 
 @unique
+class TreatmentRecircStates(DialinEnum):
+    TREATMENT_RECIRC_DISCONNECT_PATIENT_STATE               = 0     # Disconnect patient state of the treatment re-circulate sub-mode state machine
+    TREATMENT_RECIRC_RECIRC_STATE                           = 1     # Re-circulate Dialysate state of the treatment re-circulate sub-mode state machine
+    TREATMENT_RECIRC_STOPPED_STATE                          = 2     # Stopped state of the treatment re-circulate sub-mode state machine
+    TREATMENT_RECIRC_RECONNECT_PATIENT_STATE                = 3     # Reconnect patient state of the treatment re-circulate sub-mode state machine
+    NUM_OF_TREATMENT_RECIRC_STATES                          = 4     # Number of treatment re-circulate sub-mode states
+
+
+@unique
 class PreTreatmentPatientConnectionStates(DialinEnum):
     PRE_TREATMENT_PAT_CONN_WAIT_FOR_UF_VOL_STATE = 0               # Pre-treatment patient connect wait for UF volume setting state
     PRE_TREATMENT_PAT_CONN_WAIT_FOR_DLZR_INVERT_STATE = 1          # Pre-treatment patient connect wait for dialyzer inverted state