Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -rdf61c476838011a343a6930fd5b30404629379bc -rbc97db7aaffa2e2115d2049bbcda2da34fb8f9a8
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision df61c476838011a343a6930fd5b30404629379bc)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision bc97db7aaffa2e2115d2049bbcda2da34fb8f9a8)
@@ -121,7 +121,7 @@
 
             // State Messages
             ID_TDOpModeData                             = 0x1200, // 18     //// ----- @LEAHIZED
-            ID_PreTreatmentStates                       = 0x5C00, // 92
+            ID_PreTreatmentStates                       = 0xB700, // 183    //// ----- @LEAHIZED
             ID_TreatmentStates                          = 0x3C00, // 60     //// ----- @LEAHIZED
             ID_PostTreatmentStates                      = 0x770F, // 119    //// ----- @CRAPIZED: had to change to avoid duplication
 
@@ -179,7 +179,7 @@
             // Pre-Treatment Disposable Priming
             ID_AdjustDisposablesPrimeReq                = 0x3C0F, // 60     //// ----- @CRAPIZED: had to change to avoid duplication
             ID_AdjustDisposablesPrimeRsp                = 0x3D0F, // 61     //// ----- @CRAPIZED: had to change to avoid duplication
-            ID_DisposablesPrimeData                     = 0x43FF, // ??     //// ----- @CRAPIZED - FFed
+            ID_DisposablesPrimeData                     = 0xC700, // 199    //// ----- @LEAHIZED
             // Pre-Treatment Patient Connection Begin
             ID_AdjustPatientConnectionBeginReq          = 0x640F, // 100    //// ----- @CRAPIZED: had to change to avoid duplication
             ID_AdjustPatientConnectionBeginRsp          = 0x650F, // 101   //// ----- @CRAPIZED: had to change to avoid duplication
@@ -457,7 +457,7 @@
         // Pre-Treatment Self Test Dry
         Q_ENUM(TD_Pre_Treatment_Dry_Self_Tests_States)
         // Pre-Treatment Prime
-        Q_ENUM(TD_Pre_Treatment_Prime_States)
+        Q_ENUM(TD_Prime_States)
         // Pre-Treatment Recirculate
         Q_ENUM(TD_Pre_Treatment_Recirc_States)
         // Post-Treatment SubMode
@@ -537,7 +537,7 @@
     // Pre-Treatment Self Test Dry
     typedef GuiActions::TD_Pre_Treatment_Dry_Self_Tests_States          GuiPreTreatmentSelfTestDryStates;
     // Pre-Treatment Prime
-    typedef GuiActions::TD_Pre_Treatment_Prime_States                   GuiPreTreatmentPrimeStates;
+    typedef GuiActions::TD_Prime_States                                 GuiPreTreatmentPrimeStates;
     // Pre-Treatment Recirculate
     typedef GuiActions::TD_Pre_Treatment_Recirc_States                  GuiPreTreatmentRecirculateStates;