diff --git a/src/org/kde/kdeconnect/Plugins/MousePadPlugin/SendKeystrokesToHostActivity.java b/src/org/kde/kdeconnect/Plugins/MousePadPlugin/SendKeystrokesToHostActivity.java
index b64944c8..e100456c 100644
--- a/src/org/kde/kdeconnect/Plugins/MousePadPlugin/SendKeystrokesToHostActivity.java
+++ b/src/org/kde/kdeconnect/Plugins/MousePadPlugin/SendKeystrokesToHostActivity.java
@@ -80,7 +80,7 @@ public class SendKeystrokesToHostActivity extends AppCompatActivity {
                 // device is connected and send the text to it without user confirmation, to make sending of
                 // short and safe text like PINs/TANs very fluent
                 //
-                // (contentIsOkay gets used in updateComputerList again)
+                // (contentIsOkay gets used in updateDeviceList again)
                 if (prefs.getBoolean(getString(R.string.pref_send_safe_text_immediately), true)) {
                     SafeTextChecker safeTextChecker = new SafeTextChecker(SAFE_CHARS, MAX_SAFE_LENGTH);
                     contentIsOkay = safeTextChecker.isSafe(toSend);
@@ -108,11 +108,11 @@ public class SendKeystrokesToHostActivity extends AppCompatActivity {
                 // subscribe to new connected devices
                 BackgroundService.RunCommand(this, service -> {
                     service.onNetworkChange();
-                    service.addDeviceListChangedCallback("SendKeystrokesToHostActivity", this::updateComputerList);
+                    service.addDeviceListChangedCallback("SendKeystrokesToHostActivity", this::updateDeviceList);
                 });
 
                 // list all currently connected devices
-                updateComputerList();
+                updateDeviceList();
 
             } else {
                 Toast.makeText(getApplicationContext(), R.string.sendkeystrokes_wrong_data, Toast.LENGTH_LONG).show();
@@ -143,7 +143,7 @@ public class SendKeystrokesToHostActivity extends AppCompatActivity {
     }
 
 
-    private void updateComputerList() {
+    private void updateDeviceList() {
         BackgroundService.RunCommand(this, service -> {
 
             Collection<Device> devices = service.getDevices().values();
diff --git a/src/org/kde/kdeconnect/Plugins/SharePlugin/ShareActivity.java b/src/org/kde/kdeconnect/Plugins/SharePlugin/ShareActivity.java
index f9e64967..0fa7fa83 100644
--- a/src/org/kde/kdeconnect/Plugins/SharePlugin/ShareActivity.java
+++ b/src/org/kde/kdeconnect/Plugins/SharePlugin/ShareActivity.java
@@ -42,15 +42,15 @@ public class ShareActivity extends AppCompatActivity {
     @Override
     public boolean onOptionsItemSelected(final MenuItem item) {
         if (item.getItemId() == R.id.menu_refresh) {
-            updateComputerListAction();
+            updateDeviceListAction();
             return true;
         } else {
             return super.onOptionsItemSelected(item);
         }
     }
 
-    private void updateComputerListAction() {
-        updateComputerList();
+    private void updateDeviceListAction() {
+        updateDeviceList();
         BackgroundService.RunCommand(ShareActivity.this, BackgroundService::onNetworkChange);
 
         binding.devicesListLayout.refreshListLayout.setRefreshing(true);
@@ -60,7 +60,7 @@ public class ShareActivity extends AppCompatActivity {
         }, 1500);
     }
 
-    private void updateComputerList() {
+    private void updateDeviceList() {
         final Intent intent = getIntent();
 
         String action = intent.getAction();
@@ -110,7 +110,7 @@ public class ShareActivity extends AppCompatActivity {
         getSupportActionBar().setDisplayShowHomeEnabled(true);
 
         ActionBar actionBar = getSupportActionBar();
-        binding.devicesListLayout.refreshListLayout.setOnRefreshListener(this::updateComputerListAction);
+        binding.devicesListLayout.refreshListLayout.setOnRefreshListener(this::updateDeviceListAction);
         if (actionBar != null) {
             actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_SHOW_TITLE | ActionBar.DISPLAY_SHOW_CUSTOM);
         }
@@ -131,9 +131,9 @@ public class ShareActivity extends AppCompatActivity {
         } else {
             BackgroundService.RunCommand(this, service -> {
                 service.onNetworkChange();
-                service.addDeviceListChangedCallback("ShareActivity", this::updateComputerList);
+                service.addDeviceListChangedCallback("ShareActivity", this::updateDeviceList);
             });
-            updateComputerList();
+            updateDeviceList();
         }
     }
 
diff --git a/src/org/kde/kdeconnect/UserInterface/PairingFragment.java b/src/org/kde/kdeconnect/UserInterface/PairingFragment.java
index a6740835..096c6266 100644
--- a/src/org/kde/kdeconnect/UserInterface/PairingFragment.java
+++ b/src/org/kde/kdeconnect/UserInterface/PairingFragment.java
@@ -79,7 +79,7 @@ public class PairingFragment extends Fragment implements PairingDeviceItem.Callb
         pairingExplanationTextBinding = PairingExplanationTextBinding.inflate(inflater);
         pairingExplanationTextNoWifiBinding = PairingExplanationTextNoWifiBinding.inflate(inflater);
 
-        devicesListBinding.refreshListLayout.setOnRefreshListener(this::updateComputerListAction);
+        devicesListBinding.refreshListLayout.setOnRefreshListener(this::updateDeviceListAction);
 
         notTrustedText = pairingExplanationNotTrustedBinding.getRoot();
         notTrustedText.setOnClickListener(null);
@@ -135,7 +135,7 @@ public class PairingFragment extends Fragment implements PairingDeviceItem.Callb
         mActivity = ((MainActivity) getActivity());
     }
 
-    private void updateComputerListAction() {
+    private void updateDeviceListAction() {
         updateDeviceList();
         BackgroundService.RunCommand(mActivity, BackgroundService::onNetworkChange);
         devicesListBinding.refreshListLayout.setRefreshing(true);
@@ -294,7 +294,7 @@ public class PairingFragment extends Fragment implements PairingDeviceItem.Callb
     public boolean onOptionsItemSelected(final MenuItem item) {
         int id = item.getItemId();
         if (id == R.id.menu_refresh) {
-            updateComputerListAction();
+            updateDeviceListAction();
             return true;
         } else if (id == R.id.menu_custom_device_list) {
             startActivity(new Intent(mActivity, CustomDevicesActivity.class));