diff --git a/.gitattributes b/.gitattributes
index c3207fb2a..73f9d1879 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,8 +2,8 @@
 .gitignore export-ignore
 .travis.yml export-ignore
 .idea export-ignore
-projectgenerator.zip export-ignore
+QgisModelBaker.zip export-ignore
 *.sh export-ignore
 */__pycache__ export-ignore
-projectgenerator/tests export-ignore
-projectgenerator/metadata.txt eol=lf
+QgisModelBaker/tests export-ignore
+QgisModelBaker/metadata.txt eol=lf
diff --git a/.gitignore b/.gitignore
index 76ad20d77..e036c5c32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 .idea
 __pycache__
-/projectgenerator/libili2db/bin
+/QgisModelBaker/libili2db/bin
 *.orig
 i18n
 .DS_Store
diff --git a/.tx/config b/.tx/config
index f16e09ce4..d01dc3ab0 100644
--- a/.tx/config
+++ b/.tx/config
@@ -1,8 +1,8 @@
 [main]
 host = https://www.transifex.com
 
-[projectgenerator.projectgenerator]
-source_file = i18n/projectgenerator_en.ts
+[QgisModelBaker.QgisModelBaker]
+source_file = i18n/QgisModelBaker_en.ts
 source_lang = en
-file_filter = i18n/projectgenerator_<lang>.ts
+file_filter = i18n/QgisModelBaker_<lang>.ts
 type = QT
diff --git a/projectgenerator/__init__.py b/QgisModelBaker/__init__.py
similarity index 90%
rename from projectgenerator/__init__.py
rename to QgisModelBaker/__init__.py
index 4fb2cc2e7..8b218c511 100644
--- a/projectgenerator/__init__.py
+++ b/QgisModelBaker/__init__.py
@@ -20,5 +20,5 @@
 
 
 def classFactory(iface):
-    from .qgs_project_generator import QgsProjectGeneratorPlugin
-    return QgsProjectGeneratorPlugin(iface)
+    from .qgismodelbaker import QgisModelBakerPlugin
+    return QgisModelBakerPlugin(iface)
diff --git a/projectgenerator/gui/__init__.py b/QgisModelBaker/gui/__init__.py
similarity index 100%
rename from projectgenerator/gui/__init__.py
rename to QgisModelBaker/gui/__init__.py
diff --git a/projectgenerator/gui/custom_model_dir.py b/QgisModelBaker/gui/custom_model_dir.py
similarity index 94%
rename from projectgenerator/gui/custom_model_dir.py
rename to QgisModelBaker/gui/custom_model_dir.py
index 5739fd309..e35e5cb21 100644
--- a/projectgenerator/gui/custom_model_dir.py
+++ b/QgisModelBaker/gui/custom_model_dir.py
@@ -18,8 +18,8 @@
  ***************************************************************************/
 """
 
-from projectgenerator.utils import get_ui_class
-from projectgenerator.utils.qt_utils import selectFolder
+from QgisModelBaker.utils import get_ui_class
+from QgisModelBaker.utils.qt_utils import selectFolder
 
 from qgis.PyQt.QtCore import QCoreApplication, Qt
 from qgis.PyQt.QtWidgets import QDialog, QListWidgetItem
@@ -73,7 +73,7 @@ def accepted(self):
 
     def browse_dir(self):
         selectFolder(self.model_dir_list.currentItem(), title=QCoreApplication.translate(
-            'projectgenerator', 'Open Folder with ili Models'), parent=None)
+            'QgisModelBaker', 'Open Folder with ili Models'), parent=None)
 
     def set_flags(self, item):
         item.setFlags(Qt.ItemIsSelectable |
diff --git a/projectgenerator/gui/export.py b/QgisModelBaker/gui/export.py
similarity index 91%
rename from projectgenerator/gui/export.py
rename to QgisModelBaker/gui/export.py
index adba475a9..5fb9982f9 100644
--- a/projectgenerator/gui/export.py
+++ b/QgisModelBaker/gui/export.py
@@ -23,12 +23,12 @@
 import os.path
 import re
 
-from projectgenerator.gui.options import OptionsDialog, ModelListView
-from projectgenerator.gui.multiple_models import MultipleModelsDialog
-from projectgenerator.libili2db.iliexporter import JavaNotFoundError
-from projectgenerator.libili2db.ilicache import IliCache, ModelCompleterDelegate
-from projectgenerator.libili2db.ili2dbutils import color_log_text
-from projectgenerator.utils.qt_utils import (
+from QgisModelBaker.gui.options import OptionsDialog, ModelListView
+from QgisModelBaker.gui.multiple_models import MultipleModelsDialog
+from QgisModelBaker.libili2db.iliexporter import JavaNotFoundError
+from QgisModelBaker.libili2db.ilicache import IliCache, ModelCompleterDelegate
+from QgisModelBaker.libili2db.ili2dbutils import color_log_text
+from QgisModelBaker.utils.qt_utils import (
     make_save_file_selector,
     Validators,
     make_file_selector,
@@ -375,49 +375,49 @@ def updated_configuration(self):
     def save_configuration(self, configuration):
         settings = QSettings()
         settings.setValue(
-            'QgsProjectGenerator/ili2pg/xtffile_export', configuration.xtffile)
-        settings.setValue('QgsProjectGenerator/importtype',
+            'QgisModelBaker/ili2pg/xtffile_export', configuration.xtffile)
+        settings.setValue('QgisModelBaker/importtype',
                           self.type_combo_box.currentData())
 
         if self.type_combo_box.currentData() in ['ili2pg', 'pg']:
             # PostgreSQL specific options
             settings.setValue(
-                'QgsProjectGenerator/ili2pg/host', configuration.dbhost)
+                'QgisModelBaker/ili2pg/host', configuration.dbhost)
             settings.setValue(
-                'QgsProjectGenerator/ili2pg/port', configuration.dbport)
+                'QgisModelBaker/ili2pg/port', configuration.dbport)
             settings.setValue(
-                'QgsProjectGenerator/ili2pg/user', configuration.dbusr)
+                'QgisModelBaker/ili2pg/user', configuration.dbusr)
             settings.setValue(
-                'QgsProjectGenerator/ili2pg/database', configuration.database)
+                'QgisModelBaker/ili2pg/database', configuration.database)
             settings.setValue(
-                'QgsProjectGenerator/ili2pg/schema', configuration.dbschema)
+                'QgisModelBaker/ili2pg/schema', configuration.dbschema)
             settings.setValue(
-                'QgsProjectGenerator/ili2pg/password', configuration.dbpwd)
+                'QgisModelBaker/ili2pg/password', configuration.dbpwd)
         elif self.type_combo_box.currentData() in ['ili2gpkg', 'gpkg']:
             settings.setValue(
-                'QgsProjectGenerator/ili2gpkg/dbfile', configuration.dbfile)
+                'QgisModelBaker/ili2gpkg/dbfile', configuration.dbfile)
 
     def restore_configuration(self):
         settings = QSettings()
 
         self.xtf_file_line_edit.setText(settings.value(
-            'QgsProjectGenerator/ili2pg/xtffile_export'))
+            'QgisModelBaker/ili2pg/xtffile_export'))
         self.pg_host_line_edit.setText(settings.value(
-            'QgsProjectGenerator/ili2pg/host', 'localhost'))
+            'QgisModelBaker/ili2pg/host', 'localhost'))
         self.pg_port_line_edit.setText(
-            settings.value('QgsProjectGenerator/ili2pg/port'))
+            settings.value('QgisModelBaker/ili2pg/port'))
         self.pg_user_line_edit.setText(
-            settings.value('QgsProjectGenerator/ili2pg/user'))
+            settings.value('QgisModelBaker/ili2pg/user'))
         self.pg_database_line_edit.setText(
-            settings.value('QgsProjectGenerator/ili2pg/database'))
+            settings.value('QgisModelBaker/ili2pg/database'))
         self.pg_schema_line_edit.setText(
-            settings.value('QgsProjectGenerator/ili2pg/schema'))
+            settings.value('QgisModelBaker/ili2pg/schema'))
         self.pg_password_line_edit.setText(
-            settings.value('QgsProjectGenerator/ili2pg/password'))
+            settings.value('QgisModelBaker/ili2pg/password'))
         self.gpkg_file_line_edit.setText(
-            settings.value('QgsProjectGenerator/ili2gpkg/dbfile'))
+            settings.value('QgisModelBaker/ili2gpkg/dbfile'))
 
-        mode = settings.value('QgsProjectGenerator/importtype', 'pg')
+        mode = settings.value('QgisModelBaker/importtype', 'pg')
         mode = 'pg' if mode == 'ili2pg' else mode
         mode = 'gpkg' if mode == 'ili2gpkg' else mode
         self.type_combo_box.setCurrentIndex(self.type_combo_box.findData(mode))
@@ -447,7 +447,7 @@ def link_activated(self, link):
             cfg = OptionsDialog(self.base_configuration)
             if cfg.exec_():
                 settings = QSettings()
-                settings.beginGroup('QgsProjectGenerator/ili2db')
+                settings.beginGroup('QgisModelBaker/ili2db')
                 self.base_configuration.save(settings)
         else:
             QDesktopServices.openUrl(link)
@@ -457,10 +457,10 @@ def help_requested(self):
             'locale/userLocale')).name()[:2]
         if os_language in ['es', 'de']:
             webbrowser.open(
-                "https://opengisch.github.io/projectgenerator/docs/{}/user-guide.html#export-an-interlis-transfer-file-xtf".format(os_language))
+                "https://opengisch.github.io/QgisModelBaker/docs/{}/user-guide.html#export-an-interlis-transfer-file-xtf".format(os_language))
         else:
             webbrowser.open(
-                "https://opengisch.github.io/projectgenerator/docs/user-guide.html#export-an-interlis-transfer-file-xtf")
+                "https://opengisch.github.io/QgisModelBaker/docs/user-guide.html#export-an-interlis-transfer-file-xtf")
 
     def xtf_browser_opened_to_true(self):
         """
diff --git a/projectgenerator/gui/generate_project.py b/QgisModelBaker/gui/generate_project.py
similarity index 91%
rename from projectgenerator/gui/generate_project.py
rename to QgisModelBaker/gui/generate_project.py
index a7d100286..a86c5e8a4 100644
--- a/projectgenerator/gui/generate_project.py
+++ b/QgisModelBaker/gui/generate_project.py
@@ -24,15 +24,15 @@
 import re
 from psycopg2 import OperationalError
 
