Index: HDDefs.h
===================================================================
diff -u -r0551ba4ac8162f75e8ad03c479ef58ffabd68a69 -rde4b672b00f7b1efb4a0c6c218347c643b4a0adb
--- HDDefs.h	(.../HDDefs.h)	(revision 0551ba4ac8162f75e8ad03c479ef58ffabd68a69)
+++ HDDefs.h	(.../HDDefs.h)	(revision de4b672b00f7b1efb4a0c6c218347c643b4a0adb)
@@ -185,7 +185,7 @@
 /**@}*/
 
 /**
- *  @addtogroup SelfTestConsumable
+ *  @addtogroup ConsumableSelfTest
  *  @{
  */
 
@@ -313,7 +313,7 @@
     PRE_TREATMENT_RECIRC_STOPPED_STATE,                             ///< Pre-treatment recirculate stopped state
     NUM_OF_PRE_TREATMENT_RECIRC_STATES                              ///< Number of pre-treatment recirculate states
 };
-///< Type for HD pre-treatment recirculate sub-mode states enumeration
+/// Type for HD pre-treatment recirculate sub-mode states enumeration
 typedef enum HD_Pre_Treatment_Recirc_States HD_PRE_TREATMENT_RECIRC_STATE_T;
 
 /**@}*/
@@ -332,7 +332,7 @@
     PRE_TREATMENT_PAT_CONN_WAIT_FOR_TREATMENT_START_STATE,          ///< Pre-treatment patient connect wait for treatment start state
     NUM_OF_PRE_TREATMENT_PAT_CONN_STATES                            ///< Number of pre-treatment patient connect states
 };
-///< Type for HD pre-treatment recirculate sub-mode states enumeration
+/// Type for HD pre-treatment patient connect sub-mode states enumeration
 typedef enum HD_Pre_Treatment_Pat_Conn_States HD_PRE_TREATMENT_PAT_CONN_STATE_T;
 
 /**@}*/
@@ -697,7 +697,7 @@
 typedef enum HD_Pumps HD_PUMP_T;                                        ///< Type for HD pump enumeration
 
 /**
- *  @addtogroup HDTreatmentLog
+ *  @addtogroup HDTreatmentMode
  *  @{
  */
 
@@ -786,7 +786,7 @@
 /**@}*/
 
 /**
- *  @addtogroup UIUserConfirm
+ *  @addtogroup HDOperationModes
  *  @{
  */