diff --git a/CHANGELOG.md b/CHANGELOG.md
index 804b1bd1e7..95809c2a55 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ Since there's a lot of new people coming over, I'll repeat my statement a few re
 - Repositioned cutout options in settings
 - Splash icon now uses coloured variant of the icon
 - Removed deep link for sources, this should be handled by extensions
+- Removed braces from nightly (and debug) app name
 
 ## Fixes
 - Fixed splash icon hardcoded to white
diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml
index 1e7b9a19b4..102211ad90 100644
--- a/app/src/debug/res/values/strings.xml
+++ b/app/src/debug/res/values/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name" translatable="false">Yōkai (Debug)</string>
-    <string name="app_short_name" translatable="false">Yōkai (Debug)</string>
+    <string name="app_name" translatable="false">Yōkai Debug</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt b/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
index 91b10ad4f6..4ab186787d 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
@@ -83,8 +83,8 @@ class LocalSource(private val context: Context) : CatalogueSource, UnmeteredSour
         }
 
         private fun getBaseDirectories(context: Context): List<File> {
-            val library = context.getString(R.string.app_name_prod) + File.separator + "local"
-            val normalized = context.getString(R.string.app_name_normalized) + File.separator + "local"
+            val library = context.getString(R.string.app_short_name) + File.separator + "local"
+            val normalized = context.getString(R.string.app_normalized_name) + File.separator + "local"
             val j2k = "TachiyomiJ2K" + File.separator + "local"
             val tachi = "Tachiyomi" + File.separator + "local"
             return DiskUtil.getExternalStorages(context).map {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 65a5d49f00..95bb3b4cc5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,8 +2,7 @@
 <resources>
     <string name="app_name" translatable="false">Yōkai</string>
     <string name="app_short_name" translatable="false">Yōkai</string>
-    <string name="app_name_prod" translatable="false">Yōkai</string>
-    <string name="app_name_normalized" translatable="false">Yokai</string>
+    <string name="app_normalized_name" translatable="false">Yokai</string>
 
     <string name="all_files_permission_required">File permissions required</string>
     <string name="external_storage_permission_notice">TachiyomiJ2K requires access to all files in Android 11 to download chapters, create automatic backups, and read local series. \n\nOn the next screen, enable \"Allow access to manage all files.\"</string>
diff --git a/app/src/nightly/res/values/strings.xml b/app/src/nightly/res/values/strings.xml
index 0ef47eac37..d4b725c00a 100644
--- a/app/src/nightly/res/values/strings.xml
+++ b/app/src/nightly/res/values/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name" translatable="false">Yōkai (Nightly)</string>
-    <string name="app_short_name" translatable="false">Yōkai (Nightly)</string>
-</resources>
+    <string name="app_name" translatable="false">Yōkai Nightly</string>
+</resources>
\ No newline at end of file