Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -r4ae0f0abdbe4edfcd93dbf5b0240417f1f079586 -rbf426741cb8398e3a8c7bbee5f57cb2f5de9a61f
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 4ae0f0abdbe4edfcd93dbf5b0240417f1f079586)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision bf426741cb8398e3a8c7bbee5f57cb2f5de9a61f)
@@ -172,7 +172,7 @@
             // Pre-Treatment Consumables Installation Confirm
             ID_AdjustConsumablesConfirmReq              = 0x6800, // 104 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
             // Pre-Treatment SelfTest NoCartridge Progress Data
-            ID_SelfTestNoCartridgeData                  = 0x610F, // 97  // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
+            ID_SelfTestNoCartridgeData                  = 0x6100, // 97  // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
             // Pre-Treatment Disposables Installation Confirm
             ID_AdjustDisposablesConfirmReq              = 0x9200, // 146  // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
             ID_AdjustDisposablesConfirmRsp              = 0x9300, // 147 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
@@ -211,7 +211,7 @@
             ID_DDHeatersData                            = 0x2800, // 40     //// ----- @LEAHIZED
             ID_DDLevelData                              = 0x2900, // 41     //// ----- @LEAHIZED
             ID_DDGenDialysateData                       = 0x2F00, // 47     //// ----- @LEAHIZED
-            ID_DDBloodLeakData                          = 0x6100, // 96     //// ----- @LEAHIZED
+            ID_DDBloodLeakData                          = 0x6000, // 96     //// ----- TODO: Payload subject to change given FW implementation
 
             // FP Data Messages
             ID_FPValvesStatesData                       = 0x310F, // 49     //// ----- @OBSOLETE. REMOVE?
@@ -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;