diff --git a/libraries/muxer/src/main/java/androidx/media3/muxer/Mp4Muxer.java b/libraries/muxer/src/main/java/androidx/media3/muxer/Mp4Muxer.java
index c75f77d688..10edc1445c 100644
--- a/libraries/muxer/src/main/java/androidx/media3/muxer/Mp4Muxer.java
+++ b/libraries/muxer/src/main/java/androidx/media3/muxer/Mp4Muxer.java
@@ -137,16 +137,16 @@ public final class Mp4Muxer implements Muxer {
           new Mp4MoovStructure(metadataCollector, lastFrameDurationBehavior);
       AnnexBToAvccConverter avccConverter =
           annexBToAvccConverter == null ? AnnexBToAvccConverter.DEFAULT : annexBToAvccConverter;
-      BasicMp4Writer mp4Writer = new BasicMp4Writer(fileOutputStream, moovStructure, avccConverter);
+      Mp4Writer mp4Writer = new Mp4Writer(fileOutputStream, moovStructure, avccConverter);
 
       return new Mp4Muxer(mp4Writer, metadataCollector);
     }
   }
 
-  private final BasicMp4Writer mp4Writer;
+  private final Mp4Writer mp4Writer;
   private final MetadataCollector metadataCollector;
 
-  private Mp4Muxer(BasicMp4Writer mp4Writer, MetadataCollector metadataCollector) {
+  private Mp4Muxer(Mp4Writer mp4Writer, MetadataCollector metadataCollector) {
     this.mp4Writer = mp4Writer;
     this.metadataCollector = metadataCollector;
   }
diff --git a/libraries/muxer/src/main/java/androidx/media3/muxer/BasicMp4Writer.java b/libraries/muxer/src/main/java/androidx/media3/muxer/Mp4Writer.java
similarity index 99%
rename from libraries/muxer/src/main/java/androidx/media3/muxer/BasicMp4Writer.java
rename to libraries/muxer/src/main/java/androidx/media3/muxer/Mp4Writer.java
index 2022fdf0b8..be4ebda373 100644
--- a/libraries/muxer/src/main/java/androidx/media3/muxer/BasicMp4Writer.java
+++ b/libraries/muxer/src/main/java/androidx/media3/muxer/Mp4Writer.java
@@ -37,7 +37,7 @@ import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /** Writes all media samples into a single mdat box. */
-/* package */ final class BasicMp4Writer {
+/* package */ final class Mp4Writer {
   private static final long INTERLEAVE_DURATION_US = 1_000_000L;
 
   private final FileOutputStream outputStream;
@@ -63,7 +63,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
    *     H.265 NAL units from the Annex-B format (using start codes to delineate NAL units) to the
    *     AVCC format (which uses length prefixes).
    */
-  public BasicMp4Writer(
+  public Mp4Writer(
       FileOutputStream outputStream,
       Mp4MoovStructure moovGenerator,
       AnnexBToAvccConverter annexBToAvccConverter) {