-from projectgenerator.gui.options import OptionsDialog, CompletionLineEdit
-from projectgenerator.gui.ili2db_options import Ili2dbOptionsDialog
-from projectgenerator.gui.multiple_models import MultipleModelsDialog
-from projectgenerator.libili2db.globals import CRS_PATTERNS
-from projectgenerator.libili2db.ili2dbconfig import SchemaImportConfiguration
-from projectgenerator.libili2db.ilicache import IliCache, ModelCompleterDelegate
-from projectgenerator.libili2db.iliimporter import JavaNotFoundError
-from projectgenerator.libili2db.ili2dbutils import color_log_text
-from projectgenerator.utils.qt_utils import (
+from QgisModelBaker.gui.options import OptionsDialog, CompletionLineEdit
+from QgisModelBaker.gui.ili2db_options import Ili2dbOptionsDialog
+from QgisModelBaker.gui.multiple_models import MultipleModelsDialog
+from QgisModelBaker.libili2db.globals import CRS_PATTERNS
+from QgisModelBaker.libili2db.ili2dbconfig import SchemaImportConfiguration
+from QgisModelBaker.libili2db.ilicache import IliCache, ModelCompleterDelegate
+from QgisModelBaker.libili2db.iliimporter import JavaNotFoundError
+from QgisModelBaker.libili2db.ili2dbutils import color_log_text
+from QgisModelBaker.utils.qt_utils import (
     make_file_selector,
     make_save_file_selector,
     Validators,
@@ -398,60 +398,60 @@ def updated_configuration(self):
 
     def save_configuration(self, configuration):
         settings = QSettings()
-        settings.setValue('QgsProjectGenerator/ili2db/ilifile',
+        settings.setValue('QgisModelBaker/ili2db/ilifile',
                           configuration.ilifile)
-        settings.setValue('QgsProjectGenerator/ili2db/epsg', self.epsg)
-        settings.setValue('QgsProjectGenerator/importtype',
+        settings.setValue('QgisModelBaker/ili2db/epsg', self.epsg)
+        settings.setValue('QgisModelBaker/importtype',
                           self.type_combo_box.currentData())
         if self.type_combo_box.currentData() in ['ili2pg', 'pg']:
             # PostgreSQL specific options
             settings.setValue(
-                'QgsProjectGenerator/ili2pg/host', configuration.dbhost)
+                'QgisModelBaker/ili2pg/host', configuration.dbhost)
             settings.setValue(
-                'QgsProjectGenerator/ili2pg/port', configuration.dbport)
+                'QgisModelBaker/ili2pg/port', configuration.dbport)
             settings.setValue(
-                'QgsProjectGenerator/ili2pg/user', configuration.dbusr)
+                'QgisModelBaker/ili2pg/user', configuration.dbusr)
             settings.setValue(
-                'QgsProjectGenerator/ili2pg/database', configuration.database.strip("'"))
+                'QgisModelBaker/ili2pg/database', configuration.database.strip("'"))
             settings.setValue(
-                'QgsProjectGenerator/ili2pg/schema', configuration.dbschema)
+                'QgisModelBaker/ili2pg/schema', configuration.dbschema)
             settings.setValue(
-                'QgsProjectGenerator/ili2pg/password', configuration.dbpwd)
+                'QgisModelBaker/ili2pg/password', configuration.dbpwd)
             settings.setValue(
-                'QgsProjectGenerator/ili2pg/usesuperlogin', configuration.db_use_super_login)
+                'QgisModelBaker/ili2pg/usesuperlogin', configuration.db_use_super_login)
         elif self.type_combo_box.currentData() in ['ili2gpkg', 'gpkg']:
             settings.setValue(
-                'QgsProjectGenerator/ili2gpkg/dbfile', configuration.dbfile)
+                'QgisModelBaker/ili2gpkg/dbfile', configuration.dbfile)
 
     def restore_configuration(self):
         settings = QSettings()
 
         self.ili_file_line_edit.setText(
-            settings.value('QgsProjectGenerator/ili2db/ilifile'))
+            settings.value('QgisModelBaker/ili2db/ilifile'))
         self.crs = QgsCoordinateReferenceSystem(
-            settings.value('QgsProjectGenerator/ili2db/epsg', 21781, int))
+            settings.value('QgisModelBaker/ili2db/epsg', 21781, int))
         self.fill_toml_file_info_label()
         self.update_crs_info()
 
         self.pg_host_line_edit.setText(
-            settings.value('QgsProjectGenerator/ili2pg/host', 'localhost'))
+            settings.value('QgisModelBaker/ili2pg/host', 'localhost'))
         self.pg_port_line_edit.setText(
-            settings.value('QgsProjectGenerator/ili2pg/port'))
+            settings.value('QgisModelBaker/ili2pg/port'))
         self.pg_user_line_edit.setText(
-            settings.value('QgsProjectGenerator/ili2pg/user'))
+            settings.value('QgisModelBaker/ili2pg/user'))
         self.pg_database_line_edit.setText(
-            settings.value('QgsProjectGenerator/ili2pg/database'))
+            settings.value('QgisModelBaker/ili2pg/database'))
         self.pg_schema_line_edit.setText(
-            settings.value('QgsProjectGenerator/ili2pg/schema'))
+            settings.value('QgisModelBaker/ili2pg/schema'))
         self.pg_password_line_edit.setText(
-            settings.value('QgsProjectGenerator/ili2pg/password'))
+            settings.value('QgisModelBaker/ili2pg/password'))
         self.pg_use_super_login.setChecked(
-            settings.value('QgsProjectGenerator/ili2pg/usesuperlogin', defaultValue=False, type=bool))
+            settings.value('QgisModelBaker/ili2pg/usesuperlogin', defaultValue=False, type=bool))
         self.gpkg_file_line_edit.setText(
-            settings.value('QgsProjectGenerator/ili2gpkg/dbfile'))
+            settings.value('QgisModelBaker/ili2gpkg/dbfile'))
 
         self.type_combo_box.setCurrentIndex(
-            self.type_combo_box.findData(settings.value('QgsProjectGenerator/importtype', 'pg')))
+            self.type_combo_box.findData(settings.value('QgisModelBaker/importtype', 'pg')))
         self.type_changed()
         self.crs_changed()
 
@@ -524,7 +524,7 @@ def link_activated(self, link):
             cfg = OptionsDialog(self.base_configuration)
             if cfg.exec_():
                 settings = QSettings()
-                settings.beginGroup('QgsProjectGenerator/ili2db')
+                settings.beginGroup('QgisModelBaker/ili2db')
                 self.base_configuration.save(settings)
         else:
             QDesktopServices.openUrl(link)
@@ -612,10 +612,10 @@ def help_requested(self):
             'locale/userLocale')).name()[:2]
         if os_language in ['es', 'de']:
             webbrowser.open(
-                "https://opengisch.github.io/projectgenerator/docs/{}/user-guide.html#generate-project".format(os_language))
+                "https://opengisch.github.io/QgisModelBaker/docs/{}/user-guide.html#generate-project".format(os_language))
         else:
             webbrowser.open(
-                "https://opengisch.github.io/projectgenerator/docs/user-guide.html#generate-project")
+                "https://opengisch.github.io/QgisModelBaker/docs/user-guide.html#generate-project")
 
     def advance_progress_bar_by_text(self, text):
         if text.strip() == 'Info: compile models…':
