diff --git a/dump-1.txt b/dump-1.txt
new file mode 100644
index 0000000000..01b604a459
--- /dev/null
+++ b/dump-1.txt
@@ -0,0 +1,45 @@
+00000000: 0000 0020 6674 7970 6973 6f6d 0000 0000  ... ftypisom....
+00000010: 6973 6f38 6d70 3431 6461 7368 636d 6663  iso8mp41dashcmfc
+00000020: 0000 02ae 6d6f 6f76 0000 006c 6d76 6864  ....moov...lmvhd
+00000030: 0000 0000 7c25 b080 7c25 b080 0000 03e8  ....|%..|%......
+00000040: 0000 0000 0001 0000 0100 0000 0000 0000  ................
+00000050: 0000 0000 0001 0000 0000 0000 0000 0000  ................
+00000060: 0000 0000 0001 0000 0000 0000 0000 0000  ................
+00000070: 0000 0000 4000 0000 0000 0000 0000 0000  ....@...........
+00000080: 0000 0000 0000 0000 0000 0000 0000 0000  ................
+00000090: 0000 0002 0000 008a 6d65 7461 0000 0000  ........meta....
+000000a0: 0000 0020 6864 6c72 0000 0000 0000 0000  ... hdlr........
+000000b0: 4944 3332 0000 0000 0000 0000 0000 0000  ID32............
+000000c0: 0000 005e 4944 3332 0000 0000 15c7 4944  ...^ID32......ID
+000000d0: 3304 0000 0000 0046 5052 4956 0000 003c  3......FPRIV...<
+000000e0: 0000 6874 7470 733a 2f2f 6769 7468 7562  ..https://github
+000000f0: 2e63 6f6d 2f67 6f6f 676c 652f 7368 616b  .com/google/shak
+00000100: 612d 7061 636b 6167 6572 003c 7461 673e  a-packager.<tag>
+00000110: 2d3c 6861 7368 3e2d 3c74 6573 743e 0000  -<hash>-<test>..
+00000120: 0178 7472 616b 0000 005c 746b 6864 0000  .xtrak...\tkhd..
+00000130: 0007 7c25 b080 7c25 b080 0000 0001 0000  ..|%..|%........
+00000140: 0000 0000 0000 0000 0000 0000 0000 0000  ................
+00000150: 0000 0100 0000 0001 0000 0000 0000 0000  ................
+00000160: 0000 0000 0000 0001 0000 0000 0000 0000  ................
+00000170: 0000 0000 0000 4000 0000 0000 0000 0000  ......@.........
+00000180: 0000 0000 0114 6d64 6961 0000 0020 6d64  ......mdia... md
+00000190: 6864 0000 0000 7c25 b080 7c25 b080 0000  hd....|%..|%....
+000001a0: 03e8 0000 0000 55c4 0000 0000 002c 6864  ......U......,hd
+000001b0: 6c72 0000 0000 0000 0000 7465 7874 0000  lr........text..
+000001c0: 0000 0000 0000 0000 0000 5465 7874 4861  ..........TextHa
+000001d0: 6e64 6c65 7200 0000 00c0 6d69 6e66 0000  ndler.....minf..
+000001e0: 0024 6469 6e66 0000 001c 6472 6566 0000  .$dinf....dref..
+000001f0: 0000 0000 0001 0000 000c 7572 6c20 0000  ..........url ..
+00000200: 0001 0000 0088 7374 626c 0000 003c 7374  ......stbl...<st
+00000210: 7364 0000 0000 0000 0001 0000 002c 7776  sd...........,wv
+00000220: 7474 0000 0000 0000 cf80 0000 0008 7674  tt............vt
+00000230: 7443 0000 0014 766c 6162 736f 7572 6365  tC....vlabsource
+00000240: 5f6c 6162 656c 0000 0010 7374 7473 0000  _label....stts..
+00000250: 0000 0000 0000 0000 0010 7374 7363 0000  ..........stsc..
+00000260: 0000 0000 0000 0000 0014 7374 737a 0000  ..........stsz..
+00000270: 0000 0000 0000 0000 0000 0000 0010 7374  ..............st
+00000280: 636f 0000 0000 0000 0000 0000 000c 7374  co............st
+00000290: 6864 0000 0000 0000 0038 6d76 6578 0000  hd.......8mvex..
+000002a0: 0010 6d65 6864 0000 0000 0000 13cc 0000  ..mehd..........
+000002b0: 0020 7472 6578 0000 0000 0000 0001 0000  . trex..........
+000002c0: 0001 0000 0320 0000 0000 0000 0000       ..... ........
diff --git a/dump-2.txt b/dump-2.txt
new file mode 100644
index 0000000000..780aacc45e
--- /dev/null
+++ b/dump-2.txt
@@ -0,0 +1,45 @@
+00000000: 0000 0020 6674 7970 6973 6f6d 0000 0000  ... ftypisom....
+00000010: 6973 6f38 6d70 3431 6461 7368 636d 6663  iso8mp41dashcmfc
+00000020: 0000 02ae 6d6f 6f76 0000 006c 6d76 6864  ....moov...lmvhd
+00000030: 0000 0000 7c25 b080 7c25 b080 0000 03e8  ....|%..|%......
+00000040: 0000 0000 0001 0000 0100 0000 0000 0000  ................
+00000050: 0000 0000 0001 0000 0000 0000 0000 0000  ................
+00000060: 0000 0000 0001 0000 0000 0000 0000 0000  ................
+00000070: 0000 0000 4000 0000 0000 0000 0000 0000  ....@...........
+00000080: 0000 0000 0000 0000 0000 0000 0000 0000  ................
+00000090: 0000 0002 0000 008a 6d65 7461 0000 0000  ........meta....
+000000a0: 0000 0020 6864 6c72 0000 0000 0000 0000  ... hdlr........
+000000b0: 4944 3332 0000 0000 0000 0000 0000 0000  ID32............
+000000c0: 0000 005e 4944 3332 0000 0000 15c7 4944  ...^ID32......ID
+000000d0: 3304 0000 0000 0046 5052 4956 0000 003c  3......FPRIV...<
+000000e0: 0000 6874 7470 733a 2f2f 6769 7468 7562  ..https://github
+000000f0: 2e63 6f6d 2f67 6f6f 676c 652f 7368 616b  .com/google/shak
+00000100: 612d 7061 636b 6167 6572 003c 7461 673e  a-packager.<tag>
+00000110: 2d3c 6861 7368 3e2d 3c74 6573 743e 0000  -<hash>-<test>..
+00000120: 0178 7472 616b 0000 005c 746b 6864 0000  .xtrak...\tkhd..
+00000130: 0007 7c25 b080 7c25 b080 0000 0001 0000  ..|%..|%........
+00000140: 0000 0000 0000 0000 0000 0000 0000 0000  ................
+00000150: 0000 0100 0000 0001 0000 0000 0000 0000  ................
+00000160: 0000 0000 0000 0001 0000 0000 0000 0000  ................
+00000170: 0000 0000 0000 4000 0000 0000 0000 0000  ......@.........
+00000180: 0000 0000 0114 6d64 6961 0000 0020 6d64  ......mdia... md
+00000190: 6864 0000 0000 7c25 b080 7c25 b080 0000  hd....|%..|%....
+000001a0: 03e8 0000 0000 55c4 0000 0000 002c 6864  ......U......,hd
+000001b0: 6c72 0000 0000 0000 0000 7465 7874 0000  lr........text..
+000001c0: 0000 0000 0000 0000 0000 5465 7874 4861  ..........TextHa
+000001d0: 6e64 6c65 7200 0000 00c0 6d69 6e66 0000  ndler.....minf..
+000001e0: 0024 6469 6e66 0000 001c 6472 6566 0000  .$dinf....dref..
+000001f0: 0000 0000 0001 0000 000c 7572 6c20 0000  ..........url ..
+00000200: 0001 0000 0088 7374 626c 0000 003c 7374  ......stbl...<st
+00000210: 7364 0000 0000 0000 0001 0000 002c 7776  sd...........,wv
+00000220: 7474 0000 0000 0000 be00 0000 0008 7674  tt............vt
+00000230: 7443 0000 0014 766c 6162 736f 7572 6365  tC....vlabsource
+00000240: 5f6c 6162 656c 0000 0010 7374 7473 0000  _label....stts..
+00000250: 0000 0000 0000 0000 0010 7374 7363 0000  ..........stsc..
+00000260: 0000 0000 0000 0000 0014 7374 737a 0000  ..........stsz..
+00000270: 0000 0000 0000 0000 0000 0000 0010 7374  ..............st
+00000280: 636f 0000 0000 0000 0000 0000 000c 7374  co............st
+00000290: 6864 0000 0000 0000 0038 6d76 6578 0000  hd.......8mvex..
+000002a0: 0010 6d65 6864 0000 0000 0000 13cc 0000  ..mehd..........
+000002b0: 0020 7472 6578 0000 0000 0000 0001 0000  . trex..........
+000002c0: 0001 0000 0320 0000 0000 0000 0000       ..... ........
diff --git a/packager/media/formats/webvtt/webvtt.gyp b/packager/media/formats/webvtt/webvtt.gyp
index 9a4c2f3501..b496c2d605 100644
--- a/packager/media/formats/webvtt/webvtt.gyp
+++ b/packager/media/formats/webvtt/webvtt.gyp
@@ -19,10 +19,10 @@
         'text_readers.h',
         'webvtt_file_buffer.cc',
         'webvtt_file_buffer.h',
