Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -r6fd40bd4e54a0dc35ae7335a97122626d9c60ee0 -r6ac0e78ba8a65d86f67ce866ed879430fe2b2703
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 6fd40bd4e54a0dc35ae7335a97122626d9c60ee0)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 6ac0e78ba8a65d86f67ce866ed879430fe2b2703)
@@ -397,12 +397,12 @@
     typedef GuiActions::Generic_Confirm_Id                              GuiConfirmId;
     typedef GuiActions::Generic_Confirm_Command                         GuiConfirmCommand;
     // POST
-    typedef GuiActions::TD_POST_States                                  GuiHDPOSTStates;
-    typedef GuiActions::DD_POST_States                                  GuiDGPOSTStates;
+    typedef GuiActions::TD_POST_States                                  GuiTDPOSTStates;
+    typedef GuiActions::DD_POST_States                                  GuiDDPOSTStates;
     // operation mode
-    typedef GuiActions::TD_Op_Modes                                     GuiHDOpModes;
-    typedef GuiActions::DD_Op_Modes                                     GuiDGOpModes;
-    typedef GuiActions::TD_Standby_States                               GuiHDStandbyStates;
+    typedef GuiActions::TD_Op_Modes                                     GuiTDOpModes;
+    typedef GuiActions::DD_Op_Modes                                     GuiDDOpModes;
+    typedef GuiActions::TD_Standby_States                               GuiTDStandbyStates;
     // Treatment States
     typedef GuiActions::Treatment_States                                GuiTreatmentStates;
     // Dialysis
@@ -425,14 +425,11 @@
     typedef GuiActions::Requested_Treatment_Recirc_User_Actions         GuiRecirculateCommands;
     // Blood Prime
     typedef GuiActions::Blood_Prime_States                              GuiBloodPrimeStates;
-//  typedef GuiActions::Requested_Blood_Prime_User_Actions              GuiBloodPrimeCommands; // No user Action defined
     // Treatment End
     typedef GuiActions::Treatment_End_States                            GuiTreatmentEndStates;
     typedef GuiActions::Requested_Treatment_End_User_Actions            GuiTreatmentEndCommands;
     // Treatment Stop
     typedef GuiActions::Treatment_Stop_States                           GuiTreatmentStopStates;
-//  typedef GuiActions::Requested_Treatment_Stop_User_Actions           GuiTreatmentStopCommands; // No user Action defined
-
     // Pre-Treatment SubMode
     typedef GuiActions::TD_Pre_Treatment_Mode_States                    GuiPreTreatmentStates;
     // Pre-Treatment Water Sample