diff --git a/projectgenerator/gui/ili2db_options.py b/QgisModelBaker/gui/ili2db_options.py
similarity index 81%
rename from projectgenerator/gui/ili2db_options.py
rename to QgisModelBaker/gui/ili2db_options.py
index be9a375be..05bdbcf63 100644
--- a/projectgenerator/gui/ili2db_options.py
+++ b/QgisModelBaker/gui/ili2db_options.py
@@ -18,7 +18,7 @@
  ***************************************************************************/
 """
 
-from projectgenerator.utils.qt_utils import (
+from QgisModelBaker.utils.qt_utils import (
     make_file_selector,
     Validators,
     FileValidator
@@ -80,7 +80,7 @@ def inheritance_type(self):
 
     def set_toml_file_key(self, key_postfix):
         if key_postfix:
-            self.toml_file_key = 'QgsProjectGenerator/ili2db/tomlfile/' + key_postfix
+            self.toml_file_key = 'QgisModelBaker/ili2db/tomlfile/' + key_postfix
         else:
             self.toml_file_key = None
         self.restore_configuration()
@@ -94,24 +94,24 @@ def stroke_arcs(self):
     def save_configuration(self):
         settings = QSettings()
         settings.setValue(
-            'QgsProjectGenerator/ili2db/inheritance', self.inheritance_type())
+            'QgisModelBaker/ili2db/inheritance', self.inheritance_type())
         settings.setValue(
             self.toml_file_key, self.toml_file())
-        settings.setValue('QgsProjectGenerator/ili2db/create_basket_col', self.create_basket_col())
-        settings.setValue('QgsProjectGenerator/ili2db/create_import_tid', self.create_import_tid())
-        settings.setValue('QgsProjectGenerator/ili2db/stroke_arcs', self.stroke_arcs())
+        settings.setValue('QgisModelBaker/ili2db/create_basket_col', self.create_basket_col())
+        settings.setValue('QgisModelBaker/ili2db/create_import_tid', self.create_import_tid())
+        settings.setValue('QgisModelBaker/ili2db/stroke_arcs', self.stroke_arcs())
 
     def restore_configuration(self):
         settings = QSettings()
         inheritance = settings.value(
-            'QgsProjectGenerator/ili2db/inheritance', 'smart2')
+            'QgisModelBaker/ili2db/inheritance', 'smart2')
         if inheritance == 'smart1':
             self.smart1_radio_button.setChecked(True)
         else:
             self.smart2_radio_button.setChecked(True)
-        create_basket_col = settings.value('QgsProjectGenerator/ili2db/create_basket_col', defaultValue=False, type=bool)
-        create_import_tid = settings.value('QgsProjectGenerator/ili2db/create_import_tid', defaultValue=True, type=bool)
-        stroke_arcs = settings.value('QgsProjectGenerator/ili2db/stroke_arcs', defaultValue=True, type=bool)
+        create_basket_col = settings.value('QgisModelBaker/ili2db/create_basket_col', defaultValue=False, type=bool)
+        create_import_tid = settings.value('QgisModelBaker/ili2db/create_import_tid', defaultValue=True, type=bool)
+        stroke_arcs = settings.value('QgisModelBaker/ili2db/stroke_arcs', defaultValue=True, type=bool)
 
         self.create_basket_col_checkbox.setChecked(create_basket_col)
         self.create_import_tid_checkbox.setChecked(create_import_tid)
diff --git a/projectgenerator/gui/import_data.py b/QgisModelBaker/gui/import_data.py
similarity index 87%
rename from projectgenerator/gui/import_data.py
rename to QgisModelBaker/gui/import_data.py
index cca7e3ff3..71adbc075 100644
--- a/projectgenerator/gui/import_data.py
+++ b/QgisModelBaker/gui/import_data.py
@@ -20,14 +20,14 @@
 
 import webbrowser
 
-from projectgenerator.gui.ili2db_options import Ili2dbOptionsDialog
-from projectgenerator.gui.options import OptionsDialog, CompletionLineEdit
-from projectgenerator.gui.multiple_models import MultipleModelsDialog
-from projectgenerator.libili2db.iliimporter import JavaNotFoundError
-from projectgenerator.libili2db.ilicache import IliCache, ModelCompleterDelegate
-from projectgenerator.libili2db.ili2dbutils import color_log_text
-from projectgenerator.libqgsprojectgen.dbconnector import pg_connector
-from projectgenerator.utils.qt_utils import (
+from QgisModelBaker.gui.ili2db_options import Ili2dbOptionsDialog
+from QgisModelBaker.gui.options import OptionsDialog, CompletionLineEdit
+from QgisModelBaker.gui.multiple_models import MultipleModelsDialog
+from QgisModelBaker.libili2db.iliimporter import JavaNotFoundError
+from QgisModelBaker.libili2db.ilicache import IliCache, ModelCompleterDelegate
+from QgisModelBaker.libili2db.ili2dbutils import color_log_text
+from QgisModelBaker.libqgsprojectgen.dbconnector import pg_connector
+from QgisModelBaker.utils.qt_utils import (
     make_file_selector,
     make_save_file_selector,
     make_folder_selector,
@@ -137,7 +137,7 @@ def __init__(self, base_config, parent=None):
             self.gpkg_file_line_edit.text())
 
         settings = QSettings()
-        ilifile = settings.value('QgsProjectGenerator/ili2db/ilifile')
+        ilifile = settings.value('QgisModelBaker/ili2db/ilifile')
         self.ilicache = IliCache(base_config, ilifile or None)
         self.update_models_completer()
         self.ilicache.refresh()
@@ -283,30 +283,30 @@ def updated_configuration(self):
     def save_configuration(self, configuration):
         settings = QSettings()
         settings.setValue(
-            'QgsProjectGenerator/ili2pg/xtffile_import', configuration.xtffile)
+            'QgisModelBaker/ili2pg/xtffile_import', configuration.xtffile)
         settings.setValue(
-            'QgsProjectGenerator/ili2pg/deleteData', configuration.delete_data)
+            'QgisModelBaker/ili2pg/deleteData', configuration.delete_data)
         settings.setValue(
-            'QgsProjectGenerator/importtype', self.type_combo_box.currentData())
+            'QgisModelBaker/importtype', self.type_combo_box.currentData())
 
         if self.type_combo_box.currentData() in ['ili2pg', 'pg']:
             # PostgreSQL specific options
-            settings.setValue('QgsProjectGenerator/ili2pg/host',
+            settings.setValue('QgisModelBaker/ili2pg/host',
                               configuration.dbhost)
-            settings.setValue('QgsProjectGenerator/ili2pg/port',
+            settings.setValue('QgisModelBaker/ili2pg/port',
                               configuration.dbport)
-            settings.setValue('QgsProjectGenerator/ili2pg/user',
+            settings.setValue('QgisModelBaker/ili2pg/user',
                               configuration.dbusr)
-            settings.setValue('QgsProjectGenerator/ili2pg/database',
+            settings.setValue('QgisModelBaker/ili2pg/database',
                               configuration.database)
-            settings.setValue('QgsProjectGenerator/ili2pg/schema',
+            settings.setValue('QgisModelBaker/ili2pg/schema',
                               configuration.dbschema)
-            settings.setValue('QgsProjectGenerator/ili2pg/password',
+            settings.setValue('QgisModelBaker/ili2pg/password',
                               configuration.dbpwd)
-            settings.setValue('QgsProjectGenerator/ili2pg/usesuperlogin',
+            settings.setValue('QgisModelBaker/ili2pg/usesuperlogin',
                               configuration.db_use_super_login)
         elif self.type_combo_box.currentData() in ['ili2gpkg', 'gpkg']:
-            settings.setValue('QgsProjectGenerator/ili2gpkg/dbfile',
+            settings.setValue('QgisModelBaker/ili2gpkg/dbfile',
                               configuration.dbfile)
 
     def restore_configuration(self):
@@ -314,27 +314,27 @@ def restore_configuration(self):
 
         self.fill_toml_file_info_label()
         self.xtf_file_line_edit.setText(settings.value(
-            'QgsProjectGenerator/ili2pg/xtffile_import'))
+            'QgisModelBaker/ili2pg/xtffile_import'))
         self.chk_delete_data.setChecked(settings.value(
-            'QgsProjectGenerator/ili2pg/deleteData', False, bool))
+            'QgisModelBaker/ili2pg/deleteData', False, bool))
         self.pg_host_line_edit.setText(settings.value(
-            'QgsProjectGenerator/ili2pg/host', 'localhost'))
+            'QgisModelBaker/ili2pg/host', 'localhost'))
         self.pg_port_line_edit.setText(settings.value(
-            'QgsProjectGenerator/ili2pg/port'))
+            'QgisModelBaker/ili2pg/port'))
         self.pg_user_line_edit.setText(settings.value(
-            'QgsProjectGenerator/ili2pg/user'))
+            'QgisModelBaker/ili2pg/user'))
         self.pg_database_line_edit.setText(settings.value(
-            'QgsProjectGenerator/ili2pg/database'))
+            'QgisModelBaker/ili2pg/database'))
         self.pg_schema_line_edit.setText(settings.value(
-            'QgsProjectGenerator/ili2pg/schema'))
+            'QgisModelBaker/ili2pg/schema'))
         self.pg_password_line_edit.setText(settings.value(
-            'QgsProjectGenerator/ili2pg/password'))
+            'QgisModelBaker/ili2pg/password'))
         self.pg_use_super_login.setChecked(settings.value(
-            'QgsProjectGenerator/ili2pg/usesuperlogin', defaultValue=False, type=bool))
+            'QgisModelBaker/ili2pg/usesuperlogin', defaultValue=False, type=bool))
         self.gpkg_file_line_edit.setText(settings.value(
-            'QgsProjectGenerator/ili2gpkg/dbfile'))
+            'QgisModelBaker/ili2gpkg/dbfile'))
 
-        mode = settings.value('QgsProjectGenerator/importtype', 'pg')
+        mode = settings.value('QgisModelBaker/importtype', 'pg')
         mode = 'pg' if mode == 'ili2pg' else mode
         mode = 'gpkg' if mode == 'ili2gpkg' else mode
         self.type_combo_box.setCurrentIndex(self.type_combo_box.findData(mode))
@@ -364,7 +364,7 @@ def link_activated(self, link):
             cfg = OptionsDialog(self.base_configuration)
             if cfg.exec_():
                 settings = QSettings()
-                settings.beginGroup('QgsProjectGenerator/ili2db')
+                settings.beginGroup('QgisModelBaker/ili2db')
                 self.base_configuration.save(settings)
         else:
             QDesktopServices.openUrl(link)
@@ -401,10 +401,10 @@ def help_requested(self):
             'locale/userLocale')).name()[:2]
         if os_language in ['es', 'de']:
             webbrowser.open(
-                "https://opengisch.github.io/projectgenerator/docs/{}/user-guide.html#import-an-interlis-transfer-file-xtf".format(os_language))
+                "https://opengisch.github.io/QgisModelBaker/docs/{}/user-guide.html#import-an-interlis-transfer-file-xtf".format(os_language))
         else:
             webbrowser.open(
-                "https://opengisch.github.io/projectgenerator/docs/user-guide.html#import-an-interlis-transfer-file-xtf")
+                "https://opengisch.github.io/QgisModelBaker/docs/user-guide.html#import-an-interlis-transfer-file-xtf")
 
     def advance_progress_bar_by_text(self, text):
         if text.strip() == 'Info: compile models...':
diff --git a/projectgenerator/gui/multiple_models.py b/QgisModelBaker/gui/multiple_models.py
similarity index 98%
rename from projectgenerator/gui/multiple_models.py
rename to QgisModelBaker/gui/multiple_models.py
index 1c5890049..f6a422715 100644
--- a/projectgenerator/gui/multiple_models.py
+++ b/QgisModelBaker/gui/multiple_models.py
@@ -17,7 +17,7 @@
  *                                                                         *
  ***************************************************************************/
 """
-from projectgenerator.utils import get_ui_class
+from QgisModelBaker.utils import get_ui_class
 
 from qgis.PyQt.QtCore import Qt
 from qgis.PyQt.QtWidgets import QDialog, QListWidgetItem, QDialogButtonBox
diff --git a/projectgenerator/gui/options.py b/QgisModelBaker/gui/options.py
similarity index 90%
rename from projectgenerator/gui/options.py
rename to QgisModelBaker/gui/options.py
index 68dc3aa35..65f6c9d9d 100644
--- a/projectgenerator/gui/options.py
+++ b/QgisModelBaker/gui/options.py
@@ -19,16 +19,16 @@
 """
 import webbrowser
 
-from projectgenerator.libili2db.ili2dbconfig import SchemaImportConfiguration, ImportDataConfiguration, \
+from QgisModelBaker.libili2db.ili2dbconfig import SchemaImportConfiguration, ImportDataConfiguration, \
     ExportConfiguration
-from projectgenerator.libili2db.ili2dbutils import get_ili2db_bin
-from projectgenerator.utils import get_ui_class
-from projectgenerator.utils import qt_utils
-from projectgenerator.gui.custom_model_dir import CustomModelDirDialog
+from QgisModelBaker.libili2db.ili2dbutils import get_ili2db_bin
+from QgisModelBaker.utils import get_ui_class
+from QgisModelBaker.utils import qt_utils
+from QgisModelBaker.gui.custom_model_dir import CustomModelDirDialog
 from qgis.PyQt.QtWidgets import QDialog, QLineEdit, QListView
 from qgis.PyQt.QtCore import QLocale, QSettings, pyqtSignal, pyqtSlot, Qt, QModelIndex
 
-from projectgenerator.utils.qt_utils import FileValidator, Validators
+from QgisModelBaker.utils.qt_utils import FileValidator, Validators
 
 DIALOG_UI = get_ui_class('options.ui')
 
@@ -100,10 +100,10 @@ def help_requested(self):
             'locale/userLocale')).name()[:2]
         if os_language in ['es', 'de']:
             webbrowser.open(
-                "https://opengisch.github.io/projectgenerator/docs/{}/user-guide.html#plugin-configuration".format(os_language))
+                "https://opengisch.github.io/QgisModelBaker/docs/{}/user-guide.html#plugin-configuration".format(os_language))
         else:
             webbrowser.open(
-                "https://opengisch.github.io/projectgenerator/docs/user-guide.html#plugin-configuration")
+                "https://opengisch.github.io/QgisModelBaker/docs/user-guide.html#plugin-configuration")
 
     def ili2db_command_reload(self):
         config = None
diff --git a/projectgenerator/images/projectgenerator-icon.png b/QgisModelBaker/images/QgisModelBaker-icon.png
similarity index 100%
rename from projectgenerator/images/projectgenerator-icon.png
rename to QgisModelBaker/images/QgisModelBaker-icon.png
diff --git a/projectgenerator/images/projectgenerator-icon.svg b/QgisModelBaker/images/QgisModelBaker-icon.svg
similarity index 99%
rename from projectgenerator/images/projectgenerator-icon.svg
rename to QgisModelBaker/images/QgisModelBaker-icon.svg
index 004be3b1f..715a56ebb 100644
--- a/projectgenerator/images/projectgenerator-icon.svg
+++ b/QgisModelBaker/images/QgisModelBaker-icon.svg
@@ -16,8 +16,8 @@
    id="svg4855"
    version="1.1"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="projectgenerator-icon.svg"
-   inkscape:export-filename="C:\Users\peter.staub\Desktop\projectgenerator-icon.png"
+   sodipodi:docname="QgisModelBaker-icon.svg"
+   inkscape:export-filename="C:\Users\peter.staub\Desktop\QgisModelBaker-icon.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs
diff --git a/projectgenerator/images/projectgenerator-xtf-export-icon.svg b/QgisModelBaker/images/QgisModelBaker-xtf-export-icon.svg
similarity index 99%
rename from projectgenerator/images/projectgenerator-xtf-export-icon.svg
rename to QgisModelBaker/images/QgisModelBaker-xtf-export-icon.svg
index 63164dfd1..4d0bfe4c7 100644
--- a/projectgenerator/images/projectgenerator-xtf-export-icon.svg
+++ b/QgisModelBaker/images/QgisModelBaker-xtf-export-icon.svg
@@ -16,8 +16,8 @@
    id="svg4855"
    version="1.1"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="projectgenerator-xtf-export-icon.svg"
-   inkscape:export-filename="C:\Users\peter.staub\Desktop\projectgenerator-icon.png"
+   sodipodi:docname="QgisModelBaker-xtf-export-icon.svg"
+   inkscape:export-filename="C:\Users\peter.staub\Desktop\QgisModelBaker-icon.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs
diff --git a/projectgenerator/images/projectgenerator-xtf-import-icon.svg b/QgisModelBaker/images/QgisModelBaker-xtf-import-icon.svg
similarity index 99%
rename from projectgenerator/images/projectgenerator-xtf-import-icon.svg
rename to QgisModelBaker/images/QgisModelBaker-xtf-import-icon.svg
index 19814db23..6d91968ef 100644
--- a/projectgenerator/images/projectgenerator-xtf-import-icon.svg
+++ b/QgisModelBaker/images/QgisModelBaker-xtf-import-icon.svg
@@ -16,8 +16,8 @@
    id="svg4855"
    version="1.1"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="projectgenerator-xtf-import-icon.svg"
-   inkscape:export-filename="C:\Users\peter.staub\Desktop\projectgenerator-icon.png"
+   sodipodi:docname="QgisModelBaker-xtf-import-icon.svg"
+   inkscape:export-filename="C:\Users\peter.staub\Desktop\QgisModelBaker-icon.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs
diff --git a/projectgenerator/libili2db/__init__.py b/QgisModelBaker/libili2db/__init__.py
similarity index 100%
rename from projectgenerator/libili2db/__init__.py
rename to QgisModelBaker/libili2db/__init__.py
diff --git a/projectgenerator/libili2db/globals.py b/QgisModelBaker/libili2db/globals.py
similarity index 100%
rename from projectgenerator/libili2db/globals.py
rename to QgisModelBaker/libili2db/globals.py
diff --git a/projectgenerator/libili2db/ili2dbconfig.py b/QgisModelBaker/libili2db/ili2dbconfig.py
similarity index 99%
rename from projectgenerator/libili2db/ili2dbconfig.py
rename to QgisModelBaker/libili2db/ili2dbconfig.py
index da6cd4c02..923397dd5 100644
--- a/projectgenerator/libili2db/ili2dbconfig.py
+++ b/QgisModelBaker/libili2db/ili2dbconfig.py
@@ -18,7 +18,7 @@
  ***************************************************************************/
 """
 