-        'webvtt_output_handler.cc',
-        'webvtt_output_handler.h',
         'webvtt_parser.cc',
         'webvtt_parser.h',
+        'webvtt_text_output_handler.cc',
+        'webvtt_text_output_handler.h',
         'webvtt_timestamp.cc',
         'webvtt_timestamp.h',
         'webvtt_to_mp4_handler.cc',
@@ -40,8 +40,8 @@
       'type': '<(gtest_target_type)',
       'sources': [
         'text_readers_unittest.cc',
-        'webvtt_output_handler_unittest.cc',
         'webvtt_parser_unittest.cc',
+        'webvtt_text_output_handler_unittest.cc',
         'webvtt_timestamp_unittest.cc',
         'webvtt_to_mp4_handler_unittest.cc',
       ],
diff --git a/packager/media/formats/webvtt/webvtt_output_handler.cc b/packager/media/formats/webvtt/webvtt_text_output_handler.cc
similarity index 98%
rename from packager/media/formats/webvtt/webvtt_output_handler.cc
rename to packager/media/formats/webvtt/webvtt_text_output_handler.cc
index f1dc3cc181..cfb299216a 100644
--- a/packager/media/formats/webvtt/webvtt_output_handler.cc
+++ b/packager/media/formats/webvtt/webvtt_text_output_handler.cc
@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "packager/media/formats/webvtt/webvtt_output_handler.h"
+#include "packager/media/formats/webvtt/webvtt_text_output_handler.h"
 
 #include <algorithm>  // needed for min and max
 
