Subtitle{,String,Image} -> Text{,String,Image}.

9 files changed, 132 insertions, 132 deletions

diff --git a/test/combine_test.cc b/test/combine_test.cc
index 05563127..569f9d90 100644
--- a/test/combine_test.cc
+++ b/test/combine_test.cc
@@ -451,7 +451,7 @@ BOOST_AUTO_TEST_CASE(combine_multi_reel_subtitles)
 	memset(data1.data(), 0, data1.size());
 
 	auto subs1 = make_shared<dcp::InteropTextAsset>();
-	subs1->add(simple_subtitle());
+	subs1->add(simple_text());
 	boost::filesystem::create_directory(in / "subs1");
 	subs1->add_font("afont1", data1);
 	subs1->write(in / "subs1" / "subs1.xml");
@@ -460,7 +460,7 @@ BOOST_AUTO_TEST_CASE(combine_multi_reel_subtitles)
 	memset(data2.data(), 1, data1.size());
 
 	auto subs2 = make_shared<dcp::InteropTextAsset>();
-	subs2->add(simple_subtitle());
+	subs2->add(simple_text());
 	boost::filesystem::create_directory(in / "subs2");
 	subs2->add_font("afont2", data2);
 	subs2->write(in / "subs2" / "subs2.xml");
diff --git a/test/decryption_test.cc b/test/decryption_test.cc
index 273b4efa..d811fb3a 100644
--- a/test/decryption_test.cc
+++ b/test/decryption_test.cc
@@ -181,7 +181,7 @@ BOOST_AUTO_TEST_CASE (decryption_test2)
 	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),
diff --git a/test/interop_subtitle_test.cc b/test/interop_subtitle_test.cc
index d731f10f..59f7daa7 100644
--- a/test/interop_subtitle_test.cc
+++ b/test/interop_subtitle_test.cc
@@ -35,8 +35,8 @@
 #include "interop_text_asset.h"
 #include "interop_load_font_node.h"
 #include "reel_interop_text_asset.h"
-#include "subtitle_string.h"
-#include "subtitle_image.h"
+#include "text_string.h"
+#include "text_image.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 #include <iostream>
@@ -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,
@@ -233,10 +233,10 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 {
 	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,
@@ -716,8 +716,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test3)
 {
 	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::TextImage>(subs.texts().front());
 	BOOST_REQUIRE (si);
 	BOOST_CHECK (si->png_image() == dcp::ArrayData("test/data/sub.png"));
 }
@@ -732,7 +732,7 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test)
 	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,
@@ -847,7 +847,7 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test2)
 	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,
