Rename classes.

sed -i "s/\<PictureAsset/J2KPictureAsset/g" src/*.{cc,h}
sed -i "s/\<dcp::PictureAsset/dcp::J2KPictureAsset/g" src/*.{cc,h} test/*.{cc,h} tools/*.cc examples/*.cc
sed -i "s/\<MonoPictureAsset/MonoJ2KPictureAsset/g" src/*.{cc,h} tools/*.cc test/*.{cc,h}
sed -i "s/\<dcp::MonoPictureAsset/dcp::MonoJ2KPictureAsset/g" src/*.{cc,h} test/*.{cc,h} tools/*.cc examples/*.cc
sed -i "s/\<StereoPictureAsset/StereoJ2KPictureAsset/g" src/*.{cc,h} tools/*.cc
sed -i "s/\<dcp::StereoPictureAsset/dcp::StereoJ2KPictureAsset/g" src/*.{cc,h} test/*.{cc,h} tools/*.cc examples/*.cc
sed -i "s/\<MonoPictureFrame/MonoJ2KPictureFrame/g" src/*.{cc,h} tools/*.cc test/*.{cc,h}
sed -i "s/\<dcp::MonoPictureFrame/dcp::MonoJ2KPictureFrame/g" src/*.{cc,h} test/*.{cc,h} tools/*.cc examples/*.cc
sed -i "s/\<StereoPictureFrame/StereoJ2KPictureFrame/g" src/*.{cc,h} tools/*.cc
sed -i "s/\<dcp::StereoPictureFrame/dcp::StereoJ2KPictureFrame/g" src/*.{cc,h} test/*.{cc,h} tools/*.cc examples/*.cc

30 files changed, 210 insertions, 210 deletions

diff --git a/src/asset_factory.cc b/src/asset_factory.cc
index 19ee460e..240b7685 100644
--- a/src/asset_factory.cc
+++ b/src/asset_factory.cc
@@ -72,11 +72,11 @@ dcp::asset_factory (boost::filesystem::path path, bool ignore_incorrect_picture_
 		throw ReadError ("MPEG2 video essences are not supported");
 	case ASDCP::ESS_JPEG_2000:
 		try {
-			return make_shared<MonoPictureAsset>(path);
+			return make_shared<MonoJ2KPictureAsset>(path);
 		} catch (dcp::MXFFileError& e) {
 			if (ignore_incorrect_picture_mxf_type && e.number() == ASDCP::RESULT_SFORMAT) {
 				/* Tried to load it as mono but the error says it's stereo; try that instead */
-				auto stereo = make_shared<StereoPictureAsset>(path);
+				auto stereo = make_shared<StereoJ2KPictureAsset>(path);
 				if (stereo && found_threed_marked_as_twod) {
 					*found_threed_marked_as_twod = true;
 				}
