diff --git a/metadata/com.eventyay.organizer.yml b/metadata/com.eventyay.organizer.yml
index efbacc4041..07e5a9d1be 100644
--- a/metadata/com.eventyay.organizer.yml
+++ b/metadata/com.eventyay.organizer.yml
@@ -9,7 +9,7 @@ SourceCode: https://github.com/fossasia/open-event-organizer-android
 IssueTracker: https://github.com/fossasia/open-event-organizer-android/issues
 Changelog: https://github.com/fossasia/open-event-organizer-android/releases
 
-AutoName: ${appName}
+AutoName: Open Event Organizer
 
 RepoType: git
 Repo: https://github.com/fossasia/open-event-organizer-android
diff --git a/metadata/com.farmerbb.notepad.yml b/metadata/com.farmerbb.notepad.yml
index 1aecd584fc..f55f4a7558 100644
--- a/metadata/com.farmerbb.notepad.yml
+++ b/metadata/com.farmerbb.notepad.yml
@@ -7,8 +7,7 @@ SourceCode: https://github.com/farmerbb/Notepad
 IssueTracker: https://github.com/farmerbb/Notepad/issues
 Changelog: https://github.com/farmerbb/Notepad/releases
 
-Name: Notepad
-AutoName: ${appName}
+AutoName: Notepad
 Description: |-
     A simple, bare-bones, no-frills note taking app.
 
diff --git a/metadata/com.farmerbb.secondscreen.free.yml b/metadata/com.farmerbb.secondscreen.free.yml
index 3c9a042dca..5496cf7bd8 100644
--- a/metadata/com.farmerbb.secondscreen.free.yml
+++ b/metadata/com.farmerbb.secondscreen.free.yml
@@ -7,8 +7,7 @@ SourceCode: https://github.com/farmerbb/SecondScreen
 IssueTracker: https://github.com/farmerbb/SecondScreen/issues
 Changelog: https://github.com/farmerbb/SecondScreen/releases
 
-Name: SecondScreen
-AutoName: ${appName}
+AutoName: SecondScreen
 Description: |-
     SecondScreen is an application designed for power users that frequently connect
     their Android devices to external displays. It works with your existing screen
diff --git a/metadata/com.flxrs.dankchat.yml b/metadata/com.flxrs.dankchat.yml
index 1e37bd641a..dc6f99e2ee 100644
--- a/metadata/com.flxrs.dankchat.yml
+++ b/metadata/com.flxrs.dankchat.yml
@@ -8,7 +8,7 @@ AuthorEmail: felix.schmid@flxrs.com
 SourceCode: https://github.com/flex3r/DankChat
 IssueTracker: https://github.com/flex3r/DankChat/issues
 
-AutoName: ${applicationLabel}
+AutoName: DankChat
 Description: Chat in multiple channels at once, regardless if the streamers are live
     or offline, with FrankerFaceZ and BTTV emote support built-in!
 
diff --git a/metadata/com.foobnix.pro.pdf.reader.yml b/metadata/com.foobnix.pro.pdf.reader.yml
index 2c3da01559..218bc0522e 100644
--- a/metadata/com.foobnix.pro.pdf.reader.yml
+++ b/metadata/com.foobnix.pro.pdf.reader.yml
@@ -8,7 +8,7 @@ SourceCode: https://github.com/foobnix/LibreraReader
 IssueTracker: https://github.com/foobnix/LibreraReader/issues
 Changelog: https://librera.mobi/wiki/what-is-new/
 
-AutoName: ${appName}
+AutoName: LibreraReader
 
 RepoType: git
 Repo: https://github.com/foobnix/LibreraReader.git
diff --git a/metadata/com.github.k1rakishou.chan.fdroid.yml b/metadata/com.github.k1rakishou.chan.fdroid.yml
index 3c0b082f5b..13cefc969f 100644
--- a/metadata/com.github.k1rakishou.chan.fdroid.yml
+++ b/metadata/com.github.k1rakishou.chan.fdroid.yml
@@ -7,7 +7,7 @@ WebSite: https://github.com/K1rakishou/Kuroba-Experimental
 SourceCode: https://github.com/K1rakishou/Kuroba-Experimental
 IssueTracker: https://github.com/K1rakishou/Kuroba-Experimental/issues
 
