Index: firmware/App/Services/NVRecordsDD.c
===================================================================
diff -u -r9a14f69c0f0de343b5664b20753142b50bc4e093 -r6d1ea33dbe56d63b13802cacd09c263a5ee7e6e0
--- firmware/App/Services/NVRecordsDD.c	(.../NVRecordsDD.c)	(revision 9a14f69c0f0de343b5664b20753142b50bc4e093)
+++ firmware/App/Services/NVRecordsDD.c	(.../NVRecordsDD.c)	(revision 6d1ea33dbe56d63b13802cacd09c263a5ee7e6e0)
@@ -15,7 +15,8 @@
 #include <string.h>      // For memcpy
 //#include "Common.h"
 #include "DDDefs.h"
-#include "NVMsgQ.h"
+#include "NVJobQ.h"
+#include "NVMessaging.h"
 #include "NVRecordsDD.h"
 #include "Timers.h"
 #include "Utilities.h" // For crc calculation
@@ -97,42 +98,42 @@
 /// DG calibration records structure
 typedef struct
 {
-    DD_CALIBRATION_GROUPS_T ddCalibrationGroups;                                                                ///< DD calibration groups.
-    U08 padding[ RECORD_PADDING_LENGTH(DD_CALIBRATION_GROUPS_T, MAX_EEPROM_WRITE_BUFFER_BYTES) ];               ///< DD calibration record padding byte array.
-    U16 crc;                                                                                                    ///< CRC for the DG calibration record structure.
+    DD_CALIBRATION_GROUPS_T ddCalibrationGroups;                                                              ///< DD calibration groups.
+    U08 padding[ RECORD_PADDING_LENGTH(DD_CALIBRATION_GROUPS_T, MAX_EEPROM_WRITE_BUFFER_BYTES) ];             ///< DD calibration record padding byte array.
+    U16 crc;                                                                                                  ///< CRC for the DG calibration record structure.
 } DD_CALIBRATION_RECORD_T;
 
 /// DG system group structure
 typedef struct
 {
-    DD_SYSTEM_RECORD_T ddSystemRecord;                                                                          ///< DD system record.
-    U08 padding[ RECORD_PADDING_LENGTH(DD_SYSTEM_RECORD_T, MAX_EEPROM_WRITE_BUFFER_BYTES) ];                    ///< DD system group padding byte array.
-    U16 crc;                                                                                                    ///< CRC for the DG system group structure.
+    DD_SYSTEM_RECORD_T ddSystemRecord;                                                                        ///< DD system record.
+    U08 padding[ RECORD_PADDING_LENGTH(DD_SYSTEM_RECORD_T, MAX_EEPROM_WRITE_BUFFER_BYTES) ];                  ///< DD system group padding byte array.
+    U16 crc;                                                                                                  ///< CRC for the DG system group structure.
 } DD_SYSTEM_GROUP_T;
 
 /// DG service record structure
 typedef struct
 {
-    DD_SERVICE_RECORD_T ddServiceRecord;                                                                        ///< DD service record.
-    U08 padding[ RECORD_PADDING_LENGTH(DD_SERVICE_RECORD_T, MAX_EEPROM_WRITE_BUFFER_BYTES) ];                   ///< DD service group padding.
-    U16 crc;                                                                                                    ///< CRC for the DG service structure.
+    DD_SERVICE_RECORD_T ddServiceRecord;                                                                      ///< DD service record.
+    U08 padding[ RECORD_PADDING_LENGTH(DD_SERVICE_RECORD_T, MAX_EEPROM_WRITE_BUFFER_BYTES) ];                 ///< DD service group padding.
+    U16 crc;                                                                                                  ///< CRC for the DG service structure.
 } DD_SERVICE_GROUP_T;
 
 
 /// DD institutional record structure
 typedef struct
 {
-    DD_INSTITUTIONAL_RECORD_T ddInstitutionalRecord;                                                            ///< DD institutional record.
-    U08 padding[ RECORD_PADDING_LENGTH(DD_INSTITUTIONAL_RECORD_T, MAX_EEPROM_WRITE_BUFFER_BYTES) ];             ///< DD institutional group padding.
-    U16 crc;                                                                                                    ///< CRC for the HD institutional structure.
+    DD_INSTITUTIONAL_RECORD_T ddInstitutionalRecord;                                                          ///< DD institutional record.
+    U08 padding[ RECORD_PADDING_LENGTH(DD_INSTITUTIONAL_RECORD_T, MAX_EEPROM_WRITE_BUFFER_BYTES) ];           ///< DD institutional group padding.
+    U16 crc;                                                                                                  ///< CRC for the HD institutional structure.
 } DD_INSTITUTIONAL_GROUP_T;
 
 /// DG usage record structure
 typedef struct
 {
-    DD_USAGE_INFO_RECORD_T ddUsageInfo;                                                                         ///< DD usage info record.
-    U08 padding[ RECORD_PADDING_LENGTH(DD_USAGE_INFO_RECORD_T, MAX_EEPROM_WRITE_BUFFER_BYTES) ];                ///< DD scheduled run group padding.
-    U16 crc;                                                                                                    ///< CRC for the DG usage info structure.
+    DD_USAGE_INFO_RECORD_T ddUsageInfo;                                                                       ///< DD usage info record.
+    U08 padding[ RECORD_PADDING_LENGTH(DD_USAGE_INFO_RECORD_T, MAX_EEPROM_WRITE_BUFFER_BYTES) ];              ///< DD scheduled run group padding.
+    U16 crc;                                                                                                  ///< CRC for the DG usage info structure.
 } DD_USAGE_INFO_GROUP_T;
 
 #pragma pack(pop)
@@ -364,8 +365,8 @@
     if ( ( TRUE == hasSystemRecordPassed ) && ( TRUE == hasServiceRecordPassed ) &&
          ( TRUE == haveCalGroupsPassed ) && ( TRUE == hasUsageRecordPassed ) )
     {
-        updateRecordStartTimer( getMSTimerCount() );
-        updateNewNVRecordAvailableFlag( TRUE );
+        startNewCalRecordAvailableTimer();
+        setNewCalibrationRecordAvailable( TRUE );
         nvmSelfTestResult = SELF_TEST_STATUS_PASSED;
     }
     else
@@ -1162,7 +1163,7 @@
 
 /*********************************************************************//**
  * @brief
- * The testSetNVRecordCRCOverride function overrides the CRC value of
+ * The updateNVRecordCRC function overrides the CRC value of
  * the selected non-volatile record and schedules it for writing.
  * @details \b Alarms: ALARM_ID_DD_SOFTWARE_FAULT if invalid job is
  * selected
@@ -1173,7 +1174,7 @@
  * @param crc The CRC value to be set
  * @return TRUE if the job was scheduled successfully otherwise FALSE
  *************************************************************************/
-BOOL testSetNVRecordCRCOverride( U32 job, U16 crc )
+BOOL updateNVRecordCRC( U32 job, U16 crc )
 {
     BOOL status               = FALSE;
     NVM_RECORD_TYPE_T nvJob = (NVM_RECORD_TYPE_T)job;