Index: firmware/App/Services/CommBuffers.c
===================================================================
diff -u -ra7bf3ca23ea37a61000379facae628a31b3ecc59 -r5cfa1f3d17db625f92f046868812717e3f1f51c3
--- firmware/App/Services/CommBuffers.c	(.../CommBuffers.c)	(revision a7bf3ca23ea37a61000379facae628a31b3ecc59)
+++ firmware/App/Services/CommBuffers.c	(.../CommBuffers.c)	(revision 5cfa1f3d17db625f92f046868812717e3f1f51c3)
@@ -154,7 +154,7 @@
                 // if buffer overflows persists, fault
                 if ( calcTimeSince( firstBufferOverflowTimeStamp ) > BUFFER_OVERFLOW_PERSISTENCE_MS )
                 {
-                    SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_ADD_TOO_MUCH_DATA, len )
+                    SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_ADD_TOO_MUCH_DATA, len )
                 }
             }
             else // first overflow - set time stamp for persistence check
@@ -180,7 +180,7 @@
     }
     else // invalid buffer given
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_ADD_INVALID_BUFFER, buffer )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_ADD_INVALID_BUFFER, buffer )
     }
 
     return result;
@@ -241,7 +241,7 @@
     }
     else // invalid buffer given
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_GET_INVALID_BUFFER, buffer )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_GET_INVALID_BUFFER, buffer )
     }
 
     return result;
@@ -299,7 +299,7 @@
     }
     else // invalid buffer given
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_PEEK_INVALID_BUFFER, buffer )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_PEEK_INVALID_BUFFER, buffer )
     }
 
     return numOfBytesPeeked;
@@ -337,7 +337,7 @@
     }
     else // invalid buffer
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_COUNT_INVALID_BUFFER, buffer )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_COMM_BUFFERS_COUNT_INVALID_BUFFER, buffer )
     }
 
     return result;