diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
index d8d51ceedf..7e8f445512 100644
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -105,7 +105,7 @@ install_helper(
 
 if(NOT APPLE)
   install_helper(
-    FILES ${CMAKE_CURRENT_SOURCE_DIR}/io.neovim.nvim.desktop
+    FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.neovim.nvim.desktop
     DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
 endif()
 
diff --git a/runtime/io.neovim.nvim.appdata.xml b/runtime/org.neovim.nvim.appdata.xml
similarity index 96%
rename from runtime/io.neovim.nvim.appdata.xml
rename to runtime/org.neovim.nvim.appdata.xml
index c55dbdd521..0633abfa24 100644
--- a/runtime/io.neovim.nvim.appdata.xml
+++ b/runtime/org.neovim.nvim.appdata.xml
@@ -7,7 +7,7 @@
     https://github.com/flathub/io.neovim.nvim
 -->
 <component type="desktop-application">
-  <id>io.neovim.nvim</id>
+  <id>org.neovim.nvim</id>
   <translation type="gettext">nvim</translation>
   <project_license>Apache-2.0</project_license>
   <metadata_license>CC0-1.0</metadata_license>
@@ -18,7 +18,7 @@
     <p>Neovim is a refactor of the Vim text editor designed to encourage new features, advanced UIs, and powerful extensions.</p>
   </description>
 
-  <developer id="io.neovim">
+  <developer id="org.neovim">
     <name>Neovim contributors</name>
   </developer>
 
@@ -75,7 +75,7 @@
   </releases>
 
   <content_rating type="oars-1.1"/>
-  <launchable type="desktop-id">io.neovim.nvim.desktop</launchable>
+  <launchable type="desktop-id">org.neovim.nvim.desktop</launchable>
   <url type="homepage">https://neovim.io/</url>
   <url type="bugtracker">https://github.com/neovim/neovim/issues</url>
   <url type="faq">https://neovim.io/doc/user/faq.html</url>
diff --git a/runtime/io.neovim.nvim.desktop b/runtime/org.neovim.nvim.desktop
similarity index 100%
rename from runtime/io.neovim.nvim.desktop
rename to runtime/org.neovim.nvim.desktop
diff --git a/scripts/genappimage.sh b/scripts/genappimage.sh
index 29edc01950..38129d090b 100755
--- a/scripts/genappimage.sh
+++ b/scripts/genappimage.sh
@@ -16,7 +16,7 @@ ARCH_OUTPUT=$ARCH
 TAG=$1
 
 # App name
-APP=io.neovim.nvim
+APP=org.neovim.nvim
 
 ROOT_DIR="$(git rev-parse --show-toplevel)"
 APP_BUILD_DIR="$ROOT_DIR/build"
diff --git a/scripts/release.sh b/scripts/release.sh
index f7dd151efe..6d4a53a87e 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -12,7 +12,7 @@
 #     - CMakeLists.txt: Unset NVIM_VERSION_PRERELEASE
 #     - CMakeLists.txt: Unset NVIM_API_PRERELEASE
 #     - Create test/functional/fixtures/api_level_N.mpack
-#     - Add date and version to runtime/io.neovim.nvim.appdata.xml
+#     - Add date and version to runtime/org.neovim.nvim.appdata.xml
 #     - Tag the commit.
 #   Create the "version bump" commit:
 #     - CMakeLists.txt: Set NVIM_VERSION_PRERELEASE to "-dev"
@@ -64,8 +64,8 @@ _do_release_commit() {
   fi
 
   $__sed -i.bk 's,(<releases>),\1\
-    <release date="'"${__DATE}"'" version="'"${__VERSION}"'"/>,' runtime/io.neovim.nvim.appdata.xml
-  git add runtime/io.neovim.nvim.appdata.xml
+    <release date="'"${__DATE}"'" version="'"${__VERSION}"'"/>,' runtime/org.neovim.nvim.appdata.xml
+  git add runtime/org.neovim.nvim.appdata.xml
 
   if ! test "$ARG1" = '--use-current-commit' ; then
     echo "Building changelog since ${__LAST_TAG}..."
@@ -81,7 +81,7 @@ _do_bump_commit() {
   $__sed -i.bk 's/(NVIM_VERSION_PRERELEASE) ""/\1 "-dev"/' CMakeLists.txt
   $__sed -i.bk 's/set\((NVIM_VERSION_PATCH) [[:digit:]]/set(\1 ?/' CMakeLists.txt
   rm -f CMakeLists.txt.bk
-  rm -f runtime/io.neovim.nvim.appdata.xml.bk
+  rm -f runtime/org.neovim.nvim.appdata.xml.bk
   nvim +'/NVIM_VERSION' +1new +'exe "norm! iUpdate version numbers!!!"' \
     -O CMakeLists.txt