-from projectgenerator.libili2db.ili2dbutils import get_all_modeldir_in_path
+from QgisModelBaker.libili2db.ili2dbutils import get_all_modeldir_in_path
 from qgis.PyQt.QtNetwork import QNetworkProxy
 from qgis.core import QgsNetworkAccessManager
 import os
diff --git a/projectgenerator/libili2db/ili2dbutils.py b/QgisModelBaker/libili2db/ili2dbutils.py
similarity index 98%
rename from projectgenerator/libili2db/ili2dbutils.py
rename to QgisModelBaker/libili2db/ili2dbutils.py
index 8a468dc31..374f8086a 100644
--- a/projectgenerator/libili2db/ili2dbutils.py
+++ b/QgisModelBaker/libili2db/ili2dbutils.py
@@ -25,7 +25,7 @@
 from qgis.PyQt.QtCore import QCoreApplication
 from qgis.PyQt.QtGui import QColor
 
-from projectgenerator.utils.qt_utils import download_file, NetworkError
+from QgisModelBaker.utils.qt_utils import download_file, NetworkError
 
 
 def get_ili2db_bin(tool_name, stdout, stderr, ili2db_tools):
diff --git a/projectgenerator/libili2db/ilicache.py b/QgisModelBaker/libili2db/ilicache.py
similarity index 97%
rename from projectgenerator/libili2db/ilicache.py
rename to QgisModelBaker/libili2db/ilicache.py
index 1d2f82363..b7fc0be16 100644
--- a/projectgenerator/libili2db/ilicache.py
+++ b/QgisModelBaker/libili2db/ilicache.py
@@ -26,8 +26,8 @@
 import re
 
 from enum import Enum
-from projectgenerator.libili2db.ili2dbutils import get_all_modeldir_in_path
-from projectgenerator.utils.qt_utils import download_file
+from QgisModelBaker.libili2db.ili2dbutils import get_all_modeldir_in_path
+from QgisModelBaker.utils.qt_utils import download_file
 from PyQt5.QtCore import (
     QObject,
     pyqtSignal,
@@ -128,7 +128,7 @@ def _process_ilisite(self, file):
             root = ET.parse(file).getroot()
         except ET.ParseError as e:
             QgsMessageLog.logMessage(self.tr('Could not parse ilisite file `{file}` ({exception})'.format(
-                file=file, exception=str(e))), self.tr('Projectgenerator'))
+                file=file, exception=str(e))), self.tr('QGIS Model Baker'))
             return
 
         for site in root.iter('{http://www.interlis.ch/INTERLIS2.3}IliSite09.SiteMetadata.Site'):
@@ -147,7 +147,7 @@ def _process_ilimodels(self, file, netloc):
             root = ET.parse(file).getroot()
         except ET.ParseError as e:
             QgsMessageLog.logMessage(self.tr('Could not parse ilimodels file `{file}` ({exception})'.format(
-                file=file, exception=str(e))), self.tr('Projectgenerator'))
+                file=file, exception=str(e))), self.tr('QGIS Model Baker'))
             return
 
         self.repositories[netloc] = list()
@@ -199,7 +199,7 @@ def process_ili_file(self, ilifile):
                                               os.path.basename(ilifile))))
                 QgsMessageLog.logMessage(self.tr(
                     'Could not parse ili file `{ilifile}`. We suggest you to encode it in UTF-8. ({exception})'.format(
-                        ilifile=ilifile, exception=str(e))), self.tr('Projectgenerator'))
+                        ilifile=ilifile, exception=str(e))), self.tr('QGIS Model Baker'))
                 fileModels = list()
 
         return fileModels
diff --git a/projectgenerator/libili2db/iliexporter.py b/QgisModelBaker/libili2db/iliexporter.py
similarity index 96%
rename from projectgenerator/libili2db/iliexporter.py
rename to QgisModelBaker/libili2db/iliexporter.py
index 846fa9c3d..b6d3e3ca1 100644
--- a/projectgenerator/libili2db/iliexporter.py
+++ b/QgisModelBaker/libili2db/iliexporter.py
@@ -23,10 +23,10 @@
 import functools
 import locale
 
-from projectgenerator.libili2db.ili2dbutils import get_ili2db_bin
+from QgisModelBaker.libili2db.ili2dbutils import get_ili2db_bin
 from qgis.PyQt.QtCore import QObject, pyqtSignal, QProcess, QEventLoop
 
-from projectgenerator.libili2db.ili2dbconfig import ExportConfiguration, JavaNotFoundError, ili2db_tools
+from QgisModelBaker.libili2db.ili2dbconfig import ExportConfiguration, JavaNotFoundError, ili2db_tools
 
 
 class Exporter(QObject):
diff --git a/projectgenerator/libili2db/iliimporter.py b/QgisModelBaker/libili2db/iliimporter.py
similarity index 97%
rename from projectgenerator/libili2db/iliimporter.py
rename to QgisModelBaker/libili2db/iliimporter.py
index 3a264a83b..5a839b1e7 100644
--- a/projectgenerator/libili2db/iliimporter.py
+++ b/QgisModelBaker/libili2db/iliimporter.py
@@ -23,10 +23,10 @@
 import locale
 import functools
 
-from projectgenerator.libili2db.ili2dbutils import get_ili2db_bin
+from QgisModelBaker.libili2db.ili2dbutils import get_ili2db_bin
 from qgis.PyQt.QtCore import QObject, pyqtSignal, QProcess, QEventLoop
 
