diff --git a/im.kaidan.kaidan.json b/im.kaidan.kaidan.json
index 068055a..90d155f 100644
--- a/im.kaidan.kaidan.json
+++ b/im.kaidan.kaidan.json
@@ -1,47 +1,47 @@
 {
     "id": "im.kaidan.kaidan",
     "rename-desktop-file": "kaidan.desktop",
     "rename-icon": "kaidan",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kaidan",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": [
         "--share=ipc",
         "--share=network",
         "--socket=x11",
         "--socket=wayland",
         "--device=dri",
         "--filesystem=home",
         "--talk-name=org.freedesktop.Notifications"
     ],
     "separate-locales": false,
 
     "modules": [
         {
             "name": "gloox",
             "buildsystem": "autotools",
             "sources": [
                 {
                     "type": "archive",
                     "url": "https://camaya.net/download/gloox-1.0.21.tar.bz2",
                     "sha256": "3c13155c10e3182a1a57779134cc524efb3657545849534b2831fae0e2c3a7cc"
                 }
             ]
         },
         {
             "name": "kaidan",
             "buildsystem": "cmake-ninja",
             "config-opts": ["-DI18N=1"],
             "sources": [
                 {
                     "type": "git",
                     "url": "https://github.com/kaidanim/kaidan",
                     "branch": "master"
                 }
             ]
         }
     ]
 }
diff --git a/org.kde.artikulate.json b/org.kde.artikulate.json
index 526a5db..d9d1e44 100644
--- a/org.kde.artikulate.json
+++ b/org.kde.artikulate.json
@@ -1,26 +1,26 @@
 {
     "id": "org.kde.artikulate",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "artikulate",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=network", "--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         "boost.json",
         {
             "name": "qt5-gstreamer",
             "config-opts": ["-DENABLE_TESTING=OFF" , "-DQT_VERSION=5", "-DUSE_QT_PLUGIN_DIR=OFF", "-DUSE_GST_PLUGIN_DIR=OFF"],
             "buildsystem": "cmake",
             "sources": [ { "type": "git", "url": "git://anongit.freedesktop.org/gstreamer/qt-gstreamer" } ]
         },
         {
             "name": "artikulate",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/artikulate.git" } ]
         }
     ]
 }
diff --git a/org.kde.atcore.json b/org.kde.atcore.json
index 48b02f6..5d7cd4a 100644
--- a/org.kde.atcore.json
+++ b/org.kde.atcore.json
@@ -1,38 +1,38 @@
 {
     "id": "org.kde.atcore",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "atcore-gui",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--device=all" ],
     "modules": [
         {
             "name": "cmake",
             "buildsystem":"cmake-ninja",
             "cleanup": [
                 "/bin",
                 "/doc",
                 "/share"
             ],
             "sources":[
                 {"type":"archive","url":"https://cmake.org/files/v3.11/cmake-3.11.4.tar.gz","sha256":"8f864e9f78917de3e1483e256270daabc4a321741592c5b36af028e72bff87f5"}
             ]
         },
         {
             "name": "atcore",
             "config-opts": ["-DBUILD_GUI=ON"],
             "buildsystem": "cmake-ninja",
             "cleanup": [
                 "/mkspecs",
                 "/include",
                 "/*/cmake"
             ],
             "sources": [ 
                 { "type": "git", "url": "git://anongit.kde.org/atcore.git" } 
             ]
         }
     ]
 }
diff --git a/org.kde.atelier.json b/org.kde.atelier.json
index b3e6cba..f44b0e1 100644
--- a/org.kde.atelier.json
+++ b/org.kde.atelier.json
@@ -1,71 +1,71 @@
 {
     "id": "org.kde.atelier",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "atelier",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--share=network", "--socket=wayland", "--filesystem=host", "--device=all" ],
     "modules": [
                 {
             "name": "cmake",
             "buildsystem":"cmake-ninja",
             "cleanup": [
                 "/bin",
                 "/doc",
                 "/share"
             ],
             "sources":[
                 {"type":"archive","url":"https://cmake.org/files/v3.11/cmake-3.11.4.tar.gz","sha256":"8f864e9f78917de3e1483e256270daabc4a321741592c5b36af028e72bff87f5"}
             ]
         },
         {
             "name": "qwt",
             "buildsystem": "simple",
             "build-commands": [
                 "qmake qwt.pro",
                 "make install"
             ],
             "cleanup": [
                 "/doc",
                 "/include",
                 "/features",
                 "/share",
                 "/plugins"
             ],
             "sources": [
                 {
                     "type": "archive",
                     "url": "https://cytranet.dl.sourceforge.net/project/qwt/qwt/6.1.3/qwt-6.1.3.tar.bz2",
                     "sha256":"f3ecd34e72a9a2b08422fb6c8e909ca76f4ce5fa77acad7a2883b701f4309733"
                 },
                 {
                     "type": "patch",
                     "path": "qwtPatch.patch"
                 }
             ]
         },
         {
             "name": "atcore",
             "config-opts": ["-DBUILD_GUI=ON"],
             "buildsystem": "cmake-ninja",
             "cleanup": [
                 "/mkspecs",
                 "/include",
                 "/*/cmake"
             ],
             "sources": [ 
                 { "type": "git", "url": "git://anongit.kde.org/atcore.git" } 
             ]
         },
         {
             "name": "atelier",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/atelier.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.babe.json b/org.kde.babe.json
index 448316d..5a75ae3 100644
--- a/org.kde.babe.json
+++ b/org.kde.babe.json
@@ -1,34 +1,34 @@
 {
     "id": "org.kde.babe",
     "branch": "master",
     "rename-icon": "babe",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "babe",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=host", "--socket=pulseaudio", "--socket=session-bus", "--share=network" ],
 
     "modules": [
         {
             "name": "taglib",
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "archive",
                     "url": "http://taglib.github.io/releases/taglib-1.11.1.tar.gz",
                     "sha256": "b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b"
                 }
             ]
         },
         {
             "name": "babe",
             "buildsystem": "cmake-ninja",
             "config-opts": [ "-DCMAKE_EXE_LINKER_FLAGS=-lz" ],
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/babe.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.blinken.json b/org.kde.blinken.json
index 6912fd9..33231fc 100644
--- a/org.kde.blinken.json
+++ b/org.kde.blinken.json
@@ -1,19 +1,19 @@
 {
     "id": "org.kde.blinken",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "blinken",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         {
             "name": "blinken",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/blinken.git" } ]
         }
     ]
 }
diff --git a/org.kde.bomber.json b/org.kde.bomber.json
index ad8c367..916e64b 100644
--- a/org.kde.bomber.json
+++ b/org.kde.bomber.json
@@ -1,22 +1,22 @@
 {
     "id": "org.kde.bomber",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "bomber",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         "libkdegames.json",
         {
             "name": "bomber",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/bomber.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.bovo.json b/org.kde.bovo.json
index 4c255a0..a4d453d 100644
--- a/org.kde.bovo.json
+++ b/org.kde.bovo.json
@@ -1,22 +1,22 @@
 {
     "id": "org.kde.bovo",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "bovo",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         "libkdegames.json",
         {
             "name": "bovo",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/bovo.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.calligragemini.json b/org.kde.calligragemini.json
index ce6ef43..553d333 100644
--- a/org.kde.calligragemini.json
+++ b/org.kde.calligragemini.json
@@ -1,53 +1,53 @@
 {
     "id": "org.kde.calligragemini",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "calligragemini",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=network", "--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         "boost.json",
         "eigen.json",
         {
             "name": "kjs",
             "buildsystem": "cmake-ninja",
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kjs.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "khtml",
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/khtml.git", "branch": "v5.51.0" } ]
         },
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kross",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kross.git", "branch": "v5.51.0" } ]
         },
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kdelibs4support",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdelibs4support.git", "branch": "v5.51.0" } ]
         },
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kdiagram",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdiagram.git" } ]
         },
         {
             "name": "calligragemini",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "config-opts": ["-DENABLE_TESTING=OFF" , "-DPRODUCTSET=GEMINI"],
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/calligra.git" } ]
         }
     ]
 }
diff --git a/org.kde.calligraplan.json b/org.kde.calligraplan.json
index 6e64cb3..eef86f9 100644
--- a/org.kde.calligraplan.json
+++ b/org.kde.calligraplan.json
@@ -1,53 +1,53 @@
 {
     "id": "org.kde.calligraplan",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "calligraplan",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=network", "--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         "boost.json",
         {
             "name": "kjs",
             "buildsystem": "cmake-ninja",
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kjs.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "khtml",
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/khtml.git", "branch": "v5.51.0" } ]
         },
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kross",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kross.git", "branch": "v5.51.0" } ]
         },
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kdelibs4support",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdelibs4support.git", "branch": "v5.51.0" } ]
         },
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kdiagram",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdiagram.git" } ]
         },
         "eigen.json",
         {
             "name": "calligraplan",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "config-opts": ["-DENABLE_TESTING=OFF" , "-DPRODUCTSET=PLAN"],
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/calligra.git" } ]
         }
     ]
 }
diff --git a/org.kde.cantor.json b/org.kde.cantor.json
index 5d55e2b..0aa4c11 100644
--- a/org.kde.cantor.json
+++ b/org.kde.cantor.json
@@ -1,24 +1,24 @@
 {
     "id": "org.kde.cantor",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "cantor",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=network", "--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         {
             "name": "analitza",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/analitza.git" } ]
         },
         {
             "name": "cantor",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/cantor.git" } ]
         }
     ]
 }
diff --git a/org.kde.cervisia.json b/org.kde.cervisia.json
index 80aef4a..8c970b0 100644
--- a/org.kde.cervisia.json
+++ b/org.kde.cervisia.json
@@ -1,22 +1,22 @@
 {
     "id": "org.kde.cervisia",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "cervisia",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=host" ],
 
     "modules": [
         { "name": "ksu", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdesu.git", "branch": "v5.51.0" } ] },
         {
             "name": "cervisia",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/cervisia.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.digikam.json b/org.kde.digikam.json
index fcb78c4..534dfb7 100644
--- a/org.kde.digikam.json
+++ b/org.kde.digikam.json
@@ -1,37 +1,37 @@
 {
     "id": "org.kde.digikam",
     "branch": "master",
     "base": "io.qt.qtwebkit.BaseApp",
     "base-version": "5.11",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "digikam",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=host" ],
     
     "modules": [
         "boost.json",
         {
             "name": "opencv",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "config-opts": ["-DENABLE_TESTING=OFF" , "-DWITH_OPENCL=ON", "-DWITH_OPENGL=ON", "-DWITH_TBB=ON", "-DWITH_XINE=ON"],
             "sources": [ { "type": "git", "url": "http://github.com/Itseez/opencv.git", "branch": "3.3.1" } ]
         },
         {
             "name": "exiv2",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "https://github.com/Exiv2/exiv2.git", "branch": "v0.26" } ]
         },
         {
             "name": "digikam",
             "buildsystem": "cmake-ninja",
             "config-opts": ["-DENABLE_TESTING=OFF", "-DQt5WebKit_DIR=/app/lib/cmake/Qt5WebKit/", "-DQt5WebKitWidgets_DIR=/app/lib/cmake/Qt5WebKitWidgets/"],
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/digikam.git" } ]
         }
     ]
 }
diff --git a/org.kde.discover.json b/org.kde.discover.json
index e5aba09..f5b60b2 100644
--- a/org.kde.discover.json
+++ b/org.kde.discover.json
@@ -1,139 +1,139 @@
 {
     "id": "org.kde.discover",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "plasma-discover",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--device=dri", "--share=network" ],
 
     "cleanup": [
         "/share/bash-completion"
     ],
     "build-options" : {
         "env": {
             "MOUNT_FUSE_PATH": "../tmp/",
             "BASH_COMPLETIONSDIR": "/app/share/bash-completion/completions"
         }
     },
     "modules": [
         {
             "name": "yaml",
             "config-opts": [ "--disable-static", "--enable-x11" ],
             "sources": [
                  {
                      "type": "archive",
                      "url": "http://pyyaml.org/download/libyaml/yaml-0.1.7.zip",
                      "sha256": "bd16d734a82ccc806eab7784b3a97ee4773daf359496b298968fc2eedc3d1b19"
                  }
             ]
         },
         {
             "name": "xmlto",
             "sources": [
                 {
                     "type": "archive", "url": "https://releases.pagure.org/xmlto/xmlto-0.0.28.tar.bz2",
                     "sha256": "1130df3a7957eb9f6f0d29e4aa1c75732a7dfb6d639be013859b5c7ec5421276"
                 }
             ]
         },
         {
             "config-opts": ["--libdir=lib", "-Denable-qt=true", "-Dstemming=false"],
             "name": "appstream",
             "buildsystem": "meson",
             "builddir": true,
             "sources": [ { "type": "git", "url": "https://github.com/ximion/appstream.git", "branch": "master" } ],
             "modules": [
                 {
                     "name": "glib",
                     "config-opts": [ "--with-pcre=system", "--with-python=python3" ],
                     "ensure-writable": [ "/share/glib-2.0/codegen/*.pyc" ],
                     "cleanup-platform": [ "/share/glib-2.0/codegen",
                                         "/bin/gdbus-codegen",
                                         "/bin/glib-*",
                                         "/bin/gobject-query",
                                         "/bin/gresource",
                                         "/bin/gtester*"
                                     ],
                     "sources": [
                         {
                             "type": "git",
                             "url": "https://gitlab.gnome.org/GNOME/glib.git"
                         }
                     ]
                 },
                 {
                     "name": "gobject-introspection",
                     "sources": [ { "type": "git", "url": "https://gitlab.gnome.org/GNOME/gobject-introspection", "branch": "1.56.1" } ]
                 }
             ]
         },
 
         {
             "name": "flatpak",
             "config-opts": ["--disable-documentation",
                             "--disable-seccomp",
                             "--disable-sandboxed-triggers",
                             "--disable-system-helper"],
             "make-args": [ "XDG_APP_BINDIR=/usr/bin" ],
             "cleanup": [ "/etc/profile.d",
                          "/libexec",
                          "/lib/systemd",
                          "/share/dbus-1/interfaces/org.freedesktop.*",
                          "/share/dbus-1/services/org.freedesktop.*",
                          "/share/gdm" ],
             "post-install": [
                 "cp /usr/bin/gtk-update-icon-cache /app/bin",
                 "cp /usr/bin/update-mime-database /app/bin",
                 "cp /usr/bin/update-desktop-database /app/bin"],
             "sources": [
                 {
                     "type": "git",
                     "url": "https://github.com/flatpak/flatpak"
                 }
             ],
             "modules": [
                 {
                     "name": "libfuse",
                     "config-opts": ["--disable-util"],
                     "cleanup": [ "/bin" ],
                     "sources": [
                         {
                             "type": "archive",
                             "url": "https://github.com/libfuse/libfuse/releases/download/fuse-2.9.7/fuse-2.9.7.tar.gz",
                             "sha256": "832432d1ad4f833c20e13b57cf40ce5277a9d33e483205fc63c78111b3358874"
                         }
                     ]
                 },
                 {
                     "name": "ostree",
                     "config-opts": ["--disable-man"],
                     "cleanup": [ "/bin", "/etc/grub.d", "/libexec" ],
                     "sources": [
                         {
                             "type": "git",
                             "url": "https://github.com/ostreedev/ostree.git"
                         }
                     ]
                 }
             ]
         },
 
         {
             "name": "discover",
             "config-opts": ["-DENABLE_TESTING=OFF" ,
                             "-DBUILD_SnapBackend=OFF", "-DBUILD_DummyBackend=ON"],
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/discover.git" } ],
             "modules-not-building": [
                 {
                     "name": "snapd-glib",
                     "sources": [ { "type": "git", "url": "https://github.com/snapcore/snapd-glib.git", "branch": "master" } ]
                 }
             ]
         }
     ]
 }
diff --git a/org.kde.dolphin.json b/org.kde.dolphin.json
index 203f53f..082b4c8 100644
--- a/org.kde.dolphin.json
+++ b/org.kde.dolphin.json
@@ -1,51 +1,51 @@
 {
     "id": "org.kde.dolphin",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "dolphin",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=host" ],
 
     "modules": [
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kfilemetadata",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kfilemetadata.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "lmdb",
             "sources": [ { "type": "git", "url": "git://github.com/LMDB/lmdb.git", "branch": "LMDB_0.9.18"}],
             "no-autogen": true,
             "make-install-args": ["prefix=/app"],
             "subdir" : "libraries/liblmdb"
         },
         {
             "config-opts": ["-DENABLE_TESTING=OFF" , "-DLMDB_DIR=/app"],
             "name": "baloo",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/baloo.git", "branch": "v5.51.0" } ]
         },
         {
             "config-opts": ["-DENABLE_TESTING=OFF" , "-DLMDB_DIR=/app"],
             "name": "baloo-widgets",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/baloo-widgets.git" } ]
         },
         {
             "name": "dolphin",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/dolphin.git" },
                          {"type": "patch", "path": "dolphinpatch.patch"}
                        ]
         },
         {
             "name": "dolphin-plugins",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/dolphin-plugins.git" } ]
         }
     ]
 }
