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

28 files changed, 153 insertions, 156 deletions

diff --git a/src/cpl.cc b/src/cpl.cc
index e8cec95c..c41a86eb 100644
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -51,7 +51,7 @@
 #include "reel_closed_caption_asset.h"
 #include "reel_picture_asset.h"
 #include "reel_sound_asset.h"
-#include "reel_subtitle_asset.h"
+#include "reel_text_asset.h"
 #include "util.h"
 #include "version.h"
 #include "warnings.h"
diff --git a/src/dcp.cc b/src/dcp.cc
index f0379202..2ab74545 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -57,7 +57,7 @@
 #include "pkl.h"
 #include "raw_convert.h"
 #include "reel_asset.h"
-#include "reel_subtitle_asset.h"
+#include "reel_text_asset.h"
 #include "smpte_subtitle_asset.h"
 #include "sound_asset.h"
 #include "stereo_j2k_picture_asset.h"
diff --git a/src/reel.cc b/src/reel.cc
index acd7c7fc..6a7043f0 100644
--- a/src/reel.cc
+++ b/src/reel.cc
@@ -47,14 +47,14 @@
 #include "reel_atmos_asset.h"
 #include "reel_closed_caption_asset.h"
 #include "reel_interop_closed_caption_asset.h"
-#include "reel_interop_subtitle_asset.h"
+#include "reel_interop_text_asset.h"
 #include "reel_markers_asset.h"
 #include "reel_mono_picture_asset.h"
 #include "reel_smpte_closed_caption_asset.h"
-#include "reel_smpte_subtitle_asset.h"
+#include "reel_smpte_text_asset.h"
 #include "reel_sound_asset.h"
 #include "reel_stereo_picture_asset.h"
-#include "reel_subtitle_asset.h"
+#include "reel_text_asset.h"
 #include "smpte_subtitle_asset.h"
 #include "sound_asset.h"
 #include "stereo_j2k_picture_asset.h"
@@ -98,10 +98,10 @@ Reel::Reel (std::shared_ptr<const cxml::Node> node, dcp::Standard standard)
 	if (main_subtitle) {
 		switch (standard) {
 			case Standard::INTEROP:
-				_main_subtitle = make_shared<ReelInteropSubtitleAsset>(main_subtitle);
+				_main_subtitle = make_shared<ReelInteropTextAsset>(main_subtitle);
 				break;
 			case Standard::SMPTE:
-				_main_subtitle = make_shared<ReelSMPTESubtitleAsset>(main_subtitle);
+				_main_subtitle = make_shared<ReelSMPTETextAsset>(main_subtitle);
 				break;
 		}
 	}
