diff --git a/fsfw b/fsfw
index 17262a1d..fec5f83f 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 17262a1da91a92c3b5995ccfbd67d439d01bb456
+Subproject commit fec5f83f4f2459facee25939e0292115f89a6d73
diff --git a/generators/.run/events.run.xml b/generators/.run/events.run.xml
index 18f71033..6bc73c96 100644
--- a/generators/.run/events.run.xml
+++ b/generators/.run/events.run.xml
@@ -12,7 +12,7 @@
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/fsfwgen.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/gen.py" />
     <option name="PARAMETERS" value="events" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
diff --git a/generators/.run/objects.run.xml b/generators/.run/objects.run.xml
index 961b8ed9..df684cc8 100644
--- a/generators/.run/objects.run.xml
+++ b/generators/.run/objects.run.xml
@@ -12,7 +12,7 @@
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/fsfwgen.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/gen.py" />
     <option name="PARAMETERS" value="objects" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
diff --git a/generators/.run/returnvalues.run.xml b/generators/.run/returnvalues.run.xml
index 51b16449..dcb00efb 100644
--- a/generators/.run/returnvalues.run.xml
+++ b/generators/.run/returnvalues.run.xml
@@ -12,7 +12,7 @@
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/fsfwgen.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/gen.py" />
     <option name="PARAMETERS" value="returnvalues" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
diff --git a/generators/bsp_q7s_returnvalues.csv b/generators/bsp_q7s_returnvalues.csv
index 447da5e9..5464683b 100644
--- a/generators/bsp_q7s_returnvalues.csv
+++ b/generators/bsp_q7s_returnvalues.csv
@@ -538,8 +538,4 @@
 0x62a1;RS_BadBitRate;Bad bitrate has been commanded (e.g. 0);0xA1;linux/obc/PtmeConfig.h;RATE_SETTER
 0x62a2;RS_ClkInversionFailed;Failed to invert clock and thus change the time the data is updated with respect to the tx clock;0xA2;linux/obc/PtmeConfig.h;RATE_SETTER
 0x62a3;RS_TxManipulatorConfigFailed;Failed to change configuration bit of tx clock manipulator;0xA3;linux/obc/PtmeConfig.h;RATE_SETTER
-0x5aa0;IPCI_PapbBusy;;0xA0;linux/archive/tmtc/CCSDSIPCoreBridge.h;CCSDS_IP_CORE_BRIDGE
-0x5a01;IPCI_UnknownGpioId;;1;linux/archive/gpio/LinuxLibgpioIF.h;CCSDS_IP_CORE_BRIDGE
-0x5a02;IPCI_DriveGpioFailure;;2;linux/archive/gpio/LinuxLibgpioIF.h;CCSDS_IP_CORE_BRIDGE
-0x5a03;IPCI_GpioTypeFailure;;3;linux/archive/gpio/LinuxLibgpioIF.h;CCSDS_IP_CORE_BRIDGE
-0x5a04;IPCI_GpioInvalidInstance;;4;linux/archive/gpio/LinuxLibgpioIF.h;CCSDS_IP_CORE_BRIDGE
+0x5aa0;IPCI_PapbBusy;;0xA0;linux/obc/PapbVcInterface.h;CCSDS_IP_CORE_BRIDGE
diff --git a/generators/events/translateEvents.cpp b/generators/events/translateEvents.cpp
index 9cbd0bef..92250a50 100644
--- a/generators/events/translateEvents.cpp
+++ b/generators/events/translateEvents.cpp
@@ -1,7 +1,7 @@
 /**
  * @brief    Auto-generated event translation file. Contains 162 translations.
  * @details
- * Generated on: 2022-03-07 17:09:35
+ * Generated on: 2022-03-11 14:31:47
  */
 #include "translateEvents.h"
 
diff --git a/generators/fsfwgen b/generators/fsfwgen
index c5ef1783..5dbe33ce 160000
--- a/generators/fsfwgen
+++ b/generators/fsfwgen
@@ -1 +1 @@
-Subproject commit c5ef1783a3b082c0e88561bd91bc3ee0f459fafc
+Subproject commit 5dbe33ceb85b15f27e6722bb907df3ed324b701b
diff --git a/generators/fsfwgen.py b/generators/gen.py
similarity index 100%
rename from generators/fsfwgen.py
rename to generators/gen.py
diff --git a/generators/objects/translateObjects.cpp b/generators/objects/translateObjects.cpp
index b29ed5db..c0e79d7a 100644
--- a/generators/objects/translateObjects.cpp
+++ b/generators/objects/translateObjects.cpp
@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 113 translations.
- * Generated on: 2022-03-07 17:15:28
+ * Generated on: 2022-03-11 14:31:51
  */
 #include "translateObjects.h"
 
diff --git a/linux/fsfwconfig/events/translateEvents.cpp b/linux/fsfwconfig/events/translateEvents.cpp
index 9cbd0bef..92250a50 100644
--- a/linux/fsfwconfig/events/translateEvents.cpp
+++ b/linux/fsfwconfig/events/translateEvents.cpp
@@ -1,7 +1,7 @@
 /**
  * @brief    Auto-generated event translation file. Contains 162 translations.
  * @details
- * Generated on: 2022-03-07 17:09:35
+ * Generated on: 2022-03-11 14:31:47
  */
 #include "translateEvents.h"
 
diff --git a/linux/fsfwconfig/objects/translateObjects.cpp b/linux/fsfwconfig/objects/translateObjects.cpp
index b29ed5db..c0e79d7a 100644
--- a/linux/fsfwconfig/objects/translateObjects.cpp
+++ b/linux/fsfwconfig/objects/translateObjects.cpp
@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 113 translations.
- * Generated on: 2022-03-07 17:15:28
+ * Generated on: 2022-03-11 14:31:51
  */
 #include "translateObjects.h"
 
diff --git a/mission/system/AcsBoardAssembly.h b/mission/system/AcsBoardAssembly.h
index 788a7227..2b29a357 100644
--- a/mission/system/AcsBoardAssembly.h
+++ b/mission/system/AcsBoardAssembly.h
@@ -73,13 +73,17 @@ class GpioIF;
  */
 class AcsBoardAssembly : public DualLaneAssemblyBase {
  public:
+  // Use these variables instead of magic numbers when generator was updated
+  // TRANSITION_OTHER_SIDE_FAILED_ID
+  // NOT_ENOUGH_DEVICES_DUAL_MODE_ID
+  // POWER_STATE_MACHINE_TIMEOUT_ID
   static constexpr uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::ACS_BOARD_ASS;
   static constexpr Event TRANSITION_OTHER_SIDE_FAILED =
-      event::makeEvent(SUBSYSTEM_ID, TRANSITION_OTHER_SIDE_FAILED_ID, severity::HIGH);
+      event::makeEvent(SUBSYSTEM_ID, 0, severity::HIGH);
   static constexpr Event NOT_ENOUGH_DEVICES_DUAL_MODE =
-      event::makeEvent(SUBSYSTEM_ID, NOT_ENOUGH_DEVICES_DUAL_MODE_ID, severity::HIGH);
+      event::makeEvent(SUBSYSTEM_ID, 1, severity::HIGH);
   static constexpr Event POWER_STATE_MACHINE_TIMEOUT =
-      event::makeEvent(SUBSYSTEM_ID, POWER_STATE_MACHINE_TIMEOUT_ID, severity::MEDIUM);
+      event::makeEvent(SUBSYSTEM_ID, 2, severity::MEDIUM);
 
   static constexpr uint8_t NUMBER_DEVICES_MODE_TABLE = 9;