Index: firmware/App/Services/MsgQueues.c
===================================================================
diff -u -r51c6a24b30643c8ce296ebfe1d703f289ffafe97 -ra0aca1a4d87df989303b4f7f41208a4916861afa
--- firmware/App/Services/MsgQueues.c	(.../MsgQueues.c)	(revision 51c6a24b30643c8ce296ebfe1d703f289ffafe97)
+++ firmware/App/Services/MsgQueues.c	(.../MsgQueues.c)	(revision a0aca1a4d87df989303b4f7f41208a4916861afa)
@@ -89,12 +89,12 @@
         }
         else // msg queue is full
         {
-            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 33 )
+            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_ADD_QUEUE_FULL )
         }
     }
     else // invalid message queue
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 34, queue )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_ADD_INVALID_QUEUE, queue )
     }
 
     return result;
@@ -136,7 +136,7 @@
     }
     else // invalid message queue
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 35, queue )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_GET_INVALID_QUEUE, queue )
     }
 
     return result;
@@ -165,7 +165,7 @@
     }
     else // invalid message queue
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 36, queue )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_IS_EMPTY_INVALID_QUEUE, queue )
     }
 
     return result;
@@ -194,7 +194,7 @@
     }
     else // invalid message queue
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, 37, queue )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_IS_FULL_INVALID_QUEUE, queue )
     }
 
     return result;