Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r25ede6f944eb53b68c8073404663c99d3ce158b0 -r7dc4bb045389ac95e6658602f2659f6071542361
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 25ede6f944eb53b68c8073404663c99d3ce158b0)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 7dc4bb045389ac95e6658602f2659f6071542361)
@@ -169,9 +169,9 @@
     dgIsCommunicating = TRUE;
     timeOfLastDGCheckIn = getMSTimerCount();
 
-    if ( TRUE == isAlarmActive( ALARM_ID_DG_COMM_TIMEOUT ) )
+    if ( TRUE == isAlarmActive( ALARM_ID_HD_DG_COMM_TIMEOUT ) )
     {
-        clearAlarmCondition( ALARM_ID_DG_COMM_TIMEOUT );
+        clearAlarmCondition( ALARM_ID_HD_DG_COMM_TIMEOUT );
     }
 }
 
@@ -763,7 +763,7 @@
             if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_COMM_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
 #endif
             {
-                activateAlarmNoData( ALARM_ID_UI_COMM_TIMEOUT );
+                activateAlarmNoData( ALARM_ID_HD_UI_COMM_TIMEOUT );
             }
         }
 
@@ -773,11 +773,11 @@
             // Only alarm on DG comm loss while in the treatment workflow
             if ( MODE_PRET == opMode || MODE_TREA == opMode || MODE_POST == opMode )
             {
-                activateAlarmNoData( ALARM_ID_DG_COMM_TIMEOUT );
+                activateAlarmNoData( ALARM_ID_HD_DG_COMM_TIMEOUT );
             }
             else // Otherwise clear the alarm
             {
-                clearAlarmCondition( ALARM_ID_DG_COMM_TIMEOUT );
+                clearAlarmCondition( ALARM_ID_HD_DG_COMM_TIMEOUT );
             }
             dgIsCommunicating = FALSE;
 #endif
@@ -908,11 +908,11 @@
                 memcpy( &msgID, (U08*)&pendingAckList[ i ].msg[ sizeof( U08 ) + sizeof( U16) ], sizeof( U16 ) );
                 if ( pendingAckList[ i ].channel != COMM_BUFFER_OUT_CAN_HD_2_DG )
                 {
-                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED_UI, (U32)msgID );
+                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED_BY_UI, (U32)msgID );
                 }
                 else
                 {
-                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED_DG, (U32)msgID );
+                    SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED_BY_DG, (U32)msgID );
                 }
                 pendingAckList[ i ].used = FALSE;  // Take pending message off of list
             }