Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r54f45c387430e440ab4607451fc84dea61f273f1 -r748fbe2e4347126645d229f9dfed45de55526ef7
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 54f45c387430e440ab4607451fc84dea61f273f1)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 748fbe2e4347126645d229f9dfed45de55526ef7)
@@ -64,14 +64,14 @@
 #define MINIMUM_TARGET_TEMPERATURE                                 10U                              ///< Minimum allowed target temperature for the heaters.
 #define MAXIMUM_TARGET_TEMPERATURE                                 90U                              ///< Maximum allowed target temperature for the heaters.
 
-/// Heaters self test enums
+/// Heaters self-test enums
 typedef enum heaters_self_test_states
 {
-    HEATERS_SELF_TEST_START = 0,                                                ///< Heaters self test start state
-    HEATERS_SELF_TEST_SMALL_PRIMARY_AND_TRIMMER_HEATERS,                        ///< Heaters self test small primary and trimmer heaters state
-    HEATERS_SELF_TEST_MAIN_PRIMARY_HEATER,                                      ///< Heaters self test start main primary state
-    HEATERS_SELF_TEST_COMPLETE,                                                 ///< Heaters self test complete state
-    NUM_OF_HEATERS_SELF_TEST_STATES                                             ///< Number of heaters self test states
+    HEATERS_SELF_TEST_START = 0,                                                ///< Heaters self-test start state
+    HEATERS_SELF_TEST_SMALL_PRIMARY_AND_TRIMMER_HEATERS,                        ///< Heaters self-test small primary and trimmer heaters state
+    HEATERS_SELF_TEST_MAIN_PRIMARY_HEATER,                                      ///< Heaters self-test start main primary state
+    HEATERS_SELF_TEST_COMPLETE,                                                 ///< Heaters self-test complete state
+    NUM_OF_HEATERS_SELF_TEST_STATES                                             ///< Number of heaters self-test states
 } HEATERS_SELF_TEST_STATES_T ;
 
 /// Primary heaters exec states
@@ -100,8 +100,8 @@
 
 // ********** private data **********
 
-static SELF_TEST_STATUS_T heatersSelfTestResult;                                            ///< Heaters self test results.
-static HEATERS_SELF_TEST_STATES_T heatersSelfTestState;                                     ///< Heaters self test state.
+static SELF_TEST_STATUS_T heatersSelfTestResult;                                            ///< Heaters self-test results.
+static HEATERS_SELF_TEST_STATES_T heatersSelfTestState;                                     ///< Heaters self-test state.
 static PRIMARY_HEATERS_EXEC_STATES_T primaryHeatersExecState;                               ///< Primary heaters exec state.
 static TRIMMER_HEATER_EXEC_STATES_T trimmerHeaterExecState;                                 ///< Trimmer heater exec state.
 
@@ -119,7 +119,7 @@
 
 static OVERRIDE_U32_T heatersDataPublishInterval = { HEATERS_DATA_PUBLISH_INTERVAL,
                                                      HEATERS_DATA_PUBLISH_INTERVAL, 0, 0 }; ///< Heaters data publish time interval.
-static U32 selfTestElapsedTime;                                                             ///< Self test elapsed time variable.
+static U32 selfTestElapsedTime;                                                             ///< Self-test elapsed time variable.
 static BOOL hasStartPrimaryHeaterRequested;                                                 ///< Start primary heater request flag.
 static BOOL hasStartTrimmerHeaterRequested;                                                 ///< Start trimmer heater request flag.
 
@@ -313,7 +313,7 @@
 
 /*********************************************************************//**
  * @brief
- * The execHeatersSelfTest function executes the heaters' self test state machine.
+ * The execHeatersSelfTest function executes the heaters' self-test state machine.
  * @details
  * Inputs : heatersSelfTestState
  * Outputs : heatersSelfTestState
@@ -405,7 +405,7 @@
 /*********************************************************************//**
  * @brief
  * The handleHeatersSelfTestStart function starts the small primary and
- * the trimmer heaters for self test.
+ * the trimmer heaters for self-test.
  * @details
  * Inputs : heatersSelfTestResult, selfTestElapsedTime
  * Outputs : heatersSelfTestResult, selfTestElapsedTime