Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision a58f91b077c8131bea3dbde0fc338adb113fc9f3)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287)
@@ -332,7 +332,6 @@
         // Ultrafiltration
         Q_ENUM(UF_Adjustments)
         Q_ENUM(UF_Commands)
-        Q_ENUM(UF_States)
         // Saline
         Q_ENUM(Saline_Bolus_States)
         Q_ENUM(Saline_Commands)
@@ -351,7 +350,7 @@
         Q_ENUM(Treatment_End_States)
         Q_ENUM(Requested_Treatment_End_User_Actions)
         // Treatment Stop
-        Q_ENUM(Treatment_Stop_States)
+        Q_ENUM(Treatment_Paused_States)
         // Pre-Treatment SubMode
         Q_ENUM(TD_Pre_Treatment_Mode_States)
         // Pre-Treatment Water Sample
@@ -404,7 +403,6 @@
     // Dialysis
     typedef GuiActions::Dialysis_States                                 GuiDialysisState;
     // Ultrafiltration
-    typedef GuiActions::UF_States                                       GuiUFStates;
     typedef GuiActions::UF_Commands                                     GuiUFCommands;
     typedef GuiActions::UF_Adjustments                                  GuiUFAdjustment;
     // Saline
@@ -425,7 +423,7 @@
     typedef GuiActions::Treatment_End_States                            GuiTreatmentEndStates;
     typedef GuiActions::Requested_Treatment_End_User_Actions            GuiTreatmentEndCommands;
     // Treatment Stop
-    typedef GuiActions::Treatment_Stop_States                           GuiTreatmentStopStates;
+    typedef GuiActions::Treatment_Paused_States                         GuiTreatmentPausedStates;
     // Pre-Treatment SubMode
     typedef GuiActions::TD_Pre_Treatment_Mode_States                    GuiPreTreatmentStates;
     // Pre-Treatment Water Sample