diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index e0b8b0c81c..88a7d12d16 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -503,7 +503,7 @@ if (is_android) {
     visibility = [ "*" ]
     sources = [
       "api/org/webrtc/LibaomAv1Decoder.java",
-      "api/org/webrtc/LibaomAv1Encoder.java",
+      "api/org/webrtc/LibaomAv1EncoderIfSupported.java",
     ]
     deps = [
       ":base_java",
@@ -848,13 +848,13 @@ if (current_os == "linux" || is_android) {
     ]
   }
 
-  rtc_library("libaom_av1_jni") {
+  rtc_library("libaom_av1_jni_if_supported") {
     visibility = [ "*" ]
     allow_poison = [ "software_video_codecs" ]
     sources = [ "src/jni/libaom_av1_codec.cc" ]
     deps = [
       ":base_jni",
-      ":generated_libaom_av1_jni",
+      ":generated_libaom_av1_jni_if_supported",
       ":video_jni",
       "../../modules/video_coding/codecs/av1:libaom_av1_decoder",
       "../../modules/video_coding/codecs/av1:libaom_av1_encoder_if_supported",
@@ -877,7 +877,7 @@ if (current_os == "linux" || is_android) {
     visibility = [ "*" ]
     allow_poison = [ "software_video_codecs" ]
     deps = [
-      ":libaom_av1_jni",
+      ":libaom_av1_jni_if_supported",
       ":libvpx_vp8_jni",
       ":libvpx_vp9_jni",
     ]
@@ -1313,10 +1313,10 @@ if (current_os == "linux" || is_android) {
     jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
   }
 
-  generate_jni("generated_libaom_av1_jni") {
+  generate_jni("generated_libaom_av1_jni_if_supported") {
     sources = [
       "api/org/webrtc/LibaomAv1Decoder.java",
-      "api/org/webrtc/LibaomAv1Encoder.java",
+      "api/org/webrtc/LibaomAv1EncoderIfSupported.java",
     ]
 
     namespace = "webrtc::jni"
diff --git a/sdk/android/api/org/webrtc/LibaomAv1Encoder.java b/sdk/android/api/org/webrtc/LibaomAv1EncoderIfSupported.java
similarity index 90%
rename from sdk/android/api/org/webrtc/LibaomAv1Encoder.java
rename to sdk/android/api/org/webrtc/LibaomAv1EncoderIfSupported.java
index 26648c589e..2d5cff79ae 100644
--- a/sdk/android/api/org/webrtc/LibaomAv1Encoder.java
+++ b/sdk/android/api/org/webrtc/LibaomAv1EncoderIfSupported.java
@@ -10,7 +10,7 @@
 
 package org.webrtc;
 
-public class LibaomAv1Encoder extends WrappedNativeVideoEncoder {
+public class LibaomAv1EncoderIfSupported extends WrappedNativeVideoEncoder {
   @Override
   public long createNativeVideoEncoder() {
     return nativeCreateEncoder();
diff --git a/sdk/android/api/org/webrtc/SoftwareVideoEncoderFactory.java b/sdk/android/api/org/webrtc/SoftwareVideoEncoderFactory.java
index 1e3e181b3e..1c0b216a27 100644
--- a/sdk/android/api/org/webrtc/SoftwareVideoEncoderFactory.java
+++ b/sdk/android/api/org/webrtc/SoftwareVideoEncoderFactory.java
@@ -29,8 +29,8 @@ public class SoftwareVideoEncoderFactory implements VideoEncoderFactory {
       return new LibvpxVp9Encoder();
     }
     if (codecName.equalsIgnoreCase(VideoCodecMimeType.AV1.name())
-        && LibaomAv1Encoder.nativeIsSupported()) {
-      return new LibaomAv1Encoder();
+        && LibaomAv1EncoderIfSupported.nativeIsSupported()) {
+      return new LibaomAv1EncoderIfSupported();
     }
 
     return null;
@@ -48,7 +48,7 @@ public class SoftwareVideoEncoderFactory implements VideoEncoderFactory {
     if (LibvpxVp9Encoder.nativeIsSupported()) {
       codecs.add(new VideoCodecInfo(VideoCodecMimeType.VP9.name(), new HashMap<>()));
     }
-    if (LibaomAv1Encoder.nativeIsSupported()) {
+    if (LibaomAv1EncoderIfSupported.nativeIsSupported()) {
       codecs.add(new VideoCodecInfo(VideoCodecMimeType.AV1.name(), new HashMap<>()));
     }
 
diff --git a/sdk/android/src/jni/libaom_av1_codec.cc b/sdk/android/src/jni/libaom_av1_codec.cc
index e4332a6512..220443a32f 100644
--- a/sdk/android/src/jni/libaom_av1_codec.cc
+++ b/sdk/android/src/jni/libaom_av1_codec.cc
@@ -12,19 +12,19 @@
 
 #include "modules/video_coding/codecs/av1/libaom_av1_decoder.h"
 #include "modules/video_coding/codecs/av1/libaom_av1_encoder_supported.h"
-#include "sdk/android/generated_libaom_av1_jni/LibaomAv1Decoder_jni.h"
-#include "sdk/android/generated_libaom_av1_jni/LibaomAv1Encoder_jni.h"
+#include "sdk/android/generated_libaom_av1_jni_if_supported/LibaomAv1Decoder_jni.h"
+#include "sdk/android/generated_libaom_av1_jni_if_supported/LibaomAv1EncoderIfSupported_jni.h"
 #include "sdk/android/src/jni/jni_helpers.h"
 
 namespace webrtc {
 namespace jni {
 
-static jlong JNI_LibaomAv1Encoder_CreateEncoder(JNIEnv* jni) {
+static jlong JNI_LibaomAv1EncoderIfSupported_CreateEncoder(JNIEnv* jni) {
   return jlongFromPointer(
       webrtc::CreateLibaomAv1EncoderIfSupported().release());
 }
 
-static jboolean JNI_LibaomAv1Encoder_IsSupported(JNIEnv* jni) {
+static jboolean JNI_LibaomAv1EncoderIfSupported_IsSupported(JNIEnv* jni) {
   return webrtc::kIsLibaomAv1EncoderSupported;
 }