-AutoName: ${appName}
+AutoName: Kuroba Experimental
 
 RepoType: git
 Repo: https://github.com/K1rakishou/Kuroba-Experimental.git
diff --git a/metadata/com.madlonkay.orgro.yml b/metadata/com.madlonkay.orgro.yml
index db1155e3f2..16d728dbab 100644
--- a/metadata/com.madlonkay.orgro.yml
+++ b/metadata/com.madlonkay.orgro.yml
@@ -10,7 +10,7 @@ SourceCode: https://github.com/amake/orgro
 IssueTracker: https://github.com/amake/orgro/issues
 Donate: https://github.com/sponsors/amake
 
-AutoName: ${displayName}
+AutoName: Orgro
 
 RepoType: git
 Repo: https://github.com/amake/orgro
diff --git a/metadata/com.pluscubed.matloglibre.yml b/metadata/com.pluscubed.matloglibre.yml
index cb877f74a2..ed74ff8734 100644
--- a/metadata/com.pluscubed.matloglibre.yml
+++ b/metadata/com.pluscubed.matloglibre.yml
@@ -6,8 +6,7 @@ SourceCode: https://github.com/pluscubed/matlog
 IssueTracker: https://github.com/pluscubed/matlog/issues
 Changelog: https://github.com/pluscubed/matlog/releases
 
-Name: MatLog Libre
-AutoName: ${appName}
+AutoName: MatLog Libre
 Description: |-
     Debug your apps. Find error stacktraces. See what your phone is saying about you
     behind your back. It's all there in the system log, aka logcat!
diff --git a/metadata/de.freehamburger.yml b/metadata/de.freehamburger.yml
index 57530942c8..0d3e5d29dd 100644
--- a/metadata/de.freehamburger.yml
+++ b/metadata/de.freehamburger.yml
@@ -7,8 +7,7 @@ AuthorName: livodeu
 SourceCode: https://github.com/livodeu/FreeHamburger
 IssueTracker: https://github.com/livodeu/FreeHamburger/issues
 
-Name: FreeHamburger
-AutoName: ${name}
+AutoName: FreeHamburger
 
 RepoType: git
 Repo: https://github.com/livodeu/FreeHamburger
diff --git a/metadata/info.puzz.a10000sentences.yml b/metadata/info.puzz.a10000sentences.yml
index 3fffd75fe6..d5d9a19b88 100644
--- a/metadata/info.puzz.a10000sentences.yml
+++ b/metadata/info.puzz.a10000sentences.yml
@@ -9,8 +9,7 @@ SourceCode: https://github.com/tkrajina/10000sentences
 IssueTracker: https://github.com/tkrajina/10000sentences/issues
 Changelog: https://github.com/tkrajina/10000sentences/releases
 
-Name: 10,000 sentences
-AutoName: ${appName}
+AutoName: 10,000 sentences
 Description: |-
     ''10,000 sentences'' is an app that will help you learn new words in your
     target languages: You will be presented with a series of sentences where
diff --git a/metadata/it.faerb.crond.yml b/metadata/it.faerb.crond.yml
index 5b2fa9b98f..f23b85f9cf 100644
--- a/metadata/it.faerb.crond.yml
+++ b/metadata/it.faerb.crond.yml
@@ -6,8 +6,7 @@ SourceCode: https://github.com/faerbit/android-crond
 IssueTracker: https://github.com/faerbit/android-crond/issues
 Changelog: https://github.com/Faerbit/android-crond/blob/HEAD/Changelog.md
 
-Name: crond
-AutoName: ${applicationLabel}
+AutoName: crond
 Description: |-
     Simple android app which implements crond using AlarmManager.
 
diff --git a/metadata/org.totschnig.myexpenses.yml b/metadata/org.totschnig.myexpenses.yml
index c755a1e037..4255a4c09a 100644
--- a/metadata/org.totschnig.myexpenses.yml
+++ b/metadata/org.totschnig.myexpenses.yml
@@ -15,7 +15,7 @@ Donate: http://www.myexpenses.mobi/#donate
 FlattrID: '1028216'
 Bitcoin: 1GCUGCSfFXzSC81ogHu12KxfUn3cShekMn
 
-AutoName: ${appName}
+AutoName: MyExpenses
 
 RepoType: git
 Repo: https://github.com/mtotschnig/MyExpenses.git