Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -ra524ef99542bfa8d371835bc7c7d24c68ecf1865 -r72289d4b682e419df5d6f7210eca83d97cd657ae
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision a524ef99542bfa8d371835bc7c7d24c68ecf1865)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 72289d4b682e419df5d6f7210eca83d97cd657ae)
@@ -106,18 +106,18 @@
 
             // Service Information
             ID_AdjustServiceDatesReq                    = 0x8900, // 137
-            ID_AdjustServiceDatesHDRsp                  = 0x8A00, // 138
-            ID_AdjustServiceDatesDGRsp                  = 0x8C00, // 140
+            ID_AdjustServiceDatesHDRsp                  = 0x8A0F, // 138 //// ----- @CRAPIZED: had to change to avoid duplication
+            ID_AdjustServiceDatesDGRsp                  = 0x8C0F, // 140 //// ----- @CRAPIZED: had to change to avoid duplication
 
             // HD/DG Usage Counter
             ID_HDUsageInfoReq                           = 0xA000, // 160
-            ID_HDUsageInfoRsp                           = 0x8B00, // 139
+            ID_HDUsageInfoRsp                           = 0x8B0F, // 139 //// ----- @CRAPIZED: had to change to avoid duplication
 
             // RTC
-            ID_AdjustHDDateTimeReq                      = 0x6D00, // 109
-            ID_AdjustHDDateTimeRsp                      = 0x6E00, // 110
-            ID_AdjustDGDateTimeReq                      = 0x6F00, // 111
-            ID_AdjustDGDateTimeRsp                      = 0x7000, // 112
+            ID_AdjustTDDateTimeReq                      = 0x6C00, // 108
+            ID_AdjustTDDateTimeRsp                      = 0x6D00, // 109
+            ID_AdjustDDDateTimeReq                      = 0x6E00, // 110
+            ID_AdjustDDDateTimeRsp                      = 0x6F00, // 111
             ID_HDRTCEpochData                           = 0x0A0F, // 10     //// ----- @CRAPIZED
 
             // State Messages
@@ -136,7 +136,7 @@
             ID_PressureOcclusion                        = 0x2400, // 36     //// ----- @LEAHIZED
             ID_Saline                                   = 0x3D00, // 61     //// ----- @LEAHIZED
             ID_Ultrafiltration                          = 0x3E00, // 62     //// ----- @LEAHIZED
-            ID_Heparin                                  = 0x4D00, // 77
+            ID_Heparin                                  = 0x8C00, // 140
             ID_Rinseback                                = 0x5600, // 86
             ID_Recirculate                              = 0x5A00, // 90
             ID_BloodPrime                               = 0x5900, // 89
@@ -224,7 +224,7 @@
             // HD Data Messages
             ID_HDAccelerometerData                      = 0x3300, // 51
             ID_HDSyringePumpData                        = 0x6900, // 105
-            ID_HDBloodLeakData                          = 0x6C00, // 108
+            ID_HDBloodLeakData                          = 0x6C0F, // 108  //// ----- @CRAPIZED: had to change to avoid duplication
             ID_TDAirBubbleData                          = 0x1E00, // 30   //// ----- @LEAHIZED
             ID_TDAirPumpData                            = 0x2000, // 32   //// ----- @LEAHIZED
             ID_TDAirTrapData                            = 0x2A00, // 42   //// ----- @LEAHIZED
@@ -252,8 +252,8 @@
             ID_AdjustVitalsReq                          = 0x6300, // 99
             ID_AdjustVitalsRsp                          = 0x6400, // 100
 
-            ID_AdjustHeparinReq                         = 0x4B00, // 75
-            ID_AdjustHeparinRsp                         = 0x4C00, // 76
+            ID_AdjustHeparinReq                         = 0x8A00, // 138
+            ID_AdjustHeparinRsp                         = 0x8B00, // 139
 
             // Ultrafiltration
             ID_AdjustUltrafiltrationStateReq            = 0x4700, // 71   //// ----- @LEAHIZED