diff --git a/org.kde.dragon.json b/org.kde.dragon.json
index 4bf43d7..a91a691 100644
--- a/org.kde.dragon.json
+++ b/org.kde.dragon.json
@@ -1,21 +1,21 @@
 {
     "id": "org.kde.dragonplayer",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "dragon",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         {
             "name": "dragon",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/dragon.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.elisa.json b/org.kde.elisa.json
index efed365..331baff 100644
--- a/org.kde.elisa.json
+++ b/org.kde.elisa.json
@@ -1,59 +1,59 @@
 {
     "id": "org.kde.elisa",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "elisa",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=home", "--socket=pulseaudio", "--device=dri", "--socket=session-bus", "--env=BALOO_DB_PATH=.local/share/baloo" ],
 
     "modules": [
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kdeclarative",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdeclarative.git", "branch": "v5.51.0" } ]
         },
         {
             "config-opts": [ "-DBUILD_SHARED_LIBS=ON" ],
             "name": "taglib",
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "archive",
                     "url": "http://taglib.github.io/releases/taglib-1.11.1.tar.gz",
                     "sha256": "b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b"
                 }
             ]
         },
         {
             "config-opts": ["-DENABLE_TESTING=OFF"  ],
             "name": "kfilemetadata",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kfilemetadata.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "lmdb",
             "sources": [ { "type": "git", "url": "git://github.com/LMDB/lmdb.git", "branch": "LMDB_0.9.18"}],
             "no-autogen": true,
             "make-install-args": ["prefix=/app"],
             "subdir" : "libraries/liblmdb"
         },
         {
             "config-opts": ["-DENABLE_TESTING=OFF" , "-DLMDB_DIR=/app"],
             "name": "baloo",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/baloo.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "elisa",
             "buildsystem": "cmake-ninja",
             "config-opts": [],
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/elisa.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.falkon.json b/org.kde.falkon.json
index 9284ae0..13fec86 100644
--- a/org.kde.falkon.json
+++ b/org.kde.falkon.json
@@ -1,33 +1,33 @@
 {
     "id": "org.kde.falkon",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "rename-icon": "falkon",
     "command": "falkon",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": [
         "--share=ipc",
         "--share=network",
         "--socket=x11",
         "--socket=pulseaudio",
         "--device=dri",
         "--filesystem=host",
         "--system-talk-name=org.freedesktop.GeoClue2"
     ],
 
     "modules": [
         {
             "buildsystem": "cmake",
             "name": "falkon",
             "sources": [
                 {
                     "type": "git",
                     "url": "git://anongit.kde.org/falkon.git"
                 }
             ]
         }
     ]
 }
diff --git a/org.kde.filelight.json b/org.kde.filelight.json
index 02ee83a..219ddb4 100644
--- a/org.kde.filelight.json
+++ b/org.kde.filelight.json
@@ -1,21 +1,21 @@
 {
     "id": "org.kde.filelight",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "filelight",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=host" ],
 
     "modules": [
         {
             "name": "filelight",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/filelight.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.gcompris.json b/org.kde.gcompris.json
index af8a9c9..77dd6c3 100644
--- a/org.kde.gcompris.json
+++ b/org.kde.gcompris.json
@@ -1,21 +1,21 @@
 {
     "id": "org.kde.gcompris",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "rename-icon": "gcompris-qt",
     "command": "gcompris-qt",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=network", "--socket=pulseaudio", "--share=ipc", "--socket=x11", "--socket=wayland", "--device=dri" ],
 
     "modules": [
         {
             "name": "gcompris",
             "buildsystem": "cmake",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/gcompris.git" } ]
         }
     ]
 }
diff --git a/org.kde.juk.json b/org.kde.juk.json
index c443c65..3180a4e 100644
--- a/org.kde.juk.json
+++ b/org.kde.juk.json
@@ -1,28 +1,28 @@
 {
     "id": "org.kde.juk",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "juk",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=host" ],
 
     "modules": [
         {
             "name": "taglib",
             "buildsystem": "cmake-ninja",
             "config-opts": ["-DENABLE_TESTING=OFF" , "-DBUILD_SHARED_LIBS=ON"],
             "sources": [ { "type": "git", "url": "https://github.com/taglib/taglib.git", "branch": "v1.11.1" } ]
         },
         {
             "name": "juk",
             "buildsystem": "cmake-ninja",
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/juk.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.kalgebra.json b/org.kde.kalgebra.json
index 1a29527..8518318 100644
--- a/org.kde.kalgebra.json
+++ b/org.kde.kalgebra.json
@@ -1,25 +1,25 @@
 {
     "id": "org.kde.kalgebra",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kalgebra",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--device=dri" ],
     "separate-locales": false,
 
     "modules": [
         {
             "name": "analitza",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/analitza.git" } ]
         },
         {
             "name": "kalgebra",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kalgebra.git" } ]
         }
     ]
 }
diff --git a/org.kde.kalzium.json b/org.kde.kalzium.json
index fee8db1..8b03c41 100644
--- a/org.kde.kalzium.json
+++ b/org.kde.kalzium.json
@@ -1,42 +1,42 @@
 {
     "id": "org.kde.kalzium",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kalzium",
     "rename-icon": "kalzium",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": [
         "--device=dri",
         "--share=ipc",
         "--socket=x11",
         "--socket=wayland"
     ],
     "modules": [
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kjs",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kjs.git", "branch": "v5.51.0" } ]
         },
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "khtml",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/khtml.git", "branch": "v5.51.0" } ]
         },
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kdelibs4support",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdelibs4support.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "kalzium",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kalzium.git" } ]
         }
     ]
 }
diff --git a/org.kde.kamoso.json b/org.kde.kamoso.json
index 30e9dcb..27f5c18 100644
--- a/org.kde.kamoso.json
+++ b/org.kde.kamoso.json
@@ -1,26 +1,26 @@
 {
     "id": "org.kde.kamoso",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kamoso",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--device=dri", "--filesystem=host", "--share=network", "--env=GST_PLUGIN_SYSTEM_PATH=/app/lib/gstreamer-1.0/:/usr/lib/gstreamer-1.0/", "--device=all" ],
 
     "modules": [
         {
             "name": "purpose",
             "config-opts": ["-DENABLE_TESTING=OFF"],
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/purpose.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "kamoso",
             "config-opts": ["-DENABLE_TESTING=OFF"],
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kamoso.git" } ]
         }
     ]
 }
diff --git a/org.kde.kanagram.json b/org.kde.kanagram.json
index 78f8023..499dfc0 100644
--- a/org.kde.kanagram.json
+++ b/org.kde.kanagram.json
@@ -1,29 +1,29 @@
 {
     "id": "org.kde.kanagram",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kanagram",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=network", "--socket=pulseaudio", "--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         {
             "name": "libkeduvocdocument",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/libkeduvocdocument.git" } ]
         },
         {
             "name": "kdeedu-data",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdeedu-data.git" } ]
         },
         {
             "name": "kanagram",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kanagram.git" } ]
         }
     ]
 }
