Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r40f46e196349e3dd730048a354df8bbb2e40407d -r2acaf549519854f7e6de1511d541582267f4d1e8
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 40f46e196349e3dd730048a354df8bbb2e40407d)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 2acaf549519854f7e6de1511d541582267f4d1e8)
@@ -5480,7 +5480,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 );
@@ -5505,7 +5505,7 @@
         // Tester must be logged in
         if ( TRUE == isTestingActivated() )
         {
-            result = getCalibrationRecord();
+            result = sendRecordToDialin( NVDATAMGMT_CALIBRATION_RECORD );
         }
     }
 
@@ -5628,7 +5628,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 );
@@ -5653,7 +5653,7 @@
         // Tester must be logged in
         if ( TRUE == isTestingActivated() )
         {
-            result = getSystemRecord();
+            result = sendRecordToDialin( NVDATAMGMT_SYSTEM_RECORD );
         }
     }
 
@@ -5744,7 +5744,7 @@
         // Tester must be logged in
         if ( TRUE == isTestingActivated() )
         {
-            result = getServiceRecord();
+            result = sendRecordToDialin( NVDATAMGMT_SERVICE_RECORD );
         }
     }
 
@@ -5810,7 +5810,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 );