Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -r5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287 -rf2e4eba6e85c5d36537be782926f23cc9dc01037
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision f2e4eba6e85c5d36537be782926f23cc9dc01037)
@@ -120,7 +120,7 @@
             ID_HDRTCEpochData                           = 0x0A00, // 10
 
             // State Messages
-            ID_HDOperationModeData                      = 0x1200, // 18     //// ----- @LEAHIZED
+            ID_TDOpModeData                             = 0x1200, // 18     //// ----- @LEAHIZED
             ID_PreTreatmentStates                       = 0x5C00, // 92
             ID_TreatmentStates                          = 0x0F00, // 15
             ID_PostTreatmentStates                      = 0x7700, // 119
@@ -154,12 +154,12 @@
 
             // Pre-Treatment
             // Pre-Treatment Initiate Treatment
-            ID_AdjustInitTreatmentReq                   = 0x3800, // 56
-            ID_AdjustInitTreatmentRsp                   = 0x3900, // 57
+            ID_AdjustInitTreatmentReq                   = 0x4500, // 69     //// ----- @LEAHIZED
+            ID_AdjustInitTreatmentRsp                   = 0x4600, // 70     //// ----- @LEAHIZED
             // Pre-Treatment Parameters Validation/Confirm
-            ID_AdjustParametersValidationReq            = 0x3500, // 53
-            ID_AdjustParametersValidationRsp            = 0x3600, // 54
-            ID_AdjustParametersConfirmReq               = 0x3B00, // 59
+            ID_AdjustParametersValidationReq            = 0x3F00, // 63     //// ----- @LEAHIZED
+            ID_AdjustParametersValidationRsp            = 0x4000, // 64     //// ----- @LEAHIZED
+            ID_AdjustParametersConfirmReq               = 0x4400, // 68     //// ----- @LEAHIZED
             // Pre-Treatment Water Sample
             ID_DGFilterFlushData                        = 0x6000, // 96
             ID_AdjustWaterSampleReq                     = 0x5D00, // 93