Rename everything.

1 files changed, 76 insertions, 76 deletions

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");