diff --git a/app/build.gradle b/app/build.gradle
index b7264498e..c4e4d1d23 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -62,6 +62,7 @@ android {
         buildConfigField "String", "GIT_HASH_SHORT", "\"${getGitHashShort()}\""
         buildConfigField "boolean", "INTERNET_ACCESS", "false"
         resValue "string", "pebble_content_provider", "com.getpebble.android.provider"
+        resValue "string", "app_name", "@string/application_name"
     }
     signingConfigs {
         nightly {
@@ -91,6 +92,7 @@ android {
             }
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
             resValue "string", "pebble_content_provider", "com.getpebble.android.provider"
+            resValue "string", "app_name", "@string/application_name_main_nightly"
             debuggable true
         }
         nopebble {
@@ -104,6 +106,7 @@ android {
             }
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
             resValue "string", "pebble_content_provider", "com.getpebble.android.nopebble.provider"
+            resValue "string", "app_name", "@string/application_name_main_nopebble"
             debuggable true
         }
 
@@ -140,6 +143,7 @@ android {
             buildConfigField "boolean", "INTERNET_ACCESS", "true"
             // Disable pebble provider to allow Bangle.js Gadgetbridge to coexist with Gadgetbridge
             resValue "string", "pebble_content_provider", "com.getpebble.android.nopebble.provider"
+            resValue "string", "app_name", "@string/application_name_banglejs_main"
         }
     }
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index edf7b965e..a2078b549 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -69,7 +69,8 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:requestLegacyExternalStorage="true"
-        android:theme="@style/GadgetbridgeTheme">
+        android:theme="@style/GadgetbridgeTheme"
+        tools:replace="android:label">
         <activity
             android:name=".activities.ControlCenterv2"
             android:label="@string/title_activity_controlcenter"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4b5d55d2f..9bebbd325 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <string name="app_name">Gadgetbridge</string>
+    <string name="application_name">Gadgetbridge</string>
     <string name="title_activity_controlcenter">Gadgetbridge</string>
     <string name="about_activity_title">About Gadgetbridge</string>
     <string name="about_description">Cloudless copylefted libre replacement for closed source Android gadget apps from vendors.</string>
     <string name="gadgetbridge_running">Gadgetbridge running</string>
 
-    <string name="app_name_banglejs_main">Bangle.js Gadgetbridge</string>
+    <string name="application_name_banglejs_main">Bangle.js Gadgetbridge</string>
     <string name="title_activity_controlcenter_banglejs_main">Bangle.js Gadgetbridge</string>
     <string name="about_activity_title_banglejs_main">About Bangle.js Gadgetbridge</string>
     <string name="about_description_banglejs_main">Android companion app for Bangle.js built on top of the Gadgetbridge project, with added Internet Access.</string>
     <string name="gadgetbridge_running_banglejs_main">Bangle.js running</string>
 
-    <string name="app_name_banglejs_nopebble">Bangle.js Gadgetbridge</string>
+    <string name="application_name_banglejs_nopebble">Bangle.js Gadgetbridge</string>
     <string name="title_activity_controlcenter_banglejs_nopebble">Bangle.js Gadgetbridge</string>
     <string name="about_activity_title_banglejs_nopebble">About Bangle.js Gadgetbridge</string>
     <string name="about_description_banglejs_nopebble">Android companion app for Bangle.js built on top of the Gadgetbridge project, with added Internet Access.</string>
     <string name="gadgetbridge_running_banglejs_nopebble">Bangle.js running</string>
 
-    <string name="app_name_main_nightly">Gadgetbridge (Nightly)</string>
+    <string name="application_name_main_nightly">Gadgetbridge (Nightly)</string>
     <string name="title_activity_controlcenter_main_nightly">Gadgetbridge Nightly</string>
     <string name="about_activity_title_main_nightly">About Gadgetbridge Nightly</string>
     <string name="about_description_main_nightly">Cloudless copylefted libre replacement for closed source Android gadget apps from vendors. Nightly releases of Gadgetbridge. It cannot be installed if you already have either the Gadgetbridge or the Pebble app installed, due to a conflict in the Pebble provider.</string>
     <string name="gadgetbridge_running_main_nightly">Nightly GB running</string>
 
-    <string name="app_name_main_nopebble">Gadgetbridge (Nightly, No Pebble provider)</string>
+    <string name="application_name_main_nopebble">Gadgetbridge (Nightly, No Pebble provider)</string>
     <string name="title_activity_controlcenter_main_nopebble">Gadgetbridge Nightly No Pebble </string>
     <string name="about_activity_title_main_nopebble">About Gadgetbridge Nightly No Pebble</string>
     <string name="about_description_main_nopebble">Cloudless copylefted libre replacement for closed source Android gadget apps from vendors. Nightly releases of Gadgetbridge. This version has the Pebble provider renamed to prevent conflicts, so some Pebble related integrations will not work, but it can be installed alongside existing Gadgetbridge installation.</string>