Rename everything.

13 files changed, 225 insertions, 222 deletions

diff --git a/test/combine_test.cc b/test/combine_test.cc
index 12cbb6e2..b04d62f1 100644
--- a/test/combine_test.cc
+++ b/test/combine_test.cc
@@ -36,7 +36,7 @@
 #include "cpl.h"
 #include "dcp.h"
 #include "equality_options.h"
-#include "interop_subtitle_asset.h"
+#include "interop_text_asset.h"
 #include "reel_subtitle_asset.h"
 #include "reel_mono_picture_asset.h"
 #include "reel_sound_asset.h"
@@ -448,7 +448,7 @@ BOOST_AUTO_TEST_CASE(combine_multi_reel_subtitles)
 	dcp::ArrayData data1(4096);
 	memset(data1.data(), 0, data1.size());
 
-	auto subs1 = make_shared<dcp::InteropSubtitleAsset>();
+	auto subs1 = make_shared<dcp::InteropTextAsset>();
 	subs1->add(simple_subtitle());
 	boost::filesystem::create_directory(in / "subs1");
 	subs1->add_font("afont1", data1);
@@ -457,7 +457,7 @@ BOOST_AUTO_TEST_CASE(combine_multi_reel_subtitles)
 	dcp::ArrayData data2(4096);
 	memset(data2.data(), 1, data1.size());
 
-	auto subs2 = make_shared<dcp::InteropSubtitleAsset>();
+	auto subs2 = make_shared<dcp::InteropTextAsset>();
 	subs2->add(simple_subtitle());
 	boost::filesystem::create_directory(in / "subs2");
 	subs2->add_font("afont2", data2);
diff --git a/test/dcp_font_test.cc b/test/dcp_font_test.cc
index 7cb55c46..482b2526 100644
--- a/test/dcp_font_test.cc
+++ b/test/dcp_font_test.cc
@@ -35,11 +35,11 @@
 #include "cpl.h"
 #include "dcp.h"
 #include "file.h"
-#include "interop_subtitle_asset.h"
+#include "interop_text_asset.h"
 #include "reel.h"
 #include "reel_interop_subtitle_asset.h"
 #include "reel_smpte_subtitle_asset.h"
-#include "smpte_subtitle_asset.h"
+#include "smpte_text_asset.h"
 #include "test.h"
 #include "util.h"
 #include <boost/test/unit_test.hpp>
@@ -60,7 +60,7 @@ BOOST_AUTO_TEST_CASE (interop_dcp_font_test)
 	boost::filesystem::remove_all(directory);
 	dcp::DCP dcp (directory);
 
-	auto subs = make_shared<dcp::InteropSubtitleAsset>();
+	auto subs = make_shared<dcp::InteropTextAsset>();
 	subs->add_font ("theFontId", dcp::ArrayData("test/data/dummy.ttf"));
 	subs->write (directory / "frobozz.xml");
 	check_file ("test/data/dummy.ttf", "build/test/interop_dcp_font_test/font_0.ttf");
@@ -76,7 +76,7 @@ BOOST_AUTO_TEST_CASE (interop_dcp_font_test)
 
 	dcp::DCP dcp2 (directory);
 	dcp2.read ();
-	auto subs2 = dynamic_pointer_cast<dcp::SubtitleAsset> (
+	auto subs2 = dynamic_pointer_cast<dcp::TextAsset> (
 		dcp2.cpls()[0]->reels()[0]->main_subtitle()->asset_ref().asset()
 		);
 	BOOST_REQUIRE (subs2);
@@ -98,7 +98,7 @@ BOOST_AUTO_TEST_CASE (smpte_dcp_font_test)
 	boost::filesystem::path directory = "build/test/smpte_dcp_font_test";
 	dcp::DCP dcp (directory);
 
-	auto subs = make_shared<dcp::SMPTESubtitleAsset>();
+	auto subs = make_shared<dcp::SMPTETextAsset>();
 	subs->add_font ("theFontId", dcp::ArrayData("test/data/dummy.ttf"));
 	subs->write (directory / "frobozz.mxf");
 
@@ -113,7 +113,7 @@ BOOST_AUTO_TEST_CASE (smpte_dcp_font_test)
 
 	dcp::DCP dcp2 (directory);
 	dcp2.read ();
-	auto subs2 = dynamic_pointer_cast<dcp::SubtitleAsset> (
+	auto subs2 = dynamic_pointer_cast<dcp::TextAsset> (
 		dcp2.cpls().front()->reels().front()->main_subtitle()->asset_ref().asset()
 		);
 	BOOST_REQUIRE (subs2);
diff --git a/test/decryption_test.cc b/test/decryption_test.cc
index 8f3dbff7..dd91da1e 100644
--- a/test/decryption_test.cc
+++ b/test/decryption_test.cc
@@ -48,7 +48,7 @@
 #include "reel_sound_asset.h"
 #include "reel_smpte_subtitle_asset.h"
 #include "rgb_xyz.h"
-#include "smpte_subtitle_asset.h"
+#include "smpte_text_asset.h"
 #include "sound_asset.h"
 #include "sound_asset_writer.h"
 #include "stream_operators.h"
@@ -178,10 +178,10 @@ BOOST_AUTO_TEST_CASE (decryption_test2)
 	sound_writer->write(audio.data(), 2, 48000);
 	sound_writer->finalize ();
 
-	auto subs_asset = std::make_shared<dcp::SMPTESubtitleAsset>();
+	auto subs_asset = std::make_shared<dcp::SMPTETextAsset>();
 	subs_asset->set_key (key);
 	subs_asset->set_context_id (context_id);
-	subs_asset->add(std::make_shared<dcp::SubtitleString>(
+	subs_asset->add(std::make_shared<dcp::TextString>(
 		optional<string>(),
 		false, false, false,
 		dcp::Colour(255, 255, 255),
@@ -236,7 +236,7 @@ BOOST_AUTO_TEST_CASE (decryption_test2)
 	BOOST_REQUIRE (reel_read->main_sound());
 	BOOST_CHECK (reel_read->main_sound()->asset()->key());
 	BOOST_REQUIRE (reel_read->main_subtitle());
-	auto smpte_sub = dynamic_pointer_cast<dcp::SMPTESubtitleAsset>(reel_read->main_subtitle()->asset());
+	auto smpte_sub = dynamic_pointer_cast<dcp::SMPTETextAsset>(reel_read->main_subtitle()->asset());
 	BOOST_REQUIRE (smpte_sub);
 	BOOST_CHECK (smpte_sub->key());
 }
diff --git a/test/encryption_test.cc b/test/encryption_test.cc
index 358a3fd9..ccb69858 100644
--- a/test/encryption_test.cc
+++ b/test/encryption_test.cc
@@ -43,7 +43,7 @@
 #include "sound_asset.h"
 #include "reel.h"
 #include "test.h"
-#include "subtitle_asset.h"
+#include "text_asset.h"
 #include "reel_mono_picture_asset.h"
 #include "reel_sound_asset.h"
 #include "encrypted_kdm.h"
diff --git a/test/interop_subtitle_test.cc b/test/interop_subtitle_test.cc
index 0efca007..0459d056 100644
--- a/test/interop_subtitle_test.cc
+++ b/test/interop_subtitle_test.cc
@@ -32,11 +32,11 @@
 */
 
 
-#include "interop_subtitle_asset.h"
 #include "interop_load_font_node.h"
+#include "interop_text_asset.h"
 #include "reel_interop_subtitle_asset.h"
-#include "subtitle_string.h"
 #include "subtitle_image.h"
+#include "text_string.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 #include <iostream>
@@ -51,7 +51,7 @@ using std::vector;
 /** Load some subtitle content from Interop XML and check that it is read correctly */
 BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 {
-	dcp::InteropSubtitleAsset subs ("test/data/subs1.xml");
+	dcp::InteropTextAsset subs("test/data/subs1.xml");
 
 	BOOST_CHECK_EQUAL (subs.id(), "cab5c268-222b-41d2-88ae-6d6999441b17");
 	BOOST_CHECK_EQUAL (subs.movie_title(), "Movie Title");
@@ -65,10 +65,10 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 	BOOST_CHECK_EQUAL (interop_lfn->id, "theFontId");
 	BOOST_CHECK_EQUAL (interop_lfn->uri, "arial.ttf");
 
-	auto s = subs.subtitles_during (dcp::Time (0, 0, 6, 1, 250), dcp::Time (0, 0, 6, 2, 250), false);
+	auto s = subs.texts_during(dcp::Time (0, 0, 6, 1, 250), dcp::Time (0, 0, 6, 2, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 2U);
-	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+	BOOST_REQUIRE(dynamic_pointer_cast<const dcp::TextString>(s.front()));
+	BOOST_CHECK_EQUAL(*dynamic_pointer_cast<const dcp::TextString>(s.front()), dcp::TextString (
 				   string ("theFontId"),
 				   false,
 				   false,
@@ -92,8 +92,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 				   0,
 				   {}
 				   ));
-	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::TextString>(s.back()), dcp::TextString (
 				   string ("theFontId"),
 				   false,
 				   false,
@@ -118,10 +118,10 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 				   {}
 				   ));
 
-	s = subs.subtitles_during (dcp::Time (0, 0, 7, 190, 250), dcp::Time (0, 0, 7, 191, 250), false);
+	s = subs.texts_during(dcp::Time (0, 0, 7, 190, 250), dcp::Time (0, 0, 7, 191, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 2U);
-	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::TextString>(s.front()), dcp::TextString (
 				   string ("theFontId"),
 				   true,
 				   false,
@@ -145,8 +145,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 				   0,
 				   {}
 				   ));
-	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::TextString>(s.back()), dcp::TextString (
 				   string ("theFontId"),
 				   false,
 				   false,
@@ -171,10 +171,10 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 				   {}
 				   ));
 
-	s = subs.subtitles_during (dcp::Time (0, 0, 11, 95, 250), dcp::Time (0, 0, 11, 96, 250), false);
+	s = subs.texts_during(dcp::Time (0, 0, 11, 95, 250), dcp::Time (0, 0, 11, 96, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 1U);
-	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::TextString>(s.back()), dcp::TextString (
 				   string ("theFontId"),
 				   false,
 				   false,
@@ -199,10 +199,10 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 				   {}
 				   ));
 
-	s = subs.subtitles_during (dcp::Time (0, 0, 14, 42, 250), dcp::Time (0, 0, 14, 43, 250), false);
+	s = subs.texts_during(dcp::Time (0, 0, 14, 42, 250), dcp::Time (0, 0, 14, 43, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 1U);
-	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::TextString>(s.back()), dcp::TextString (
 				   string ("theFontId"),
 				   false,
 				   true,
@@ -231,12 +231,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 /** And similarly for another one */
 BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 {
-	dcp::InteropSubtitleAsset subs ("test/data/subs2.xml");
+	dcp::InteropTextAsset subs("test/data/subs2.xml");
 
-	auto s = subs.subtitles_during (dcp::Time (0, 0, 42, 100, 250), dcp::Time (0, 0, 42, 101, 250), false);
+	auto s = subs.texts_during(dcp::Time (0, 0, 42, 100, 250), dcp::Time (0, 0, 42, 101, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 2U);
-	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::TextString>(s.front()), dcp::TextString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -260,8 +260,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   0,
 				   {}
 				   ));
-	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::TextString>(s.back()), dcp::TextString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -286,10 +286,10 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   {}
 				   ));
 
-	s = subs.subtitles_during (dcp::Time (0, 0, 50, 50, 250), dcp::Time (0, 0, 50, 51, 250), false);
+	s = subs.texts_during(dcp::Time (0, 0, 50, 50, 250), dcp::Time (0, 0, 50, 51, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 2U);
-	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::TextString>(s.front()), dcp::TextString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -313,8 +313,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   0,
 				   {}
 				   ));
-	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::TextString>(s.back()), dcp::TextString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -339,10 +339,10 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   {}
 				   ));
 
-	s = subs.subtitles_during (dcp::Time (0, 1, 2, 300, 250), dcp::Time (0, 1, 2, 301, 250), false);
+	s = subs.texts_during(dcp::Time (0, 1, 2, 300, 250), dcp::Time (0, 1, 2, 301, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 2U);
-	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::TextString>(s.front()), dcp::TextString (
 				   string("theFont"),
 				   true,
 				   false,
@@ -366,8 +366,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   0,
 				   {}
 				   ));
-	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::TextString>(s.back()), dcp::TextString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -392,10 +392,10 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   {}
 				   ));
 
