Index: firmware/App/Services/NVRecordsDD.c
===================================================================
diff -u -ra68c7679e493224bd41df72321d4c2537207234f -rb878faee61a0800b767d053ab3f65afb3790dacb
--- firmware/App/Services/NVRecordsDD.c	(.../NVRecordsDD.c)	(revision a68c7679e493224bd41df72321d4c2537207234f)
+++ firmware/App/Services/NVRecordsDD.c	(.../NVRecordsDD.c)	(revision b878faee61a0800b767d053ab3f65afb3790dacb)
@@ -151,21 +151,21 @@
 
 // ********** private data **********
 
-// Calibration variables
-static DD_CALIBRATION_RECORD_T      ddCalibrationRecord;                                                        ///< DD calibration record structure (including padding and final CRC).
+// NVM Record variables
 static DD_SYSTEM_GROUP_T            ddSystemGroup;                                                              ///< DD system group structure (including padding and final CRC).
 static DD_SERVICE_GROUP_T           ddServiceGroup;                                                             ///< DD service group structure (including padding and final CRC).
+static DD_CALIBRATION_RECORD_T      ddCalibrationRecord;                                                        ///< DD calibration record structure (including padding and final CRC).
 static DD_INSTITUTIONAL_GROUP_T     ddInstitutionalGroup;                                                       ///< DD institutional group structure (including padding and final CRC).
 static DD_USAGE_INFO_GROUP_T        ddUsageInfoGroup;                                                           ///< DD usage info structure (including padding and final CRC).
 
 // Process records specifications
-const PROCESS_RECORD_SPECS_T RECORDS_SPECS[ NUM_OF_NVDATMGMT_RECORDS_JOBS ] =  {
-   // Start address                     Size of the job                     Max write bytes per job        Max read bytes per job           Record structure pointer     Record CRC pointer                  Event calibration record update
-  {CAL_RECORD_NV_MEM_START_ADDRESS,     sizeof(DD_CALIBRATION_RECORD_T),    MAX_EEPROM_WRITE_BUFFER_BYTES, sizeof(DD_CALIBRATION_RECORD_T),  (U08*)&ddCalibrationRecord,  (U08*)&ddCalibrationRecord.crc,     DD_EVENT_CAL_RECORD_UPDATE },       // NVDATAMGMT_CALIBRATION_RECORD
-  {SYSTEM_RECORD_NV_MEM_START_ADDRESS,  sizeof(DD_SYSTEM_GROUP_T),          MAX_EEPROM_WRITE_BUFFER_BYTES, sizeof(DD_SYSTEM_GROUP_T),        (U08*)&ddSystemGroup,        (U08*)&ddSystemGroup.crc,           DD_EVENT_SYSTEM_RECORD_UPDATE },    // NVDATAMGMT_SYSTEM_RECORD
-  {SERVICE_RECORD_NV_MEM_START_ADDRESS, sizeof(DD_SERVICE_GROUP_T),         MAX_EEPROM_WRITE_BUFFER_BYTES, sizeof(DD_SERVICE_GROUP_T),       (U08*)&ddServiceGroup,       (U08*)&ddServiceGroup.crc,          DD_EVENT_SERVICE_UPDATE },          // NVDATAMGMT_SERVICE_RECORD
-  {INSTIT_RECORD_NV_MEM_START_ADDRESS,  sizeof(DD_INSTITUTIONAL_GROUP_T),   MAX_EEPROM_WRITE_BUFFER_BYTES, sizeof(DD_INSTITUTIONAL_GROUP_T), (U08*)&ddInstitutionalGroup, (U08*)&ddInstitutionalGroup.crc,    DD_EVENT_INSTIT_RECORD_UPDATE },    // NVDATAMGMT_INTITUTIONAL_RECORD
-  {USAGE_INFO_START_ADDRESS,            sizeof(DD_USAGE_INFO_GROUP_T),      MAX_EEPROM_WRITE_BUFFER_BYTES, sizeof(DD_USAGE_INFO_GROUP_T),    (U08*)&ddUsageInfoGroup,     (U08*)&ddUsageInfoGroup.crc,        DD_EVENT_USAGE_INFO_UPDATE },       // NVDATAMGMT_USAGE_INFO_RECORD
+const PROCESS_RECORD_SPECS_T RECORDS_SPECS[ NUM_OF_NVDATMGMT_RECORDS_JOBS ]
+   // Start address                     Size of the job                    Record structure pointer     Record CRC pointer                  Event calibration record update
+  {SYSTEM_RECORD_NV_MEM_START_ADDRESS,  sizeof(DD_SYSTEM_GROUP_T),          (U08*)&ddSystemGroup,        (U08*)&ddSystemGroup.crc,           DD_EVENT_SYSTEM_RECORD_UPDATE },    // NVDATAMGMT_SYSTEM_RECORD
+  {SERVICE_RECORD_NV_MEM_START_ADDRESS, sizeof(DD_SERVICE_GROUP_T),         (U08*)&ddServiceGroup,       (U08*)&ddServiceGroup.crc,          DD_EVENT_SERVICE_UPDATE },          // NVDATAMGMT_SERVICE_RECORD
+  {CAL_RECORD_NV_MEM_START_ADDRESS,     sizeof(DD_CALIBRATION_RECORD_T),    (U08*)&ddCalibrationRecord,  (U08*)&ddCalibrationRecord.crc,     DD_EVENT_CAL_RECORD_UPDATE },       // NVDATAMGMT_CALIBRATION_RECORD
+  {INSTIT_RECORD_NV_MEM_START_ADDRESS,  sizeof(DD_INSTITUTIONAL_GROUP_T),   (U08*)&ddInstitutionalGroup, (U08*)&ddInstitutionalGroup.crc,    DD_EVENT_INSTIT_RECORD_UPDATE },    // NVDATAMGMT_INSTITUTIONAL_RECORD
+  {USAGE_INFO_START_ADDRESS,            sizeof(DD_USAGE_INFO_GROUP_T),      (U08*)&ddUsageInfoGroup,     (U08*)&ddUsageInfoGroup.crc,        DD_EVENT_USAGE_INFO_UPDATE },       // NVDATAMGMT_USAGE_INFO_RECORD
 };
 
 static NVDATAMGMT_SELF_TEST_STATE_T nvDataMgmtSelfTestState;                                                    ///< NVDataMgmt self-test state variable.
