Index: dialin/common/hd_defs.py
===================================================================
diff -u -r03666d94ef3ce63ac1a72bb502cf8dea9ceb9c68 -rfe2ca5cbfaf3e516cf4f4c5b5db8014962687e32
--- dialin/common/hd_defs.py	(.../hd_defs.py)	(revision 03666d94ef3ce63ac1a72bb502cf8dea9ceb9c68)
+++ dialin/common/hd_defs.py	(.../hd_defs.py)	(revision fe2ca5cbfaf3e516cf4f4c5b5db8014962687e32)
@@ -122,8 +122,8 @@
 @unique
 class PreTreatmentWetSelfTestStates(DialinEnum):
     WET_SELF_TESTS_START_STATE = 0
-    WET_SELF_TESTS_SETUP_STATE = 1
-    WET_SELF_TESTS_BUBBLES_STATE = 2
+    WET_SELF_TESTS_BUBBLE_CHECK_SETUP_STATE = 1
+    WET_SELF_TESTS_BUBBLE_CHECK_STATE = 2
     WET_SELF_TESTS_PRIME_CHECK_STATE = 3
     WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE = 4
     WET_SELF_TESTS_FIRST_DISPLACEMENT_SETUP_STATE = 5
@@ -268,21 +268,17 @@
     TREATMENT_END_STATE                                     =  6    # Dialysis has ended.  Blood pump slowed.  Dialyzer is bypassed.  Dialysate is recirculated.  User can rinseback
     NUM_OF_TREATMENT_STATES                                 =  7    # Number of treatment states (sub-modes)
 
-
 @unique
 class TreatmentBloodPrimeStates(DialinEnum):
     BLOOD_PRIME_RAMP_STATE                                  =  0    # Ramp state of the blood prime sub-mode state machine
     NUM_OF_BLOOD_PRIME_STATES                               =  1    # Number of blood prime sub-mode states
 
-
 @unique
 class TreatmentDialysisStates(DialinEnum):
-    DIALYSIS_START_STATE                                    =  0    # Start state of the dialysis sub-mode state machine
-    DIALYSIS_UF_STATE                                       =  1    # Ultrafiltration state of the dialysis sub-mode state machine
-    DIALYSIS_SALINE_BOLUS_STATE                             =  2    # Saline bolus state of the dialysis sub-mode state machine
-    NUM_OF_DIALYSIS_STATES                                  =  3    # Number of dialysis sub-mode states
+    DIALYSIS_UF_STATE                                       =  0    # Ultrafiltration state of the dialysis sub-mode state machine
+    DIALYSIS_SALINE_BOLUS_STATE                             =  1    # Saline bolus state of the dialysis sub-mode state machine
+    NUM_OF_DIALYSIS_STATES                                  =  2    # Number of dialysis sub-mode states
 
-
 @unique
 class TreatmentStopStates(DialinEnum):
     TREATMENT_STOP_RECIRC_STATE                             =  0    # Dialysate and Blood re-circulation state of the treatment stop sub-mode state machine
@@ -291,7 +287,6 @@
     TREATMENT_STOP_NO_RECIRC_STATE                          =  3    # No re-circulation state of the treatment stop sub-mode state machine
     NUM_OF_TREATMENT_STOP_STATES                            =  4    # Number of treatment stop sub-mode states
 
-
 @unique
 class TreatmentRinsebackStates(DialinEnum):
     RINSEBACK_STOP_INIT_STATE                               =  0    # Start state (stopped) of the rinseback sub-mode state machine
@@ -301,7 +296,6 @@
     RINSEBACK_RUN_ADDITIONAL_STATE                          =  4    # Additional rinseback volume (10 mL) state of the rinseback sub-mode state machine
     NUM_OF_RINSEBACK_STATES                                 =  5    # Number of rinseback sub-mode states
 
-
 @unique
 class TreatmentRecircStates(DialinEnum):
     TREATMENT_RECIRC_RECIRC_STATE                           =  0    # Re-circulate Dialysate state of the treatment re-circulate sub-mode state machine
@@ -315,13 +309,11 @@
     TREATMENT_END_PAUSED_STATE                              =  1    # Paused state of the treatment end sub-mode state machine
     NUM_OF_TREATMENT_END_STATES                             =  2    # Number of treatment end sub-mode states
 
-
 @unique
 class HDFaultStates(DialinEnum):
     HD_FAULT_STATE_START                                    =  0    # Start fault state
     NUM_OF_HD_FAULT_STATES                                  =  1    # Number of fault mode states
 
-
 @unique
 class HDEventList(DialinEnum):
     HD_EVENT_STARTUP                                        =  0    # HD startup event
@@ -344,7 +336,6 @@
     HD_EVENT_RSRVR_2_LOAD_CELL_END_VALUES                   = 17    # HD reservoir 2 load cells end values
     NUM_OF_EVENT_IDS                                        = 18    # Total number of HD events
 
-
 @unique
 class HDEventDataType(DialinEnum):
     EVENT_DATA_TYPE_NONE = 0
@@ -356,10 +347,9 @@
 
 @unique
 class UFStates(DialinEnum):
-    UF_START_STATE                                          =  0    # Start state of the ultrafiltration state machine
-    UF_PAUSED_STATE                                         =  1    # Paused state of the ultrafiltration state machine
-    UF_RUNNING_STATE                                        =  2    # Running state of the ultrafiltration state machine
-    NUM_OF_UF_STATES                                        =  3    # Number of ultrafiltration states
+    UF_PAUSED_STATE                                         =  0    # Paused state of the ultrafiltration state machine
+    UF_RUNNING_STATE                                        =  1    # Running state of the ultrafiltration state machine
+    NUM_OF_UF_STATES                                        =  2    # Number of ultrafiltration states
 
 @unique
 class SalineBolusStates(DialinEnum):