Index: sources/view/td/data/treatment/VTDTreatmentStatesData.h
===================================================================
diff -u -r27a83d5f4e60279c58e3edcf0ed5730f70e3c1b5 -rdc4a0cbb5eb3a967755f4ba40d8407032723c957
--- sources/view/td/data/treatment/VTDTreatmentStatesData.h	(.../VTDTreatmentStatesData.h)	(revision 27a83d5f4e60279c58e3edcf0ed5730f70e3c1b5)
+++ sources/view/td/data/treatment/VTDTreatmentStatesData.h	(.../VTDTreatmentStatesData.h)	(revision dc4a0cbb5eb3a967755f4ba40d8407032723c957)
@@ -42,7 +42,7 @@
     // This property should not be used in QML since it need exposed enum
     // exposed enum usage in QML is not suggested since QML will not error out on any issue
     PROPERTY( quint32, subMode      , 0)
-    PROPERTY( quint32, ufState      , 0)
+    PROPERTY( quint32, isoUfState   , 0)
     PROPERTY( quint32, salineState  , 0)
 
     // these groups of properties are mutually exclusive
@@ -65,17 +65,16 @@
     PROPERTY( bool   , txRinseback              , false) ///< TREATMENT_RINSEBACK_STATE       = 4 # Perform rinseback with saline.  Dialyzer bypassed. Dialysate recirculating
     PROPERTY( bool   , txRecirculate            , false) ///< TREATMENT_RECIRC_STATE          = 5 # Recirculate saline and dialysate while patient disconnected.  Blood lines open and shunted.  Dialyzer is bypassed
     PROPERTY( bool   , txEnd                    , false) ///< TREATMENT_END_STATE             = 6 # Dialysis has ended.  Blood pump slowed.  Dialyzer is bypassed.  Dialysate is recirculated.  User can rinseback
-    PROPERTY( bool   , txIsolatedUF             , false) ///< TREATMENT_END_STATE             = 7 # Isolated UF mode
+    PROPERTY( bool   , txIsolatedUF             , false) ///< TREATMENT_ISO_UF_STATE          = 7 # Isolated UF mode
 
-    // ---- Ultrafiltration states
-    PROPERTY( bool   , ufPaused                 , false) ///< UF_PAUSED_STATE                           = 1  # Paused state of the ultrafiltration state machine
-    PROPERTY( bool   , ufRunning                , false) ///< UF_RUNNING_STATE                          = 2  # Running state of the ultrafiltration state machine
+    // ---- Isolated Ultrafiltration states
+    PROPERTY( bool   , isoUfRunning             , false) ///< ISOLATED_UF_RUNNING_STATE         = 0  # Running state of the ultrafiltration state machine
+    PROPERTY( bool   , isoUfPaused              , false) ///< ISOLATED_UF_PAUSED_STATE          = 1  # Paused state of the ultrafiltration state machine
 
     // ---- Saline Bolus states
     PROPERTY( bool   , sbIdle                   , true ) ///< SALINE_BOLUS_STATE_IDLE                   = 0  # No saline bolus delivery is in progress
     PROPERTY( bool   , sbWaitPump               , false) ///< SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP    = 1  # Wait for pumps to stop before starting bolus
     PROPERTY( bool   , sbRunning                , false) ///< SALINE_BOLUS_STATE_IN_PROGRESS            = 2  # A saline bolus delivery is in progress
-    PROPERTY( bool   , sbSubstitutionRunning    , false) ///< FLUID_BOLUS_SUBSITUTE_IN_PROGRESS_STATE   = 3  # A substitution delivery is in progress
 
     // ---- Heparin states
     PROPERTY( bool   , hpOff                    , true ) ///< HEPARIN_STATE_OFF                         = 0  # No heparin delivery is in progress
@@ -99,7 +98,6 @@
     PROPERTY( bool   , rbPaused                 , false) ///< RINSEBACK_PAUSED_STATE                    = 2 # Rinseback paused state of the rinseback sub-mode state machine
     PROPERTY( bool   , rbStop                   , false) ///< RINSEBACK_STOP_STATE                      = 3 # Rinseback stopped (done) state of the rinseback sub-mode state machine
     PROPERTY( bool   , rbAdditional             , false) ///< RINSEBACK_RUN_ADDITIONAL_STATE            = 4 # Additional rinseback volume (10 mL) state of the rinseback sub-mode state machine
-    PROPERTY( bool   , rbReconnect              , false) ///< RINSEBACK_RECONNECT_PATIENT_STATE         = 5 # Rinseback reconnect state of the rinseback sub-mode state machine
 
     // Recirculate states
     PROPERTY( bool   , rcDisconnect             , true ) ///< TREATMENT_RECIRC_DISCONNECT_PATIENT_STATE = 0 # Disconnect patient state of the treatment re-circulate sub-mode state machine