Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -rc8ea1e90f2ecdaffb0a8f6c909babc89e06f3cab -rfc912ee48cf485f9ab861eb7ebc7d2f34533d76d
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision c8ea1e90f2ecdaffb0a8f6c909babc89e06f3cab)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision fc912ee48cf485f9ab861eb7ebc7d2f34533d76d)
@@ -15,14 +15,13 @@
 *
 ***************************************************************************/
 
-#include <TxDrySelfTests.h>
 #include "Buttons.h"
 #include "ModePreTreat.h"
 #include "OperationModes.h"
 #include "TaskGeneral.h"
 #include "Timers.h"
 #include "TxParams.h"
-
+#include "TxDrySelfTests.h"
 /**
  *  @addtogroup TDPreTreatmentMode
  *  @{
Index: firmware/App/Services/TxDrySelfTests.c
===================================================================
diff -u -rc8ea1e90f2ecdaffb0a8f6c909babc89e06f3cab -rfc912ee48cf485f9ab861eb7ebc7d2f34533d76d
--- firmware/App/Services/TxDrySelfTests.c	(.../TxDrySelfTests.c)	(revision c8ea1e90f2ecdaffb0a8f6c909babc89e06f3cab)
+++ firmware/App/Services/TxDrySelfTests.c	(.../TxDrySelfTests.c)	(revision fc912ee48cf485f9ab861eb7ebc7d2f34533d76d)
@@ -15,7 +15,6 @@
 *
 ***************************************************************************/
 
-#include <TxDrySelfTests.h>
 #include "AirPump.h"
 #include "AirTrap.h"
 #include "BloodFlow.h"
@@ -35,12 +34,13 @@
 #include "TDCommon.h"
 #include "Timers.h"
 #include "TxParams.h"
+#include "TxDrySelfTests.h"
 #include "Utilities.h"
 #include "Valves.h"
 #include "Valve3Way.h"
 
 /**
- *  @addtogroup StatePreTxDrySelfTests
+ *  @addtogroup TxDrySelfTests
  *  @{
  */
 
Index: firmware/App/Services/TxDrySelfTests.h
===================================================================
diff -u -rc8ea1e90f2ecdaffb0a8f6c909babc89e06f3cab -rfc912ee48cf485f9ab861eb7ebc7d2f34533d76d
--- firmware/App/Services/TxDrySelfTests.h	(.../TxDrySelfTests.h)	(revision c8ea1e90f2ecdaffb0a8f6c909babc89e06f3cab)
+++ firmware/App/Services/TxDrySelfTests.h	(.../TxDrySelfTests.h)	(revision fc912ee48cf485f9ab861eb7ebc7d2f34533d76d)
@@ -22,10 +22,10 @@
 #include "TDDefs.h"
 
 /**
- *  @defgroup StatePreTxDrySelfTests
- *  @brief StatePreTxDrySelfTests module. This module handles self-tests execution for pre-treatment mode.
+ *  @defgroup TxDrySelfTests
+ *  @brief TxDrySelfTests module. This module handles self-tests execution for pre-treatment mode.
  *
- *  @addtogroup StatePreTxDrySelfTests
+ *  @addtogroup TxDrySelfTests
  *  @{
  */