diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactory.java
index da82e72de4..c52646c5da 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactory.java
@@ -28,7 +28,7 @@ import com.google.android.exoplayer2.drm.DrmSessionManagerProvider;
 import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory;
 import com.google.android.exoplayer2.extractor.Extractor;
 import com.google.android.exoplayer2.extractor.ExtractorsFactory;
-import com.google.android.exoplayer2.extractor.subtitle.SubtitleExtractor;
+import com.google.android.exoplayer2.extractor.text.SubtitleExtractor;
 import com.google.android.exoplayer2.offline.StreamKey;
 import com.google.android.exoplayer2.source.ads.AdsLoader;
 import com.google.android.exoplayer2.source.ads.AdsMediaSource;
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/subtitle/SubtitleExtractor.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/text/SubtitleExtractor.java
similarity index 99%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/subtitle/SubtitleExtractor.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/text/SubtitleExtractor.java
index a9890e20ba..1552dd1c4a 100644
--- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/subtitle/SubtitleExtractor.java
+++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/text/SubtitleExtractor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.extractor.subtitle;
+package com.google.android.exoplayer2.extractor.text;
 
 import static com.google.android.exoplayer2.util.Assertions.checkState;
 import static com.google.android.exoplayer2.util.Assertions.checkStateNotNull;
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/subtitle/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/text/package-info.java
similarity index 92%
rename from library/extractor/src/main/java/com/google/android/exoplayer2/extractor/subtitle/package-info.java
rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/text/package-info.java
index ba60a48a62..dc920e8302 100644
--- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/subtitle/package-info.java
+++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/text/package-info.java
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 @NonNullApi
-package com.google.android.exoplayer2.extractor.subtitle;
+package com.google.android.exoplayer2.extractor.text;
 
 import com.google.android.exoplayer2.util.NonNullApi;
diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/subtitle/SubtitleExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/text/SubtitleExtractorTest.java
similarity index 99%
rename from library/extractor/src/test/java/com/google/android/exoplayer2/extractor/subtitle/SubtitleExtractorTest.java
rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/text/SubtitleExtractorTest.java
index 52c013deab..2427790dce 100644
--- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/subtitle/SubtitleExtractorTest.java
+++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/text/SubtitleExtractorTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.extractor.subtitle;
+package com.google.android.exoplayer2.extractor.text;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertThrows;