Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r23fd3843b6e50ff90b4db987be553c823bfd6597 -r48ea28a08999dcf46985b20ea635fa504f569e57
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 23fd3843b6e50ff90b4db987be553c823bfd6597)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 48ea28a08999dcf46985b20ea635fa504f569e57)
@@ -672,7 +672,7 @@
 {
     if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_BAD_MSG_CRC ) )
     {
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_COMM_TOO_MANY_BAD_CRCS, 2 );  // 2 for DG
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_COMM_TOO_MANY_BAD_CRCS, 2 );  // 2 for DG
     }
 }
 
@@ -779,9 +779,9 @@
             {
                 U16 msgID;
 
-                memcpy( &msgID, &pendingAckList[ i ].msg[ sizeof( U08 ) + sizeof( U16) ], sizeof( U16 ) );
+                memcpy( &msgID, &pendingAckList[ i ].msg[ sizeof( U08 ) + sizeof( U16 ) ], sizeof( U16 ) );
 #ifndef DISABLE_ACK_ALARM
-                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_CAN_MESSAGE_NOT_ACKED, (U32)msgID );
+                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_CAN_MESSAGE_NOT_ACKED, (U32)msgID );
 #endif
                 pendingAckList[ i ].used = FALSE;  // take pending message off of list
             }