Index: leahi_dialin/common/td_defs.py
===================================================================
diff -u -rd0dedd8e720be5de357176ffb095484ec082c830 -rbc2f0b1d2e6947646161102d776d2e8567afad19
--- leahi_dialin/common/td_defs.py	(.../td_defs.py)	(revision d0dedd8e720be5de357176ffb095484ec082c830)
+++ leahi_dialin/common/td_defs.py	(.../td_defs.py)	(revision bc2f0b1d2e6947646161102d776d2e8567afad19)
@@ -250,7 +250,7 @@
 
 
 # ================================================== Enum Creators: Operations Lvl 3 ==================================================
-# TDPreTreatmentModesStates.TD_PRE_TREATMENT_WATER_SAMPLE_STATE sub states
+# TDPreTreatmentModesStates.WATER_SAMPLE_STATE sub states
 @unique
 class TDPreTreaSampleWaterStates(DialinEnum):
     SETUP_STATE                 = 0                             # Sample water setup (flush filter) state
@@ -267,7 +267,7 @@
 }
 
 
-# TDPreTreatmentModesStates.TD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE sub states
+# TDPreTreatmentModesStates.SELF_TEST_CONSUMABLE_STATE sub states
 @unique
 class TDPreTreaConsumableSelfTestStates(DialinEnum):
     INSTALL_STATE                       = 0                     # Consumable self-tests install state
@@ -288,7 +288,7 @@
 }
 
 
-# TDPreTreatmentModesStates.TD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE sub states
+# TDPreTreatmentModesStates.SELF_TEST_NO_CART_STATE sub states
 @unique
 class TDPreTreaNoCartSelfTestStates(DialinEnum):
     WAIT_FOR_DOOR_CLOSE_STATE           = 0                     # Wait for door to be closed before running self-tests
@@ -316,7 +316,7 @@
 }
 
 
-# TDPreTreatmentModesStates.TD_PRE_TREATMENT_SELF_TEST_DRY_STATE sub states
+# TDPreTreatmentModesStates.SELF_TEST_DRY_STATE sub states
 @unique
 class TDPreTreaDrySelfTestStates(DialinEnum):
     WAIT_FOR_DOOR_CLOSE_STATE               = 0                 # Wait for door to close before executing self-tests
@@ -364,7 +364,7 @@
 }
 
 
-# TDPreTreatmentModesStates.TD_PRE_TREATMENT_PRIME_STATE sub states
+# TDPreTreatmentModesStates.PRIME_STATE sub states
 unique
 class TDPreTreaPrimeStates(DialinEnum):
     WAIT_FOR_USER_START_STATE           = 0                     # Wait for user to start prime state
@@ -401,7 +401,7 @@
 }
 
 
-# TDPreTreatmentModesStates.TD_PRE_TREATMENT_RECIRCULATE_STATE sub states
+# TDPreTreatmentModesStates.RECIRCULATE_STATE sub states
 @unique
 class TDPreTreaRecircStates(DialinEnum):
     PRE_TREATMENT_RECIRC_STATE          = 0                     # Pre-treatment recirculate state
@@ -416,7 +416,7 @@
 }
 
 
-# TDPreTreatmentModesStates.TD_PRE_TREATMENT_PATIENT_CONNECTION_STATE sub states
+# TDPreTreatmentModesStates.PATIENT_CONNECTION_STATE sub states
 @unique
 class TDPreTreaPatientConnectStates(DialinEnum):
     WAIT_FOR_UF_VOL_STATE                   = 0                     # Pre-treatment patient connect wait for UF volume setting state
@@ -435,7 +435,7 @@
 }
 
 
-# TDTreatmentStates.TREATMENT_BLOOD_PRIME_STATE sub states
+# TDTreatmentStates.BLOOD_PRIME_STATE sub states
 @unique
 class TDTreaBloodPrimeStates(DialinEnum):
     RAMP_STATE                  = 0                             # Ramp state of the blood prime sub-mode state machine