diff --git a/packager/media/formats/webvtt/webvtt_output_handler.h b/packager/media/formats/webvtt/webvtt_text_output_handler.h
similarity index 100%
rename from packager/media/formats/webvtt/webvtt_output_handler.h
rename to packager/media/formats/webvtt/webvtt_text_output_handler.h
diff --git a/packager/media/formats/webvtt/webvtt_output_handler_unittest.cc b/packager/media/formats/webvtt/webvtt_text_output_handler_unittest.cc
similarity index 99%
rename from packager/media/formats/webvtt/webvtt_output_handler_unittest.cc
rename to packager/media/formats/webvtt/webvtt_text_output_handler_unittest.cc
index c84b1a7b8c..916f4d5776 100644
--- a/packager/media/formats/webvtt/webvtt_output_handler_unittest.cc
+++ b/packager/media/formats/webvtt/webvtt_text_output_handler_unittest.cc
@@ -12,7 +12,7 @@
 #include "packager/media/base/text_stream_info.h"
 #include "packager/media/event/combined_muxer_listener.h"
 #include "packager/media/event/mock_muxer_listener.h"
-#include "packager/media/formats/webvtt/webvtt_output_handler.h"
+#include "packager/media/formats/webvtt/webvtt_text_output_handler.h"
 #include "packager/status_test_util.h"
 
 namespace shaka {
diff --git a/packager/packager.cc b/packager/packager.cc
index fbca281c24..1d3a95f8db 100644
--- a/packager/packager.cc
+++ b/packager/packager.cc
@@ -42,8 +42,8 @@
 #include "packager/media/event/vod_media_info_dump_muxer_listener.h"
 #include "packager/media/formats/webvtt/text_padder.h"
 #include "packager/media/formats/webvtt/text_readers.h"
-#include "packager/media/formats/webvtt/webvtt_output_handler.h"
 #include "packager/media/formats/webvtt/webvtt_parser.h"
+#include "packager/media/formats/webvtt/webvtt_text_output_handler.h"
 #include "packager/media/formats/webvtt/webvtt_to_mp4_handler.h"
 #include "packager/media/replicator/replicator.h"
 #include "packager/media/trick_play/trick_play_handler.h"