-from projectgenerator.libili2db.ili2dbconfig import (
+from QgisModelBaker.libili2db.ili2dbconfig import (
         SchemaImportConfiguration,
         ImportDataConfiguration,
         JavaNotFoundError,
diff --git a/projectgenerator/libqgsprojectgen/__init__.py b/QgisModelBaker/libqgsprojectgen/__init__.py
similarity index 100%
rename from projectgenerator/libqgsprojectgen/__init__.py
rename to QgisModelBaker/libqgsprojectgen/__init__.py
diff --git a/projectgenerator/libqgsprojectgen/dataobjects/__init__.py b/QgisModelBaker/libqgsprojectgen/dataobjects/__init__.py
similarity index 100%
rename from projectgenerator/libqgsprojectgen/dataobjects/__init__.py
rename to QgisModelBaker/libqgsprojectgen/dataobjects/__init__.py
diff --git a/projectgenerator/libqgsprojectgen/dataobjects/fields.py b/QgisModelBaker/libqgsprojectgen/dataobjects/fields.py
similarity index 100%
rename from projectgenerator/libqgsprojectgen/dataobjects/fields.py
rename to QgisModelBaker/libqgsprojectgen/dataobjects/fields.py
diff --git a/projectgenerator/libqgsprojectgen/dataobjects/form.py b/QgisModelBaker/libqgsprojectgen/dataobjects/form.py
similarity index 100%
rename from projectgenerator/libqgsprojectgen/dataobjects/form.py
rename to QgisModelBaker/libqgsprojectgen/dataobjects/form.py
diff --git a/projectgenerator/libqgsprojectgen/dataobjects/layers.py b/QgisModelBaker/libqgsprojectgen/dataobjects/layers.py
similarity index 100%
rename from projectgenerator/libqgsprojectgen/dataobjects/layers.py
rename to QgisModelBaker/libqgsprojectgen/dataobjects/layers.py
diff --git a/projectgenerator/libqgsprojectgen/dataobjects/legend.py b/QgisModelBaker/libqgsprojectgen/dataobjects/legend.py
similarity index 97%
rename from projectgenerator/libqgsprojectgen/dataobjects/legend.py
rename to QgisModelBaker/libqgsprojectgen/dataobjects/legend.py
index 7384afc56..950d0cd48 100644
--- a/projectgenerator/libqgsprojectgen/dataobjects/legend.py
+++ b/QgisModelBaker/libqgsprojectgen/dataobjects/legend.py
@@ -20,7 +20,7 @@
 
 from qgis.core import QgsProject
 
-from projectgenerator.utils.qgis_utils import get_suggested_index_for_layer
+from QgisModelBaker.utils.qgis_utils import get_suggested_index_for_layer
 
 
 
diff --git a/projectgenerator/libqgsprojectgen/dataobjects/project.py b/QgisModelBaker/libqgsprojectgen/dataobjects/project.py
similarity index 98%
rename from projectgenerator/libqgsprojectgen/dataobjects/project.py
rename to QgisModelBaker/libqgsprojectgen/dataobjects/project.py
index d6dc81883..f34940d17 100644
--- a/projectgenerator/libqgsprojectgen/dataobjects/project.py
+++ b/QgisModelBaker/libqgsprojectgen/dataobjects/project.py
@@ -19,7 +19,7 @@
 """
 from typing import List
 
-from projectgenerator.libqgsprojectgen.dataobjects.relations import Relation
+from QgisModelBaker.libqgsprojectgen.dataobjects.relations import Relation
 from .layers import Layer
 from .legend import LegendGroup
 from qgis.core import QgsCoordinateReferenceSystem, QgsProject, QgsEditorWidgetSetup
diff --git a/projectgenerator/libqgsprojectgen/dataobjects/relations.py b/QgisModelBaker/libqgsprojectgen/dataobjects/relations.py
similarity index 100%
rename from projectgenerator/libqgsprojectgen/dataobjects/relations.py
rename to QgisModelBaker/libqgsprojectgen/dataobjects/relations.py
diff --git a/projectgenerator/libqgsprojectgen/dbconnector/__init__.py b/QgisModelBaker/libqgsprojectgen/dbconnector/__init__.py
similarity index 100%
rename from projectgenerator/libqgsprojectgen/dbconnector/__init__.py
rename to QgisModelBaker/libqgsprojectgen/dbconnector/__init__.py
diff --git a/projectgenerator/libqgsprojectgen/dbconnector/db_connector.py b/QgisModelBaker/libqgsprojectgen/dbconnector/db_connector.py
similarity index 100%
rename from projectgenerator/libqgsprojectgen/dbconnector/db_connector.py
rename to QgisModelBaker/libqgsprojectgen/dbconnector/db_connector.py
diff --git a/projectgenerator/libqgsprojectgen/dbconnector/gpkg_connector.py b/QgisModelBaker/libqgsprojectgen/dbconnector/gpkg_connector.py
similarity index 100%
rename from projectgenerator/libqgsprojectgen/dbconnector/gpkg_connector.py
rename to QgisModelBaker/libqgsprojectgen/dbconnector/gpkg_connector.py
diff --git a/projectgenerator/libqgsprojectgen/dbconnector/pg_connector.py b/QgisModelBaker/libqgsprojectgen/dbconnector/pg_connector.py
similarity index 100%
rename from projectgenerator/libqgsprojectgen/dbconnector/pg_connector.py
rename to QgisModelBaker/libqgsprojectgen/dbconnector/pg_connector.py
diff --git a/projectgenerator/libqgsprojectgen/generator/__init__.py b/QgisModelBaker/libqgsprojectgen/generator/__init__.py
similarity index 100%
rename from projectgenerator/libqgsprojectgen/generator/__init__.py
rename to QgisModelBaker/libqgsprojectgen/generator/__init__.py
diff --git a/projectgenerator/libqgsprojectgen/generator/config.py b/QgisModelBaker/libqgsprojectgen/generator/config.py
similarity index 100%
rename from projectgenerator/libqgsprojectgen/generator/config.py
rename to QgisModelBaker/libqgsprojectgen/generator/config.py
diff --git a/projectgenerator/libqgsprojectgen/generator/domain_relations_generator.py b/QgisModelBaker/libqgsprojectgen/generator/domain_relations_generator.py
similarity index 99%
rename from projectgenerator/libqgsprojectgen/generator/domain_relations_generator.py
rename to QgisModelBaker/libqgsprojectgen/generator/domain_relations_generator.py
index 8cdfb5a0e..ef3e7da0f 100644
--- a/projectgenerator/libqgsprojectgen/generator/domain_relations_generator.py
+++ b/QgisModelBaker/libqgsprojectgen/generator/domain_relations_generator.py
@@ -19,7 +19,7 @@
 """
 import re
 
-from projectgenerator.libqgsprojectgen.dataobjects.relations import Relation
+from QgisModelBaker.libqgsprojectgen.dataobjects.relations import Relation
 
 class DomainRelationGenerator:
     """TODO: remove when ili2db issue #19 is solved"""
diff --git a/projectgenerator/libqgsprojectgen/generator/generator.py b/QgisModelBaker/libqgsprojectgen/generator/generator.py
similarity index 97%
rename from projectgenerator/libqgsprojectgen/generator/generator.py
rename to QgisModelBaker/libqgsprojectgen/generator/generator.py
index 988d46c99..efd5598aa 100644
--- a/projectgenerator/libqgsprojectgen/generator/generator.py
+++ b/QgisModelBaker/libqgsprojectgen/generator/generator.py
@@ -22,17 +22,17 @@
 from qgis.core import QgsProviderRegistry, QgsWkbTypes, QgsApplication
 from qgis.PyQt.QtCore import QCoreApplication, QLocale
 
-from projectgenerator.libqgsprojectgen.dataobjects import Field
-from projectgenerator.libqgsprojectgen.dataobjects import LegendGroup
-from projectgenerator.libqgsprojectgen.dataobjects.layers import Layer
-from projectgenerator.libqgsprojectgen.dataobjects.relations import Relation
+from QgisModelBaker.libqgsprojectgen.dataobjects import Field
+from QgisModelBaker.libqgsprojectgen.dataobjects import LegendGroup
+from QgisModelBaker.libqgsprojectgen.dataobjects.layers import Layer
+from QgisModelBaker.libqgsprojectgen.dataobjects.relations import Relation
 from ..dbconnector import pg_connector, gpkg_connector
 from .domain_relations_generator import DomainRelationGenerator
 from .config import IGNORED_SCHEMAS, IGNORED_TABLES, IGNORED_FIELDNAMES, READONLY_FIELDNAMES
 
 
 class Generator:
-    """Builds Project Generator objects from data extracted from databases."""
+    """Builds Model Baker objects from data extracted from databases."""
 
     def __init__(self, tool_name, uri, inheritance, schema=None, pg_estimated_metadata=False):
         self.tool_name = tool_name
diff --git a/QgisModelBaker/metadata.txt b/QgisModelBaker/metadata.txt
new file mode 100644
index 000000000..2d8e5b853
--- /dev/null
+++ b/QgisModelBaker/metadata.txt
@@ -0,0 +1,14 @@
+[general]
+name=QGIS Model Baker
+description=QGIS Model Baker
+version=dev
+icon=images/QgisModelBaker-icon.svg
+qgisMinimumVersion=3.0
+qgisMaximumVersion=3.99
+author=OPENGIS.ch GmbH in collaboration with Swissphoto BSF
+email=info@opengis.ch
+about=Creates QGIS Projects from Interlis files
+tracker=https://github.com/opengisch/QgisModelBaker/issues
+repository=https://github.com/opengisch/QgisModelBaker
+experimental=False
+deprecated=False
diff --git a/projectgenerator/metaproject.py b/QgisModelBaker/metaproject.py
similarity index 100%
rename from projectgenerator/metaproject.py
rename to QgisModelBaker/metaproject.py
diff --git a/projectgenerator/qgs_project_generator.py b/QgisModelBaker/qgismodelbaker.py
similarity index 74%
rename from projectgenerator/qgs_project_generator.py
rename to QgisModelBaker/qgismodelbaker.py
index 16df8c1c8..a11e29ef0 100644
--- a/projectgenerator/qgs_project_generator.py
+++ b/QgisModelBaker/qgismodelbaker.py
@@ -21,11 +21,11 @@
 import os
 import webbrowser
 
-from projectgenerator.gui.generate_project import GenerateProjectDialog
-from projectgenerator.gui.export import ExportDialog
-from projectgenerator.gui.import_data import ImportDataDialog
-from projectgenerator.libqgsprojectgen.dataobjects.project import Project
-from projectgenerator.libqgsprojectgen.generator.generator import Generator
+from QgisModelBaker.gui.generate_project import GenerateProjectDialog
+from QgisModelBaker.gui.export import ExportDialog
+from QgisModelBaker.gui.import_data import ImportDataDialog
+from QgisModelBaker.libqgsprojectgen.dataobjects.project import Project
+from QgisModelBaker.libqgsprojectgen.generator.generator import Generator
 
 from qgis.core import QgsProject
 
@@ -33,10 +33,12 @@
 from qgis.PyQt.QtCore import QObject, QTranslator, QSettings, QLocale, QCoreApplication, Qt
 from qgis.PyQt.QtGui import QIcon
 
-from projectgenerator.gui.options import OptionsDialog
-from projectgenerator.libili2db.ili2dbconfig import BaseConfiguration
+from QgisModelBaker.gui.options import OptionsDialog
+from QgisModelBaker.libili2db.ili2dbconfig import BaseConfiguration
 
-class QgsProjectGeneratorPlugin(QObject):
+import pyplugin_installer
+
+class QgisModelBakerPlugin(QObject):
 
     def __init__(self, iface):
         QObject.__init__(self)
@@ -57,20 +59,26 @@ def __init__(self, iface):
         qgis_locale = QLocale(qgis_locale_id)
         locale_path = os.path.join(self.plugin_dir, 'i18n')
         self.translator = QTranslator()
-        self.translator.load(qgis_locale, 'projectgenerator', '_', locale_path)
+        self.translator.load(qgis_locale, 'QgisModelBaker', '_', locale_path)
         QCoreApplication.installTranslator(self.translator)
 
         self.ili2db_configuration = BaseConfiguration()
         settings = QSettings()
-        settings.beginGroup('QgsProjectGenerator/ili2db')
+        settings.beginGroup('QgisModelBaker/ili2db')
         self.ili2db_configuration.restore(settings)
 
     def initGui(self):
-        self.__generate_action = QAction( QIcon(os.path.join(os.path.dirname(__file__), 'images/projectgenerator-icon.svg')),
+        pyplugin_installer.installer.initPluginInstaller()
+        pyplugin_installer.installer_data.plugins.rebuild()
+        if 'projectgenerator' in pyplugin_installer.installer_data.plugins.all().keys():
+            import qgis
+            pyplugin_installer.instance().uninstallPlugin('projectgenerator', quiet=True)
+
+        self.__generate_action = QAction( QIcon(os.path.join(os.path.dirname(__file__), 'images/QgisModelBaker-icon.svg')),
             self.tr('Generate'), None)
-        self.__export_action = QAction( QIcon(os.path.join(os.path.dirname(__file__), 'images/projectgenerator-xtf-export-icon.svg')),
+        self.__export_action = QAction( QIcon(os.path.join(os.path.dirname(__file__), 'images/QgisModelBaker-xtf-export-icon.svg')),
             self.tr('Export Interlis Transfer File (.xtf)'), None)
-        self.__importdata_action = QAction( QIcon(os.path.join(os.path.dirname(__file__), 'images/projectgenerator-xtf-import-icon.svg')),
+        self.__importdata_action = QAction( QIcon(os.path.join(os.path.dirname(__file__), 'images/QgisModelBaker-xtf-import-icon.svg')),
             self.tr('Import Interlis Transfer File (.xtf)'), None)
         self.__configure_action = QAction(
             self.tr('Settings'), None)
@@ -89,40 +97,40 @@ def initGui(self):
         self.__about_action.triggered.connect(self.show_about_dialog)
 
         self.iface.addPluginToDatabaseMenu(
-            self.tr('Project Generator'), self.__generate_action)
+            self.tr('Model Baker'), self.__generate_action)
         self.iface.addPluginToDatabaseMenu(
-            self.tr('Project Generator'), self.__importdata_action)
+            self.tr('Model Baker'), self.__importdata_action)
         self.iface.addPluginToDatabaseMenu(
-            self.tr('Project Generator'), self.__export_action)
+            self.tr('Model Baker'), self.__export_action)
         self.iface.addPluginToDatabaseMenu(
-            self.tr('Project Generator'), self.__configure_action)
+            self.tr('Model Baker'), self.__configure_action)
         self.iface.addPluginToDatabaseMenu(
-            self.tr('Project Generator'), self.__separator)
+            self.tr('Model Baker'), self.__separator)
         self.iface.addPluginToDatabaseMenu(
-            self.tr('Project Generator'), self.__help_action)
+            self.tr('Model Baker'), self.__help_action)
         self.iface.addPluginToDatabaseMenu(
-            self.tr('Project Generator'), self.__about_action)
+            self.tr('Model Baker'), self.__about_action)
 
