Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -rad57884fca3e8a0916b6d6bf51a69264b9b5263f -rbd8d4a0e4e5a34b3187f4b472f1eb385d2a24046
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision ad57884fca3e8a0916b6d6bf51a69264b9b5263f)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision bd8d4a0e4e5a34b3187f4b472f1eb385d2a24046)
@@ -110,7 +110,7 @@
             ID_AdjustServiceDatesDGRsp                  = 0x8C0F, // 140 //// ----- @CRAPIZED: had to change to avoid duplication
 
             // HD/DG Usage Counter
-            ID_HDUsageInfoReq                           = 0xA000, // 160
+            ID_HDUsageInfoReq                           = 0xA00F, // 160 //// ----- @CRAPIZED: had to change to avoid duplication
             ID_HDUsageInfoRsp                           = 0x8B0F, // 139 //// ----- @CRAPIZED: had to change to avoid duplication
 
             // RTC
@@ -137,7 +137,7 @@
             ID_Saline                                   = 0x3D00, // 61     //// ----- @LEAHIZED
             ID_Ultrafiltration                          = 0x3E00, // 62     //// ----- @LEAHIZED
             ID_Heparin                                  = 0x8C00, // 140
-            ID_IsolatedUF                               = 0x9000, // 144
+            ID_IsolatedUF                               = 0x9A00, // 154
             ID_Rinseback                                = 0x5600, // 86
             ID_Recirculate                              = 0x5A00, // 90
             ID_BloodPrime                               = 0x5900, // 89
@@ -283,14 +283,14 @@
             ID_AdjustUltrafiltrationConfirmReq          = 0x6600, // 102  //// ----- @LEAHIZED
             ID_AdjustUltrafiltrationConfirmRsp          = 0x6700, // 103  //// ----- @LEAHIZED
 
-            ID_AdjustIsolatedUFDurationEditReq          = 0x9100, // 145  //// ----- @LEAHIZED
-            ID_AdjustIsolatedUFDurationEditRsp          = 0x9200, // 146  //// ----- @LEAHIZED
+            ID_AdjustIsolatedUFDurationEditReq          = 0x9B00, // 155  //// ----- @LEAHIZED
+            ID_AdjustIsolatedUFDurationEditRsp          = 0x9C00, // 156  //// ----- @LEAHIZED
 
-            ID_AdjustIsolatedUFVolumeGoalEditReq        = 0x9300, // 147  //// ----- @LEAHIZED
-            ID_AdjustIsolatedUFVolumeGoalEditRsp        = 0x9400, // 148  //// ----- @LEAHIZED
+            ID_AdjustIsolatedUFVolumeGoalEditReq        = 0x9D00, // 157  //// ----- @LEAHIZED
+            ID_AdjustIsolatedUFVolumeGoalEditRsp        = 0x9E00, // 158  //// ----- @LEAHIZED
 
-            ID_AdjustIsolatedUFConfirmReq               = 0x9500, // 149  //// ----- @LEAHIZED
-            ID_AdjustIsolatedUFConfirmRsp               = 0x9600, // 150  //// ----- @LEAHIZED
+            ID_AdjustIsolatedUFConfirmReq               = 0x9F00, // 159  //// ----- @LEAHIZED
+            ID_AdjustIsolatedUFConfirmRsp               = 0xA000, // 160  //// ----- @LEAHIZED
 
             // End-Treatment
             // Rinseback
@@ -324,8 +324,8 @@
             ID_TreatmentLogEventData                    = 0x960F, // 150 //// ----- @CRAPIZED: had to change to avoid duplication
 
             // Disinfect
-            ID_AdjustDisinfectModeReq                   = 0x9A00, // 154
-            ID_AdjustDisinfectModeRsp                   = 0x9B00, // 155
+            ID_AdjustDisinfectModeReq                   = 0x9A0F, // 154    //// ----- @CRAPIZED: had to change to avoid duplication
+            ID_AdjustDisinfectModeRsp                   = 0x9B0F, // 155    //// ----- @CRAPIZED: had to change to avoid duplication
             ID_AdjustDisinfectStartReq                  = 0x7F0F, // 127    //// ----- @CRAPIZED: had to change to avoid duplication
             ID_AdjustDisinfectStartRsp                  = 0x800F, // 128    //// ----- @CRAPIZED: had to change to avoid duplication
 
