diff --git a/misc/dist/linux/net.relintai.pandemonium.Pandemonium.appdata.xml b/misc/dist/linux/net.relintai.pandemonium.Pandemonium.appdata.xml
index 83da5ac10..cbcada1f4 100644
--- a/misc/dist/linux/net.relintai.pandemonium.Pandemonium.appdata.xml
+++ b/misc/dist/linux/net.relintai.pandemonium.Pandemonium.appdata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2017-2022 Rémi Verschelde <remi@godotengine.org> -->
 <component type="desktop">
-  <id>net.relintai.pandemonium.Pandemonium</id>
+  <id>org.pandemoniumengine.pandemonium.Pandemonium</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>MIT</project_license>
   <name>Pandemonium Engine</name>
   <summary>Multi-platform 2D and 3D game engine with a feature-rich editor</summary>
-  ​<launchable type="desktop-id">net.relintai.pandemonium.Pandemonium.desktop</launchable>
+  ​<launchable type="desktop-id">org.pandemoniumengine.pandemonium.Pandemonium.desktop</launchable>
   <description>
     <p>
       Pandemonium is an advanced, feature-packed, multi-platform 2D and 3D game
diff --git a/misc/scripts/codespell.sh b/misc/scripts/codespell.sh
index 2b973d6a2..36510c294 100755
--- a/misc/scripts/codespell.sh
+++ b/misc/scripts/codespell.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-SKIP_LIST="./.git,./bin,./thirdparty,*.gen.*,*.po,*.pot,package-lock.json,./core/string/locales.h,./DONORS.md,./misc/dist/linux/net.relintai.pandemonium.Pandemonium.desktop,./misc/scripts/codespell.sh,./modules/database_sqlite/sqlite/*,./modules/lz4/thirdparty/*,./modules/web/html/libs/*,./modules/mesh_utils/xatlas/*,./modules/mesh_utils/delaunay/*"
+SKIP_LIST="./.git,./bin,./thirdparty,*.gen.*,*.po,*.pot,package-lock.json,./core/string/locales.h,./DONORS.md,./misc/dist/linux/org.pandemoniumengine.pandemonium.Pandemonium.desktop,./misc/scripts/codespell.sh,./modules/database_sqlite/sqlite/*,./modules/lz4/thirdparty/*,./modules/web/html/libs/*,./modules/mesh_utils/xatlas/*,./modules/mesh_utils/delaunay/*"
 IGNORE_LIST="ba,childs,commiting,complies,curvelinear,doubleclick,expct,fave,findn,gird,inout,leapyear,lod,nd,numer,ois,readded,ro,statics,switchs,te,varius,varn,translater,acount,matc,ede"
 
 codespell -w -q 3 -S "${SKIP_LIST}" -L "${IGNORE_LIST}"
diff --git a/platform/android/java/lib/AndroidManifest.xml b/platform/android/java/lib/AndroidManifest.xml
index d354656a9..c6542cd27 100644
--- a/platform/android/java/lib/AndroidManifest.xml
+++ b/platform/android/java/lib/AndroidManifest.xml
@@ -8,7 +8,7 @@
 
         <!-- Records the version of the Pandemonium library -->
         <meta-data
-            android:name="net.relintai.pandemonium.library.version"
+            android:name="org.pandemoniumengine.pandemonium.library.version"
             android:value="${pandemoniumLibraryVersion}" />
 
         <service android:name=".PandemoniumDownloaderService" />
diff --git a/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/plugin/PandemoniumPlugin.java b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/plugin/PandemoniumPlugin.java
index bf72c6a64..efb60911e 100644
--- a/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/plugin/PandemoniumPlugin.java
+++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/plugin/PandemoniumPlugin.java
@@ -65,7 +65,7 @@ import org.pandemoniumengine.pandemonium.Pandemonium;
  * A stable version is available for each release.
  * <p>
  * - The library must include a <meta-data> tag in its manifest file setup as follow:
- * <meta-data android:name="net.relintai.pandemonium.plugin.v1.[PluginName]" android:value="[plugin.init.ClassFullName]" />
+ * <meta-data android:name="org.pandemoniumengine.pandemonium.plugin.v1.[PluginName]" android:value="[plugin.init.ClassFullName]" />
  * Where:
  * - 'PluginName' is the name of the plugin.
  * - 'plugin.init.ClassFullName' is the full name (package + class name) of the plugin class
diff --git a/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/plugin/PandemoniumPluginRegistry.java b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/plugin/PandemoniumPluginRegistry.java
index c11e8fd77..0310d84af 100644
--- a/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/plugin/PandemoniumPluginRegistry.java
+++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/plugin/PandemoniumPluginRegistry.java
@@ -53,7 +53,7 @@ import org.pandemoniumengine.pandemonium.Pandemonium;
 public final class PandemoniumPluginRegistry {
 	private static final String TAG = PandemoniumPluginRegistry.class.getSimpleName();
 
-	private static final String PANDEMONIUM_PLUGIN_V1_NAME_PREFIX = "net.relintai.pandemonium.plugin.v1.";
+	private static final String PANDEMONIUM_PLUGIN_V1_NAME_PREFIX = "org.pandemoniumengine.pandemonium.plugin.v1.";
 
 	private static PandemoniumPluginRegistry instance;
 	private final ConcurrentHashMap<String, PandemoniumPlugin> registry;