Index: firmware/App/Modes/ModeService.c
===================================================================
diff -u -r52ded7b22d4b413aa8182f1343e4fbb78e8c3b0a -r090cfb22a7c0b4738299c3fb411ca77aaba8d968
--- firmware/App/Modes/ModeService.c	(.../ModeService.c)	(revision 52ded7b22d4b413aa8182f1343e4fbb78e8c3b0a)
+++ firmware/App/Modes/ModeService.c	(.../ModeService.c)	(revision 090cfb22a7c0b4738299c3fb411ca77aaba8d968)
@@ -22,35 +22,35 @@
 #include "OperationModes.h"
 
 /**
- *  @addtogroup DGServiceMode
+ *  @addtogroup DDServiceMode
  *  @{
  */
 
 // ********** private definitions **********
 
 // ********** private data **********
 
-static DG_SERVICE_STATE_T serviceState = DG_SERVICE_STATE_START;       ///< Currently active service state.
+static DD_SERVICE_STATE_T serviceState = DD_SERVICE_STATE_START;       ///< Currently active service state.
 
 // ********** private function prototypes **********
 
 /*********************************************************************//**
  * @brief
  * The initServiceMode function initializes the service mode module.
- * @details Inputs: none
- * @details Outputs: Service mode module initialized
+ * @details \b Inputs: none
+ * @details \b Outputs: Service mode module initialized
  * @return none
  *************************************************************************/
 void initServiceMode( void )
 {
-    serviceState = DG_SERVICE_STATE_START;
+    serviceState = DD_SERVICE_STATE_START;
 }
 
 /*********************************************************************//**
  * @brief
  * The transitionToServiceMode function prepares for transition to service mode.
- * @details Inputs: none
- * @details Outputs: none
+ * @details \b Inputs: none
+ * @details \b Outputs: none
  * @return initial state
  *************************************************************************/
 U32 transitionToServiceMode( void )
@@ -71,21 +71,22 @@
 /*********************************************************************//**
  * @brief
  * The execServiceMode function executes the service mode state machine.
- * @details Inputs: none
- * @details Outputs: Service mode state machine executed
+ * @details \b Inputs: none
+ * @details \b Outputs: Service mode state machine executed
+ * @details \b Alarm: ALARM_ID_DD_SOFTWARE_FAULT when wrong service state invoked.
  * @return current state.
  *************************************************************************/
 U32 execServiceMode( void )
 {
     // execute current service state
     switch ( serviceState )
     {
-        case DG_SERVICE_STATE_START:
+        case DD_SERVICE_STATE_START:
             break;
 
         default:
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_SERVICE_MODE_INVALID_EXEC_STATE, serviceState )
-            serviceState = DG_SERVICE_STATE_START;
+            serviceState = DD_SERVICE_STATE_START;
             break;
     }
 
@@ -95,11 +96,11 @@
 /*********************************************************************//**
  * @brief
  * The getCurrentServiceState function returns the current state of the service mode.
- * @details Inputs: serviceState
- * @details Outputs: none
+ * @details \b Inputs: serviceState
+ * @details \b Outputs: none
  * @return the current state of service mode
  *************************************************************************/
-DG_SERVICE_STATE_T getCurrentServiceState( void )
+DD_SERVICE_STATE_T getCurrentServiceState( void )
 {
     return serviceState;
 }