diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/text/SimpleSubtitleDecoder.java b/libraries/extractor/src/main/java/androidx/media3/extractor/text/SimpleSubtitleDecoder.java
index 7d0689a631..ea44735054 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/text/SimpleSubtitleDecoder.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/text/SimpleSubtitleDecoder.java
@@ -91,11 +91,11 @@ public abstract class SimpleSubtitleDecoder
    * Decodes data into a {@link Subtitle}.
    *
    * @param data An array holding the data to be decoded, starting at position 0.
-   * @param size The size of the data to be decoded.
+   * @param length The number of bytes from {@code data} to be decoded.
    * @param reset Whether the decoder must be reset before decoding.
    * @return The decoded {@link Subtitle}.
    * @throws SubtitleDecoderException If a decoding error occurs.
    */
-  protected abstract Subtitle decode(byte[] data, int size, boolean reset)
+  protected abstract Subtitle decode(byte[] data, int length, boolean reset)
       throws SubtitleDecoderException;
 }
diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/text/pgs/PgsDecoder.java b/libraries/extractor/src/main/java/androidx/media3/extractor/text/pgs/PgsDecoder.java
index 241cdca746..000d2d13b4 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/text/pgs/PgsDecoder.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/text/pgs/PgsDecoder.java
@@ -56,8 +56,9 @@ public final class PgsDecoder extends SimpleSubtitleDecoder {
   }
 
   @Override
