diff --git a/libraries/muxer/src/main/java/androidx/media3/muxer/DefaultMp4Writer.java b/libraries/muxer/src/main/java/androidx/media3/muxer/BasicMp4Writer.java
similarity index 98%
rename from libraries/muxer/src/main/java/androidx/media3/muxer/DefaultMp4Writer.java
rename to libraries/muxer/src/main/java/androidx/media3/muxer/BasicMp4Writer.java
index c365a75200..4af85d4225 100644
--- a/libraries/muxer/src/main/java/androidx/media3/muxer/DefaultMp4Writer.java
+++ b/libraries/muxer/src/main/java/androidx/media3/muxer/BasicMp4Writer.java
@@ -37,10 +37,9 @@ import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
- * The default implementation of {@link Mp4Writer} which writes all the samples in a single mdat
- * box.
+ * The basic implementation of {@link Mp4Writer} which writes all the samples in a single mdat box.
  */
-/* package */ final class DefaultMp4Writer implements Mp4Writer {
+/* package */ final class BasicMp4Writer implements Mp4Writer {
   private static final long INTERLEAVE_DURATION_US = 1_000_000L;
 
   private final FileOutputStream outputStream;
@@ -66,7 +65,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 DefaultMp4Writer(
+  public BasicMp4Writer(
       FileOutputStream outputStream,
       Mp4MoovStructure moovGenerator,
       AnnexBToAvccConverter annexBToAvccConverter) {
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 47096b6484..cdbb55ae92 100644
--- a/libraries/muxer/src/main/java/androidx/media3/muxer/Mp4Muxer.java
+++ b/libraries/muxer/src/main/java/androidx/media3/muxer/Mp4Muxer.java
@@ -181,7 +181,7 @@ public final class Mp4Muxer {
           fragmentedMp4Enabled
               ? new FragmentedMp4Writer(
                   fileOutputStream, moovStructure, avccConverter, fragmentDurationUs)
-              : new DefaultMp4Writer(fileOutputStream, moovStructure, avccConverter);
+              : new BasicMp4Writer(fileOutputStream, moovStructure, avccConverter);
 
       return new Mp4Muxer(mp4Writer, metadataCollector);
     }