Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -rca05e940ea4a0c567acb05c4c8777dea079b0f08 -r148844d868453927c9dd3f9c47e79d829c08d303
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision ca05e940ea4a0c567acb05c4c8777dea079b0f08)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 148844d868453927c9dd3f9c47e79d829c08d303)
@@ -82,7 +82,7 @@
             ID_DuetConfirmUIr                           = 0xBB00, // 187
 
             // POST
-            ID_HDPostSingleResultData                   = 0x8E00, // 142
+            ID_HDPostSingleResultData                   = 0x8E0F, // 142 //// ----- @CRAPIZED: had to change to avoid duplication
             ID_HDPostFinalResultData                    = 0x8F00, // 143
             ID_DGPostSingleResultData                   = 0x9000, // 144
             ID_DGPostFinalResultData                    = 0x9100, // 145
@@ -275,8 +275,8 @@
             ID_AdjustRecirculateRsp                     = 0x5500, // 85
 
             // Treatment End
-            ID_AdjustTreatmentEndReq                    = 0xDA00, // 87
-            ID_AdjustTreatmentEndRsp                    = 0xDB00, // 88
+            ID_AdjustTreatmentEndReq                    = 0x8D00, // 141
+            ID_AdjustTreatmentEndRsp                    = 0x8E00, // 142
 
             // Post-Treatment
             // Patient Disconnect
@@ -303,7 +303,7 @@
             ID_AdjustDisinfectStartRsp                  = 0x8000, // 128
 
             ID_AdjustDGCleaningUsageReq                 = 0xB800, // 184
-            ID_AdjustDGCleaningUsageRsp                 = 0x8D00, // 141
+            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
Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h
===================================================================
diff -u -rca05e940ea4a0c567acb05c4c8777dea079b0f08 -r148844d868453927c9dd3f9c47e79d829c08d303
--- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h	(.../MTreatmentAdjustRequests.h)	(revision ca05e940ea4a0c567acb05c4c8777dea079b0f08)
+++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h	(.../MTreatmentAdjustRequests.h)	(revision 148844d868453927c9dd3f9c47e79d829c08d303)
@@ -394,7 +394,7 @@
  *
  * | MSG  | CAN ID | Type | Ack | Src | Dest | Description           |
  * |:----:|:------:|:----:|:---:|:---:|:----:|:---------------:      |
- * |0x5700| 0x100  | Req  | Y   | UI  | HD   | Treatment End Request |
+ * |0x8D00| 0x100  | Req  | Y   | UI  | HD   | Treatment End Request |
  *
  * | Payload  ||
  * |          ||
Index: sources/model/td/adjustment/treatment/MTreatmentAdjustEndResponse.h
===================================================================
diff -u -rca05e940ea4a0c567acb05c4c8777dea079b0f08 -r148844d868453927c9dd3f9c47e79d829c08d303
--- sources/model/td/adjustment/treatment/MTreatmentAdjustEndResponse.h	(.../MTreatmentAdjustEndResponse.h)	(revision ca05e940ea4a0c567acb05c4c8777dea079b0f08)
+++ sources/model/td/adjustment/treatment/MTreatmentAdjustEndResponse.h	(.../MTreatmentAdjustEndResponse.h)	(revision 148844d868453927c9dd3f9c47e79d829c08d303)
@@ -32,7 +32,7 @@
  *
  * | MSG  | CAN ID | M.Box | Type | Ack | Src | Dest | Description            |
  * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:----------------:      |
- * |0x5800| 0x020  | 6     | Rsp  | Y   | HD  | UI   | Treatment End Response |
+ * |0x8E00| 0x020  | 6     | Rsp  | Y   | HD  | UI   | Treatment End Response |
  *
  * | Payload  ||
  * |          ||