-	s = subs.subtitles_during (dcp::Time (0, 1, 15, 50, 250), dcp::Time (0, 1, 15, 51, 250), false);
+	s = subs.texts_during(dcp::Time (0, 1, 15, 50, 250), dcp::Time (0, 1, 15, 51, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 2U);
-	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::TextString>(s.front()), dcp::TextString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -419,8 +419,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   0,
 				   {}
 				   ));
-	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::TextString>(s.back()), dcp::TextString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -445,10 +445,10 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   {}
 				   ));
 
-	s = subs.subtitles_during (dcp::Time (0, 1, 27, 200, 250), dcp::Time (0, 1, 27, 201, 250), false);
+	s = subs.texts_during(dcp::Time (0, 1, 27, 200, 250), dcp::Time (0, 1, 27, 201, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 2U);
-	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::TextString>(s.front()), dcp::TextString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -472,8 +472,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   0,
 				   {}
 				   ));
-	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::TextString>(s.back()), dcp::TextString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -498,10 +498,10 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   {}
 				   ));
 
-	s = subs.subtitles_during (dcp::Time (0, 1, 42, 300, 250), dcp::Time (0, 1, 42, 301, 250), false);
+	s = subs.texts_during(dcp::Time (0, 1, 42, 300, 250), dcp::Time (0, 1, 42, 301, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 2U);
-	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::TextString>(s.front()), dcp::TextString (
 				   string ("theFont"),
 				   false,
 				   false,
@@ -525,8 +525,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   0,
 				   {}
 				   ));
-	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::TextString>(s.back()), dcp::TextString (
 				   string ("theFont"),
 				   false,
 				   false,
@@ -551,10 +551,10 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   {}
 				   ));
 
-	s = subs.subtitles_during (dcp::Time (0, 1, 45, 200, 250), dcp::Time (0, 1, 45, 201, 250), false);
+	s = subs.texts_during(dcp::Time (0, 1, 45, 200, 250), dcp::Time (0, 1, 45, 201, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 2U);
-	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::TextString>(s.front()), dcp::TextString (
 				   string("theFont"),
 				   false,
 				   false,
@@ -578,8 +578,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   0,
 				   {}
 				   ));
-	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::TextString>(s.back()), dcp::TextString (
 				   string ("theFont"),
 				   false,
 				   false,
@@ -604,10 +604,10 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   {}
 				   ));
 
-	s = subs.subtitles_during (dcp::Time (0, 1, 47, 249, 250), dcp::Time (0, 1, 47, 250, 250), false);
+	s = subs.texts_during(dcp::Time (0, 1, 47, 249, 250), dcp::Time (0, 1, 47, 250, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 2U);
-	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::TextString>(s.front()), dcp::TextString (
 				   string ("theFont"),
 				   false,
 				   false,
@@ -631,8 +631,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   0,
 				   {}
 				   ));
-	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::TextString>(s.back()), dcp::TextString (
 				   string ("theFont"),
 				   false,
 				   false,
@@ -657,10 +657,10 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   {}
 				   ));
 
-	s = subs.subtitles_during (dcp::Time (0, 2, 6, 210, 250), dcp::Time (0, 2, 6, 211, 250), false);
+	s = subs.texts_during(dcp::Time (0, 2, 6, 210, 250), dcp::Time (0, 2, 6, 211, 250), false);
 	BOOST_REQUIRE_EQUAL (s.size(), 2U);
-	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(s.front()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::TextString>(s.front()), dcp::TextString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -684,8 +684,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   0,
 				   {}
 				   ));
