{,Interop,SMPTE}SubtitleAsset -> {,Interop,SMPTE}TextAsset.

12 files changed, 114 insertions, 113 deletions

diff --git a/test/combine_test.cc b/test/combine_test.cc
index 725a4f6b..05563127 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_text_asset.h"
 #include "reel_mono_picture_asset.h"
 #include "reel_sound_asset.h"
@@ -450,7 +450,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);
@@ -459,7 +459,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 d2cfacca..ffc638d5 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_text_asset.h"
 #include "reel_smpte_text_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 62b25500..273b4efa 100644
--- a/test/decryption_test.cc
+++ b/test/decryption_test.cc
@@ -48,7 +48,7 @@
 #include "reel_sound_asset.h"
 #include "reel_smpte_text_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,7 +178,7 @@ 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>(
@@ -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 c8722907..3af0e24d 100644
--- a/test/encryption_test.cc
+++ b/test/encryption_test.cc
@@ -31,23 +31,24 @@
     files in the program, then also delete it here.
 */
 
-#include "metadata.h"
+
 #include "certificate.h"
-#include "dcp.h"
 #include "certificate_chain.h"
 #include "cpl.h"
+#include "dcp.h"
+#include "decrypted_kdm.h"
+#include "encrypted_kdm.h"
 #include "filesystem.h"
-#include "mono_j2k_picture_asset.h"
 #include "j2k_picture_asset_writer.h"
-#include "sound_asset_writer.h"
-#include "sound_asset.h"
+#include "metadata.h"
+#include "mono_j2k_picture_asset.h"
 #include "reel.h"
-#include "test.h"
-#include "subtitle_asset.h"
 #include "reel_mono_picture_asset.h"
 #include "reel_sound_asset.h"
-#include "encrypted_kdm.h"
-#include "decrypted_kdm.h"
+#include "sound_asset.h"
+#include "sound_asset_writer.h"
+#include "test.h"
+#include "text_asset.h"
 #include <asdcp/KM_util.h>
 #include <sndfile.h>
 #include <boost/test/unit_test.hpp>
diff --git a/test/interop_subtitle_test.cc b/test/interop_subtitle_test.cc
index ac63d098..d731f10f 100644
--- a/test/interop_subtitle_test.cc
+++ b/test/interop_subtitle_test.cc
@@ -32,7 +32,7 @@
 */
 
 
-#include "interop_subtitle_asset.h"
+#include "interop_text_asset.h"
 #include "interop_load_font_node.h"
 #include "reel_interop_text_asset.h"
 #include "subtitle_string.h"
@@ -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");
@@ -231,7 +231,7 @@ 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);
 	BOOST_REQUIRE_EQUAL (s.size(), 2U);
@@ -714,7 +714,7 @@ 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());
@@ -726,7 +726,7 @@ 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");
@@ -841,7 +841,7 @@ 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");
@@ -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 91db326f..cf1a7fdc 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_text_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 ae165172..3ec94166 100644
--- a/test/rewrite_subs.cc
+++ b/test/rewrite_subs.cc
@@ -35,7 +35,7 @@
 #include "dcp.h"
 #include "cpl.h"
 #include "reel.h"
-#include "subtitle_asset.h"
+#include "text_asset.h"
 #include "reel_text_asset.h"
 #include "exceptions.h"
 
diff --git a/test/shared_subtitle_test.cc b/test/shared_subtitle_test.cc
index f7273d88..4ae4f4ae 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 "interop_text_asset.h"
+#include "smpte_text_asset.h"
 #include "subtitle_string.h"
 #include "subtitle_image.h"
