Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -rcb9c48c7c307690dcafcfd16ef412fe660291692 -r1edd5fe4e852a2b352a86587820a269a5103fc9f
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision cb9c48c7c307690dcafcfd16ef412fe660291692)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 1edd5fe4e852a2b352a86587820a269a5103fc9f)
@@ -106,12 +106,12 @@
 
             // 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
@@ -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
@@ -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