diff --git a/android_webview/java_library_common.mk b/android_webview/java_library_common.mk
index f07a523190f2d..758cd983629d1 100644
--- a/android_webview/java_library_common.mk
+++ b/android_webview/java_library_common.mk
@@ -51,7 +51,7 @@ $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/input/SelectionEventType.java \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/common/ResultCodes.java \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content_public/common/ScreenOrientationValues.java \
-$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/media/ImageFormat.java \
+$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/media/AndroidImageFormat.java \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/CertificateMimeType.java \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/CertVerifyStatusAndroid.java \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/NetError.java \
diff --git a/media/base/android/BUILD.gn b/media/base/android/BUILD.gn
index c1799317226f6..b2d7bbc35d057 100644
--- a/media/base/android/BUILD.gn
+++ b/media/base/android/BUILD.gn
@@ -94,7 +94,7 @@ generate_jni("video_capture_jni_headers") {
 java_cpp_template("media_android_imageformat_list") {
   package_name = "org/chromium/media"
   sources = [
-    "java/src/org/chromium/media/ImageFormat.template",
+    "java/src/org/chromium/media/AndroidImageFormat.template",
   ]
   inputs = [
     "//media/video/capture/android/imageformat_list.h"
diff --git a/media/base/android/java/src/org/chromium/media/ImageFormat.template b/media/base/android/java/src/org/chromium/media/AndroidImageFormat.template
similarity index 92%
rename from media/base/android/java/src/org/chromium/media/ImageFormat.template
rename to media/base/android/java/src/org/chromium/media/AndroidImageFormat.template
index 1c06dcdd31dd5..c7879aa451cd4 100644
--- a/media/base/android/java/src/org/chromium/media/ImageFormat.template
+++ b/media/base/android/java/src/org/chromium/media/AndroidImageFormat.template
@@ -4,7 +4,7 @@
 
 package org.chromium.media;
 
-class AndroidImageFormatList {
+class AndroidImageFormat {
 #define DEFINE_ANDROID_IMAGEFORMAT(name, value) \
     static final int name = value;
 #include "media/video/capture/android/imageformat_list.h"
diff --git a/media/base/android/java/src/org/chromium/media/VideoCapture.java b/media/base/android/java/src/org/chromium/media/VideoCapture.java
index 84f29dd6f2e25..298986d99d4da 100644
--- a/media/base/android/java/src/org/chromium/media/VideoCapture.java
+++ b/media/base/android/java/src/org/chromium/media/VideoCapture.java
@@ -315,12 +315,12 @@ public abstract class VideoCapture implements android.hardware.Camera.PreviewCal
     public int getColorspace() {
         switch (mCaptureFormat.mPixelFormat) {
             case ImageFormat.YV12:
-                return AndroidImageFormatList.ANDROID_IMAGEFORMAT_YV12;
+                return AndroidImageFormat.ANDROID_IMAGEFORMAT_YV12;
             case ImageFormat.NV21:
-                return AndroidImageFormatList.ANDROID_IMAGEFORMAT_NV21;
+                return AndroidImageFormat.ANDROID_IMAGEFORMAT_NV21;
             case ImageFormat.UNKNOWN:
             default:
-                return AndroidImageFormatList.ANDROID_IMAGEFORMAT_UNKNOWN;
+                return AndroidImageFormat.ANDROID_IMAGEFORMAT_UNKNOWN;
         }
     }
 
diff --git a/media/base/android/java/src/org/chromium/media/VideoCaptureAndroid.java b/media/base/android/java/src/org/chromium/media/VideoCaptureAndroid.java
index 8ea03b697071d..1f8108c9fdc36 100644
--- a/media/base/android/java/src/org/chromium/media/VideoCaptureAndroid.java
+++ b/media/base/android/java/src/org/chromium/media/VideoCaptureAndroid.java
@@ -105,10 +105,9 @@ public class VideoCaptureAndroid extends VideoCapture {
             pixelFormats.add(ImageFormat.UNKNOWN);
         }
         for (Integer previewFormat : pixelFormats) {
-            int pixelFormat =
-                    AndroidImageFormatList.ANDROID_IMAGEFORMAT_UNKNOWN;
+            int pixelFormat = AndroidImageFormat.ANDROID_IMAGEFORMAT_UNKNOWN;
             if (previewFormat == ImageFormat.YV12) {
-                pixelFormat = AndroidImageFormatList.ANDROID_IMAGEFORMAT_YV12;
+                pixelFormat = AndroidImageFormat.ANDROID_IMAGEFORMAT_YV12;
             } else if (previewFormat == ImageFormat.NV21) {
                 continue;
             }
diff --git a/media/media.gyp b/media/media.gyp
index 018185c71d6cc..8e2f37aa77d8b 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -1822,7 +1822,7 @@
           'target_name': 'media_android_imageformat_list',
           'type': 'none',
           'sources': [
-            'base/android/java/src/org/chromium/media/ImageFormat.template',
+            'base/android/java/src/org/chromium/media/AndroidImageFormat.template',
           ],
           'variables': {
             'package_name': 'org/chromium/media',