-        self.toolbar = self.iface.addToolBar(self.tr('Project Generator'))
-        self.toolbar.setObjectName("ProjectGeneratorToolbar")
-        self.toolbar.setToolTip(self.tr('Project Generator Toolbar'))
+        self.toolbar = self.iface.addToolBar(self.tr('Model Baker'))
+        self.toolbar.setObjectName("ModelBakerToolbar")
+        self.toolbar.setToolTip(self.tr('Model Baker Toolbar'))
         self.toolbar.addAction(self.__generate_action)
         self.toolbar.addAction(self.__importdata_action)
         self.toolbar.addAction(self.__export_action)
 
     def unload(self):
         self.iface.removePluginDatabaseMenu(
-            self.tr('Project Generator'), self.__generate_action)
+            self.tr('Model Baker'), self.__generate_action)
         self.iface.removePluginDatabaseMenu(
-            self.tr('Project Generator'), self.__importdata_action)
+            self.tr('Model Baker'), self.__importdata_action)
         self.iface.removePluginDatabaseMenu(
-            self.tr('Project Generator'), self.__export_action)
+            self.tr('Model Baker'), self.__export_action)
         self.iface.removePluginDatabaseMenu(
-            self.tr('Project Generator'), self.__configure_action)
+            self.tr('Model Baker'), self.__configure_action)
         self.iface.removePluginDatabaseMenu(
-            self.tr('Project Generator'), self.__help_action)
+            self.tr('Model Baker'), self.__help_action)
         self.iface.removePluginDatabaseMenu(
-            self.tr('Project Generator'), self.__about_action)
+            self.tr('Model Baker'), self.__about_action)
         del self.__generate_action
         del self.__export_action
         del self.__importdata_action
@@ -138,7 +146,7 @@ def show_options_dialog(self):
         dlg = OptionsDialog(self.ili2db_configuration)
         if dlg.exec_():
             settings = QSettings()
-            settings.beginGroup('QgsProjectGenerator/ili2db')
+            settings.beginGroup('QgisModelBaker/ili2db')
             self.ili2db_configuration.save(settings)
 
     def show_export_dialog(self):
@@ -154,21 +162,21 @@ def show_help_documentation(self):
             'locale/userLocale')).name()[:2]
         if os_language in ['es', 'de']:
             webbrowser.open(
-                'https://opengisch.github.io/projectgenerator/docs/{}/'.format(os_language))
+                'https://opengisch.github.io/QgisModelBaker/docs/{}/'.format(os_language))
         else:
             webbrowser.open(
-                'https://opengisch.github.io/projectgenerator/docs/index.html')
+                'https://opengisch.github.io/QgisModelBaker/docs/index.html')
 
     def show_about_dialog(self):
         self.msg = QMessageBox()
         self.msg.setIcon(QMessageBox.Information)
         self.msg.setTextFormat(Qt.RichText)
