diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0bdc2c5df8..5cca299f86 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -235,7 +235,7 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
      <activity android:name=".DeviceListActivity"
-               android:label="@string/AndroidManifest_manage_paired_devices"
+               android:label="@string/AndroidManifest_manage_linked_devices"
                android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".LogSubmitActivity"
diff --git a/res/layout/device_list_fragment.xml b/res/layout/device_list_fragment.xml
index cf7df56a93..4eb43f68e7 100644
--- a/res/layout/device_list_fragment.xml
+++ b/res/layout/device_list_fragment.xml
@@ -27,7 +27,7 @@
               android:gravity="center|center_vertical"
               android:textSize="20sp"
               android:visibility="gone"
-              android:text="@string/device_list_fragment__no_devices_paired"/>
+              android:text="@string/device_list_fragment__no_devices_linked"/>
 
     <ListView android:id="@id/android:list"
               android:layout_width="match_parent"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index aa177eece8..0c6dac0a86 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -169,17 +169,17 @@
     <string name="DateUtils_minutes_ago">%d min</string>
 
     <!-- DeviceListActivity -->
-    <string name="DeviceListActivity_disconnect_s">Disconnect \'%s\'?</string>
-    <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">By disconnecting this device, it will no longer be able to send or receive messages.</string>
+    <string name="DeviceListActivity_unlink_s">Unlink \'%s\'?</string>
+    <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">By unlinking this device, it will no longer be able to send or receive messages.</string>
     <string name="DeviceListActivity_network_connection_failed">Network connection failed...</string>
     <string name="DeviceListActivity_try_again">Try again</string>
-    <string name="DeviceListActivity_disconnecting_device">Disconnecting device...</string>
-    <string name="DeviceListActivity_disconnecting_device_no_ellipse">Disconnecting device</string>
+    <string name="DeviceListActivity_unlinking_device">Unlinking device...</string>
+    <string name="DeviceListActivity_unlinking_device_no_ellipsis">Unlinking device</string>
     <string name="DeviceListActivity_network_failed">Network failed!</string>
 
     <!-- DeviceListItem -->
     <string name="DeviceListItem_unnamed_device">Unnamed device</string>
-    <string name="DeviceListItem_created_s">Created %s</string>
+    <string name="DeviceListItem_linked_s">Linked %s</string>
     <string name="DeviceListItem_last_active_s">Last active %s</string>
 
     <!-- ShareActivity -->
@@ -293,13 +293,13 @@
         - Read all your messages
         \n- Send messages in your name
     </string>
-    <string name="DeviceProvisioningActivity_content_progress_title">Adding device</string>
-    <string name="DeviceProvisioningActivity_content_progress_content">Adding new device...</string>
-    <string name="DeviceProvisioningActivity_content_progress_success">Device added!</string>
+    <string name="DeviceProvisioningActivity_content_progress_title">Linking device</string>
+    <string name="DeviceProvisioningActivity_content_progress_content">Linking new device...</string>
+    <string name="DeviceProvisioningActivity_content_progress_success">Device linked!</string>
     <string name="DeviceProvisioningActivity_content_progress_no_device">No device found.</string>
     <string name="DeviceProvisioningActivity_content_progress_network_error">Network error.</string>
     <string name="DeviceProvisioningActivity_content_progress_key_error">Invalid QR code.</string>
-    <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Sorry, you have too many devices registered already, try removing some...</string>
+    <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Sorry, you have too many devices linked already, try removing some...</string>
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Enter passphrase</string>
@@ -549,7 +549,7 @@
     <string name="country_selection_fragment__search">Search</string>
 
     <!-- device_list_fragment -->
-    <string name="device_list_fragment__no_devices_paired">No devices paired...</string>
+    <string name="device_list_fragment__no_devices_linked">No devices linked...</string>
 
     <!-- log_submit_activity -->
     <string name="log_submit_activity__log_fetch_failed">Could not grab logs from your device. You can still use ADB to get debug logs instead.</string>
