diff --git a/build.gradle b/build.gradle
index 9af74aada0..a90e26c062 100644
--- a/build.gradle
+++ b/build.gradle
@@ -183,10 +183,13 @@ android {
 
     buildTypes {
         debug {
+            applicationIdSuffix ".debug"
+            resValue("string", "derived_app_name", "Lawnchair (Debug)")
             signingConfig releaseSigning
         }
 
         release {
+            resValue("string", "derived_app_name", "Lawnchair")
             signingConfig releaseSigning
             minifyEnabled true
             shrinkResources true
diff --git a/lawnchair/res/values-en-rGB/strings.xml b/lawnchair/res/values-en-rGB/strings.xml
index 937c71db12..679b0a6367 100644
--- a/lawnchair/res/values-en-rGB/strings.xml
+++ b/lawnchair/res/values-en-rGB/strings.xml
@@ -17,7 +17,6 @@
 
 <resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="iconPackPackageDefault" translatable="false">""</string>
-    <string name="derived_app_name" tools:override="true" translatable="false">Lawnchair</string>
     <string name="twitter" translatable="false">Twitter</string>
     <string name="github" translatable="false">GitHub</string>
 
diff --git a/lawnchair/res/values/strings.xml b/lawnchair/res/values/strings.xml
index bb2b6f4673..79b91be48e 100644
--- a/lawnchair/res/values/strings.xml
+++ b/lawnchair/res/values/strings.xml
@@ -17,7 +17,6 @@
 
 <resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="iconPackPackageDefault" translatable="false">""</string>
-    <string name="derived_app_name" tools:override="true" translatable="false">Lawnchair</string>
 
     <!-- PreferenceDashboard -->
     <string name="settings">Settings</string>
diff --git a/quickstep/res/values/strings.xml b/quickstep/res/values/strings.xml
index 6caed1cf7d..d8fd7c50f8 100644
--- a/quickstep/res/values/strings.xml
+++ b/quickstep/res/values/strings.xml
@@ -18,9 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
-    <!-- Application name -->
-    <string name="derived_app_name" translatable="false">Quickstep</string>
-
     <!-- Options for recent tasks -->
     <!-- Title for an option to keep an app pinned to the screen until it is unpinned -->
     <string name="recent_task_option_pin">Pin</string>
diff --git a/res/values/config.xml b/res/values/config.xml
index 25911e688f..54492cb377 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -4,10 +4,6 @@
 
     <integer name="extracted_color_gradient_alpha">153</integer>
 
-    <!-- A string pointer to the original app name string. This allows derived projects to
-     easily override the app name without providing all translations -->
-    <string name="derived_app_name" translatable="false">@string/app_name</string>
-
     <!-- String representing the intent for search on the apps market. To specify a query, add
     q=<query> to the data to the intent -->
     <string name="market_search_intent" translatable="false">market://search?c=apps</string>