diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
index 97cf59963b4..57584e7d717 100644
--- a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
+++ b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
@@ -378,11 +378,11 @@ public class DataUsageSummaryPreferenceController extends TelephonyBasePreferenc
         // First plan in the list is the primary plan
         SubscriptionPlan plan = plans.get(0);
         return plan.getDataLimitBytes() > 0
-                && saneSize(plan.getDataUsageBytes())
+                && validSize(plan.getDataUsageBytes())
                 && plan.getCycleRule() != null ? plan : null;
     }
 
-    private static boolean saneSize(long value) {
+    private static boolean validSize(long value) {
         return value >= 0L && value < PETA;
     }
 
diff --git a/src/com/android/settings/network/TetherProvisioningActivity.java b/src/com/android/settings/network/TetherProvisioningActivity.java
index 047c90d5443..285780bef2d 100644
--- a/src/com/android/settings/network/TetherProvisioningActivity.java
+++ b/src/com/android/settings/network/TetherProvisioningActivity.java
@@ -36,7 +36,7 @@ import android.util.Log;
 import androidx.annotation.VisibleForTesting;
 
 /**
- * Activity which acts as a proxy to the tether provisioning app for sanity checks and permission
+ * Activity which acts as a proxy to the tether provisioning app for validity checks and permission
  * restrictions. Specifically, the provisioning apps require
  * {@link android.permission.TETHER_PRIVILEGED}, while this activity can be started by a caller
  * with {@link android.permission.TETHER_PRIVILEGED}.
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 37b47c8059d..e3f8b53ee81 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -490,7 +490,7 @@ public class WifiSettings extends RestrictedSettingsFragment
         }
 
         // "forget" for normal saved network. And "disconnect" for ephemeral network because it
-        // could only be disconnected and be put in blacklists so it won't be used again.
+        // could only be disconnected and be put in blocklists so it won't be used again.
         if (canForgetNetwork()) {
             menu.add(Menu.NONE, MENU_ID_FORGET, 0 /* order */, R.string.forget);
         }
diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
index 8dd8d7ad6a4..a48cca98144 100644
--- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
+++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
@@ -846,7 +846,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
     }
 
     private void refreshButtons() {
-        // Ephemeral network won't be removed permanently, but be putted in blacklist.
+        // Ephemeral network won't be removed permanently, but be putted in blocklist.
         mButtonsPref.setButton1Text(
                 mIsEphemeral ? R.string.wifi_disconnect_button_text : R.string.forget);
 
diff --git a/tests/robotests/src/com/android/settings/TetherSettingsTest.java b/tests/robotests/src/com/android/settings/TetherSettingsTest.java
index 3c38c51dbaf..f46ca7a1cd1 100644
--- a/tests/robotests/src/com/android/settings/TetherSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/TetherSettingsTest.java
@@ -113,7 +113,7 @@ public class TetherSettingsTest {
         FeatureFlagUtils.setEnabled(mContext, FeatureFlags.TETHER_ALL_IN_ONE, false);
         // We can ignore the condition of Utils.isMonkeyRunning()
         // In normal case, monkey and robotest should not execute at the same time
-        when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[]{"dummyRegex"});
+        when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[]{"fakeRegex"});
 
         final List<String> niks =
             TetherSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
@@ -135,7 +135,7 @@ public class TetherSettingsTest {
     public void testTetherNonIndexableKeys_bluetoothAvailable_bluetoothKeyNotReturned() {
         FeatureFlagUtils.setEnabled(mContext, FeatureFlags.TETHER_ALL_IN_ONE, false);
         when(mConnectivityManager.getTetherableBluetoothRegexs())
-                .thenReturn(new String[]{"dummyRegex"});
+                .thenReturn(new String[]{"fakeRegex"});
 
         final List<String> niks =
             TetherSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java
index 973168904c4..10d76d39305 100644
--- a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java
@@ -106,12 +106,12 @@ public class WifiP2PPreferenceControllerTest {
         mController.displayPreference(mScreen);
         verify(mWifiDirectPreference).setEnabled(true);
 
-        Intent dummyIntent = new Intent();
-        mController.mReceiver.onReceive(mContext, dummyIntent);
+        Intent fakeIntent = new Intent();
+        mController.mReceiver.onReceive(mContext, fakeIntent);
         verify(mWifiDirectPreference, times(2)).setEnabled(true);
 
         when(mWifiManager.isWifiEnabled()).thenReturn(false);
-        mController.mReceiver.onReceive(mContext, dummyIntent);
+        mController.mReceiver.onReceive(mContext, fakeIntent);
         verify(mWifiDirectPreference).setEnabled(false);
     }
 
@@ -136,12 +136,12 @@ public class WifiP2PPreferenceControllerTest {
     public void updateState_withLocationDisabled_preferenceShouldBeDisable() {
         when(mWifiManager.isWifiEnabled()).thenReturn(true);
         when(mLocationManager.isLocationEnabled()).thenReturn(true);
-        Intent dummyIntent = new Intent();
+        Intent fakeIntent = new Intent();
         mController.displayPreference(mScreen);
         verify(mWifiDirectPreference).setEnabled(true);
 
         when(mLocationManager.isLocationEnabled()).thenReturn(false);
-        mController.mLocationReceiver.onReceive(mContext, dummyIntent);
+        mController.mLocationReceiver.onReceive(mContext, fakeIntent);
         verify(mWifiDirectPreference).setEnabled(false);
     }
 }