namespace libdcp -> dcp.

81 files changed, 156 insertions, 156 deletions

diff --git a/src/argb_frame.cc b/src/argb_frame.cc
index a48f80bb..79637329 100644
--- a/src/argb_frame.cc
+++ b/src/argb_frame.cc
@@ -19,7 +19,7 @@
 
 #include "argb_frame.h"
 
-using namespace libdcp;
+using namespace dcp;
 
 /** Construct an empty ARGBFrame of a given size and with
  *  undefined contents.
diff --git a/src/argb_frame.h b/src/argb_frame.h
index f26436cd..2ad6f69d 100644
--- a/src/argb_frame.h
+++ b/src/argb_frame.h
@@ -24,7 +24,7 @@
 #include <stdint.h>
 #include "util.h"
 
-namespace libdcp
+namespace dcp
 {
 
 /** @class ARGBFrame
diff --git a/src/asset.cc b/src/asset.cc
index 91a19e69..192daf43 100644
--- a/src/asset.cc
+++ b/src/asset.cc
@@ -34,7 +34,7 @@
 
 using namespace std;
 using namespace boost;
-using namespace libdcp;
+using namespace dcp;
 
 Asset::Asset (boost::filesystem::path directory, boost::filesystem::path file_name)
 	: _directory (directory)
diff --git a/src/asset.h b/src/asset.h
index 269d5c4b..d1819ba6 100644
--- a/src/asset.h
+++ b/src/asset.h
@@ -39,7 +39,7 @@ namespace xmlpp {
 	class Element;
 }
 
-namespace libdcp
+namespace dcp
 {
 
 /** @brief Parent class for assets of DCPs
diff --git a/src/certificates.cc b/src/certificates.cc
index 2f5d47fd..caa4c830 100644
--- a/src/certificates.cc
+++ b/src/certificates.cc
@@ -37,7 +37,7 @@ using std::string;
 using std::stringstream;
 using std::vector;
 using boost::shared_ptr;
-using namespace libdcp;
+using namespace dcp;
 
 /** @param c X509 certificate, which this object will take ownership of */
 Certificate::Certificate (X509* c)
diff --git a/src/certificates.h b/src/certificates.h
index 2bf8d0db..c7d6698b 100644
--- a/src/certificates.h
+++ b/src/certificates.h
@@ -34,7 +34,7 @@ namespace xmlpp {
 	class Element;
 }
 
