Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r66cc826068b54bc436cde0fae70a05ba6c1ac974 -r1af5c9d200064f18e2727e896f74308e683492a7
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 66cc826068b54bc436cde0fae70a05ba6c1ac974)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 1af5c9d200064f18e2727e896f74308e683492a7)
@@ -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
     }
 }
 
@@ -781,7 +781,7 @@
 
                 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
             }