Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r229341f9eb23fec730cdf9b1f8f3960de2daf384 -re3a58d968d20c5e206e4ca0da48d71f3450debb5
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 229341f9eb23fec730cdf9b1f8f3960de2daf384)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision e3a58d968d20c5e206e4ca0da48d71f3450debb5)
@@ -161,9 +161,9 @@
     { MSG_ID_FW_VERSIONS_REQUEST,                                                   &handleVersionRequestMessage },
     { MSG_ID_DD_SAFETY_SHUTDOWN_OVERRIDE_REQUEST,                                   &testSetResetSafetyShutdownOverride },
     { MSG_ID_DD_UF_DATA_PUBLISH_OVERRIDE_REQUEST,                                   &testDDUFDataPublishIntervalOverride },
-    { MSG_ID_DD_SET_TEST_CONFIGURATION,                                             &handleSetTestConfiguration },
-    { MSG_ID_DD_GET_TEST_CONFIGURATION,                                             &handleGetTestConfiguration },
-    { MSG_ID_DD_RESET_ALL_TEST_CONFIGURATIONS,                                      &handleResetAllTestConfigurations },
+    { MSG_ID_DD_SET_TEST_CONFIGURATION,                                             &testSetTestConfiguration },
+    { MSG_ID_DD_GET_TEST_CONFIGURATION,                                             &testGetTestConfiguration },
+    { MSG_ID_DD_RESET_ALL_TEST_CONFIGURATIONS,                                      &testResetAllTestConfigurations },
 };
 
 #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLER_LOOKUP) / sizeof(MSG_HANDLER_LOOKUP_T))
@@ -717,14 +717,14 @@
 
 /*********************************************************************//**
  * @brief
- * The handleSetTestConfiguration function handles a request to set a
+ * The testSetTestConfiguration function handles a request to set a
  * test configuration.
  * @details \b Inputs: none
  * @details \b Outputs: message handled
  * @param message a pointer to the message to handle
  * @return TRUE if command accepted, FALSE if rejected
  *************************************************************************/
-BOOL handleSetTestConfiguration( MESSAGE_T *message )
+BOOL testSetTestConfiguration( MESSAGE_T *message )
 {
     BOOL result = FALSE;
 
@@ -756,14 +756,14 @@
 
 /*********************************************************************//**
  * @brief
- * The handleGetTestConfiguration function handles a request to get a
+ * The testGetTestConfiguration function handles a request to get a
  * test configuration.
  * @details \b Inputs: none
  * @details \b Outputs: message handled
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-BOOL handleGetTestConfiguration( MESSAGE_T *message )
+BOOL testGetTestConfiguration( MESSAGE_T *message )
 {
     BOOL result = FALSE;
 
@@ -778,14 +778,14 @@
 
 /*********************************************************************//**
  * @brief
- * The handleResetTestConfiguration function handles a request to reset all
+ * The testResetTestConfiguration function handles a request to reset all
  * test configurations.
  * @details \b Inputs: none
  * @details \b Outputs: message handled
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-BOOL handleResetAllTestConfigurations( MESSAGE_T *message )
+BOOL testResetAllTestConfigurations( MESSAGE_T *message )
 {
     BOOL result = FALSE;
 
Index: firmware/App/Services/Messaging.h
===================================================================
diff -u -r2245e17875668a9326a5f5155a56747378e139e9 -re3a58d968d20c5e206e4ca0da48d71f3450debb5
--- firmware/App/Services/Messaging.h	(.../Messaging.h)	(revision 2245e17875668a9326a5f5155a56747378e139e9)
+++ firmware/App/Services/Messaging.h	(.../Messaging.h)	(revision e3a58d968d20c5e206e4ca0da48d71f3450debb5)
@@ -79,9 +79,9 @@
 BOOL handleTesterLogInRequest( MESSAGE_T *message );
 BOOL handleDDSoftwareResetRequest( MESSAGE_T *message );
 
-BOOL handleSetTestConfiguration( MESSAGE_T *message );
-BOOL handleGetTestConfiguration( MESSAGE_T *message );
-BOOL handleResetAllTestConfigurations( MESSAGE_T *message );
+BOOL testSetTestConfiguration( MESSAGE_T *message );
+BOOL testGetTestConfiguration( MESSAGE_T *message );
+BOOL testResetAllTestConfigurations( MESSAGE_T *message );
 
 /**@}*/