-  protected Subtitle decode(byte[] data, int size, boolean reset) throws SubtitleDecoderException {
-    buffer.reset(data, size);
+  protected Subtitle decode(byte[] data, int length, boolean reset)
+      throws SubtitleDecoderException {
+    buffer.reset(data, length);
     maybeInflateData(buffer);
     cueBuilder.reset();
     ArrayList<Cue> cues = new ArrayList<>();
diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/text/ssa/SsaDecoder.java b/libraries/extractor/src/main/java/androidx/media3/extractor/text/ssa/SsaDecoder.java
index 050fbf36cf..a981193f99 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/text/ssa/SsaDecoder.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/text/ssa/SsaDecoder.java
@@ -110,15 +110,15 @@ public final class SsaDecoder extends SimpleSubtitleDecoder {
   }
 
   @Override
-  protected Subtitle decode(byte[] bytes, int length, boolean reset) {
+  protected Subtitle decode(byte[] data, int length, boolean reset) {
     List<List<Cue>> cues = new ArrayList<>();
     List<Long> cueTimesUs = new ArrayList<>();
 
-    ParsableByteArray data = new ParsableByteArray(bytes, length);
+    ParsableByteArray parsableData = new ParsableByteArray(data, length);
     if (!haveInitializationData) {
-      parseHeader(data);
+      parseHeader(parsableData);
     }
-    parseEventBody(data, cues, cueTimesUs);
+    parseEventBody(parsableData, cues, cueTimesUs);
     return new SsaSubtitle(cues, cueTimesUs);
   }
 
diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/text/subrip/SubripDecoder.java b/libraries/extractor/src/main/java/androidx/media3/extractor/text/subrip/SubripDecoder.java
index c7684e9754..1ecc7f425d 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/text/subrip/SubripDecoder.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/text/subrip/SubripDecoder.java
@@ -72,10 +72,10 @@ public final class SubripDecoder extends SimpleSubtitleDecoder {
   }
 
   @Override
-  protected Subtitle decode(byte[] bytes, int length, boolean reset) {
+  protected Subtitle decode(byte[] data, int length, boolean reset) {
     ArrayList<Cue> cues = new ArrayList<>();
     LongArray cueTimesUs = new LongArray();
-    ParsableByteArray subripData = new ParsableByteArray(bytes, length);
+    ParsableByteArray subripData = new ParsableByteArray(data, length);
 
     @Nullable String currentLine;
     while ((currentLine = subripData.readLine()) != null) {
diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/text/ttml/TtmlDecoder.java b/libraries/extractor/src/main/java/androidx/media3/extractor/text/ttml/TtmlDecoder.java
index 765b161d0c..b5f53a35fb 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/text/ttml/TtmlDecoder.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/text/ttml/TtmlDecoder.java
@@ -115,7 +115,7 @@ public final class TtmlDecoder extends SimpleSubtitleDecoder {
   }
 
   @Override
-  protected Subtitle decode(byte[] bytes, int length, boolean reset)
+  protected Subtitle decode(byte[] data, int length, boolean reset)
       throws SubtitleDecoderException {
     try {
       XmlPullParser xmlParser = xmlParserFactory.newPullParser();
@@ -123,7 +123,7 @@ public final class TtmlDecoder extends SimpleSubtitleDecoder {
       Map<String, TtmlRegion> regionMap = new HashMap<>();
       Map<String, String> imageMap = new HashMap<>();
       regionMap.put(TtmlNode.ANONYMOUS_REGION_ID, new TtmlRegion(TtmlNode.ANONYMOUS_REGION_ID));
-      ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes, 0, length);
+      ByteArrayInputStream inputStream = new ByteArrayInputStream(data, 0, length);
       xmlParser.setInput(inputStream, null);
       @Nullable TtmlSubtitle ttmlSubtitle = null;
       ArrayDeque<TtmlNode> nodeStack = new ArrayDeque<>();
diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/text/tx3g/Tx3gDecoder.java b/libraries/extractor/src/main/java/androidx/media3/extractor/text/tx3g/Tx3gDecoder.java
index 2e2bde432a..e0339d8f97 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/text/tx3g/Tx3gDecoder.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/text/tx3g/Tx3gDecoder.java
@@ -125,9 +125,9 @@ public final class Tx3gDecoder extends SimpleSubtitleDecoder {
   }
 
   @Override
-  protected Subtitle decode(byte[] bytes, int length, boolean reset)
+  protected Subtitle decode(byte[] data, int length, boolean reset)
       throws SubtitleDecoderException {
-    parsableByteArray.reset(bytes, length);
+    parsableByteArray.reset(data, length);
     String cueTextString = readSubtitleText(parsableByteArray);
     if (cueTextString.isEmpty()) {
       return Tx3gSubtitle.EMPTY;
diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/text/webvtt/Mp4WebvttDecoder.java b/libraries/extractor/src/main/java/androidx/media3/extractor/text/webvtt/Mp4WebvttDecoder.java
index d6af63a777..977eede122 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/text/webvtt/Mp4WebvttDecoder.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/text/webvtt/Mp4WebvttDecoder.java
@@ -51,11 +51,11 @@ public final class Mp4WebvttDecoder extends SimpleSubtitleDecoder {
   }
 
   @Override
-  protected Subtitle decode(byte[] bytes, int length, boolean reset)
+  protected Subtitle decode(byte[] data, int length, boolean reset)
       throws SubtitleDecoderException {
     // Webvtt in Mp4 samples have boxes inside of them, so we have to do a traditional box parsing:
     // first 4 bytes size and then 4 bytes type.
-    sampleData.reset(bytes, length);
+    sampleData.reset(data, length);
     List<Cue> resultingCueList = new ArrayList<>();
     while (sampleData.bytesLeft() > 0) {
       if (sampleData.bytesLeft() < BOX_HEADER_SIZE) {
diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/text/webvtt/WebvttDecoder.java b/libraries/extractor/src/main/java/androidx/media3/extractor/text/webvtt/WebvttDecoder.java
index 643a21566a..6a0daf5893 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/text/webvtt/WebvttDecoder.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/text/webvtt/WebvttDecoder.java
@@ -53,9 +53,9 @@ public final class WebvttDecoder extends SimpleSubtitleDecoder {
   }
 
   @Override
-  protected Subtitle decode(byte[] bytes, int length, boolean reset)
+  protected Subtitle decode(byte[] data, int length, boolean reset)
       throws SubtitleDecoderException {
-    parsableWebvttData.reset(bytes, length);
+    parsableWebvttData.reset(data, length);
     List<WebvttCssStyle> definedStyles = new ArrayList<>();
 
     // Validate the first line of the header, and skip the remainder.