Index: sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFConfirmResponse.h
===================================================================
diff -u -rad57884fca3e8a0916b6d6bf51a69264b9b5263f -rbd8d4a0e4e5a34b3187f4b472f1eb385d2a24046
--- sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFConfirmResponse.h	(.../MTreatmentAdjustIsolatedUFConfirmResponse.h)	(revision ad57884fca3e8a0916b6d6bf51a69264b9b5263f)
+++ sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFConfirmResponse.h	(.../MTreatmentAdjustIsolatedUFConfirmResponse.h)	(revision bd8d4a0e4e5a34b3187f4b472f1eb385d2a24046)
@@ -29,9 +29,9 @@
  * \brief   The MAdjustIsolatedUFConfirmResponse class
  * \details The UF vol. change confirmation response model
  *
- * | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description                          |
- * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:                         |
- * |0x9600| 0x040  | 6   | Rsp    | Y   | TD  | UI  | UF Vol. Change Confirmation Response |
+ * | MSG  | CAN ID  Type   | Ack | Src | Dst | Description                          |
+ * |:----:|:------::------:|:---:|:---:|:---:|:-----------:                         |
+ * |0xA000| 0x040   Rsp    | Y   | TD  | UI  | UF Vol. Change Confirmation Response |
  *
  * | Payload  ||
  * |          ||
Index: sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFDurationEditResponse.h
===================================================================
diff -u -rad57884fca3e8a0916b6d6bf51a69264b9b5263f -rbd8d4a0e4e5a34b3187f4b472f1eb385d2a24046
--- sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFDurationEditResponse.h	(.../MTreatmentAdjustIsolatedUFDurationEditResponse.h)	(revision ad57884fca3e8a0916b6d6bf51a69264b9b5263f)
+++ sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFDurationEditResponse.h	(.../MTreatmentAdjustIsolatedUFDurationEditResponse.h)	(revision bd8d4a0e4e5a34b3187f4b472f1eb385d2a24046)
@@ -31,7 +31,7 @@
  *
  * | MSG  | CAN ID | Type   | Ack | Src | Dst | Description                         |
  * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------:                        |
- * |0x9200| 0x040  | Rsp    | Y   | TD  | UI  | Isolated UF Duration Edit Response  |
+ * |0x9C00| 0x040  | Rsp    | Y   | TD  | UI  | Isolated UF Duration Edit Response  |
  *
  * | Payload  ||
  * |          ||
Index: sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFVolumeGoalEditResponse.h
===================================================================
diff -u -rad57884fca3e8a0916b6d6bf51a69264b9b5263f -rbd8d4a0e4e5a34b3187f4b472f1eb385d2a24046
--- sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFVolumeGoalEditResponse.h	(.../MTreatmentAdjustIsolatedUFVolumeGoalEditResponse.h)	(revision ad57884fca3e8a0916b6d6bf51a69264b9b5263f)
+++ sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFVolumeGoalEditResponse.h	(.../MTreatmentAdjustIsolatedUFVolumeGoalEditResponse.h)	(revision bd8d4a0e4e5a34b3187f4b472f1eb385d2a24046)
@@ -31,7 +31,7 @@
  *
  * | MSG  | CAN ID | Type   | Ack | Src | Dst | Description                             |
  * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------:                            |
- * |0x9400| 0x040  | Rsp    | Y   | TD  | UI  | Isolated UF Volume Goal Edit Response   |
+ * |0x9E00| 0x040  | Rsp    | Y   | TD  | UI  | Isolated UF Volume Goal Edit Response   |
  *
  * | Payload  ||
  * |          ||
Index: sources/model/td/data/treatment/MTreatmentIsolatedUFData.h
===================================================================
diff -u -rad57884fca3e8a0916b6d6bf51a69264b9b5263f -rbd8d4a0e4e5a34b3187f4b472f1eb385d2a24046
--- sources/model/td/data/treatment/MTreatmentIsolatedUFData.h	(.../MTreatmentIsolatedUFData.h)	(revision ad57884fca3e8a0916b6d6bf51a69264b9b5263f)
+++ sources/model/td/data/treatment/MTreatmentIsolatedUFData.h	(.../MTreatmentIsolatedUFData.h)	(revision bd8d4a0e4e5a34b3187f4b472f1eb385d2a24046)
@@ -32,7 +32,7 @@
  *
  * | MSG  | CAN ID | Box | Type   | Ack | Src | Dst | Description               |
  * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------:              |
- * |0x900| 0x100  | 7   | 1 Hz   | N   | TD  | All | Treatment IsolatedUF Data  |
+ * |0x9A00| 0x100  | 7   | 1 Hz   | N   | TD  | All | Treatment IsolatedUF Data  |
  *
  * | Payload  ||
  * |          ||