-#include "subtitle_asset_internal.h"
+#include "text_asset_internal.h"
 #include "reel_interop_text_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");
 	cxml::add_text_child(fred, "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");
 	cxml::add_text_child(root, "Bar", "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..005a9ec7 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,7 +51,7 @@ using boost::optional;
 
 BOOST_AUTO_TEST_CASE (smpte_subtitle_id_test)
 {
-	dcp::SMPTESubtitleAsset subs;
+	dcp::SMPTETextAsset subs;
 	subs.add(
 		std::make_shared<dcp::SubtitleString>(
 			optional<string>(),
@@ -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" /
@@ -128,7 +128,7 @@ BOOST_AUTO_TEST_CASE (read_smpte_subtitle_test)
 /** 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();
 	BOOST_REQUIRE_EQUAL (subs.size(), 6U);
@@ -174,7 +174,7 @@ 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");
@@ -296,7 +296,7 @@ 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");
@@ -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,7 +522,7 @@ 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");
+	dcp::SMPTETextAsset read_back (path / "subs.mxf");
 	auto subs = read_back.subtitles ();
 	BOOST_REQUIRE_EQUAL (subs.size(), 1U);
 	auto image = dynamic_pointer_cast<const dcp::SubtitleImage>(subs[0]);
@@ -546,7 +546,7 @@ 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");
@@ -636,7 +636,7 @@ 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");
@@ -733,39 +733,39 @@ BOOST_AUTO_TEST_CASE(smpte_subtitle_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::SubtitleStandard::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::SubtitleStandard::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)
 {
-	dcp::SMPTESubtitleAsset test_2007("test/data/2007.mxf");
+	dcp::SMPTETextAsset test_2007("test/data/2007.mxf");
 	BOOST_CHECK(test_2007.subtitle_standard() == dcp::SubtitleStandard::SMPTE_2007);
 
-	dcp::SMPTESubtitleAsset test_2010("test/data/2010.mxf");
+	dcp::SMPTETextAsset test_2010("test/data/2010.mxf");
 	BOOST_CHECK(test_2010.subtitle_standard() == dcp::SubtitleStandard::SMPTE_2010);
 
-	dcp::SMPTESubtitleAsset test_2014("test/data/2014.mxf");
+	dcp::SMPTETextAsset test_2014("test/data/2014.mxf");
 	BOOST_CHECK(test_2014.subtitle_standard() == dcp::SubtitleStandard::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..84f4de06 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 8e30878d..e1d5ce77 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_j2k_picture_asset.h"
@@ -52,7 +52,7 @@
 #include "reel_mono_picture_asset.h"
 #include "reel_smpte_text_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"
@@ -436,7 +436,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");
@@ -457,7 +457,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());
@@ -478,7 +478,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");
 
@@ -494,7 +494,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/verify_test.cc b/test/verify_test.cc
index 0b6ac4d5..81d31c72 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_j2k_picture_asset.h"
 #include "mono_j2k_picture_asset_writer.h"
@@ -49,7 +49,7 @@
 #include "reel_sound_asset.h"
 #include "reel_stereo_picture_asset.h"
 #include "reel_smpte_text_asset.h"
-#include "smpte_subtitle_asset.h"
+#include "smpte_text_asset.h"
 #include "stereo_j2k_picture_asset.h"
 #include "stream_operators.h"
 #include "test.h"
@@ -323,7 +323,7 @@ replace(string suffix, boost::function<path (string)> file, string from, 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);
@@ -1177,7 +1177,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::ReelInteropTextAsset>(dcp::TextType::SUBTITLE, asset, dcp::Fraction(24, 1), 16 * 24, 0);
 	auto cpl = write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
 
@@ -1203,7 +1203,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::ReelInteropTextAsset>(dcp::TextType::CAPTION, asset, dcp::Fraction(24, 1), 16 * 24, 0);
 	auto cpl = write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
 
@@ -1231,7 +1231,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::ReelInteropTextAsset>(dcp::TextType::SUBTITLE, asset, dcp::Fraction(24, 1), 16 * 24, 0);
 	auto cpl = write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
 
@@ -1272,7 +1272,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::ReelInteropTextAsset>(dcp::TextType::SUBTITLE, asset, dcp::Fraction(24, 1), 16 * 24, 0);
 	auto cpl = write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
 
@@ -1302,7 +1302,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::ReelInteropTextAsset>(dcp::TextType::SUBTITLE, asset, dcp::Fraction(24, 1), 16 * 24, 0);
 	auto cpl = write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
 
@@ -1329,7 +1329,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::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, asset, dcp::Fraction(24, 1), 6046, 0);
 	auto cpl = write_dcp_with_single_asset (dir, reel_asset);
 
@@ -1364,7 +1364,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::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, asset, dcp::Fraction(24, 1), 6046, 0);
 	auto cpl = write_dcp_with_single_asset (dir, reel_asset);
 
@@ -1409,7 +1409,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::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, asset, dcp::Fraction(24, 1), 192, 0);
 	auto cpl = write_dcp_with_single_asset (dir, reel_asset);
 
@@ -1451,7 +1451,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::ReelInteropTextAsset>(dcp::TextType::SUBTITLE, asset, dcp::Fraction(24, 1), 192, 0);
 	auto cpl = write_dcp_with_single_asset (dir, reel_asset, dcp::Standard::INTEROP);
 
@@ -1478,7 +1478,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::ReelInteropTextAsset>(dcp::TextType::SUBTITLE, asset, dcp::Fraction(24, 1), 192, 0);
 	auto cpl = write_dcp_with_single_asset (dir, reel_asset, dcp::Standard::INTEROP);
 
@@ -1548,7 +1548,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::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, asset, dcp::Fraction(24, 1), 16 * 24, 0);
 
 	auto reel = make_shared<dcp::Reel>();
@@ -1683,7 +1683,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::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, asset, dcp::Fraction(24, 1), 6046, 0);
@@ -1719,7 +1719,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::ReelSMPTETextAsset>(dcp::TextType::CAPTION, asset, dcp::Fraction(24, 1), 6046, 0);
@@ -2070,7 +2070,7 @@ 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>(
@@ -2106,7 +2106,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);
 	}
@@ -2146,10 +2146,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) {
@@ -2243,7 +2243,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::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, subs, dcp::Fraction(24, 1), 106, 0);
@@ -2287,7 +2287,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);
@@ -2297,7 +2297,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);
@@ -2349,7 +2349,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);
@@ -2359,7 +2359,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);
@@ -2431,7 +2431,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::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, subs, dcp::Fraction(24, 1), 106, 0);
@@ -2499,7 +2499,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::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, subs, dcp::Fraction(24, 1), 106, 0);
@@ -2559,7 +2559,7 @@ shared_ptr<dcp::CPL>
 dcp_with_text(dcp::TextType type, 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);
@@ -2582,7 +2582,7 @@ shared_ptr<dcp::CPL>
 dcp_with_text_from_file(dcp::TextType type, 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"));
 
@@ -2667,7 +2667,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);
@@ -2681,7 +2681,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 */
@@ -2828,7 +2828,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);
@@ -3572,7 +3572,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());
@@ -3705,7 +3705,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());
@@ -3836,7 +3836,7 @@ verify_text_entry_point_check(dcp::TextType type, path dir, dcp::VerificationNot
 
 	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());
@@ -4842,7 +4842,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::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, subs_asset, dcp::Fraction(24, 1), 240, 0);
 
 	auto cpl = write_dcp_with_single_asset (dir, subs_reel);
@@ -4922,7 +4922,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::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, subs_asset, dcp::Fraction(24, 1), 240, 0);
 
 	auto cpl = write_dcp_with_single_asset (dir, subs_reel);
@@ -5602,7 +5602,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::ReelInteropTextAsset>(dcp::TextType::SUBTITLE, asset, dcp::Fraction(24, 1), 16 * 24, 0);
 	auto cpl = write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
 
@@ -5653,7 +5653,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::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, subs, dcp::Fraction(24, 1), 202, 0);
@@ -5842,7 +5842,7 @@ BOOST_AUTO_TEST_CASE(verify_invalid_sound_bit_depth)
 
 BOOST_AUTO_TEST_CASE(overlapping_subtitles)
 {
-	auto asset = make_shared<dcp::InteropSubtitleAsset>();
+	auto asset = make_shared<dcp::InteropTextAsset>();
 
 	asset->add(std::make_shared<dcp::SubtitleString>(
 			optional<string>{}, false, false, false,