Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r31e778e30a996a0c75429c9a1e9fb34e5d9e373d -rdcd956fa52aef8f27bba867e54f764bebd384c99
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 31e778e30a996a0c75429c9a1e9fb34e5d9e373d)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision dcd956fa52aef8f27bba867e54f764bebd384c99)
@@ -5481,7 +5481,7 @@
     memcpy(&payloadLength, payloadPtr, sizeof(U32));
     payloadPtr += sizeof(U32);
 
-    status = setCalibrationRecord( currentMessage, totalMessages, payloadLength, payloadPtr );
+    status = receiveRecordFromDialin( NVDATAMGMT_CALIBRATION_RECORD, currentMessage, totalMessages, payloadLength, payloadPtr );
 
     // Respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status );
@@ -5506,7 +5506,7 @@
         // Tester must be logged in
         if ( TRUE == isTestingActivated() )
         {
-            result = getCalibrationRecord();
+            result = sendRecordToDialin( NVDATAMGMT_CALIBRATION_RECORD );
         }
     }
 
@@ -5629,7 +5629,7 @@
     memcpy(&payloadLength, payloadPtr, sizeof(U32));
     payloadPtr += sizeof(U32);
 
-    status = setSystemRecord( currentMessage, totalMessages, payloadLength, payloadPtr );
+    status = receiveRecordFromDialin( NVDATAMGMT_SYSTEM_RECORD, currentMessage, totalMessages, payloadLength, payloadPtr );
 
     // Respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status );
@@ -5654,7 +5654,7 @@
         // Tester must be logged in
         if ( TRUE == isTestingActivated() )
         {
-            result = getSystemRecord();
+            result = sendRecordToDialin( NVDATAMGMT_SYSTEM_RECORD );
         }
     }
 
@@ -5745,7 +5745,7 @@
         // Tester must be logged in
         if ( TRUE == isTestingActivated() )
         {
-            result = getServiceRecord();
+            result = sendRecordToDialin( NVDATAMGMT_SERVICE_RECORD );
         }
     }
 
@@ -5811,7 +5811,7 @@
     memcpy(&payloadLength, payloadPtr, sizeof(U32));
     payloadPtr += sizeof(U32);
 
-    status = setServiceRecord( currentMessage, totalMessages, payloadLength, payloadPtr );
+    status = receiveRecordFromDialin( NVDATAMGMT_SERVICE_RECORD, currentMessage, totalMessages, payloadLength, payloadPtr );
 
     // Respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, status );