@@ -313,8 +313,8 @@
     // Check if the records' entire CRCs as well as the individual CRCs passed
     if ( ( TRUE == haveCalGroupsPassed ) && ( TRUE == hasSystemRecordPassed ) && ( TRUE == hasServiceRecordPassed ) && ( TRUE == hasInstitutionalRecordPassed ) )
     {
-        updateCalStartTimer( getMSTimerCount() );
-        updateNewCalAvailableFlag( TRUE );
+        updateRecordStartTimer( getMSTimerCount() );
+        updateNewNVRecordAvailableFlag( TRUE );
         nvDataMgmtSelfTestResult = SELF_TEST_STATUS_PASSED;
 
     }
@@ -1191,7 +1191,7 @@
 {
     BOOL status = FALSE;
 
-    if ( getAvailableRecordQueueCount() >= ( MIN_JOBS_NEEDED_FOR_SECTOR_0 + 1 ) )
+    if ( getAvailableRecordQueueCount() >= ( MIN_JOBS_NEEDED_FOR_ALL_RECORDS + 1 ) )
     {
         // When the service record is changed, all the sector 0 must be re-written plus the stack's usage information must be updated.
         // Therefore, at least 4 queues are needed to be able to update all the records. The usage records are changed:
@@ -1463,7 +1463,7 @@
             status = enqueueSector0Records();
             break;
 
-        case NVDATAMGMT_INTITUTIONAL_RECORD:
+        case NVDATAMGMT_INSTITUTIONAL_RECORD:
             ddInstitutionalGroup.ddInstitutionalRecord.crc = crc;
             status = enqueueSector0Records();
             break;