Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -rbdf2072247c8779596c6bcf418c5a7ae4d9f9848 -r5adaa0ae1236d34fca1fc8def7fa107ec470115e
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision bdf2072247c8779596c6bcf418c5a7ae4d9f9848)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 5adaa0ae1236d34fca1fc8def7fa107ec470115e)
@@ -295,7 +295,7 @@
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_CONDUCTIVITY_SENSOR_ID, sensorID );
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_CONDUCTIVITY_SENSOR_ID, sensorId );
     }
 
     return result;
Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -rebbb1f85550a1f9b8f946655f7b2b63f76fbf67d -r5adaa0ae1236d34fca1fc8def7fa107ec470115e
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision ebbb1f85550a1f9b8f946655f7b2b63f76fbf67d)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 5adaa0ae1236d34fca1fc8def7fa107ec470115e)
@@ -727,7 +727,7 @@
     else
     {
         result = SELF_TEST_STATUS_FAILED;
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_FPGA_POST_TEST_FAILED, (U32)fpgaHeader.fpgaId )
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_FPGA_POST_TEST_FAILED, (U32)fpgaHeader.fpgaId )
     }
 
     return result;
Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -rbdf2072247c8779596c6bcf418c5a7ae4d9f9848 -r5adaa0ae1236d34fca1fc8def7fa107ec470115e
--- firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision bdf2072247c8779596c6bcf418c5a7ae4d9f9848)
+++ firmware/App/Services/WatchdogMgmt.c	(.../WatchdogMgmt.c)	(revision 5adaa0ae1236d34fca1fc8def7fa107ec470115e)
@@ -266,7 +266,7 @@
     }
     else
     {
-        activateAlarmNoData( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_TASK, task );
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_TASK, task );
     }
 
     return result;