@@ -737,7 +737,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_paired_devices">Manage paired devices</string>
+    <string name="AndroidManifest_manage_linked_devices">Manage linked devices</string>
 
     <!-- arrays.xml -->
     <string name="arrays__import_export">Import / export</string>
diff --git a/src/org/thoughtcrime/securesms/DeviceListActivity.java b/src/org/thoughtcrime/securesms/DeviceListActivity.java
index 0f20d1a415..70605144e3 100644
--- a/src/org/thoughtcrime/securesms/DeviceListActivity.java
+++ b/src/org/thoughtcrime/securesms/DeviceListActivity.java
@@ -137,8 +137,8 @@ public class DeviceListActivity extends PassphraseRequiredActionBarActivity {
       final long   deviceId   = ((DeviceListItem)view).getDeviceId();
 
       AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(getActivity());
-      builder.setTitle(getActivity().getString(R.string.DeviceListActivity_disconnect_s, deviceName));
-      builder.setMessage(R.string.DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive);
+      builder.setTitle(getActivity().getString(R.string.DeviceListActivity_unlink_s, deviceName));
+      builder.setMessage(R.string.DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive);
       builder.setNegativeButton(android.R.string.cancel, null);
       builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
         @Override
@@ -164,8 +164,8 @@ public class DeviceListActivity extends PassphraseRequiredActionBarActivity {
 
     private void handleDisconnectDevice(final long deviceId) {
       new ProgressDialogAsyncTask<Void, Void, Void>(getActivity(),
-                                                    R.string.DeviceListActivity_disconnecting_device_no_ellipse,
-                                                    R.string.DeviceListActivity_disconnecting_device)
+                                                    R.string.DeviceListActivity_unlinking_device_no_ellipsis,
+                                                    R.string.DeviceListActivity_unlinking_device)
       {
         @Override
         protected Void doInBackground(Void... params) {
diff --git a/src/org/thoughtcrime/securesms/DeviceListItem.java b/src/org/thoughtcrime/securesms/DeviceListItem.java
index 39b32f5bac..fe35005053 100644
--- a/src/org/thoughtcrime/securesms/DeviceListItem.java
+++ b/src/org/thoughtcrime/securesms/DeviceListItem.java
@@ -38,7 +38,7 @@ public class DeviceListItem extends LinearLayout {
     if (TextUtils.isEmpty(deviceInfo.getName())) this.name.setText(R.string.DeviceListItem_unnamed_device);
     else                                         this.name.setText(deviceInfo.getName());
 
-    this.created.setText(getContext().getString(R.string.DeviceListItem_created_s,
+    this.created.setText(getContext().getString(R.string.DeviceListItem_linked_s,
                                                 DateUtils.getExtendedRelativeTimeSpanString(getContext(),
                                                                                             Locale.getDefault(),
                                                                                             deviceInfo.getCreated())));
diff --git a/src/org/thoughtcrime/securesms/DeviceProvisioningActivity.java b/src/org/thoughtcrime/securesms/DeviceProvisioningActivity.java
index 39e0ea33ac..2d5799da3e 100644
--- a/src/org/thoughtcrime/securesms/DeviceProvisioningActivity.java
+++ b/src/org/thoughtcrime/securesms/DeviceProvisioningActivity.java
@@ -149,7 +149,7 @@ public class DeviceProvisioningActivity extends PassphraseRequiredActionBarActiv
             Toast.makeText(context, R.string.DeviceProvisioningActivity_content_progress_key_error, Toast.LENGTH_LONG).show();
             break;
           case LIMIT_EXCEEDED:
-            Toast.makeText(context, R.string.DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already, Toast.LENGTH_LONG).show();
+            Toast.makeText(context, R.string.DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already, Toast.LENGTH_LONG).show();
             break;
         }
         dialog.dismiss();