Index: sources/view/td/data/treatment/VTDTreatmentStatesData.h
===================================================================
diff -u -re7ddd5bebe2e455e77337b485d17ccf1d26c395d -r3bbcc27ab7584e84e87a9d005c14a6e04188d0c0
--- sources/view/td/data/treatment/VTDTreatmentStatesData.h	(.../VTDTreatmentStatesData.h)	(revision e7ddd5bebe2e455e77337b485d17ccf1d26c395d)
+++ sources/view/td/data/treatment/VTDTreatmentStatesData.h	(.../VTDTreatmentStatesData.h)	(revision 3bbcc27ab7584e84e87a9d005c14a6e04188d0c0)
@@ -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,11 +65,11 @@
     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