diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index e6f49442e7..f9e47ac9c4 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -35,7 +35,7 @@ config("libjingle_peerconnection_jni_warnings_config") {
 
 generate_jni("generated_base_jni") {
   sources = [
-    "src/java/org/webrtc/ClassLoader.java",
+    "src/java/org/webrtc/WebRtcClassLoader.java",
   ]
   jni_package = ""
   jni_generator_include = "//sdk/android/src/jni/jni_generator_helper.h"
@@ -510,7 +510,7 @@ rtc_android_library("libjingle_peerconnection_java") {
     "src/java/org/webrtc/Camera2Session.java",
     "src/java/org/webrtc/CameraCapturer.java",
     "src/java/org/webrtc/CameraSession.java",
-    "src/java/org/webrtc/ClassLoader.java",
+    "src/java/org/webrtc/WebRtcClassLoader.java",
     "src/java/org/webrtc/DynamicBitrateAdjuster.java",
     "src/java/org/webrtc/EglBase10.java",
     "src/java/org/webrtc/EglBase14.java",
diff --git a/sdk/android/src/java/org/webrtc/ClassLoader.java b/sdk/android/src/java/org/webrtc/WebRtcClassLoader.java
similarity index 90%
rename from sdk/android/src/java/org/webrtc/ClassLoader.java
rename to sdk/android/src/java/org/webrtc/WebRtcClassLoader.java
index 463704607c..c40aca0d6b 100644
--- a/sdk/android/src/java/org/webrtc/ClassLoader.java
+++ b/sdk/android/src/java/org/webrtc/WebRtcClassLoader.java
@@ -15,9 +15,9 @@ package org.webrtc;
  * what thread it's called from. Such a ClassLoader is needed for the few cases where the JNI
  * mechanism is unable to automatically determine the appropriate ClassLoader instance.
  */
-class ClassLoader {
+class WebRtcClassLoader {
   @CalledByNative
   static Object getClassLoader() {
-    return ClassLoader.class.getClassLoader();
+    return WebRtcClassLoader.class.getClassLoader();
   }
 }
diff --git a/sdk/android/src/jni/class_loader.cc b/sdk/android/src/jni/class_loader.cc
index c21e6c0e8d..84b3e9062a 100644
--- a/sdk/android/src/jni/class_loader.cc
+++ b/sdk/android/src/jni/class_loader.cc
@@ -14,7 +14,7 @@
 #include <string>
 
 #include "rtc_base/checks.h"
-#include "sdk/android/generated_base_jni/jni/ClassLoader_jni.h"
+#include "sdk/android/generated_base_jni/jni/WebRtcClassLoader_jni.h"
 
 // Abort the process if |jni| has a Java exception pending. This macros uses the
 // comma operator to execute ExceptionDescribe and ExceptionClear ignoring their
@@ -38,7 +38,8 @@ class ClassLoader {
         env->GetMethodID(class_loader_class_, "loadClass",
                          "(Ljava/lang/String;)Ljava/lang/Class;");
     CHECK_EXCEPTION(env);
-    class_loader_ = env->NewGlobalRef(Java_ClassLoader_getClassLoader(env));
+    class_loader_ =
+        env->NewGlobalRef(Java_WebRtcClassLoader_getClassLoader(env));
     CHECK_EXCEPTION(env);
   }