diff --git a/org.kde.kapman.json b/org.kde.kapman.json
index 8a17977..2a9fae9 100644
--- a/org.kde.kapman.json
+++ b/org.kde.kapman.json
@@ -1,29 +1,29 @@
 {
     "id": "org.kde.kapman",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kapman",
     "rename-icon": "kapman",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": [
         "--share=ipc",
         "--socket=x11",
         "--socket=wayland",
         "--socket=pulseaudio",
         "--device=dri",
         "--filesystem=host"
     ],
     "modules": [
         "libkdegames.json",
         {
             "name": "kapman",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/kapman.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.kate.json b/org.kde.kate.json
index ac5ecf3..4014385 100644
--- a/org.kde.kate.json
+++ b/org.kde.kate.json
@@ -1,20 +1,20 @@
 {
     "id": "org.kde.kate",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kate",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=host" ],
     "separate-locales": false,
 
     "modules": [
         {
             "name": "kate",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kate.git" } ]
         }
     ]
 }
diff --git a/org.kde.katomic.json b/org.kde.katomic.json
index 285ba13..877d4cf 100644
--- a/org.kde.katomic.json
+++ b/org.kde.katomic.json
@@ -1,29 +1,29 @@
 {
     "id": "org.kde.katomic",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "katomic",
     "rename-icon": "katomic",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": [
         "--share=ipc",
         "--socket=x11",
         "--socket=wayland",
         "--socket=pulseaudio",
         "--device=dri",
         "--filesystem=host"
     ],
     "modules": [
         "libkdegames.json",
         {
             "name": "katomic",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/katomic.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.kblackbox.json b/org.kde.kblackbox.json
index 9f26f0a..12facec 100644
--- a/org.kde.kblackbox.json
+++ b/org.kde.kblackbox.json
@@ -1,22 +1,22 @@
 {
     "id": "org.kde.kblackbox",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kblackbox",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=host" ],
 
     "modules": [
         "libkdegames.json",
         {
             "name": "kblackbox",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/kblackbox.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.kblocks.json b/org.kde.kblocks.json
index 361d9e4..d488b28 100644
--- a/org.kde.kblocks.json
+++ b/org.kde.kblocks.json
@@ -1,29 +1,29 @@
 {
     "id": "org.kde.kblocks",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kblocks",
     "rename-icons": "kblocks",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": [
         "--share=ipc",
         "--socket=x11",
         "--socket=wayland",
         "--socket=pulseaudio",
         "--device=dri",
         "--filesystem=host"
     ],
     "modules": [
         "libkdegames.json",
         {
             "name": "kblocks",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/kblocks.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.kbounce.json b/org.kde.kbounce.json
index 04565bc..f9ff311 100644
--- a/org.kde.kbounce.json
+++ b/org.kde.kbounce.json
@@ -1,29 +1,29 @@
 {
     "id": "org.kde.kbounce",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kbounce",
     "rename-icon": "kbounce",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": [
         "--share=ipc",
         "--socket=x11",
         "--socket=wayland",
         "--socket=pulseaudio",
         "--device=dri",
         "--filesystem=host"
     ],
     "modules": [
         "libkdegames.json",
         {
             "name": "kbounce",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/kbounce.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.kbreakout.json b/org.kde.kbreakout.json
index b2eb400..665b422 100644
--- a/org.kde.kbreakout.json
+++ b/org.kde.kbreakout.json
@@ -1,22 +1,22 @@
 {
     "id": "org.kde.kbreakout",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kbreakout",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=host" ],
 
     "modules": [
         "libkdegames.json",
         {
             "name": "kbreakout",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/kbreakout.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.kbruch.json b/org.kde.kbruch.json
index a30e213..ed260f4 100644
--- a/org.kde.kbruch.json
+++ b/org.kde.kbruch.json
@@ -1,24 +1,24 @@
 {
     "id": "org.kde.kbruch",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kbruch",
     "rename-icon": "kbruch",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": [
         "--share=ipc",
         "--socket=x11",
         "--socket=wayland",
         "--device=dri"
     ],
     "modules": [
         {
             "name": "kbruch",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kbruch.git" } ]
         }
     ]
 }
diff --git a/org.kde.kcachegrind.json b/org.kde.kcachegrind.json
index b4f8a61..940fede 100644
--- a/org.kde.kcachegrind.json
+++ b/org.kde.kcachegrind.json
@@ -1,19 +1,19 @@
 {
     "id": "org.kde.kcachegrind",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kcachegrind",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         {
             "name": "kcachegrind",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kcachegrind.git" } ]
         }
     ]
 }
diff --git a/org.kde.kcalc.json b/org.kde.kcalc.json
index cf82ddf..039245c 100644
--- a/org.kde.kcalc.json
+++ b/org.kde.kcalc.json
@@ -1,19 +1,19 @@
 {
     "id": "org.kde.kcalc",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kcalc",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=host" ],
 
     "modules": [
         {
             "name": "kcalc",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kcalc.git" } ]
         }
     ]
 }
diff --git a/org.kde.kcharselect.json b/org.kde.kcharselect.json
index 40cbba0..7243b30 100644
--- a/org.kde.kcharselect.json
+++ b/org.kde.kcharselect.json
@@ -1,19 +1,19 @@
 {
     "id": "org.kde.kcharselect",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kcharselect",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         {
             "name": "kcharselect",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kcharselect.git" } ]
         }
     ]
 }
diff --git a/org.kde.kcolorchooser.json b/org.kde.kcolorchooser.json
index f8c9d8e..a0a93ff 100644
--- a/org.kde.kcolorchooser.json
+++ b/org.kde.kcolorchooser.json
@@ -1,19 +1,19 @@
 {
     "id": "org.kde.kcolorchooser",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kcolorchooser",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         {
             "name": "kcolorchooser",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kcolorchooser.git" } ]
         }
     ]
 }
diff --git a/org.kde.kdebugsettings.json b/org.kde.kdebugsettings.json
index 3fb5fb4..a5f86c9 100644
--- a/org.kde.kdebugsettings.json
+++ b/org.kde.kdebugsettings.json
@@ -1,19 +1,19 @@
 {
     "id": "org.kde.kdebugsettings",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kdebugsettings",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         {
             "name": "kdebugsettings",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdebugsettings.git" } ]
         }
     ]
 }
diff --git a/org.kde.kdeconnect.json b/org.kde.kdeconnect.json
index acb23bc..2019112 100644
--- a/org.kde.kdeconnect.json
+++ b/org.kde.kdeconnect.json
@@ -1,43 +1,43 @@
 {
     "id": "org.kde.kdeconnect",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kdeconnect-indicator",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--share=network", "--own-name=org.kde.kdeconnectd", "--own-name=org.kde.kdeconnect-indicator",
                     "--talk-name=org.mpris.MediaPlayer2", "--talk-name=org.mpris.MediaPlayer2.Player" ],
     "rename-desktop-file": "org.kde.kdeconnect.nonplasma.desktop",
 
     "modules": [
         {
             "name": "libfakekey",
             "buildsystem": "simple",
             "build-commands": [
                 "./configure --prefix=/app --sysconfdir=/etc --localstatedir=/var --disable-static",
                 "make AM_LDFLAGS=-lX11",
                 "make install"
             ],
             "sources": [
                 {
                     "type": "archive",
                     "url": "http://downloads.yoctoproject.org/releases/matchbox/libfakekey/0.1/libfakekey-0.1.tar.bz2",
                     "sha256": "c41042a70524895b0edf8077ae3ae1206f1a313bea5811dcc23033ea16a00194"
                 }
             ]
         },
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "qca",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/qca.git" } ]
         },
         {
             "name": "kdeconnect",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdeconnect-kde.git" } ]
         }
     ]
 }
diff --git a/org.kde.kdenlive.json b/org.kde.kdenlive.json
index 6f60a08..e96c3af 100644
--- a/org.kde.kdenlive.json
+++ b/org.kde.kdenlive.json
@@ -1,41 +1,41 @@
 {
     "id": "org.kde.kdenlive",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kdenlive",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kfilemetadata",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kfilemetadata.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "gtk2",
             "config-opts": ["--disable-man",
                             "--with-xinput=xfree"],
             "sources": [
                 {
                     "type": "git",
                     "url": "https://gitlab.gnome.org/GNOME/gtk.git",
                     "branch": "gtk-2-24"
                 }
             ]
         },
         {
             "name": "mlt",
             "sources": [ { "type": "git", "url": "https://github.com/mltframework/mlt.git", "branch": "v6.10.0" } ]
         },
         {
             "name": "kdenlive",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdenlive.git" } ]
         }
     ]
 }
diff --git a/org.kde.kdevelop.json b/org.kde.kdevelop.json
index 6abb40d..04bf28a 100644
--- a/org.kde.kdevelop.json
+++ b/org.kde.kdevelop.json
@@ -1,46 +1,46 @@
 {
     "id": "org.kde.kdevelop",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kdevelop",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=host" ],
 
     "modules": [
         "boost.json",
         {
             "name": "grantlee",
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "https://github.com/steveire/grantlee.git" } ]
         },
         {
             "name": "libkomparediff2",
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/libkomparediff2.git" } ]
         },
         {
             "name": "llvmclang",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "config-opts": ["-DLLVM_BUILD_LLVM_DYLIB=ON", "-DLLVM_LINK_LLVM_DYLIB=ON"],
             "cleanup": [ "/lib/*.a" ],
             "sources": [
                 { "type": "git", "url": "http://llvm.org/git/llvm.git", "branch": "release_60" },
                 {
                     "type": "git", "url": "http://llvm.org/git/clang.git", "branch": "release_60",
                     "dest": "llvm/tools"
                 }
             ]
         },
         {
             "name": "kdevelop",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdevelop.git", "branch": "master" } ]
         }
     ]
 }