-        self.msg.setWindowTitle(self.tr('About Project Generator'))
+        self.msg.setWindowTitle(self.tr('About Model Baker'))
         self.msg.setText(self.tr(
-            """<h1>Project Generator</h1>
+            """<h1>Model Baker</h1>
         <p align="justify">Configuring QGIS layers and forms manually is a tedious and error prone process. This plugin loads database schemas with various meta
         information to preconfigure the layer tree, widget configuration, relations and more.</p>
-        <p align="justify">This project is open source under the terms of the GPLv2 or later and the source code can be found on <a href="https://github.com/opengisch/projectgenerator">github</a>.</p>
+        <p align="justify">This project is open source under the terms of the GPLv2 or later and the source code can be found on <a href="https://github.com/opengisch/QgisModelBaker">github</a>.</p>
         <p align="justify">This plugin is developed by <a href="https://www.opengis.ch/">OPENGIS.ch</a> in collaboration with
         <a href="https://www.proadmintierra.info/">Agencia de Implementación (BSF-Swissphoto AG / INCIGE S.A.S.)</a>.</p></p>"""))
         self.msg.setStandardButtons(QMessageBox.Close)
@@ -179,7 +187,7 @@ def get_generator(self):
 
     def create_project(self, layers, relations, bags_of_enum, legend, auto_transaction=True, evaluate_default_values=True):
         """
-        Expose the main functionality from Project Generator to other plugins,
+        Expose the main functionality from Model Baker to other plugins,
         namely, create a QGIS project from objects obtained from the Generator
         class.
 
diff --git a/projectgenerator/tests/README.md b/QgisModelBaker/tests/README.md
similarity index 100%
rename from projectgenerator/tests/README.md
rename to QgisModelBaker/tests/README.md
diff --git a/projectgenerator/tests/test_domain_class_relations.py b/QgisModelBaker/tests/test_domain_class_relations.py
similarity index 99%
rename from projectgenerator/tests/test_domain_class_relations.py
rename to QgisModelBaker/tests/test_domain_class_relations.py
index 2f3eef113..8b793b5cb 100644
--- a/projectgenerator/tests/test_domain_class_relations.py
+++ b/QgisModelBaker/tests/test_domain_class_relations.py
@@ -24,9 +24,9 @@
 import nose2
 import logging
 
-from projectgenerator.libili2db import iliimporter
-from projectgenerator.tests.utils import iliimporter_config, testdata_path
-from projectgenerator.libqgsprojectgen.generator.generator import Generator
+from QgisModelBaker.libili2db import iliimporter
+from QgisModelBaker.tests.utils import iliimporter_config, testdata_path
+from QgisModelBaker.libqgsprojectgen.generator.generator import Generator
 from qgis.testing import unittest, start_app
 
 start_app()
diff --git a/projectgenerator/tests/test_dump.py b/QgisModelBaker/tests/test_dump.py
similarity index 92%
rename from projectgenerator/tests/test_dump.py
rename to QgisModelBaker/tests/test_dump.py
index 0a3fbdec9..9115bf5af 100644
--- a/projectgenerator/tests/test_dump.py
+++ b/QgisModelBaker/tests/test_dump.py
@@ -19,8 +19,8 @@
 
 import nose2
 
-from projectgenerator.tests.utils import testdata_path
-from projectgenerator.libqgsprojectgen.generator.generator import Generator
+from QgisModelBaker.tests.utils import testdata_path
+from QgisModelBaker.libqgsprojectgen.generator.generator import Generator
 from qgis.testing import unittest, start_app
 
 from subprocess import call
diff --git a/projectgenerator/tests/test_export.py b/QgisModelBaker/tests/test_export.py
similarity index 98%
rename from projectgenerator/tests/test_export.py
rename to QgisModelBaker/tests/test_export.py
index 22e0a6e54..4b7b43495 100644
--- a/projectgenerator/tests/test_export.py
+++ b/QgisModelBaker/tests/test_export.py
@@ -25,9 +25,9 @@
 import xml.etree.ElementTree as ET
 import logging
 
-from projectgenerator.libili2db import (iliexporter,
+from QgisModelBaker.libili2db import (iliexporter,
                                         iliimporter)
-from projectgenerator.tests.utils import (iliimporter_config,
+from QgisModelBaker.tests.utils import (iliimporter_config,
                                           iliexporter_config,
                                           ilidataimporter_config,
                                           testdata_path)
diff --git a/projectgenerator/tests/test_import.py b/QgisModelBaker/tests/test_import.py
similarity index 97%
rename from projectgenerator/tests/test_import.py
rename to QgisModelBaker/tests/test_import.py
index db9a291ec..669da2d56 100644
--- a/projectgenerator/tests/test_import.py
+++ b/QgisModelBaker/tests/test_import.py
@@ -26,8 +26,8 @@
 import psycopg2.extras
 import logging
 
-from projectgenerator.libili2db import iliimporter, iliimporter
-from projectgenerator.tests.utils import iliimporter_config, ilidataimporter_config, testdata_path
+from QgisModelBaker.libili2db import iliimporter, iliimporter
+from QgisModelBaker.tests.utils import iliimporter_config, ilidataimporter_config, testdata_path
 from qgis.testing import unittest, start_app
 from qgis import utils
 
diff --git a/projectgenerator/tests/test_libili2pg.py b/QgisModelBaker/tests/test_libili2pg.py
similarity index 79%
rename from projectgenerator/tests/test_libili2pg.py
rename to QgisModelBaker/tests/test_libili2pg.py
index 7ece79c98..5fd2fc5e3 100644
--- a/projectgenerator/tests/test_libili2pg.py
+++ b/QgisModelBaker/tests/test_libili2pg.py
@@ -1,8 +1,8 @@
 import qgis
 from qgis.testing import unittest, start_app
 start_app()
-from projectgenerator.libili2db import ilicache
-from projectgenerator.libili2db.ili2dbconfig import BaseConfiguration
+from QgisModelBaker.libili2db import ilicache
+from QgisModelBaker.libili2db.ili2dbconfig import BaseConfiguration
 
 import os
 import nose2
diff --git a/projectgenerator/tests/test_plugin.py b/QgisModelBaker/tests/test_plugin.py
similarity index 93%
rename from projectgenerator/tests/test_plugin.py
rename to QgisModelBaker/tests/test_plugin.py
index 93c46d7da..d30a1a2f7 100644
--- a/projectgenerator/tests/test_plugin.py
+++ b/QgisModelBaker/tests/test_plugin.py
@@ -19,4 +19,4 @@
 """
 
 import os
-from projectgenerator.qgs_project_generator import QgsProjectGeneratorPlugin
+from QgisModelBaker.qgismodelbaker import QgisModelBakerPlugin
diff --git a/projectgenerator/tests/test_projectgen.py b/QgisModelBaker/tests/test_projectgen.py
similarity index 99%
rename from projectgenerator/tests/test_projectgen.py
rename to QgisModelBaker/tests/test_projectgen.py
index c3400c3a5..9baee5c53 100644
--- a/projectgenerator/tests/test_projectgen.py
+++ b/QgisModelBaker/tests/test_projectgen.py
@@ -25,12 +25,12 @@
 import nose2
 import logging
 
-from projectgenerator.libili2db import iliimporter
-from projectgenerator.libqgsprojectgen.dataobjects import Project
-from projectgenerator.tests.utils import iliimporter_config, testdata_path
+from QgisModelBaker.libili2db import iliimporter
+from QgisModelBaker.libqgsprojectgen.dataobjects import Project
+from QgisModelBaker.tests.utils import iliimporter_config, testdata_path
 from qgis.testing import unittest, start_app
 from qgis.core import QgsProject, QgsEditFormConfig
-from projectgenerator.libqgsprojectgen.generator.generator import Generator
+from QgisModelBaker.libqgsprojectgen.generator.generator import Generator
 
 start_app()
 
diff --git a/projectgenerator/tests/test_projectgen_generic_databases.py b/QgisModelBaker/tests/test_projectgen_generic_databases.py
similarity index 97%
rename from projectgenerator/tests/test_projectgen_generic_databases.py
rename to QgisModelBaker/tests/test_projectgen_generic_databases.py
index 41985ab73..3a2ec48a0 100644
--- a/projectgenerator/tests/test_projectgen_generic_databases.py
+++ b/QgisModelBaker/tests/test_projectgen_generic_databases.py
@@ -26,11 +26,11 @@
 import psycopg2
 import psycopg2.extras
 
-from projectgenerator.libqgsprojectgen.dataobjects import Project
-from projectgenerator.tests.utils import testdata_path
+from QgisModelBaker.libqgsprojectgen.dataobjects import Project
+from QgisModelBaker.tests.utils import testdata_path
 from qgis.testing import unittest, start_app
 from qgis.core import QgsProject, QgsEditFormConfig
-from projectgenerator.libqgsprojectgen.generator.generator import Generator
+from QgisModelBaker.libqgsprojectgen.generator.generator import Generator
 
 start_app()
 
diff --git a/projectgenerator/tests/test_yaml.py b/QgisModelBaker/tests/test_yaml.py
similarity index 93%
rename from projectgenerator/tests/test_yaml.py
rename to QgisModelBaker/tests/test_yaml.py
index ea171df2e..f9811f5a7 100644
--- a/projectgenerator/tests/test_yaml.py
+++ b/QgisModelBaker/tests/test_yaml.py
@@ -2,7 +2,7 @@
 from qgis.testing import unittest
 import yaml
 
-from projectgenerator.yamltools.loader import InheritanceLoader
+from QgisModelBaker.yamltools.loader import InheritanceLoader
 
 
 class YamlInheritanceTest(unittest.TestCase):
diff --git a/projectgenerator/tests/test_z_geom.py b/QgisModelBaker/tests/test_z_geom.py
similarity index 92%
rename from projectgenerator/tests/test_z_geom.py
rename to QgisModelBaker/tests/test_z_geom.py
index cdbde5b69..2fba9da33 100644
--- a/projectgenerator/tests/test_z_geom.py
+++ b/QgisModelBaker/tests/test_z_geom.py
@@ -20,9 +20,9 @@
 import nose2
 import logging
 
-from projectgenerator.libili2db import iliimporter
-from projectgenerator.tests.utils import iliimporter_config, testdata_path
-from projectgenerator.libqgsprojectgen.generator.generator import Generator
+from QgisModelBaker.libili2db import iliimporter
+from QgisModelBaker.tests.utils import iliimporter_config, testdata_path
+from QgisModelBaker.libqgsprojectgen.generator.generator import Generator
 from qgis.testing import unittest, start_app
 from qgis.core import QgsWkbTypes
 
diff --git a/projectgenerator/tests/testdata/dumps/_nupla_dump b/QgisModelBaker/tests/testdata/dumps/_nupla_dump
similarity index 100%
rename from projectgenerator/tests/testdata/dumps/_nupla_dump
rename to QgisModelBaker/tests/testdata/dumps/_nupla_dump
diff --git a/projectgenerator/tests/testdata/geopackage/test_empty.gpkg b/QgisModelBaker/tests/testdata/geopackage/test_empty.gpkg
similarity index 100%
rename from projectgenerator/tests/testdata/geopackage/test_empty.gpkg
rename to QgisModelBaker/tests/testdata/geopackage/test_empty.gpkg
diff --git a/projectgenerator/tests/testdata/geopackage/test_export.gpkg b/QgisModelBaker/tests/testdata/geopackage/test_export.gpkg
similarity index 100%
rename from projectgenerator/tests/testdata/geopackage/test_export.gpkg
rename to QgisModelBaker/tests/testdata/geopackage/test_export.gpkg
diff --git a/projectgenerator/tests/testdata/geopackage/test_ogr_empty.gpkg b/QgisModelBaker/tests/testdata/geopackage/test_ogr_empty.gpkg
similarity index 100%
rename from projectgenerator/tests/testdata/geopackage/test_ogr_empty.gpkg
rename to QgisModelBaker/tests/testdata/geopackage/test_ogr_empty.gpkg
diff --git a/projectgenerator/tests/testdata/geopackage/test_relations.gpkg b/QgisModelBaker/tests/testdata/geopackage/test_relations.gpkg
similarity index 100%
rename from projectgenerator/tests/testdata/geopackage/test_relations.gpkg
rename to QgisModelBaker/tests/testdata/geopackage/test_relations.gpkg
diff --git a/projectgenerator/tests/testdata/ilimodels/CHBase_Part1_GEOMETRY_20110830.ili b/QgisModelBaker/tests/testdata/ilimodels/CHBase_Part1_GEOMETRY_20110830.ili
similarity index 100%
rename from projectgenerator/tests/testdata/ilimodels/CHBase_Part1_GEOMETRY_20110830.ili
rename to QgisModelBaker/tests/testdata/ilimodels/CHBase_Part1_GEOMETRY_20110830.ili
diff --git a/projectgenerator/tests/testdata/ilimodels/CHBase_Part2_LOCALISATION_20110830.ili b/QgisModelBaker/tests/testdata/ilimodels/CHBase_Part2_LOCALISATION_20110830.ili
similarity index 100%
rename from projectgenerator/tests/testdata/ilimodels/CHBase_Part2_LOCALISATION_20110830.ili
rename to QgisModelBaker/tests/testdata/ilimodels/CHBase_Part2_LOCALISATION_20110830.ili
diff --git a/projectgenerator/tests/testdata/ilimodels/CHBase_Part3_CATALOGUEOBJECTS_20110830.ili b/QgisModelBaker/tests/testdata/ilimodels/CHBase_Part3_CATALOGUEOBJECTS_20110830.ili
similarity index 100%
rename from projectgenerator/tests/testdata/ilimodels/CHBase_Part3_CATALOGUEOBJECTS_20110830.ili
rename to QgisModelBaker/tests/testdata/ilimodels/CHBase_Part3_CATALOGUEOBJECTS_20110830.ili
diff --git a/projectgenerator/tests/testdata/ilimodels/CHBase_Part4_ADMINISTRATIVEUNITS_20110830.ili b/QgisModelBaker/tests/testdata/ilimodels/CHBase_Part4_ADMINISTRATIVEUNITS_20110830.ili
similarity index 100%
rename from projectgenerator/tests/testdata/ilimodels/CHBase_Part4_ADMINISTRATIVEUNITS_20110830.ili
rename to QgisModelBaker/tests/testdata/ilimodels/CHBase_Part4_ADMINISTRATIVEUNITS_20110830.ili
diff --git a/projectgenerator/tests/testdata/ilimodels/CIAF_LADM/CIAF_LADM.ili b/QgisModelBaker/tests/testdata/ilimodels/CIAF_LADM/CIAF_LADM.ili
similarity index 100%
rename from projectgenerator/tests/testdata/ilimodels/CIAF_LADM/CIAF_LADM.ili
rename to QgisModelBaker/tests/testdata/ilimodels/CIAF_LADM/CIAF_LADM.ili
diff --git a/projectgenerator/tests/testdata/ilimodels/CIAF_LADM/Catastro_COL_ES.ili b/QgisModelBaker/tests/testdata/ilimodels/CIAF_LADM/Catastro_COL_ES.ili
similarity index 100%
rename from projectgenerator/tests/testdata/ilimodels/CIAF_LADM/Catastro_COL_ES.ili
rename to QgisModelBaker/tests/testdata/ilimodels/CIAF_LADM/Catastro_COL_ES.ili
diff --git a/projectgenerator/tests/testdata/ilimodels/CIAF_LADM/ISO19107_V1_MAGNABOG.ili b/QgisModelBaker/tests/testdata/ilimodels/CIAF_LADM/ISO19107_V1_MAGNABOG.ili
similarity index 100%
rename from projectgenerator/tests/testdata/ilimodels/CIAF_LADM/ISO19107_V1_MAGNABOG.ili
rename to QgisModelBaker/tests/testdata/ilimodels/CIAF_LADM/ISO19107_V1_MAGNABOG.ili
diff --git a/projectgenerator/tests/testdata/ilimodels/CoordSys-20151124.ili b/QgisModelBaker/tests/testdata/ilimodels/CoordSys-20151124.ili
similarity index 100%
rename from projectgenerator/tests/testdata/ilimodels/CoordSys-20151124.ili
rename to QgisModelBaker/tests/testdata/ilimodels/CoordSys-20151124.ili
diff --git a/projectgenerator/tests/testdata/ilimodels/ExceptionalLoadsRoute_V1.ili b/QgisModelBaker/tests/testdata/ilimodels/ExceptionalLoadsRoute_V1.ili
similarity index 100%
rename from projectgenerator/tests/testdata/ilimodels/ExceptionalLoadsRoute_V1.ili
rename to QgisModelBaker/tests/testdata/ilimodels/ExceptionalLoadsRoute_V1.ili
diff --git a/projectgenerator/tests/testdata/ilimodels/Hazard_Mapping_V1_2.ili b/QgisModelBaker/tests/testdata/ilimodels/Hazard_Mapping_V1_2.ili
similarity index 100%
rename from projectgenerator/tests/testdata/ilimodels/Hazard_Mapping_V1_2.ili
rename to QgisModelBaker/tests/testdata/ilimodels/Hazard_Mapping_V1_2.ili
diff --git a/projectgenerator/tests/testdata/ilimodels/KbS_V1_3.ili b/QgisModelBaker/tests/testdata/ilimodels/KbS_V1_3.ili
similarity index 100%
rename from projectgenerator/tests/testdata/ilimodels/KbS_V1_3.ili
rename to QgisModelBaker/tests/testdata/ilimodels/KbS_V1_3.ili
diff --git a/projectgenerator/tests/testdata/ilimodels/Units-20120220.ili b/QgisModelBaker/tests/testdata/ilimodels/Units-20120220.ili
similarity index 100%
rename from projectgenerator/tests/testdata/ilimodels/Units-20120220.ili
rename to QgisModelBaker/tests/testdata/ilimodels/Units-20120220.ili
diff --git a/projectgenerator/tests/testdata/ilimodels/ZG_Abfallsammelstellen_ZEBA_V1.ili b/QgisModelBaker/tests/testdata/ilimodels/ZG_Abfallsammelstellen_ZEBA_V1.ili
similarity index 100%
rename from projectgenerator/tests/testdata/ilimodels/ZG_Abfallsammelstellen_ZEBA_V1.ili
rename to QgisModelBaker/tests/testdata/ilimodels/ZG_Abfallsammelstellen_ZEBA_V1.ili
diff --git a/projectgenerator/tests/testdata/ilimodels/ZG_Naturschutz_und_Erholungsinfrastruktur_V1.ili b/QgisModelBaker/tests/testdata/ilimodels/ZG_Naturschutz_und_Erholungsinfrastruktur_V1.ili
similarity index 100%
rename from projectgenerator/tests/testdata/ilimodels/ZG_Naturschutz_und_Erholungsinfrastruktur_V1.ili
rename to QgisModelBaker/tests/testdata/ilimodels/ZG_Naturschutz_und_Erholungsinfrastruktur_V1.ili
diff --git a/projectgenerator/tests/testdata/ilimodels/repo/CHBase_Part1_GEOMETRY_20110830.ili b/QgisModelBaker/tests/testdata/ilimodels/repo/CHBase_Part1_GEOMETRY_20110830.ili
similarity index 100%
rename from projectgenerator/tests/testdata/ilimodels/repo/CHBase_Part1_GEOMETRY_20110830.ili
rename to QgisModelBaker/tests/testdata/ilimodels/repo/CHBase_Part1_GEOMETRY_20110830.ili
diff --git a/projectgenerator/tests/testdata/ilimodels/repo/Units-20120220.ili b/QgisModelBaker/tests/testdata/ilimodels/repo/Units-20120220.ili
similarity index 100%
rename from projectgenerator/tests/testdata/ilimodels/repo/Units-20120220.ili
rename to QgisModelBaker/tests/testdata/ilimodels/repo/Units-20120220.ili
diff --git a/projectgenerator/tests/testdata/ilimodels/repo/ZG_Naturschutz_und_Erholung_V1_0.ili b/QgisModelBaker/tests/testdata/ilimodels/repo/ZG_Naturschutz_und_Erholung_V1_0.ili
similarity index 100%
rename from projectgenerator/tests/testdata/ilimodels/repo/ZG_Naturschutz_und_Erholung_V1_0.ili
rename to QgisModelBaker/tests/testdata/ilimodels/repo/ZG_Naturschutz_und_Erholung_V1_0.ili
diff --git a/projectgenerator/tests/testdata/toml/ExceptionalLoadsRoute_V1.toml b/QgisModelBaker/tests/testdata/toml/ExceptionalLoadsRoute_V1.toml
similarity index 100%
rename from projectgenerator/tests/testdata/toml/ExceptionalLoadsRoute_V1.toml
rename to QgisModelBaker/tests/testdata/toml/ExceptionalLoadsRoute_V1.toml
diff --git a/projectgenerator/tests/testdata/toml/hidden_fields.toml b/QgisModelBaker/tests/testdata/toml/hidden_fields.toml
similarity index 100%
rename from projectgenerator/tests/testdata/toml/hidden_fields.toml
rename to QgisModelBaker/tests/testdata/toml/hidden_fields.toml
diff --git a/projectgenerator/tests/testdata/xtf/test_ciaf_ladm.xtf b/QgisModelBaker/tests/testdata/xtf/test_ciaf_ladm.xtf
similarity index 100%
rename from projectgenerator/tests/testdata/xtf/test_ciaf_ladm.xtf
rename to QgisModelBaker/tests/testdata/xtf/test_ciaf_ladm.xtf
diff --git a/projectgenerator/tests/testdata/xtf/test_empty_ciaf_ladm.xtf b/QgisModelBaker/tests/testdata/xtf/test_empty_ciaf_ladm.xtf
similarity index 100%
rename from projectgenerator/tests/testdata/xtf/test_empty_ciaf_ladm.xtf
rename to QgisModelBaker/tests/testdata/xtf/test_empty_ciaf_ladm.xtf
diff --git a/projectgenerator/tests/utils.py b/QgisModelBaker/tests/utils.py
similarity index 95%
rename from projectgenerator/tests/utils.py
rename to QgisModelBaker/tests/utils.py
index 93b20824d..06a64535b 100644
--- a/projectgenerator/tests/utils.py
+++ b/QgisModelBaker/tests/utils.py
@@ -19,7 +19,7 @@
 """
 import os
 
-from projectgenerator.libili2db.ili2dbconfig import SchemaImportConfiguration, ExportConfiguration, ImportDataConfiguration, BaseConfiguration
+from QgisModelBaker.libili2db.ili2dbconfig import SchemaImportConfiguration, ExportConfiguration, ImportDataConfiguration, BaseConfiguration
 
 
 def iliimporter_config(tool_name='ili2pg', modeldir=None):
diff --git a/projectgenerator/ui/custom_model_dir.ui b/QgisModelBaker/ui/custom_model_dir.ui
similarity index 100%
rename from projectgenerator/ui/custom_model_dir.ui
rename to QgisModelBaker/ui/custom_model_dir.ui
diff --git a/projectgenerator/ui/export.ui b/QgisModelBaker/ui/export.ui
similarity index 99%
rename from projectgenerator/ui/export.ui
rename to QgisModelBaker/ui/export.ui
index fa1cc02f5..36a110584 100644
--- a/projectgenerator/ui/export.ui
+++ b/QgisModelBaker/ui/export.ui
@@ -294,7 +294,7 @@
  <customwidgets>
   <customwidget>
    <class>ModelListView</class>
-   <header>projectgenerator.gui.options</header>
+   <header>QgisModelBaker.gui.options</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/projectgenerator/ui/generate_project.ui b/QgisModelBaker/ui/generate_project.ui
similarity index 99%
rename from projectgenerator/ui/generate_project.ui
rename to QgisModelBaker/ui/generate_project.ui
index d2212b64c..6b207bc0c 100644
--- a/projectgenerator/ui/generate_project.ui
+++ b/QgisModelBaker/ui/generate_project.ui
@@ -368,7 +368,7 @@
   <customwidget>
    <class>CompletionLineEdit</class>
    <extends></extends>
-   <header>projectgenerator.gui.options</header>
+   <header>QgisModelBaker.gui.options</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/projectgenerator/ui/ili2db_options.ui b/QgisModelBaker/ui/ili2db_options.ui
similarity index 100%
rename from projectgenerator/ui/ili2db_options.ui
rename to QgisModelBaker/ui/ili2db_options.ui
diff --git a/projectgenerator/ui/import_data.ui b/QgisModelBaker/ui/import_data.ui
similarity index 99%
rename from projectgenerator/ui/import_data.ui
rename to QgisModelBaker/ui/import_data.ui
index 537008451..ed2550968 100644
--- a/projectgenerator/ui/import_data.ui
+++ b/QgisModelBaker/ui/import_data.ui
@@ -339,7 +339,7 @@
   <customwidget>
    <class>CompletionLineEdit</class>
    <extends></extends>
-   <header>projectgenerator.gui.options</header>
+   <header>QgisModelBaker.gui.options</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/projectgenerator/ui/multiple_models.ui b/QgisModelBaker/ui/multiple_models.ui
similarity index 100%
rename from projectgenerator/ui/multiple_models.ui
rename to QgisModelBaker/ui/multiple_models.ui
diff --git a/projectgenerator/ui/options.ui b/QgisModelBaker/ui/options.ui
similarity index 100%
rename from projectgenerator/ui/options.ui
rename to QgisModelBaker/ui/options.ui
diff --git a/projectgenerator/utils/__init__.py b/QgisModelBaker/utils/__init__.py
similarity index 100%
rename from projectgenerator/utils/__init__.py
rename to QgisModelBaker/utils/__init__.py
diff --git a/projectgenerator/utils/qgis_utils.py b/QgisModelBaker/utils/qgis_utils.py
similarity index 100%
rename from projectgenerator/utils/qgis_utils.py
rename to QgisModelBaker/utils/qgis_utils.py
diff --git a/projectgenerator/utils/qt_utils.py b/QgisModelBaker/utils/qt_utils.py
similarity index 96%
rename from projectgenerator/utils/qt_utils.py
rename to QgisModelBaker/utils/qt_utils.py
index e6bae5ab9..7833e1152 100644
--- a/projectgenerator/utils/qt_utils.py
+++ b/QgisModelBaker/utils/qt_utils.py
@@ -46,8 +46,8 @@ def selectFileName(line_edit_widget, title, file_filter, parent):
     line_edit_widget.setText(filename)
 
 
-def make_file_selector(widget, title=QCoreApplication.translate('projectgenerator', 'Open File'),
-                       file_filter=QCoreApplication.translate('projectgenerator', 'Any file(*)'), parent=None):
+def make_file_selector(widget, title=QCoreApplication.translate('QgisModelBaker', 'Open File'),
+                       file_filter=QCoreApplication.translate('QgisModelBaker', 'Any file(*)'), parent=None):
     return partial(selectFileName, line_edit_widget=widget, title=title, file_filter=file_filter, parent=parent)
 
 
@@ -67,8 +67,8 @@ def selectFileNameToSave(line_edit_widget, title, file_filter, parent, extension
     line_edit_widget.setText(filename)
 
 
-def make_save_file_selector(widget, title=QCoreApplication.translate('projectgenerator', 'Open File'),
-                            file_filter=QCoreApplication.translate('projectgenerator', 'Any file(*)'), parent=None,
+def make_save_file_selector(widget, title=QCoreApplication.translate('QgisModelBaker', 'Open File'),
+                            file_filter=QCoreApplication.translate('QgisModelBaker', 'Any file(*)'), parent=None,
                             extension='', extensions=None):
     return partial(selectFileNameToSave, line_edit_widget=widget, title=title, file_filter=file_filter, parent=parent,
                    extension=extension, extensions=extensions)
@@ -80,7 +80,7 @@ def selectFolder(line_edit_widget, title, parent):
     line_edit_widget.setText(foldername)
 
 
-def make_folder_selector(widget, title=QCoreApplication.translate('projectgenerator', 'Open Folder'), parent=None):
+def make_folder_selector(widget, title=QCoreApplication.translate('QgisModelBaker', 'Open Folder'), parent=None):
     return partial(selectFolder, line_edit_widget=widget, title=title, parent=parent)
 
 class NetworkError(RuntimeError):
diff --git a/projectgenerator/utils/ui.py b/QgisModelBaker/utils/ui.py
similarity index 100%
rename from projectgenerator/utils/ui.py
rename to QgisModelBaker/utils/ui.py
diff --git a/projectgenerator/yamltools/__init__.py b/QgisModelBaker/yamltools/__init__.py
similarity index 100%
rename from projectgenerator/yamltools/__init__.py
rename to QgisModelBaker/yamltools/__init__.py
diff --git a/projectgenerator/yamltools/loader.py b/QgisModelBaker/yamltools/loader.py
similarity index 100%
rename from projectgenerator/yamltools/loader.py
rename to QgisModelBaker/yamltools/loader.py
diff --git a/README.md b/README.md
index 0fad5a11b..772b0e04e 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,6 @@ the additional meta information to configure the user interface even better.
 We love to be multilingual!
 
 Translating the plugin is done on
-[Transifex](https://www.transifex.com/opengisch/projectgenerator/languages/). If
+[Transifex](https://www.transifex.com/opengisch/QgisModelBaker/languages/). If
 you would like to help translating this plugin into an existing or a new language,
 please create a Transifex account and request access to the team.
diff --git a/projectgenerator/metadata.txt b/projectgenerator/metadata.txt
deleted file mode 100644
index 2124703e1..000000000
--- a/projectgenerator/metadata.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-[general]
-name=QgsProjectGenerator
-description=QGIS Project Generator
-version=3.2.3
-icon=images/projectgenerator-icon.svg
-qgisMinimumVersion=3.0
-qgisMaximumVersion=3.99
-author=OPENGIS.ch GmbH in collaboration with Swissphoto BSF
-email=info@opengis.ch
-about=Creates QGIS Projects from Interlis files
-tracker=https://github.com/opengisch/projectgenerator/issues
-repository=https://github.com/opengisch/projectgenerator
-experimental=False
-deprecated=False
diff --git a/scripts/update-strings.sh b/scripts/update-strings.sh
index 25185d733..c8b796e0f 100755
--- a/scripts/update-strings.sh
+++ b/scripts/update-strings.sh
@@ -4,7 +4,7 @@ LOCALES=$*
 # Get newest .py files so we don't update strings unnecessarily
 
 CHANGED_FILES=0
-PYTHON_FILES=`find projectgenerator/ -regextype sed -regex ".*\.\(py\|ui\)$" -type f`
+PYTHON_FILES=`find QgisModelBaker/ -regextype sed -regex ".*\.\(py\|ui\)$" -type f`
 for PYTHON_FILE in $PYTHON_FILES
 do
   CHANGED=$(stat -c %Y $PYTHON_FILE)
@@ -21,7 +21,7 @@ mkdir -p i18n
 UPDATE=false
 for LOCALE in ${LOCALES}
 do
-  TRANSLATION_FILE="i18n/projectgenerator_$LOCALE.ts"
+  TRANSLATION_FILE="i18n/QgisModelBaker_$LOCALE.ts"
   if [ ! -f ${TRANSLATION_FILE} ]
   then
     # Force translation string collection as we have a new language file
@@ -57,7 +57,7 @@ then
   do
     # Note we don't use pylupdate with qt .pro file approach as it is flakey
     # about what is made available.
-    pylupdate5 -noobsolete ${PYTHON_FILES} -ts i18n/projectgenerator_${LOCALE}.ts
+    pylupdate5 -noobsolete ${PYTHON_FILES} -ts i18n/QgisModelBaker_${LOCALE}.ts
   done
   git checkout -- .
 else