-	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
-	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(s.back()));
+	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::TextString>(s.back()), dcp::TextString (
 				   string ("theFont"),
 				   true,
 				   false,
@@ -714,10 +714,10 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 /** And one with bitmap subtitles */
 BOOST_AUTO_TEST_CASE (read_interop_subtitle_test3)
 {
-	dcp::InteropSubtitleAsset subs ("test/data/subs3.xml");
+	dcp::InteropTextAsset subs ("test/data/subs3.xml");
 
-	BOOST_REQUIRE_EQUAL (subs.subtitles().size(), 1U);
-	auto si = dynamic_pointer_cast<const dcp::SubtitleImage>(subs.subtitles().front());
+	BOOST_REQUIRE_EQUAL(subs.texts().size(), 1U);
+	auto si = dynamic_pointer_cast<const dcp::SubtitleImage>(subs.texts().front());
 	BOOST_REQUIRE (si);
 	BOOST_CHECK (si->png_image() == dcp::ArrayData("test/data/sub.png"));
 }
@@ -726,13 +726,13 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test3)
 /** Write some subtitle content as Interop XML and check that it is right */
 BOOST_AUTO_TEST_CASE (write_interop_subtitle_test)
 {
-	dcp::InteropSubtitleAsset c;
+	dcp::InteropTextAsset c;
 	c.set_reel_number ("1");
 	c.set_language ("EN");
 	c.set_movie_title ("Test");
 
 	c.add (
-		std::make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::TextString>(
 			string ("Frutiger"),
 			false,
 			false,
@@ -759,7 +759,7 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test)
 		);
 
 	c.add (
-		std::make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::TextString>(
 			boost::optional<string> (),
 			true,
 			true,
@@ -786,7 +786,7 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test)
 		);
 
 	c.add (
-		std::make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::TextString>(
 			boost::optional<string> (),
 			true,
 			true,
@@ -841,13 +841,13 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test)
  */
 BOOST_AUTO_TEST_CASE (write_interop_subtitle_test2)
 {
-	dcp::InteropSubtitleAsset c;
+	dcp::InteropTextAsset c;
 	c.set_reel_number ("1");
 	c.set_language ("EN");
 	c.set_movie_title ("Test");
 
 	c.add (
-		std::make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::TextString>(
 			string ("Frutiger"),
 			false,
 			false,
@@ -874,7 +874,7 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test2)
 		);
 
 	c.add (
-		std::make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::TextString>(
 			boost::optional<string>(),
 			true,
 			true,
@@ -929,7 +929,7 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test3)
 {
 	RNGFixer fix;
 
-	auto c = std::make_shared<dcp::InteropSubtitleAsset>();
+	auto c = std::make_shared<dcp::InteropTextAsset>();
 	c->set_reel_number ("1");
 	c->set_language ("EN");
 	c->set_movie_title ("Test");
diff --git a/test/kdm_test.cc b/test/kdm_test.cc
index 6f06b4c9..b5deb356 100644
--- a/test/kdm_test.cc
+++ b/test/kdm_test.cc
@@ -42,7 +42,7 @@
 #include "reel_mono_picture_asset.h"
 #include "reel_sound_asset.h"
 #include "reel_smpte_subtitle_asset.h"
-#include "smpte_subtitle_asset.h"
+#include "smpte_text_asset.h"
 #include "test.h"
 #include "types.h"
 #include "util.h"
@@ -325,7 +325,7 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test)
 
 	/* Make VF */
 
-	auto subs = make_shared<dcp::SMPTESubtitleAsset>();
+	auto subs = make_shared<dcp::SMPTETextAsset>();
 	subs->add(simple_subtitle());
 	subs->set_key(key);
 
diff --git a/test/rewrite_subs.cc b/test/rewrite_subs.cc
index 0a6f4c6c..11033a5e 100644
--- a/test/rewrite_subs.cc
+++ b/test/rewrite_subs.cc
@@ -31,13 +31,15 @@
     files in the program, then also delete it here.
 */
 
-#include <iostream>
-#include "dcp.h"
+
 #include "cpl.h"
+#include "dcp.h"
+#include "exceptions.h"
 #include "reel.h"
-#include "subtitle_asset.h"
 #include "reel_subtitle_asset.h"
-#include "exceptions.h"
+#include "text_asset.h"
+#include <iostream>
+
 
 using std::cout;
 using std::cerr;
diff --git a/test/shared_subtitle_test.cc b/test/shared_subtitle_test.cc
index 7ac20e10..f858de7d 100644
--- a/test/shared_subtitle_test.cc
+++ b/test/shared_subtitle_test.cc
@@ -37,11 +37,11 @@
  */
 
 
-#include "interop_subtitle_asset.h"
-#include "smpte_subtitle_asset.h"
-#include "subtitle_string.h"
+#include "interop_text_asset.h"
+#include "smpte_text_asset.h"
 #include "subtitle_image.h"
-#include "subtitle_asset_internal.h"
+#include "text_string.h"
+#include "text_asset_internal.h"
 #include "reel_interop_subtitle_asset.h"
 #include "reel.h"
 #include "cpl.h"
@@ -113,7 +113,7 @@ BOOST_AUTO_TEST_CASE (pull_fonts_test1)
 	text1->font._values["font"] = "Inconsolata";
 	text1->font._values["size"] = "42";
 
-	dcp::SubtitleAsset::pull_fonts (root);
+	dcp::TextAsset::pull_fonts(root);
 
 	BOOST_REQUIRE_EQUAL (sub1->font._values.size(), 2U);
 	BOOST_CHECK_EQUAL (sub1->font._values["font"], "Inconsolata");
@@ -136,7 +136,7 @@ BOOST_AUTO_TEST_CASE (pull_fonts_test2)
 	text2->font._values["font"] = "Inconsolata";
 	text2->font._values["size"] = "48";
 
-	dcp::SubtitleAsset::pull_fonts (root);
+	dcp::TextAsset::pull_fonts(root);
 
 	BOOST_REQUIRE_EQUAL (sub1->font._values.size(), 1U);
 	BOOST_CHECK_EQUAL (sub1->font._values["font"], "Inconsolata");
@@ -160,7 +160,7 @@ BOOST_AUTO_TEST_CASE (pull_fonts_test3)
 	auto string1 = make_shared<dcp::order::String>(text1, font, "Hello world", 0);
 	text1->children.push_back (string1);
 
-	dcp::SubtitleAsset::pull_fonts (root);
+	dcp::TextAsset::pull_fonts(root);
 
 	BOOST_REQUIRE_EQUAL (sub1->font._values.size(), 2U);
 	BOOST_CHECK_EQUAL (sub1->font._values["font"], "Inconsolata");
@@ -183,7 +183,7 @@ BOOST_AUTO_TEST_CASE (format_xml_test1)
 	fred->add_child_text("Fred");
 	fred->add_child("Text")->add_child_text("Jim");
 	fred->add_child_text("Sheila");
-	BOOST_REQUIRE_EQUAL (dcp::SubtitleAsset::format_xml(doc, make_pair(string{}, string{"fred"})),
+	BOOST_REQUIRE_EQUAL(dcp::TextAsset::format_xml(doc, make_pair(string{}, string{"fred"})),
 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 "<Foo xmlns=\"fred\">\n"
 "  <Empty/>\n"
@@ -202,7 +202,7 @@ BOOST_AUTO_TEST_CASE (format_xml_test2)
 	auto path = private_test / "DKH_UT_EN20160601def.xml";
 	parser.parse_file(path.string().c_str());
 	auto document = parser.get_document();
-	check_xml (dcp::file_to_string(private_test / "DKH_UT_EN20160601def.reformatted.xml"), dcp::SubtitleAsset::format_xml(*document, {}), {});
+	check_xml(dcp::file_to_string(private_test / "DKH_UT_EN20160601def.reformatted.xml"), dcp::TextAsset::format_xml(*document, {}), {});
 }
 
 
@@ -211,7 +211,7 @@ BOOST_AUTO_TEST_CASE (format_xml_entities_test)
 	xmlpp::Document doc;
 	auto root = doc.create_root_node("Foo");
 	root->add_child("Bar")->add_child_text("Don't panic &amp; xml \"is\" 'great' & < > —");
-	BOOST_REQUIRE_EQUAL(dcp::SubtitleAsset::format_xml(doc, {}),
+	BOOST_REQUIRE_EQUAL(dcp::TextAsset::format_xml(doc, {}),
 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 "<Foo>\n"
 "  <Bar>Don't panic &amp;amp; xml \"is\" 'great' &amp; &lt; &gt; —</Bar>\n"
@@ -221,7 +221,7 @@ BOOST_AUTO_TEST_CASE (format_xml_entities_test)
 
 BOOST_AUTO_TEST_CASE(ruby_round_trip_test)
 {
-	dcp::InteropSubtitleAsset asset("test/data/ruby1.xml");
+	dcp::InteropTextAsset asset("test/data/ruby1.xml");
 	check_xml(dcp::file_to_string("test/data/ruby1.xml"), asset.xml_as_string(), {}, false);
 }
 
diff --git a/test/smpte_subtitle_test.cc b/test/smpte_subtitle_test.cc
index 3bf9dc52..9b119592 100644
--- a/test/smpte_subtitle_test.cc
+++ b/test/smpte_subtitle_test.cc
@@ -33,7 +33,7 @@
 
 
 #include "smpte_load_font_node.h"
-#include "smpte_subtitle_asset.h"
+#include "smpte_text_asset.h"
 #include "stream_operators.h"
 #include "subtitle_image.h"
 #include "test.h"
@@ -51,9 +51,9 @@ using boost::optional;
 
 BOOST_AUTO_TEST_CASE (smpte_subtitle_id_test)
 {
-	dcp::SMPTESubtitleAsset subs;
+	dcp::SMPTETextAsset subs;
 	subs.add(
-		std::make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::TextString>(
 			optional<string>(),
 			false, false, false,
 			dcp::Colour(),
@@ -78,7 +78,7 @@ BOOST_AUTO_TEST_CASE (smpte_subtitle_id_test)
 		);
 	subs.write("build/test/smpte_subtitle_id_test.mxf");
 
-	dcp::SMPTESubtitleAsset check("build/test/smpte_subtitle_id_test.mxf");
+	dcp::SMPTETextAsset check("build/test/smpte_subtitle_id_test.mxf");
 	BOOST_CHECK(check.id() != check.xml_id());
 }
 
@@ -86,7 +86,7 @@ BOOST_AUTO_TEST_CASE (smpte_subtitle_id_test)
 /** Check reading of a SMPTE subtitle file */
 BOOST_AUTO_TEST_CASE (read_smpte_subtitle_test)
 {
-	dcp::SMPTESubtitleAsset sc (
+	dcp::SMPTETextAsset sc(
 		private_test /
 		"data" /
 		"JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV" /
@@ -111,59 +111,59 @@ BOOST_AUTO_TEST_CASE (read_smpte_subtitle_test)
 	BOOST_REQUIRE (smpte_lfn);
 	BOOST_CHECK_EQUAL (smpte_lfn->id, "theFontId");
 	BOOST_CHECK_EQUAL (smpte_lfn->urn, "9118bbce-4105-4a05-b37c-a5a6f75e1fea");
-	BOOST_REQUIRE_EQUAL (sc.subtitles().size(), 63U);
-	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(sc.subtitles().front()));
-	BOOST_CHECK_EQUAL (dynamic_pointer_cast<const dcp::SubtitleString>(sc.subtitles().front())->text(), "Noch mal.");
-	BOOST_CHECK_EQUAL (dynamic_pointer_cast<const dcp::SubtitleString>(sc.subtitles().front())->space_before(), 0.0f);
-	BOOST_CHECK_EQUAL (sc.subtitles().front()->in(), dcp::Time (0, 0, 25, 12, 25));
-	BOOST_CHECK_EQUAL (sc.subtitles().front()->out(), dcp::Time (0, 0, 26, 4, 25));
-	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(sc.subtitles().back()));
-	BOOST_CHECK_EQUAL (dynamic_pointer_cast<const dcp::SubtitleString>(sc.subtitles().back())->text(), "Prochainement");
-	BOOST_CHECK_EQUAL (dynamic_pointer_cast<const dcp::SubtitleString>(sc.subtitles().back())->space_before(), 0.0f);
-	BOOST_CHECK_EQUAL (sc.subtitles().back()->in(), dcp::Time (0, 1, 57, 17, 25));
-	BOOST_CHECK_EQUAL (sc.subtitles().back()->out(), dcp::Time (0, 1, 58, 12, 25));
+	BOOST_REQUIRE_EQUAL(sc.texts().size(), 63U);
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(sc.texts().front()));
+	BOOST_CHECK_EQUAL (dynamic_pointer_cast<const dcp::TextString>(sc.texts().front())->text(), "Noch mal.");
+	BOOST_CHECK_EQUAL (dynamic_pointer_cast<const dcp::TextString>(sc.texts().front())->space_before(), 0.0f);
+	BOOST_CHECK_EQUAL (sc.texts().front()->in(), dcp::Time (0, 0, 25, 12, 25));
+	BOOST_CHECK_EQUAL (sc.texts().front()->out(), dcp::Time (0, 0, 26, 4, 25));
+	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(sc.texts().back()));
+	BOOST_CHECK_EQUAL (dynamic_pointer_cast<const dcp::TextString>(sc.texts().back())->text(), "Prochainement");
+	BOOST_CHECK_EQUAL (dynamic_pointer_cast<const dcp::TextString>(sc.texts().back())->space_before(), 0.0f);
+	BOOST_CHECK_EQUAL (sc.texts().back()->in(), dcp::Time (0, 1, 57, 17, 25));
+	BOOST_CHECK_EQUAL (sc.texts().back()->out(), dcp::Time (0, 1, 58, 12, 25));
 }
 
 
 /** And another one featuring <Font> within <Text> and some <Space> */
 BOOST_AUTO_TEST_CASE (read_smpte_subtitle_test2)
 {
-	dcp::SMPTESubtitleAsset sc (private_test / "olsson.xml");
+	dcp::SMPTETextAsset sc (private_test / "olsson.xml");
 
-	auto subs = sc.subtitles();
+	auto subs = sc.texts();
 	BOOST_REQUIRE_EQUAL (subs.size(), 6U);
 	auto i = 0;
-	auto is = dynamic_pointer_cast<const dcp::SubtitleString>(subs[i]);
+	auto is = dynamic_pointer_cast<const dcp::TextString>(subs[i]);
 	BOOST_REQUIRE (is);
 	BOOST_CHECK_EQUAL (is->text(), "Testing is ");
 	BOOST_CHECK (!is->italic());
 	BOOST_CHECK_CLOSE (is->space_before(), 0, 0.1);
 	++i;
-	is = dynamic_pointer_cast<const dcp::SubtitleString>(subs[i]);
+	is = dynamic_pointer_cast<const dcp::TextString>(subs[i]);
 	BOOST_REQUIRE (is);
 	BOOST_CHECK_EQUAL (is->text(), "really");
 	BOOST_CHECK (is->italic());
 	BOOST_CHECK_CLOSE (is->space_before(), 0, 0.1);
 	++i;
-	is = dynamic_pointer_cast<const dcp::SubtitleString>(subs[i]);
+	is = dynamic_pointer_cast<const dcp::TextString>(subs[i]);
 	BOOST_REQUIRE (is);
 	BOOST_CHECK_EQUAL (is->text(), " fun!");
 	BOOST_CHECK (!is->italic());
 	BOOST_CHECK_CLOSE (is->space_before(), 5, 0.1);
 	++i;
-	is = dynamic_pointer_cast<const dcp::SubtitleString>(subs[i]);
+	is = dynamic_pointer_cast<const dcp::TextString>(subs[i]);
 	BOOST_REQUIRE (is);
 	BOOST_CHECK_EQUAL (is->text(), "This is the ");
 	BOOST_CHECK (!is->italic());
 	BOOST_CHECK_CLOSE (is->space_before(), 0, 0.1);
 	++i;
-	is = dynamic_pointer_cast<const dcp::SubtitleString>(subs[i]);
+	is = dynamic_pointer_cast<const dcp::TextString>(subs[i]);
 	BOOST_REQUIRE (is);
 	BOOST_CHECK_EQUAL (is->text(), "second");
 	BOOST_CHECK (is->italic());
 	BOOST_CHECK_CLOSE (is->space_before(), 0, 0.1);
 	++i;
-	is = dynamic_pointer_cast<const dcp::SubtitleString>(subs[i]);
+	is = dynamic_pointer_cast<const dcp::TextString>(subs[i]);
 	BOOST_REQUIRE (is);
 	BOOST_CHECK_EQUAL (is->text(), " line!");
 	BOOST_CHECK (!is->italic());
@@ -174,14 +174,14 @@ BOOST_AUTO_TEST_CASE (read_smpte_subtitle_test2)
 /* Write some subtitle content as SMPTE XML and check that it is right */
 BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test)
 {
-	dcp::SMPTESubtitleAsset c;
+	dcp::SMPTETextAsset c;
 	c.set_reel_number (1);
 	c.set_language (dcp::LanguageTag("en"));
 	c.set_content_title_text ("Test");
 	c.set_issue_date (dcp::LocalTime ("2016-04-01T03:52:00+00:00"));
 
 	c.add (
-		std::make_shared<dcp::SubtitleString> (
+		std::make_shared<dcp::TextString> (
 			string ("Frutiger"),
 			false,
 			false,
@@ -208,7 +208,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test)
 		);
 
 	c.add (
-		std::make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::TextString>(
 			boost::optional<string> (),
 			true,
 			true,
@@ -235,7 +235,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test)
 		);
 
 	c.add (
-		std::make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::TextString>(
 			boost::optional<string> (),
 			true,
 			true,
@@ -296,14 +296,14 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test)
 */
 BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 {
-	dcp::SMPTESubtitleAsset c;
+	dcp::SMPTETextAsset c;
 	c.set_reel_number (1);
 	c.set_language (dcp::LanguageTag("en"));
 	c.set_content_title_text ("Test");
 	c.set_issue_date (dcp::LocalTime ("2016-04-01T03:52:00+00:00"));
 
 	c.add (
-		std::make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::TextString>(
 			string ("Arial"),
 			false,
 			false,
@@ -330,7 +330,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 		);
 
 	c.add (
-		std::make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::TextString>(
 			string ("Arial"),
 			true,
 			false,
@@ -357,7 +357,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 		);
 
 	c.add (
-		std::make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::TextString>(
 			string ("Arial"),
 			false,
 			false,
@@ -384,7 +384,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 		);
 
 	c.add (
-		std::make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::TextString>(
 			string ("Arial"),
 			false,
 			false,
@@ -411,7 +411,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 		);
 
 	c.add (
-		std::make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::TextString>(
 			string ("Arial"),
 			true,
 			false,
@@ -438,7 +438,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 		);
 
 	c.add (
-		std::make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::TextString>(
 			string ("Arial"),
 			false,
 			false,
@@ -493,7 +493,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 /* Write some subtitle content as SMPTE using bitmaps and check that it is right */
 BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test3)
 {
-	dcp::SMPTESubtitleAsset c;
+	dcp::SMPTETextAsset c;
 	c.set_reel_number (1);
 	c.set_language (dcp::LanguageTag("en"));
 	c.set_content_title_text ("Test");
@@ -522,8 +522,8 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test3)
 	boost::filesystem::create_directories (path);
 	c.write (path / "subs.mxf");
 
-	dcp::SMPTESubtitleAsset read_back (path / "subs.mxf");
-	auto subs = read_back.subtitles ();
+	dcp::SMPTETextAsset read_back (path / "subs.mxf");
+	auto subs = read_back.texts();
 	BOOST_REQUIRE_EQUAL (subs.size(), 1U);
 	auto image = dynamic_pointer_cast<const dcp::SubtitleImage>(subs[0]);
 	BOOST_REQUIRE (image);
@@ -546,14 +546,14 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test3)
  */
 BOOST_AUTO_TEST_CASE (write_subtitles_in_vertical_order_with_top_alignment)
 {
-	dcp::SMPTESubtitleAsset c;
+	dcp::SMPTETextAsset c;
 	c.set_reel_number (1);
 	c.set_language (dcp::LanguageTag("en"));
 	c.set_content_title_text ("Test");
 	c.set_issue_date (dcp::LocalTime ("2016-04-01T03:52:00+00:00"));
 
 	c.add (
-		std::make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::TextString>(
 			string ("Arial"),
 			false,
 			false,
@@ -580,7 +580,7 @@ BOOST_AUTO_TEST_CASE (write_subtitles_in_vertical_order_with_top_alignment)
 		);
 
 	c.add (
-		std::make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::TextString>(
 			string ("Arial"),
 			false,
 			false,
@@ -636,14 +636,14 @@ BOOST_AUTO_TEST_CASE (write_subtitles_in_vertical_order_with_top_alignment)
 /* See the test above */
 BOOST_AUTO_TEST_CASE (write_subtitles_in_vertical_order_with_bottom_alignment)
 {
-	dcp::SMPTESubtitleAsset c;
+	dcp::SMPTETextAsset c;
 	c.set_reel_number (1);
 	c.set_language (dcp::LanguageTag("en"));
 	c.set_content_title_text ("Test");
 	c.set_issue_date (dcp::LocalTime ("2016-04-01T03:52:00+00:00"));
 
 	c.add (
-		std::make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::TextString>(
 			string ("Arial"),
 			false,
 			false,
@@ -670,7 +670,7 @@ BOOST_AUTO_TEST_CASE (write_subtitles_in_vertical_order_with_bottom_alignment)
 		);
 
 	c.add (
-		std::make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::TextString>(
 			string ("Arial"),
 			false,
 			false,
@@ -723,49 +723,49 @@ BOOST_AUTO_TEST_CASE (write_subtitles_in_vertical_order_with_bottom_alignment)
 }
 
 
-BOOST_AUTO_TEST_CASE(smpte_subtitle_standard_written_correctly)
+BOOST_AUTO_TEST_CASE(smpte_text_standard_written_correctly)
 {
 	RNGFixer fixer;
 
 	boost::filesystem::path const ref = "test/data";
-	boost::filesystem::path const out = "build/test/smpte_subtitle_standard_written_correctly";
+	boost::filesystem::path const out = "build/test/smpte_text_standard_written_correctly";
 
 	boost::filesystem::remove_all(out);
 	boost::filesystem::create_directories(out);
 
-	dcp::SMPTESubtitleAsset test_2014;
+	dcp::SMPTETextAsset test_2014;
 	test_2014.set_issue_date(dcp::LocalTime("2020-01-01T14:00:00"));
 	test_2014.write(out / "2014.mxf");
-	BOOST_CHECK_EQUAL(dcp::SMPTESubtitleAsset(ref / "2014.mxf").raw_xml(), dcp::SMPTESubtitleAsset(out / "2014.mxf").raw_xml());
+	BOOST_CHECK_EQUAL(dcp::SMPTETextAsset(ref / "2014.mxf").raw_xml(), dcp::SMPTETextAsset(out / "2014.mxf").raw_xml());
 
-	dcp::SMPTESubtitleAsset test_2010(dcp::SubtitleStandard::SMPTE_2010);
+	dcp::SMPTETextAsset test_2010(dcp::TextStandard::SMPTE_2010);
 	test_2010.set_issue_date(dcp::LocalTime("2020-01-01T14:00:00"));
 	test_2010.write(out / "2010.mxf");
-	BOOST_CHECK_EQUAL(dcp::SMPTESubtitleAsset(ref / "2010.mxf").raw_xml(), dcp::SMPTESubtitleAsset(out / "2010.mxf").raw_xml());
+	BOOST_CHECK_EQUAL(dcp::SMPTETextAsset(ref / "2010.mxf").raw_xml(), dcp::SMPTETextAsset(out / "2010.mxf").raw_xml());
 
-	dcp::SMPTESubtitleAsset test_2007(dcp::SubtitleStandard::SMPTE_2007);
+	dcp::SMPTETextAsset test_2007(dcp::TextStandard::SMPTE_2007);
 	test_2007.set_issue_date(dcp::LocalTime("2020-01-01T14:00:00"));
 	test_2007.write(out / "2007.mxf");
-	BOOST_CHECK_EQUAL(dcp::SMPTESubtitleAsset(ref / "2007.mxf").raw_xml(), dcp::SMPTESubtitleAsset(out / "2007.mxf").raw_xml());
+	BOOST_CHECK_EQUAL(dcp::SMPTETextAsset(ref / "2007.mxf").raw_xml(), dcp::SMPTETextAsset(out / "2007.mxf").raw_xml());
 }
 
 
-BOOST_AUTO_TEST_CASE(smpte_subtitle_standard_read_correctly)
+BOOST_AUTO_TEST_CASE(smpte_text_standard_read_correctly)
 {
-	dcp::SMPTESubtitleAsset test_2007("test/data/2007.mxf");
-	BOOST_CHECK(test_2007.subtitle_standard() == dcp::SubtitleStandard::SMPTE_2007);
+	dcp::SMPTETextAsset test_2007("test/data/2007.mxf");
+	BOOST_CHECK(test_2007.text_standard() == dcp::TextStandard::SMPTE_2007);
 
-	dcp::SMPTESubtitleAsset test_2010("test/data/2010.mxf");
-	BOOST_CHECK(test_2010.subtitle_standard() == dcp::SubtitleStandard::SMPTE_2010);
+	dcp::SMPTETextAsset test_2010("test/data/2010.mxf");
+	BOOST_CHECK(test_2010.text_standard() == dcp::TextStandard::SMPTE_2010);
 
-	dcp::SMPTESubtitleAsset test_2014("test/data/2014.mxf");
-	BOOST_CHECK(test_2014.subtitle_standard() == dcp::SubtitleStandard::SMPTE_2014);
+	dcp::SMPTETextAsset test_2014("test/data/2014.mxf");
+	BOOST_CHECK(test_2014.text_standard() == dcp::TextStandard::SMPTE_2014);
 }
 
 
 BOOST_AUTO_TEST_CASE(smpte_subtitle_intrinsic_duration_read_correctly)
 {
-	dcp::SMPTESubtitleAsset ref("test/data/verify_incorrect_closed_caption_ordering3.xml");
+	dcp::SMPTETextAsset ref("test/data/verify_incorrect_closed_caption_ordering3.xml");
 
 	dcp::Key key;
 	ref.set_key(key);
@@ -777,7 +777,7 @@ BOOST_AUTO_TEST_CASE(smpte_subtitle_intrinsic_duration_read_correctly)
 	auto const path = boost::filesystem::path("build/test/smpte_subtitle_instrinsic_duration_read_correctly.mxf");
 	ref.write(path);
 
-	auto check = dcp::SMPTESubtitleAsset(path);
+	auto check = dcp::SMPTETextAsset(path);
 	check.set_key(key);
 	BOOST_CHECK_EQUAL(check.intrinsic_duration(), duration);
 }
diff --git a/test/subs_in_out.cc b/test/subs_in_out.cc
index 7ca45f35..ec130393 100644
--- a/test/subs_in_out.cc
+++ b/test/subs_in_out.cc
@@ -31,8 +31,8 @@
     files in the program, then also delete it here.
 */
 
-#include "interop_subtitle_asset.h"
-#include "smpte_subtitle_asset.h"
+#include "interop_text_asset.h"
+#include "smpte_text_asset.h"
 #include <iostream>
 
 using namespace std;
@@ -46,12 +46,12 @@ main (int argc, char* argv[])
 	}
 
 	try {
-		dcp::InteropSubtitleAsset sc (argv[1]);
+		dcp::InteropTextAsset sc (argv[1]);
 		cout << sc.xml_as_string ();
 	} catch (exception& e) {
 		cerr << "Could not load as interop: " << e.what() << "\n";
 		try {
-			dcp::SMPTESubtitleAsset sc (argv[1]);
+			dcp::SMPTETextAsset sc(argv[1]);
 			cout << sc.xml_as_string();
 		} catch (exception& e) {
 			cerr << "Could not load as SMPTE (" << e.what() << ")\n";
diff --git a/test/test.cc b/test/test.cc
index d384bdfa..12b1016e 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -36,7 +36,7 @@
 #include "compose.hpp"
 #include "cpl.h"
 #include "dcp.h"
-#include "interop_subtitle_asset.h"
+#include "interop_text_asset.h"
 #include "file.h"
 #include "j2k_transcode.h"
 #include "mono_picture_asset.h"
@@ -54,7 +54,7 @@
 #include "reel_smpte_closed_caption_asset.h"
 #include "reel_smpte_subtitle_asset.h"
 #include "reel_sound_asset.h"
-#include "smpte_subtitle_asset.h"
+#include "smpte_text_asset.h"
 #include "sound_asset.h"
 #include "sound_asset_writer.h"
 #include "test.h"
@@ -393,10 +393,10 @@ make_simple (boost::filesystem::path path, int reels, int frames, dcp::Standard
 }
 
 
-shared_ptr<dcp::Subtitle>
+shared_ptr<dcp::Text>
 simple_subtitle ()
 {
-	return std::make_shared<dcp::SubtitleString>(
+	return std::make_shared<dcp::TextString>(
 		optional<string>(),
 		false,
 		false,
@@ -438,7 +438,7 @@ make_simple_with_interop_subs (boost::filesystem::path path)
 {
 	auto dcp = make_simple (path, 1, 24, dcp::Standard::INTEROP);
 
-	auto subs = make_shared<dcp::InteropSubtitleAsset>();
+	auto subs = make_shared<dcp::InteropTextAsset>();
 	subs->add (simple_subtitle());
 
 	boost::filesystem::create_directory (path / "subs");
@@ -459,7 +459,7 @@ make_simple_with_smpte_subs (boost::filesystem::path path)
 {
 	auto dcp = make_simple (path, 1, 192);
 
-	auto subs = make_shared<dcp::SMPTESubtitleAsset>();
+	auto subs = make_shared<dcp::SMPTETextAsset>();
 	subs->set_language (dcp::LanguageTag("de-DE"));
 	subs->set_start_time (dcp::Time());
 	subs->add (simple_subtitle());
@@ -480,7 +480,7 @@ make_simple_with_interop_ccaps (boost::filesystem::path path)
 {
 	auto dcp = make_simple (path, 1, 24, dcp::Standard::INTEROP);
 
-	auto subs = make_shared<dcp::InteropSubtitleAsset>();
+	auto subs = make_shared<dcp::InteropTextAsset>();
 	subs->add (simple_subtitle());
 	subs->write (path / "ccap.xml");
 
@@ -496,7 +496,7 @@ make_simple_with_smpte_ccaps (boost::filesystem::path path)
 {
 	auto dcp = make_simple (path, 1, 192);
 
-	auto subs = make_shared<dcp::SMPTESubtitleAsset>();
+	auto subs = make_shared<dcp::SMPTETextAsset>();
 	subs->set_language (dcp::LanguageTag("de-DE"));
 	subs->set_start_time (dcp::Time());
 	subs->add (simple_subtitle());
diff --git a/test/test.h b/test/test.h
index bacb9311..18806f4d 100644
--- a/test/test.h
+++ b/test/test.h
@@ -22,12 +22,13 @@
 #include "dcp.h"
 #include "reel.h"
 #include "reel_subtitle_asset.h"
-#include "subtitle.h"
 #include "reel_asset.h"
+#include "text.h"
 #include <boost/filesystem.hpp>
 #include <boost/optional.hpp>
 #include <boost/test/unit_test.hpp>
 
+
 namespace xmlpp {
 	class Element;
 }
@@ -60,7 +61,7 @@ extern std::shared_ptr<dcp::SoundAsset> simple_sound (
 	boost::optional<dcp::Key> key = boost::optional<dcp::Key>(),
 	int channels = 6
 	);
-extern std::shared_ptr<dcp::Subtitle> simple_subtitle ();
+extern std::shared_ptr<dcp::Text> simple_subtitle();
 extern std::shared_ptr<dcp::ReelMarkersAsset> simple_markers (int frames = 24);
 extern std::shared_ptr<dcp::DCP> make_simple (
 	boost::filesystem::path path,
diff --git a/test/verify_test.cc b/test/verify_test.cc
index 47b5cc78..d7615ed2 100644
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -36,7 +36,7 @@
 #include "cpl.h"
 #include "dcp.h"
 #include "file.h"
-#include "interop_subtitle_asset.h"
+#include "interop_text_asset.h"
 #include "j2k_transcode.h"
 #include "mono_picture_asset.h"
 #include "mono_picture_asset_writer.h"
@@ -51,7 +51,7 @@
 #include "reel_stereo_picture_asset.h"
 #include "reel_smpte_closed_caption_asset.h"
 #include "reel_smpte_subtitle_asset.h"
-#include "smpte_subtitle_asset.h"
+#include "smpte_text_asset.h"
 #include "stereo_picture_asset.h"
 #include "stream_operators.h"
 #include "test.h"
@@ -262,7 +262,7 @@ check_verify_result_after_replace (string suffix, boost::function<path (string)>
 
 static
 void
-add_font(shared_ptr<dcp::SubtitleAsset> asset)
+add_font(shared_ptr<dcp::TextAsset> asset)
 {
 	dcp::ArrayData fake_font(1024);
 	asset->add_font("font", fake_font);
@@ -695,7 +695,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_interop_subtitles)
 	path const dir("build/test/verify_valid_interop_subtitles");
 	prepare_directory (dir);
 	copy_file ("test/data/subs1.xml", dir / "subs.xml");
-	auto asset = make_shared<dcp::InteropSubtitleAsset>(dir / "subs.xml");
+	auto asset = make_shared<dcp::InteropTextAsset>(dir / "subs.xml");
 	auto reel_asset = make_shared<dcp::ReelInteropSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
 	write_dcp_with_single_asset (dir, reel_asset, dcp::Standard::INTEROP);
 
@@ -714,7 +714,7 @@ BOOST_AUTO_TEST_CASE(verify_catch_missing_font_file_with_interop_ccap)
 	path const dir("build/test/verify_catch_missing_font_file_with_interop_ccap");
 	prepare_directory(dir);
 	copy_file("test/data/subs1.xml", dir / "ccap.xml");
-	auto asset = make_shared<dcp::InteropSubtitleAsset>(dir / "ccap.xml");
+	auto asset = make_shared<dcp::InteropTextAsset>(dir / "ccap.xml");
 	auto reel_asset = make_shared<dcp::ReelInteropClosedCaptionAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
 	write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
 
@@ -735,7 +735,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_interop_subtitles)
 	path const dir("build/test/verify_invalid_interop_subtitles");
 	prepare_directory (dir);
 	copy_file ("test/data/subs1.xml", dir / "subs.xml");
-	auto asset = make_shared<dcp::InteropSubtitleAsset>(dir / "subs.xml");
+	auto asset = make_shared<dcp::InteropTextAsset>(dir / "subs.xml");
 	auto reel_asset = make_shared<dcp::ReelInteropSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
 	write_dcp_with_single_asset (dir, reel_asset, dcp::Standard::INTEROP);
 
@@ -767,7 +767,7 @@ BOOST_AUTO_TEST_CASE(verify_interop_subtitle_asset_with_no_subtitles)
 	path const dir("build/test/verify_interop_subtitle_asset_with_no_subtitles");
 	prepare_directory(dir);
 	copy_file("test/data/subs4.xml", dir / "subs.xml");
-	auto asset = make_shared<dcp::InteropSubtitleAsset>(dir / "subs.xml");
+	auto asset = make_shared<dcp::InteropTextAsset>(dir / "subs.xml");
 	auto reel_asset = make_shared<dcp::ReelInteropSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
 	write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
 
@@ -788,7 +788,7 @@ BOOST_AUTO_TEST_CASE(verify_interop_subtitle_asset_with_single_space_subtitle)
 	path const dir("build/test/verify_interop_subtitle_asset_with_single_space_subtitle");
 	prepare_directory(dir);
 	copy_file("test/data/subs5.xml", dir / "subs.xml");
-	auto asset = make_shared<dcp::InteropSubtitleAsset>(dir / "subs.xml");
+	auto asset = make_shared<dcp::InteropTextAsset>(dir / "subs.xml");
 	auto reel_asset = make_shared<dcp::ReelInteropSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
 	write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
 
@@ -808,7 +808,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_smpte_subtitles)
 	path const dir("build/test/verify_valid_smpte_subtitles");
 	prepare_directory (dir);
 	copy_file ("test/data/subs.mxf", dir / "subs.mxf");
-	auto asset = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.mxf");
+	auto asset = make_shared<dcp::SMPTETextAsset>(dir / "subs.mxf");
 	auto reel_asset = make_shared<dcp::ReelSMPTESubtitleAsset>(asset, dcp::Fraction(24, 1), 6046, 0);
 	auto cpl = write_dcp_with_single_asset (dir, reel_asset);
 
@@ -831,7 +831,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_smpte_subtitles)
 	prepare_directory (dir);
 	/* This broken_smpte.mxf does not use urn:uuid: for its subtitle ID, which we tolerate (rightly or wrongly) */
 	copy_file ("test/data/broken_smpte.mxf", dir / "subs.mxf");
-	auto asset = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.mxf");
+	auto asset = make_shared<dcp::SMPTETextAsset>(dir / "subs.mxf");
 	auto reel_asset = make_shared<dcp::ReelSMPTESubtitleAsset>(asset, dcp::Fraction(24, 1), 6046, 0);
 	auto cpl = write_dcp_with_single_asset (dir, reel_asset);
 
@@ -860,7 +860,7 @@ BOOST_AUTO_TEST_CASE (verify_empty_text_node_in_subtitles)
 	path const dir("build/test/verify_empty_text_node_in_subtitles");
 	prepare_directory (dir);
 	copy_file ("test/data/empty_text.mxf", dir / "subs.mxf");
-	auto asset = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.mxf");
+	auto asset = make_shared<dcp::SMPTETextAsset>(dir / "subs.mxf");
 	auto reel_asset = make_shared<dcp::ReelSMPTESubtitleAsset>(asset, dcp::Fraction(24, 1), 192, 0);
 	auto cpl = write_dcp_with_single_asset (dir, reel_asset);
 
@@ -884,7 +884,7 @@ BOOST_AUTO_TEST_CASE (verify_empty_text_node_in_subtitles_with_child_nodes)
 	path const dir("build/test/verify_empty_text_node_in_subtitles_with_child_nodes");
 	prepare_directory (dir);
 	copy_file ("test/data/empty_but_with_children.xml", dir / "subs.xml");
-	auto asset = make_shared<dcp::InteropSubtitleAsset>(dir / "subs.xml");
+	auto asset = make_shared<dcp::InteropTextAsset>(dir / "subs.xml");
 	auto reel_asset = make_shared<dcp::ReelInteropSubtitleAsset>(asset, dcp::Fraction(24, 1), 192, 0);
 	auto cpl = write_dcp_with_single_asset (dir, reel_asset, dcp::Standard::INTEROP);
 
@@ -904,7 +904,7 @@ BOOST_AUTO_TEST_CASE (verify_empty_text_node_in_subtitles_with_empty_child_nodes
 	path const dir("build/test/verify_empty_text_node_in_subtitles_with_empty_child_nodes");
 	prepare_directory (dir);
 	copy_file ("test/data/empty_with_empty_children.xml", dir / "subs.xml");
-	auto asset = make_shared<dcp::InteropSubtitleAsset>(dir / "subs.xml");
+	auto asset = make_shared<dcp::InteropTextAsset>(dir / "subs.xml");
 	auto reel_asset = make_shared<dcp::ReelInteropSubtitleAsset>(asset, dcp::Fraction(24, 1), 192, 0);
 	auto cpl = write_dcp_with_single_asset (dir, reel_asset, dcp::Standard::INTEROP);
 
@@ -955,7 +955,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_cpl_metadata)
 	prepare_directory (dir);
 
 	copy_file ("test/data/subs.mxf", dir / "subs.mxf");
-	auto asset = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.mxf");
+	auto asset = make_shared<dcp::SMPTETextAsset>(dir / "subs.mxf");
 	auto reel_asset = make_shared<dcp::ReelSMPTESubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
 
 	auto reel = make_shared<dcp::Reel>();
@@ -1102,7 +1102,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_language1)
 	path const dir("build/test/verify_invalid_language1");
 	prepare_directory (dir);
 	copy_file ("test/data/subs.mxf", dir / "subs.mxf");
-	auto asset = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.mxf");
+	auto asset = make_shared<dcp::SMPTETextAsset>(dir / "subs.mxf");
 	asset->_language = "wrong-andbad";
 	asset->write (dir / "subs.mxf");
 	auto reel_asset = make_shared<dcp::ReelSMPTESubtitleAsset>(asset, dcp::Fraction(24, 1), 6046, 0);
@@ -1126,7 +1126,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_language2)
 	path const dir("build/test/verify_invalid_language2");
 	prepare_directory (dir);
 	copy_file ("test/data/subs.mxf", dir / "subs.mxf");
-	auto asset = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.mxf");
+	auto asset = make_shared<dcp::SMPTETextAsset>(dir / "subs.mxf");
 	asset->_language = "wrong-andbad";
 	asset->write (dir / "subs.mxf");
 	auto reel_asset = make_shared<dcp::ReelSMPTEClosedCaptionAsset>(asset, dcp::Fraction(24, 1), 6046, 0);
@@ -1336,10 +1336,10 @@ BOOST_AUTO_TEST_CASE (verify_picture_size)
 
 static
 void
-add_test_subtitle (shared_ptr<dcp::SubtitleAsset> asset, int start_frame, int end_frame, float v_position = 0, dcp::VAlign v_align = dcp::VAlign::CENTER, string text = "Hello")
+add_test_subtitle(shared_ptr<dcp::TextAsset> asset, int start_frame, int end_frame, float v_position = 0, dcp::VAlign v_align = dcp::VAlign::CENTER, string text = "Hello")
 {
 	asset->add (
-		std::make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::TextString>(
 			optional<string>(),
 			false,
 			false,
@@ -1372,7 +1372,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_closed_caption_xml_size_in_bytes)
 	path const dir("build/test/verify_invalid_closed_caption_xml_size_in_bytes");
 	prepare_directory (dir);
 
-	auto asset = make_shared<dcp::SMPTESubtitleAsset>();
+	auto asset = make_shared<dcp::SMPTETextAsset>();
 	for (int i = 0; i < 2048; ++i) {
 		add_test_subtitle (asset, i * 24, i * 24 + 20);
 	}
@@ -1400,10 +1400,10 @@ BOOST_AUTO_TEST_CASE (verify_invalid_closed_caption_xml_size_in_bytes)
 
 
 static
-shared_ptr<dcp::SMPTESubtitleAsset>
+shared_ptr<dcp::SMPTETextAsset>
 make_large_subtitle_asset (path font_file)
 {
-	auto asset = make_shared<dcp::SMPTESubtitleAsset>();
+	auto asset = make_shared<dcp::SMPTETextAsset>();
 	dcp::ArrayData big_fake_font(1024 * 1024);
 	big_fake_font.write (font_file);
 	for (int i = 0; i < 116; ++i) {
@@ -1478,7 +1478,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_subtitle_language)
 	BOOST_REQUIRE (xml_file);
 	xml_file.write(xml.c_str(), xml.size(), 1);
 	xml_file.close();
-	auto subs = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.xml");
+	auto subs = make_shared<dcp::SMPTETextAsset>(dir / "subs.xml");
 	subs->write (dir / "subs.mxf");
 
 	auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), 106, 0);
@@ -1503,7 +1503,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_subtitle_languages)
 	auto cpl = dcp->cpls()[0];
 
 	{
-		auto subs = make_shared<dcp::SMPTESubtitleAsset>();
+		auto subs = make_shared<dcp::SMPTETextAsset>();
 		subs->set_language (dcp::LanguageTag("de-DE"));
 		subs->add (simple_subtitle());
 		add_font(subs);
@@ -1513,7 +1513,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_subtitle_languages)
 	}
 
 	{
-		auto subs = make_shared<dcp::SMPTESubtitleAsset>();
+		auto subs = make_shared<dcp::SMPTETextAsset>();
 		subs->set_language (dcp::LanguageTag("en-US"));
 		subs->add (simple_subtitle());
 		add_font(subs);
@@ -1543,7 +1543,7 @@ BOOST_AUTO_TEST_CASE (verify_multiple_closed_caption_languages_allowed)
 	auto cpl = dcp->cpls()[0];
 
 	{
-		auto ccaps = make_shared<dcp::SMPTESubtitleAsset>();
+		auto ccaps = make_shared<dcp::SMPTETextAsset>();
 		ccaps->set_language (dcp::LanguageTag("de-DE"));
 		ccaps->add (simple_subtitle());
 		add_font(ccaps);
@@ -1553,7 +1553,7 @@ BOOST_AUTO_TEST_CASE (verify_multiple_closed_caption_languages_allowed)
 	}
 
 	{
-		auto ccaps = make_shared<dcp::SMPTESubtitleAsset>();
+		auto ccaps = make_shared<dcp::SMPTETextAsset>();
 		ccaps->set_language (dcp::LanguageTag("en-US"));
 		ccaps->add (simple_subtitle());
 		add_font(ccaps);
@@ -1605,7 +1605,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_subtitle_start_time)
 	BOOST_REQUIRE (xml_file);
 	xml_file.write(xml.c_str(), xml.size(), 1);
 	xml_file.close();
-	auto subs = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.xml");
+	auto subs = make_shared<dcp::SMPTETextAsset>(dir / "subs.xml");
 	subs->write (dir / "subs.mxf");
 
 	auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), 106, 0);
@@ -1654,7 +1654,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_start_time)
 	BOOST_REQUIRE (xml_file);
 	xml_file.write(xml.c_str(), xml.size(), 1);
 	xml_file.close();
-	auto subs = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.xml");
+	auto subs = make_shared<dcp::SMPTETextAsset>(dir / "subs.xml");
 	subs->write (dir / "subs.mxf");
 
 	auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), 106, 0);
@@ -1695,7 +1695,7 @@ shared_ptr<dcp::CPL>
 dcp_with_text(path dir, vector<TestText> subs, optional<dcp::Key> key = boost::none, optional<string> key_id = boost::none)
 {
 	prepare_directory (dir);
-	auto asset = make_shared<dcp::SMPTESubtitleAsset>();
+	auto asset = make_shared<dcp::SMPTETextAsset>();
 	asset->set_start_time (dcp::Time());
 	for (auto i: subs) {
 		add_test_subtitle (asset, i.in, i.out, i.v_position, i.v_align, i.text);
@@ -1718,7 +1718,7 @@ shared_ptr<dcp::CPL>
 dcp_with_text_from_file (path dir, boost::filesystem::path subs_xml)
 {
 	prepare_directory (dir);
-	auto asset = make_shared<dcp::SMPTESubtitleAsset>(subs_xml);
+	auto asset = make_shared<dcp::SMPTETextAsset>(subs_xml);
 	asset->set_start_time (dcp::Time());
 	asset->set_language (dcp::LanguageTag("de-DE"));
 
@@ -1780,7 +1780,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_first_text_time_on_second_reel)
 	auto const dir = path("build/test/verify_valid_subtitle_first_text_time_on_second_reel");
 	prepare_directory (dir);
 
-	auto asset1 = make_shared<dcp::SMPTESubtitleAsset>();
+	auto asset1 = make_shared<dcp::SMPTETextAsset>();
 	asset1->set_start_time (dcp::Time());
 	/* Just late enough */
 	add_test_subtitle (asset1, 4 * 24, 5 * 24);
@@ -1794,7 +1794,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_first_text_time_on_second_reel)
 	markers1->set (dcp::Marker::FFOC, dcp::Time(1, 24, 24));
 	reel1->add (markers1);
 
-	auto asset2 = make_shared<dcp::SMPTESubtitleAsset>();
+	auto asset2 = make_shared<dcp::SMPTETextAsset>();
 	asset2->set_start_time (dcp::Time());
 	add_font(asset2);
 	/* This would be too early on first reel but should be OK on the second */
@@ -1878,7 +1878,7 @@ BOOST_AUTO_TEST_CASE (verify_subtitle_overlapping_reel_boundary)
 {
 	auto const dir = path("build/test/verify_subtitle_overlapping_reel_boundary");
 	prepare_directory (dir);
-	auto asset = make_shared<dcp::SMPTESubtitleAsset>();
+	auto asset = make_shared<dcp::SMPTETextAsset>();
 	asset->set_start_time (dcp::Time());
 	add_test_subtitle (asset, 0, 4 * 24);
 	add_font(asset);
@@ -2342,7 +2342,7 @@ verify_subtitles_must_be_in_all_reels_check (path dir, bool add_to_reel1, bool a
 
 	auto constexpr reel_length = 192;
 
-	auto subs = make_shared<dcp::SMPTESubtitleAsset>();
+	auto subs = make_shared<dcp::SMPTETextAsset>();
 	subs->set_language (dcp::LanguageTag("de-DE"));
 	subs->set_start_time (dcp::Time());
 	subs->add (simple_subtitle());
@@ -2427,7 +2427,7 @@ verify_closed_captions_must_be_in_all_reels_check (path dir, int caps_in_reel1,
 
 	auto constexpr reel_length = 192;
 
-	auto subs = make_shared<dcp::SMPTESubtitleAsset>();
+	auto subs = make_shared<dcp::SMPTETextAsset>();
 	subs->set_language (dcp::LanguageTag("de-DE"));
 	subs->set_start_time (dcp::Time());
 	subs->add (simple_subtitle());
@@ -2510,7 +2510,7 @@ verify_text_entry_point_check (path dir, dcp::VerificationNote::Code code, boost
 
 	auto constexpr reel_length = 192;
 
-	auto subs = make_shared<dcp::SMPTESubtitleAsset>();
+	auto subs = make_shared<dcp::SMPTETextAsset>();
 	subs->set_language (dcp::LanguageTag("de-DE"));
 	subs->set_start_time (dcp::Time());
 	subs->add (simple_subtitle());
@@ -3177,7 +3177,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_subtitle_resource_id)
 
 	writer.Finalize();
 
-	auto subs_asset = make_shared<dcp::SMPTESubtitleAsset>(subs_mxf);
+	auto subs_asset = make_shared<dcp::SMPTETextAsset>(subs_mxf);
 	auto subs_reel = make_shared<dcp::ReelSMPTESubtitleAsset>(subs_asset, dcp::Fraction(24, 1), 240, 0);
 
 	auto cpl = write_dcp_with_single_asset (dir, subs_reel);
@@ -3243,7 +3243,7 @@ BOOST_AUTO_TEST_CASE (verify_incorrect_timed_text_id)
 
 	writer.Finalize();
 
-	auto subs_asset = make_shared<dcp::SMPTESubtitleAsset>(subs_mxf);
+	auto subs_asset = make_shared<dcp::SMPTETextAsset>(subs_mxf);
 	auto subs_reel = make_shared<dcp::ReelSMPTESubtitleAsset>(subs_asset, dcp::Fraction(24, 1), 240, 0);
 
 	auto cpl = write_dcp_with_single_asset (dir, subs_reel);
@@ -3683,7 +3683,7 @@ BOOST_AUTO_TEST_CASE(verify_missing_load_font_for_font)
 		Editor editor(dir / "subs.xml");
 		editor.delete_first_line_containing("LoadFont");
 	}
-	auto asset = make_shared<dcp::InteropSubtitleAsset>(dir / "subs.xml");
+	auto asset = make_shared<dcp::InteropTextAsset>(dir / "subs.xml");
 	auto reel_asset = make_shared<dcp::ReelInteropSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
 	write_dcp_with_single_asset (dir, reel_asset, dcp::Standard::INTEROP);
 
@@ -3729,7 +3729,7 @@ BOOST_AUTO_TEST_CASE(verify_missing_load_font)
 	BOOST_REQUIRE(xml_file);
 	xml_file.write(xml.c_str(), xml.size(), 1);
 	xml_file.close();
-	auto subs = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.xml");
+	auto subs = make_shared<dcp::SMPTETextAsset>(dir / "subs.xml");
 	subs->write(dir / "subs.mxf");
 
 	auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), 202, 0);