diff --git a/.github/workflows/whitespace_checks.yml b/.github/workflows/whitespace_checks.yml
index b5fcc02e5..ea8d41e3b 100644
--- a/.github/workflows/whitespace_checks.yml
+++ b/.github/workflows/whitespace_checks.yml
@@ -92,7 +92,7 @@ jobs:
       - name: Check indent spaces
         run: |
           if git ls-files |\
-            grep -E '^src/.*\.cpp$|^src/.*\.[ch]$|\.lua' |\
+            grep -E '^src/.*\.cpp$|^src/.*\.[ch]$|\.lua$' |\
             xargs grep -n -P '^\t*[ ]';\
           then\
             echo -e "\033[0;31mFound incorrect indent whitespaces";\
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 31059d51f..1bf2effd1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -265,8 +265,8 @@ install(FILES "minetest.conf.example" DESTINATION "${EXAMPLE_CONF_DIR}")
 
 if(UNIX AND NOT APPLE)
 	install(FILES "doc/luanti.6" "doc/luantiserver.6" DESTINATION "${MANDIR}/man6")
-	install(FILES "misc/net.minetest.minetest.desktop" DESTINATION "${XDG_APPS_DIR}")
-	install(FILES "misc/net.minetest.minetest.metainfo.xml" DESTINATION "${METAINFODIR}")
+	install(FILES "misc/org.luanti.luanti.desktop" DESTINATION "${XDG_APPS_DIR}")
+	install(FILES "misc/org.luanti.luanti.metainfo.xml" DESTINATION "${METAINFODIR}")
 	install(FILES "misc/luanti.svg" DESTINATION "${ICONDIR}/hicolor/scalable/apps")
 	install(FILES "misc/luanti-xorg-icon-128.png"
 		DESTINATION "${ICONDIR}/hicolor/128x128/apps"
diff --git a/misc/AppImageBuilder.yml b/misc/AppImageBuilder.yml
index 6bd9edd2a..4862e58f1 100644
--- a/misc/AppImageBuilder.yml
+++ b/misc/AppImageBuilder.yml
@@ -3,7 +3,7 @@ version: 1
 AppDir:
   path: AppDir
   app_info:
-    id: net.minetest.minetest
+    id: org.luanti.luanti
     name: Luanti
     icon: luanti
     version: !ENV ${VERSION}
@@ -57,4 +57,4 @@ script: |
     mkdir -p AppDir/usr/share/luanti/misc
     cp AppDir/usr/share/icons/hicolor/128x128/apps/luanti.png AppDir/usr/share/luanti/misc/luanti-xorg-icon-128.png
     # Validation issues
-    sed -i '/PrefersNonDefaultGPU/d' AppDir/usr/share/applications/net.minetest.minetest.desktop
+    sed -i '/PrefersNonDefaultGPU/d' AppDir/usr/share/applications/org.luanti.luanti.desktop
diff --git a/misc/net.minetest.minetest.desktop b/misc/org.luanti.luanti.desktop
similarity index 100%
rename from misc/net.minetest.minetest.desktop
rename to misc/org.luanti.luanti.desktop
diff --git a/misc/net.minetest.minetest.metainfo.xml b/misc/org.luanti.luanti.metainfo.xml
similarity index 96%
rename from misc/net.minetest.minetest.metainfo.xml
rename to misc/org.luanti.luanti.metainfo.xml
index 59778bfd4..0c5b1a717 100644
--- a/misc/net.minetest.minetest.metainfo.xml
+++ b/misc/org.luanti.luanti.metainfo.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop-application">
-    <id>net.minetest.minetest</id>
+    <id>org.luanti.luanti</id>
+    <provides>
+        <id>net.minetest.minetest</id>
+    </provides>
+    <replaces>
+        <id>net.minetest.minetest</id>
+    </replaces>
 
     <name>Luanti</name>
     <summary>Block-based multiplayer game platform</summary>
@@ -10,7 +16,7 @@
     <metadata_license>CC0-1.0</metadata_license>
     <project_license>LGPL-2.1+ AND CC-BY-SA-3.0 AND MIT AND Apache-2.0</project_license>
 
-    <developer id="net.minetest">
+    <developer id="org.luanti">
         <name>Luanti Team</name>
     </developer>
 
@@ -119,7 +125,7 @@
         </ul>
     </description>
 
-    <launchable type="desktop-id">net.minetest.minetest.desktop</launchable>
+    <launchable type="desktop-id">org.luanti.luanti.desktop</launchable>
     <screenshots>
         <screenshot type="default">
             <image>https://www.luanti.org/media/gallery/1.jpg</image>