Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r9cc5da6947aa143a10f95519eb7f366c1b095d61 -r224f096c4d255526eccba9aaa13e36e0e7499f14
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 9cc5da6947aa143a10f95519eb7f366c1b095d61)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 224f096c4d255526eccba9aaa13e36e0e7499f14)
@@ -1460,9 +1460,9 @@
     if ( 0 == message->hdr.payloadLen )
     {
         // Fill message payload
-        memcpy( payloadPtr, &usageInfo.lastHeatDisDateEpoch, sizeof( U32 ) );
+        memcpy( payloadPtr, &usageInfo.lastHeatDisCompleteDateEpoch, sizeof( U32 ) );
         payloadPtr += sizeof( U32 );
-        memcpy( payloadPtr, &usageInfo.lastChemicalDisDateEpoch, sizeof( U32 ) );
+        memcpy( payloadPtr, &usageInfo.lastChemDisCompleteDateEpoch, sizeof( U32 ) );
         payloadPtr += sizeof( U32 );
         memcpy( payloadPtr, &usageInfo.isDisinfected, sizeof( BOOL ) );
     }