diff --git a/.gitmodules b/.gitmodules
index 1a4dc3c2..44a86d86 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,3 +16,6 @@
 [submodule "fsfw_hal"]
 	path = fsfw_hal
 	url = https://egit.irs.uni-stuttgart.de/fsfw/fsfw-hal.git
+[submodule "generators/fsfwgen"]
+	path = generators/fsfwgen
+	url = https://egit.irs.uni-stuttgart.de/fsfw/fsfw-generators.git
diff --git a/generators/events/event_parser.py b/generators/events/event_parser.py
index fa52f938..565f2240 100644
--- a/generators/events/event_parser.py
+++ b/generators/events/event_parser.py
@@ -11,10 +11,10 @@ On Windows, Build Tools installation might be necessary
 """
 import datetime
 
-from modgen.events.event_parser import handle_csv_export, handle_cpp_export, SubsystemDefinitionParser, EventParser
-from modgen.parserbase.file_list_parser import FileListParser
-from modgen.utility.printer import PrettyPrinter
-from modgen.utility.file_management import copy_file, move_file
+from fsfwgen.events.event_parser import handle_csv_export, handle_cpp_export, SubsystemDefinitionParser, EventParser
+from fsfwgen.parserbase.file_list_parser import FileListParser
+from fsfwgen.utility.printer import PrettyPrinter
+from fsfwgen.utility.file_management import copy_file, move_file
 
 from definitions import BspType
 
diff --git a/generators/events/translateEvents.cpp b/generators/events/translateEvents.cpp
index 8fb7d4e8..c3af08e1 100644
--- a/generators/events/translateEvents.cpp
+++ b/generators/events/translateEvents.cpp
@@ -1,7 +1,7 @@
 /**
  * @brief    Auto-generated event translation file. Contains 83 translations.
  * @details
- * Generated on: 2021-05-18 16:15:50
+ * Generated on: 2021-06-08 17:09:32
  */
 #include "translateEvents.h"
 
diff --git a/generators/fsfwgen b/generators/fsfwgen
new file mode 160000
index 00000000..78e890f9
--- /dev/null
+++ b/generators/fsfwgen
@@ -0,0 +1 @@
+Subproject commit 78e890f947f55a9417d390fea8d9bd5684d11730
diff --git a/generators/objects/objects.py b/generators/objects/objects.py
index c7df218e..d37b80d7 100644
--- a/generators/objects/objects.py
+++ b/generators/objects/objects.py
@@ -10,10 +10,10 @@ On Windows, Build Tools installation might be necessary
 """
 import datetime
 
-from modgen.objects.objects import sql_object_exporter, ObjectDefinitionParser, write_translation_file, \
+from fsfwgen.objects.objects import sql_object_exporter, ObjectDefinitionParser, write_translation_file, \
     export_object_file, write_translation_header_file
-from modgen.utility.printer import PrettyPrinter
-from modgen.utility.file_management import copy_file, move_file
+from fsfwgen.utility.printer import PrettyPrinter
+from fsfwgen.utility.file_management import copy_file, move_file
 
 from definitions import BspType, DATABASE_NAME
 
diff --git a/generators/returnvalues/returnvalues_parser.py b/generators/returnvalues/returnvalues_parser.py
index 24bbd54b..772e0bf1 100644
--- a/generators/returnvalues/returnvalues_parser.py
+++ b/generators/returnvalues/returnvalues_parser.py
@@ -9,10 +9,10 @@ Returnvalue exporter.
 To use MySQLdb, run pip install mysqlclient or install in IDE. On Windows, Build Tools installation might be necessary.
 :data:      21.11.2019
 """
-from modgen.parserbase.file_list_parser import FileListParser
-from modgen.returnvalues.returnvalues_parser import InterfaceParser, ReturnValueParser
-from modgen.utility.sql_writer import SqlWriter
-from modgen.utility.file_management import move_file
+from fsfwgen.parserbase.file_list_parser import FileListParser
+from fsfwgen.returnvalues.returnvalues_parser import InterfaceParser, ReturnValueParser
+from fsfwgen.utility.sql_writer import SqlWriter
+from fsfwgen.utility.file_management import move_file
 
 from definitions import BspType, DATABASE_NAME
 
diff --git a/linux/fsfwconfig/events/translateEvents.cpp b/linux/fsfwconfig/events/translateEvents.cpp
index 8fb7d4e8..c3af08e1 100644
--- a/linux/fsfwconfig/events/translateEvents.cpp
+++ b/linux/fsfwconfig/events/translateEvents.cpp
@@ -1,7 +1,7 @@
 /**
  * @brief    Auto-generated event translation file. Contains 83 translations.
  * @details
- * Generated on: 2021-05-18 16:15:50
+ * Generated on: 2021-06-08 17:09:32
  */
 #include "translateEvents.h"