Index: sources/canbus/MessageDispatcher.cpp
===================================================================
diff -u -r5fdac82425ab432aeda805a3ed7ad8cb2efc2bd1 -r9569b4a56306df342846b862b124c034c87d4883
--- sources/canbus/MessageDispatcher.cpp	(.../MessageDispatcher.cpp)	(revision 5fdac82425ab432aeda805a3ed7ad8cb2efc2bd1)
+++ sources/canbus/MessageDispatcher.cpp	(.../MessageDispatcher.cpp)	(revision 9569b4a56306df342846b862b124c034c87d4883)
@@ -480,7 +480,7 @@
  * \param   vData - Data model contains the alarm volume
  * \return  void
  */
-void MessageDispatcher::onAdjustment(const AdjustHDAlarmVolumeRequestData &vData)
+void MessageDispatcher::onAdjustment(const AdjustTDAlarmVolumeRequestData &vData)
 {
     QVariantList mData;
     mData += vData.volume2HD();
@@ -949,11 +949,11 @@
  * \param   vData - Data model contains the UI RO Water Mode adjustment request data.
  * \return  void
  */
-void MessageDispatcher::onAdjustment(const DuetRoWaterModeUIiData &vData)
+void MessageDispatcher::onAdjustment(const AdjustRoWaterModeRequestData &vData)
 {
     QVariantList mData;
     mData += vData.mStatus;
-    actionTransmit(GuiActionType::ID_DuetRoWaterModeUIi, mData);
+    actionTransmit(GuiActionType::ID_AdjustRoWaterModeReq, mData);
 }
 
 /*!
Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -r718a3ed0b0693f0bc36e11931f41ccd0f49d7251 -r9569b4a56306df342846b862b124c034c87d4883
--- sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 718a3ed0b0693f0bc36e11931f41ccd0f49d7251)
+++ sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision 9569b4a56306df342846b862b124c034c87d4883)
@@ -79,7 +79,7 @@
     {Gui::GuiActionType::ID_Vitals                                  ,   3 * 4       }, // 3 parameters each 4bytes
     {Gui::GuiActionType::ID_Ultrafiltration                         ,   4 * 4       }, // 4 parameters each 4bytes
     {Gui::GuiActionType::ID_IsolatedUF                              ,   4 * 4       }, // 4 parameters each 4bytes
-    {Gui::GuiActionType::ID_Heparin                                 ,   2 * 4       }, // 2 parameters each 4bytes
+    {Gui::GuiActionType::ID_Heparin                                 ,   3 * 4       }, // 2 parameters each 4bytes
     {Gui::GuiActionType::ID_Rinseback                               ,   6 * 4       }, // 6 parameters each 4bytes
     {Gui::GuiActionType::ID_Recirculate                             ,   2 * 4       }, // 2 parameters each 4bytes
     {Gui::GuiActionType::ID_BloodPrime                              ,   4 * 4       }, // 4 parameters each 4bytes
@@ -330,9 +330,8 @@
     {Gui::GuiActionType::ID_AdjustDGCleaningUsageReq                ,   0 * 4       }, // 0 parameter
     {Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp                ,  10 * 4       }, //10 parameters each 4bytes
     // ---- RO Water
-    {Gui::GuiActionType::ID_DuetRoWaterStatDGq                      ,   0 * 4       }, // 0 parameter  each 4bytes
-    {Gui::GuiActionType::ID_DuetRoWaterModeUIi                      ,   1 * 4       }, // 1 parameter  each 4bytes
-    {Gui::GuiActionType::ID_DuetRoWaterModeDGr                      ,   3 * 4       }, // 3 parameters each 4bytes
+    {Gui::GuiActionType::ID_AdjustRoWaterModeReq                    ,   1 * 4       }, // 1 parameter  each 4bytes
+    {Gui::GuiActionType::ID_AdjustRoWaterModeRsp                    ,   2 * 4       }, // 2 parameter  each 4bytes
     // ----
     {Gui::GuiActionType::ID_RawData                                 , 255           },
     {Gui::GuiActionType::ID_Acknow                                  ,   0           },
Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -rac290dfdbd332fafc7a70ad7f78a21ef15e7f82e -r9569b4a56306df342846b862b124c034c87d4883
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision ac290dfdbd332fafc7a70ad7f78a21ef15e7f82e)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 9569b4a56306df342846b862b124c034c87d4883)
@@ -130,7 +130,7 @@
             ID_TreatmentTime                            = 0x3B00, // 59     //// ----- @LEAHIZED
             ID_BloodFlow                                = 0x1100, // 17     //// ----- @LEAHIZED
             ID_DialysateInletFlow                       = 0x0800,
-            ID_DialysateOutletFlow                      = 0x0B00,
+            ID_DialysateOutletFlow                      = 0x0B0F,           //// ----- @CRAPIZED
             ID_PressureOcclusion                        = 0x2400, // 36     //// ----- @LEAHIZED
             ID_Saline                                   = 0x3D00, // 61     //// ----- @LEAHIZED
             ID_Ultrafiltration                          = 0x3E00, // 62     //// ----- @LEAHIZED
@@ -198,7 +198,7 @@
             ID_DGDrainPumpData                          = 0x240F, // ??   //// ----- @CRAPIZED: had to change to avoid duplication
             ID_DDOperationModeData                      = 0x1300,
             ID_DGReservoirData                          = 0x280F, // ??   //// ----- @CRAPIZED: had to change to avoid duplication
-            ID_DGLoadCellReadingsData                   = 0x0C00, // 12
+            ID_DGLoadCellReadingsData                   = 0x0C0F, // 12
             ID_DGAccelerometerData                      = 0x340F, // 52   //// ----- @CRAPIZED: had to change to avoid duplication
             ID_DDValvesStatesData                       = 0x1B00, // 27     //// ----- @LEAHIZED
             ID_DDPressuresData                          = 0x1C00, // 28     //// ----- @LEAHIZED
@@ -344,9 +344,8 @@
             ID_AdjustDGCleaningUsageRsp                 = 0x8D0F, // 141    //// ----- @CRAPIZED: had to change to avoid duplication
 
             // RO Water Input Mode
-            ID_DuetRoWaterStatDGq                       = 0xC300, // 195 DG -> UI // DG initiates Status query
-            ID_DuetRoWaterModeUIi                       = 0xBC00, // 188 UI -> DG // UI initiates Mode Set || responses to status query
-            ID_DuetRoWaterModeDGr                       = 0xC400, // 196 UI <- DG // DG responses Mode Set
+            ID_AdjustRoWaterModeReq                     = 0xED00, // 237
+            ID_AdjustRoWaterModeRsp                     = 0xEE00, // 238
 
             // Institutional record request and response
             ID_InstitutionalRecordReq                   = 0x8200, // 130 UI -> TD request institutional record