diff --git a/org.kde.kdiamond.json b/org.kde.kdiamond.json
index 4e8d405..5a245e9 100644
--- a/org.kde.kdiamond.json
+++ b/org.kde.kdiamond.json
@@ -1,29 +1,29 @@
 {
     "id": "org.kde.kdiamond",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kdiamond",
     "rename-icon": "kdiamond",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": [
         "--share=ipc",
         "--socket=x11",
         "--socket=wayland",
         "--socket=pulseaudio",
         "--device=dri",
         "--filesystem=host"
     ],
     "modules": [
         "libkdegames.json",
         {
             "name": "kdiamond",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/kdiamond.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.kdiff3.json b/org.kde.kdiff3.json
index 2a62948..5288f48 100644
--- a/org.kde.kdiff3.json
+++ b/org.kde.kdiff3.json
@@ -1,21 +1,21 @@
 {
     "id": "org.kde.kdiff3",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kdiff3",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=host" ],
 
     "modules": [
         {
             "name": "kdiff3",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/kdiff3.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.kexi.json b/org.kde.kexi.json
index f3658f7..b402912 100644
--- a/org.kde.kexi.json
+++ b/org.kde.kexi.json
@@ -1,35 +1,35 @@
 {
     "id": "org.kde.kexi",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kexi-3.2",
     "tags": ["nightly"],
     "rename-desktop-file": "org.kde.kexi-3.2.desktop",
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         {
             "name": "kdb",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdb.git" } ]
         },
         {
             "name": "kproperty",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kproperty.git" } ]
         },
         {
             "name": "kreport",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kreport.git" } ]
         },
         {
             "name": "kexi",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kexi.git" } ]
         }
     ]
 }
diff --git a/org.kde.kfind.json b/org.kde.kfind.json
index 68f231c..e40560a 100644
--- a/org.kde.kfind.json
+++ b/org.kde.kfind.json
@@ -1,33 +1,33 @@
 {
     "id": "org.kde.kfind",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kfind",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=host" ],
 
     "modules": [
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kdelibs4support",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdelibs4support.git", "branch": "v5.51.0" } ]
         },
         {
             "config-opts": ["-DENABLE_TESTING=OFF"  ],
             "name": "kfilemetadata",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kfilemetadata.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "kfind",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/kfind.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.kfloppy.json b/org.kde.kfloppy.json
index 556684f..c288da3 100644
--- a/org.kde.kfloppy.json
+++ b/org.kde.kfloppy.json
@@ -1,21 +1,21 @@
 {
     "id": "org.kde.kfloppy",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kfloppy",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=host" ],
 
     "modules": [
         {
             "name": "kfloppy",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/kfloppy.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.kfourinline.json b/org.kde.kfourinline.json
index 3b6cc75..be4e089 100644
--- a/org.kde.kfourinline.json
+++ b/org.kde.kfourinline.json
@@ -1,28 +1,28 @@
 {
     "id": "org.kde.kfourinline",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kfourinline",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=host" ],
 
     "modules": [
         "libkdegames.json",
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kdelibs4support",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdelibs4support.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "kfourinline",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/kfourinline.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.kgeography.json b/org.kde.kgeography.json
index 21363ef..5974044 100644
--- a/org.kde.kgeography.json
+++ b/org.kde.kgeography.json
@@ -1,24 +1,24 @@
 {
     "id": "org.kde.kgeography",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kgeography",
     "rename-icon": "kgeography",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": [
         "--share=ipc",
         "--socket=x11",
         "--socket=wayland",
         "--device=dri"
     ],
     "modules": [
         {
             "name": "kgeography",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kgeography.git" } ]
         }
     ]
 }
diff --git a/org.kde.kget.json b/org.kde.kget.json
index 13e4156..60a1ee1 100644
--- a/org.kde.kget.json
+++ b/org.kde.kget.json
@@ -1,28 +1,28 @@
 {
     "id": "org.kde.kget",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kget",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=host" ],
 
     "modules": [
         "boost.json",
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kdelibs4support",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdelibs4support.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "kget",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/kget.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.kgoldrunner.json b/org.kde.kgoldrunner.json
index f0f7a7f..e672e70 100644
--- a/org.kde.kgoldrunner.json
+++ b/org.kde.kgoldrunner.json
@@ -1,34 +1,34 @@
 {
     "id": "org.kde.kgoldrunner",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kgoldrunner",
     "rename-icon": "kgoldrunner",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": [
         "--share=ipc",
         "--socket=x11",
         "--socket=wayland",
         "--device=dri",
         "--filesystem=host"
     ],
     "modules": [
         "libkdegames.json",
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kdelibs4support",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdelibs4support.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "kgoldrunner",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/kgoldrunner.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.khangman.json b/org.kde.khangman.json
index e41ace0..ac696a1 100644
--- a/org.kde.khangman.json
+++ b/org.kde.khangman.json
@@ -1,36 +1,36 @@
 {
     "id": "org.kde.khangman",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "khangman",
     "rename-icon": "khangman",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": [
         "--share=network",
         "--socket=pulseaudio",
         "--share=ipc",
         "--socket=x11",
         "--socket=wayland",
         "--device=dri"
     ],
     "modules": [
         {
             "name": "libkeduvocdocument",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/libkeduvocdocument.git" } ]
         },
         {
             "name": "kdeedu-data",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdeedu-data.git" } ]
         },
         {
             "name": "khangman",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/khangman.git" } ]
         }
     ]
 }
diff --git a/org.kde.kig.json b/org.kde.kig.json
index be2e7c7..4571142 100644
--- a/org.kde.kig.json
+++ b/org.kde.kig.json
@@ -1,19 +1,19 @@
 {
     "id": "org.kde.kig",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kig",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         {
             "name": "kig",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kig.git" } ]
         }
     ]
 }
diff --git a/org.kde.kigo.json b/org.kde.kigo.json
index 3dee2b3..3740332 100644
--- a/org.kde.kigo.json
+++ b/org.kde.kigo.json
@@ -1,44 +1,44 @@
 {
     "id": "org.kde.kigo",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kigo",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": [
         "--share=ipc",
         "--socket=x11",
         "--socket=wayland",
         "--socket=pulseaudio",
         "--device=dri",
         "--filesystem=host"
     ],
     "modules": [
         "libkdegames.json",
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kdelibs4support",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdelibs4support.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "gnugo",
             "sources": [
                 {
                     "type": "archive",
                     "url": "https://ftp.gnu.org/gnu/gnugo/gnugo-3.8.tar.gz",
                     "sha256": "da68d7a65f44dcf6ce6e4e630b6f6dd9897249d34425920bfdd4e07ff1866a72"
                 }
             ]
         },
         {
             "name": "kigo",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/kigo.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.killbots.json b/org.kde.killbots.json
index cb156f8..307ed52 100644
--- a/org.kde.killbots.json
+++ b/org.kde.killbots.json
@@ -1,29 +1,29 @@
 {
     "id": "org.kde.killbots",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "killbots",
     "rename-icon": "killbots",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": [
         "--share=ipc",
         "--socket=x11",
         "--socket=wayland",
         "--socket=pulseaudio",
         "--device=dri",
         "--filesystem=host"
     ],
     "modules": [
         "libkdegames.json",
         {
             "name": "killbots",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/killbots.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.kirigami2.gallery.json b/org.kde.kirigami2.gallery.json
index 397b375..c4055c8 100644
--- a/org.kde.kirigami2.gallery.json
+++ b/org.kde.kirigami2.gallery.json
@@ -1,20 +1,20 @@
 {
     "id": "org.kde.kirigami2.gallery",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--share=network", "--socket=x11", "--socket=wayland", "--device=dri" ],
 
     "modules": [
         {
             "name": "kirigamigallery",
             "config-opts": ["-DCMAKE_BUILD_TYPE=debug"],
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kirigami-gallery.git", "branch": "master" } ]
         }
     ]
 }
diff --git a/org.kde.kiriki.json b/org.kde.kiriki.json
index 051bd40..da862e7 100644
--- a/org.kde.kiriki.json
+++ b/org.kde.kiriki.json
@@ -1,22 +1,22 @@
 {
     "id": "org.kde.kiriki",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kiriki",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=host" ],
 
     "modules": [
         "libkdegames.json",
         {
             "name": "kiriki",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/kiriki.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.kiten.json b/org.kde.kiten.json
index d052987..3694aab 100644
--- a/org.kde.kiten.json
+++ b/org.kde.kiten.json
@@ -1,31 +1,31 @@
 {
     "id": "org.kde.kiten",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kiten",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kjs",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kjs.git", "branch": "v5.51.0" } ]
         },
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "khtml",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/khtml.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "kiten",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kiten.git" } ]
         }
     ]
 }
diff --git a/org.kde.kjumpingcube.json b/org.kde.kjumpingcube.json
index 7f3ddf7..9480605 100644
--- a/org.kde.kjumpingcube.json
+++ b/org.kde.kjumpingcube.json
@@ -1,28 +1,28 @@
 {
     "id": "org.kde.kjumpingcube",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kjumpingcube",
     "rename-icon": "kjumpingcube",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": [
         "--share=ipc",
         "--socket=x11",
         "--socket=wayland",
         "--device=dri",
         "--filesystem=host"
     ],
     "modules": [
         "libkdegames.json",
         {
             "name": "kjumpingcube",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/kjumpingcube.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.kleopatra.json b/org.kde.kleopatra.json
index 1fea5e3..366b5cf 100644
--- a/org.kde.kleopatra.json
+++ b/org.kde.kleopatra.json
@@ -1,19 +1,19 @@
 {
     "id": "org.kde.kleopatra",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kleopatra",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=host" ],
 
     "modules": [
         "boost.json",
         "gpgme.json",
         { "name": "kmime", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kmime" } ] },
         { "name": "libkleo", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/libkleo.git" } ] },
         { "name": "kleopatra", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kleopatra.git" } ] }
     ]
 }
diff --git a/org.kde.klettres.json b/org.kde.klettres.json
index e55b9a3..66ac229 100644
--- a/org.kde.klettres.json
+++ b/org.kde.klettres.json
@@ -1,19 +1,19 @@
 {
     "id": "org.kde.klettres",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "klettres",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=network", "--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         {
             "name": "klettres",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/klettres.git" } ]
         }
     ]
 }
diff --git a/org.kde.klickety.json b/org.kde.klickety.json
index 41f6ab2..a719f8c 100644
--- a/org.kde.klickety.json
+++ b/org.kde.klickety.json
@@ -1,22 +1,22 @@
 {
     "id": "org.kde.klickety",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "klickety",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=host" ],
 
     "modules": [
         "libkdegames.json",
         {
             "name": "klickety",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/klickety.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.klimbgrades.json b/org.kde.klimbgrades.json
index 207a751..9694e20 100644
--- a/org.kde.klimbgrades.json
+++ b/org.kde.klimbgrades.json
@@ -1,20 +1,20 @@
 {
     "id": "org.kde.klimbgrades",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "klimbgrades",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         {
             "name": "klimbgrades",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/klimbgrades.git" } ]
         }
     ]
 }
diff --git a/org.kde.klines.json b/org.kde.klines.json
index a428069..9130122 100644
--- a/org.kde.klines.json
+++ b/org.kde.klines.json
@@ -1,28 +1,28 @@
 {
     "id": "org.kde.klines",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "klines",
     "rename-icon": "klines",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": [
         "--share=ipc",
         "--socket=x11",
         "--socket=wayland",
         "--device=dri",
         "--filesystem=host"
     ],
     "modules": [
         "libkdegames.json",
         {
             "name": "klines",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/klines.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.kmag.json b/org.kde.kmag.json
index d0a82ba..c969e27 100644
--- a/org.kde.kmag.json
+++ b/org.kde.kmag.json
@@ -1,21 +1,21 @@
 {
     "id": "org.kde.kmag",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kmag",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=host" ],
 
     "modules": [
         {
             "name": "kmag",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/kmag.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.kmahjongg.json b/org.kde.kmahjongg.json
index 0efe0c1..78897f4 100644
--- a/org.kde.kmahjongg.json
+++ b/org.kde.kmahjongg.json
@@ -1,29 +1,29 @@
 {
     "id": "org.kde.kmahjongg",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kmahjongg",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=host" ],
 
     "modules": [
         "libkdegames.json",
         {
             "name": "libkmahjongg",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/libkmahjongg.git" }
             ]
         },
         {
             "name": "kmahjongg",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/kmahjongg.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.kmines.json b/org.kde.kmines.json
index 94bd3c5..8e6107e 100644
--- a/org.kde.kmines.json
+++ b/org.kde.kmines.json
@@ -1,22 +1,22 @@
 {
     "id": "org.kde.kmines",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kmines",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=host" ],
 
     "modules": [
         "libkdegames.json",
         {
             "name": "kmines",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/kmines.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.kmix.json b/org.kde.kmix.json
index cfa67c8..7b71257 100644
--- a/org.kde.kmix.json
+++ b/org.kde.kmix.json
@@ -1,41 +1,41 @@
 {
     "id": "org.kde.kmix",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kmix",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         "boost.json",
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kdelibs4support",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdelibs4support.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "kactivities",
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kactivities.git", "branch": "v5.51.0" } ]
         },
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "plasma-framework",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/plasma-framework.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "kmix",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/kmix.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.kmplot.json b/org.kde.kmplot.json
index 4463cb3..01749d2 100644
--- a/org.kde.kmplot.json
+++ b/org.kde.kmplot.json
@@ -1,25 +1,25 @@
 {
     "id": "org.kde.kmplot",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kmplot",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kdelibs4support",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdelibs4support.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "kmplot",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kmplot.git" } ]
         }
     ]
 }
diff --git a/org.kde.knavalbattle.json b/org.kde.knavalbattle.json
index 36378cf..f8a1384 100644
--- a/org.kde.knavalbattle.json
+++ b/org.kde.knavalbattle.json
@@ -1,28 +1,28 @@
 {
     "id": "org.kde.knavalbattle",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "knavalbattle",
     "rename-icon": "knavalbattle",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": [
         "--share=ipc",
         "--socket=x11",
         "--socket=wayland",
         "--device=dri",
         "--filesystem=host"
     ],
     "modules": [
         "libkdegames.json",
         {
             "name": "knavalbattle",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/knavalbattle.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.knetwalk.json b/org.kde.knetwalk.json
index 3f431c8..72706a7 100644
--- a/org.kde.knetwalk.json
+++ b/org.kde.knetwalk.json
@@ -1,29 +1,29 @@
 {
     "id": "org.kde.knetwalk",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "knetwalk",
     "rename-icon": "knetwalk",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": [
         "--share=ipc",
         "--socket=x11",
         "--socket=wayland",
         "--socket=pulseaudio",
         "--device=dri",
         "--filesystem=host"
     ],
     "modules": [
         "libkdegames.json",
         {
             "name": "knetwalk",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/knetwalk.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.koko.json b/org.kde.koko.json
index d352efb..bb101f0 100644
--- a/org.kde.koko.json
+++ b/org.kde.koko.json
@@ -1,73 +1,73 @@
 {
     "id": "org.kde.koko",
     "rename-icon": "koko",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "koko",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": [
         "--share=ipc",
         "--share=network",
         "--socket=x11",
         "--socket=wayland",
         "--device=dri",
         "--filesystem=home"
     ],
     "separate-locales": false,
 
     "modules": [
         {
             "name": "exiv2",
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "archive",
                     "url": "http://www.exiv2.org/builds/exiv2-0.26-trunk.tar.gz",
                     "sha256": "c75e3c4a0811bf700d92c82319373b7a825a2331c12b8b37d41eb58e4f18eafb"
                 }
             ]
         },
         {
             "name": "purpose",
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://github.com/KDE/purpose",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "koko",
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://github.com/KDE/koko",
                     "branch": "master"
                 },
                 {
                     "type": "file",
                     "path": "koko/cities1000.zip",
                     "dest-filename": "src/cities1000.zip",
                     "sha256": "3c4cce61c4afb8954db15ea1f32aa5036b4a66bf3057b19a27b85c1a20ab5613"
                 },
                 {
                     "type": "file",
                     "path": "koko/admin2Codes.txt",
                     "dest-filename": "src/admin2Codes.txt",
                     "sha256": "2f12b595df32f4fc57f85345600229e0097e52ad9bf7eeafb34b7da6fe9f1246"
                 },
                 {
                     "type": "file",
                     "path": "koko/admin1CodesASCII.txt",
                     "dest-filename": "src/admin1CodesASCII.txt",
                     "sha256": "0f93bba814d3af0f05032e68655b1b84d2ef6ef05aab330091bcbf819976cc75"
                 }
             ]
         }
     ]
 }
diff --git a/org.kde.kolf.json b/org.kde.kolf.json
index 0adcfac..11cf3db 100644
--- a/org.kde.kolf.json
+++ b/org.kde.kolf.json
@@ -1,28 +1,28 @@
 {
     "id": "org.kde.kolf",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kolf",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=host" ],
 
     "modules": [
         "libkdegames.json",
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kdelibs4support",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdelibs4support.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "kolf",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/kolf.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.kollision.json b/org.kde.kollision.json
index d2395cc..d246007 100644
--- a/org.kde.kollision.json
+++ b/org.kde.kollision.json
@@ -1,22 +1,22 @@
 {
     "id": "org.kde.kollision",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kollision",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         "libkdegames.json",
         {
             "name": "kollision",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/kollision.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.kolourpaint.json b/org.kde.kolourpaint.json
index 87a2ca6..7c48865 100644
--- a/org.kde.kolourpaint.json
+++ b/org.kde.kolourpaint.json
@@ -1,27 +1,27 @@
 {
     "id": "org.kde.kolourpaint",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kolourpaint",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=host" ],
 
     "modules": [
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kdelibs4support",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdelibs4support.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "kolourpaint",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/kolourpaint.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.kompare.json b/org.kde.kompare.json
index 00dbd12..f1555b7 100644
--- a/org.kde.kompare.json
+++ b/org.kde.kompare.json
@@ -1,26 +1,26 @@
 {
     "id": "org.kde.kompare",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kompare",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         {
             "name": "libkomparediff2",
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/libkomparediff2.git" } ]
         },
         {
             "name": "kompare",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kompare.git" } ]
         }
     ]
 }
diff --git a/org.kde.konqueror.json b/org.kde.konqueror.json
index 4b819cf..1b6eb6b 100644
--- a/org.kde.konqueror.json
+++ b/org.kde.konqueror.json
@@ -1,49 +1,49 @@
 {
     "id": "org.kde.konqueror",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "rename-desktop-file": "konqbrowser.desktop",
     "sdk": "org.kde.Sdk",
     "command": "konqueror",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=host" ],
 
     "modules": [
         "boost.json",
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kjs",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kjs.git", "branch": "v5.51.0" } ]
         },
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "khtml",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/khtml.git", "branch": "v5.51.0" } ]
         },
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kdelibs4support",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdelibs4support.git", "branch": "v5.51.0" } ]
         },
         { "name": "ksu", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdesu.git", "branch": "v5.51.0" } ] },
         {
             "name": "kactivities",
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kactivities.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "konqueror",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/konqueror.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.konquest.json b/org.kde.konquest.json
index e3669b3..307f573 100644
--- a/org.kde.konquest.json
+++ b/org.kde.konquest.json
@@ -1,22 +1,22 @@
 {
     "id": "org.kde.konquest",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "konquest",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         "libkdegames.json",
         {
             "name": "konquest",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/konquest.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.konsole.json b/org.kde.konsole.json
index 665bc03..d2cca9f 100644
--- a/org.kde.konsole.json
+++ b/org.kde.konsole.json
@@ -1,21 +1,21 @@
 {
     "id": "org.kde.konsole",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "konsole",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         {
             "name": "konsole",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/konsole.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.kontact.json b/org.kde.kontact.json
index cae62e5..eb633f0 100644
--- a/org.kde.kontact.json
+++ b/org.kde.kontact.json
@@ -1,1182 +1,1182 @@
 {
     "id": "org.kde.kontact",
     "branch": "master",
     "rename-icon": "kontact",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "tags": [ "nightly" ],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "command": "run_kontact.sh",
     "finish-args": [
         "--share=network",
         "--share=ipc",
         "--socket=x11",
         "--socket=wayland",
         "--device=dri",
         "--own-name=org.freedesktop.Akonadi",
         "--own-name=org.freedesktop.Akonadi.*",
         "--own-name=org.freedesktop.Akonadi.Control.*",
         "--own-name=org.freedesktop.Akonadi.Agent.*",
         "--own-name=org.freedesktop.Akonadi.Resource.*",
         "--own-name=org.kde.akregator",
         "--own-name=org.kde.kaddressbook",
         "--own-name=org.kde.kmail",
         "--own-name=org.kde.kmail2",
         "--own-name=org.kde.knotes",
         "--own-name=org.kde.kontact",
         "--own-name=org.kde.korgac",
         "--own-name=org.kde.korganizer",
         "--own-name=org.kde.kalarm",
         "--own-name=org.kde.accountwizard",
         "--own-name=org.kde.pimsettingsexporter",
         "--own-name=org.kde.sieveeditor",
         "--own-name=org.kde.pim.*",
         "--talk-name=org.kde.Solid.PowerManagement",
         "--talk-name=org.kde.kded5",
         "--talk-name=org.kde.kglobalaccel",
         "--talk-name=org.kde.JobViewServer",
         "--talk-name=org.kde.klauncher5",
         "--talk-name=org.kde.knotify",
         "--talk-name=org.kde.kwalletd5",
         "--talk-name=org.kde.kcookiejar5",
         "--system-talk-name=org.freedesktop.NetworkManager"
     ],
     "cleanup": [
         "/lib/cmake",
         "/lib/pkgconfig",
         "/lib/plugins/designer",
         "/include",
         "/docs",
         "/mkspecs",
         "/share/man",
         "/bin/afmtodit",
         "/usr/bin/xsd",
         "/lib/libKF5*.so",
         "/lib/libboost_*.so",
         "*.a",
         "*.la"
     ],
     "rename-icon": "kontact",
     "copy-icon": true,
     "modules": [
         {
             "name": "gpgme",
             "sources": [
                 {
                     "type": "archive",
                     "url": "https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.11.1.tar.bz2",
                     "sha256": "2d1b111774d2e3dd26dcd7c251819ce4ef774ec5e566251eb9308fa7542fbd6f"
                 }
             ],
             "modules": [
                 {
                     "name": "libgpg-error",
                     "sources": [
                         {
                             "type": "archive",
                             "url": "https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.32.tar.bz2",
                             "sha256": "c345c5e73cc2332f8d50db84a2280abfb1d8f6d4f1858b9daa30404db44540ca"
                         }
                     ]
                 },
                 {
                     "name": "libassuan",
                     "sources": [
                         {
                             "type": "archive",
                             "url": "https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.1.tar.bz2",
                             "sha256": "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449"
                         }
                     ]
                 }
             ]
         },
         {
             "name": "kdiagram",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/kdiagram.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "kcalcore",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/kcalcore.git",
                     "branch": "master"
                 }
             ],
             "modules": [
                 {
                     "name": "libical",
                     "buildsystem": "cmake-ninja",
                     "config-opts": [
                         "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
                     ],
                     "sources": [
                         {
                             "type": "archive",
                             "url": "https://github.com/libical/libical/releases/download/v3.0.4/libical-3.0.4.tar.gz",
                             "sha256": "72b216e10233c3f60cb06062facf41f3b0f70615e5a60b47f9853341a0d5d145"
                         }
                     ],
                     "cleanup": [
                         "/share/gtk-doc"
                     ]
                 }
             ]
         },
         {
             "name": "boost",
             "buildsystem": "simple",
             "build-commands": [
                 "./bootstrap.sh --prefix=/app --with-libraries=graph,program_options,system,thread",
                 "./b2 -j $FLATPAK_BUILDER_N_JOBS install"
             ],
             "sources": [
                 {
                     "type": "archive",
                     "url": "https://dl.bintray.com/boostorg/release/1.68.0/source/boost_1_68_0.tar.bz2",
                     "sha256": "7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7"
                 }
             ]
         },
         {
             "name": "akonadi",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DBUILD_TOOLS=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo",
                 "-DDATABASE_BACKEND=SQLITE"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/akonadi.git",
                     "branch": "master"
                 }
             ],
             "modules": [
                 {
                     "name": "sqlite3",
                     "config-opts": [
                         "--enable-threadsafe",
                         "--enable-threads-override-locks"
                     ],
                     "build-options": {
                         "cflags": "-DSQLITE_ENABLE_UNLOCK_NOTIFY=1"
                     },
                     "sources": [
                         {
                             "type": "archive",
                             "url": "http://sqlite.org/2016/sqlite-autoconf-3150200.tar.gz",
                             "sha256": "07b35063b9386865b78226cdaca9a299d938a87aaa8fdc4d73edb0cef30f3149"
                         }
                     ],
                     "cleanup": [
                         "/bin/sqlite3"
                     ]
                 }
             ]
         },
         {
             "name": "kmime",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/kmime.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "akonadi-mime",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/akonadi-mime.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "kcontacts",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/kcontacts.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "grantlee",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "archive",
                     "url": "https://github.com/steveire/grantlee/archive/v5.1.0.tar.gz",
                     "sha256": "3836572fe5e49d28a1d99186c6d96f88ff839644b4bc77b73b6d8208f6ccc9d1"
                 }
             ]
         },
         {
             "name": "prison",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/prison.git",
                     "branch": "master"
                 }
             ],
             "modules": [
                 {
                     "name": "qrencode",
                     "rm-configure": true,
                     "sources": [
                         {
                             "type": "archive",
                             "url": "https://fukuchi.org/works/qrencode/qrencode-4.0.2.tar.gz",
                             "sha256": "dbabe79c07614625d1f74d8c0ae2ee5358c4e27eab8fd8fe31f9365f821a3b1d"
                         },
                         {
                             "type": "script",
                             "dest-filename": "autogen.sh",
                             "commands": [
                                 "cp -p /usr/share/automake-*/config.{sub,guess} .",
                                 "autoconf -f -B build/autoconf_prepend-include"
                             ]
                         }
                     ]
                 },
                 {
                     "name": "libdmtx",
                     "sources": [
                         {
                             "type": "archive",
                             "url": "https://github.com/dmtx/libdmtx/archive/v0.7.5.tar.gz",
                             "sha256": "be0c5275695a732a5f434ded1fcc232aa63b1a6015c00044fe87f3a689b75f2e"
                         }
                     ]
                 }
             ]
         },
         {
             "name": "akonadi-contacts",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/akonadi-contacts.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "libkgapi",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/libkgapi.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "ksmtp",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/ksmtp.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "kmailtransport",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/kmailtransport.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "kpimtextedit",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/kpimtextedit.git",
                     "branch": "master"
                 },
                 {
                     "type": "patch",
                     "path": "kontact-kpimtextedit-revert-qttextspeech-dep.patch"
                 }
             ]
         },
         {
             "name": "kidentitymanagement",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/kidentitymanagement.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "kcalutils",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/kcalutils.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "xapian",
             "sources": [
                 {
                     "type": "archive",
                     "url": "https://oligarchy.co.uk/xapian/1.4.7/xapian-core-1.4.7.tar.xz",
                     "sha256": "13f08a0b649c7afa804fa0e85678d693fd6069dd394c9b9e7d41973d74a3b5d3"
                 }
             ],
             "cleanup": [
                 "/share/doc/xapian-core",
                 "/bin/xapian-*",
                 "/bin/copydatabase",
                 "/bin/quest",
                 "/bin/simpleexpand",
                 "/bin/simpleindex",
                 "/bin/simplesearch"
             ]
         },
         {
             "name": "kldap",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/kldap.git",
                     "branch": "master"
                 }
             ],
             "modules": [
                 {
                     "name": "openldap",
                     "config-opts": [
                         "--disable-static",
                         "--disable-slapd"
                     ],
                     "sources": [
                         {
                             "type": "archive",
                             "url": "http://mirror.eu.oneandone.net/software/openldap/openldap-release/openldap-2.4.44.tgz",
                             "sha256": "d7de6bf3c67009c95525dde3a0212cc110d0a70b92af2af8e3ee800e81b88400"
                         }
                     ],
                     "cleanup": [
                         "/bin/ldap*",
                         "/sbin"
                     ]
                 }
             ]
         },
         {
             "name": "akonadi-search",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo",
                 "-DAKONADISEARCH_ENABLE_KRUNNER_RUNNER=OFF"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/akonadi-search.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "kmbox",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/kmbox.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "libkdepim",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/libkdepim.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "kimap",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/kimap.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "pimcommon",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/pimcommon.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "kholidays",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/kholidays.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "kalarmcal",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/kalarmcal.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "akonadi-calendar",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/akonadi-calendar.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "akonadi-notes",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/akonadi-notes.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "syndication",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/syndication.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "kdav",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/kdav.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "libkleo",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/libkleo.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "grantleetheme",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/grantleetheme.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "kdepim-apps-libs",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/kdepim-apps-libs.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "libgravatar",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/libgravatar.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "calendarsupport",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/calendarsupport.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "eventviews",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/eventviews.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "incidenceeditor",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/incidenceeditor.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "messagelib",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/messagelib.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "mailimporter",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/mailimporter.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "mailcommon",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/mailcommon.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "kontactinterface",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/kontactinterface.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "libksieve",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/libksieve.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "kdepim-runtime",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/kdepim-runtime.git",
                     "branch": "master"
                 }
             ],
             "modules": [
                 {
                     "name": "libkolabxml",
                     "config-opts": [
                         "-DBUILD_TESTS=OFF",
                         "-DQT5_BUILD=ON",
                         "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
                     ],
                     "buildsystem": "cmake-ninja",
                     "sources": [
                         {
                             "type": "git",
                             "url": "https://git.kolab.org/diffusion/LKX/libkolabxml.git",
                             "branch": "libkolabxml-1.1"
                         }
                     ],
                     "modules": [
                         {
                             "name": "xerces-c",
                             "config-opts": [
                                 "--disable-static"
                             ],
                             "sources": [
                                 {
                                     "type": "archive",
                                     "url": "http://archive.apache.org/dist/xerces/c/3/sources/xerces-c-3.1.4.tar.gz",
                                     "sha256": "c98eedac4cf8a73b09366ad349cb3ef30640e7a3089d360d40a3dde93f66ecf6"
                                 }
                             ],
                             "cleanup": [
                                 "/bin"
                             ]
                         },
                         {
                             "name": "xsd",
                             "make-install-args": [
                                 "install_prefix=/app"
                             ],
                             "no-autogen": true,
                             "sources": [
                                 {
                                     "type": "archive",
                                     "url": "http://www.codesynthesis.com/download/xsd/4.0/xsd-4.0.0+dep.tar.bz2",
                                     "sha256": "eca52a9c8f52cdbe2ae4e364e4a909503493a0d51ea388fc6c9734565a859817"
                                 }
                             ],
                             "cleanup": [
                                 "/share/doc/xsd",
                                 "/share/doc/libxsd"
                             ]
                         },
                         {
                             "name": "kdelibs4support",
                             "config-opts": [
                                 "-DBUILD_TESTING=OFF",
                                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
                             ],
                             "buildsystem": "cmake-ninja",
                             "sources": [
                                 {
                                     "type": "git",
                                     "url": "https://anongit.kde.org/kdelibs4support.git",
                                     "branch": "master"
                                 }
                             ]
                         }
                     ]
                 }
             ]
         },
         {
             "name": "ktnef",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/ktnef.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "kmail",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/kmail.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "akregator",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/akregator.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "korganizer",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/korganizer.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "kalarm",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/kalarm.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "kaddressbook",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/kaddressbook.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "knotes",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/knotes.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "kontact",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/kontact.git",
                     "branch": "master"
                 },
                 {
                     "type": "file",
                     "path": "run_kontact.sh"
                 }
             ],
             "post-install": [
                 "install run_kontact.sh /app/bin/run_kontact.sh"
             ]
         },
         {
             "name": "akonadi-import-wizard",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/akonadi-import-wizard.git",
                     "branch": "master"
                 }
             ]
         },
 
         {
             "name": "kdepim-addons",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/kdepim-addons.git",
                     "branch": "master"
                 }
             ],
             "modules": [
                 {
                     "name": "kitinerary",
                     "config-opts": [
                         "-DBUILD_TESTING=OFF",
                         "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
                     ],
                     "buildsystem": "cmake-ninja",
                     "sources": [
                         {
                             "type": "git",
                             "url": "https://anongit.kde.org/kitinerary.git",
                             "branch": "master"
                         }
                     ],
                     "modules": [
                         {
                             "name": "kpkpass",
                             "config-opts": [
                                 "-DBUILD_TESTING=OFF",
                                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
                             ],
                             "buildsystem": "cmake-ninja",
                             "sources": [
                                 {
                                     "type": "git",
                                     "url": "https://anongit.kde.org/kpkpass.git",
                                     "branch": "master"
                                 }
                             ]
                         }
                     ]
                 }
             ]
         },
         {
             "name": "grantlee-editor",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/grantlee-editor.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "kmail-account-wizard",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/kmail-account-wizard.git",
                     "branch": "master"
                 }
             ],
             "modules": [
                 {
                     "name": "kross",
                     "config-opts": [
                         "-DBUILD_TESTING=OFF",
                         "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
                     ],
                     "buildsystem": "cmake-ninja",
                     "sources": [
                         {
                             "type": "git",
                             "url": "https://anongit.kde.org/kross.git",
                             "branch": "master"
                         }
                     ]
                 }
             ]
         },
         {
             "name": "pim-data-exporter",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/pim-data-exporter.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "pim-sieve-editor",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/pim-sieve-editor.git",
                     "branch": "master"
                 }
             ]
         },
         {
             "name": "mbox-importer",
             "config-opts": [
                 "-DBUILD_TESTING=OFF",
                 "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
             ],
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://anongit.kde.org/mbox-importer.git",
                     "branch": "master"
                 }
             ]
         }
     ]
 }