@@ -208,8 +208,8 @@ Reel::equals(std::shared_ptr<const Reel> other, EqualityOptions const& opt, Note
 	bool same_type = false;
 
 	{
-		auto interop = dynamic_pointer_cast<ReelInteropSubtitleAsset>(_main_subtitle);
-		auto interop_other = dynamic_pointer_cast<ReelInteropSubtitleAsset>(other->_main_subtitle);
+		auto interop = dynamic_pointer_cast<ReelInteropTextAsset>(_main_subtitle);
+		auto interop_other = dynamic_pointer_cast<ReelInteropTextAsset>(other->_main_subtitle);
 		if (interop && interop_other) {
 			same_type = true;
 			if (!interop->equals(interop_other, opt, note)) {
@@ -219,8 +219,8 @@ Reel::equals(std::shared_ptr<const Reel> other, EqualityOptions const& opt, Note
 	}
 
 	{
-		auto smpte = dynamic_pointer_cast<ReelSMPTESubtitleAsset>(_main_subtitle);
-		auto smpte_other = dynamic_pointer_cast<ReelSMPTESubtitleAsset>(other->_main_subtitle);
+		auto smpte = dynamic_pointer_cast<ReelSMPTETextAsset>(_main_subtitle);
+		auto smpte_other = dynamic_pointer_cast<ReelSMPTETextAsset>(other->_main_subtitle);
 		if (smpte && smpte_other) {
 			same_type = true;
 			if (!smpte->equals(smpte_other, opt, note)) {
@@ -333,13 +333,13 @@ Reel::give_kdm_to_assets (DecryptedKDM const & kdm)
 			_main_sound->asset()->set_key (i.key());
 		}
 		if (_main_subtitle) {
-			auto smpte = dynamic_pointer_cast<ReelSMPTESubtitleAsset>(_main_subtitle);
+			auto smpte = dynamic_pointer_cast<ReelSMPTETextAsset>(_main_subtitle);
 			if (smpte && i.id() == smpte->key_id() && smpte->asset_ref().resolved()) {
 				smpte->smpte_asset()->set_key(i.key());
 			}
 		}
 		for (auto j: _closed_captions) {
-			auto smpte = dynamic_pointer_cast<ReelSMPTESubtitleAsset>(j);
+			auto smpte = dynamic_pointer_cast<ReelSMPTETextAsset>(j);
 			if (smpte && i.id() == smpte->key_id() && smpte->asset_ref().resolved()) {
 				smpte->smpte_asset()->set_key(i.key());
 			}
@@ -358,7 +358,7 @@ Reel::add (shared_ptr<ReelAsset> asset)
 		_main_picture = p;
 	} else if (auto so = dynamic_pointer_cast<ReelSoundAsset>(asset)) {
 		_main_sound = so;
-	} else if (auto su = dynamic_pointer_cast<ReelSubtitleAsset>(asset)) {
+	} else if (auto su = dynamic_pointer_cast<ReelTextAsset>(asset)) {
 		_main_subtitle = su;
 	} else if (auto m = dynamic_pointer_cast<ReelMarkersAsset>(asset)) {
 		_main_markers = m;
diff --git a/src/reel.h b/src/reel.h
index df6d12a9..7c9ba0d4 100644
--- a/src/reel.h
+++ b/src/reel.h
@@ -68,7 +68,7 @@ class DecryptedKDM;
 class ReelAsset;
 class ReelPictureAsset;
 class ReelSoundAsset;
-class ReelSubtitleAsset;
+class ReelTextAsset;
 class ReelMarkersAsset;
 class ReelClosedCaptionAsset;
 class ReelAtmosAsset;
@@ -84,7 +84,7 @@ public:
 	Reel (
 		std::shared_ptr<ReelPictureAsset> picture,
 		std::shared_ptr<ReelSoundAsset> sound = std::shared_ptr<ReelSoundAsset> (),
-		std::shared_ptr<ReelSubtitleAsset> subtitle = std::shared_ptr<ReelSubtitleAsset> (),
+		std::shared_ptr<ReelTextAsset> subtitle = std::shared_ptr<ReelTextAsset> (),
 		std::shared_ptr<ReelMarkersAsset> markers = std::shared_ptr<ReelMarkersAsset> (),
 		std::shared_ptr<ReelAtmosAsset> atmos = std::shared_ptr<ReelAtmosAsset> ()
 		)
@@ -105,7 +105,7 @@ public:
 		return _main_sound;
 	}
 
-	std::shared_ptr<ReelSubtitleAsset> main_subtitle () const {
+	std::shared_ptr<ReelTextAsset> main_subtitle () const {
 		return _main_subtitle;
 	}
 
@@ -145,7 +145,7 @@ private:
 
 	std::shared_ptr<ReelPictureAsset> _main_picture;
 	std::shared_ptr<ReelSoundAsset> _main_sound;
-	std::shared_ptr<ReelSubtitleAsset> _main_subtitle;
+	std::shared_ptr<ReelTextAsset> _main_subtitle;
 	std::shared_ptr<ReelMarkersAsset> _main_markers;
 	std::vector<std::shared_ptr<ReelClosedCaptionAsset>> _closed_captions;
 	std::shared_ptr<ReelAtmosAsset> _atmos;
diff --git a/src/reel_interop_subtitle_asset.cc b/src/reel_interop_text_asset.cc
index 5f295d53..4bd030aa 100644
--- a/src/reel_interop_subtitle_asset.cc
+++ b/src/reel_interop_text_asset.cc
@@ -32,33 +32,32 @@
 */
 
 
-/** @file  src/reel_interop_subtitle_asset.cc
- *  @brief ReelInteropSubtitleAsset class
+/** @file  src/reel_interop_text_asset.cc
+ *  @brief ReelInteropTextAsset class
  */
 
 
-#include "reel_interop_subtitle_asset.h"
+#include "reel_interop_text_asset.h"
 #include "warnings.h"
 LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
 LIBDCP_ENABLE_WARNINGS
 
 
-using std::shared_ptr;
 using std::string;
 using boost::optional;
 using namespace dcp;
 
 
-ReelInteropSubtitleAsset::ReelInteropSubtitleAsset (std::shared_ptr<SubtitleAsset> asset, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point)
-	: ReelSubtitleAsset (asset, edit_rate, intrinsic_duration, entry_point)
+ReelInteropTextAsset::ReelInteropTextAsset(std::shared_ptr<SubtitleAsset> asset, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point)
+	: ReelTextAsset(asset, edit_rate, intrinsic_duration, entry_point)
 {
 
 }
 
 
-ReelInteropSubtitleAsset::ReelInteropSubtitleAsset (std::shared_ptr<const cxml::Node> node)
-	: ReelSubtitleAsset (node)
+ReelInteropTextAsset::ReelInteropTextAsset(std::shared_ptr<const cxml::Node> node)
+	: ReelTextAsset(node)
 {
 	node->done ();
 }
diff --git a/src/reel_interop_subtitle_asset.h b/src/reel_interop_text_asset.h
index 7e90e9e0..cedc2ae5 100644
--- a/src/reel_interop_subtitle_asset.h
+++ b/src/reel_interop_text_asset.h
@@ -32,27 +32,26 @@
 */
 
 
-/** @file  src/reel_interop_subtitle_asset.h
- *  @brief ReelInteropSubtitleAsset class
+/** @file  src/reel_interop_text_asset.h
+ *  @brief ReelInteropTextAsset class
  */
 
 
 #include "interop_subtitle_asset.h"
-#include "reel_file_asset.h"
-#include "reel_subtitle_asset.h"
+#include "reel_text_asset.h"
 
 
 namespace dcp {
 
 
-/** @class ReelInteropSubtitleAsset
- *  @brief Part of a Reel's description which refers to an Interop subtitle XML file
+/** @class ReelInteropTextAsset
+ *  @brief Part of a Reel's description which refers to an Interop subtitle or caption XML file
  */
-class ReelInteropSubtitleAsset : public ReelSubtitleAsset
+class ReelInteropTextAsset : public ReelTextAsset
 {
 public:
-	ReelInteropSubtitleAsset (std::shared_ptr<SubtitleAsset> asset, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point);
-	explicit ReelInteropSubtitleAsset (std::shared_ptr<const cxml::Node>);
+	ReelInteropTextAsset(std::shared_ptr<SubtitleAsset> asset, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point);
+	explicit ReelInteropTextAsset (std::shared_ptr<const cxml::Node>);
 
 	std::shared_ptr<const InteropSubtitleAsset> interop_asset () const {
 		return asset_of_type<const InteropSubtitleAsset>();
diff --git a/src/reel_smpte_subtitle_asset.cc b/src/reel_smpte_text_asset.cc
index 64440547..bbfa1b39 100644
--- a/src/reel_smpte_subtitle_asset.cc
+++ b/src/reel_smpte_text_asset.cc
@@ -32,12 +32,12 @@
 */
 
 
-/** @file  src/reel_interop_subtitle_asset.cc
- *  @brief ReelInteropSubtitleAsset class
+/** @file  src/reel_interop_text_asset.cc
+ *  @brief ReelInteropTextAsset class
  */
 
 
-#include "reel_smpte_subtitle_asset.h"
+#include "reel_smpte_text_asset.h"
 #include "smpte_subtitle_asset.h"
 #include "warnings.h"
 LIBDCP_DISABLE_WARNINGS
@@ -51,15 +51,15 @@ using boost::optional;
 using namespace dcp;
 
 
-ReelSMPTESubtitleAsset::ReelSMPTESubtitleAsset (shared_ptr<SMPTESubtitleAsset> asset, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point)
-	: ReelSubtitleAsset (asset, edit_rate, intrinsic_duration, entry_point)
+ReelSMPTETextAsset::ReelSMPTETextAsset(shared_ptr<SMPTESubtitleAsset> asset, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point)
+	: ReelTextAsset(asset, edit_rate, intrinsic_duration, entry_point)
 {
 
 }
 
 
-ReelSMPTESubtitleAsset::ReelSMPTESubtitleAsset (shared_ptr<const cxml::Node> node)
-	: ReelSubtitleAsset (node)
+ReelSMPTETextAsset::ReelSMPTETextAsset(shared_ptr<const cxml::Node> node)
+	: ReelTextAsset(node)
 {
 	node->done ();
 }
diff --git a/src/reel_smpte_subtitle_asset.h b/src/reel_smpte_text_asset.h
index 49b6000b..6eb3260d 100644
--- a/src/reel_smpte_subtitle_asset.h
+++ b/src/reel_smpte_text_asset.h
@@ -32,12 +32,12 @@
 */
 
 
-/** @file  src/reel_smpte_subtitle_asset.h
- *  @brief ReelSMPTESubtitleAsset class
+/** @file  src/reel_smpte_text_asset.h
+ *  @brief ReelSMPTETextAsset class
  */
 
 
-#include "reel_subtitle_asset.h"
+#include "reel_text_asset.h"
 #include "smpte_subtitle_asset.h"
 
 
@@ -47,14 +47,14 @@ namespace dcp {
 class SMPTESubtitleAsset;
 
 
-/** @class ReelSMPTESubtitleAsset
- *  @brief Part of a Reel's description which refers to an SMPTE subtitle MXF file
+/** @class ReelSMPTETextAsset
+ *  @brief Part of a Reel's description which refers to an SMPTE subtitle or caption MXF file
  */
-class ReelSMPTESubtitleAsset : public ReelSubtitleAsset
+class ReelSMPTETextAsset : public ReelTextAsset
 {
 public:
-	ReelSMPTESubtitleAsset (std::shared_ptr<SMPTESubtitleAsset> asset, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point);
-	explicit ReelSMPTESubtitleAsset (std::shared_ptr<const cxml::Node>);
+	ReelSMPTETextAsset(std::shared_ptr<SMPTESubtitleAsset> asset, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point);
+	explicit ReelSMPTETextAsset(std::shared_ptr<const cxml::Node>);
 
 	std::shared_ptr<const SMPTESubtitleAsset> smpte_asset () const {
 		return asset_of_type<const SMPTESubtitleAsset>();
diff --git a/src/reel_subtitle_asset.cc b/src/reel_text_asset.cc
index 436aa69f..1802ad51 100644
--- a/src/reel_subtitle_asset.cc
+++ b/src/reel_text_asset.cc
@@ -32,13 +32,13 @@
 */
 
 
-/** @file  src/reel_subtitle_asset.cc
- *  @brief ReelSubtitleAsset class
+/** @file  src/reel_text_asset.cc
+ *  @brief ReelTextAsset class
  */
 
 
 #include "language_tag.h"
-#include "reel_subtitle_asset.h"
+#include "reel_text_asset.h"
 #include "smpte_subtitle_asset.h"
 #include "subtitle_asset.h"
 #include "warnings.h"
@@ -54,7 +54,7 @@ using boost::optional;
 using namespace dcp;
 
 
-ReelSubtitleAsset::ReelSubtitleAsset (std::shared_ptr<SubtitleAsset> asset, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point)
+ReelTextAsset::ReelTextAsset(std::shared_ptr<SubtitleAsset> asset, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point)
 	: ReelFileAsset (
 		asset,
 		dynamic_pointer_cast<SMPTESubtitleAsset>(asset) ? dynamic_pointer_cast<SMPTESubtitleAsset>(asset)->key_id() : boost::none,
@@ -68,7 +68,7 @@ ReelSubtitleAsset::ReelSubtitleAsset (std::shared_ptr<SubtitleAsset> asset, Frac
 }
 
 
-ReelSubtitleAsset::ReelSubtitleAsset (std::shared_ptr<const cxml::Node> node)
+ReelTextAsset::ReelTextAsset(std::shared_ptr<const cxml::Node> node)
 	: ReelFileAsset (node)
 {
 	_language = node->optional_string_child("Language");
@@ -76,21 +76,21 @@ ReelSubtitleAsset::ReelSubtitleAsset (std::shared_ptr<const cxml::Node> node)
 
 
 string
-ReelSubtitleAsset::cpl_node_name (Standard) const
+ReelTextAsset::cpl_node_name(Standard) const
 {
 	return "MainSubtitle";
 }
 
 
 void
-ReelSubtitleAsset::set_language (dcp::LanguageTag language)
+ReelTextAsset::set_language(dcp::LanguageTag language)
 {
 	_language = language.to_string();
 }
 
 
 bool
-ReelSubtitleAsset::equals(shared_ptr<const ReelSubtitleAsset> other, EqualityOptions const& opt, NoteHandler note) const
+ReelTextAsset::equals(shared_ptr<const ReelTextAsset> other, EqualityOptions const& opt, NoteHandler note) const
 {
 	if (!asset_equals (other, opt, note)) {
 		return false;
@@ -104,7 +104,7 @@ ReelSubtitleAsset::equals(shared_ptr<const ReelSubtitleAsset> other, EqualityOpt
 
 
 xmlpp::Element *
-ReelSubtitleAsset::write_to_cpl(xmlpp::Element* node, Standard standard) const
+ReelTextAsset::write_to_cpl(xmlpp::Element* node, Standard standard) const
 {
 	auto asset = ReelFileAsset::write_to_cpl (node, standard);
 	if (_language) {
diff --git a/src/reel_subtitle_asset.h b/src/reel_text_asset.h
index c619c752..63962155 100644
--- a/src/reel_subtitle_asset.h
+++ b/src/reel_text_asset.h
@@ -32,13 +32,13 @@
 */
 
 
-/** @file  src/reel_subtitle_asset.h
- *  @brief ReelSubtitleAsset class.
+/** @file  src/reel_text_asset.h
+ *  @brief ReelTextAsset class.
  */
 
 
-#ifndef LIBDCP_REEL_SUBTITLE_ASSET_H
-#define LIBDCP_REEL_SUBTITLE_ASSET_H
+#ifndef LIBDCP_REEL_TEXT_ASSET_H
+#define LIBDCP_REEL_TEXT_ASSET_H
 
 
 #include "language_tag.h"
@@ -56,14 +56,14 @@ namespace dcp {
 class SubtitleAsset;
 
 
-/** @class ReelSubtitleAsset
- *  @brief Part of a Reel's description which refers to a subtitle XML/MXF file
+/** @class ReelTextAsset
+ *  @brief Part of a Reel's description which refers to a subtitle or caption XML/MXF file
  */
-class ReelSubtitleAsset : public ReelFileAsset
+class ReelTextAsset : public ReelFileAsset
 {
 public:
-	ReelSubtitleAsset (std::shared_ptr<SubtitleAsset> asset, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point);
-	explicit ReelSubtitleAsset (std::shared_ptr<const cxml::Node>);
+	ReelTextAsset(std::shared_ptr<SubtitleAsset> asset, Fraction edit_rate, int64_t intrinsic_duration, int64_t entry_point);
+	explicit ReelTextAsset(std::shared_ptr<const cxml::Node>);
 
 	std::shared_ptr<const SubtitleAsset> asset () const {
 		return asset_of_type<const SubtitleAsset>();
@@ -75,7 +75,7 @@ public:
 
 	xmlpp::Element* write_to_cpl(xmlpp::Element* node, Standard standard) const override;
 
-	bool equals(std::shared_ptr<const ReelSubtitleAsset>, EqualityOptions const&, NoteHandler) const;
+	bool equals(std::shared_ptr<const ReelTextAsset>, EqualityOptions const&, NoteHandler) const;
 
 	void set_language (dcp::LanguageTag language);
 
diff --git a/src/verify.cc b/src/verify.cc
index 1e27514a..067ebfd2 100644
--- a/src/verify.cc
+++ b/src/verify.cc
@@ -48,12 +48,12 @@
 #include "raw_convert.h"
 #include "reel.h"
 #include "reel_closed_caption_asset.h"
-#include "reel_interop_subtitle_asset.h"
+#include "reel_interop_text_asset.h"
 #include "reel_markers_asset.h"
 #include "reel_picture_asset.h"
 #include "reel_sound_asset.h"
-#include "reel_smpte_subtitle_asset.h"
-#include "reel_subtitle_asset.h"
+#include "reel_smpte_text_asset.h"
+#include "reel_text_asset.h"
 #include "smpte_subtitle_asset.h"
 #include "stereo_j2k_picture_asset.h"
 #include "stereo_j2k_picture_frame.h"
@@ -722,7 +722,7 @@ verify_main_sound_asset(Context& context, shared_ptr<const ReelSoundAsset> reel_
 
 
 static void
-verify_main_subtitle_reel(Context& context, shared_ptr<const ReelSubtitleAsset> reel_asset)
+verify_main_subtitle_reel(Context& context, shared_ptr<const ReelTextAsset> reel_asset)
 {
 	/* XXX: is Language compulsory? */
 	if (reel_asset->language()) {
diff --git a/src/verify_report.cc b/src/verify_report.cc
index 632e2a04..bcbda1ff 100644
--- a/src/verify_report.cc
+++ b/src/verify_report.cc
@@ -39,7 +39,7 @@
 #include "reel.h"
 #include "reel_picture_asset.h"
 #include "reel_sound_asset.h"
-#include "reel_subtitle_asset.h"
+#include "reel_text_asset.h"
 #include "verify.h"
 #include "verify_report.h"
 
diff --git a/src/wscript b/src/wscript
index 1793aa72..f7bced72 100644
--- a/src/wscript
+++ b/src/wscript
@@ -98,15 +98,15 @@ def build(bld):
              reel_closed_caption_asset.cc
              reel_file_asset.cc
              reel_interop_closed_caption_asset.cc
-             reel_interop_subtitle_asset.cc
+             reel_interop_text_asset.cc
              reel_markers_asset.cc
              reel_mono_picture_asset.cc
              reel_picture_asset.cc
              reel_smpte_closed_caption_asset.cc
-             reel_smpte_subtitle_asset.cc
+             reel_smpte_text_asset.cc
              reel_sound_asset.cc
              reel_stereo_picture_asset.cc
-             reel_subtitle_asset.cc
+             reel_text_asset.cc
              ref.cc
              rgb_xyz.cc
              ruby.cc
@@ -215,15 +215,15 @@ def build(bld):
               reel_closed_caption_asset.h
               reel_file_asset.h
               reel_interop_closed_caption_asset.h
-              reel_interop_subtitle_asset.h
+              reel_interop_text_asset.h
               reel_markers_asset.h
               reel_mono_picture_asset.h
               reel_picture_asset.h
               reel_smpte_closed_caption_asset.h
-              reel_smpte_subtitle_asset.h
+              reel_smpte_text_asset.h
               reel_sound_asset.h
               reel_stereo_picture_asset.h
-              reel_subtitle_asset.h
+              reel_text_asset.h
               ref.h
               rgb_xyz.h
               ruby.h
diff --git a/test/combine_test.cc b/test/combine_test.cc
index a5f6a57f..26f2be3e 100644
--- a/test/combine_test.cc
+++ b/test/combine_test.cc
@@ -37,13 +37,13 @@
 #include "dcp.h"
 #include "equality_options.h"
 #include "interop_subtitle_asset.h"
-#include "reel_subtitle_asset.h"
+#include "reel_text_asset.h"
 #include "reel_mono_picture_asset.h"
 #include "reel_sound_asset.h"
 #include "test.h"
 #include "types.h"
 #include "verify.h"
-#include "reel_interop_subtitle_asset.h"
+#include "reel_interop_text_asset.h"
 #include "reel_markers_asset.h"
 #include <boost/algorithm/string.hpp>
 #include <boost/optional.hpp>
@@ -465,10 +465,10 @@ BOOST_AUTO_TEST_CASE(combine_multi_reel_subtitles)
 	subs2->add_font("afont2", data2);
 	subs2->write(in / "subs2" / "subs2.xml");
 
-	auto reel_subs1 = make_shared<dcp::ReelInteropSubtitleAsset>(subs1, dcp::Fraction(24, 1), 240, 0);
+	auto reel_subs1 = make_shared<dcp::ReelInteropTextAsset>(subs1, dcp::Fraction(24, 1), 240, 0);
 	dcp->cpls()[0]->reels()[0]->add(reel_subs1);
 
-	auto reel_subs2 = make_shared<dcp::ReelInteropSubtitleAsset>(subs2, dcp::Fraction(24, 1), 240, 0);
+	auto reel_subs2 = make_shared<dcp::ReelInteropTextAsset>(subs2, dcp::Fraction(24, 1), 240, 0);
 	dcp->cpls()[0]->reels()[1]->add(reel_subs2);
 
 	dcp->write_xml();
diff --git a/test/cpl_metadata_test.cc b/test/cpl_metadata_test.cc
index 906f1bc4..a24fd7e0 100644
--- a/test/cpl_metadata_test.cc
+++ b/test/cpl_metadata_test.cc
@@ -39,7 +39,7 @@
 #include "language_tag.h"
 #include "reel.h"
 #include "reel_mono_picture_asset.h"
-#include "reel_smpte_subtitle_asset.h"
+#include "reel_smpte_text_asset.h"
 #include "reel_sound_asset.h"
 #include "stream_operators.h"
 #include "test.h"
@@ -351,7 +351,7 @@ BOOST_AUTO_TEST_CASE (cpl_metadata_write_test1)
 
 	auto reel = make_shared<dcp::Reel>();
 	reel->add (black_picture_asset("build/test/cpl_metadata_write_test1"));
-	reel->add (make_shared<dcp::ReelSMPTESubtitleAsset>(doc));
+	reel->add (make_shared<dcp::ReelSMPTETextAsset>(doc));
 	cpl.add (reel);
 
 	auto lt = { dcp::LanguageTag("en-US"), dcp::LanguageTag("fr-ZA") };
diff --git a/test/dcp_font_test.cc b/test/dcp_font_test.cc
index 7cb55c46..b81248f0 100644
--- a/test/dcp_font_test.cc
+++ b/test/dcp_font_test.cc
@@ -37,8 +37,8 @@
 #include "file.h"
 #include "interop_subtitle_asset.h"
 #include "reel.h"
-#include "reel_interop_subtitle_asset.h"
-#include "reel_smpte_subtitle_asset.h"
+#include "reel_interop_text_asset.h"
+#include "reel_smpte_text_asset.h"
 #include "smpte_subtitle_asset.h"
 #include "test.h"
 #include "util.h"
@@ -66,7 +66,7 @@ BOOST_AUTO_TEST_CASE (interop_dcp_font_test)
 	check_file ("test/data/dummy.ttf", "build/test/interop_dcp_font_test/font_0.ttf");
 
 	auto reel = make_shared<dcp::Reel>();
-	reel->add (make_shared<dcp::ReelInteropSubtitleAsset>(subs, dcp::Fraction (24, 1), 24, 0));
+	reel->add (make_shared<dcp::ReelInteropTextAsset>(subs, dcp::Fraction (24, 1), 24, 0));
 
 	auto cpl = make_shared<dcp::CPL>("", dcp::ContentKind::TRAILER, dcp::Standard::INTEROP);
 	cpl->add (reel);
@@ -103,7 +103,7 @@ BOOST_AUTO_TEST_CASE (smpte_dcp_font_test)
 	subs->write (directory / "frobozz.mxf");
 
 	auto reel = make_shared<dcp::Reel>();
-	reel->add (make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction (24, 1), 24, 0));
+	reel->add (make_shared<dcp::ReelSMPTETextAsset>(subs, dcp::Fraction (24, 1), 24, 0));
 
 	auto cpl = make_shared<dcp::CPL>("", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE);
 	cpl->add (reel);
diff --git a/test/dcp_test.cc b/test/dcp_test.cc
index 63de990f..f0a2e4f5 100644
--- a/test/dcp_test.cc
+++ b/test/dcp_test.cc
@@ -325,7 +325,7 @@ BOOST_AUTO_TEST_CASE (dcp_test5)
 	cpl->add(make_shared<dcp::Reel>(
 			make_shared<dcp::ReelMonoPictureAsset>(mp, 0),
 			make_shared<dcp::ReelSoundAsset>(ms, 0),
-			shared_ptr<dcp::ReelSubtitleAsset>(),
+			shared_ptr<dcp::ReelTextAsset>(),
 			shared_ptr<dcp::ReelMarkersAsset>(),
 			make_shared<dcp::ReelAtmosAsset>(am, 0)
 			));
diff --git a/test/decryption_test.cc b/test/decryption_test.cc
index 1aadc461..af5ba91b 100644
--- a/test/decryption_test.cc
+++ b/test/decryption_test.cc
@@ -46,7 +46,7 @@
 #include "reel_mono_picture_asset.h"
 #include "reel_picture_asset.h"
 #include "reel_sound_asset.h"
-#include "reel_smpte_subtitle_asset.h"
+#include "reel_smpte_text_asset.h"
 #include "rgb_xyz.h"
 #include "smpte_subtitle_asset.h"
 #include "sound_asset.h"
@@ -203,7 +203,7 @@ BOOST_AUTO_TEST_CASE (decryption_test2)
 	auto reel = std::make_shared<dcp::Reel>();
 	auto reel_picture_asset = std::make_shared<dcp::ReelMonoPictureAsset>(picture_asset, 0);
 	auto reel_sound_asset = std::make_shared<dcp::ReelSoundAsset>(sound_asset, 0);
-	auto reel_subs_asset = std::make_shared<dcp::ReelSMPTESubtitleAsset>(subs_asset, dcp::Fraction(24, 1), 120, 0);
+	auto reel_subs_asset = std::make_shared<dcp::ReelSMPTETextAsset>(subs_asset, dcp::Fraction(24, 1), 120, 0);
 	reel->add(reel_picture_asset);
 	reel->add(reel_sound_asset);
 	reel->add(reel_subs_asset);
diff --git a/test/encryption_test.cc b/test/encryption_test.cc
index a927a5df..c8722907 100644
--- a/test/encryption_test.cc
+++ b/test/encryption_test.cc
@@ -126,7 +126,7 @@ BOOST_AUTO_TEST_CASE (encryption_test)
 	cpl->add (make_shared<dcp::Reel>(
 			make_shared<dcp::ReelMonoPictureAsset>(mp, 0),
 			make_shared<dcp::ReelSoundAsset>(ms, 0),
-			shared_ptr<dcp::ReelSubtitleAsset>()
+			shared_ptr<dcp::ReelTextAsset>()
 			));
 	cpl->set_content_version (
 		dcp::ContentVersion("urn:uri:81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00", "81fb54df-e1bf-4647-8788-ea7ba154375b_2012-07-17T04:45:18+00:00")
diff --git a/test/interop_subtitle_test.cc b/test/interop_subtitle_test.cc
index 0efca007..d7d7b7f7 100644
--- a/test/interop_subtitle_test.cc
+++ b/test/interop_subtitle_test.cc
@@ -34,7 +34,7 @@
 
 #include "interop_subtitle_asset.h"
 #include "interop_load_font_node.h"
-#include "reel_interop_subtitle_asset.h"
+#include "reel_interop_text_asset.h"
 #include "subtitle_string.h"
 #include "subtitle_image.h"
 #include "test.h"
@@ -955,7 +955,7 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test3)
 	c->write ("build/test/write_interop_subtitle_test3/subs.xml");
 
 	auto reel = std::make_shared<dcp::Reel>();
-	reel->add(std::make_shared<dcp::ReelInteropSubtitleAsset>(c, dcp::Fraction(24, 1), 6046, 0));
+	reel->add(std::make_shared<dcp::ReelInteropTextAsset>(c, dcp::Fraction(24, 1), 6046, 0));
 
 	string const issue_date = "2018-09-02T04:45:18+00:00";
 	string const issuer = "libdcp";
diff --git a/test/kdm_test.cc b/test/kdm_test.cc
index 75a6019e..4ab1a204 100644
--- a/test/kdm_test.cc
+++ b/test/kdm_test.cc
@@ -41,7 +41,7 @@
 #include "reel.h"
 #include "reel_mono_picture_asset.h"
 #include "reel_sound_asset.h"
-#include "reel_smpte_subtitle_asset.h"
+#include "reel_smpte_text_asset.h"
 #include "smpte_subtitle_asset.h"
 #include "test.h"
 #include "types.h"
@@ -335,7 +335,7 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test)
 	subs->add_font ("afont", data);
 	subs->write (vf_path / "subs.xml");
 
-	auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), 192, 0);
+	auto reel_subs = make_shared<dcp::ReelSMPTETextAsset>(subs, dcp::Fraction(24, 1), 192, 0);
 
 	auto reel = make_shared<dcp::Reel>(ov_reel_picture, ov_reel_sound, reel_subs);
 
diff --git a/test/reel_asset_test.cc b/test/reel_asset_test.cc
index 9dd2f8c3..f8974f63 100644
--- a/test/reel_asset_test.cc
+++ b/test/reel_asset_test.cc
@@ -33,7 +33,7 @@
 
 
 #include "reel_mono_picture_asset.h"
-#include "reel_smpte_subtitle_asset.h"
+#include "reel_smpte_text_asset.h"
 #include <libcxml/cxml.h>
 #include <boost/test/unit_test.hpp>
 #include "stream_operators.h"
@@ -78,7 +78,7 @@ BOOST_AUTO_TEST_CASE (reel_picture_asset_test)
 }
 
 
-/** Test the XML constructor of ReelSMPTESubtitleAsset */
+/** Test the XML constructor of ReelSMPTETextAsset */
 BOOST_AUTO_TEST_CASE (reel_smpte_subtitle_asset_test)
 {
 	auto doc = make_shared<cxml::Document>("MainSubtitle");
@@ -97,7 +97,7 @@ BOOST_AUTO_TEST_CASE (reel_smpte_subtitle_asset_test)
 		"</MainSubtitle>"
 		);
 
-	dcp::ReelSMPTESubtitleAsset ps (doc);
+	dcp::ReelSMPTETextAsset ps (doc);
 	BOOST_CHECK_EQUAL (ps.id(), "8bca1489-aab1-9259-a4fd-8150abc1de12");
 	BOOST_CHECK_EQUAL (ps.annotation_text().get_value_or(""), "Goodbye world!");
 	BOOST_CHECK_EQUAL (ps.edit_rate(), dcp::Fraction(25, 1));
diff --git a/test/rewrite_subs.cc b/test/rewrite_subs.cc
index 0a6f4c6c..ae165172 100644
--- a/test/rewrite_subs.cc
+++ b/test/rewrite_subs.cc
@@ -36,7 +36,7 @@
 #include "cpl.h"
 #include "reel.h"
 #include "subtitle_asset.h"
-#include "reel_subtitle_asset.h"
+#include "reel_text_asset.h"
 #include "exceptions.h"
 
 using std::cout;
diff --git a/test/shared_subtitle_test.cc b/test/shared_subtitle_test.cc
index 22ee7177..f7273d88 100644
--- a/test/shared_subtitle_test.cc
+++ b/test/shared_subtitle_test.cc
@@ -42,7 +42,7 @@
 #include "subtitle_string.h"
 #include "subtitle_image.h"
 #include "subtitle_asset_internal.h"
-#include "reel_interop_subtitle_asset.h"
+#include "reel_interop_text_asset.h"
 #include "reel.h"
 #include "cpl.h"
 #include "dcp.h"
diff --git a/test/test.cc b/test/test.cc
index 51a631d2..ef5424b6 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -47,12 +47,12 @@
 #include "reel.h"
 #include "reel_asset.h"
 #include "reel_interop_closed_caption_asset.h"
-#include "reel_interop_subtitle_asset.h"
+#include "reel_interop_text_asset.h"
 #include "reel_markers_asset.h"
 #include "reel_mono_picture_asset.h"
 #include "reel_mono_picture_asset.h"
 #include "reel_smpte_closed_caption_asset.h"
-#include "reel_smpte_subtitle_asset.h"
+#include "reel_smpte_text_asset.h"
 #include "reel_sound_asset.h"
 #include "smpte_subtitle_asset.h"
 #include "sound_asset.h"
@@ -447,7 +447,7 @@ make_simple_with_interop_subs (boost::filesystem::path path)
 	subs->add_font ("afont", data);
 	subs->write (path / "subs" / "subs.xml");
 
-	auto reel_subs = make_shared<dcp::ReelInteropSubtitleAsset>(subs, dcp::Fraction(24, 1), 240, 0);
+	auto reel_subs = make_shared<dcp::ReelInteropTextAsset>(subs, dcp::Fraction(24, 1), 240, 0);
 	dcp->cpls().front()->reels().front()->add (reel_subs);
 
 	return dcp;
@@ -468,7 +468,7 @@ make_simple_with_smpte_subs (boost::filesystem::path path)
 
 	subs->write (path / "subs.mxf");
 
-	auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), 192, 0);
+	auto reel_subs = make_shared<dcp::ReelSMPTETextAsset>(subs, dcp::Fraction(24, 1), 192, 0);
 	dcp->cpls().front()->reels().front()->add (reel_subs);
 
 	return dcp;
diff --git a/test/test.h b/test/test.h
index d3fded87..df7bda89 100644
--- a/test/test.h
+++ b/test/test.h
@@ -21,7 +21,6 @@
 #include "cpl.h"
 #include "dcp.h"
 #include "reel.h"
-#include "reel_subtitle_asset.h"
 #include "subtitle.h"
 #include "reel_asset.h"
 #include <boost/filesystem.hpp>
diff --git a/test/verify_test.cc b/test/verify_test.cc
index b5a53ec2..ddd4a8cd 100644
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -44,13 +44,13 @@
 #include "raw_convert.h"
 #include "reel.h"
 #include "reel_interop_closed_caption_asset.h"
-#include "reel_interop_subtitle_asset.h"
+#include "reel_interop_text_asset.h"
 #include "reel_markers_asset.h"
 #include "reel_mono_picture_asset.h"
 #include "reel_sound_asset.h"
 #include "reel_stereo_picture_asset.h"
 #include "reel_smpte_closed_caption_asset.h"
-#include "reel_smpte_subtitle_asset.h"
+#include "reel_smpte_text_asset.h"
 #include "smpte_subtitle_asset.h"
 #include "stereo_j2k_picture_asset.h"
 #include "stream_operators.h"
@@ -1180,7 +1180,7 @@ BOOST_AUTO_TEST_CASE (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 reel_asset = make_shared<dcp::ReelInteropSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
+	auto reel_asset = make_shared<dcp::ReelInteropTextAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
 	auto cpl = write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
 
 	check_verify_result (
@@ -1234,7 +1234,7 @@ BOOST_AUTO_TEST_CASE (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 reel_asset = make_shared<dcp::ReelInteropSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
+	auto reel_asset = make_shared<dcp::ReelInteropTextAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
 	auto cpl = write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
 
 	{
@@ -1275,7 +1275,7 @@ BOOST_AUTO_TEST_CASE(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 reel_asset = make_shared<dcp::ReelInteropSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
+	auto reel_asset = make_shared<dcp::ReelInteropTextAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
 	auto cpl = write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
 
 	check_verify_result (
@@ -1305,7 +1305,7 @@ BOOST_AUTO_TEST_CASE(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 reel_asset = make_shared<dcp::ReelInteropSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
+	auto reel_asset = make_shared<dcp::ReelInteropTextAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
 	auto cpl = write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
 
 	check_verify_result (
@@ -1332,7 +1332,7 @@ BOOST_AUTO_TEST_CASE (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 reel_asset = make_shared<dcp::ReelSMPTESubtitleAsset>(asset, dcp::Fraction(24, 1), 6046, 0);
+	auto reel_asset = make_shared<dcp::ReelSMPTETextAsset>(asset, dcp::Fraction(24, 1), 6046, 0);
 	auto cpl = write_dcp_with_single_asset (dir, reel_asset);
 
 	check_verify_result(
@@ -1367,7 +1367,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_smpte_subtitles)
 	/* 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 reel_asset = make_shared<dcp::ReelSMPTESubtitleAsset>(asset, dcp::Fraction(24, 1), 6046, 0);
+	auto reel_asset = make_shared<dcp::ReelSMPTETextAsset>(asset, dcp::Fraction(24, 1), 6046, 0);
 	auto cpl = write_dcp_with_single_asset (dir, reel_asset);
 
 	check_verify_result (
@@ -1412,7 +1412,7 @@ BOOST_AUTO_TEST_CASE (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 reel_asset = make_shared<dcp::ReelSMPTESubtitleAsset>(asset, dcp::Fraction(24, 1), 192, 0);
+	auto reel_asset = make_shared<dcp::ReelSMPTETextAsset>(asset, dcp::Fraction(24, 1), 192, 0);
 	auto cpl = write_dcp_with_single_asset (dir, reel_asset);
 
 	check_verify_result (
@@ -1454,7 +1454,7 @@ BOOST_AUTO_TEST_CASE (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 reel_asset = make_shared<dcp::ReelInteropSubtitleAsset>(asset, dcp::Fraction(24, 1), 192, 0);
+	auto reel_asset = make_shared<dcp::ReelInteropTextAsset>(asset, dcp::Fraction(24, 1), 192, 0);
 	auto cpl = write_dcp_with_single_asset (dir, reel_asset, dcp::Standard::INTEROP);
 
 	check_verify_result (
@@ -1481,7 +1481,7 @@ BOOST_AUTO_TEST_CASE (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 reel_asset = make_shared<dcp::ReelInteropSubtitleAsset>(asset, dcp::Fraction(24, 1), 192, 0);
+	auto reel_asset = make_shared<dcp::ReelInteropTextAsset>(asset, dcp::Fraction(24, 1), 192, 0);
 	auto cpl = write_dcp_with_single_asset (dir, reel_asset, dcp::Standard::INTEROP);
 
 	check_verify_result (
@@ -1551,7 +1551,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_cpl_metadata)
 
 	copy_file ("test/data/subs.mxf", dir / "subs.mxf");
 	auto asset = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.mxf");
-	auto reel_asset = make_shared<dcp::ReelSMPTESubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
+	auto reel_asset = make_shared<dcp::ReelSMPTETextAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
 
 	auto reel = make_shared<dcp::Reel>();
 	reel->add (reel_asset);
@@ -1688,7 +1688,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_language1)
 	auto asset = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.mxf");
 	asset->_language = "wrong-andbad";
 	asset->write (dir / "subs.mxf");
-	auto reel_asset = make_shared<dcp::ReelSMPTESubtitleAsset>(asset, dcp::Fraction(24, 1), 6046, 0);
+	auto reel_asset = make_shared<dcp::ReelSMPTETextAsset>(asset, dcp::Fraction(24, 1), 6046, 0);
 	reel_asset->_language = "badlang";
 	auto cpl = write_dcp_with_single_asset (dir, reel_asset);
 
@@ -2209,7 +2209,7 @@ verify_timed_text_asset_too_large (string name)
 
 BOOST_AUTO_TEST_CASE (verify_subtitle_asset_too_large)
 {
-	verify_timed_text_asset_too_large<dcp::ReelSMPTESubtitleAsset>("verify_subtitle_asset_too_large");
+	verify_timed_text_asset_too_large<dcp::ReelSMPTETextAsset>("verify_subtitle_asset_too_large");
 	verify_timed_text_asset_too_large<dcp::ReelSMPTEClosedCaptionAsset>("verify_closed_caption_asset_too_large");
 }
 
@@ -2248,7 +2248,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_subtitle_language)
 	auto subs = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.xml");
 	subs->write (dir / "subs.mxf");
 
-	auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), 106, 0);
+	auto reel_subs = make_shared<dcp::ReelSMPTETextAsset>(subs, dcp::Fraction(24, 1), 106, 0);
 	auto cpl = dcp->cpls()[0];
 	cpl->reels()[0]->add(reel_subs);
 	dcp->write_xml();
@@ -2294,7 +2294,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_subtitle_languages)
 		subs->add (simple_subtitle());
 		add_font(subs);
 		subs->write (path / "subs1.mxf");
-		auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), reel_length, 0);
+		auto reel_subs = make_shared<dcp::ReelSMPTETextAsset>(subs, dcp::Fraction(24, 1), reel_length, 0);
 		cpl->reels()[0]->add(reel_subs);
 	}
 
@@ -2304,7 +2304,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_subtitle_languages)
 		subs->add (simple_subtitle());
 		add_font(subs);
 		subs->write (path / "subs2.mxf");
-		auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), reel_length, 0);
+		auto reel_subs = make_shared<dcp::ReelSMPTETextAsset>(subs, dcp::Fraction(24, 1), reel_length, 0);
 		cpl->reels()[1]->add(reel_subs);
 	}
 
@@ -2436,7 +2436,7 @@ BOOST_AUTO_TEST_CASE (verify_missing_subtitle_start_time)
 	auto subs = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.xml");
 	subs->write (dir / "subs.mxf");
 
-	auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), 106, 0);
+	auto reel_subs = make_shared<dcp::ReelSMPTETextAsset>(subs, dcp::Fraction(24, 1), 106, 0);
 	auto cpl = dcp->cpls()[0];
 	cpl->reels()[0]->add(reel_subs);
 	dcp->write_xml();
@@ -2504,7 +2504,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_start_time)
 	auto subs = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.xml");
 	subs->write (dir / "subs.mxf");
 
-	auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), 106, 0);
+	auto reel_subs = make_shared<dcp::ReelSMPTETextAsset>(subs, dcp::Fraction(24, 1), 106, 0);
 	auto cpl = dcp->cpls()[0];
 	cpl->reels().front()->add(reel_subs);
 	dcp->write_xml();
@@ -2620,7 +2620,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_first_text_time)
 {
 	auto const dir = path("build/test/verify_invalid_subtitle_first_text_time");
 	/* Just too early */
-	auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (dir, {{ 4 * 24 - 1, 5 * 24 }});
+	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset> (dir, {{ 4 * 24 - 1, 5 * 24 }});
 	check_verify_result (
 		{ dir },
 		{},
@@ -2646,7 +2646,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_first_text_time)
 {
 	auto const dir = path("build/test/verify_valid_subtitle_first_text_time");
 	/* Just late enough */
-	auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (dir, {{ 4 * 24, 5 * 24 }});
+	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset> (dir, {{ 4 * 24, 5 * 24 }});
 	check_verify_result(
 		{dir},
 		{},
@@ -2676,7 +2676,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_first_text_time_on_second_reel)
 	asset1->set_language (dcp::LanguageTag("de-DE"));
 	add_font(asset1);
 	asset1->write (dir / "subs1.mxf");
-	auto reel_asset1 = make_shared<dcp::ReelSMPTESubtitleAsset>(asset1, dcp::Fraction(24, 1), 5 * 24, 0);
+	auto reel_asset1 = make_shared<dcp::ReelSMPTETextAsset>(asset1, dcp::Fraction(24, 1), 5 * 24, 0);
 	auto reel1 = make_shared<dcp::Reel>();
 	reel1->add (reel_asset1);
 	auto markers1 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 5 * 24);
@@ -2690,7 +2690,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_first_text_time_on_second_reel)
 	add_test_subtitle (asset2, 3, 4 * 24);
 	asset2->set_language (dcp::LanguageTag("de-DE"));
 	asset2->write (dir / "subs2.mxf");
-	auto reel_asset2 = make_shared<dcp::ReelSMPTESubtitleAsset>(asset2, dcp::Fraction(24, 1), 4 * 24, 0);
+	auto reel_asset2 = make_shared<dcp::ReelSMPTETextAsset>(asset2, dcp::Fraction(24, 1), 4 * 24, 0);
 	auto reel2 = make_shared<dcp::Reel>();
 	reel2->add (reel_asset2);
 	auto markers2 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), 4 * 24);
@@ -2725,7 +2725,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_first_text_time_on_second_reel)
 BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_spacing)
 {
 	auto const dir = path("build/test/verify_invalid_subtitle_spacing");
-	auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (
+	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset> (
 		dir,
 		{
 			{ 4 * 24,     5 * 24 },
@@ -2754,7 +2754,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_spacing)
 BOOST_AUTO_TEST_CASE (verify_valid_subtitle_spacing)
 {
 	auto const dir = path("build/test/verify_valid_subtitle_spacing");
-	auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (
+	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset> (
 		dir,
 		{
 			{ 4 * 24,      5 * 24 },
@@ -2781,7 +2781,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_spacing)
 BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_duration)
 {
 	auto const dir = path("build/test/verify_invalid_subtitle_duration");
-	auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (dir, {{ 4 * 24, 4 * 24 + 1 }});
+	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset> (dir, {{ 4 * 24, 4 * 24 + 1 }});
 	check_verify_result (
 		{dir},
 		{},
@@ -2805,7 +2805,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_duration)
 BOOST_AUTO_TEST_CASE (verify_valid_subtitle_duration)
 {
 	auto const dir = path("build/test/verify_valid_subtitle_duration");
-	auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (dir, {{ 4 * 24, 4 * 24 + 17 }});
+	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset> (dir, {{ 4 * 24, 4 * 24 + 17 }});
 
 	check_verify_result(
 		{dir},
@@ -2835,7 +2835,7 @@ BOOST_AUTO_TEST_CASE (verify_subtitle_overlapping_reel_boundary)
 	asset->set_language (dcp::LanguageTag("de-DE"));
 	asset->write (dir / "subs.mxf");
 
-	auto reel_asset = make_shared<dcp::ReelSMPTESubtitleAsset>(asset, dcp::Fraction(24, 1), 3 * 24, 0);
+	auto reel_asset = make_shared<dcp::ReelSMPTETextAsset>(asset, dcp::Fraction(24, 1), 3 * 24, 0);
 	auto cpl = write_dcp_with_single_asset (dir, reel_asset);
 	check_verify_result (
 		{dir},
@@ -2867,7 +2867,7 @@ BOOST_AUTO_TEST_CASE (verify_subtitle_overlapping_reel_boundary)
 BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_count1)
 {
 	auto const dir = path ("build/test/invalid_subtitle_line_count1");
-	auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (
+	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset> (
 		dir,
 		{
 			{ 96, 200, 0.0, dcp::VAlign::CENTER, "We" },
@@ -2898,7 +2898,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_count1)
 BOOST_AUTO_TEST_CASE (verify_valid_subtitle_line_count1)
 {
 	auto const dir = path ("build/test/verify_valid_subtitle_line_count1");
-	auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (
+	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset> (
 		dir,
 		{
 			{ 96, 200, 0.0, dcp::VAlign::CENTER, "We" },
@@ -2926,7 +2926,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_line_count1)
 BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_count2)
 {
 	auto const dir = path ("build/test/verify_invalid_subtitle_line_count2");
-	auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (
+	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset> (
 		dir,
 		{
 			{ 96, 300, 0.0, dcp::VAlign::CENTER, "We" },
@@ -2957,7 +2957,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_count2)
 BOOST_AUTO_TEST_CASE (verify_valid_subtitle_line_count2)
 {
 	auto const dir = path ("build/test/verify_valid_subtitle_line_count2");
-	auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (
+	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset> (
 		dir,
 		{
 			{ 96, 300, 0.0, dcp::VAlign::CENTER, "We" },
@@ -2986,7 +2986,7 @@ BOOST_AUTO_TEST_CASE (verify_valid_subtitle_line_count2)
 BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_length1)
 {
 	auto const dir = path ("build/test/verify_invalid_subtitle_line_length1");
-	auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (
+	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset> (
 		dir,
 		{
 			{ 96, 300, 0.0, dcp::VAlign::CENTER, "012345678901234567890123456789012345678901234567890123" }
@@ -3014,7 +3014,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_length1)
 BOOST_AUTO_TEST_CASE (verify_invalid_subtitle_line_length2)
 {
 	auto const dir = path ("build/test/verify_invalid_subtitle_line_length2");
-	auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset> (
+	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset> (
 		dir,
 		{
 			{ 96, 300, 0.0, dcp::VAlign::CENTER, "012345678901234567890123456789012345678901234567890123456789012345678901234567890" }
@@ -3562,7 +3562,7 @@ verify_subtitles_must_be_in_all_reels_check (path dir, bool add_to_reel1, bool a
 	subs->add (simple_subtitle());
 	add_font(subs);
 	subs->write (dir / "subs.mxf");
-	auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), reel_length, 0);
+	auto reel_subs = make_shared<dcp::ReelSMPTETextAsset>(subs, dcp::Fraction(24, 1), reel_length, 0);
 
 	auto reel1 = make_shared<dcp::Reel>(
 		make_shared<dcp::ReelMonoPictureAsset>(simple_picture(dir, "1", reel_length), 0),
@@ -3570,7 +3570,7 @@ verify_subtitles_must_be_in_all_reels_check (path dir, bool add_to_reel1, bool a
 		);
 
 	if (add_to_reel1) {
-		reel1->add (make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), reel_length, 0));
+		reel1->add (make_shared<dcp::ReelSMPTETextAsset>(subs, dcp::Fraction(24, 1), reel_length, 0));
 	}
 
 	auto markers1 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), reel_length);
@@ -3585,7 +3585,7 @@ verify_subtitles_must_be_in_all_reels_check (path dir, bool add_to_reel1, bool a
 		);
 
 	if (add_to_reel2) {
-		reel2->add (make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), reel_length, 0));
+		reel2->add (make_shared<dcp::ReelSMPTETextAsset>(subs, dcp::Fraction(24, 1), reel_length, 0));
 	}
 
 	auto markers2 = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(24, 1), reel_length);
@@ -3868,18 +3868,18 @@ verify_text_entry_point_check (path dir, dcp::VerificationNote::Code code, boost
 
 BOOST_AUTO_TEST_CASE (verify_text_entry_point)
 {
-	verify_text_entry_point_check<dcp::ReelSMPTESubtitleAsset> (
+	verify_text_entry_point_check<dcp::ReelSMPTETextAsset> (
 		"build/test/verify_subtitle_entry_point_must_be_present",
 		dcp::VerificationNote::Code::MISSING_SUBTITLE_ENTRY_POINT,
-		[](shared_ptr<dcp::ReelSMPTESubtitleAsset> asset) {
+		[](shared_ptr<dcp::ReelSMPTETextAsset> asset) {
 			asset->unset_entry_point ();
 			}
 		);
 
-	verify_text_entry_point_check<dcp::ReelSMPTESubtitleAsset> (
+	verify_text_entry_point_check<dcp::ReelSMPTETextAsset> (
 		"build/test/verify_subtitle_entry_point_must_be_zero",
 		dcp::VerificationNote::Code::INCORRECT_SUBTITLE_ENTRY_POINT,
-		[](shared_ptr<dcp::ReelSMPTESubtitleAsset> asset) {
+		[](shared_ptr<dcp::ReelSMPTETextAsset> asset) {
 			asset->set_entry_point (4);
 			}
 		);
@@ -4823,7 +4823,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_subtitle_resource_id)
 	writer.Finalize();
 
 	auto subs_asset = make_shared<dcp::SMPTESubtitleAsset>(subs_mxf);
-	auto subs_reel = make_shared<dcp::ReelSMPTESubtitleAsset>(subs_asset, dcp::Fraction(24, 1), 240, 0);
+	auto subs_reel = make_shared<dcp::ReelSMPTETextAsset>(subs_asset, dcp::Fraction(24, 1), 240, 0);
 
 	auto cpl = write_dcp_with_single_asset (dir, subs_reel);
 
@@ -4903,7 +4903,7 @@ BOOST_AUTO_TEST_CASE (verify_incorrect_timed_text_id)
 	writer.Finalize();
 
 	auto subs_asset = make_shared<dcp::SMPTESubtitleAsset>(subs_mxf);
-	auto subs_reel = make_shared<dcp::ReelSMPTESubtitleAsset>(subs_asset, dcp::Fraction(24, 1), 240, 0);
+	auto subs_reel = make_shared<dcp::ReelSMPTETextAsset>(subs_asset, dcp::Fraction(24, 1), 240, 0);
 
 	auto cpl = write_dcp_with_single_asset (dir, subs_reel);
 
@@ -5583,7 +5583,7 @@ BOOST_AUTO_TEST_CASE(verify_missing_load_font_for_font)
 		editor.delete_first_line_containing("LoadFont");
 	}
 	auto asset = make_shared<dcp::InteropSubtitleAsset>(dir / "subs.xml");
-	auto reel_asset = make_shared<dcp::ReelInteropSubtitleAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
+	auto reel_asset = make_shared<dcp::ReelInteropTextAsset>(asset, dcp::Fraction(24, 1), 16 * 24, 0);
 	auto cpl = write_dcp_with_single_asset(dir, reel_asset, dcp::Standard::INTEROP);
 
 	check_verify_result (
@@ -5636,7 +5636,7 @@ BOOST_AUTO_TEST_CASE(verify_missing_load_font)
 	auto subs = make_shared<dcp::SMPTESubtitleAsset>(dir / "subs.xml");
 	subs->write(dir / "subs.mxf");
 
-	auto reel_subs = make_shared<dcp::ReelSMPTESubtitleAsset>(subs, dcp::Fraction(24, 1), 202, 0);
+	auto reel_subs = make_shared<dcp::ReelSMPTETextAsset>(subs, dcp::Fraction(24, 1), 202, 0);
 	auto cpl = dcp->cpls()[0];
 	cpl->reels()[0]->add(reel_subs);
 	dcp->write_xml();
@@ -5742,7 +5742,7 @@ BOOST_AUTO_TEST_CASE(verify_encrypted_smpte_dcp)
 	auto const dir = path("build/test/verify_encrypted_smpte_dcp");
 	dcp::Key key;
 	auto key_id = dcp::make_uuid();
-	auto cpl = dcp_with_text<dcp::ReelSMPTESubtitleAsset>(dir, {{ 4 * 24, 5 * 24 }}, key, key_id);
+	auto cpl = dcp_with_text<dcp::ReelSMPTETextAsset>(dir, {{ 4 * 24, 5 * 24 }}, key, key_id);
 
 	dcp::DecryptedKDM kdm(dcp::LocalTime(), dcp::LocalTime(), "", "", "");
 	kdm.add_key(dcp::DecryptedKDMKey(string{"MDIK"}, key_id, key, cpl->id(), dcp::Standard::SMPTE));
diff --git a/tools/dcpinfo.cc b/tools/dcpinfo.cc
index f68fac24..7cbdf140 100644
--- a/tools/dcpinfo.cc
+++ b/tools/dcpinfo.cc
@@ -46,7 +46,7 @@
 #include "reel.h"
 #include "reel_picture_asset.h"
 #include "reel_sound_asset.h"
-#include "reel_subtitle_asset.h"
+#include "reel_text_asset.h"
 #include "smpte_subtitle_asset.h"
 #include "sound_asset.h"
 #include "subtitle_asset.h"
@@ -243,7 +243,7 @@ static
 void
 main_subtitle (vector<string> const& only, shared_ptr<Reel> reel, bool list_subtitles)
 {
-	shared_ptr<dcp::ReelSubtitleAsset> ms = reel->main_subtitle ();
+	auto ms = reel->main_subtitle();
 	if (!ms) {
 		return;
 	}