diff --git a/sdk/android/api/org/webrtc/HardwareVideoDecoderFactory.java b/sdk/android/api/org/webrtc/HardwareVideoDecoderFactory.java
index ac3b1b97c1..4a648c8cd7 100644
--- a/sdk/android/api/org/webrtc/HardwareVideoDecoderFactory.java
+++ b/sdk/android/api/org/webrtc/HardwareVideoDecoderFactory.java
@@ -18,13 +18,13 @@ import java.util.Arrays;
 public class HardwareVideoDecoderFactory extends MediaCodecVideoDecoderFactory {
   private final static Predicate<MediaCodecInfo> defaultAllowedPredicate =
       new Predicate<MediaCodecInfo>() {
-        private String[] prefixBlacklist =
+        private String[] prefixBlocklist =
             Arrays.copyOf(MediaCodecUtils.SOFTWARE_IMPLEMENTATION_PREFIXES,
                 MediaCodecUtils.SOFTWARE_IMPLEMENTATION_PREFIXES.length);
         @Override
         public boolean test(MediaCodecInfo arg) {
           final String name = arg.getName();
-          for (String prefix : prefixBlacklist) {
+          for (String prefix : prefixBlocklist) {
             if (name.startsWith(prefix)) {
               return false;
             }
diff --git a/sdk/android/api/org/webrtc/PlatformSoftwareVideoDecoderFactory.java b/sdk/android/api/org/webrtc/PlatformSoftwareVideoDecoderFactory.java
index 82417fd980..31b6e59e3b 100644
--- a/sdk/android/api/org/webrtc/PlatformSoftwareVideoDecoderFactory.java
+++ b/sdk/android/api/org/webrtc/PlatformSoftwareVideoDecoderFactory.java
@@ -21,14 +21,14 @@ public class PlatformSoftwareVideoDecoderFactory extends MediaCodecVideoDecoderF
    */
   private static final Predicate<MediaCodecInfo> defaultAllowedPredicate =
       new Predicate<MediaCodecInfo>() {
-        private String[] prefixWhitelist =
+        private String[] prefixAllowlist =
             Arrays.copyOf(MediaCodecUtils.SOFTWARE_IMPLEMENTATION_PREFIXES,
                 MediaCodecUtils.SOFTWARE_IMPLEMENTATION_PREFIXES.length);
 
         @Override
         public boolean test(MediaCodecInfo arg) {
           final String name = arg.getName();
-          for (String prefix : prefixWhitelist) {
+          for (String prefix : prefixAllowlist) {
             if (name.startsWith(prefix)) {
               return true;
             }
diff --git a/sdk/android/src/java/org/webrtc/audio/WebRtcAudioEffects.java b/sdk/android/src/java/org/webrtc/audio/WebRtcAudioEffects.java
index 6f575be2ce..6b69b264ea 100644
--- a/sdk/android/src/java/org/webrtc/audio/WebRtcAudioEffects.java
+++ b/sdk/android/src/java/org/webrtc/audio/WebRtcAudioEffects.java
@@ -219,14 +219,14 @@ class WebRtcAudioEffects {
   // Returns true if an effect of the specified type is available. Functionally
   // equivalent to (NoiseSuppressor|AutomaticGainControl|...).isAvailable(), but
   // faster as it avoids the expensive OS call to enumerate effects.
-  private static boolean isEffectTypeAvailable(UUID effectType, UUID blackListedUuid) {
+  private static boolean isEffectTypeAvailable(UUID effectType, UUID blockListedUuid) {
     Descriptor[] effects = getAvailableEffects();
     if (effects == null) {
       return false;
     }
     for (Descriptor d : effects) {
       if (d.type.equals(effectType)) {
-        return !d.uuid.equals(blackListedUuid);
+        return !d.uuid.equals(blockListedUuid);
       }
     }
     return false;
diff --git a/sdk/android/src/jni/audio_device/audio_device_module.cc b/sdk/android/src/jni/audio_device/audio_device_module.cc
index b4cb184177..d77488ff4a 100644
--- a/sdk/android/src/jni/audio_device/audio_device_module.cc
+++ b/sdk/android/src/jni/audio_device/audio_device_module.cc
@@ -516,7 +516,7 @@ class AndroidAudioDeviceModule : public AudioDeviceModule {
   }
 
   // Returns true if the device both supports built in AEC and the device
-  // is not blacklisted.
+  // is not blocklisted.
   // Currently, if OpenSL ES is used in both directions, this method will still
   // report the correct value and it has the correct effect. As an example:
   // a device supports built in AEC and this method returns true. Libjingle
@@ -544,7 +544,7 @@ class AndroidAudioDeviceModule : public AudioDeviceModule {
   }
 
   // Returns true if the device both supports built in NS and the device
-  // is not blacklisted.
+  // is not blocklisted.
   // TODO(henrika): add implementation for OpenSL ES based audio as well.
   // In addition, see comments for BuiltInAECIsAvailable().
   bool BuiltInNSIsAvailable() const override {