diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ef2ada1922..2f17357493 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -288,7 +288,7 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
      <activity android:name=".DeviceActivity"
-               android:label="@string/AndroidManifest_manage_linked_devices"
+               android:label="@string/AndroidManifest__linked_devices"
                android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".LogSubmitActivity"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 352bee632f..5e09efb779 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -907,7 +907,7 @@
     <string name="AndroidManifest__media_overview">All images</string>
     <string name="AndroidManifest__media_overview_named">All images with %1$s</string>
     <string name="AndroidManifest__message_details">Message details</string>
-    <string name="AndroidManifest_manage_linked_devices">Manage linked devices</string>
+    <string name="AndroidManifest__linked_devices">Linked devices</string>
     <string name="AndroidManifest__invite_friends">Invite friends</string>
     <string name="AndroidManifest_archived_conversations">Archived conversations</string>
 
@@ -1023,7 +1023,7 @@
     <string name="preferences__conversation_length_limit">Conversation length limit</string>
     <string name="preferences__trim_all_conversations_now">Trim all conversations now</string>
     <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">Scan through all conversations and enforce conversation length limits</string>
-    <string name="preferences__devices">Devices</string>
+    <string name="preferences__linked_devices">Linked devices</string>
     <string name="preferences__light_theme">Light</string>
     <string name="preferences__dark_theme">Dark</string>
     <string name="preferences__appearance">Appearance</string>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 90f5277a2d..ebb5936e23 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -22,7 +22,7 @@
                 android:icon="?pref_ic_chats"/>
 
     <Preference android:key="preference_category_devices"
-                android:title="@string/preferences__devices"
+                android:title="@string/preferences__linked_devices"
                 android:icon="?pref_ic_devices"/>
 
     <Preference android:key="preference_category_advanced"
diff --git a/src/org/thoughtcrime/securesms/DeviceActivity.java b/src/org/thoughtcrime/securesms/DeviceActivity.java
index b9b10aa6a9..f24cdea9f9 100644
--- a/src/org/thoughtcrime/securesms/DeviceActivity.java
+++ b/src/org/thoughtcrime/securesms/DeviceActivity.java
@@ -55,7 +55,7 @@ public class DeviceActivity extends PassphraseRequiredActionBarActivity
   @Override
   public void onCreate(Bundle bundle, @NonNull MasterSecret masterSecret) {
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-    getSupportActionBar().setTitle(R.string.AndroidManifest_manage_linked_devices);
+    getSupportActionBar().setTitle(R.string.AndroidManifest__linked_devices);
     this.deviceAddFragment  = new DeviceAddFragment();
     this.deviceListFragment = new DeviceListFragment();
     this.deviceLinkFragment = new DeviceLinkFragment();