diff --git a/org.kde.konversation-konvi2x.json b/org.kde.konversation-konvi2x.json
index 691e6bc..a20f788 100644
--- a/org.kde.konversation-konvi2x.json
+++ b/org.kde.konversation-konvi2x.json
@@ -1,31 +1,31 @@
 {
     "id": "org.kde.konversation-konvi2x",
     "rename-desktop-file": "org.kde.konversation.desktop",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "konversation",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "desktop-file-name-suffix": " (Konvi2x)",
     "finish-args": ["--share=ipc", "--share=network", "--socket=x11", "--socket=wayland", "--device=dri",
                     "--talk-name=org.kde.StatusNotifierWatcher", "--talk-name=org.freedesktop.Notifications" ],
     "separate-locales": false,
 
     "modules": [
         {
             "name": "kirigami",
             "config-opts": ["-DCMAKE_BUILD_TYPE=debug", "-DPLASMA_ENABLED=OFF"],
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kirigami.git", "branch": "master" } ]
         },
         {
             "name": "konversation-konvi2x",
             "buildsystem": "cmake-ninja",
             "config-opts": ["-DCMAKE_BUILD_TYPE=debug"],
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/konversation.git", "branch": "wip/qtquick" } ]
         }
     ]
 }
diff --git a/org.kde.konversation.json b/org.kde.konversation.json
index cd2f255..c60552d 100644
--- a/org.kde.konversation.json
+++ b/org.kde.konversation.json
@@ -1,21 +1,21 @@
 {
     "id": "org.kde.konversation",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "konversation",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--share=network", "--socket=x11", "--socket=wayland",
                     "--talk-name=org.kde.StatusNotifierWatcher", "--talk-name=org.freedesktop.Notifications" ],
     "separate-locales": false,
 
     "modules": [
         {
             "name": "konversation",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/konversation.git" } ]
         }
     ]
 }
