diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1802b13e..c692c0ec 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -294,7 +294,8 @@
     <string name="mute">Mute</string>
     <string name="devices">Devices</string>
 
-    <string name="settings_dark_mode">Dark mode</string>
+    <string name="settings_rename">Device name</string>
+    <string name="settings_dark_mode">Dark theme</string>
     <string name="settings_more_settings_title">More settings</string>
     <string name="settings_more_settings_text">Per-device settings can be found under \'Plugin settings\' from within a device.</string>
     <string name="setting_persistent_notification">Show persistent notification</string>
diff --git a/src/org/kde/kdeconnect/UserInterface/SettingsFragment.java b/src/org/kde/kdeconnect/UserInterface/SettingsFragment.java
index 1b68712c..2a80d51c 100644
--- a/src/org/kde/kdeconnect/UserInterface/SettingsFragment.java
+++ b/src/org/kde/kdeconnect/UserInterface/SettingsFragment.java
@@ -29,6 +29,7 @@ public class SettingsFragment extends PreferenceFragmentCompat implements MainAc
     }
 
     TwoStatePreference createTwoStatePreferenceCompat(Context context) {
+        //The switch didn't work on Android 6, not sure about 7
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             return new SwitchPreference(context);
         } else {
@@ -54,7 +55,7 @@ public class SettingsFragment extends PreferenceFragmentCompat implements MainAc
             return true;
         });
         String deviceName = DeviceHelper.getDeviceName(context);
-        renameDevice.setTitle(R.string.device_rename_title);
+        renameDevice.setTitle(R.string.settings_rename);
         renameDevice.setSummary(deviceName);
         screen.addPreference(renameDevice);