diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b5c46b41422d5c7b885f98c5bef9e4b1b07af276..a1d419e85ace53d64648905ebb4e5aca8e13fa80 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -40,7 +40,7 @@
 
     <application
         android:name=".DocumentsApplication"
-        android:label="@string/app_label"
+        android:label="@string/files_label"
         android:icon="@mipmap/ic_launcher"
         android:supportsRtl="true"
         android:allowBackup="true"
@@ -84,7 +84,7 @@
 
         <activity
             android:name=".files.LauncherActivity"
-            android:label="@string/launcher_label"
+            android:label="@string/files_label"
             android:icon="@drawable/launcher_icon"
             android:theme="@android:style/Theme.NoDisplay">
         </activity>
@@ -100,7 +100,7 @@
         <activity-alias
             android:name=".LauncherActivity"
             android:targetActivity=".files.LauncherActivity"
-            android:label="@string/launcher_label"
+            android:label="@string/files_label"
             android:exported="true"
             android:icon="@drawable/launcher_icon" >
             <intent-filter>
diff --git a/src/com/android/documentsui/files/FilesActivity.java b/src/com/android/documentsui/files/FilesActivity.java
index 7c09811c9187682bfe943f9d6111297e9e536091..a2178099ab069265f25b7402c52c1f772fc192ff 100644
--- a/src/com/android/documentsui/files/FilesActivity.java
+++ b/src/com/android/documentsui/files/FilesActivity.java
@@ -290,7 +290,7 @@ public class FilesActivity extends BaseActivity implements AbstractActionHandler
         Intent intent = getIntent();
         return (intent != null && intent.hasExtra(Intent.EXTRA_TITLE))
                 ? intent.getStringExtra(Intent.EXTRA_TITLE)
-                : getString(R.string.app_label);
+                : getString(R.string.files_label);
     }
 
     @Override
diff --git a/src/com/android/documentsui/files/LauncherActivity.java b/src/com/android/documentsui/files/LauncherActivity.java
index 8cd7dcbb8073abe1e86e5c4084bb3b65f4a0a7bd..6ae3652c57bb819cc237fc7a263dfb2ff84ad45a 100644
--- a/src/com/android/documentsui/files/LauncherActivity.java
+++ b/src/com/android/documentsui/files/LauncherActivity.java
@@ -98,7 +98,7 @@ public class LauncherActivity extends Activity {
     private void startTask() {
         Intent intent = createLaunchIntent(this);
 
-        intent.putExtra(TASK_LABEL_RES, R.string.launcher_label);
+        intent.putExtra(TASK_LABEL_RES, R.string.files_label);
         intent.putExtra(TASK_ICON_RES, R.drawable.launcher_icon);
 
         // Forward any flags from the original intent.
diff --git a/src/com/android/documentsui/files/MenuManager.java b/src/com/android/documentsui/files/MenuManager.java
index 742bc97395be7af583a24bbf5550706bd95b622c..8cabb46ceb5ff4155ea67e21ebcdf1356d531187 100644
--- a/src/com/android/documentsui/files/MenuManager.java
+++ b/src/com/android/documentsui/files/MenuManager.java
@@ -78,7 +78,7 @@ public final class MenuManager extends com.android.documentsui.MenuManager {
     public void updateKeyboardShortcutsMenu(
             List<KeyboardShortcutGroup> data, IntFunction<String> stringSupplier) {
         KeyboardShortcutGroup group = new KeyboardShortcutGroup(
-                stringSupplier.apply(R.string.app_label));
+                stringSupplier.apply(R.string.files_label));
         group.addItem(new KeyboardShortcutInfo(
                 stringSupplier.apply(R.string.menu_cut_to_clipboard), KeyEvent.KEYCODE_X,
                 KeyEvent.META_CTRL_ON));
diff --git a/src/com/android/documentsui/picker/PickActivity.java b/src/com/android/documentsui/picker/PickActivity.java
index c2fbd50a06421b126e03372334329660cac8ee0b..263c2654c3d4c8d4f7eb041bf352603d6e9fa293 100644
--- a/src/com/android/documentsui/picker/PickActivity.java
+++ b/src/com/android/documentsui/picker/PickActivity.java
@@ -300,7 +300,7 @@ public class PickActivity extends BaseActivity implements ActionHandler.Addons {
                     title = getResources().getString(R.string.title_save);
                 } else {
                     // If all else fails, just call it "Documents".
-                    title = getResources().getString(R.string.app_label);
+                    title = getResources().getString(R.string.files_label);
                 }
             }
         }
diff --git a/src/com/android/documentsui/services/FileOperationService.java b/src/com/android/documentsui/services/FileOperationService.java
index c7be5f4fc06e7e680f4b8ffe041fe3fb188ded93..ffbffdfed6d641ee944c02d5f8d5dc26c157a671 100644
--- a/src/com/android/documentsui/services/FileOperationService.java
+++ b/src/com/android/documentsui/services/FileOperationService.java
@@ -176,7 +176,7 @@ public class FileOperationService extends Service implements Job.Listener {
         if (features.isNotificationChannelEnabled()) {
             NotificationChannel channel = new NotificationChannel(
                     NOTIFICATION_CHANNEL_ID,
-                    getString(R.string.app_label),
+                    getString(R.string.files_label),
                     NotificationManager.IMPORTANCE_LOW);
             notificationManager.createNotificationChannel(channel);
         }