Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -raa7b1f5f68aae23c1c52b32658fcb625c29accfb -rc429cf7f50851acbaca6e800957ef44cc1fa2162
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision aa7b1f5f68aae23c1c52b32658fcb625c29accfb)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision c429cf7f50851acbaca6e800957ef44cc1fa2162)
@@ -3224,7 +3224,7 @@
         payloadPtr += sizeof( U32 );
         memcpy( payloadPtr, &service.serviceIntervalSeconds, sizeof( U32 ) );
         payloadPtr += sizeof( U32 );
-        memcpy( payloadPtr, &dgData.dgServiceRecord.lastServiceDateEpoch, sizeof( U32 ) );
+        memcpy( payloadPtr, &dgData.dgServiceRecord.lastServiceEpochDate, sizeof( U32 ) );
         payloadPtr += sizeof( U32 );
         memcpy( payloadPtr, &dgData.dgServiceRecord.serviceIntervalSeconds, sizeof( U32 ) );
     }
@@ -7240,11 +7240,11 @@
  *************************************************************************/
 void handleDGServiceScheduleData( MESSAGE_T *message )
 {
-    if ( message->hdr.payloadLen == sizeof( HD_VERSION_DG_SERVICE_RECORD_T ) )
+    if ( message->hdr.payloadLen == sizeof( DG_SERVICE_RECORD_T ) )
     {
-        HD_VERSION_DG_SERVICE_RECORD_T payload;
+        DG_SERVICE_RECORD_T payload;
 
-        memcpy( &payload, message->payload, sizeof( HD_VERSION_DG_SERVICE_RECORD_T ) );
+        memcpy( &payload, message->payload, sizeof( DG_SERVICE_RECORD_T ) );
         setHDVersionDGServiceRecord( &payload );
     }
 }
@@ -7260,11 +7260,11 @@
  *************************************************************************/
 void handleDGUsageInfoData( MESSAGE_T *message )
 {
-    if ( message->hdr.payloadLen == sizeof( HD_VERSION_DG_USAGE_INFO_T ) )
+    if ( message->hdr.payloadLen == sizeof( DG_USAGE_INFO_RECORD_T ) )
     {
-        HD_VERSION_DG_USAGE_INFO_T payload;
+        DG_USAGE_INFO_RECORD_T payload;
 
-        memcpy( &payload, message->payload, sizeof( HD_VERSION_DG_USAGE_INFO_T ) );
+        memcpy( &payload, message->payload, sizeof( DG_USAGE_INFO_RECORD_T ) );
         setHDVersionDGUsageInfo( &payload );
     }
 }