Index: NVDataMgmt.c
===================================================================
diff -u -r3a57b1955aa7516898e4c2c855978bbf01c8ec62 -rb02c369dad6391be4687f99b49d169e3c212373d
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 3a57b1955aa7516898e4c2c855978bbf01c8ec62)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision b02c369dad6391be4687f99b49d169e3c212373d)
@@ -1441,7 +1441,7 @@
     }
     else if ( ++usageWriteTries > MAX_NUM_OF_WRITE_TRIES )
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_WRITE_GEN_RO_WATER_TO_NV_FAILURE, USAGE_INFO_RO_GEN_WATER );
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_WRITE_USAGE_INFO_TO_NV_FAILURE, USAGE_INFO_RO_GEN_WATER );
     }
 
     return status;
@@ -1484,7 +1484,7 @@
     }
     else if ( ++usageWriteTries > MAX_NUM_OF_WRITE_TRIES )
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_WRITE_DISINFECT_DATE_TO_NV_FAILURE, disinfect );
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_WRITE_USAGE_INFO_TO_NV_FAILURE, disinfect );
     }
 
     return status;
@@ -1516,7 +1516,7 @@
     }
     else if ( ++usageWriteTries > MAX_NUM_OF_WRITE_TRIES )
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_WRITE_DISINFECT_STATUS_TO_NV_FAILURE, USAGE_INFO_DISIFNECT_STATUS );
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_WRITE_USAGE_INFO_TO_NV_FAILURE, USAGE_INFO_DISIFNECT_STATUS );
     }
 
     return status;
@@ -2756,7 +2756,7 @@
         // CRC did not pass so set all values to default
         dgServiceGroup.dgServiceRecord.lastServiceEpochDate   = 0;
         dgServiceGroup.dgServiceRecord.serviceIntervalSeconds = RECORD_DEFAULT_SERVICE_INTERVAL_S;
-        //dgServiceGroup.dgServiceRecord.lastResetTimeEpoch     = getRTCTimestamp(); // TODO un-comment with the next calibration table roll out
+        dgServiceGroup.dgServiceRecord.lastResetTimeEpoch     = getRTCTimestamp(); // TODO un-comment with the next calibration table roll out
         dgServiceGroup.dgServiceRecord.crc                    = crc16 ( (U08*)&dgServiceGroup.dgServiceRecord, sizeof( DG_SERVICE_RECORD_T ) - sizeof( U16 ) );
         dgServiceGroup.crc                                    = crc16 ( (U08*)&dgServiceGroup, sizeof( DG_SERVICE_GROUP_T ) - sizeof( U16 ) );
         status                                                = FALSE;