diff --git a/desktop/remote-touchpad.appdata.xml b/desktop/com.github.unrud.RemoteTouchpad.appdata.xml
similarity index 91%
rename from desktop/remote-touchpad.appdata.xml
rename to desktop/com.github.unrud.RemoteTouchpad.appdata.xml
index e226cf6..273fbd1 100644
--- a/desktop/remote-touchpad.appdata.xml
+++ b/desktop/com.github.unrud.RemoteTouchpad.appdata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop">
-  <id>remote-touchpad.desktop</id>
+<component type="desktop-application">
+  <id>com.github.unrud.RemoteTouchpad</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0-or-later</project_license>
   <name>Remote Touchpad</name>
@@ -14,6 +14,7 @@
       Supports Flatpak&apos;s RemoteDesktop portal (experimental), Windows and X11.
     </p>
   </description>
+  <launchable type="desktop-id">com.github.unrud.RemoteTouchpad.desktop</launchable>
   <url type="bugtracker">https://github.com/Unrud/remote-touchpad/issues</url>
   <url type="homepage">https://github.com/Unrud/remote-touchpad</url>
   <developer_name>Unrud</developer_name>
@@ -43,7 +44,7 @@
         <li>use colors in terminal for QR qode</li>
         <li>remove -invert command line argument</li>
         <li>mitigate race condition when typing text on X11</li>
-        <li>improve KeySyms used for text on X11 and Flatpak's RemoteDesktop portal</li>
+        <li>improve KeySyms used for text on X11 and Flatpak&apos;s RemoteDesktop portal</li>
         <li>normalize line endings</li>
       </ul>
     </release>
@@ -89,5 +90,5 @@
       <image>https://raw.githubusercontent.com/Unrud/remote-touchpad/0.0.10/screenshots/4.png</image>
     </screenshot>
   </screenshots>
-  <content_rating type="oars-1.1" />
+  <content_rating type="oars-1.1"/>
 </component>
diff --git a/desktop/remote-touchpad.desktop b/desktop/com.github.unrud.RemoteTouchpad.desktop
similarity index 85%
rename from desktop/remote-touchpad.desktop
rename to desktop/com.github.unrud.RemoteTouchpad.desktop
index 7924c12..774441d 100644
--- a/desktop/remote-touchpad.desktop
+++ b/desktop/com.github.unrud.RemoteTouchpad.desktop
@@ -5,5 +5,5 @@ Name=Remote Touchpad
 Comment=Control mouse and keyboard from a smartphone
 Terminal=true
 Exec=remote-touchpad-wait-on-error
-Icon=remote-touchpad
+Icon=com.github.unrud.RemoteTouchpad
 Categories=Network;RemoteAccess;ConsoleOnly;
diff --git a/flatpak/com.github.unrud.RemoteTouchpad.json b/flatpak/com.github.unrud.RemoteTouchpad.json
index d768c65..73316ce 100644
--- a/flatpak/com.github.unrud.RemoteTouchpad.json
+++ b/flatpak/com.github.unrud.RemoteTouchpad.json
@@ -4,9 +4,6 @@
     "runtime-version" : "18.08",
     "sdk" : "org.freedesktop.Sdk",
     "command" : "remote-touchpad",
-    "rename-appdata-file" : "remote-touchpad.appdata.xml",
-    "rename-desktop-file" : "remote-touchpad.desktop",
-    "rename-icon" : "remote-touchpad",
     "sdk-extensions" : [
         "org.freedesktop.Sdk.Extension.golang"
     ],
@@ -54,12 +51,12 @@
                 ". /usr/lib/sdk/golang/enable.sh; env GOPATH=\"$(pwd)\" go build -tags 'portal x11' github.com/unrud/remote-touchpad",
                 "install -Dm0755 -t /app/bin remote-touchpad",
                 "install -Dm0755 -t /app/bin src/github.com/unrud/remote-touchpad/desktop/remote-touchpad-wait-on-error",
-                "install -Dm0644 -t /app/share/appdata src/github.com/unrud/remote-touchpad/desktop/remote-touchpad.appdata.xml",
-                "install -Dm0644 -t /app/share/applications src/github.com/unrud/remote-touchpad/desktop/remote-touchpad.desktop",
-                "install -Dm0644 src/github.com/unrud/remote-touchpad/desktop/remote-touchpad_64.png /app/share/icons/hicolor/64x64/apps/remote-touchpad.png",
-                "install -Dm0644 src/github.com/unrud/remote-touchpad/desktop/remote-touchpad_128.png /app/share/icons/hicolor/128x128/apps/remote-touchpad.png",
-                "install -Dm0644 src/github.com/unrud/remote-touchpad/desktop/remote-touchpad_256.png /app/share/icons/hicolor/256x256/apps/remote-touchpad.png",
-                "install -Dm0644 src/github.com/unrud/remote-touchpad/desktop/remote-touchpad_512.png /app/share/icons/hicolor/512x512/apps/remote-touchpad.png"
+                "install -Dm0644 -t /app/share/appdata src/github.com/unrud/remote-touchpad/desktop/com.github.unrud.RemoteTouchpad.appdata.xml",
+                "install -Dm0644 -t /app/share/applications src/github.com/unrud/remote-touchpad/desktop/com.github.unrud.RemoteTouchpad.desktop",
+                "install -Dm0644 src/github.com/unrud/remote-touchpad/desktop/remote-touchpad_64.png /app/share/icons/hicolor/64x64/apps/com.github.unrud.RemoteTouchpad.png",
+                "install -Dm0644 src/github.com/unrud/remote-touchpad/desktop/remote-touchpad_128.png /app/share/icons/hicolor/128x128/apps/com.github.unrud.RemoteTouchpad.png",
+                "install -Dm0644 src/github.com/unrud/remote-touchpad/desktop/remote-touchpad_256.png /app/share/icons/hicolor/256x256/apps/com.github.unrud.RemoteTouchpad.png",
+                "install -Dm0644 src/github.com/unrud/remote-touchpad/desktop/remote-touchpad_512.png /app/share/icons/hicolor/512x512/apps/com.github.unrud.RemoteTouchpad.png"
             ]
         }
     ]