diff --git a/org.kde.kopete.json b/org.kde.kopete.json
index 491224f..aedc184 100644
--- a/org.kde.kopete.json
+++ b/org.kde.kopete.json
@@ -1,46 +1,46 @@
 {
     "id": "org.kde.kopete",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kopete",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         "boost.json",
         "gpgme.json",
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kdelibs4support",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdelibs4support.git", "branch": "v5.51.0" } ]
         },
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kjs",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kjs.git", "branch": "v5.51.0" } ]
         },
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "khtml",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/khtml.git", "branch": "v5.51.0" } ]
         },
         { "name": "kcontacts", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kcontacts" } ] },
         { "name": "grantlee", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "https://github.com/steveire/grantlee.git" } ] },
         { "name": "kpimtextedit", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kpimtextedit" } ] },
         { "name": "kidentitymanagement", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kidentitymanagement" } ] },
         { "name": "libkleo", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/libkleo" } ] },
         {
             "name": "kopete",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/kopete.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.kpat.json b/org.kde.kpat.json
index 2d06952..b87e222 100644
--- a/org.kde.kpat.json
+++ b/org.kde.kpat.json
@@ -1,49 +1,49 @@
 {
     "id": "org.kde.kpat",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kpat",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         "libkdegames.json",
         {
             "name": "freecell-solver",
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "archive",
                     "url": "http://fc-solve.shlomifish.org/downloads/fc-solve/freecell-solver-4.18.0.tar.xz",
                     "sha256": "d6369779837eef203e5a0051031245da772291cf2d6ff9f66555c69bcc8aaab2"
                 }
             ],
             "modules": [
                 {
                     "name": "random2",
                     "buildsystem": "simple",
                     "build-commands": [
                         "pip3 install --prefix=/app --no-deps ."
                     ],
                     "sources": [
                         {
                             "type": "archive",
                             "url": "https://files.pythonhosted.org/packages/ee/b5/5aca5217501fbd06b1e5aed6d5986baa0da5380880e6bb6f421ed18e3a32/random2-1.0.1.zip",
                             "sha256": "34ad30aac341039872401595df9ab2c9dc36d0b7c077db1cea9ade430ed1c007"
                         }
                     ]
                 }
             ]
         },
         {
             "name": "kpat",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/kpat.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.krdc.json b/org.kde.krdc.json
index 1e697ba..31e26fa 100644
--- a/org.kde.krdc.json
+++ b/org.kde.krdc.json
@@ -1,21 +1,21 @@
 {
     "id": "org.kde.krdc",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "krdc",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         {
             "name": "krdc",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/krdc.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.kreversi.json b/org.kde.kreversi.json
index f0a288c..1a9245c 100644
--- a/org.kde.kreversi.json
+++ b/org.kde.kreversi.json
@@ -1,28 +1,28 @@
 {
     "id": "org.kde.kreversi",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kreversi",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         "libkdegames.json",
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kdelibs4support",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdelibs4support.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "kreversi",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/kreversi.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.krfb.json b/org.kde.krfb.json
index 3efcf00..d04d963 100644
--- a/org.kde.krfb.json
+++ b/org.kde.krfb.json
@@ -1,57 +1,57 @@
 {
     "id": "org.kde.krfb",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "krfb",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         {
             "name": "libgpg-error",
             "sources": [ { "type": "archive", "url": "http://mirrors.dotsrc.org/gnupg/libgpg-error/libgpg-error-1.31.tar.bz2", "sha256": "40d0a823c9329478063903192a1f82496083b277265904878f4bc09e0db7a4ef" } ],
             "cleanup": [ "/lib/libgpg-error.la" ],
             "modules": [
                 {
                     "name": "gettext",
                     "sources": [{
                         "type": "archive",
                         "url": "https://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.8.tar.gz",
                         "sha256": "3da4f6bd79685648ecf46dab51d66fcdddc156f41ed07e580a696a38ac61d48f"
                     }]
                 }
             ]
         },
         {
             "name": "libgcrypt",
             "sources": [
                 {
                     "type": "archive",
                     "url": "https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.7.7.tar.bz2",
                     "sha256": "b9b85eba0793ea3e6e66b896eb031fa05e1a4517277cc9ab10816b359254cd9a"
                 }
             ]
         },
         {
             "name": "LibVNCServer",
             "sources": [
                 {
                     "type": "archive",
                     "url": "https://github.com/LibVNC/libvncserver/archive/LibVNCServer-0.9.11.tar.gz",
                     "sha256": "193d630372722a532136fd25c5326b2ca1a636cbb8bf9bb115ef869c804d2894"
                 }
             ]
         },
         {
             "name": "krfb",
             "buildsystem": "cmake-ninja",
             "config-opts": ["-DCMAKE_BUILD_TYPE=debug", "-DPLASMA_ENABLED=OFF"],
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/krfb.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.krita.json b/org.kde.krita.json
index 18902b7..c1bd7ef 100644
--- a/org.kde.krita.json
+++ b/org.kde.krita.json
@@ -1,39 +1,39 @@
 {
     "id": "org.kde.krita",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "krita",
     "rename-icon": "calligrakrita",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": [
         "--share=ipc",
         "--socket=x11",
         "--socket=wayland",
         "--device=dri"
     ],
     "modules": [
         "boost.json",
         "eigen.json",
         {
             "name": "exiv2",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [
                 {
                     "type": "archive",
                     "url": "http://www.exiv2.org/exiv2-0.25.tar.gz",
                     "sha256": "c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4"
                 }
             ]
         },
         {
             "name": "krita",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/krita.git" } ]
         }
     ]
 }
diff --git a/org.kde.kruler.json b/org.kde.kruler.json
index a902dc6..cd22fdc 100644
--- a/org.kde.kruler.json
+++ b/org.kde.kruler.json
@@ -1,21 +1,21 @@
 {
     "id": "org.kde.kruler",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kruler",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         {
             "name": "kruler",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/kruler.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.kshisen.json b/org.kde.kshisen.json
index f17adea..c2b26ff 100644
--- a/org.kde.kshisen.json
+++ b/org.kde.kshisen.json
@@ -1,29 +1,29 @@
 {
     "id": "org.kde.kshisen",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kshisen",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         "libkdegames.json",
         {
             "name": "libkmahjongg",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/libkmahjongg.git" }
             ]
         },
         {
             "name": "kshisen",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/kshisen.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.ksirk.json b/org.kde.ksirk.json
index 962c2f2..cfaa00a 100644
--- a/org.kde.ksirk.json
+++ b/org.kde.ksirk.json
@@ -1,34 +1,34 @@
 {
     "id": "org.kde.ksirk",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "ksirk",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         "libkdegames.json",
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kdelibs4support",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdelibs4support.git", "branch": "v5.51.0" } ]
         },
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "qca",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/qca.git" } ]
         },
         {
             "name": "ksirk",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/ksirk.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.ksnakeduel.json b/org.kde.ksnakeduel.json
index 24cc7a1..c8c7291 100644
--- a/org.kde.ksnakeduel.json
+++ b/org.kde.ksnakeduel.json
@@ -1,22 +1,22 @@
 {
     "id": "org.kde.ksnakeduel",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "ksnakeduel",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         "libkdegames.json",
         {
             "name": "ksnakeduel",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/ksnakeduel.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.kspaceduel.json b/org.kde.kspaceduel.json
index ffc3b7d..21bde01 100644
--- a/org.kde.kspaceduel.json
+++ b/org.kde.kspaceduel.json
@@ -1,28 +1,28 @@
 {
     "id": "org.kde.kspaceduel",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kspaceduel",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         "libkdegames.json",
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kdelibs4support",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdelibs4support.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "kspaceduel",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/kspaceduel.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.ksquares.json b/org.kde.ksquares.json
index 65621ac..a2f7408 100644
--- a/org.kde.ksquares.json
+++ b/org.kde.ksquares.json
@@ -1,27 +1,27 @@
 {
     "id": "org.kde.ksquares",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "ksquares",
     "rename-icon": "ksquares",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": [
         "--share=ipc",
         "--socket=x11",
         "--socket=wayland",
         "--device=dri"
     ],
     "modules": [
         "libkdegames.json",
         {
             "name": "ksquares",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/ksquares.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.kstars.json b/org.kde.kstars.json
index 9beef2d..89d8f11 100644
--- a/org.kde.kstars.json
+++ b/org.kde.kstars.json
@@ -1,20 +1,20 @@
 {
     "id": "org.kde.kstars",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kstars",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         "eigen.json",
         {
             "name": "kstars",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kstars.git" } ]
         }
     ]
 }
diff --git a/org.kde.ksudoku.json b/org.kde.ksudoku.json
index 96faf3c..ca96e4a 100644
--- a/org.kde.ksudoku.json
+++ b/org.kde.ksudoku.json
@@ -1,26 +1,26 @@
 {
     "id": "org.kde.ksudoku",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "ksudoku",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         "libkdegames.json",
         {
             "name": "glu",
             "sources": [ { "type": "git", "url": "https://anongit.freedesktop.org/git/mesa/glu.git", "branch": "glu-9.0.0" } ]
         },
         {
             "name": "ksudoku",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/ksudoku.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.ksystemlog.json b/org.kde.ksystemlog.json
index 9d3fb8e..1b8aaab 100644
--- a/org.kde.ksystemlog.json
+++ b/org.kde.ksystemlog.json
@@ -1,21 +1,21 @@
 {
     "id": "org.kde.ksystemlog",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "ksystemlog",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         {
             "name": "ksystemlog",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/ksystemlog.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.kteatime.json b/org.kde.kteatime.json
index 9a2588b..ab29e8d 100644
--- a/org.kde.kteatime.json
+++ b/org.kde.kteatime.json
@@ -1,21 +1,21 @@
 {
     "id": "org.kde.kteatime",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kteatime",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         {
             "name": "kteatime",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/kteatime.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.ktimer.json b/org.kde.ktimer.json
index bf29962..31fcf2b 100644
--- a/org.kde.ktimer.json
+++ b/org.kde.ktimer.json
@@ -1,21 +1,21 @@
 {
     "id": "org.kde.ktimer",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "ktimer",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         {
             "name": "ktimer",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/ktimer.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.ktorrent.json b/org.kde.ktorrent.json
index 8bad73e..c9f7ee4 100644
--- a/org.kde.ktorrent.json
+++ b/org.kde.ktorrent.json
@@ -1,45 +1,45 @@
 {
     "id": "org.kde.ktorrent",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "ktorrent",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         "boost.json",
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "qca",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/qca.git" } ]
         },
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kdelibs4support",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdelibs4support.git", "branch": "v5.51.0" } ]
         },
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kross",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kross.git", "branch": "v5.51.0" } ]
         },
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "libktorrent",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/libktorrent.git" } ]
         },
         {
             "name": "ktorrent",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/ktorrent.git" } ]
         }
     ]
 }
diff --git a/org.kde.ktouch.json b/org.kde.ktouch.json
index a170902..b64a867 100644
--- a/org.kde.ktouch.json
+++ b/org.kde.ktouch.json
@@ -1,35 +1,35 @@
 {
     "id": "org.kde.ktouch",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "ktouch",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         {
             "name": "libxkbfile",
             "config-opts": [ "--disable-static", "--enable-x11" ],
             "sources": [
                  {
                      "type": "archive",
                      "url": "https://xorg.freedesktop.org/releases/individual/lib/libxkbfile-1.0.9.tar.gz",
                      "sha256": "95df50570f38e720fb79976f603761ae6eff761613eb56f258c3cb6bab4fd5e3"
                  }
             ]
         },
         {
             "name": "kqtquickcharts",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kqtquickcharts.git" } ]
         },
         {
             "name": "ktouch",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/ktouch.git" } ]
         }
     ]
 }
diff --git a/org.kde.ktuberling.json b/org.kde.ktuberling.json
index dbdb9bf..5b29793 100644
--- a/org.kde.ktuberling.json
+++ b/org.kde.ktuberling.json
@@ -1,33 +1,33 @@
 {
     "id": "org.kde.ktuberling",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "ktuberling",
     "rename-icon": "ktuberling",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": [
         "--share=ipc",
         "--socket=x11",
         "--socket=wayland",
         "--socket=pulseaudio",
         "--device=dri"
     ],
     "modules": [
         "libkdegames.json",
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kdelibs4support",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdelibs4support.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "ktuberling",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/ktuberling.git" } ]
         }
     ]
 }
diff --git a/org.kde.kturtle.json b/org.kde.kturtle.json
index cb1bd34..c031902 100644
--- a/org.kde.kturtle.json
+++ b/org.kde.kturtle.json
@@ -1,19 +1,19 @@
 {
     "id": "org.kde.kturtle",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kturtle",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=network", "--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         {
             "name": "kturtle",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kturtle.git" } ]
         }
     ]
 }
diff --git a/org.kde.kwordquiz.json b/org.kde.kwordquiz.json
index 308a1ca..697c93c 100644
--- a/org.kde.kwordquiz.json
+++ b/org.kde.kwordquiz.json
@@ -1,36 +1,36 @@
 {
     "id": "org.kde.kwordquiz",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kwordquiz",
     "rename-icon": "kwordquiz",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": [
         "--share=network",
         "--share=ipc",
         "--socket=x11",
         "--socket=pulseaudio",
         "--device=dri"
     ],
     "modules": [
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kdelibs4support",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdelibs4support.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "libkeduvocdocument",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/libkeduvocdocument.git" } ]
         },
         {
             "name": "kwordquiz",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kwordquiz.git" } ]
         }
     ]
 }