@@ -452,7 +452,7 @@
 }
 
 
-# TDTreatmentStates.TREATMENT_DIALYSIS_STATE sub states
+# TDTreatmentStates.DIALYSIS_STATE sub states
 @unique
 class TDTreaDialysisStates(DialinEnum):
     DIALYSIS_UF_STATE           = 0                             # Ultrafiltration state of the dialysis sub-mode state machine
@@ -467,7 +467,7 @@
 }
 
 
-# TDTreatmentStates.TREATMENT_PAUSED_STATE sub states
+# TDTreatmentStates.PAUSED_STATE sub states
 @unique
 class TDTreaPausedStates(DialinEnum):
     RECIRC_STATE                    = 0                         # Dialysate and Blood re-circulation state of the treatment paused sub-mode state machine
@@ -488,7 +488,7 @@
 }
 
 
-# TDTreatmentStates.TREATMENT_RINSEBACK_STATE sub states
+# TDTreatmentStates.RINSEBACK_STATE sub states
 @unique
 class TDTreaRinsebackStates(DialinEnum):
     STOP_INIT_STATE             = 0                             # Start state (stopped) of the rinseback sub-mode state machine
@@ -511,7 +511,7 @@
 }
 
 
-# TDTreatmentStates.TREATMENT_RECIRC_STATE sub states
+# TDTreatmentStates.RECIRC_STATE sub states
 @unique
 class TDTreaRecircStates(DialinEnum):
     DISCONNECT_PATIENT_STATE        = 0                         # Disconnect patient state of the treatment re-circulate sub-mode state machine
@@ -530,7 +530,7 @@
 }
 
 
-# TDTreatmentStates.TREATMENT_SALINE_BOLUS_STATE sub states
+# TDTreatmentStates.SALINE_BOLUS_STATE sub states
 @unique
 class TDTreaBolusStates(DialinEnum):
     SALINE_BOLUS_STATE_IDLE                 = 0                 # No saline bolus delivery is in progress
@@ -601,7 +601,7 @@
 }
 
 
-# TDTreatmentStates.TREATMENT_END_STATE sub states
+# TDTreatmentStates.END_STATE sub states
 @unique
 class TDTreaEndStates(DialinEnum):
     WAIT_FOR_RINSEBACK_STATE    = 0                             # Wait for rinseback state of the treatment end sub-mode state machine
@@ -618,7 +618,7 @@
 
 
 # ================================================== Enum Creators: Operations Lvl 4 ==================================================
-# TDPreTreatmentModesStates.TD_PRE_TREATMENT_WATER_SAMPLE_STATE.SAMPLE_WATER_STATE sub states
+# TDPreTreatmentModesStates.WATER_SAMPLE_STATE.SAMPLE_WATER_STATE sub states
 @unique
 class TDPreTreaSamplWaterUserActionStates(DialinEnum):
     STOP                                        = 0             # User requests to stop sample water
@@ -633,7 +633,7 @@
 }
 
 
-# TDPreTreatmentModesStates.TDPreTreaPrimeStates.TD_PRIME_WET_SELF_TESTS_STATE sub states
+# TDPreTreatmentModesStates.TDPreTreaPrimeStates.WET_SELF_TESTS_STATE sub states
 @unique
 class TDWetSelfTestsStates(DialinEnum):
     START_STATE                         = 0                     # Wet self-tests starting state.
@@ -672,7 +672,7 @@
 }
 
 
-# TDTreatmentStates.TREATMENT_BLOOD_PRIME_STATE.BLOOD_PRIME_RUN_STATE sub states
+# TDTreatmentStates.BLOOD_PRIME_STATE.BLOOD_PRIME_RUN_STATE sub states
 @unique
 class TDTreaBloodPrimeUserActionStates(DialinEnum):
     PAUSE                                       = 0             # User requests to pause blood prime operation