diff --git a/.github/workflows/flathub.yml b/.github/workflows/flathub.yml
index 0a856bc3..58de96f0 100644
--- a/.github/workflows/flathub.yml
+++ b/.github/workflows/flathub.yml
@@ -19,14 +19,14 @@ jobs:
       - name: Checkout Flathub repo
         uses: actions/checkout@v4
         with:
-          repository: flathub/app.yaak.desktop
+          repository: flathub/app.yaak.Yaak
           token: ${{ secrets.FLATHUB_TOKEN }}
           path: flathub-repo
 
       - name: Copy updated files to Flathub repo
         run: |
-          cp flatpak/app.yaak.desktop.yml flathub-repo/
-          cp flatpak/app.yaak.desktop.metainfo.xml flathub-repo/
+          cp flatpak/app.yaak.Yaak.yml flathub-repo/
+          cp flatpak/app.yaak.Yaak.metainfo.xml flathub-repo/
           cp -r flatpak/icons flathub-repo/
 
       - name: Commit and push to Flathub
diff --git a/flatpak/app.yaak.desktop.metainfo.xml b/flatpak/app.yaak.Yaak.metainfo.xml
similarity index 95%
rename from flatpak/app.yaak.desktop.metainfo.xml
rename to flatpak/app.yaak.Yaak.metainfo.xml
index 547963d4..9441ad8a 100644
--- a/flatpak/app.yaak.desktop.metainfo.xml
+++ b/flatpak/app.yaak.Yaak.metainfo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop-application">
-  <id>app.yaak.desktop</id>
+  <id>app.yaak.Yaak</id>
 
   <name>Yaak</name>
   <summary>Play with APIs, intuitively</summary>
@@ -34,7 +34,7 @@
     </ul>
   </description>
 
-  <launchable type="desktop-id">app.yaak.desktop.desktop</launchable>
+  <launchable type="desktop-id">app.yaak.Yaak.desktop</launchable>
 
   <branding>
     <color type="primary" scheme_preference="light">#8b32ff</color>
diff --git a/flatpak/app.yaak.desktop.yml b/flatpak/app.yaak.Yaak.yml
similarity index 69%
rename from flatpak/app.yaak.desktop.yml
rename to flatpak/app.yaak.Yaak.yml
index 39b87c95..427acfbd 100644
--- a/flatpak/app.yaak.desktop.yml
+++ b/flatpak/app.yaak.Yaak.yml
@@ -2,12 +2,12 @@
 #
 # To build and test locally:
 #   flatpak install flathub org.gnome.Platform//48 org.gnome.Sdk//48
-#   flatpak-builder --force-clean --user --install-deps-from=flathub --repo=flatpak-repo build flatpak/app.yaak.desktop.yml
+#   flatpak-builder --force-clean --user --install-deps-from=flathub --repo=flatpak-repo build flatpak/app.yaak.Yaak.yml
 #   flatpak --user remote-add --if-not-exists yaak-local flatpak-repo
-#   flatpak --user install yaak-local app.yaak.desktop
-#   flatpak run app.yaak.desktop
+#   flatpak --user install yaak-local app.yaak.Yaak
+#   flatpak run app.yaak.Yaak
 
-id: app.yaak.desktop
+id: app.yaak.Yaak
 runtime: org.gnome.Platform
 runtime-version: "48"
 sdk: org.gnome.Sdk
@@ -41,19 +41,22 @@ modules:
       - cp -r usr/lib/yaak /app/lib/yaak
 
       # Install desktop file, updating Exec and Icon to match Flatpak conventions
-      - install -Dm644 usr/share/applications/yaak.desktop /app/share/applications/app.yaak.desktop.desktop
-      - desktop-file-edit --set-key=Exec --set-value=yaak-app /app/share/applications/app.yaak.desktop.desktop
-      - desktop-file-edit --set-icon=app.yaak.desktop /app/share/applications/app.yaak.desktop.desktop
-      - desktop-file-edit --set-key=StartupWMClass --set-value=yaak-app /app/share/applications/app.yaak.desktop.desktop
+      - install -Dm644 usr/share/applications/yaak.desktop /app/share/applications/app.yaak.Yaak.desktop
+      - desktop-file-edit --set-key=Exec --set-value=yaak-app /app/share/applications/app.yaak.Yaak.desktop
+      - desktop-file-edit --set-icon=app.yaak.Yaak /app/share/applications/app.yaak.Yaak.desktop
+      - desktop-file-edit --set-key=StartupWMClass --set-value=yaak-app /app/share/applications/app.yaak.Yaak.desktop
 
       # Install icons from deb (small sizes) and from this repo (large sizes)