diff --git a/org.kde.labplot2.json b/org.kde.labplot2.json
index 1defcd8..fa2a18e 100644
--- a/org.kde.labplot2.json
+++ b/org.kde.labplot2.json
@@ -1,35 +1,35 @@
 {
     "id": "org.kde.labplot2",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "labplot2",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kdelibs4support",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdelibs4support.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "gsl",
             "sources": [
                 {
                     "type": "archive",
                     "url": "http://ftp.gnu.org/gnu/gsl/gsl-2.3.tar.gz",
                     "sha256": "562500b789cd599b3a4f88547a7a3280538ab2ff4939504c8b4ac4ca25feadfb"
                 }
             ]
         },
         {
             "name": "labplot",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/labplot.git" } ]
         }
     ]
 }
diff --git a/org.kde.lokalize.json b/org.kde.lokalize.json
index 00c7418..05b58ad 100644
--- a/org.kde.lokalize.json
+++ b/org.kde.lokalize.json
@@ -1,26 +1,26 @@
 {
     "id": "org.kde.lokalize",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "lokalize",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--device=dri" ],
     "separate-locales": false,
 
     "modules": [
         {
             "name": "kross",
             "buildsystem": "cmake-ninja",
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kross.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "lokalize",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/lokalize.git" } ]
         }
     ]
 }
diff --git a/org.kde.lskat.json b/org.kde.lskat.json
index b0c843c..e02bdac 100644
--- a/org.kde.lskat.json
+++ b/org.kde.lskat.json
@@ -1,22 +1,22 @@
 {
     "id": "org.kde.lskat",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "lskat",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         "libkdegames.json",
         {
             "name": "lskat",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/lskat.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.marble.json b/org.kde.marble.json
index 5a52641..8abe011 100644
--- a/org.kde.marble.json
+++ b/org.kde.marble.json
@@ -1,26 +1,26 @@
 {
     "id": "org.kde.marble",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "marble",
     "rename-icon": "marble",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": [
         "--share=network",
         "--share=ipc",
         "--socket=x11",
         "--socket=wayland",
         "--device=dri"
     ],
     "modules": [
         {
             "name": "marble",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/marble.git" } ]
         }
     ]
 }
diff --git a/org.kde.massifvisualizer.json b/org.kde.massifvisualizer.json
index 31ee2a0..d6d5d4b 100644
--- a/org.kde.massifvisualizer.json
+++ b/org.kde.massifvisualizer.json
@@ -1,25 +1,25 @@
 {
     "id": "org.kde.massif-visualizer",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "massif-visualizer",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=host" ],
     
     "modules": [
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kdiagram",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdiagram.git" } ]
         },
         {
             "name": "massif-visualizer",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/massif-visualizer.git" } ]
         }
     ]
 }
diff --git a/org.kde.minuet.json b/org.kde.minuet.json
index d5af273..20acff7 100644
--- a/org.kde.minuet.json
+++ b/org.kde.minuet.json
@@ -1,29 +1,29 @@
 {
     "id": "org.kde.minuet",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "minuet",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--socket=pulseaudio", "--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         {
             "name": "fluidsynth",
             "sources": [
                 {
                     "type": "archive",
                     "url": "http://downloads.sourceforge.net/fluidsynth/fluidsynth-1.1.6.tar.gz",
                     "sha256": "50853391d9ebeda9b4db787efb23f98b1e26b7296dd2bb5d0d96b5bccee2171c"
                 }
             ]
         },
         {
             "name": "minuet",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/minuet.git" } ]
         }
     ]
 }
diff --git a/org.kde.okteta.json b/org.kde.okteta.json
index 33adfa8..631af6f 100644
--- a/org.kde.okteta.json
+++ b/org.kde.okteta.json
@@ -1,21 +1,21 @@
 {
     "id": "org.kde.okteta",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "okteta",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         {
             "name": "okteta",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/okteta.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.okular.json b/org.kde.okular.json
index c1da8c4..8827043 100644
--- a/org.kde.okular.json
+++ b/org.kde.okular.json
@@ -1,151 +1,151 @@
 {
     "id": "org.kde.okular",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "okular",
     "rename-icon": "okular",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": [
         "--share=ipc",
         "--socket=x11",
         "--socket=wayland",
         "--device=dri"
     ],
     "modules": [
         "boost.json",
         {
             "name": "kjs",
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kjs.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "khtml",
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/khtml.git", "branch": "v5.51.0" } ]
         },
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kdelibs4support",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdelibs4support.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "kactivities",
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kactivities.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "purpose",
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/purpose.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "openjpeg2",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "https://github.com/szukw000/openjpeg.git", "branch": "v2.1.2" } ]
         },
         {
             "name": "poppler",
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.freedesktop.org/poppler/poppler.git", "branch": "master" } ]
         },
         {
             "name": "libspectre",
             "sources": [
                 {
                     "type": "archive",
                     "url": "http://libspectre.freedesktop.org/releases/libspectre-0.2.8.tar.gz",
                     "sha256": "65256af389823bbc4ee4d25bfd1cc19023ffc29ae9f9677f2d200fa6e98bc7a8"
                 }
             ],
             "modules": [
                 {
                     "name": "ghostscript",
                     "config-opts": [ "--disable-cups" ],
                     "make-args": [ "so" ],
                     "make-install-args": [ "soinstall" ],
                     "cleanup": [ "/bin", "/share/man", "/share/ghostscript/9.20/doc/", "/share/ghostscript/9.20/examples" ],
                     "rm-configure": true,
                     "sources": [
                         {
                             "type": "archive",
                             "url": "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs920/ghostscript-9.20.tar.xz",
                             "sha256": "3c0f3dc5df6f784850fa4ce7dcc3d6c56ef543af1fbaedd1d9f8d9f8b66de0ab"
                         },
                         {
                             "type": "script",
                             "dest-filename": "autogen.sh",
                             "commands": [
                                 "AUTOMAKE=\"automake --foreign\" autoreconf -vfi"
                             ]
                         }
                     ]
                 }
             ]
         },
         {
             "name": "kdegraphics-mobipocket",
             "config-opts": ["-DCMAKE_BUILD_TYPE=Release" ],
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdegraphics-mobipocket" } ]
         },
         {
             "name": "libzip",
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "archive",
                     "url": "https://libzip.org/download/libzip-1.4.0.tar.xz",
                     "sha256": "e508aba025f5f94b267d5120fc33761bcd98440ebe49dbfe2ed3df3afeacc7b1"
                 }
             ]
         },
         {
             "name": "chmlib",
             "rm-configure": true,
             "sources": [
                 {
                     "type": "archive",
                     "url": "http://www.jedrea.com/chmlib/chmlib-0.40.tar.bz2",
                     "sha256": "3449d64b0cf71578b2c7e3ddc048d4af3661f44a83941ea074a7813f3a59ffa3"
                 },
                 {
                     "type": "script",
                     "dest-filename": "autogen.sh",
                     "commands": [
                         "AUTOMAKE=\"automake --foreign\" autoreconf -vfi"
                     ]
                 }
             ]
         },
         {
             "name": "ebook-tools",
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "archive",
                     "url": "https://downloads.sourceforge.net/project/ebook-tools/ebook-tools/0.2.2/ebook-tools-0.2.2.tar.gz",
                     "sha256": "cbc35996e911144fa62925366ad6a6212d6af2588f1e39075954973bbee627ae"
                 }
             ]
         },
         {
             "name": "okular",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/okular.git", "branch": "master" } ]
         }
     ]
 }
diff --git a/org.kde.palapeli.json b/org.kde.palapeli.json
index f58639f..007fcb7 100644
--- a/org.kde.palapeli.json
+++ b/org.kde.palapeli.json
@@ -1,34 +1,34 @@
 {
     "id": "org.kde.palapeli",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "palapeli",
     "rename-icon": "palapeli",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": [
         "--share=ipc",
         "--socket=x11",
         "--socket=wayland",
         "--socket=pulseaudio",
         "--device=dri"
     ],
     "modules": [
         "libkdegames.json",
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kdelibs4support",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdelibs4support.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "palapeli",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/palapeli.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.parley.json b/org.kde.parley.json
index 485ba37..eddf9b4 100644
--- a/org.kde.parley.json
+++ b/org.kde.parley.json
@@ -1,42 +1,42 @@
 {
     "id": "org.kde.parley",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "parley",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=network", "--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         {
             "name": "kjs",
             "buildsystem": "cmake-ninja",
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kjs.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "khtml",
             "buildsystem": "cmake-ninja",
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/khtml.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "kross",
             "buildsystem": "cmake-ninja",
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kross.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "libkeduvocdocument",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/libkeduvocdocument.git" } ]
         },
         {
             "name": "parley",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/parley.git" } ]
         }
     ]
 }
diff --git a/org.kde.picmi.json b/org.kde.picmi.json
index 7a5576e..2cba022 100644
--- a/org.kde.picmi.json
+++ b/org.kde.picmi.json
@@ -1,23 +1,23 @@
 {
     "id": "org.kde.picmi",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "picmi",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         "libkdegames.json",
         {
             "name": "picmi",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/picmi.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.rocs.json b/org.kde.rocs.json
index 60ccedc..d4fe70b 100644
--- a/org.kde.rocs.json
+++ b/org.kde.rocs.json
@@ -1,29 +1,29 @@
 {
     "id": "org.kde.rocs",
     "branch": "master",
     "base": "io.qt.qtwebkit.BaseApp",
     "base-version": "5.11",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "rocs",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=host" ],
 
     "modules": [
         "boost.json",
         {
             "name": "grantlee",
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "https://github.com/steveire/grantlee.git" } ]
         },
         {
             "name": "rocs",
             "buildsystem": "cmake-ninja",
             "config-opts": ["-DENABLE_TESTING=OFF", "-DQt5WebKit_DIR=/app/lib/cmake/Qt5WebKit/", "-DQt5WebKitWidgets_DIR=/app/lib/cmake/Qt5WebKitWidgets/"],
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/rocs.git" } ]
         }
     ]
 }
diff --git a/org.kde.rsibreak.json b/org.kde.rsibreak.json
index f2e4595..eb6134e 100644
--- a/org.kde.rsibreak.json
+++ b/org.kde.rsibreak.json
@@ -1,21 +1,21 @@
 {
     "id": "org.kde.rsibreak",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "rename-desktop-file": "rsibreak.desktop",
     "sdk": "org.kde.Sdk",
     "command": "rsibreak",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=host" ],
     
     "modules": [
         {
             "name": "rsibreak",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/rsibreak.git" } ]
         }
     ]
 }