-namespace libdcp {
+namespace dcp {
 
 class Certificate
 {
diff --git a/src/colour_matrix.cc b/src/colour_matrix.cc
index b633e384..19243d4d 100644
--- a/src/colour_matrix.cc
+++ b/src/colour_matrix.cc
@@ -23,19 +23,19 @@
    EasyDCP player, I think.
 */
 
-double const libdcp::colour_matrix::xyz_to_rgb[3][3] = {
+double const dcp::colour_matrix::xyz_to_rgb[3][3] = {
 	{  3.24096989631653,   -1.5373831987381,  -0.498610764741898 },
 	{ -0.96924364566803,    1.87596750259399,  0.0415550582110882 },
 	{  0.0556300804018974, -0.203976958990097, 1.05697154998779 }
 };
 
-double const libdcp::colour_matrix::srgb_to_xyz[3][3] = {
+double const dcp::colour_matrix::srgb_to_xyz[3][3] = {
 	{0.4124564, 0.3575761, 0.1804375},
 	{0.2126729, 0.7151522, 0.0721750},
 	{0.0193339, 0.1191920, 0.9503041}
 };
 
-double const libdcp::colour_matrix::rec709_to_xyz[3][3] = {
+double const dcp::colour_matrix::rec709_to_xyz[3][3] = {
 	{ 0.412390799265959,  0.357584339383878, 0.180480788401834 },
 	{ 0.21263900587151,   0.715168678767756, 0.0721923153607337 },
         { 0.0193308187155918, 0.119194779794626, 0.950532152249661 }
diff --git a/src/colour_matrix.h b/src/colour_matrix.h
index 615e8b38..010ac3b9 100644
--- a/src/colour_matrix.h
+++ b/src/colour_matrix.h
@@ -17,7 +17,7 @@
 
 */
 
-namespace libdcp {
+namespace dcp {
 
 namespace colour_matrix {
 
diff --git a/src/cpl.cc b/src/cpl.cc
index dcb730ff..2058223c 100644
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -41,7 +41,7 @@ using std::make_pair;
 using boost::shared_ptr;
 using boost::lexical_cast;
 using boost::optional;
-using namespace libdcp;
+using namespace dcp;
 
 CPL::CPL (boost::filesystem::path directory, string name, ContentKind content_kind, int length, int frames_per_second)
 	: _directory (directory)
diff --git a/src/cpl.h b/src/cpl.h
index aadc7347..45480ec7 100644
--- a/src/cpl.h
+++ b/src/cpl.h
@@ -31,7 +31,7 @@
 #include "certificates.h"
 #include "key.h"
 
-namespace libdcp {
+namespace dcp {
 
 namespace parse {
 	class AssetMap;
diff --git a/src/dcp.cc b/src/dcp.cc
index f80726fc..653dc87a 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -56,7 +56,7 @@ using std::back_inserter;
 using std::make_pair;
 using boost::shared_ptr;
 using boost::lexical_cast;
-using namespace libdcp;
+using namespace dcp;
 
 DCP::DCP (boost::filesystem::path directory)
 	: _directory (directory)
@@ -216,12 +216,12 @@ DCP::read_assets ()
 		boost::filesystem::path p = _directory;
 		p /= "ASSETMAP";
 		if (boost::filesystem::exists (p)) {
-			asset_map.reset (new libdcp::parse::AssetMap (p.string ()));
+			asset_map.reset (new dcp::parse::AssetMap (p.string ()));
 		} else {
 			p = _directory;
 			p /= "ASSETMAP.xml";
 			if (boost::filesystem::exists (p)) {
-				asset_map.reset (new libdcp::parse::AssetMap (p.string ()));
+				asset_map.reset (new dcp::parse::AssetMap (p.string ()));
 			} else {
 				boost::throw_exception (DCPReadError ("could not find AssetMap file"));
 			}
@@ -231,7 +231,7 @@ DCP::read_assets ()
 		boost::throw_exception (FileError ("could not load AssetMap file", _files.asset_map, e.number ()));
 	}
 
-	for (list<shared_ptr<libdcp::parse::AssetMapAsset> >::const_iterator i = asset_map->assets.begin(); i != asset_map->assets.end(); ++i) {
+	for (list<shared_ptr<dcp::parse::AssetMapAsset> >::const_iterator i = asset_map->assets.begin(); i != asset_map->assets.end(); ++i) {
 		if ((*i)->chunks.size() != 1) {
 			boost::throw_exception (XMLError ("unsupported asset chunk count"));
 		}
diff --git a/src/dcp.h b/src/dcp.h
index 45ccce88..9b72ae74 100644
--- a/src/dcp.h
+++ b/src/dcp.h
@@ -37,7 +37,7 @@ namespace xmlpp {
 }
 
 /** @brief Namespace for everything in libdcp */
-namespace libdcp
+namespace dcp
 {
 
 class Asset;	
@@ -110,7 +110,7 @@ public:
 	 *  supplemental.add_assets_from (original_version);
 	 *  supplemental.read ();
 	 */
-	void add_assets_from (libdcp::DCP const &);
+	void add_assets_from (DCP const &);
 
 	bool encrypted () const;
 
diff --git a/src/dcp_time.cc b/src/dcp_time.cc
index 14155fdb..605c4a40 100644
--- a/src/dcp_time.cc
+++ b/src/dcp_time.cc
@@ -31,7 +31,7 @@
 
 using namespace std;
 using namespace boost;
-using namespace libdcp;
+using namespace dcp;
 
 Time::Time (int frame, int frames_per_second)
 	: h (0)
@@ -85,19 +85,19 @@ Time::Time (string time)
 }
 
 bool
-libdcp::operator== (Time const & a, Time const & b)
+dcp::operator== (Time const & a, Time const & b)
 {
 	return (a.h == b.h && a.m == b.m && a.s == b.s && a.t == b.t);
 }
 
 bool
-libdcp::operator!= (Time const & a, Time const & b)
+dcp::operator!= (Time const & a, Time const & b)
 {
 	return !(a == b);
 }
 
 bool
-libdcp::operator<= (Time const & a, Time const & b)
+dcp::operator<= (Time const & a, Time const & b)
 {
 	if (a.h != b.h) {
 		return a.h <= b.h;
@@ -119,7 +119,7 @@ libdcp::operator<= (Time const & a, Time const & b)
 }
 
 bool
-libdcp::operator< (Time const & a, Time const & b)
+dcp::operator< (Time const & a, Time const & b)
 {
 	if (a.h != b.h) {
 		return a.h < b.h;
@@ -141,7 +141,7 @@ libdcp::operator< (Time const & a, Time const & b)
 }
 
 bool
-libdcp::operator> (Time const & a, Time const & b)
+dcp::operator> (Time const & a, Time const & b)
 {
 	if (a.h != b.h) {
 		return a.h > b.h;
@@ -163,14 +163,14 @@ libdcp::operator> (Time const & a, Time const & b)
 }
 
 ostream &
-libdcp::operator<< (ostream& s, Time const & t)
+dcp::operator<< (ostream& s, Time const & t)
 {
 	s << t.h << ":" << t.m << ":" << t.s << "." << t.t;
 	return s;
 }
 
-libdcp::Time
-libdcp::operator+ (Time a, Time const & b)
+dcp::Time
+dcp::operator+ (Time a, Time const & b)
 {
 	Time r;
 
@@ -197,8 +197,8 @@ libdcp::operator+ (Time a, Time const & b)
 	return r;
 }
 
-libdcp::Time
-libdcp::operator- (Time a, Time const & b)
+dcp::Time
+dcp::operator- (Time a, Time const & b)
 {
 	Time r;
 
@@ -226,7 +226,7 @@ libdcp::operator- (Time a, Time const & b)
 }
 
 float
-libdcp::operator/ (Time a, Time const & b)
+dcp::operator/ (Time a, Time const & b)
 {
 	int64_t const at = a.h * 3600 * 250 + a.m * 60 * 250 + a.s * 250 + a.t;
 	int64_t const bt = b.h * 3600 * 250 + b.m * 60 * 250 + b.s * 250 + b.t;
diff --git a/src/dcp_time.h b/src/dcp_time.h
index 92cee9a0..885393c1 100644
--- a/src/dcp_time.h
+++ b/src/dcp_time.h
@@ -28,7 +28,7 @@
 #include <iostream>
 #include <stdint.h>
 
-namespace libdcp {
+namespace dcp {
 
 /** @class Time
  *  @brief A representation of time within a DCP.
diff --git a/src/exceptions.cc b/src/exceptions.cc
index 6a32a33f..c3755a60 100644
--- a/src/exceptions.cc
+++ b/src/exceptions.cc
@@ -21,7 +21,7 @@
 #include "compose.hpp"
 
 using std::string;
-using namespace libdcp;
+using namespace dcp;
 
 FileError::FileError (std::string const & message, boost::filesystem::path filename, int number)
 	: _message (String::compose ("%1 (error %2) (%3)", message, filename.string(), number))
diff --git a/src/exceptions.h b/src/exceptions.h
index 2070dd0f..2a7fbdda 100644
--- a/src/exceptions.h
+++ b/src/exceptions.h
@@ -26,7 +26,7 @@
  *  @brief Exceptions thrown by libdcp.
  */
 
-namespace libdcp
+namespace dcp
 {
 
 /** @brief An exception related to a file */
diff --git a/src/gamma_lut.cc b/src/gamma_lut.cc
index 80d9b902..0b8ad2fd 100644
--- a/src/gamma_lut.cc
+++ b/src/gamma_lut.cc
@@ -21,7 +21,7 @@
 #include "gamma_lut.h"
 #include "lut_cache.h"
 
-using namespace libdcp;
+using namespace dcp;
 
 LUTCache<GammaLUT> GammaLUT::cache;
 
diff --git a/src/gamma_lut.h b/src/gamma_lut.h
index 32e4af02..095ad882 100644
--- a/src/gamma_lut.h
+++ b/src/gamma_lut.h
@@ -23,7 +23,7 @@
 #include "lut.h"
 #include "lut_cache.h"
 
-namespace libdcp {
+namespace dcp {
 
 class GammaLUT : public LUT
 {
diff --git a/src/image.cc b/src/image.cc
index 24174fca..2cb5a7a4 100644
--- a/src/image.cc
+++ b/src/image.cc
@@ -20,7 +20,7 @@
 #include "image.h"
 
 using boost::shared_ptr;
-using namespace libdcp;
+using namespace dcp;
 
 Image::Image (Size s)
 	: _size (s)
diff --git a/src/image.h b/src/image.h
index 8b7fee09..a8786b77 100644
--- a/src/image.h
+++ b/src/image.h
@@ -19,7 +19,7 @@
 
 #include "util.h"
 
-namespace libdcp {
+namespace dcp {
 
 class Image
 {
diff --git a/src/kdm.cc b/src/kdm.cc
index 4132b242..02e6ce7f 100644
--- a/src/kdm.cc
+++ b/src/kdm.cc
@@ -43,7 +43,7 @@ using std::setw;
 using std::setfill;
 using std::cout;
 using boost::shared_ptr;
-using namespace libdcp;
+using namespace dcp;
 
 KDM::KDM (boost::filesystem::path kdm, boost::filesystem::path private_key)
 	: _xml_kdm (new xml::DCinemaSecurityMessage (kdm))
@@ -383,7 +383,7 @@ KDMKey::put_uuid (uint8_t ** d, string id) const
 }
 
 bool
-libdcp::operator== (libdcp::KDMKey const & a, libdcp::KDMKey const & b)
+dcp::operator== (dcp::KDMKey const & a, dcp::KDMKey const & b)
 {
 	if (memcmp (a._signer_thumbprint, b._signer_thumbprint, 20) != 0) {
 		return false;
diff --git a/src/kdm.h b/src/kdm.h
index 4e897ca8..9ee793c9 100644
--- a/src/kdm.h
+++ b/src/kdm.h
@@ -32,7 +32,7 @@
 
 class kdm_key_test;
 
-namespace libdcp {
+namespace dcp {
 
 namespace xml {
 	class DCinemaSecurityMessage;
diff --git a/src/key.cc b/src/key.cc
index 8cac04a3..0e04c27a 100644
--- a/src/key.cc
+++ b/src/key.cc
@@ -29,7 +29,7 @@ using std::string;
 using std::stringstream;
 using std::setw;
 using std::setfill;
-using namespace libdcp;
+using namespace dcp;
 
 Key::Key ()
 	: _value (new uint8_t[ASDCP::KeyLen])
@@ -86,13 +86,13 @@ Key::hex () const
 }
 
 bool
-libdcp::operator== (Key const & a, Key const & b)
+dcp::operator== (Key const & a, Key const & b)
 {
 	return memcmp (a.value(), b.value(), ASDCP::KeyLen) == 0;
 }
 
 bool
-libdcp::operator!= (Key const & a, Key const & b)
+dcp::operator!= (Key const & a, Key const & b)
 {
 	return !(a == b);
 }
diff --git a/src/key.h b/src/key.h
index d0286627..be9f95f4 100644
--- a/src/key.h
+++ b/src/key.h
@@ -26,7 +26,7 @@
 
 #include <stdint.h>
 
-namespace libdcp {
+namespace dcp {
 
 /** @class Key
  *  @brief A key for encrypting MXFs.
diff --git a/src/lut.h b/src/lut.h
index ad291467..f56676a2 100644
--- a/src/lut.h
+++ b/src/lut.h
@@ -23,7 +23,7 @@
 #include <cmath>
 #include <boost/utility.hpp>
 
-namespace libdcp {
+namespace dcp {
 
 class LUT : boost::noncopyable
 {
diff --git a/src/metadata.cc b/src/metadata.cc
index acbc3b2e..d2357a1f 100644
--- a/src/metadata.cc
+++ b/src/metadata.cc
@@ -31,7 +31,7 @@
 #include "util.h"
 
 using namespace std;
-using namespace libdcp;
+using namespace dcp;
 
 MXFMetadata::MXFMetadata ()
 	: company_name ("libdcp")
diff --git a/src/metadata.h b/src/metadata.h
index b4c0896d..0a707534 100644
--- a/src/metadata.h
+++ b/src/metadata.h
@@ -28,7 +28,7 @@
 
 class utc_offset_to_string_test;
 
-namespace libdcp
+namespace dcp
 {
 
 class MXFMetadata
diff --git a/src/mono_picture_asset.cc b/src/mono_picture_asset.cc
index 0ac48d37..3163e89a 100644
--- a/src/mono_picture_asset.cc
+++ b/src/mono_picture_asset.cc
@@ -29,7 +29,7 @@ using std::vector;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::lexical_cast;
-using namespace libdcp;
+using namespace dcp;
 
 MonoPictureAsset::MonoPictureAsset (boost::filesystem::path directory, boost::filesystem::path mxf_name)
 	: PictureAsset (directory, mxf_name)
diff --git a/src/mono_picture_asset.h b/src/mono_picture_asset.h
index ae2df4d2..19308aaf 100644
--- a/src/mono_picture_asset.h
+++ b/src/mono_picture_asset.h
@@ -22,7 +22,7 @@
 
 #include "picture_asset.h"
 
-namespace libdcp {
+namespace dcp {
 
 /** A 2D (monoscopic) picture asset */
 class MonoPictureAsset : public PictureAsset
diff --git a/src/mono_picture_asset_writer.cc b/src/mono_picture_asset_writer.cc
index 6f0ba973..87f37a2d 100644
--- a/src/mono_picture_asset_writer.cc
+++ b/src/mono_picture_asset_writer.cc
@@ -30,7 +30,7 @@ using std::ostream;
 using std::string;
 using boost::shared_ptr;
 using boost::lexical_cast;
-using namespace libdcp;
+using namespace dcp;
 
 struct MonoPictureAssetWriter::ASDCPState : public ASDCPStateBase
 {
@@ -50,7 +50,7 @@ MonoPictureAssetWriter::MonoPictureAssetWriter (PictureAsset* asset, bool overwr
 void
 MonoPictureAssetWriter::start (uint8_t* data, int size)
 {
-	libdcp::start (this, _state, _asset, data, size);
+	dcp::start (this, _state, _asset, data, size);
 }
 
 FrameInfo
diff --git a/src/mono_picture_asset_writer.h b/src/mono_picture_asset_writer.h
index e3922623..b4da70b4 100644
--- a/src/mono_picture_asset_writer.h
+++ b/src/mono_picture_asset_writer.h
@@ -24,7 +24,7 @@
 #include <boost/utility.hpp>
 #include "picture_asset_writer.h"
 
-namespace libdcp {
+namespace dcp {
 
 /** A helper class for writing to MonoPictureAssets progressively (i.e. writing frame-by-frame,
  *  rather than giving libdcp all the frames in one go).
diff --git a/src/mono_picture_frame.cc b/src/mono_picture_frame.cc
index 890967d1..964b543b 100644
--- a/src/mono_picture_frame.cc
+++ b/src/mono_picture_frame.cc
@@ -32,7 +32,7 @@
 
 using std::string;
 using boost::shared_ptr;
-using namespace libdcp;
+using namespace dcp;
 
 /** Make a picture frame from a 2D (monoscopic) asset.
  *  @param mxf_path Path to the asset's MXF file.
diff --git a/src/mono_picture_frame.h b/src/mono_picture_frame.h
index 0eedfb95..44df68c9 100644
--- a/src/mono_picture_frame.h
+++ b/src/mono_picture_frame.h
@@ -29,7 +29,7 @@ namespace ASDCP {
 	class AESDecContext;
 }
 
-namespace libdcp {
+namespace dcp {
 
 class ARGBFrame;
 
diff --git a/src/mxf_asset.cc b/src/mxf_asset.cc
index c2428a3c..1b15f7a9 100644
--- a/src/mxf_asset.cc
+++ b/src/mxf_asset.cc
@@ -40,7 +40,7 @@ using std::pair;
 using boost::shared_ptr;
 using boost::lexical_cast;
 using boost::dynamic_pointer_cast;
-using namespace libdcp;
+using namespace dcp;
 
 MXFAsset::MXFAsset (boost::filesystem::path directory, boost::filesystem::path file_name)
 	: Asset (directory, file_name)
diff --git a/src/mxf_asset.h b/src/mxf_asset.h
index 7a645b7c..5ba70324 100644
--- a/src/mxf_asset.h
+++ b/src/mxf_asset.h
@@ -30,7 +30,7 @@ namespace ASDCP {
 	class AESDecContext;
 }
 
-namespace libdcp
+namespace dcp
 {
 
 class MXFMetadata;	
diff --git a/src/parse/asset_map.cc b/src/parse/asset_map.cc
index 484c2710..0b323fb3 100644
--- a/src/parse/asset_map.cc
+++ b/src/parse/asset_map.cc
@@ -29,7 +29,7 @@
 using std::string;
 using std::list;
 using boost::shared_ptr;
-using namespace libdcp::parse;
+using namespace dcp::parse;
 
 AssetMap::AssetMap (string file)
 {
diff --git a/src/parse/asset_map.h b/src/parse/asset_map.h
index af3e8918..e3035593 100644
--- a/src/parse/asset_map.h
+++ b/src/parse/asset_map.h
@@ -25,7 +25,7 @@
 #include <boost/shared_ptr.hpp>
 #include <libcxml/cxml.h>
 
-namespace libdcp {
+namespace dcp {
 
 namespace parse {
 
diff --git a/src/parse/cpl.cc b/src/parse/cpl.cc
index f6ce434c..d94fb68e 100644
--- a/src/parse/cpl.cc
+++ b/src/parse/cpl.cc
@@ -29,7 +29,7 @@
 using std::string;
 using std::bad_cast;
 using boost::shared_ptr;
-using namespace libdcp::parse;
+using namespace dcp::parse;
 
 CPL::CPL (string file)
 {
diff --git a/src/parse/cpl.h b/src/parse/cpl.h
index 04bf9351..4889a1c4 100644
--- a/src/parse/cpl.h
+++ b/src/parse/cpl.h
@@ -26,7 +26,7 @@
 #include <libcxml/cxml.h>
 #include "../types.h"
 
-namespace libdcp {
+namespace dcp {
 
 namespace parse	{
 
diff --git a/src/parse/pkl.cc b/src/parse/pkl.cc
index bbf070ae..d0fa1556 100644
--- a/src/parse/pkl.cc
+++ b/src/parse/pkl.cc
@@ -26,7 +26,7 @@
 
 using namespace std;
 using namespace boost;
-using namespace libdcp::parse;
+using namespace dcp::parse;
 
 PKL::PKL (string file)
 {
diff --git a/src/parse/pkl.h b/src/parse/pkl.h
index 13d87fa1..f31eef7d 100644
--- a/src/parse/pkl.h
+++ b/src/parse/pkl.h
@@ -24,7 +24,7 @@
 #include <boost/shared_ptr.hpp>
 #include "../xml.h"
 
-namespace libdcp {
+namespace dcp {
 
 namespace parse {
 
diff --git a/src/parse/subtitle.cc b/src/parse/subtitle.cc
index 612af716..3f9869b4 100644
--- a/src/parse/subtitle.cc
+++ b/src/parse/subtitle.cc
@@ -27,8 +27,8 @@ using std::list;
 using boost::shared_ptr;
 using boost::optional;
 using boost::lexical_cast;
-using namespace libdcp;
-using namespace libdcp::parse;
+using namespace dcp;
+using namespace dcp::parse;
 
 Font::Font (shared_ptr<const cxml::Node> node)
 {
diff --git a/src/parse/subtitle.h b/src/parse/subtitle.h
index c20278a3..50c2ebc5 100644
--- a/src/parse/subtitle.h
+++ b/src/parse/subtitle.h
@@ -21,7 +21,7 @@
 #include "../dcp_time.h"
 #include "../types.h"
 
-namespace libdcp
+namespace dcp
 {
 
 namespace parse
diff --git a/src/picture_asset.cc b/src/picture_asset.cc
index b2eecee5..94ebefaa 100644
--- a/src/picture_asset.cc
+++ b/src/picture_asset.cc
@@ -50,7 +50,7 @@ using std::cout;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::lexical_cast;
-using namespace libdcp;
+using namespace dcp;
 
 PictureAsset::PictureAsset (boost::filesystem::path directory, boost::filesystem::path mxf_name)
 	: MXFAsset (directory, mxf_name)
diff --git a/src/picture_asset.h b/src/picture_asset.h
index b8dab052..d9b9919b 100644
--- a/src/picture_asset.h
+++ b/src/picture_asset.h
@@ -35,7 +35,7 @@ namespace ASDCP {
 	}
 }
 
-namespace libdcp
+namespace dcp
 {
 
 class MonoPictureFrame;	
diff --git a/src/picture_asset_writer.cc b/src/picture_asset_writer.cc
index 92b384db..c1c9bd85 100644
--- a/src/picture_asset_writer.cc
+++ b/src/picture_asset_writer.cc
@@ -29,7 +29,7 @@ using std::istream;
 using std::ostream;
 using std::string;
 using boost::shared_ptr;
-using namespace libdcp;
+using namespace dcp;
 
 FrameInfo::FrameInfo (istream& s)
 	: offset (0)
diff --git a/src/picture_asset_writer.h b/src/picture_asset_writer.h
index 68ba086b..c6c00d87 100644
--- a/src/picture_asset_writer.h
+++ b/src/picture_asset_writer.h
@@ -25,7 +25,7 @@
 #include "metadata.h"
 #include "types.h"
 
-namespace libdcp {
+namespace dcp {
 
 class PictureAsset;	
 
diff --git a/src/picture_asset_writer_common.cc b/src/picture_asset_writer_common.cc
index 52848745..bb1316c7 100644
--- a/src/picture_asset_writer_common.cc
+++ b/src/picture_asset_writer_common.cc
@@ -33,7 +33,7 @@ struct ASDCPStateBase
 };
 
 template <class P, class Q>
-void libdcp::start (PictureAssetWriter* writer, shared_ptr<P> state, Q* asset, uint8_t* data, int size)
+void dcp::start (PictureAssetWriter* writer, shared_ptr<P> state, Q* asset, uint8_t* data, int size)
 {
 	if (ASDCP_FAILURE (state->j2k_parser.OpenReadFrame (data, size, state->frame_buffer))) {
 		boost::throw_exception (MiscError ("could not parse J2K frame"));
diff --git a/src/rec709_linearised_gamma_lut.cc b/src/rec709_linearised_gamma_lut.cc
index f14e4472..29f39ac0 100644
--- a/src/rec709_linearised_gamma_lut.cc
+++ b/src/rec709_linearised_gamma_lut.cc
@@ -19,7 +19,7 @@
 
 #include "rec709_linearised_gamma_lut.h"
 
-using namespace libdcp;
+using namespace dcp;
 
 LUTCache<Rec709LinearisedGammaLUT> Rec709LinearisedGammaLUT::cache;
 
diff --git a/src/rec709_linearised_gamma_lut.h b/src/rec709_linearised_gamma_lut.h
index af0158a5..e7130ef3 100644
--- a/src/rec709_linearised_gamma_lut.h
+++ b/src/rec709_linearised_gamma_lut.h
@@ -20,7 +20,7 @@
 #include "lut.h"
 #include "lut_cache.h"
 
-namespace libdcp {
+namespace dcp {
 
 class Rec709LinearisedGammaLUT : public LUT
 {
diff --git a/src/reel.cc b/src/reel.cc
index ff51c025..7a54059e 100644
--- a/src/reel.cc
+++ b/src/reel.cc
@@ -32,7 +32,7 @@ using std::list;
 using std::cout;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
-using namespace libdcp;
+using namespace dcp;
 
 void
 Reel::write_to_cpl (xmlpp::Element* node) const
diff --git a/src/reel.h b/src/reel.h
index 35302f17..666e235e 100644
--- a/src/reel.h
+++ b/src/reel.h
@@ -31,7 +31,7 @@ namespace xmlpp {
 	class Node;
 }
 
-namespace libdcp {
+namespace dcp {
 
 class PictureAsset;
 class SoundAsset;
@@ -68,7 +68,7 @@ public:
 
 	bool encrypted () const;
 
-	void set_mxf_keys (libdcp::Key);
+	void set_mxf_keys (dcp::Key);
 	
 	bool equals (boost::shared_ptr<const Reel> other, EqualityOptions opt, boost::function<void (NoteType, std::string)> notes) const;
 
diff --git a/src/rgb_xyz.cc b/src/rgb_xyz.cc
index dea2106c..7d30d32e 100644
--- a/src/rgb_xyz.cc
+++ b/src/rgb_xyz.cc
@@ -27,7 +27,7 @@
 using std::min;
 using std::max;
 using boost::shared_ptr;
-using namespace libdcp;
+using namespace dcp;
 
 #define DCI_COEFFICIENT (48.0 / 52.37)
 
@@ -36,7 +36,7 @@ using namespace libdcp;
  *  @return RGB image.
  */
 shared_ptr<ARGBFrame>
-libdcp::xyz_to_rgb (shared_ptr<const XYZFrame> xyz_frame, shared_ptr<const LUT> lut_in, shared_ptr<const LUT> lut_out)
+dcp::xyz_to_rgb (shared_ptr<const XYZFrame> xyz_frame, shared_ptr<const LUT> lut_in, shared_ptr<const LUT> lut_out)
 {
 	int const max_colour = pow (2, lut_out->bit_depth()) - 1;
 
@@ -99,8 +99,8 @@ libdcp::xyz_to_rgb (shared_ptr<const XYZFrame> xyz_frame, shared_ptr<const LUT>
 	return argb_frame;
 }
 
-shared_ptr<libdcp::XYZFrame>
-libdcp::rgb_to_xyz (shared_ptr<const Image> rgb, shared_ptr<const LUT> lut_in, shared_ptr<const LUT> lut_out, double const colour_matrix[3][3])
+shared_ptr<dcp::XYZFrame>
+dcp::rgb_to_xyz (shared_ptr<const Image> rgb, shared_ptr<const LUT> lut_in, shared_ptr<const LUT> lut_out, double const colour_matrix[3][3])
 {
 	assert (lut_in->bit_depth() == 12);
 	assert (lut_out->bit_depth() == 16);
diff --git a/src/rgb_xyz.h b/src/rgb_xyz.h
index 87959cb3..f4c8b686 100644
--- a/src/rgb_xyz.h
+++ b/src/rgb_xyz.h
@@ -19,7 +19,7 @@
 
 #include <boost/shared_ptr.hpp>
 
-namespace libdcp {
+namespace dcp {
 
 class ARGBFrame;	
 class XYZFrame;
diff --git a/src/signer.cc b/src/signer.cc
index 63da8d8e..ea13563f 100644
--- a/src/signer.cc
+++ b/src/signer.cc
@@ -30,7 +30,7 @@ using std::string;
 using std::list;
 using std::cout;
 using boost::shared_ptr;
-using namespace libdcp;
+using namespace dcp;
 
 /** @param signer_key Filename of private key to sign with */
 void
diff --git a/src/signer.h b/src/signer.h
index efb8099b..7c2864fd 100644
--- a/src/signer.h
+++ b/src/signer.h
@@ -25,7 +25,7 @@ namespace xmlpp {
 	class Node;
 }
 
-namespace libdcp {
+namespace dcp {
 
 class Signer
 {
diff --git a/src/signer_chain.cc b/src/signer_chain.cc
index d407286e..5f9941f9 100644
--- a/src/signer_chain.cc
+++ b/src/signer_chain.cc
@@ -76,7 +76,7 @@ static void command (string cmd)
 	if (code) {
 		stringstream s;
 		s << "error " << code << " in " << cmd << " within " << boost::filesystem::current_path();
-		throw libdcp::MiscError (s.str());
+		throw dcp::MiscError (s.str());
 	}
 }
 
@@ -101,7 +101,7 @@ public_key_digest (boost::filesystem::path private_key, boost::filesystem::path
 	string pub;
 	ifstream f (public_name.string().c_str ());
 	if (!f.good ()) {
-		throw libdcp::MiscError ("public key not found");
+		throw dcp::MiscError ("public key not found");
 	}
 
 	bool read = false;
@@ -120,22 +120,22 @@ public_key_digest (boost::filesystem::path private_key, boost::filesystem::path
 	/* Decode the base64 of the public key */
 		
 	unsigned char buffer[512];
-	int const N = libdcp::base64_decode (pub, buffer, 1024);
+	int const N = dcp::base64_decode (pub, buffer, 1024);
 
 	/* Hash it with SHA1 (without the first 24 bytes, for reasons that are not entirely clear) */
 
 	SHA_CTX context;
 	if (!SHA1_Init (&context)) {
-		throw libdcp::MiscError ("could not init SHA1 context");
+		throw dcp::MiscError ("could not init SHA1 context");
 	}
 
 	if (!SHA1_Update (&context, buffer + 24, N - 24)) {
-		throw libdcp::MiscError ("could not update SHA1 digest");
+		throw dcp::MiscError ("could not update SHA1 digest");
 	}
 
 	unsigned char digest[SHA_DIGEST_LENGTH];
 	if (!SHA1_Final (digest, &context)) {
-		throw libdcp::MiscError ("could not finish SHA1 digest");
+		throw dcp::MiscError ("could not finish SHA1 digest");
 	}
 
 	char digest_base64[64];
@@ -149,7 +149,7 @@ public_key_digest (boost::filesystem::path private_key, boost::filesystem::path
 }
 
 void
-libdcp::make_signer_chain (boost::filesystem::path directory, boost::filesystem::path openssl)
+dcp::make_signer_chain (boost::filesystem::path directory, boost::filesystem::path openssl)
 {
 	boost::filesystem::path const cwd = boost::filesystem::current_path ();
 
diff --git a/src/signer_chain.h b/src/signer_chain.h
index 50f56ed9..034e2290 100644
--- a/src/signer_chain.h
+++ b/src/signer_chain.h
@@ -19,7 +19,7 @@
 
 #include <boost/filesystem.hpp>
 
-namespace libdcp {
+namespace dcp {
 
 /** Create a chain of certificates for signing things.
  *  @param directory Directory to write files to.
diff --git a/src/sound_asset.cc b/src/sound_asset.cc
index 95244b90..cc537d56 100644
--- a/src/sound_asset.cc
+++ b/src/sound_asset.cc
@@ -40,7 +40,7 @@ using std::vector;
 using std::list;
 using boost::shared_ptr;
 using boost::lexical_cast;
-using namespace libdcp;
+using namespace dcp;
 
 SoundAsset::SoundAsset (boost::filesystem::path directory, boost::filesystem::path mxf_name)
 	: MXFAsset (directory, mxf_name)
diff --git a/src/sound_asset.h b/src/sound_asset.h
index d2e49bd1..f33e5aec 100644
--- a/src/sound_asset.h
+++ b/src/sound_asset.h
@@ -28,7 +28,7 @@
 #include "types.h"
 #include "metadata.h"
 
-namespace libdcp
+namespace dcp
 {
 
 class SoundFrame;
diff --git a/src/sound_frame.cc b/src/sound_frame.cc
index 6bc52c1a..06d2b88e 100644
--- a/src/sound_frame.cc
+++ b/src/sound_frame.cc
@@ -23,7 +23,7 @@
 #include "exceptions.h"
 
 using namespace std;
-using namespace libdcp;
+using namespace dcp;
 
 SoundFrame::SoundFrame (string mxf_path, int n, ASDCP::AESDecContext* c)
 {
diff --git a/src/sound_frame.h b/src/sound_frame.h
index 154ff84b..bc46b53a 100644
--- a/src/sound_frame.h
+++ b/src/sound_frame.h
@@ -30,7 +30,7 @@ namespace ASDCP {
 	class AESDecContext;
 }
 
-namespace libdcp {
+namespace dcp {
 
 class SoundFrame
 {
diff --git a/src/srgb_linearised_gamma_lut.cc b/src/srgb_linearised_gamma_lut.cc
index 0d3650f4..bab36cb1 100644
--- a/src/srgb_linearised_gamma_lut.cc
+++ b/src/srgb_linearised_gamma_lut.cc
@@ -19,7 +19,7 @@
 
 #include "srgb_linearised_gamma_lut.h"
 
-using namespace libdcp;
+using namespace dcp;
 
 LUTCache<SRGBLinearisedGammaLUT> SRGBLinearisedGammaLUT::cache;
 
diff --git a/src/srgb_linearised_gamma_lut.h b/src/srgb_linearised_gamma_lut.h
index 34800c66..68030610 100644
--- a/src/srgb_linearised_gamma_lut.h
+++ b/src/srgb_linearised_gamma_lut.h
@@ -20,7 +20,7 @@
 #include "lut.h"
 #include "lut_cache.h"
 
-namespace libdcp {
+namespace dcp {
 
 class SRGBLinearisedGammaLUT : public LUT
 {
diff --git a/src/stereo_picture_asset.cc b/src/stereo_picture_asset.cc
index 47a41cc2..bad80832 100644
--- a/src/stereo_picture_asset.cc
+++ b/src/stereo_picture_asset.cc
@@ -28,7 +28,7 @@ using std::pair;
 using std::make_pair;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
-using namespace libdcp;
+using namespace dcp;
 
 bool
 StereoPictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt, boost::function<void (NoteType, string)> note) const
diff --git a/src/stereo_picture_asset.h b/src/stereo_picture_asset.h
index 64cdb6b3..6ebc7239 100644
--- a/src/stereo_picture_asset.h
+++ b/src/stereo_picture_asset.h
@@ -22,7 +22,7 @@
 
 #include "picture_asset.h"
 
-namespace libdcp {
+namespace dcp {
 	
 /** A 3D (stereoscopic) picture asset */	
 class StereoPictureAsset : public PictureAsset
diff --git a/src/stereo_picture_asset_writer.cc b/src/stereo_picture_asset_writer.cc
index 81ce7fc0..04ca0590 100644
--- a/src/stereo_picture_asset_writer.cc
+++ b/src/stereo_picture_asset_writer.cc
@@ -29,7 +29,7 @@ using std::istream;
 using std::ostream;
 using std::string;
 using boost::shared_ptr;
-using namespace libdcp;
+using namespace dcp;
 
 struct StereoPictureAssetWriter::ASDCPState : public ASDCPStateBase
 {
@@ -47,7 +47,7 @@ StereoPictureAssetWriter::StereoPictureAssetWriter (PictureAsset* asset, bool ov
 void
 StereoPictureAssetWriter::start (uint8_t* data, int size)
 {
-	libdcp::start (this, _state, _asset, data, size);
+	dcp::start (this, _state, _asset, data, size);
 }
 
 /** Write a frame for one eye.  Frames must be written left, then right, then left etc.
diff --git a/src/stereo_picture_asset_writer.h b/src/stereo_picture_asset_writer.h
index 771524c4..96572989 100644
--- a/src/stereo_picture_asset_writer.h
+++ b/src/stereo_picture_asset_writer.h
@@ -24,7 +24,7 @@
 #include <boost/utility.hpp>
 #include "picture_asset_writer.h"
 
-namespace libdcp {
+namespace dcp {
 
 /** A helper class for writing to StereoPictureAssets progressively (i.e. writing frame-by-frame,
  *  rather than giving libdcp all the frames in one go).
@@ -56,7 +56,7 @@ private:
 	struct ASDCPState;
 	boost::shared_ptr<ASDCPState> _state;
 
-	libdcp::Eye _next_eye;
+	dcp::Eye _next_eye;
 };
 
 }
diff --git a/src/stereo_picture_frame.cc b/src/stereo_picture_frame.cc
index dce1f106..8f318371 100644
--- a/src/stereo_picture_frame.cc
+++ b/src/stereo_picture_frame.cc
@@ -32,7 +32,7 @@
 
 using std::string;
 using boost::shared_ptr;
-using namespace libdcp;
+using namespace dcp;
 
 /** Make a picture frame from a 3D (stereoscopic) asset.
  *  @param mxf_path Path to the asset's MXF file.
diff --git a/src/stereo_picture_frame.h b/src/stereo_picture_frame.h
index ab99ceac..40c2a441 100644
--- a/src/stereo_picture_frame.h
+++ b/src/stereo_picture_frame.h
@@ -29,7 +29,7 @@ namespace ASDCP {
 	class AESDecContext;
 }
 
-namespace libdcp {
+namespace dcp {
 
 class ARGBFrame;
 
diff --git a/src/subtitle_asset.cc b/src/subtitle_asset.cc
index a48a614d..d67e3625 100644
--- a/src/subtitle_asset.cc
+++ b/src/subtitle_asset.cc
@@ -34,7 +34,7 @@ using std::stringstream;
 using boost::shared_ptr;
 using boost::lexical_cast;
 using boost::optional;
-using namespace libdcp;
+using namespace dcp;
 
 SubtitleAsset::SubtitleAsset (string directory, string xml_file)
 	: Asset (directory, xml_file)
@@ -66,8 +66,8 @@ SubtitleAsset::read_xml (string xml_file)
 
 	xml->ignore_child ("LoadFont");
 
-	list<shared_ptr<libdcp::parse::Font> > font_nodes = type_children<libdcp::parse::Font> (xml, "Font");
-	_load_font_nodes = type_children<libdcp::parse::LoadFont> (xml, "LoadFont");
+	list<shared_ptr<dcp::parse::Font> > font_nodes = type_children<dcp::parse::Font> (xml, "Font");
+	_load_font_nodes = type_children<dcp::parse::LoadFont> (xml, "LoadFont");
 
 	/* Now make Subtitle objects to represent the raw XML nodes
 	   in a sane way.
@@ -80,16 +80,16 @@ SubtitleAsset::read_xml (string xml_file)
 void
 SubtitleAsset::examine_font_nodes (
 	shared_ptr<const cxml::Node> xml,
-	list<shared_ptr<libdcp::parse::Font> > const & font_nodes,
+	list<shared_ptr<dcp::parse::Font> > const & font_nodes,
 	ParseState& parse_state
 	)
 {
-	for (list<shared_ptr<libdcp::parse::Font> >::const_iterator i = font_nodes.begin(); i != font_nodes.end(); ++i) {
+	for (list<shared_ptr<dcp::parse::Font> >::const_iterator i = font_nodes.begin(); i != font_nodes.end(); ++i) {
 
 		parse_state.font_nodes.push_back (*i);
 		maybe_add_subtitle ((*i)->text, parse_state);
 
-		for (list<shared_ptr<libdcp::parse::Subtitle> >::iterator j = (*i)->subtitle_nodes.begin(); j != (*i)->subtitle_nodes.end(); ++j) {
+		for (list<shared_ptr<dcp::parse::Subtitle> >::iterator j = (*i)->subtitle_nodes.begin(); j != (*i)->subtitle_nodes.end(); ++j) {
 			parse_state.subtitle_nodes.push_back (*j);
 			examine_text_nodes (xml, (*j)->text_nodes, parse_state);
 			examine_font_nodes (xml, (*j)->font_nodes, parse_state);
@@ -106,11 +106,11 @@ SubtitleAsset::examine_font_nodes (
 void
 SubtitleAsset::examine_text_nodes (
 	shared_ptr<const cxml::Node> xml,
-	list<shared_ptr<libdcp::parse::Text> > const & text_nodes,
+	list<shared_ptr<dcp::parse::Text> > const & text_nodes,
 	ParseState& parse_state
 	)
 {
-	for (list<shared_ptr<libdcp::parse::Text> >::const_iterator i = text_nodes.begin(); i != text_nodes.end(); ++i) {
+	for (list<shared_ptr<dcp::parse::Text> >::const_iterator i = text_nodes.begin(); i != text_nodes.end(); ++i) {
 		parse_state.text_nodes.push_back (*i);
 		maybe_add_subtitle ((*i)->text, parse_state);
 		examine_font_nodes (xml, (*i)->font_nodes, parse_state);
@@ -132,9 +132,9 @@ SubtitleAsset::maybe_add_subtitle (string text, ParseState const & parse_state)
 	assert (!parse_state.text_nodes.empty ());
 	assert (!parse_state.subtitle_nodes.empty ());
 	
-	libdcp::parse::Font effective_font (parse_state.font_nodes);
-	libdcp::parse::Text effective_text (*parse_state.text_nodes.back ());
-	libdcp::parse::Subtitle effective_subtitle (*parse_state.subtitle_nodes.back ());
+	dcp::parse::Font effective_font (parse_state.font_nodes);
+	dcp::parse::Text effective_text (*parse_state.text_nodes.back ());
+	dcp::parse::Subtitle effective_subtitle (*parse_state.subtitle_nodes.back ());
 
 	_subtitles.push_back (
 		shared_ptr<Subtitle> (
@@ -173,7 +173,7 @@ SubtitleAsset::subtitles_at (Time t) const
 std::string
 SubtitleAsset::font_id_to_name (string id) const
 {
-	list<shared_ptr<libdcp::parse::LoadFont> >::const_iterator i = _load_font_nodes.begin();
+	list<shared_ptr<dcp::parse::LoadFont> >::const_iterator i = _load_font_nodes.begin();
 	while (i != _load_font_nodes.end() && (*i)->id != id) {
 		++i;
 	}
@@ -233,7 +233,7 @@ Subtitle::size_in_pixels (int screen_height) const
 }
 
 bool
-libdcp::operator== (Subtitle const & a, Subtitle const & b)
+dcp::operator== (Subtitle const & a, Subtitle const & b)
 {
 	return (
 		a.font() == b.font() &&
@@ -253,7 +253,7 @@ libdcp::operator== (Subtitle const & a, Subtitle const & b)
 }
 
 ostream&
-libdcp::operator<< (ostream& s, Subtitle const & sub)
+dcp::operator<< (ostream& s, Subtitle const & sub)
 {
 	s << "\n`" << sub.text() << "' from " << sub.in() << " to " << sub.out() << ";\n"
 	  << "fade up " << sub.fade_up_time() << ", fade down " << sub.fade_down_time() << ";\n"
diff --git a/src/subtitle_asset.h b/src/subtitle_asset.h
index 74ab9873..e5e2e853 100644
--- a/src/subtitle_asset.h
+++ b/src/subtitle_asset.h
@@ -24,7 +24,7 @@
 #include "asset.h"
 #include "dcp_time.h"
 
-namespace libdcp
+namespace dcp
 {
 
 namespace parse
diff --git a/src/types.cc b/src/types.cc
index 693b9ab2..113fc85f 100644
--- a/src/types.cc
+++ b/src/types.cc
@@ -7,7 +7,7 @@
 #include "exceptions.h"
 
 using namespace std;
-using namespace libdcp;
+using namespace dcp;
 using namespace boost;
 
 Fraction::Fraction (string s)
@@ -22,13 +22,13 @@ Fraction::Fraction (string s)
 }
 
 bool
-libdcp::operator== (Fraction const & a, Fraction const & b)
+dcp::operator== (Fraction const & a, Fraction const & b)
 {
 	return (a.numerator == b.numerator && a.denominator == b.denominator);
 }
 
 bool
-libdcp::operator!= (Fraction const & a, Fraction const & b)
+dcp::operator!= (Fraction const & a, Fraction const & b)
 {
 	return (a.numerator != b.numerator || a.denominator != b.denominator);
 }
@@ -84,7 +84,7 @@ Color::to_argb_string () const
  *  @param b Second color to compare.
  */
 bool
-libdcp::operator== (Color const & a, Color const & b)
+dcp::operator== (Color const & a, Color const & b)
 {
 	return (a.r == b.r && a.g == b.g && a.b == b.b);
 }
@@ -94,20 +94,20 @@ libdcp::operator== (Color const & a, Color const & b)
  *  @param b Second color to compare.
  */
 bool
-libdcp::operator!= (Color const & a, Color const & b)
+dcp::operator!= (Color const & a, Color const & b)
 {
 	return !(a == b);
 }
 
 ostream &
-libdcp::operator<< (ostream& s, Color const & c)
+dcp::operator<< (ostream& s, Color const & c)
 {
 	s << "(" << c.r << ", " << c.g << ", " << c.b << ")";
 	return s;
 }
 
 string
-libdcp::effect_to_string (Effect e)
+dcp::effect_to_string (Effect e)
 {
 	switch (e) {
 	case NONE:
@@ -122,7 +122,7 @@ libdcp::effect_to_string (Effect e)
 }
 
 Effect
-libdcp::string_to_effect (string s)
+dcp::string_to_effect (string s)
 {
 	if (s == "none") {
 		return NONE;
@@ -136,7 +136,7 @@ libdcp::string_to_effect (string s)
 }
 
 string
-libdcp::valign_to_string (VAlign v)
+dcp::valign_to_string (VAlign v)
 {
 	switch (v) {
 	case TOP:
@@ -151,7 +151,7 @@ libdcp::valign_to_string (VAlign v)
 }
 
 VAlign
-libdcp::string_to_valign (string s)
+dcp::string_to_valign (string s)
 {
 	if (s == "top") {
 		return TOP;
diff --git a/src/types.h b/src/types.h
index 013c1863..021d1ecf 100644
--- a/src/types.h
+++ b/src/types.h
@@ -27,7 +27,7 @@
 #include <string>
 #include <boost/shared_ptr.hpp>
 
-namespace libdcp
+namespace dcp
 {
 
 namespace parse {
diff --git a/src/util.cc b/src/util.cc
index a668b7fc..3807b4cc 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -56,13 +56,13 @@ using std::setw;
 using std::setfill;
 using boost::shared_ptr;
 using boost::lexical_cast;
-using namespace libdcp;
+using namespace dcp;
 
 /** Create a UUID.
  *  @return UUID.
  */
 string
-libdcp::make_uuid ()
+dcp::make_uuid ()
 {
 	char buffer[64];
 	Kumu::UUID id;
@@ -79,7 +79,7 @@ libdcp::make_uuid ()
  *  @return Digest.
  */
 string
-libdcp::make_digest (string filename, boost::function<void (float)>* progress)
+dcp::make_digest (string filename, boost::function<void (float)>* progress)
 {
 	Kumu::FileReader reader;
 	Kumu::Result_t r = reader.OpenRead (filename.c_str ());
@@ -126,7 +126,7 @@ libdcp::make_digest (string filename, boost::function<void (float)>* progress)
  *  @return string.
  */
 string
-libdcp::content_kind_to_string (ContentKind kind)
+dcp::content_kind_to_string (ContentKind kind)
 {
 	switch (kind) {
 	case FEATURE:
@@ -159,8 +159,8 @@ libdcp::content_kind_to_string (ContentKind kind)
  *  @param type Content kind string.
  *  @return libdcp ContentKind.
  */
-libdcp::ContentKind
-libdcp::content_kind_from_string (string type)
+dcp::ContentKind
+dcp::content_kind_from_string (string type)
 {
 	transform (type.begin(), type.end(), type.begin(), ::tolower);
 	
@@ -198,8 +198,8 @@ libdcp::content_kind_from_string (string type)
  *  This is useful for scaling 4K DCP images down to 2K.
  *  @return XYZ image.
  */
-shared_ptr<libdcp::XYZFrame>
-libdcp::decompress_j2k (uint8_t* data, int64_t size, int reduce)
+shared_ptr<dcp::XYZFrame>
+dcp::decompress_j2k (uint8_t* data, int64_t size, int reduce)
 {
 	opj_dinfo_t* decoder = opj_create_decompress (CODEC_J2K);
 	opj_dparameters_t parameters;
@@ -226,7 +226,7 @@ libdcp::decompress_j2k (uint8_t* data, int64_t size, int reduce)
  *  @return true if the string contains only space, newline or tab characters, or is empty.
  */
 bool
-libdcp::empty_or_white_space (string s)
+dcp::empty_or_white_space (string s)
 {
 	for (size_t i = 0; i < s.length(); ++i) {
 		if (s[i] != ' ' && s[i] != '\n' && s[i] != '\t') {
@@ -238,7 +238,7 @@ libdcp::empty_or_white_space (string s)
 }
 
 void
-libdcp::init ()
+dcp::init ()
 {
 	if (xmlSecInit() < 0) {
 		throw MiscError ("could not initialise xmlsec");
@@ -259,12 +259,12 @@ libdcp::init ()
 	}
 }
 
-bool libdcp::operator== (libdcp::Size const & a, libdcp::Size const & b)
+bool dcp::operator== (dcp::Size const & a, dcp::Size const & b)
 {
 	return (a.width == b.width && a.height == b.height);
 }
 
-bool libdcp::operator!= (libdcp::Size const & a, libdcp::Size const & b)
+bool dcp::operator!= (dcp::Size const & a, dcp::Size const & b)
 {
 	return !(a == b);
 }
@@ -273,7 +273,7 @@ bool libdcp::operator!= (libdcp::Size const & a, libdcp::Size const & b)
  *  this and the command-line base64 for some inputs.  Not sure why.
  */
 int
-libdcp::base64_decode (string const & in, unsigned char* out, int out_length)
+dcp::base64_decode (string const & in, unsigned char* out, int out_length)
 {
 	BIO* b64 = BIO_new (BIO_f_base64 ());
 
@@ -298,7 +298,7 @@ libdcp::base64_decode (string const & in, unsigned char* out, int out_length)
 }
 
 string
-libdcp::tm_to_string (struct tm* tm)
+dcp::tm_to_string (struct tm* tm)
 {
 	char buffer[64];
 	strftime (buffer, 64, "%Y-%m-%dT%H:%M:%S", tm);
@@ -320,7 +320,7 @@ libdcp::tm_to_string (struct tm* tm)
  *  @return string of the form e.g. -01:00.
  */
 string
-libdcp::utc_offset_to_string (int b)
+dcp::utc_offset_to_string (int b)
 {
 	bool const negative = (b < 0);
 	b = negative ? -b : b;
@@ -340,7 +340,7 @@ libdcp::utc_offset_to_string (int b)
 }
 
 string
-libdcp::ptime_to_string (boost::posix_time::ptime t)
+dcp::ptime_to_string (boost::posix_time::ptime t)
 {
 	struct tm t_tm = boost::posix_time::to_tm (t);
 	return tm_to_string (&t_tm);
@@ -352,7 +352,7 @@ libdcp::ptime_to_string (boost::posix_time::ptime t)
    with this wrapper.
 */
 FILE *
-libdcp::fopen_boost (boost::filesystem::path p, string t)
+dcp::fopen_boost (boost::filesystem::path p, string t)
 {
 #ifdef LIBDCP_WINDOWS
         wstring w (t.begin(), t.end());
diff --git a/src/util.h b/src/util.h
index 2a6aae1b..f12f0ff0 100644
--- a/src/util.h
+++ b/src/util.h
@@ -37,7 +37,7 @@ namespace xmlpp {
 	class Element;
 }
 
-namespace libdcp {
+namespace dcp {
 
 class ARGBFrame;
 class CertificateChain;
diff --git a/src/version.h b/src/version.h
index 52abd13a..9b6dc65f 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,5 +1,5 @@
 
-namespace libdcp {
+namespace dcp {
 
 extern char const * version;
 extern char const * git_commit;
diff --git a/src/xml.h b/src/xml.h
index 5978ff7e..665cfe43 100644
--- a/src/xml.h
+++ b/src/xml.h
@@ -23,7 +23,7 @@
 #include <libcxml/cxml.h>
 #include "exceptions.h"
 
-namespace libdcp
+namespace dcp
 {
 
 template <class T>
diff --git a/src/xml/kdm_smpte.h b/src/xml/kdm_smpte.h
index 32a297f8..49281d70 100644
--- a/src/xml/kdm_smpte.h
+++ b/src/xml/kdm_smpte.h
@@ -41,7 +41,7 @@
 #include <libcxml/cxml.h>
 #include "../exceptions.h"
 
-namespace libdcp {
+namespace dcp {
 namespace xml {
 
 class Writer
diff --git a/src/xyz_frame.cc b/src/xyz_frame.cc
index f5b0ee86..e75a43bc 100644
--- a/src/xyz_frame.cc
+++ b/src/xyz_frame.cc
@@ -21,7 +21,7 @@
 #include <stdexcept>
 #include "xyz_frame.h"
 
-using namespace libdcp;
+using namespace dcp;
 
 /** Construct an XYZFrame, taking ownership of the opj_image_t */
 XYZFrame::XYZFrame (opj_image_t* image)
@@ -70,9 +70,9 @@ XYZFrame::data (int c) const
 	return _opj_image->comps[c].data;
 }
 
-libdcp::Size
+dcp::Size
 XYZFrame::size () const
 {
 	/* XXX: this may not be right; x0 and y0 can presumably be non-zero */
-	return libdcp::Size (_opj_image->x1, _opj_image->y1);
+	return dcp::Size (_opj_image->x1, _opj_image->y1);
 }
diff --git a/src/xyz_frame.h b/src/xyz_frame.h
index a4dcb2c0..2118331c 100644
--- a/src/xyz_frame.h
+++ b/src/xyz_frame.h
@@ -20,7 +20,7 @@
 #include <openjpeg.h>
 #include "util.h"
 
-namespace libdcp {
+namespace dcp {
 
 class XYZFrame
 {
@@ -30,7 +30,7 @@ public:
 	~XYZFrame ();
 
 	int* data (int) const;
-	libdcp::Size size () const;
+	dcp::Size size () const;
 
 	opj_image_t* opj_image () const {
 		return _opj_image;