Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r0b17c6271cdc3c55697a74ecaadb477d9c8f5687 -rfeb93744f73bc0a3d58841bb02bd05c38357f35d
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 0b17c6271cdc3c55697a74ecaadb477d9c8f5687)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision feb93744f73bc0a3d58841bb02bd05c38357f35d)
@@ -1971,38 +1971,6 @@
 }
 
 /*********************************************************************//**
-* @brief
-* The handleFansDataPublishIntervalOverride function handles a request
-* to override the publish interval of the fans data
-* @details Inputs: none
-* @details Outputs: message handled
-* @param message a pointer to the message to handle
-* @return none
-*************************************************************************/
-void handleFansDataPublishIntervalOverride( MESSAGE_T * message )
-{
-    TEST_OVERRIDE_PAYLOAD_T payload;
-    BOOL result = FALSE;
-
-    // verify payload length
-    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
-    {
-        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-        if ( FALSE == payload.reset )
-        {
-            result = testSetFanPublishIntervalOverride( payload.state.u32 );
-        }
-        else
-        {
-            result = testResetFanPublishIntervalOverride();
-        }
-    }
-
-    // respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
  * @brief
  * The handleSetConcentratePumpTargetSpeed function handles a request to
  * override a concentrate pump's target speed value.
@@ -2102,15 +2070,15 @@
 * @param message a pointer to the message to handle
 * @return none
 *************************************************************************/
-void handleThermistorsDataPublishIntervalOverride( MESSAGE_T *message )
+void handleTestThermistorsDataPublishIntervalOverride( MESSAGE_T *message )
 {
     TEST_OVERRIDE_PAYLOAD_T payload;
     BOOL result = FALSE;
 
     // verify payload length
-    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
+    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
     {
-        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
         if ( FALSE == payload.reset )
         {
             result = testSetThermistorPublishIntervalOverride( payload.state.u32 );
@@ -2134,7 +2102,7 @@
 * @param message a pointer to the message to handle
 * @return none
 *************************************************************************/
-void handleThermisotrsValueOverride( MESSAGE_T *message )
+void handleTestThermisotrsValueOverride( MESSAGE_T *message )
 {
     TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     BOOL result = FALSE;
@@ -2157,4 +2125,36 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
+/*********************************************************************//**
+* @brief
+* The handleFansDataPublishIntervalOverride function handles a request
+* to override the publish interval of the fans data
+* @details Inputs: none
+* @details Outputs: message handled
+* @param message a pointer to the message to handle
+* @return none
+*************************************************************************/
+void handleTestFansDataPublishIntervalOverride( MESSAGE_T * message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetFanPublishIntervalOverride( payload.state.u32 );
+        }
+        else
+        {
+            result = testResetFanPublishIntervalOverride();
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /**@}*/