diff --git a/starboard/android/shared/BUILD.gn b/starboard/android/shared/BUILD.gn
index d7343f02bb34..5ec6ffbdb79a 100644
--- a/starboard/android/shared/BUILD.gn
+++ b/starboard/android/shared/BUILD.gn
@@ -348,8 +348,8 @@ static_library("starboard_platform") {
     "log_internal.h",
     "log_raw.cc",
     "main.cc",
-    "max_output_buffers_lookup_table.cc",
-    "max_output_buffers_lookup_table.h",
+    "max_media_codec_output_buffers_lookup_table.cc",
+    "max_media_codec_output_buffers_lookup_table.h",
     "media_capabilities_cache.cc",
     "media_capabilities_cache.h",
     "media_codec_bridge.cc",
diff --git a/starboard/android/shared/max_output_buffers_lookup_table.cc b/starboard/android/shared/max_media_codec_output_buffers_lookup_table.cc
similarity index 97%
rename from starboard/android/shared/max_output_buffers_lookup_table.cc
rename to starboard/android/shared/max_media_codec_output_buffers_lookup_table.cc
index 7ed6fb8055a9..e81bf10cdca5 100644
--- a/starboard/android/shared/max_output_buffers_lookup_table.cc
+++ b/starboard/android/shared/max_media_codec_output_buffers_lookup_table.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "starboard/android/shared/max_output_buffers_lookup_table.h"
+#include "starboard/android/shared/max_media_codec_output_buffers_lookup_table.h"
 
 #include "starboard/common/log.h"
 #include "starboard/common/once.h"
diff --git a/starboard/android/shared/max_output_buffers_lookup_table.h b/starboard/android/shared/max_media_codec_output_buffers_lookup_table.h
similarity index 88%
rename from starboard/android/shared/max_output_buffers_lookup_table.h
rename to starboard/android/shared/max_media_codec_output_buffers_lookup_table.h
index 4dddc5d90f10..736bd384fcf2 100644
--- a/starboard/android/shared/max_output_buffers_lookup_table.h
+++ b/starboard/android/shared/max_media_codec_output_buffers_lookup_table.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef STARBOARD_ANDROID_SHARED_MAX_OUTPUT_BUFFERS_LOOKUP_TABLE_H_
-#define STARBOARD_ANDROID_SHARED_MAX_OUTPUT_BUFFERS_LOOKUP_TABLE_H_
+#ifndef STARBOARD_ANDROID_SHARED_MAX_MEDIA_CODEC_OUTPUT_BUFFERS_LOOKUP_TABLE_H_
+#define STARBOARD_ANDROID_SHARED_MAX_MEDIA_CODEC_OUTPUT_BUFFERS_LOOKUP_TABLE_H_
 
 #include <functional>
 #include <map>
@@ -72,4 +72,4 @@ class MaxMediaCodecOutputBuffersLookupTable {
 }  // namespace android
 }  // namespace starboard
 
-#endif  // STARBOARD_ANDROID_SHARED_MAX_OUTPUT_BUFFERS_LOOKUP_TABLE_H_
+#endif  // STARBOARD_ANDROID_SHARED_MAX_MEDIA_CODEC_OUTPUT_BUFFERS_LOOKUP_TABLE_H_
diff --git a/starboard/android/shared/media_is_video_supported.cc b/starboard/android/shared/media_is_video_supported.cc
index c6e0462d750b..cee2457b3a66 100644
--- a/starboard/android/shared/media_is_video_supported.cc
+++ b/starboard/android/shared/media_is_video_supported.cc
@@ -14,7 +14,7 @@
 
 #include "starboard/shared/starboard/media/media_support_internal.h"
 
-#include "starboard/android/shared/max_output_buffers_lookup_table.h"
+#include "starboard/android/shared/max_media_codec_output_buffers_lookup_table.h"
 #include "starboard/android/shared/media_capabilities_cache.h"
 #include "starboard/android/shared/media_common.h"
 #include "starboard/configuration.h"
diff --git a/starboard/android/shared/video_decoder.h b/starboard/android/shared/video_decoder.h
index 72f941fcc562..8cd7d98a3394 100644
--- a/starboard/android/shared/video_decoder.h
+++ b/starboard/android/shared/video_decoder.h
@@ -21,7 +21,7 @@
 #include <vector>
 
 #include "starboard/android/shared/drm_system.h"
-#include "starboard/android/shared/max_output_buffers_lookup_table.h"
+#include "starboard/android/shared/max_media_codec_output_buffers_lookup_table.h"
 #include "starboard/android/shared/media_codec_bridge.h"
 #include "starboard/android/shared/media_decoder.h"
 #include "starboard/android/shared/video_frame_tracker.h"