@@ -935,7 +935,7 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test3)
 	c->set_movie_title ("Test");
 
 	c->add (
-		std::make_shared<dcp::SubtitleImage>(
+		std::make_shared<dcp::TextImage>(
 			dcp::ArrayData ("test/data/sub.png"),
 			dcp::Time (0, 4,  9, 22, 24),
 			dcp::Time (0, 4, 11, 22, 24),
diff --git a/test/kdm_test.cc b/test/kdm_test.cc
index cf1a7fdc..d2ae3042 100644
--- a/test/kdm_test.cc
+++ b/test/kdm_test.cc
@@ -326,7 +326,7 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test)
 	/* Make VF */
 
 	auto subs = make_shared<dcp::SMPTETextAsset>();
-	subs->add(simple_subtitle());
+	subs->add(simple_text());
 	subs->set_key(key);
 
 	boost::filesystem::remove_all (vf_path);
diff --git a/test/shared_subtitle_test.cc b/test/shared_subtitle_test.cc
index 4ae4f4ae..82595cd0 100644
--- a/test/shared_subtitle_test.cc
+++ b/test/shared_subtitle_test.cc
@@ -39,8 +39,8 @@
 
 #include "interop_text_asset.h"
 #include "smpte_text_asset.h"
-#include "subtitle_string.h"
-#include "subtitle_image.h"
+#include "text_string.h"
+#include "text_image.h"
 #include "text_asset_internal.h"
 #include "reel_interop_text_asset.h"
 #include "reel.h"
diff --git a/test/smpte_subtitle_test.cc b/test/smpte_subtitle_test.cc
index 005a9ec7..e1dabc44 100644
--- a/test/smpte_subtitle_test.cc
+++ b/test/smpte_subtitle_test.cc
@@ -35,8 +35,8 @@
 #include "smpte_load_font_node.h"
 #include "smpte_text_asset.h"
 #include "stream_operators.h"
-#include "subtitle_image.h"
 #include "test.h"
+#include "text_image.h"
 #include "types.h"
 #include <boost/optional/optional_io.hpp>
 #include <boost/test/unit_test.hpp>
@@ -53,7 +53,7 @@ BOOST_AUTO_TEST_CASE (smpte_subtitle_id_test)
 {
 	dcp::SMPTETextAsset subs;
 	subs.add(
-		std::make_shared<dcp::SubtitleString>(
+		std::make_shared<dcp::TextString>(
 			optional<string>(),
 			false, false, false,
 			dcp::Colour(),
@@ -111,17 +111,17 @@ 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));
 }
 
 
@@ -130,40 +130,40 @@ BOOST_AUTO_TEST_CASE (read_smpte_subtitle_test2)
 {
 	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());
@@ -181,7 +181,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_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,
@@ -303,7 +303,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 	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,
@@ -502,7 +502,7 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test3)
 	boost::filesystem::path const sub_image = "test/data/sub.png";
 
 	c.add (
-		std::make_shared<dcp::SubtitleImage>(
+		std::make_shared<dcp::TextImage>(
 			dcp::ArrayData(sub_image),
 			dcp::Time (0, 4,  9, 22, 24),
 			dcp::Time (0, 4, 11, 22, 24),
@@ -523,9 +523,9 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test3)
 	c.write (path / "subs.mxf");
 
 	dcp::SMPTETextAsset read_back (path / "subs.mxf");
-	auto subs = read_back.subtitles ();
+	auto subs = read_back.texts();
 	BOOST_REQUIRE_EQUAL (subs.size(), 1U);
-	auto image = dynamic_pointer_cast<const dcp::SubtitleImage>(subs[0]);
+	auto image = dynamic_pointer_cast<const dcp::TextImage>(subs[0]);
 	BOOST_REQUIRE (image);
 
 	BOOST_CHECK (image->png_image() == dcp::ArrayData(sub_image));
@@ -553,7 +553,7 @@ BOOST_AUTO_TEST_CASE (write_subtitles_in_vertical_order_with_top_alignment)
 	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,
@@ -643,7 +643,7 @@ BOOST_AUTO_TEST_CASE (write_subtitles_in_vertical_order_with_bottom_alignment)
 	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,
diff --git a/test/test.cc b/test/test.cc
index e1d5ce77..b4d51e9c 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -391,10 +391,10 @@ make_simple (boost::filesystem::path path, int reels, int frames, dcp::Standard
 }
 
 
-shared_ptr<dcp::Subtitle>
-simple_subtitle ()
+shared_ptr<dcp::Text>
+simple_text()
 {
-	return std::make_shared<dcp::SubtitleString>(
+	return std::make_shared<dcp::TextString>(
 		optional<string>(),
 		false,
 		false,
@@ -437,7 +437,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::InteropTextAsset>();
-	subs->add (simple_subtitle());
+	subs->add(simple_text());
 
 	boost::filesystem::create_directory (path / "subs");
 	dcp::ArrayData data(4096);
@@ -460,7 +460,7 @@ make_simple_with_smpte_subs (boost::filesystem::path path)
 	auto subs = make_shared<dcp::SMPTETextAsset>();
 	subs->set_language (dcp::LanguageTag("de-DE"));
 	subs->set_start_time (dcp::Time());
-	subs->add (simple_subtitle());
+	subs->add(simple_text());
 	dcp::ArrayData fake_font(1024);
 	subs->add_font("font", fake_font);
 
@@ -479,7 +479,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::InteropTextAsset>();
-	subs->add (simple_subtitle());
+	subs->add(simple_text());
 	subs->write (path / "ccap.xml");
 
 	auto reel_caps = make_shared<dcp::ReelInteropTextAsset>(dcp::TextType::CAPTION, subs, dcp::Fraction(24, 1), 240, 0);
@@ -497,7 +497,7 @@ make_simple_with_smpte_ccaps (boost::filesystem::path path)
 	auto subs = make_shared<dcp::SMPTETextAsset>();
 	subs->set_language (dcp::LanguageTag("de-DE"));
 	subs->set_start_time (dcp::Time());
-	subs->add (simple_subtitle());
+	subs->add(simple_text());
 	dcp::ArrayData fake_font(1024);
 	subs->add_font("font", fake_font);
 	subs->write (path / "ccap.mxf");
diff --git a/test/test.h b/test/test.h
index df7bda89..d796a4a4 100644
--- a/test/test.h
+++ b/test/test.h
@@ -21,8 +21,8 @@
 #include "cpl.h"
 #include "dcp.h"
 #include "reel.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>
@@ -59,7 +59,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_text();
 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 81d31c72..63e2f352 100644
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -2073,7 +2073,7 @@ void
 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,
@@ -2289,7 +2289,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_subtitle_languages)
 	{
 		auto subs = make_shared<dcp::SMPTETextAsset>();
 		subs->set_language (dcp::LanguageTag("de-DE"));
-		subs->add (simple_subtitle());
+		subs->add(simple_text());
 		add_font(subs);
 		subs->write (path / "subs1.mxf");
 		auto reel_subs = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, subs, dcp::Fraction(24, 1), reel_length, 0);
@@ -2299,7 +2299,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_subtitle_languages)
 	{
 		auto subs = make_shared<dcp::SMPTETextAsset>();
 		subs->set_language (dcp::LanguageTag("en-US"));
-		subs->add (simple_subtitle());
+		subs->add(simple_text());
 		add_font(subs);
 		subs->write (path / "subs2.mxf");
 		auto reel_subs = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, subs, dcp::Fraction(24, 1), reel_length, 0);
@@ -2351,7 +2351,7 @@ BOOST_AUTO_TEST_CASE (verify_multiple_closed_caption_languages_allowed)
 	{
 		auto ccaps = make_shared<dcp::SMPTETextAsset>();
 		ccaps->set_language (dcp::LanguageTag("de-DE"));
-		ccaps->add (simple_subtitle());
+		ccaps->add(simple_text());
 		add_font(ccaps);
 		ccaps->write (path / "subs1.mxf");
 		auto reel_ccaps = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::CAPTION, ccaps, dcp::Fraction(24, 1), reel_length, 0);
@@ -2361,7 +2361,7 @@ BOOST_AUTO_TEST_CASE (verify_multiple_closed_caption_languages_allowed)
 	{
 		auto ccaps = make_shared<dcp::SMPTETextAsset>();
 		ccaps->set_language (dcp::LanguageTag("en-US"));
-		ccaps->add (simple_subtitle());
+		ccaps->add(simple_text());
 		add_font(ccaps);
 		ccaps->write (path / "subs2.mxf");
 		auto reel_ccaps = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::CAPTION, ccaps, dcp::Fraction(24, 1), reel_length, 0);
@@ -3575,7 +3575,7 @@ verify_subtitles_must_be_in_all_reels_check (path dir, bool add_to_reel1, bool a
 	auto subs = make_shared<dcp::SMPTETextAsset>();
 	subs->set_language (dcp::LanguageTag("de-DE"));
 	subs->set_start_time (dcp::Time());
-	subs->add (simple_subtitle());
+	subs->add(simple_text());
 	add_font(subs);
 	subs->write (dir / "subs.mxf");
 	auto reel_subs = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, subs, dcp::Fraction(24, 1), reel_length, 0);
@@ -3708,7 +3708,7 @@ verify_closed_captions_must_be_in_all_reels_check (path dir, int caps_in_reel1,
 	auto subs = make_shared<dcp::SMPTETextAsset>();
 	subs->set_language (dcp::LanguageTag("de-DE"));
 	subs->set_start_time (dcp::Time());
-	subs->add (simple_subtitle());
+	subs->add(simple_text());
 	add_font(subs);
 	subs->write (dir / "subs.mxf");
 
@@ -3839,7 +3839,7 @@ verify_text_entry_point_check(dcp::TextType type, path dir, dcp::VerificationNot
 	auto subs = make_shared<dcp::SMPTETextAsset>();
 	subs->set_language (dcp::LanguageTag("de-DE"));
 	subs->set_start_time (dcp::Time());
-	subs->add (simple_subtitle());
+	subs->add(simple_text());
 	add_font(subs);
 	subs->write (dir / "subs.mxf");
 	auto reel_text = make_shared<T>(type, subs, dcp::Fraction(24, 1), reel_length, 0);
@@ -5844,7 +5844,7 @@ BOOST_AUTO_TEST_CASE(overlapping_subtitles)
 {
 	auto asset = make_shared<dcp::InteropTextAsset>();
 
-	asset->add(std::make_shared<dcp::SubtitleString>(
+	asset->add(std::make_shared<dcp::TextString>(
 			optional<string>{}, false, false, false,
 			dcp::Colour{}, 42, 0,
 			dcp::Time(0, 0, 0, 0, 24),
@@ -5857,7 +5857,7 @@ BOOST_AUTO_TEST_CASE(overlapping_subtitles)
 			dcp::Effect::NONE, dcp::Colour{}, dcp::Time{}, dcp::Time{}, 0, vector<dcp::Ruby>{}
 			));
 
-	asset->add(std::make_shared<dcp::SubtitleString>(
+	asset->add(std::make_shared<dcp::TextString>(
 			optional<string>{}, false, false, false,
 			dcp::Colour{}, 42, 0,
 			dcp::Time(0, 0, 2, 0, 24),