Index: SystemComm.c
===================================================================
diff -u -r2801d97e877dd78189aa891e80a2f7cf60a6a2b7 -r19f8ae4251383b97ce914f3ae41811024e82ea39
--- SystemComm.c	(.../SystemComm.c)	(revision 2801d97e877dd78189aa891e80a2f7cf60a6a2b7)
+++ SystemComm.c	(.../SystemComm.c)	(revision 19f8ae4251383b97ce914f3ae41811024e82ea39)
@@ -54,7 +54,7 @@
 #define PENDING_ACK_LIST_SIZE           25          ///< Maximum number of Denali messages that can be pending ACK at any given time
 
 #define PENDING_ACK_LIST_OVERRIDE_UI_CHANNEL    1   ///< Value for determining UI channel when Pending ACKs are overriden.
-#define PENDING_ACK_LIST_OVERRIDE_DG_CHANNEL    2   ///< Value for determining DG channel when Pending ACKs are overriden.
+#define PENDING_ACK_LIST_OVERRIDE_DD_CHANNEL    2   ///< Value for determining DD channel when Pending ACKs are overriden.
 #define PENDING_ACK_LIST_OVERRIDE_TD_CHANNEL    3   ///< Value for determining TD channel when Pending ACKs are overriden.
 #define PENDING_ACK_LIST_OVERRIDE_RO_CHANNEL    4   ///< Value for determining RO channel when Pending ACKs are overriden.
 
@@ -245,7 +245,15 @@
     else
     {
         // Should not get here - not an active message box
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_CAN_MESSAGE_BOX, srcCANBox )
+#ifdef _TD_
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_CAN_MESSAGE_BOX, srcCANBox )
+#endif
+#ifdef _DD_
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_CAN_MESSAGE_BOX, srcCANBox )
+#endif
+#ifdef _RO_
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_CAN_MESSAGE_BOX, srcCANBox )
+#endif
     }
 }
 
@@ -683,19 +691,19 @@
 #ifdef _TD_
             // Remove message pending ACK from list
             if ( ( ( getU32OverrideValue( &pendingACKOverride ) != PENDING_ACK_LIST_OVERRIDE_UI_CHANNEL ) || ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_TD_2_UI ) ) &&
-                 ( ( getU32OverrideValue( &pendingACKOverride ) != PENDING_ACK_LIST_OVERRIDE_DG_CHANNEL ) || ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_TD_2_DD ) ) )
+                 ( ( getU32OverrideValue( &pendingACKOverride ) != PENDING_ACK_LIST_OVERRIDE_DD_CHANNEL ) || ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_TD_2_DD ) ) )
 #endif
 #ifdef _DD_
             //TODO : validate code changes
             // Remove message pending ACK from list
             if ( ( ( getU32OverrideValue( &pendingACKOverride ) != PENDING_ACK_LIST_OVERRIDE_TD_CHANNEL ) || ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_DD_2_TD ) ) &&
-                 ( ( getU32OverrideValue( &pendingACKOverride ) != PENDING_ACK_LIST_OVERRIDE_DG_CHANNEL ) || ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_DD_2_RO ) ) )
+                 ( ( getU32OverrideValue( &pendingACKOverride ) != PENDING_ACK_LIST_OVERRIDE_DD_CHANNEL ) || ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_DD_2_RO ) ) )
 #endif
 #ifdef _RO_
             // TODO : clean up required
             // Remove message pending ACK from list
             if ( ( ( getU32OverrideValue( &pendingACKOverride ) != PENDING_ACK_LIST_OVERRIDE_UI_CHANNEL ) || ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_TD_2_UI ) ) &&
-                 ( ( getU32OverrideValue( &pendingACKOverride ) != PENDING_ACK_LIST_OVERRIDE_DG_CHANNEL ) || ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_TD_2_DD ) ) )
+                 ( ( getU32OverrideValue( &pendingACKOverride ) != PENDING_ACK_LIST_OVERRIDE_DD_CHANNEL ) || ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_TD_2_DD ) ) )
 #endif
             {
                 pendingAckList[ i ].used = FALSE;