diff --git a/org.kde.skanlite.json b/org.kde.skanlite.json
index 72af04d..a7fc865 100644
--- a/org.kde.skanlite.json
+++ b/org.kde.skanlite.json
@@ -1,31 +1,31 @@
 {
     "id": "org.kde.skanlite",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "skanlite",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=home", "--device=all" ],
     "separate-locales": false,
 
     "modules": [
         {
             "name": "sane",
             "buildsystem": "autotools",
             "sources": [ { "type": "git", "url": "https://gitlab.com/sane-project/backends", "tag": "RELEASE_1_0_27"} ]
         },
         {
             "name": "libksane",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/libksane.git" } ]
         },
         {
             "name": "skanlite",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/skanlite.git" } ]
         }
     ]
 }
diff --git a/org.kde.spectacle.json b/org.kde.spectacle.json
index d5cb939..39eddc0 100644
--- a/org.kde.spectacle.json
+++ b/org.kde.spectacle.json
@@ -1,26 +1,26 @@
 {
     "id": "org.kde.spectacle",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "spectacle",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         {
             "name": "purpose",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/purpose.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "spectacle",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/spectacle.git" }
             ]
         }
     ]
 }
diff --git a/org.kde.step.json b/org.kde.step.json
index 2a45ce9..8a5d589 100644
--- a/org.kde.step.json
+++ b/org.kde.step.json
@@ -1,38 +1,38 @@
 {
     "id": "org.kde.step",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "step",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=network", "--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         "eigen.json",
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kjs",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kjs.git", "branch": "v5.51.0" } ]
         },
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "khtml",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/khtml.git", "branch": "v5.51.0" } ]
         },
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kdelibs4support",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdelibs4support.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "step",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/step.git" } ]
         }
     ]
 }
diff --git a/org.kde.trojita.json b/org.kde.trojita.json
index 45c22b4..d897c15 100644
--- a/org.kde.trojita.json
+++ b/org.kde.trojita.json
@@ -1,34 +1,34 @@
 {
     "id": "org.kde.trojita",
     "rename-icon": "trojita",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "trojita",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": [
         "--share=ipc",
         "--share=network",
         "--socket=x11",
         "--socket=wayland",
         "--device=dri",
         "--filesystem=home",
         "--talk-name=org.freedesktop.Notifications"
     ],
     "separate-locales": false,
 
     "modules": [
         {
             "name": "trojita",
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "git://anongit.kde.org/trojita",
                     "branch": "master"
                 }
             ]
         }
     ]
 }
diff --git a/org.kde.umbrello.json b/org.kde.umbrello.json
index fc3c93a..367f4a1 100644
--- a/org.kde.umbrello.json
+++ b/org.kde.umbrello.json
@@ -1,30 +1,30 @@
 {
     "id": "org.kde.umbrello",
     "branch": "master",
     "base": "io.qt.qtwebkit.BaseApp",
     "base-version": "5.11",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "umbrello5",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kdelibs4support",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdelibs4support.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "umbrello",
             "buildsystem": "cmake-ninja",
             "config-opts": ["-DBUILD_KF5=ON", "-DENABLE_TESTING=OFF", "-DQt5WebKit_DIR=/app/lib/cmake/Qt5WebKit/", "-DQt5WebKitWidgets_DIR=/app/lib/cmake/Qt5WebKitWidgets/"],
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/umbrello.git" }
             ]
         }
     ]
 }
diff --git a/todo/org.kde.kajongg.json b/todo/org.kde.kajongg.json
index 75170dd..2b96df2 100644
--- a/todo/org.kde.kajongg.json
+++ b/todo/org.kde.kajongg.json
@@ -1,50 +1,50 @@
 {
     "id": "org.kde.kajongg",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kajongg",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=host" ],
 
     "modules": [
         {
             "name": "libkmahjongg",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/libkmahjongg.git" }
             ]
         },
         {
             "name": "incremental",
             "buildsystem": "simple",
             "build-commands": [
                 "python setup.py build",
                 "python setup.py install --prefix=/app --optimize=1"
             ],
             "sources": [
                 { "type": "git", "url": "https://github.com/glyph/automat.git", "branch": "v0.5.0" }
             ]
         },
         {
             "name": "twisted",
             "buildsystem": "simple",
             "build-commands": [
                 "python setup.py build",
                 "python setup.py install --prefix=/app --optimize=1"
             ],
             "sources": [
                 { "type": "git", "url": "https://github.com/twisted/twisted.git", "branch": "twisted-17.1.0" }
             ]
         },
         {
             "name": "kajongg",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/kajongg.git" }
             ]
         }
     ]
 }
diff --git a/todo/org.kde.kgpg.json b/todo/org.kde.kgpg.json
index d04936d..79e97eb 100644
--- a/todo/org.kde.kgpg.json
+++ b/todo/org.kde.kgpg.json
@@ -1,32 +1,32 @@
 {
     "id": "org.kde.kgpg",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kgpg",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=host" ],
 
     "modules": [
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kdelibs4support",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdelibs4support.git", "branch": "v5.51.0" } ]
         },
         { "name": "grantlee", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "https://github.com/steveire/grantlee.git" } ] },
         { "name": "kcontacts", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kcontacts" } ] },
         { "name": "kmime", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/kmime" } ] },
         { "name": "akonadi-mime", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/akonadi-mime" } ] },
         { "name": "akonadi-contacts", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/akonadi-contacts" } ] },
         {
             "name": "kgpg",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/kgpg.git" }
             ]
         }
     ]
 }
diff --git a/todo/org.kde.kimagemapeditor.json b/todo/org.kde.kimagemapeditor.json
index d4172aa..7ffff6c 100644
--- a/todo/org.kde.kimagemapeditor.json
+++ b/todo/org.kde.kimagemapeditor.json
@@ -1,21 +1,21 @@
 {
     "id": "org.kde.kimagemapeditor",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kimagemapeditor",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=host" ],
 
     "modules": [
         {
             "name": "kimagemapeditor",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/kimagemapeditor.git", "branch": "frameworks----------------------" }
             ]
         }
     ]
 }
diff --git a/todo/org.kde.klinkstatus.json b/todo/org.kde.klinkstatus.json
index c162fc3..158c212 100644
--- a/todo/org.kde.klinkstatus.json
+++ b/todo/org.kde.klinkstatus.json
@@ -1,21 +1,21 @@
 {
     "id": "org.kde.klinkstatus",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "klinkstatus",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=host" ],
 
     "modules": [
         {
             "name": "klinkstatus",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/klinkstatus.git", "branch": "frameworks----------" }
             ]
         }
     ]
 }
diff --git a/todo/org.kde.kremotecontrol.json b/todo/org.kde.kremotecontrol.json
index dbf5a11..eb6c852 100644
--- a/todo/org.kde.kremotecontrol.json
+++ b/todo/org.kde.kremotecontrol.json
@@ -1,21 +1,21 @@
 {
     "id": "org.kde.kremotecontrol",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kremotecontrol",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         {
             "name": "kremotecontrol",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/kremotecontrol.git"--------------------------------- }
             ]
         }
     ]
 }
diff --git a/todo/org.kde.kwave.json b/todo/org.kde.kwave.json
index d32b6c5..3caec40 100644
--- a/todo/org.kde.kwave.json
+++ b/todo/org.kde.kwave.json
@@ -1,40 +1,40 @@
 {
     "id": "org.kde.kwave",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "kwave",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         {
             "name": "fftw",
             "sources": [
                 {
                     "type": "archive",
                     "url": "http://www.fftw.org/fftw-3.3.6-pl2.tar.gz",
                     "sha256": "a5de35c5c824a78a058ca54278c706cdf3d4abba1c56b63531c2cb05f5d57da2"
                 }
             ]
         },
         {
             "name": "audiofile",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://github.com/mpruett/audiofile.git"
                 }
             ]
         },
         {
             "name": "kwave",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/kwave.git" }
             ]
         }
     ]
 }
diff --git a/todo/org.kde.plasmashell.json b/todo/org.kde.plasmashell.json
index 184cb90..e04c8b6 100644
--- a/todo/org.kde.plasmashell.json
+++ b/todo/org.kde.plasmashell.json
@@ -1,199 +1,199 @@
 {
     "id": "org.kde.plasmashell",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "plasmashell",
     "rename-desktop-file": "org.kde.kfontview.desktop",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=host" ],
     
     "modules": [
         "boost.json",
         {
             "name": "kactivities",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kactivities.git", "branch": "master" } ]
         },
         {
             "name": "plasma-framework",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/plasma-framework.git", "branch": "master" } ]
         },
         {
             "name": "krunner",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/krunner.git", "branch": "master" } ]
         },
         {
             "name": "kjs",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kjs.git", "branch": "master" } ]
         },
         {
             "name": "kjsembed",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kjsembed.git", "branch": "master" } ]
         },
         {
             "name": "kdesu",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdesu.git", "branch": "master" } ]
         },
         {
             "name": "libksysguard",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/libksysguard.git", "branch": "master" } ]
         },
         {
             "name": "ksysguard",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/ksysguard.git", "branch": "master" } ]
         },
         {
             "name": "kdelibs4support",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdelibs4support.git", "branch": "master" } ]
         },
         {
             "config-opts": [ "-DENABLE_TESTING=OFF" ],
             "name": "kfilemetadata",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kfilemetadata.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "lmdb",
             "sources": [ { "type": "git", "url": "git://github.com/LMDB/lmdb.git", "branch": "LMDB_0.9.18"}],
             "no-autogen": true,
             "make-install-args": ["prefix=/app"],
             "subdir" : "libraries/liblmdb"
         },
         {
             "config-opts": ["-DENABLE_TESTING=OFF" , "-DLMDB_DIR=/app"],
             "name": "baloo",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/baloo.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "kdecoration",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdecoration.git", "branch": "master" } ]
         },
         {
             "name": "breeze",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/breeze.git", "branch": "master" } ]
         },
         {
             "name": "kscreenlocker",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kscreenlocker.git", "branch": "master" } ]
         },
         {
             "name": "libxkbcommon",
             "config-opts": [ "--disable-static", "--enable-x11" ],
             "sources": [
                  {
                      "type": "archive",
                      "url": "https://xkbcommon.org/download/libxkbcommon-0.7.0.tar.xz",
                      "sha256": "09351592312d67b438655f54da5b67853026662c4a57e6be4d225f04a9989798"
                  }
             ]
         },
         {
             "name": "mtdev",
             "config-opts": [ "--disable-static" ],
             "sources": [
                  {
                      "type": "archive",
                      "url": "http://bitmath.org/code/mtdev/mtdev-1.1.5.tar.bz2",
                      "sha256": "6677d5708a7948840de734d8b4675d5980d4561171c5a8e89e54adf7a13eba7f"
                  }
             ]
         },
         {
             "name": "libinput",
             "config-opts": [ "--disable-static", "--enable-x11" ],
             "sources": [
                  {
                      "type": "archive",
                      "url": "https://freedesktop.org/software/libinput/libinput-1.5.4.tar.xz",
                      "sha256": "6f9ad1ede468bd54ec4469b8a4eb93a6f62f7fe6480c7a43e36c5d58cc2822b7"
                  }
             ]
         },
         {
             "name": "kwin",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kwin.git", "branch": "master" } ]
         },
         {
             "name": "plasma-workspace",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/plasma-workspace.git", "branch": "master" } ]
         },
         {
             "name": "kpeople",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kpeople.git", "branch": "master" } ]
         },
         {
             "name": "kactivities-stats",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kactivities-stats.git", "branch": "master" } ]
         },
         {
             "name": "libxkbfile",
             "config-opts": [ "--disable-static", "--enable-x11" ],
             "sources": [
                  {
                      "type": "archive",
                      "url": "https://www.x.org/releases/individual/lib/libxkbfile-1.0.9.tar.gz",
                      "sha256": "95df50570f38e720fb79976f603761ae6eff761613eb56f258c3cb6bab4fd5e3"
                  }
             ]
         },
         {
             "name": "plasma-desktop",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/plasma-desktop.git", "branch": "master" } ]
         },
         {
             "name": "purpose",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/purpose.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "kross",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kross.git", "branch": "v5.51.0" } ]
         },
         {
             "name": "kdeplasma-addons",
             "buildsystem": "cmake-ninja",
             "builddir": true,
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdeplasma-addons.git", "branch": "master" } ]
         }
     ]
 }
diff --git a/todo/org.kde.sweeper.json b/todo/org.kde.sweeper.json
index be7fdb2..3784a2b 100644
--- a/todo/org.kde.sweeper.json
+++ b/todo/org.kde.sweeper.json
@@ -1,21 +1,21 @@
 {
     "id": "org.kde.sweeper",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.11",
     "sdk": "org.kde.Sdk",
     "command": "sweeper",
     "tags": ["nightly"],
-    "desktop-file-name-prefix": "(Nightly) ",
+    "desktop-file-name-suffix": " (Nightly)",
     "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland" ],
 
     "modules": [
         {
             "name": "sweeper",
             "buildsystem": "cmake-ninja",
             "sources": [
                 { "type": "git", "url": "git://anongit.kde.org/sweeper.git", "branch": "frameworks" }
             ]
         }
     ]
 }