Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -r472f06f3448ba0708f4b2592e202b45ce76f6836 -rf1e0e3ab13b12c450d52668608c92b33aa1d2c91
--- sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 472f06f3448ba0708f4b2592e202b45ce76f6836)
+++ sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision f1e0e3ab13b12c450d52668608c92b33aa1d2c91)
@@ -94,14 +94,14 @@
 
     // DG Data Messages
     {Gui::GuiActionType::ID_DGROPumpData                            ,   6 * 4       }, //  6 parameters each 4bytes
-    {Gui::GuiActionType::ID_DGPressuresData                         ,   5 * 4       }, //  5 parameters each 4bytes
+    {Gui::GuiActionType::ID_DDPressuresData                         ,   5 * 4       }, //  5 parameters each 4bytes
     {Gui::GuiActionType::ID_DGDrainPumpData                         ,   8 * 4       }, //  8 parameters each 4bytes
     {Gui::GuiActionType::ID_DGOperationModeData                     ,   2 * 4       }, //  2 parameter  each 4bytes
     {Gui::GuiActionType::ID_DGReservoirData                         ,  12 * 4       }, // 12 parameters each 4bytes
     {Gui::GuiActionType::ID_DGValvesStatesData                      ,   1 * 2 + 13  }, //  1 parameter      16bits & 13 parameters each 1 byte
-    {Gui::GuiActionType::ID_DGHeatersData                           ,  13 * 4       }, // 13 parameters each 4bytes
+    {Gui::GuiActionType::ID_DDHeatersData                           ,  13 * 4       }, // 13 parameters each 4bytes
     {Gui::GuiActionType::ID_DGLoadCellReadingsData                  ,   4 * 4       }, //  4 parameters each 4bytes
-    {Gui::GuiActionType::ID_DGTemperaturesData                      ,  23 * 4       }, // 23 parameters each 4bytes
+    {Gui::GuiActionType::ID_DDTemperaturesData                      ,  23 * 4       }, // 23 parameters each 4bytes
     {Gui::GuiActionType::ID_DGAccelerometerData                     ,   9 * 4       }, //  9 parameters each 4bytes
     {Gui::GuiActionType::ID_DDConductivityData                      ,   5 * 4       }, //  5 parameters each 4bytes
     {Gui::GuiActionType::ID_DDGenDialysateData                      ,   9 * 4       }, //  9 parameters each 4bytes
@@ -116,7 +116,7 @@
     {Gui::GuiActionType::ID_TDSwitchesData                          ,   1 * 4       }, // 3 parameters each 4bytes
     {Gui::GuiActionType::ID_TDBatteryData                           ,   2 * 4       }, // 2 parameters each 4bytes //// TODO: The payload is TBD (as indicated by the provided screen items)
     {Gui::GuiActionType::ID_TDTemperatureData                       ,   1 * 4       }, // 1 parameters each 4bytes //// TODO: The payload is TBD (as indicated by the provided screen items)
-    {Gui::GuiActionType::ID_TreatmentSetPointData                   ,   3 * 4       }, // 3 parameters each 4bytes
+    {Gui::GuiActionType::ID_TreatmentParametersSetPointData         ,   3 * 4       }, // 3 parameters each 4bytes
 
     // ---- TODO : AFTER GIVING IT SOME THOUGHT, IT SEEMS WE CAN GET THESE LEN FROM THE MODEL AND DO NOT NEED TO HAVE THIS BUT NEED TO INVESTIGATE MORE.
     {Gui::GuiActionType::ID_AlarmStatus                             ,   4 * 3 + 2   }, // 3 parameters each 4bytes + 1 parameter 2bytes