-      - install -Dm644 usr/share/icons/hicolor/32x32/apps/yaak-app.png /app/share/icons/hicolor/32x32/apps/app.yaak.desktop.png
-      - install -Dm644 usr/share/icons/hicolor/128x128/apps/yaak-app.png /app/share/icons/hicolor/128x128/apps/app.yaak.desktop.png
-      - install -Dm644 256x256/app.yaak.desktop.png /app/share/icons/hicolor/256x256/apps/app.yaak.desktop.png
-      - install -Dm644 512x512/app.yaak.desktop.png /app/share/icons/hicolor/512x512/apps/app.yaak.desktop.png
+      - install -Dm644 usr/share/icons/hicolor/32x32/apps/yaak-app.png /app/share/icons/hicolor/32x32/apps/app.yaak.Yaak.png
+      - install -Dm644 usr/share/icons/hicolor/128x128/apps/yaak-app.png /app/share/icons/hicolor/128x128/apps/app.yaak.Yaak.png
+      - install -Dm644 256x256/app.yaak.Yaak.png /app/share/icons/hicolor/256x256/apps/app.yaak.Yaak.png
+      - install -Dm644 512x512/app.yaak.Yaak.png /app/share/icons/hicolor/512x512/apps/app.yaak.Yaak.png
 
       # Install AppStream metainfo
-      - install -Dm644 app.yaak.desktop.metainfo.xml /app/share/metainfo/app.yaak.desktop.metainfo.xml
+      - install -Dm644 app.yaak.Yaak.metainfo.xml /app/share/metainfo/app.yaak.Yaak.metainfo.xml
+
+      # Install license
+      - install -Dm644 LICENSE /app/share/licenses/app.yaak.Yaak/LICENSE
 
     sources:
       # The deb package from GitHub releases
@@ -77,4 +80,8 @@ modules:
 
       # AppStream metainfo (from this repo)
       - type: file
-        path: app.yaak.desktop.metainfo.xml
+        path: app.yaak.Yaak.metainfo.xml
+
+      # License file (from repo root)
+      - type: file
+        path: ../LICENSE
diff --git a/flatpak/icons/128x128/app.yaak.desktop.png b/flatpak/icons/128x128/app.yaak.Yaak.png
similarity index 100%
rename from flatpak/icons/128x128/app.yaak.desktop.png
rename to flatpak/icons/128x128/app.yaak.Yaak.png
diff --git a/flatpak/icons/256x256/app.yaak.desktop.png b/flatpak/icons/256x256/app.yaak.Yaak.png
similarity index 100%
rename from flatpak/icons/256x256/app.yaak.desktop.png
rename to flatpak/icons/256x256/app.yaak.Yaak.png
diff --git a/flatpak/icons/512x512/app.yaak.desktop.png b/flatpak/icons/512x512/app.yaak.Yaak.png
similarity index 100%
rename from flatpak/icons/512x512/app.yaak.desktop.png
rename to flatpak/icons/512x512/app.yaak.Yaak.png
diff --git a/flatpak/update-manifest.sh b/flatpak/update-manifest.sh
index f8e5b844..e75c6186 100755
--- a/flatpak/update-manifest.sh
+++ b/flatpak/update-manifest.sh
@@ -14,8 +14,8 @@
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-MANIFEST="$SCRIPT_DIR/app.yaak.desktop.yml"
-METAINFO="$SCRIPT_DIR/app.yaak.desktop.metainfo.xml"
+MANIFEST="$SCRIPT_DIR/app.yaak.Yaak.yml"
+METAINFO="$SCRIPT_DIR/app.yaak.Yaak.metainfo.xml"
 
 if [ $# -lt 1 ]; then
     echo "Usage: $0 <version-tag>"