diff --git a/.gitmodules b/.gitmodules
index 2c4816801c..67b820a247 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,4 +3,4 @@
 	url = https://github.com/pypeclub/avalon-core.git
 [submodule "repos/avalon-unreal-integration"]
 	path = repos/avalon-unreal-integration
-	url = https://github.com/pypeclub/avalon-unreal-integration.git
+	url = https://github.com/pypeclub/avalon-unreal-integration.git
\ No newline at end of file
diff --git a/openpype/modules/base.py b/openpype/modules/base.py
index 6c86557337..213a7681f5 100644
--- a/openpype/modules/base.py
+++ b/openpype/modules/base.py
@@ -35,7 +35,7 @@ DEFAULT_OPENPYPE_MODULES = (
     "log_viewer",
     "deadline",
     "muster",
-    "royal_render",
+    "royalrender",
     "python_console_interpreter",
     "ftrack",
     "slack",
diff --git a/openpype/modules/default_modules/ftrack/python2_vendor/arrow b/openpype/modules/default_modules/ftrack/python2_vendor/arrow
deleted file mode 160000
index b746fedf72..0000000000
--- a/openpype/modules/default_modules/ftrack/python2_vendor/arrow
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b746fedf7286c3755a46f07ab72f4c414cd41fc0
diff --git a/openpype/modules/default_modules/ftrack/python2_vendor/ftrack-python-api b/openpype/modules/default_modules/ftrack/python2_vendor/ftrack-python-api
deleted file mode 160000
index d277f474ab..0000000000
--- a/openpype/modules/default_modules/ftrack/python2_vendor/ftrack-python-api
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d277f474ab016e7b53479c36af87cb861d0cc53e
diff --git a/openpype/modules/royal_render/__init__.py b/openpype/modules/royalrender/__init__.py
similarity index 100%
rename from openpype/modules/royal_render/__init__.py
rename to openpype/modules/royalrender/__init__.py
diff --git a/openpype/modules/royal_render/api.py b/openpype/modules/royalrender/api.py
similarity index 100%
rename from openpype/modules/royal_render/api.py
rename to openpype/modules/royalrender/api.py
diff --git a/openpype/modules/royal_render/plugins/publish/collect_default_rr_path.py b/openpype/modules/royalrender/plugins/publish/collect_default_rr_path.py
similarity index 100%
rename from openpype/modules/royal_render/plugins/publish/collect_default_rr_path.py
rename to openpype/modules/royalrender/plugins/publish/collect_default_rr_path.py
diff --git a/openpype/modules/royal_render/plugins/publish/collect_rr_path_from_instance.py b/openpype/modules/royalrender/plugins/publish/collect_rr_path_from_instance.py
similarity index 100%
rename from openpype/modules/royal_render/plugins/publish/collect_rr_path_from_instance.py
rename to openpype/modules/royalrender/plugins/publish/collect_rr_path_from_instance.py
diff --git a/openpype/modules/royal_render/plugins/publish/collect_sequences_from_job.py b/openpype/modules/royalrender/plugins/publish/collect_sequences_from_job.py
similarity index 100%
rename from openpype/modules/royal_render/plugins/publish/collect_sequences_from_job.py
rename to openpype/modules/royalrender/plugins/publish/collect_sequences_from_job.py
diff --git a/openpype/modules/royal_render/royal_render_module.py b/openpype/modules/royalrender/royal_render_module.py
similarity index 100%
rename from openpype/modules/royal_render/royal_render_module.py
rename to openpype/modules/royalrender/royal_render_module.py
diff --git a/openpype/modules/royal_render/rr_job.py b/openpype/modules/royalrender/rr_job.py
similarity index 100%
rename from openpype/modules/royal_render/rr_job.py
rename to openpype/modules/royalrender/rr_job.py
diff --git a/openpype/modules/royal_render/rr_root/README.md b/openpype/modules/royalrender/rr_root/README.md
similarity index 100%
rename from openpype/modules/royal_render/rr_root/README.md
rename to openpype/modules/royalrender/rr_root/README.md
diff --git a/openpype/modules/royal_render/rr_root/plugins/control_job/perjob/m50__openpype_publish_render.py b/openpype/modules/royalrender/rr_root/plugins/control_job/perjob/m50__openpype_publish_render.py
similarity index 100%
rename from openpype/modules/royal_render/rr_root/plugins/control_job/perjob/m50__openpype_publish_render.py
rename to openpype/modules/royalrender/rr_root/plugins/control_job/perjob/m50__openpype_publish_render.py