Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -rc70815ad2b3beadf61832f2e4d12eb90d476e020 -rc66898d4ac69b72f1b9cc59e3039e7d9a1e59154
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision c70815ad2b3beadf61832f2e4d12eb90d476e020)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision c66898d4ac69b72f1b9cc59e3039e7d9a1e59154)
@@ -78,8 +78,8 @@
             ID_TDCheckIn                                = 0x1000, //  16    //// ----- @LEAHIZED
 
             // Generic Confirmation
-            ID_DuetConfirmHDi                           = 0xBA00, // 186
-            ID_DuetConfirmUIr                           = 0xBB00, // 187
+            ID_DuetConfirmTDi                           = 0xB500, // 181
+            ID_DuetConfirmUIr                           = 0xB600, // 182
 
             // POST
             ID_HDPostSingleResultData                   = 0x8E0F, // 142 //// ----- @CRAPIZED: had to change to avoid duplication
@@ -127,7 +127,7 @@
             ID_PostTreatmentStates                      = 0x770F, // 119    //// ----- @CRAPIZED: had to change to avoid duplication
 
             // -----
-            ID_PowerOff                                 = 0x010F, // 010F   //// ----- @CRAPIZED
+            ID_PowerOff                                 = 0xB700, // 183    //// ----- @LEAHIZED
             ID_ShuttingDown                             = 0x0E0F, // 35     //// ----- @CRAPIZED: had to change to avoid duplication
             ID_TreatmentTime                            = 0x3B00, // 59     //// ----- @LEAHIZED
             ID_BloodFlow                                = 0x1100, // 17     //// ----- @LEAHIZED
@@ -406,8 +406,8 @@
         Q_ENUM(UF_Adjustments)
         Q_ENUM(UF_Commands)
         // Saline
-        Q_ENUM(Saline_Bolus_States)
-        Q_ENUM(Saline_Commands)
+        Q_ENUM(Fluid_Bolus_States)
+        Q_ENUM(Fluid_Bolus_Commands)
         // Heparin
         Q_ENUM(Heparin_States)
         Q_ENUM(Heparin_Commands)
@@ -482,8 +482,8 @@
     typedef GuiActions::UF_Commands                                     GuiUFCommands;
     typedef GuiActions::UF_Adjustments                                  GuiUFAdjustment;
     // Saline
-    typedef GuiActions::Saline_Bolus_States                             GuiSalineStates;
-    typedef GuiActions::Saline_Commands                                 GuiSalineCommands;
+    typedef GuiActions::Fluid_Bolus_States                              GuiSalineStates;
+    typedef GuiActions::Fluid_Bolus_Commands                            GuiSalineCommands;
     // Heparin
     typedef GuiActions::Heparin_States                                  GuiHeparinStates;
     typedef GuiActions::Heparin_Commands                                GuiHeparinCommands;