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

11 files changed, 51 insertions, 51 deletions

diff --git a/test/cpl_sar_test.cc b/test/cpl_sar_test.cc
index 39d9c483..ab1ef182 100644
--- a/test/cpl_sar_test.cc
+++ b/test/cpl_sar_test.cc
@@ -68,7 +68,7 @@ check (shared_ptr<dcp::ReelMonoPictureAsset> pa, dcp::Fraction frac, string sar)
 BOOST_AUTO_TEST_CASE (cpl_sar)
 {
 	auto pa = make_shared<dcp::ReelMonoPictureAsset>(
-		make_shared<dcp::MonoPictureAsset>("test/ref/DCP/dcp_test1/video.mxf"), 0
+		make_shared<dcp::MonoJ2KPictureAsset>("test/ref/DCP/dcp_test1/video.mxf"), 0
 		);
 
 	/* Easy ones */
diff --git a/test/dcp_test.cc b/test/dcp_test.cc
index feb7f51d..dbbf1e45 100644
--- a/test/dcp_test.cc
+++ b/test/dcp_test.cc
@@ -105,9 +105,9 @@ BOOST_AUTO_TEST_CASE (dcp_test2)
 	cpl->set_issue_date ("2012-07-17T04:45:18+00:00");
 	cpl->set_annotation_text ("A Test DCP");
 
-	auto mp = make_shared<dcp::StereoPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
+	auto mp = make_shared<dcp::StereoJ2KPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
 	mp->set_metadata (mxf_meta);
-	auto picture_writer = mp->start_write("build/test/DCP/dcp_test2/video.mxf", dcp::PictureAsset::Behaviour::MAKE_NEW);
+	auto picture_writer = mp->start_write("build/test/DCP/dcp_test2/video.mxf", dcp::J2KPictureAsset::Behaviour::MAKE_NEW);
 	dcp::ArrayData j2c ("test/data/flat_red.j2c");
 	for (int i = 0; i < 24; ++i) {
 		/* Left */
@@ -206,7 +206,7 @@ test_rewriting_sound(string name, bool modify)
 	BOOST_REQUIRE (A_picture->mono_asset());
 	BOOST_REQUIRE (A_picture->mono_asset()->file());
 	copy_file (A_picture->mono_asset()->file().get(), path("build") / "test" / name / picture);
-	reel->add(make_shared<dcp::ReelMonoPictureAsset>(make_shared<dcp::MonoPictureAsset>(path("build") / "test" / name / picture), 0));
+	reel->add(make_shared<dcp::ReelMonoPictureAsset>(make_shared<dcp::MonoJ2KPictureAsset>(path("build") / "test" / name / picture), 0));
 
 	auto reader = A_sound->asset()->start_read();
 	auto sound = make_shared<dcp::SoundAsset>(A_sound->asset()->edit_rate(), A_sound->asset()->sampling_rate(), A_sound->asset()->channels(), dcp::LanguageTag("en-US"), dcp::Standard::SMPTE);
@@ -290,9 +290,9 @@ BOOST_AUTO_TEST_CASE (dcp_test5)
 	cpl->set_issue_date ("2012-07-17T04:45:18+00:00");
 	cpl->set_annotation_text ("A Test DCP");
 
-	auto mp = make_shared<dcp::MonoPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
+	auto mp = make_shared<dcp::MonoJ2KPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
 	mp->set_metadata (mxf_meta);
-	auto picture_writer = mp->start_write("build/test/DCP/dcp_test5/video.mxf", dcp::PictureAsset::Behaviour::MAKE_NEW);
+	auto picture_writer = mp->start_write("build/test/DCP/dcp_test5/video.mxf", dcp::J2KPictureAsset::Behaviour::MAKE_NEW);
 	dcp::ArrayData j2c ("test/data/flat_red.j2c");
 	for (int i = 0; i < 24; ++i) {
 		picture_writer->write (j2c.data (), j2c.size ());
@@ -510,8 +510,8 @@ BOOST_AUTO_TEST_CASE(hashes_preserved_when_loading_corrupted_dcp)
 	auto dcp = make_simple(dir / "1");
 	dcp->write_xml();
 
-	auto asset_1_id = dcp::MonoPictureAsset(dir / "1" / "video.mxf").id();
-	auto asset_1_hash = dcp::MonoPictureAsset(dir / "1" / "video.mxf").hash();
+	auto asset_1_id = dcp::MonoJ2KPictureAsset(dir / "1" / "video.mxf").id();
+	auto asset_1_hash = dcp::MonoJ2KPictureAsset(dir / "1" / "video.mxf").hash();
 
 	/* Replace the hash in the CPL (the one that corresponds to the actual file)
 	 * with an incorrect one new_hash.
diff --git a/test/decryption_test.cc b/test/decryption_test.cc
index 3d858028..30b301a5 100644
--- a/test/decryption_test.cc
+++ b/test/decryption_test.cc
@@ -80,7 +80,7 @@ get_frame (dcp::DCP const & dcp)
 	auto picture = reel->main_picture()->asset();
 	BOOST_CHECK (picture);
 
-	auto mono_picture = dynamic_pointer_cast<const dcp::MonoPictureAsset>(picture);
+	auto mono_picture = dynamic_pointer_cast<const dcp::MonoJ2KPictureAsset>(picture);
 	auto reader = mono_picture->start_read();
 	auto j2k_frame = reader->get_frame(0);
 	auto xyz = j2k_frame->xyz_image();
@@ -152,10 +152,10 @@ BOOST_AUTO_TEST_CASE (decryption_test2)
 	auto context_id = dcp::make_uuid();
 	dcp::Key key;
 
-	auto picture_asset = std::make_shared<dcp::MonoPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE);
+	auto picture_asset = std::make_shared<dcp::MonoJ2KPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE);
 	picture_asset->set_key (key);
 	picture_asset->set_context_id (context_id);
-	auto picture_writer = picture_asset->start_write(dir / "picture.mxf", dcp::PictureAsset::Behaviour::MAKE_NEW);
+	auto picture_writer = picture_asset->start_write(dir / "picture.mxf", dcp::J2KPictureAsset::Behaviour::MAKE_NEW);
 	dcp::ArrayData picture("test/data/flat_red.j2c");
 	for (int i = 0; i < 24; ++i) {
 		picture_writer->write(picture);
diff --git a/test/encryption_test.cc b/test/encryption_test.cc
index 6e145056..e3ff8a2d 100644
--- a/test/encryption_test.cc
+++ b/test/encryption_test.cc
@@ -90,11 +90,11 @@ BOOST_AUTO_TEST_CASE (encryption_test)
 
 	dcp::Key key;
 
-	auto mp = make_shared<dcp::MonoPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
+	auto mp = make_shared<dcp::MonoJ2KPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
 	mp->set_metadata (mxf_metadata);
 	mp->set_key (key);
 
-	auto writer = mp->start_write("build/test/DCP/encryption_test/video.mxf", dcp::PictureAsset::Behaviour::MAKE_NEW);
+	auto writer = mp->start_write("build/test/DCP/encryption_test/video.mxf", dcp::J2KPictureAsset::Behaviour::MAKE_NEW);
 	dcp::ArrayData j2c ("test/data/flat_red.j2c");
 	for (int i = 0; i < 24; ++i) {
 		writer->write (j2c.data (), j2c.size ());
diff --git a/test/frame_info_hash_test.cc b/test/frame_info_hash_test.cc
index 94336867..5f29ebab 100644
--- a/test/frame_info_hash_test.cc
+++ b/test/frame_info_hash_test.cc
@@ -47,7 +47,7 @@ using std::string;
 
 
 static void
-check (shared_ptr<dcp::PictureAssetWriter> writer, boost::random::uniform_int_distribution<>& dist, boost::random::mt19937& rng, string hash)
+check (shared_ptr<dcp::J2KPictureAssetWriter> writer, boost::random::uniform_int_distribution<>& dist, boost::random::mt19937& rng, string hash)
 {
 	auto xyz = make_shared<dcp::OpenJPEGImage>(dcp::Size(1998, 1080));
 	for (int c = 0; c < 3; ++c) {
@@ -66,8 +66,8 @@ check (shared_ptr<dcp::PictureAssetWriter> writer, boost::random::uniform_int_di
 /** Test the hashing of data written to JPEG2000 MXFs with some random inputs */
 BOOST_AUTO_TEST_CASE (frame_info_hash_test)
 {
-	auto mp = make_shared<dcp::MonoPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
-	auto writer = mp->start_write("build/test/frame_info_hash_test.mxf", dcp::PictureAsset::Behaviour::MAKE_NEW);
+	auto mp = make_shared<dcp::MonoJ2KPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
+	auto writer = mp->start_write("build/test/frame_info_hash_test.mxf", dcp::J2KPictureAsset::Behaviour::MAKE_NEW);
 
 	boost::random::mt19937 rng(1);
 	boost::random::uniform_int_distribution<> dist(0, 4095);
diff --git a/test/kdm_test.cc b/test/kdm_test.cc
index 5eae90c3..a3835d23 100644
--- a/test/kdm_test.cc
+++ b/test/kdm_test.cc
@@ -256,9 +256,9 @@ BOOST_AUTO_TEST_CASE (validity_period_test1)
 	auto signer = make_shared<dcp::CertificateChain>(dcp::file_to_string("test/data/certificate_chain"));
 	signer->set_key(dcp::file_to_string("test/data/private.key"));
 
-	auto asset = make_shared<dcp::MonoPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE);
+	auto asset = make_shared<dcp::MonoJ2KPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE);
 	asset->set_key (dcp::Key());
-	auto writer = asset->start_write("build/test/validity_period_test1.mxf", dcp::PictureAsset::Behaviour::MAKE_NEW);
+	auto writer = asset->start_write("build/test/validity_period_test1.mxf", dcp::J2KPictureAsset::Behaviour::MAKE_NEW);
 	dcp::ArrayData frame ("test/data/flat_red.j2c");
 	writer->write (frame.data(), frame.size());
 	writer->finalize ();
@@ -376,7 +376,7 @@ BOOST_AUTO_TEST_CASE (vf_kdm_test)
 	BOOST_REQUIRE_EQUAL(reload_vf.cpls()[0]->reels().size(), 1U);
 	BOOST_REQUIRE(reload_vf.cpls()[0]->reels()[0]->main_picture());
 	BOOST_REQUIRE(reload_vf.cpls()[0]->reels()[0]->main_picture()->asset());
-	auto mono_asset = dynamic_pointer_cast<dcp::MonoPictureAsset>(reload_vf.cpls()[0]->reels()[0]->main_picture()->asset());
+	auto mono_asset = dynamic_pointer_cast<dcp::MonoJ2KPictureAsset>(reload_vf.cpls()[0]->reels()[0]->main_picture()->asset());
 	BOOST_REQUIRE(mono_asset);
 	auto reader = mono_asset->start_read();
 	reader->set_check_hmac(false);
diff --git a/test/recovery_test.cc b/test/recovery_test.cc
index b968c86f..feb480bb 100644
--- a/test/recovery_test.cc
+++ b/test/recovery_test.cc
@@ -55,8 +55,8 @@ BOOST_AUTO_TEST_CASE (recovery)
 
 	boost::filesystem::remove_all ("build/test/baz");
 	boost::filesystem::create_directories ("build/test/baz");
-	auto mp = make_shared<dcp::MonoPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
-	auto writer = mp->start_write("build/test/baz/video1.mxf", dcp::PictureAsset::Behaviour::MAKE_NEW);
+	auto mp = make_shared<dcp::MonoJ2KPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
+	auto writer = mp->start_write("build/test/baz/video1.mxf", dcp::J2KPictureAsset::Behaviour::MAKE_NEW);
 
 	int written_size = 0;
 	for (int i = 0; i < 24; ++i) {
@@ -82,8 +82,8 @@ BOOST_AUTO_TEST_CASE (recovery)
 
 	Kumu::ResetTestRNG ();
 
-	mp = make_shared<dcp::MonoPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
-	writer = mp->start_write("build/test/baz/video2.mxf", dcp::PictureAsset::Behaviour::OVERWRITE_EXISTING);
+	mp = make_shared<dcp::MonoJ2KPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
+	writer = mp->start_write("build/test/baz/video2.mxf", dcp::J2KPictureAsset::Behaviour::OVERWRITE_EXISTING);
 
 	writer->write (data.data(), data.size());
 
diff --git a/test/round_trip_test.cc b/test/round_trip_test.cc
index 02b9f78e..926441ab 100644
--- a/test/round_trip_test.cc
+++ b/test/round_trip_test.cc
@@ -70,8 +70,8 @@ BOOST_AUTO_TEST_CASE (round_trip_test)
 	boost::filesystem::path work_dir = "build/test/round_trip_test";
 	boost::filesystem::create_directory (work_dir);
 
-	auto asset_A = make_shared<dcp::MonoPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
-	auto writer = asset_A->start_write(work_dir / "video.mxf", dcp::PictureAsset::Behaviour::MAKE_NEW);
+	auto asset_A = make_shared<dcp::MonoJ2KPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
+	auto writer = asset_A->start_write(work_dir / "video.mxf", dcp::J2KPictureAsset::Behaviour::MAKE_NEW);
 	dcp::ArrayData j2c ("test/data/flat_red.j2c");
 	for (int i = 0; i < 24; ++i) {
 		writer->write (j2c.data (), j2c.size ());
@@ -123,7 +123,7 @@ BOOST_AUTO_TEST_CASE (round_trip_test)
 	}
 
 	/* Reload the picture asset */
-	auto asset_B = make_shared<dcp::MonoPictureAsset>(work_dir / "video.mxf");
+	auto asset_B = make_shared<dcp::MonoJ2KPictureAsset>(work_dir / "video.mxf");
 
 	BOOST_CHECK (!kdm_B.keys().empty ());
 	asset_B->set_key (kdm_B.keys().front().key());
diff --git a/test/test.cc b/test/test.cc
index efe02209..56ea32cd 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -271,7 +271,7 @@ RNGFixer::~RNGFixer ()
 }
 
 
-shared_ptr<dcp::MonoPictureAsset>
+shared_ptr<dcp::MonoJ2KPictureAsset>
 simple_picture (boost::filesystem::path path, string suffix, int frames, optional<dcp::Key> key)
 {
 	dcp::MXFMetadata mxf_meta;
@@ -279,12 +279,12 @@ simple_picture (boost::filesystem::path path, string suffix, int frames, optiona
 	mxf_meta.product_name = "OpenDCP";
 	mxf_meta.product_version = "0.0.25";
 
-	auto mp = make_shared<dcp::MonoPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
+	auto mp = make_shared<dcp::MonoJ2KPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
 	mp->set_metadata (mxf_meta);
 	if (key) {
 		mp->set_key (*key);
 	}
-	auto picture_writer = mp->start_write(path / dcp::String::compose("video%1.mxf", suffix), dcp::PictureAsset::Behaviour::MAKE_NEW);
+	auto picture_writer = mp->start_write(path / dcp::String::compose("video%1.mxf", suffix), dcp::J2KPictureAsset::Behaviour::MAKE_NEW);
 
 	dcp::Size const size (1998, 1080);
 	auto image = make_shared<dcp::OpenJPEGImage>(size);
@@ -530,10 +530,10 @@ black_picture_asset (boost::filesystem::path dir, int frames)
 	auto frame = dcp::compress_j2k (image, 100000000, 24, false, false);
 	BOOST_REQUIRE (frame.size() < 230000000 / (24 * 8));
 
-	auto asset = make_shared<dcp::MonoPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE);
+	auto asset = make_shared<dcp::MonoJ2KPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE);
 	asset->set_metadata (dcp::MXFMetadata("libdcp", "libdcp", "1.6.4devel"));
 	boost::filesystem::create_directories (dir);
-	auto writer = asset->start_write(dir / "pic.mxf", dcp::PictureAsset::Behaviour::MAKE_NEW);
+	auto writer = asset->start_write(dir / "pic.mxf", dcp::J2KPictureAsset::Behaviour::MAKE_NEW);
 	for (int i = 0; i < frames; ++i) {
 		writer->write (frame.data(), frame.size());
 	}
diff --git a/test/test.h b/test/test.h
index bacb9311..d3fded87 100644
--- a/test/test.h
+++ b/test/test.h
@@ -34,7 +34,7 @@ namespace xmlpp {
 
 namespace dcp {
 	class DCP;
-	class MonoPictureAsset;
+	class MonoJ2KPictureAsset;
 	class SoundAsset;
 }
 
@@ -44,7 +44,7 @@ extern boost::filesystem::path xsd_test;
 extern void check_xml (xmlpp::Element* ref, xmlpp::Element* test, std::vector<std::string> ignore_tags, bool ignore_whitespace = false);
 extern void check_xml (std::string ref, std::string test, std::vector<std::string> ignore, bool ignore_whitespace = false);
 extern void check_file (boost::filesystem::path ref, boost::filesystem::path check);
-extern std::shared_ptr<dcp::MonoPictureAsset> simple_picture (
+extern std::shared_ptr<dcp::MonoJ2KPictureAsset> simple_picture (
 	boost::filesystem::path path,
 	std::string suffix,
 	int frames = 24,
diff --git a/test/verify_test.cc b/test/verify_test.cc
index d9e88ec1..47292c46 100644
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -1025,9 +1025,9 @@ static
 shared_ptr<dcp::CPL>
 dcp_from_frame (dcp::ArrayData const& frame, path dir)
 {
-	auto asset = make_shared<dcp::MonoPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE);
+	auto asset = make_shared<dcp::MonoJ2KPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE);
 	create_directories (dir);
-	auto writer = asset->start_write(dir / "pic.mxf", dcp::PictureAsset::Behaviour::MAKE_NEW);
+	auto writer = asset->start_write(dir / "pic.mxf", dcp::J2KPictureAsset::Behaviour::MAKE_NEW);
 	for (int i = 0; i < 24; ++i) {
 		writer->write (frame.data(), frame.size());
 	}
@@ -1826,13 +1826,13 @@ check_picture_size (int width, int height, int frame_rate, bool three_d)
 	path dcp_path = "build/test/verify_picture_test";
 	prepare_directory (dcp_path);
 
-	shared_ptr<dcp::PictureAsset> mp;
+	shared_ptr<dcp::J2KPictureAsset> mp;
 	if (three_d) {
-		mp = make_shared<dcp::StereoPictureAsset>(dcp::Fraction(frame_rate, 1), dcp::Standard::SMPTE);
+		mp = make_shared<dcp::StereoJ2KPictureAsset>(dcp::Fraction(frame_rate, 1), dcp::Standard::SMPTE);
 	} else {
-		mp = make_shared<dcp::MonoPictureAsset>(dcp::Fraction(frame_rate, 1), dcp::Standard::SMPTE);
+		mp = make_shared<dcp::MonoJ2KPictureAsset>(dcp::Fraction(frame_rate, 1), dcp::Standard::SMPTE);
 	}
-	auto picture_writer = mp->start_write(dcp_path / "video.mxf", dcp::PictureAsset::Behaviour::MAKE_NEW);
+	auto picture_writer = mp->start_write(dcp_path / "video.mxf", dcp::J2KPictureAsset::Behaviour::MAKE_NEW);
 
 	auto image = black_image (dcp::Size(width, height));
 	auto j2c = dcp::compress_j2k (image, 100000000, frame_rate, three_d, width > 2048);
@@ -1855,9 +1855,9 @@ check_picture_size (int width, int height, int frame_rate, bool three_d)
 	auto reel = make_shared<dcp::Reel>();
 
 	if (three_d) {
-		reel->add (make_shared<dcp::ReelStereoPictureAsset>(std::dynamic_pointer_cast<dcp::StereoPictureAsset>(mp), 0));
+		reel->add (make_shared<dcp::ReelStereoPictureAsset>(std::dynamic_pointer_cast<dcp::StereoJ2KPictureAsset>(mp), 0));
 	} else {
-		reel->add (make_shared<dcp::ReelMonoPictureAsset>(std::dynamic_pointer_cast<dcp::MonoPictureAsset>(mp), 0));
+		reel->add (make_shared<dcp::ReelMonoPictureAsset>(std::dynamic_pointer_cast<dcp::MonoJ2KPictureAsset>(mp), 0));
 	}
 
 	reel->add (simple_markers(frame_rate));
@@ -3508,7 +3508,7 @@ BOOST_AUTO_TEST_CASE (verify_mismatched_asset_duration)
 	shared_ptr<dcp::DCP> dcp (new dcp::DCP(dir));
 	auto cpl = make_shared<dcp::CPL>("A Test DCP", dcp::ContentKind::TRAILER, dcp::Standard::SMPTE);
 
-	shared_ptr<dcp::MonoPictureAsset> mp = simple_picture (dir, "", 24);
+	shared_ptr<dcp::MonoJ2KPictureAsset> mp = simple_picture (dir, "", 24);
 	shared_ptr<dcp::SoundAsset> ms = simple_sound (dir, "", dcp::MXFMetadata(), "en-US", 25);
 
 	auto reel = make_shared<dcp::Reel>(
@@ -4670,10 +4670,10 @@ BOOST_AUTO_TEST_CASE (verify_partially_encrypted)
 
 	dcp::Key key;
 
-	auto mp = make_shared<dcp::MonoPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
+	auto mp = make_shared<dcp::MonoJ2KPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
 	mp->set_key (key);
 
-	auto writer = mp->start_write(dir / "video.mxf", dcp::PictureAsset::Behaviour::MAKE_NEW);
+	auto writer = mp->start_write(dir / "video.mxf", dcp::J2KPictureAsset::Behaviour::MAKE_NEW);
 	dcp::ArrayData j2c ("test/data/flat_red.j2c");
 	for (int i = 0; i < 24; ++i) {
 		writer->write (j2c.data(), j2c.size());
@@ -4739,7 +4739,7 @@ BOOST_AUTO_TEST_CASE (verify_partially_encrypted)
 BOOST_AUTO_TEST_CASE (verify_jpeg2000_codestream_2k)
 {
 	vector<dcp::VerificationNote> notes;
-	dcp::MonoPictureAsset picture (find_file(private_test / "data" / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV", "j2c.mxf"));
+	dcp::MonoJ2KPictureAsset picture (find_file(private_test / "data" / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV", "j2c.mxf"));
 	auto reader = picture.start_read ();
 	auto frame = reader->get_frame (0);
 	verify_j2k(frame, 0, 0, 24, notes);
@@ -4750,7 +4750,7 @@ BOOST_AUTO_TEST_CASE (verify_jpeg2000_codestream_2k)
 BOOST_AUTO_TEST_CASE (verify_jpeg2000_codestream_4k)
 {
 	vector<dcp::VerificationNote> notes;
-	dcp::MonoPictureAsset picture (find_file(private_test / "data" / "sul", "TLR"));
+	dcp::MonoJ2KPictureAsset picture (find_file(private_test / "data" / "sul", "TLR"));
 	auto reader = picture.start_read ();
 	auto frame = reader->get_frame (0);
 	verify_j2k(frame, 0, 0, 24, notes);
@@ -4765,7 +4765,7 @@ BOOST_AUTO_TEST_CASE (verify_jpeg2000_codestream_libdcp)
 	auto dcp = make_simple (dir);
 	dcp->write_xml ();
 	vector<dcp::VerificationNote> notes;
-	dcp::MonoPictureAsset picture (find_file(dir, "video"));
+	dcp::MonoJ2KPictureAsset picture (find_file(dir, "video"));
 	auto reader = picture.start_read ();
 	auto frame = reader->get_frame (0);
 	verify_j2k(frame, 0, 0, 24, notes);
@@ -5440,8 +5440,8 @@ BOOST_AUTO_TEST_CASE(verify_invalid_tile_part_size)
 	boost::filesystem::remove_all(path);
 	boost::filesystem::create_directories(path);
 
-	auto mp = make_shared<dcp::MonoPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE);
-	auto picture_writer = mp->start_write(path / "video.mxf", dcp::PictureAsset::Behaviour::MAKE_NEW);
+	auto mp = make_shared<dcp::MonoJ2KPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE);
+	auto picture_writer = mp->start_write(path / "video.mxf", dcp::J2KPictureAsset::Behaviour::MAKE_NEW);
 
 	dcp::Size const size(1998, 1080);
 	auto image = make_shared<dcp::OpenJPEGImage>(size);
@@ -5673,11 +5673,11 @@ BOOST_AUTO_TEST_CASE(verify_spots_wrong_asset)
 	dcp1->write_xml();
 	auto cpl = dcp1->cpls()[0];
 
-	auto const asset_1 = dcp::MonoPictureAsset(dir / "1" / "video.mxf").id();
+	auto const asset_1 = dcp::MonoJ2KPictureAsset(dir / "1" / "video.mxf").id();
 
 	auto dcp2 = make_simple(dir / "2");
 	dcp2->write_xml();
-	auto const asset_2 = dcp::MonoPictureAsset(dir / "2" / "video.mxf").id();
+	auto const asset_2 = dcp::MonoJ2KPictureAsset(dir / "2" / "video.mxf").id();
 
 	boost::filesystem::remove(dir / "1" / "video.mxf");
 	boost::filesystem::copy_file(dir / "2" / "video.mxf", dir / "1" / "video.mxf");