diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
index f5f5527d27..d8d51ceedf 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}/nvim.desktop
+    FILES ${CMAKE_CURRENT_SOURCE_DIR}/io.neovim.nvim.desktop
     DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
 endif()
 
diff --git a/runtime/nvim.appdata.xml b/runtime/io.neovim.nvim.appdata.xml
similarity index 95%
rename from runtime/nvim.appdata.xml
rename to runtime/io.neovim.nvim.appdata.xml
index 713598001d..c55dbdd521 100644
--- a/runtime/nvim.appdata.xml
+++ b/runtime/io.neovim.nvim.appdata.xml
@@ -18,6 +18,10 @@
     <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">
+    <name>Neovim contributors</name>
+  </developer>
+
   <screenshots>
     <screenshot type="default">
       <caption>Live :substitute feature</caption>
@@ -71,7 +75,7 @@
   </releases>
 
   <content_rating type="oars-1.1"/>
-  <launchable type="desktop-id">nvim.desktop</launchable>
+  <launchable type="desktop-id">io.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/nvim.desktop b/runtime/io.neovim.nvim.desktop
similarity index 100%
rename from runtime/nvim.desktop
rename to runtime/io.neovim.nvim.desktop
diff --git a/scripts/genappimage.sh b/scripts/genappimage.sh
index f8c567da57..29edc01950 100755
--- a/scripts/genappimage.sh
+++ b/scripts/genappimage.sh
@@ -6,7 +6,7 @@
 # For more information, see http://appimage.org/
 ########################################################################
 
-# App arch, used by generate_appimage.
+# App arch
 if [ -z "$ARCH" ]; then
   ARCH="$(arch)"
   export ARCH
@@ -15,8 +15,8 @@ ARCH_OUTPUT=$ARCH
 
 TAG=$1
 
-# App name, used by generate_appimage.
-APP=nvim
+# App name
+APP=io.neovim.nvim
 
 ROOT_DIR="$(git rev-parse --show-toplevel)"
 APP_BUILD_DIR="$ROOT_DIR/build"
@@ -54,7 +54,7 @@ chmod +x "$APP_BUILD_DIR"/linuxdeploy-"$ARCH".AppImage
 
 # metainfo is not packaged automatically by linuxdeploy
 mkdir -p "$APP_DIR/usr/share/metainfo/"
-cp "$ROOT_DIR/runtime/nvim.appdata.xml" "$APP_DIR/usr/share/metainfo/"
+cp "$ROOT_DIR/runtime/$APP.appdata.xml" "$APP_DIR/usr/share/metainfo/"
 
 cd "$APP_DIR" || exit
 
@@ -93,7 +93,7 @@ fi
 #   - Expects: $ARCH, $APP, $VERSION env vars
 #   - Expects: ./$APP.AppDir/ directory
 #   - Produces: ./nvim-linux-$ARCH_OUTPUT.appimage
-./linuxdeploy-"$ARCH".AppImage --appdir $APP.AppDir -d "$ROOT_DIR"/runtime/nvim.desktop -i \
+./linuxdeploy-"$ARCH".AppImage --appdir $APP.AppDir -d "$ROOT_DIR/runtime/$APP.desktop" -i \
 "$ROOT_DIR/runtime/nvim.png" --output appimage
 
 # Moving the final executable to a different folder so it isn't in the
diff --git a/scripts/release.sh b/scripts/release.sh
index 72d0a58821..f7dd151efe 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/nvim.appdata.xml
+#     - Add date and version to runtime/io.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/nvim.appdata.xml
-  git add runtime/nvim.appdata.xml
+    <release date="'"${__DATE}"'" version="'"${__VERSION}"'"/>,' runtime/io.neovim.nvim.appdata.xml
+  git add runtime/io.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/nvim.appdata.xml.bk
+  rm -f runtime/io.neovim.nvim.appdata.xml.bk
   nvim +'/NVIM_VERSION' +1new +'exe "norm! iUpdate version numbers!!!"' \
     -O CMakeLists.txt