@@ -89,7 +89,7 @@ dcp::asset_factory (boost::filesystem::path path, bool ignore_incorrect_picture_
 	case ASDCP::ESS_PCM_24b_96k:
 		return make_shared<SoundAsset>(path);
 	case ASDCP::ESS_JPEG_2000_S:
-		return make_shared<StereoPictureAsset>(path);
+		return make_shared<StereoJ2KPictureAsset>(path);
 	case ASDCP::ESS_TIMED_TEXT:
 		return make_shared<SMPTESubtitleAsset>(path);
 	case ASDCP::ESS_DCDATA_DOLBY_ATMOS:
diff --git a/src/asset_reader.h b/src/asset_reader.h
index aa815745..ac48c3f0 100644
--- a/src/asset_reader.h
+++ b/src/asset_reader.h
@@ -53,9 +53,9 @@ namespace dcp {
 
 
 class AtmosAsset;
-class MonoPictureAsset;
+class MonoJ2KPictureAsset;
 class SoundAsset;
-class StereoPictureAsset;
+class StereoJ2KPictureAsset;
 
 
 template <class R, class F>
@@ -90,9 +90,9 @@ protected:
 
 private:
 	friend class AtmosAsset;
-	friend class MonoPictureAsset;
+	friend class MonoJ2KPictureAsset;
 	friend class SoundAsset;
-	friend class StereoPictureAsset;
+	friend class StereoJ2KPictureAsset;
 
 	explicit AssetReader (Asset const * asset, boost::optional<Key> key, Standard standard)
 		: _crypto_context (new DecryptionContext(key, standard))
diff --git a/src/dcp.cc b/src/dcp.cc
index dac20547..816fc178 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -246,7 +246,7 @@ DCP::read (vector<dcp::VerificationNote>* notes, bool ignore_incorrect_picture_m
 				other_assets.push_back (make_shared<InteropSubtitleAsset>(path));
 			}
 		} else if (
-			*pkl_type == remove_parameters(PictureAsset::static_pkl_type(standard)) ||
+			*pkl_type == remove_parameters(J2KPictureAsset::static_pkl_type(standard)) ||
 			*pkl_type == remove_parameters(SoundAsset::static_pkl_type(standard)) ||
 			*pkl_type == remove_parameters(AtmosAsset::static_pkl_type(standard)) ||
 			*pkl_type == remove_parameters(SMPTESubtitleAsset::static_pkl_type(standard))
diff --git a/src/j2k_picture_asset.cc b/src/j2k_picture_asset.cc
index 5b4bed20..5c31e9c2 100644
--- a/src/j2k_picture_asset.cc
+++ b/src/j2k_picture_asset.cc
@@ -33,7 +33,7 @@
 
 
 /** @file  src/picture_asset.cc
- *  @brief PictureAsset class
+ *  @brief J2KPictureAsset class
  */
 
 
@@ -64,14 +64,14 @@ using std::shared_ptr;
 using namespace dcp;
 
 
-PictureAsset::PictureAsset (boost::filesystem::path file)
+J2KPictureAsset::J2KPictureAsset (boost::filesystem::path file)
 	: Asset (file)
 {
 
 }
 
 
-PictureAsset::PictureAsset (Fraction edit_rate, Standard standard)
+J2KPictureAsset::J2KPictureAsset (Fraction edit_rate, Standard standard)
 	: MXF (standard)
 	, _edit_rate (edit_rate)
 {
@@ -80,7 +80,7 @@ PictureAsset::PictureAsset (Fraction edit_rate, Standard standard)
 
 
 void
-PictureAsset::read_picture_descriptor (ASDCP::JP2K::PictureDescriptor const & desc)
+J2KPictureAsset::read_picture_descriptor (ASDCP::JP2K::PictureDescriptor const & desc)
 {
 	_size.width = desc.StoredWidth;
 	_size.height = desc.StoredHeight;
@@ -92,7 +92,7 @@ PictureAsset::read_picture_descriptor (ASDCP::JP2K::PictureDescriptor const & de
 
 
 bool
-PictureAsset::descriptor_equals (
+J2KPictureAsset::descriptor_equals (
 	ASDCP::JP2K::PictureDescriptor const & a, ASDCP::JP2K::PictureDescriptor const & b, NoteHandler note
 	) const
 {
@@ -135,7 +135,7 @@ PictureAsset::descriptor_equals (
 
 
 bool
-PictureAsset::frame_buffer_equals (
+J2KPictureAsset::frame_buffer_equals (
 	int frame, EqualityOptions const& opt, NoteHandler note,
 	uint8_t const * data_A, unsigned int size_A, uint8_t const * data_B, unsigned int size_B
 	) const
@@ -210,7 +210,7 @@ PictureAsset::frame_buffer_equals (
 
 
 string
-PictureAsset::static_pkl_type (Standard standard)
+J2KPictureAsset::static_pkl_type (Standard standard)
 {
 	switch (standard) {
 	case Standard::INTEROP:
@@ -224,7 +224,7 @@ PictureAsset::static_pkl_type (Standard standard)
 
 
 string
-PictureAsset::pkl_type (Standard standard) const
+J2KPictureAsset::pkl_type (Standard standard) const
 {
 	return static_pkl_type (standard);
 }
diff --git a/src/j2k_picture_asset.h b/src/j2k_picture_asset.h
index 9ad1eb22..405f6531 100644
--- a/src/j2k_picture_asset.h
+++ b/src/j2k_picture_asset.h
@@ -33,7 +33,7 @@
 
 
 /** @file  src/picture_asset.h
- *  @brief PictureAsset class
+ *  @brief J2KPictureAsset class
  */
 
 
@@ -56,29 +56,29 @@ namespace ASDCP {
 namespace dcp {
 
 
-class MonoPictureFrame;
-class StereoPictureFrame;
-class PictureAssetWriter;
+class MonoJ2KPictureFrame;
+class StereoJ2KPictureFrame;
+class J2KPictureAssetWriter;
 
 
-/** @class PictureAsset
+/** @class J2KPictureAsset
  *  @brief An asset made up of JPEG2000 data
  */
-class PictureAsset : public Asset, public MXF
+class J2KPictureAsset : public Asset, public MXF
 {
 public:
-	/** Load a PictureAsset from a file */
-	explicit PictureAsset (boost::filesystem::path file);
+	/** Load a J2KPictureAsset from a file */
+	explicit J2KPictureAsset (boost::filesystem::path file);
 
-	/** Create a new PictureAsset with a given edit rate and standard */
-	PictureAsset(Fraction edit_rate, Standard standard);
+	/** Create a new J2KPictureAsset with a given edit rate and standard */
+	J2KPictureAsset (Fraction edit_rate, Standard standard);
 
 	enum class Behaviour {
 		OVERWRITE_EXISTING,
 		MAKE_NEW
 	};
 
-	virtual std::shared_ptr<PictureAssetWriter> start_write (
+	virtual std::shared_ptr<J2KPictureAssetWriter> start_write (
 		boost::filesystem::path file,
 		Behaviour behaviour
 		) = 0;
@@ -118,8 +118,8 @@ public:
 	static std::string static_pkl_type (Standard standard);
 
 protected:
-	friend class MonoPictureAssetWriter;
-	friend class StereoPictureAssetWriter;
+	friend class MonoJ2KPictureAssetWriter;
+	friend class StereoJ2KPictureAssetWriter;
 
 	bool frame_buffer_equals (
 		int frame, EqualityOptions const& opt, NoteHandler note,
diff --git a/src/j2k_picture_asset_writer.cc b/src/j2k_picture_asset_writer.cc
index 594eb6a4..5a552b52 100644
--- a/src/j2k_picture_asset_writer.cc
+++ b/src/j2k_picture_asset_writer.cc
@@ -33,7 +33,7 @@
 
 
 /** @file  src/picture_asset_writer.cc
- *  @brief PictureAssetWriter and FrameInfo classes
+ *  @brief J2KPictureAssetWriter and FrameInfo classes
  */
 
 
@@ -51,7 +51,7 @@ using std::shared_ptr;
 using namespace dcp;
 
 
-PictureAssetWriter::PictureAssetWriter (PictureAsset* asset, boost::filesystem::path file, bool overwrite)
+J2KPictureAssetWriter::J2KPictureAssetWriter (J2KPictureAsset* asset, boost::filesystem::path file, bool overwrite)
 	: AssetWriter (asset, file)
 	, _picture_asset (asset)
 	, _overwrite (overwrite)
@@ -61,7 +61,7 @@ PictureAssetWriter::PictureAssetWriter (PictureAsset* asset, boost::filesystem::
 
 
 FrameInfo
-PictureAssetWriter::write (Data const& data)
+J2KPictureAssetWriter::write (Data const& data)
 {
 	return write (data.data(), data.size());
 }
diff --git a/src/j2k_picture_asset_writer.h b/src/j2k_picture_asset_writer.h
index 0caa8815..d441c06d 100644
--- a/src/j2k_picture_asset_writer.h
+++ b/src/j2k_picture_asset_writer.h
@@ -33,7 +33,7 @@
 
 
 /** @file  src/picture_asset_writer.h
- *  @brief PictureAssetWriter and FrameInfo classes.
+ *  @brief J2KPictureAssetWriter and FrameInfo classes.
  */
 
 
@@ -53,7 +53,7 @@ namespace dcp {
 
 
 class Data;
-class PictureAsset;
+class J2KPictureAsset;
 
 
 /** @class FrameInfo
@@ -75,10 +75,10 @@ struct FrameInfo
 };
 
 
-/** @class PictureAssetWriter
+/** @class J2KPictureAssetWriter
  *  @brief Parent class for classes which write picture assets.
  */
-class PictureAssetWriter : public AssetWriter
+class J2KPictureAssetWriter : public AssetWriter
 {
 public:
 	virtual FrameInfo write (uint8_t const *, int) = 0;
@@ -88,11 +88,11 @@ public:
 
 protected:
 	template <class P, class Q>
-	friend void start (PictureAssetWriter *, std::shared_ptr<P>, Q *, uint8_t const *, int);
+	friend void start (J2KPictureAssetWriter *, std::shared_ptr<P>, Q *, uint8_t const *, int);
 
-	PictureAssetWriter (PictureAsset *, boost::filesystem::path, bool);
+	J2KPictureAssetWriter (J2KPictureAsset *, boost::filesystem::path, bool);
 
-	PictureAsset* _picture_asset = nullptr;
+	J2KPictureAsset* _picture_asset = nullptr;
 	bool _overwrite = false;
 };
 
diff --git a/src/j2k_picture_asset_writer_common.cc b/src/j2k_picture_asset_writer_common.cc
index 82866aac..d8f00f01 100644
--- a/src/j2k_picture_asset_writer_common.cc
+++ b/src/j2k_picture_asset_writer_common.cc
@@ -33,7 +33,7 @@
 
 
 /** @file  src/picture_asset_writer_common.cc
- *  @brief Common parts of PictureAssetWriter
+ *  @brief Common parts of J2KPictureAssetWriter
  */
 
 
@@ -63,7 +63,7 @@ struct ASDCPStateBase
 
 
 template <class P, class Q>
-void dcp::start (PictureAssetWriter* writer, shared_ptr<P> state, Q* asset, uint8_t const * data, int size)
+void dcp::start (J2KPictureAssetWriter* writer, shared_ptr<P> state, Q* asset, uint8_t const * data, int size)
 {
 	asset->set_file (writer->_file);
 
diff --git a/src/mono_j2k_picture_asset.cc b/src/mono_j2k_picture_asset.cc
index 7fd0f277..f718525d 100644
--- a/src/mono_j2k_picture_asset.cc
+++ b/src/mono_j2k_picture_asset.cc
@@ -33,7 +33,7 @@
 
 
 /** @file  src/mono_picture_asset.cc
- *  @brief MonoPictureAsset class
+ *  @brief MonoJ2KPictureAsset class
  */
 
 
@@ -63,8 +63,8 @@ using namespace boost::placeholders;
 using namespace dcp;
 
 
-MonoPictureAsset::MonoPictureAsset (boost::filesystem::path file)
-	: PictureAsset (file)
+MonoJ2KPictureAsset::MonoJ2KPictureAsset (boost::filesystem::path file)
+	: J2KPictureAsset (file)
 {
 	Kumu::FileReaderFactory factory;
 	ASDCP::JP2K::MXFReader reader(factory);
@@ -89,8 +89,8 @@ MonoPictureAsset::MonoPictureAsset (boost::filesystem::path file)
 }
 
 
-MonoPictureAsset::MonoPictureAsset (Fraction edit_rate, Standard standard)
-	: PictureAsset (edit_rate, standard)
+MonoJ2KPictureAsset::MonoJ2KPictureAsset (Fraction edit_rate, Standard standard)
+	: J2KPictureAsset (edit_rate, standard)
 {
 
 }
@@ -104,9 +104,9 @@ storing_note_handler (list<pair<NoteType, string>>& notes, NoteType t, string s)
 
 
 bool
-MonoPictureAsset::equals(shared_ptr<const Asset> other, EqualityOptions const& opt, NoteHandler note) const
+MonoJ2KPictureAsset::equals(shared_ptr<const Asset> other, EqualityOptions const& opt, NoteHandler note) const
 {
-	if (!dynamic_pointer_cast<const MonoPictureAsset>(other)) {
+	if (!dynamic_pointer_cast<const MonoJ2KPictureAsset>(other)) {
 		return false;
 	}
 
@@ -138,7 +138,7 @@ MonoPictureAsset::equals(shared_ptr<const Asset> other, EqualityOptions const& o
 		return false;
 	}
 
-	auto other_picture = dynamic_pointer_cast<const MonoPictureAsset> (other);
+	auto other_picture = dynamic_pointer_cast<const MonoJ2KPictureAsset> (other);
 	DCP_ASSERT (other_picture);
 
 	bool result = true;
@@ -186,23 +186,23 @@ MonoPictureAsset::equals(shared_ptr<const Asset> other, EqualityOptions const& o
 }
 
 
-shared_ptr<PictureAssetWriter>
-MonoPictureAsset::start_write(boost::filesystem::path file, Behaviour behaviour)
+shared_ptr<J2KPictureAssetWriter>
+MonoJ2KPictureAsset::start_write(boost::filesystem::path file, Behaviour behaviour)
 {
-	/* Can't use make_shared here as the MonoPictureAssetWriter constructor is private */
-	return shared_ptr<MonoPictureAssetWriter>(new MonoPictureAssetWriter(this, file, behaviour == Behaviour::OVERWRITE_EXISTING));
+	/* Can't use make_shared here as the MonoJ2KPictureAssetWriter constructor is private */
+	return shared_ptr<MonoJ2KPictureAssetWriter>(new MonoJ2KPictureAssetWriter(this, file, behaviour == Behaviour::OVERWRITE_EXISTING));
 }
 
-shared_ptr<MonoPictureAssetReader>
-MonoPictureAsset::start_read () const
+shared_ptr<MonoJ2KPictureAssetReader>
+MonoJ2KPictureAsset::start_read () const
 {
-	/* Can't use make_shared here as the MonoPictureAssetReader constructor is private */
-	return shared_ptr<MonoPictureAssetReader>(new MonoPictureAssetReader(this, key(), standard()));
+	/* Can't use make_shared here as the MonoJ2KPictureAssetReader constructor is private */
+	return shared_ptr<MonoJ2KPictureAssetReader>(new MonoJ2KPictureAssetReader(this, key(), standard()));
 
 }
 
 string
-MonoPictureAsset::cpl_node_name () const
+MonoJ2KPictureAsset::cpl_node_name () const
 {
 	return "MainPicture";
 }
diff --git a/src/mono_j2k_picture_asset.h b/src/mono_j2k_picture_asset.h
index 255ee0a0..0512d1f0 100644
--- a/src/mono_j2k_picture_asset.h
+++ b/src/mono_j2k_picture_asset.h
@@ -33,7 +33,7 @@
 
 
 /** @file  src/mono_picture_asset.cc
- *  @brief MonoPictureAsset class
+ *  @brief MonoJ2KPictureAsset class
  */
 
 
@@ -48,34 +48,34 @@
 namespace dcp {
 
 
-class MonoPictureAssetWriter;
+class MonoJ2KPictureAssetWriter;
 
 
-/** @class MonoPictureAsset
+/** @class MonoJ2KPictureAsset
  *  @brief A 2D (monoscopic) picture asset
  */
-class MonoPictureAsset : public PictureAsset
+class MonoJ2KPictureAsset : public J2KPictureAsset
 {
 public:
-	/** Create a MonoPictureAsset by reading a file.
+	/** Create a MonoJ2KPictureAsset by reading a file.
 	 *  @param file Asset file to read.
 	 */
-	explicit MonoPictureAsset (boost::filesystem::path file);
+	explicit MonoJ2KPictureAsset (boost::filesystem::path file);
 
-	/** Create a MonoPictureAsset with a given edit rate.
+	/** Create a MonoJ2KPictureAsset with a given edit rate.
 	 *  @param edit_rate Edit rate (i.e. frame rate) in frames per second.
 	 *  @param standard DCP standard (INTEROP or SMPTE).
 	 */
-	MonoPictureAsset(Fraction edit_rate, Standard standard);
+	MonoJ2KPictureAsset(Fraction edit_rate, Standard standard);
 
-	/** Start a progressive write to a MonoPictureAsset.
+	/** Start a progressive write to a MonoJ2KPictureAsset.
 	 *  @path file File to write to.
 	 *  @path behaviour OVERWRITE_EXISTING to overwrite and potentially add to an existing file
 	 *  (after a write previously failed), MAKE_NEW to create a new file.
 	 *  If in doubt, use MAKE_NEW here.
 	 */
-	std::shared_ptr<PictureAssetWriter> start_write(boost::filesystem::path file, Behaviour behaviour) override;
-	std::shared_ptr<MonoPictureAssetReader> start_read () const;
+	std::shared_ptr<J2KPictureAssetWriter> start_write(boost::filesystem::path file, Behaviour behaviour) override;
+	std::shared_ptr<MonoJ2KPictureAssetReader> start_read () const;
 
 	bool equals (
 		std::shared_ptr<const Asset> other,
diff --git a/src/mono_j2k_picture_asset_reader.h b/src/mono_j2k_picture_asset_reader.h
index 79c44d36..f2213681 100644
--- a/src/mono_j2k_picture_asset_reader.h
+++ b/src/mono_j2k_picture_asset_reader.h
@@ -33,7 +33,7 @@
 
 
 /** @file  src/mono_picture_asset_reader.h
- *  @brief MonoPictureAssetReader typedef
+ *  @brief MonoJ2KPictureAssetReader typedef
  */
 
 
@@ -48,7 +48,7 @@
 namespace dcp {
 
 
-typedef AssetReader<ASDCP::JP2K::MXFReader, MonoPictureFrame> MonoPictureAssetReader;
+typedef AssetReader<ASDCP::JP2K::MXFReader, MonoJ2KPictureFrame> MonoJ2KPictureAssetReader;
 
 
 }
diff --git a/src/mono_j2k_picture_asset_writer.cc b/src/mono_j2k_picture_asset_writer.cc
index 81fb88ca..035f0020 100644
--- a/src/mono_j2k_picture_asset_writer.cc
+++ b/src/mono_j2k_picture_asset_writer.cc
@@ -33,7 +33,7 @@
 
 
 /** @file  src/mono_picture_asset_writer.cc
- *  @brief MonoPictureAssetWriter class
+ *  @brief MonoJ2KPictureAssetWriter class
  */
 
 
@@ -57,7 +57,7 @@ using std::shared_ptr;
 using namespace dcp;
 
 
-struct MonoPictureAssetWriter::ASDCPState : public ASDCPStateBase
+struct MonoJ2KPictureAssetWriter::ASDCPState : public ASDCPStateBase
 {
 	ASDCP::JP2K::MXFWriter mxf_writer;
 };
@@ -66,15 +66,15 @@ struct MonoPictureAssetWriter::ASDCPState : public ASDCPStateBase
 /** @param a Asset to write to.  `a' must not be deleted while
  *  this writer class still exists, or bad things will happen.
  */
-MonoPictureAssetWriter::MonoPictureAssetWriter (PictureAsset* asset, boost::filesystem::path file, bool overwrite)
-	: PictureAssetWriter (asset, file, overwrite)
-	, _state (new MonoPictureAssetWriter::ASDCPState)
+MonoJ2KPictureAssetWriter::MonoJ2KPictureAssetWriter (J2KPictureAsset* asset, boost::filesystem::path file, bool overwrite)
+	: J2KPictureAssetWriter (asset, file, overwrite)
+	, _state (new MonoJ2KPictureAssetWriter::ASDCPState)
 {
 
 }
 
 
-MonoPictureAssetWriter::~MonoPictureAssetWriter()
+MonoJ2KPictureAssetWriter::~MonoJ2KPictureAssetWriter()
 {
 	try {
 		/* Last-resort finalization to close the file, at least */
@@ -86,7 +86,7 @@ MonoPictureAssetWriter::~MonoPictureAssetWriter()
 
 
 void
-MonoPictureAssetWriter::start (uint8_t const * data, int size)
+MonoJ2KPictureAssetWriter::start (uint8_t const * data, int size)
 {
 	dcp::start (this, _state, _picture_asset, data, size);
 	_picture_asset->set_frame_rate (_picture_asset->edit_rate());
@@ -94,7 +94,7 @@ MonoPictureAssetWriter::start (uint8_t const * data, int size)
 
 
 FrameInfo
-MonoPictureAssetWriter::write (uint8_t const * data, int size)
+MonoJ2KPictureAssetWriter::write (uint8_t const * data, int size)
 {
 	DCP_ASSERT (!_finalized);
 
@@ -122,7 +122,7 @@ MonoPictureAssetWriter::write (uint8_t const * data, int size)
 
 
 void
-MonoPictureAssetWriter::fake_write (int size)
+MonoJ2KPictureAssetWriter::fake_write (int size)
 {
 	DCP_ASSERT (_started);
 	DCP_ASSERT (!_finalized);
@@ -137,7 +137,7 @@ MonoPictureAssetWriter::fake_write (int size)
 
 
 bool
-MonoPictureAssetWriter::finalize ()
+MonoJ2KPictureAssetWriter::finalize ()
 {
 	if (_started) {
 		auto r = _state->mxf_writer.Finalize();
@@ -147,5 +147,5 @@ MonoPictureAssetWriter::finalize ()
 	}
 
 	_picture_asset->_intrinsic_duration = _frames_written;
-	return PictureAssetWriter::finalize ();
+	return J2KPictureAssetWriter::finalize ();
 }
diff --git a/src/mono_j2k_picture_asset_writer.h b/src/mono_j2k_picture_asset_writer.h
index 6e653f54..0a89775e 100644
--- a/src/mono_j2k_picture_asset_writer.h
+++ b/src/mono_j2k_picture_asset_writer.h
@@ -33,7 +33,7 @@
 
 
 /** @file  src/mono_picture_asset_writer.h
- *  @brief MonoPictureAssetWriter class
+ *  @brief MonoJ2KPictureAssetWriter class
  */
 
 
@@ -51,29 +51,29 @@
 namespace dcp {
 
 
-/** @class MonoPictureAssetWriter
- *  @brief A helper class for writing to MonoPictureAssets
+/** @class MonoJ2KPictureAssetWriter
+ *  @brief A helper class for writing to MonoJ2KPictureAssets
  *
- *  Objects of this class can only be created with MonoPictureAsset::start_write().
+ *  Objects of this class can only be created with MonoJ2KPictureAsset::start_write().
  *
- *  Frames can be written to the MonoPictureAsset by calling write() with a JPEG2000 image
+ *  Frames can be written to the MonoJ2KPictureAsset by calling write() with a JPEG2000 image
  *  (a verbatim .j2c file).  finalize() should be called after the last frame has been written,
  *  but if it is not, it will be called by the destructor (though in that case any error
  *  during finalization will be ignored).
  */
-class MonoPictureAssetWriter : public PictureAssetWriter
+class MonoJ2KPictureAssetWriter : public J2KPictureAssetWriter
 {
 public:
-	~MonoPictureAssetWriter();
+	~MonoJ2KPictureAssetWriter();
 
 	FrameInfo write (uint8_t const *, int) override;
 	void fake_write (int size) override;
 	bool finalize () override;
 
 private:
-	friend class MonoPictureAsset;
+	friend class MonoJ2KPictureAsset;
 
-	MonoPictureAssetWriter (PictureAsset* a, boost::filesystem::path file, bool);
+	MonoJ2KPictureAssetWriter (J2KPictureAsset* a, boost::filesystem::path file, bool);
 
 	void start (uint8_t const *, int);
 
diff --git a/src/mono_j2k_picture_frame.cc b/src/mono_j2k_picture_frame.cc
index dfdb05a7..69ba9a59 100644
--- a/src/mono_j2k_picture_frame.cc
+++ b/src/mono_j2k_picture_frame.cc
@@ -33,7 +33,7 @@
 
 
 /** @file  src/mono_picture_frame.cc
- *  @brief MonoPictureFrame class
+ *  @brief MonoJ2KPictureFrame class
  */
 
 
@@ -58,7 +58,7 @@ using boost::optional;
 using namespace dcp;
 
 
-MonoPictureFrame::MonoPictureFrame (boost::filesystem::path path)
+MonoJ2KPictureFrame::MonoJ2KPictureFrame (boost::filesystem::path path)
 {
 	auto const size = filesystem::file_size(path);
 	_buffer.reset(new ASDCP::JP2K::FrameBuffer(size));
@@ -81,7 +81,7 @@ MonoPictureFrame::MonoPictureFrame (boost::filesystem::path path)
  *  @param c Context for decryption, or 0.
  *  @param check_hmac true to check the HMAC and give an error if it is not as expected.
  */
-MonoPictureFrame::MonoPictureFrame (ASDCP::JP2K::MXFReader* reader, int n, shared_ptr<DecryptionContext> c, bool check_hmac)
+MonoJ2KPictureFrame::MonoJ2KPictureFrame (ASDCP::JP2K::MXFReader* reader, int n, shared_ptr<DecryptionContext> c, bool check_hmac)
 {
 	/* XXX: unfortunate guesswork on this buffer size */
 	_buffer = make_shared<ASDCP::JP2K::FrameBuffer>(4 * Kumu::Megabyte);
@@ -94,7 +94,7 @@ MonoPictureFrame::MonoPictureFrame (ASDCP::JP2K::MXFReader* reader, int n, share
 }
 
 
-MonoPictureFrame::MonoPictureFrame (uint8_t const * data, int size)
+MonoJ2KPictureFrame::MonoJ2KPictureFrame (uint8_t const * data, int size)
 {
 	_buffer = make_shared<ASDCP::JP2K::FrameBuffer>(size);
 	_buffer->Size (size);
@@ -103,28 +103,28 @@ MonoPictureFrame::MonoPictureFrame (uint8_t const * data, int size)
 
 
 uint8_t const *
-MonoPictureFrame::data () const
+MonoJ2KPictureFrame::data () const
 {
 	return _buffer->RoData ();
 }
 
 
 uint8_t *
-MonoPictureFrame::data ()
+MonoJ2KPictureFrame::data ()
 {
 	return _buffer->Data ();
 }
 
 
 int
-MonoPictureFrame::size () const
+MonoJ2KPictureFrame::size () const
 {
 	return _buffer->Size ();
 }
 
 
 shared_ptr<OpenJPEGImage>
-MonoPictureFrame::xyz_image (int reduce) const
+MonoJ2KPictureFrame::xyz_image (int reduce) const
 {
 	return decompress_j2k (const_cast<uint8_t*>(_buffer->RoData()), _buffer->Size(), reduce);
 }
diff --git a/src/mono_j2k_picture_frame.h b/src/mono_j2k_picture_frame.h
index 43575864..4459a3ed 100644
--- a/src/mono_j2k_picture_frame.h
+++ b/src/mono_j2k_picture_frame.h
@@ -33,7 +33,7 @@
 
 
 /** @file  src/mono_picture_frame.h
- *  @brief MonoPictureFrame class
+ *  @brief MonoJ2KPictureFrame class
  */
 
 
@@ -64,20 +64,20 @@ namespace dcp {
 class OpenJPEGImage;
 
 
-/** @class MonoPictureFrame
+/** @class MonoJ2KPictureFrame
  *  @brief A single frame of a 2D (monoscopic) picture asset
  */
-class MonoPictureFrame : public Data
+class MonoJ2KPictureFrame : public Data
 {
 public:
 	/** Make a picture frame from a JPEG2000 file.
 	 *  @param path Path to JPEG2000 file.
 	 */
-	explicit MonoPictureFrame (boost::filesystem::path path);
-	MonoPictureFrame (uint8_t const * data, int size);
+	explicit MonoJ2KPictureFrame (boost::filesystem::path path);
+	MonoJ2KPictureFrame (uint8_t const * data, int size);
 
-	MonoPictureFrame (MonoPictureFrame const&) = delete;
-	MonoPictureFrame& operator= (MonoPictureFrame const&) = delete;
+	MonoJ2KPictureFrame (MonoJ2KPictureFrame const&) = delete;
+	MonoJ2KPictureFrame& operator= (MonoJ2KPictureFrame const&) = delete;
 
 	/** @param reduce a factor by which to reduce the resolution
 	 *  of the image, expressed as a power of two (pass 0 for no
@@ -95,12 +95,12 @@ public:
 	int size () const override;
 
 private:
-	/* XXX: this is a bit of a shame, but I tried friend MonoPictureAssetReader and it's
+	/* XXX: this is a bit of a shame, but I tried friend MonoJ2KPictureAssetReader and it's
 	   rejected by some (seemingly older) GCCs.
 	*/
-	friend class AssetReader<ASDCP::JP2K::MXFReader, MonoPictureFrame>;
+	friend class AssetReader<ASDCP::JP2K::MXFReader, MonoJ2KPictureFrame>;
 
-	MonoPictureFrame (ASDCP::JP2K::MXFReader* reader, int n, std::shared_ptr<DecryptionContext>, bool check_hmac);
+	MonoJ2KPictureFrame (ASDCP::JP2K::MXFReader* reader, int n, std::shared_ptr<DecryptionContext>, bool check_hmac);
 
 	std::shared_ptr<ASDCP::JP2K::FrameBuffer> _buffer;
 };
diff --git a/src/mxf.h b/src/mxf.h
index 19d4a956..68ae561f 100644
--- a/src/mxf.h
+++ b/src/mxf.h
@@ -64,7 +64,7 @@ namespace dcp
 
 
 class MXFMetadata;
-class PictureAssetWriter;
+class J2KPictureAssetWriter;
 
 
 /** @class MXF
@@ -136,7 +136,7 @@ public:
 
 protected:
 	template <class P, class Q>
-	friend void start (PictureAssetWriter* writer, std::shared_ptr<P> state, Q* mxf, uint8_t const * data, int size);
+	friend void start (J2KPictureAssetWriter* writer, std::shared_ptr<P> state, Q* mxf, uint8_t const * data, int size);
 
 	MXF ();
 
diff --git a/src/reel_mono_picture_asset.cc b/src/reel_mono_picture_asset.cc
index 25f76d2f..04c16d25 100644
--- a/src/reel_mono_picture_asset.cc
+++ b/src/reel_mono_picture_asset.cc
@@ -47,7 +47,7 @@ using std::shared_ptr;
 using namespace dcp;
 
 
-ReelMonoPictureAsset::ReelMonoPictureAsset (std::shared_ptr<MonoPictureAsset> asset, int64_t entry_point)
+ReelMonoPictureAsset::ReelMonoPictureAsset (std::shared_ptr<MonoJ2KPictureAsset> asset, int64_t entry_point)
 	: ReelPictureAsset (asset, entry_point)
 {
 
diff --git a/src/reel_mono_picture_asset.h b/src/reel_mono_picture_asset.h
index b03b691d..54429ad4 100644
--- a/src/reel_mono_picture_asset.h
+++ b/src/reel_mono_picture_asset.h
@@ -48,7 +48,7 @@
 namespace dcp {
 
 
-class MonoPictureAsset;
+class MonoJ2KPictureAsset;
 
 
 /** @class ReelMonoPictureAsset
@@ -57,17 +57,17 @@ class MonoPictureAsset;
 class ReelMonoPictureAsset : public ReelPictureAsset
 {
 public:
-	ReelMonoPictureAsset (std::shared_ptr<MonoPictureAsset> asset, int64_t entry_point);
+	ReelMonoPictureAsset (std::shared_ptr<MonoJ2KPictureAsset> asset, int64_t entry_point);
 	explicit ReelMonoPictureAsset (std::shared_ptr<const cxml::Node>);
 
-	/** @return the MonoPictureAsset that this object refers to */
-	std::shared_ptr<const MonoPictureAsset> mono_asset () const {
-		return asset_of_type<const MonoPictureAsset>();
+	/** @return the MonoJ2KPictureAsset that this object refers to */
+	std::shared_ptr<const MonoJ2KPictureAsset> mono_asset () const {
+		return asset_of_type<const MonoJ2KPictureAsset>();
 	}
 
-	/** @return the MonoPictureAsset that this object refers to */
-	std::shared_ptr<MonoPictureAsset> mono_asset () {
-		return asset_of_type<MonoPictureAsset>();
+	/** @return the MonoJ2KPictureAsset that this object refers to */
+	std::shared_ptr<MonoJ2KPictureAsset> mono_asset () {
+		return asset_of_type<MonoJ2KPictureAsset>();
 	}
 
 private:
diff --git a/src/reel_picture_asset.cc b/src/reel_picture_asset.cc
index e2e13067..ca22b6fc 100644
--- a/src/reel_picture_asset.cc
+++ b/src/reel_picture_asset.cc
@@ -59,7 +59,7 @@ using boost::optional;
 using namespace dcp;
 
 
-ReelPictureAsset::ReelPictureAsset (shared_ptr<PictureAsset> asset, int64_t entry_point)
+ReelPictureAsset::ReelPictureAsset (shared_ptr<J2KPictureAsset> asset, int64_t entry_point)
 	: ReelFileAsset (asset, asset->key_id(), asset->id(), asset->edit_rate(), asset->intrinsic_duration(), entry_point)
 	, _frame_rate (asset->frame_rate ())
 	, _screen_aspect_ratio (asset->screen_aspect_ratio ())
diff --git a/src/reel_picture_asset.h b/src/reel_picture_asset.h
index 0c167045..6185f3dd 100644
--- a/src/reel_picture_asset.h
+++ b/src/reel_picture_asset.h
@@ -54,17 +54,17 @@ namespace dcp {
 class ReelPictureAsset : public ReelFileAsset
 {
 public:
-	ReelPictureAsset (std::shared_ptr<PictureAsset> asset, int64_t entry_point);
+	ReelPictureAsset (std::shared_ptr<J2KPictureAsset> asset, int64_t entry_point);
 	explicit ReelPictureAsset (std::shared_ptr<const cxml::Node>);
 
-	/** @return the PictureAsset that this object refers to */
-	std::shared_ptr<const PictureAsset> asset () const {
-		return asset_of_type<const PictureAsset>();
+	/** @return the J2KPictureAsset that this object refers to */
+	std::shared_ptr<const J2KPictureAsset> asset () const {
+		return asset_of_type<const J2KPictureAsset>();
 	}
 
-	/** @return the PictureAsset that this object refers to */
-	std::shared_ptr<PictureAsset> asset () {
-		return asset_of_type<PictureAsset>();
+	/** @return the J2KPictureAsset that this object refers to */
+	std::shared_ptr<J2KPictureAsset> asset () {
+		return asset_of_type<J2KPictureAsset>();
 	}
 
 	virtual xmlpp::Element* write_to_cpl(xmlpp::Element* node, Standard standard) const override;
diff --git a/src/reel_stereo_picture_asset.cc b/src/reel_stereo_picture_asset.cc
index ec3f7786..13bfec8e 100644
--- a/src/reel_stereo_picture_asset.cc
+++ b/src/reel_stereo_picture_asset.cc
@@ -49,7 +49,7 @@ using std::shared_ptr;
 using namespace dcp;
 
 
-ReelStereoPictureAsset::ReelStereoPictureAsset (std::shared_ptr<StereoPictureAsset> mxf, int64_t entry_point)
+ReelStereoPictureAsset::ReelStereoPictureAsset (std::shared_ptr<StereoJ2KPictureAsset> mxf, int64_t entry_point)
 	: ReelPictureAsset (mxf, entry_point)
 {
 
diff --git a/src/reel_stereo_picture_asset.h b/src/reel_stereo_picture_asset.h
index 7a836164..09170ddd 100644
--- a/src/reel_stereo_picture_asset.h
+++ b/src/reel_stereo_picture_asset.h
@@ -48,7 +48,7 @@
 namespace dcp {
 
 
-class StereoPictureAsset;
+class StereoJ2KPictureAsset;
 
 
 /** @class ReelStereoPictureAsset
@@ -57,17 +57,17 @@ class StereoPictureAsset;
 class ReelStereoPictureAsset : public ReelPictureAsset
 {
 public:
-	ReelStereoPictureAsset (std::shared_ptr<StereoPictureAsset> content, int64_t entry_point);
+	ReelStereoPictureAsset (std::shared_ptr<StereoJ2KPictureAsset> content, int64_t entry_point);
 	explicit ReelStereoPictureAsset (std::shared_ptr<const cxml::Node>);
 
-	/** @return the StereoPictureAsset that this object refers to */
-	std::shared_ptr<const StereoPictureAsset> stereo_asset () const {
-		return asset_of_type<const StereoPictureAsset>();
+	/** @return the StereoJ2KPictureAsset that this object refers to */
+	std::shared_ptr<const StereoJ2KPictureAsset> stereo_asset () const {
+		return asset_of_type<const StereoJ2KPictureAsset>();
 	}
 
-	/** @return the StereoPictureAsset that this object refers to */
-	std::shared_ptr<StereoPictureAsset> stereo_asset () {
-		return asset_of_type<StereoPictureAsset>();
+	/** @return the StereoJ2KPictureAsset that this object refers to */
+	std::shared_ptr<StereoJ2KPictureAsset> stereo_asset () {
+		return asset_of_type<StereoJ2KPictureAsset>();
 	}
 
 private:
diff --git a/src/stereo_j2k_picture_asset.cc b/src/stereo_j2k_picture_asset.cc
index ffce0f51..6a5e7d79 100644
--- a/src/stereo_j2k_picture_asset.cc
+++ b/src/stereo_j2k_picture_asset.cc
@@ -33,7 +33,7 @@
 
 
 /** @file  src/stereo_picture_asset.cc
- *  @brief StereoPictureAsset class
+ *  @brief StereoJ2KPictureAsset class
  */
 
 
@@ -56,8 +56,8 @@ using std::dynamic_pointer_cast;
 using namespace dcp;
 
 
-StereoPictureAsset::StereoPictureAsset (boost::filesystem::path file)
-	: PictureAsset (file)
+StereoJ2KPictureAsset::StereoJ2KPictureAsset (boost::filesystem::path file)
+	: J2KPictureAsset (file)
 {
 	Kumu::FileReaderFactory factory;
 	ASDCP::JP2K::MXFSReader reader(factory);
@@ -82,29 +82,29 @@ StereoPictureAsset::StereoPictureAsset (boost::filesystem::path file)
 }
 
 
-StereoPictureAsset::StereoPictureAsset (Fraction edit_rate, Standard standard)
-	: PictureAsset (edit_rate, standard)
+StereoJ2KPictureAsset::StereoJ2KPictureAsset (Fraction edit_rate, Standard standard)
+	: J2KPictureAsset (edit_rate, standard)
 {
 
 }
 
 
-shared_ptr<PictureAssetWriter>
-StereoPictureAsset::start_write(boost::filesystem::path file, Behaviour behaviour)
+shared_ptr<J2KPictureAssetWriter>
+StereoJ2KPictureAsset::start_write(boost::filesystem::path file, Behaviour behaviour)
 {
-	return shared_ptr<StereoPictureAssetWriter>(new StereoPictureAssetWriter(this, file, behaviour == Behaviour::OVERWRITE_EXISTING));
+	return shared_ptr<StereoJ2KPictureAssetWriter>(new StereoJ2KPictureAssetWriter(this, file, behaviour == Behaviour::OVERWRITE_EXISTING));
 }
 
 
-shared_ptr<StereoPictureAssetReader>
-StereoPictureAsset::start_read () const
+shared_ptr<StereoJ2KPictureAssetReader>
+StereoJ2KPictureAsset::start_read () const
 {
-	return shared_ptr<StereoPictureAssetReader> (new StereoPictureAssetReader(this, key(), standard()));
+	return shared_ptr<StereoJ2KPictureAssetReader> (new StereoJ2KPictureAssetReader(this, key(), standard()));
 }
 
 
 bool
-StereoPictureAsset::equals(shared_ptr<const Asset> other, EqualityOptions const& opt, NoteHandler note) const
+StereoJ2KPictureAsset::equals(shared_ptr<const Asset> other, EqualityOptions const& opt, NoteHandler note) const
 {
 	Kumu::FileReaderFactory factory;
 	ASDCP::JP2K::MXFSReader reader_A(factory);
@@ -134,7 +134,7 @@ StereoPictureAsset::equals(shared_ptr<const Asset> other, EqualityOptions const&
 		return false;
 	}
 
-	auto other_picture = dynamic_pointer_cast<const StereoPictureAsset> (other);
+	auto other_picture = dynamic_pointer_cast<const StereoJ2KPictureAsset> (other);
 	DCP_ASSERT (other_picture);
 
 	auto reader = start_read ();
@@ -143,8 +143,8 @@ StereoPictureAsset::equals(shared_ptr<const Asset> other, EqualityOptions const&
 	bool result = true;
 
 	for (int i = 0; i < _intrinsic_duration; ++i) {
-		shared_ptr<const StereoPictureFrame> frame_A;
-		shared_ptr<const StereoPictureFrame> frame_B;
+		shared_ptr<const StereoJ2KPictureFrame> frame_A;
+		shared_ptr<const StereoJ2KPictureFrame> frame_B;
 		try {
 			frame_A = reader->get_frame (i);
 			frame_B = other_reader->get_frame (i);
diff --git a/src/stereo_j2k_picture_asset.h b/src/stereo_j2k_picture_asset.h
index 42d17542..f4c5d9e0 100644
--- a/src/stereo_j2k_picture_asset.h
+++ b/src/stereo_j2k_picture_asset.h
@@ -33,7 +33,7 @@
 
 
 /** @file  src/stereo_picture_asset.h
- *  @brief StereoPictureAsset class
+ *  @brief StereoJ2KPictureAsset class
  */
 
 
@@ -48,18 +48,18 @@
 namespace dcp {
 
 
-/** @class StereoPictureAsset
+/** @class StereoJ2KPictureAsset
  *  @brief A 3D (stereoscopic) picture asset
  */
-class StereoPictureAsset : public PictureAsset
+class StereoJ2KPictureAsset : public J2KPictureAsset
 {
 public:
-	explicit StereoPictureAsset (boost::filesystem::path file);
-	explicit StereoPictureAsset (Fraction edit_rate, Standard standard);
+	explicit StereoJ2KPictureAsset (boost::filesystem::path file);
+	explicit StereoJ2KPictureAsset (Fraction edit_rate, Standard standard);
 
-	/** Start a progressive write to a StereoPictureAsset */
-	std::shared_ptr<PictureAssetWriter> start_write(boost::filesystem::path file, Behaviour behaviour) override;
-	std::shared_ptr<StereoPictureAssetReader> start_read () const;
+	/** Start a progressive write to a StereoJ2KPictureAsset */
+	std::shared_ptr<J2KPictureAssetWriter> start_write(boost::filesystem::path file, Behaviour behaviour) override;
+	std::shared_ptr<StereoJ2KPictureAssetReader> start_read () const;
 
 	bool equals (
 		std::shared_ptr<const Asset> other,
diff --git a/src/stereo_j2k_picture_asset_reader.h b/src/stereo_j2k_picture_asset_reader.h
index 1ed769ac..5d1968e0 100644
--- a/src/stereo_j2k_picture_asset_reader.h
+++ b/src/stereo_j2k_picture_asset_reader.h
@@ -33,7 +33,7 @@
 
 
 /** @file  src/stereo_picture_asset_reader.h
- *  @brief StereoPictureAssetReader typedef
+ *  @brief StereoJ2KPictureAssetReader typedef
  */
 
 
@@ -48,7 +48,7 @@
 namespace dcp {
 
 
-typedef AssetReader<ASDCP::JP2K::MXFSReader, StereoPictureFrame> StereoPictureAssetReader;
+typedef AssetReader<ASDCP::JP2K::MXFSReader, StereoJ2KPictureFrame> StereoJ2KPictureAssetReader;
 
 
 }
diff --git a/src/stereo_j2k_picture_asset_writer.cc b/src/stereo_j2k_picture_asset_writer.cc
index 4f8fb656..5a881f79 100644
--- a/src/stereo_j2k_picture_asset_writer.cc
+++ b/src/stereo_j2k_picture_asset_writer.cc
@@ -33,7 +33,7 @@
 
 
 /** @file  src/stereo_picture_asset_writer.cc
- *  @brief StereoPictureAssetWriter class
+ *  @brief StereoJ2KPictureAssetWriter class
  */
 
 
@@ -54,21 +54,21 @@ using std::shared_ptr;
 using namespace dcp;
 
 
-struct StereoPictureAssetWriter::ASDCPState : public ASDCPStateBase
+struct StereoJ2KPictureAssetWriter::ASDCPState : public ASDCPStateBase
 {
 	ASDCP::JP2K::MXFSWriter mxf_writer;
 };
 
 
-StereoPictureAssetWriter::StereoPictureAssetWriter (PictureAsset* mxf, boost::filesystem::path file, bool overwrite)
-	: PictureAssetWriter (mxf, file, overwrite)
-	, _state (new StereoPictureAssetWriter::ASDCPState)
+StereoJ2KPictureAssetWriter::StereoJ2KPictureAssetWriter (J2KPictureAsset* mxf, boost::filesystem::path file, bool overwrite)
+	: J2KPictureAssetWriter (mxf, file, overwrite)
+	, _state (new StereoJ2KPictureAssetWriter::ASDCPState)
 {
 
 }
 
 
-StereoPictureAssetWriter::~StereoPictureAssetWriter()
+StereoJ2KPictureAssetWriter::~StereoJ2KPictureAssetWriter()
 {
 	try {
 		/* Last-resort finalization to close the file, at least */
@@ -80,7 +80,7 @@ StereoPictureAssetWriter::~StereoPictureAssetWriter()
 
 
 void
-StereoPictureAssetWriter::start (uint8_t const * data, int size)
+StereoJ2KPictureAssetWriter::start (uint8_t const * data, int size)
 {
 	dcp::start (this, _state, _picture_asset, data, size);
 	_picture_asset->set_frame_rate (Fraction (_picture_asset->edit_rate().numerator * 2, _picture_asset->edit_rate().denominator));
@@ -88,7 +88,7 @@ StereoPictureAssetWriter::start (uint8_t const * data, int size)
 
 
 FrameInfo
-StereoPictureAssetWriter::write (uint8_t const * data, int size)
+StereoJ2KPictureAssetWriter::write (uint8_t const * data, int size)
 {
 	DCP_ASSERT (!_finalized);
 
@@ -128,7 +128,7 @@ StereoPictureAssetWriter::write (uint8_t const * data, int size)
 
 
 void
-StereoPictureAssetWriter::fake_write (int size)
+StereoJ2KPictureAssetWriter::fake_write (int size)
 {
 	DCP_ASSERT (_started);
 	DCP_ASSERT (!_finalized);
@@ -146,7 +146,7 @@ StereoPictureAssetWriter::fake_write (int size)
 
 
 bool
-StereoPictureAssetWriter::finalize ()
+StereoJ2KPictureAssetWriter::finalize ()
 {
 	if (_started) {
 		auto r = _state->mxf_writer.Finalize();
@@ -156,5 +156,5 @@ StereoPictureAssetWriter::finalize ()
 	}
 
 	_picture_asset->_intrinsic_duration = _frames_written;
-	return PictureAssetWriter::finalize ();
+	return J2KPictureAssetWriter::finalize ();
 }
diff --git a/src/stereo_j2k_picture_asset_writer.h b/src/stereo_j2k_picture_asset_writer.h
index 606f789a..8d09440f 100644
--- a/src/stereo_j2k_picture_asset_writer.h
+++ b/src/stereo_j2k_picture_asset_writer.h
@@ -33,7 +33,7 @@
 
 
 /** @file  src/stereo_picture_asset_writer.h
- *  @brief StereoPictureAssetWriter class
+ *  @brief StereoJ2KPictureAssetWriter class
  */
 
 
@@ -46,20 +46,20 @@
 namespace dcp {
 
 
-/** @class StereoPictureAssetWriter
- *  @brief A helper class for writing to StereoPictureAssets.
+/** @class StereoJ2KPictureAssetWriter
+ *  @brief A helper class for writing to StereoJ2KPictureAssets.
  *
- *  Objects of this class can only be created with StereoPictureAsset::start_write().
+ *  Objects of this class can only be created with StereoJ2KPictureAsset::start_write().
  *
- *  Frames can be written to the StereoPictureAsset by calling write() with a JPEG2000 image
+ *  Frames can be written to the StereoJ2KPictureAsset by calling write() with a JPEG2000 image
  *  (a verbatim .j2c file).  finalize() should be called after the last frame has been written,
  *  but if it is not, it will be called by the destructor (though in that case any error
  *  during finalization will be ignored).
  */
-class StereoPictureAssetWriter : public PictureAssetWriter
+class StereoJ2KPictureAssetWriter : public J2KPictureAssetWriter
 {
 public:
-	~StereoPictureAssetWriter();
+	~StereoJ2KPictureAssetWriter();
 
 	/** Write a frame for one eye.  Frames must be written left, then right, then left etc.
 	 *  @param data JPEG2000 data.
@@ -70,9 +70,9 @@ public:
 	bool finalize () override;
 
 private:
-	friend class StereoPictureAsset;
+	friend class StereoJ2KPictureAsset;
 
-	StereoPictureAssetWriter (PictureAsset *, boost::filesystem::path file, bool);
+	StereoJ2KPictureAssetWriter (J2KPictureAsset *, boost::filesystem::path file, bool);
 	void start (uint8_t const *, int);
 
 	/* do this with an opaque pointer so we don't have to include
diff --git a/src/stereo_j2k_picture_frame.cc b/src/stereo_j2k_picture_frame.cc
index fc98a673..9ef91c5c 100644
--- a/src/stereo_j2k_picture_frame.cc
+++ b/src/stereo_j2k_picture_frame.cc
@@ -33,7 +33,7 @@
 
 
 /** @file  src/stereo_picture_frame.cc
- *  @brief StereoPictureFrame class
+ *  @brief StereoJ2KPictureFrame class
  */
 
 
@@ -55,7 +55,7 @@ using std::make_shared;
 using namespace dcp;
 
 
-StereoPictureFrame::Part::Part (shared_ptr<ASDCP::JP2K::SFrameBuffer> buffer, Eye eye)
+StereoJ2KPictureFrame::Part::Part (shared_ptr<ASDCP::JP2K::SFrameBuffer> buffer, Eye eye)
 	: _buffer (buffer)
 	, _eye (eye)
 {
@@ -64,28 +64,28 @@ StereoPictureFrame::Part::Part (shared_ptr<ASDCP::JP2K::SFrameBuffer> buffer, Ey
 
 
 ASDCP::JP2K::FrameBuffer &
-StereoPictureFrame::Part::mono () const
+StereoJ2KPictureFrame::Part::mono () const
 {
 	return _eye == Eye::LEFT ? _buffer->Left : _buffer->Right;
 }
 
 
 uint8_t const *
-StereoPictureFrame::Part::data () const
+StereoJ2KPictureFrame::Part::data () const
 {
 	return mono().RoData();
 }
 
 
 uint8_t *
-StereoPictureFrame::Part::data ()
+StereoJ2KPictureFrame::Part::data ()
 {
 	return mono().Data();
 }
 
 
 int
-StereoPictureFrame::Part::size () const
+StereoJ2KPictureFrame::Part::size () const
 {
 	return mono().Size();
 }
@@ -96,7 +96,7 @@ StereoPictureFrame::Part::size () const
  *  @param n Frame within the asset, not taking EntryPoint into account.
  *  @param check_hmac true to check the HMAC and give an error if it is not as expected.
  */
-StereoPictureFrame::StereoPictureFrame (ASDCP::JP2K::MXFSReader* reader, int n, shared_ptr<DecryptionContext> c, bool check_hmac)
+StereoJ2KPictureFrame::StereoJ2KPictureFrame (ASDCP::JP2K::MXFSReader* reader, int n, shared_ptr<DecryptionContext> c, bool check_hmac)
 {
 	/* XXX: unfortunate guesswork on this buffer size */
 	_buffer = make_shared<ASDCP::JP2K::SFrameBuffer>(4 * Kumu::Megabyte);
@@ -107,7 +107,7 @@ StereoPictureFrame::StereoPictureFrame (ASDCP::JP2K::MXFSReader* reader, int n,
 }
 
 
-StereoPictureFrame::StereoPictureFrame ()
+StereoJ2KPictureFrame::StereoJ2KPictureFrame ()
 {
 	_buffer = make_shared<ASDCP::JP2K::SFrameBuffer>(4 * Kumu::Megabyte);
 }
@@ -119,7 +119,7 @@ StereoPictureFrame::StereoPictureFrame ()
  *  reduction).
  */
 shared_ptr<OpenJPEGImage>
-StereoPictureFrame::xyz_image (Eye eye, int reduce) const
+StereoJ2KPictureFrame::xyz_image (Eye eye, int reduce) const
 {
 	switch (eye) {
 	case Eye::LEFT:
@@ -132,15 +132,15 @@ StereoPictureFrame::xyz_image (Eye eye, int reduce) const
 }
 
 
-shared_ptr<StereoPictureFrame::Part>
-StereoPictureFrame::right () const
+shared_ptr<StereoJ2KPictureFrame::Part>
+StereoJ2KPictureFrame::right () const
 {
 	return make_shared<Part>(_buffer, Eye::RIGHT);
 }
 
 
-shared_ptr<StereoPictureFrame::Part>
-StereoPictureFrame::left () const
+shared_ptr<StereoJ2KPictureFrame::Part>
+StereoJ2KPictureFrame::left () const
 {
 	return make_shared<Part>(_buffer, Eye::LEFT);
 }
diff --git a/src/stereo_j2k_picture_frame.h b/src/stereo_j2k_picture_frame.h
index b0c0f0c8..0c171c66 100644
--- a/src/stereo_j2k_picture_frame.h
+++ b/src/stereo_j2k_picture_frame.h
@@ -33,7 +33,7 @@
 
 
 /** @file  src/stereo_picture_frame.h
- *  @brief StereoPictureFrame class
+ *  @brief StereoJ2KPictureFrame class
  */
 
 
@@ -61,19 +61,19 @@ namespace dcp {
 
 
 class OpenJPEGImage;
-class StereoPictureFrame;
+class StereoJ2KPictureFrame;
 
 
-/** @class StereoPictureFrame
+/** @class StereoJ2KPictureFrame
  *  @brief A single frame of a 3D (stereoscopic) picture asset
  */
-class StereoPictureFrame
+class StereoJ2KPictureFrame
 {
 public:
-	StereoPictureFrame ();
+	StereoJ2KPictureFrame ();
 
-	StereoPictureFrame (StereoPictureFrame const &) = delete;
-	StereoPictureFrame& operator= (StereoPictureFrame const &) = delete;
+	StereoJ2KPictureFrame (StereoJ2KPictureFrame const &) = delete;
+	StereoJ2KPictureFrame& operator= (StereoJ2KPictureFrame const &) = delete;
 
 	std::shared_ptr<OpenJPEGImage> xyz_image (Eye eye, int reduce = 0) const;
 
@@ -87,7 +87,7 @@ public:
 		int size () const override;
 
 	private:
-		friend class StereoPictureFrame;
+		friend class StereoJ2KPictureFrame;
 
 		ASDCP::JP2K::FrameBuffer& mono () const;
 
@@ -99,12 +99,12 @@ public:
 	std::shared_ptr<Part> right () const;
 
 private:
-	/* XXX: this is a bit of a shame, but I tried friend StereoPictureAssetReader and it's
+	/* XXX: this is a bit of a shame, but I tried friend StereoJ2KPictureAssetReader and it's
 	   rejected by some (seemingly older) GCCs.
 	*/
-	friend class AssetReader<ASDCP::JP2K::MXFSReader, StereoPictureFrame>;
+	friend class AssetReader<ASDCP::JP2K::MXFSReader, StereoJ2KPictureFrame>;
 
-	StereoPictureFrame (ASDCP::JP2K::MXFSReader* reader, int n, std::shared_ptr<DecryptionContext>, bool check_hmac);
+	StereoJ2KPictureFrame (ASDCP::JP2K::MXFSReader* reader, int n, std::shared_ptr<DecryptionContext>, bool check_hmac);
 
 	std::shared_ptr<ASDCP::JP2K::SFrameBuffer> _buffer;
 };
diff --git a/src/verify.cc b/src/verify.cc
index 9103546d..56e6b5b8 100644
--- a/src/verify.cc
+++ b/src/verify.cc
@@ -527,7 +527,7 @@ verify_picture_asset(
 	int64_t start_frame
 	)
 {
-	auto asset = dynamic_pointer_cast<PictureAsset>(reel_file_asset->asset_ref().asset());
+	auto asset = dynamic_pointer_cast<J2KPictureAsset>(reel_file_asset->asset_ref().asset());
 	auto const duration = asset->intrinsic_duration ();
 
 	auto check_and_add = [&context](vector<VerificationNote> const& j2k_notes) {
@@ -559,7 +559,7 @@ verify_picture_asset(
 		}
 	};
 
-	if (auto mono_asset = dynamic_pointer_cast<MonoPictureAsset>(reel_file_asset->asset_ref().asset())) {
+	if (auto mono_asset = dynamic_pointer_cast<MonoJ2KPictureAsset>(reel_file_asset->asset_ref().asset())) {
 		auto reader = mono_asset->start_read ();
 		for (int64_t i = 0; i < duration; ++i) {
 			auto frame = reader->get_frame (i);
@@ -571,7 +571,7 @@ verify_picture_asset(
 			}
 			context.progress(float(i) / duration);
 		}
-	} else if (auto stereo_asset = dynamic_pointer_cast<StereoPictureAsset>(asset)) {
+	} else if (auto stereo_asset = dynamic_pointer_cast<StereoJ2KPictureAsset>(asset)) {
 		auto reader = stereo_asset->start_read ();
 		for (int64_t i = 0; i < duration; ++i) {
 			auto frame = reader->get_frame (i);
@@ -659,7 +659,7 @@ verify_main_picture_asset(Context& context, shared_ptr<const ReelPictureAsset> r
 		}
 
 		/* Only 2D allowed for 4K */
-		if (dynamic_pointer_cast<const StereoPictureAsset>(asset)) {
+		if (dynamic_pointer_cast<const StereoJ2KPictureAsset>(asset)) {
 			context.bv21_error(
 				VerificationNote::Code::INVALID_PICTURE_ASSET_RESOLUTION_FOR_3D,
 				String::compose("%1/%2", asset->edit_rate().numerator, asset->edit_rate().denominator),