Merge branch 'content-rework-take5' of /home/carl/git/dvdomatic into content-rework-take5

67 files changed, 303 insertions, 881 deletions

diff --git a/src/lib/audio_analysis.h b/src/lib/audio_analysis.h
index 6e0e2b78a..ec6905105 100644
--- a/src/lib/audio_analysis.h
+++ b/src/lib/audio_analysis.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_AUDIO_ANALYSIS_H
-#define DVDOMATIC_AUDIO_ANALYSIS_H
+#ifndef DCPOMATIC_AUDIO_ANALYSIS_H
+#define DCPOMATIC_AUDIO_ANALYSIS_H
 
 #include <iostream>
 #include <vector>
diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index dbd55943d..2362786d9 100644
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_AUDIO_CONTENT_H
-#define DVDOMATIC_AUDIO_CONTENT_H
+#ifndef DCPOMATIC_AUDIO_CONTENT_H
+#define DCPOMATIC_AUDIO_CONTENT_H
 
 #include "content.h"
 #include "util.h"
diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 24e2796ae..418fc6da2 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -21,8 +21,8 @@
  *  @brief Parent class for audio decoders.
  */
 
-#ifndef DVDOMATIC_AUDIO_DECODER_H
-#define DVDOMATIC_AUDIO_DECODER_H
+#ifndef DCPOMATIC_AUDIO_DECODER_H
+#define DCPOMATIC_AUDIO_DECODER_H
 
 #include "audio_source.h"
 #include "decoder.h"
diff --git a/src/lib/audio_mapping.h b/src/lib/audio_mapping.h
index 4f2cdb7f8..248d2570e 100644
--- a/src/lib/audio_mapping.h
+++ b/src/lib/audio_mapping.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_AUDIO_MAPPING_H
-#define DVDOMATIC_AUDIO_MAPPING_H
+#ifndef DCPOMATIC_AUDIO_MAPPING_H
+#define DCPOMATIC_AUDIO_MAPPING_H
 
 #include <list>
 #include <string>
diff --git a/src/lib/audio_sink.h b/src/lib/audio_sink.h
index 11d578a60..085491657 100644
--- a/src/lib/audio_sink.h
+++ b/src/lib/audio_sink.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_AUDIO_SINK_H
-#define DVDOMATIC_AUDIO_SINK_H
+#ifndef DCPOMATIC_AUDIO_SINK_H
+#define DCPOMATIC_AUDIO_SINK_H
 
 class AudioSink
 {
diff --git a/src/lib/audio_source.h b/src/lib/audio_source.h
index 5a1510d3c..ee5c606dc 100644
--- a/src/lib/audio_source.h
+++ b/src/lib/audio_source.h
@@ -21,8 +21,8 @@
  *  @brief Parent class for classes which emit audio data.
  */
 
-#ifndef DVDOMATIC_AUDIO_SOURCE_H
-#define DVDOMATIC_AUDIO_SOURCE_H
+#ifndef DCPOMATIC_AUDIO_SOURCE_H
+#define DCPOMATIC_AUDIO_SOURCE_H
 
 #include <boost/signals2.hpp>
 
diff --git a/src/lib/config.cc b/src/lib/config.cc
index 2defa0539..354940b1c 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -155,9 +155,9 @@ Config::file (bool old) const
 	boost::filesystem::path p;
 	p /= g_get_user_config_dir ();
 	if (old) {
-		p /= ".dvdomatic";
+		p /= ".dcpomatic";
 	} else {
-		p /= ".dvdomatic.xml";
+		p /= ".dcpomatic.xml";
 	}
 	return p.string ();
 }
diff --git a/src/lib/config.h b/src/lib/config.h
index 13d36d236..57f4fb8a9 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -21,8 +21,8 @@
  *  @brief Class holding configuration.
  */
 
-#ifndef DVDOMATIC_CONFIG_H
-#define DVDOMATIC_CONFIG_H
+#ifndef DCPOMATIC_CONFIG_H
+#define DCPOMATIC_CONFIG_H
 
 #include <vector>
 #include <boost/shared_ptr.hpp>
diff --git a/src/lib/content.h b/src/lib/content.h
index c8aa6b0e0..d39fc9e1a 100644
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_CONTENT_H
-#define DVDOMATIC_CONTENT_H
+#ifndef DCPOMATIC_CONTENT_H
+#define DCPOMATIC_CONTENT_H
 
 #include <boost/filesystem.hpp>
 #include <boost/signals2.hpp>
diff --git a/src/lib/cross.cc b/src/lib/cross.cc
index 2c66ab53a..f232f1779 100644
--- a/src/lib/cross.cc
+++ b/src/lib/cross.cc
@@ -18,20 +18,20 @@
 */
 
 #include "cross.h"
-#ifdef DVDOMATIC_POSIX
+#ifdef DCPOMATIC_POSIX
 #include <unistd.h>
 #endif
-#ifdef DVDOMATIC_WINDOWS
+#ifdef DCPOMATIC_WINDOWS
 #include "windows.h"
 #endif
 
 void
-dvdomatic_sleep (int s)
+dcpomatic_sleep (int s)
 {
-#ifdef DVDOMATIC_POSIX
+#ifdef DCPOMATIC_POSIX
 	sleep (s);
 #endif
-#ifdef DVDOMATIC_WINDOWS
+#ifdef DCPOMATIC_WINDOWS
 	Sleep (s * 1000);
 #endif
 }
diff --git a/src/lib/cross.h b/src/lib/cross.h
index 110660b16..00457c968 100644
--- a/src/lib/cross.h
+++ b/src/lib/cross.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifdef DVDOMATIC_WINDOWS
+#ifdef DCPOMATIC_WINDOWS
 #define WEXITSTATUS(w) (w)
 #endif
 
-void dvdomatic_sleep (int);
+void dcpomatic_sleep (int);
diff --git a/src/lib/dci_metadata.h b/src/lib/dci_metadata.h
index f61dae5a8..b87609ed0 100644
--- a/src/lib/dci_metadata.h
+++ b/src/lib/dci_metadata.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_DCI_METADATA_H
-#define DVDOMATIC_DCI_METADATA_H
+#ifndef DCPOMATIC_DCI_METADATA_H
+#define DCPOMATIC_DCI_METADATA_H
 
 #include <string>
 #include <libxml++/libxml++.h>
diff --git a/src/lib/dcp_content_type.h b/src/lib/dcp_content_type.h
index 960bb0129..14204bd72 100644
--- a/src/lib/dcp_content_type.h
+++ b/src/lib/dcp_content_type.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_DCP_CONTENT_TYPE_H
-#define DVDOMATIC_DCP_CONTENT_TYPE_H
+#ifndef DCPOMATIC_DCP_CONTENT_TYPE_H
+#define DCPOMATIC_DCP_CONTENT_TYPE_H
 
 /** @file src/content_type.h
  *  @brief A description of the type of content for a DCP (e.g. feature, trailer etc.)
diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index e9499871a..da51665d1 100644
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -266,7 +266,7 @@ DCPVideoFrame::encode_locally ()
 	_parameters->tcp_numlayers++;
 	_parameters->cp_disto_alloc = 1;
 	_parameters->cp_rsiz = CINEMA2K;
-	_parameters->cp_comment = strdup (N_("DVD-o-matic"));
+	_parameters->cp_comment = strdup (N_("DCP-o-matic"));
 	_parameters->cp_cinema = CINEMA2K_24;
 
 	/* 3 components, so use MCT */
diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 0fffef257..72b866ffe 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -21,8 +21,8 @@
  *  @brief Parent class for decoders of content.
  */
 
-#ifndef DVDOMATIC_DECODER_H
-#define DVDOMATIC_DECODER_H
+#ifndef DCPOMATIC_DECODER_H
+#define DCPOMATIC_DECODER_H
 
 #include <vector>
 #include <string>
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index d6a57ae6b..3201e6ecb 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -423,7 +423,7 @@ Encoder::encoder_thread (ServerDescription* server)
 		}
 
 		if (remote_backoff > 0) {
-			dvdomatic_sleep (remote_backoff);
+			dcpomatic_sleep (remote_backoff);
 		}
 
 		lock.lock ();
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 70e6eea9a..56007fd48 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_ENCODER_H
-#define DVDOMATIC_ENCODER_H
+#ifndef DCPOMATIC_ENCODER_H
+#define DCPOMATIC_ENCODER_H
 
 /** @file src/encoder.h
  *  @brief Encoder to J2K and WAV for DCP.
diff --git a/src/lib/exceptions.h b/src/lib/exceptions.h
index 6920556e5..6bad7c924 100644
--- a/src/lib/exceptions.h
+++ b/src/lib/exceptions.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_EXCEPTIONS_H
-#define DVDOMATIC_EXCEPTIONS_H
+#ifndef DCPOMATIC_EXCEPTIONS_H
+#define DCPOMATIC_EXCEPTIONS_H
 
 /** @file  src/exceptions.h
  *  @brief Our exceptions.
diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index b49e5790e..8bf4d42a5 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_FFMPEG_CONTENT_H
-#define DVDOMATIC_FFMPEG_CONTENT_H
+#ifndef DCPOMATIC_FFMPEG_CONTENT_H
+#define DCPOMATIC_FFMPEG_CONTENT_H
 
 #include <boost/enable_shared_from_this.hpp>
 #include "video_content.h"
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 6ab6551da..67605ffca 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -254,7 +254,7 @@ Film::make_dcp ()
 		throw BadSettingError (_("name"), _("cannot contain slashes"));
 	}
 	
-	log()->log (String::compose ("DVD-o-matic %1 git %2 using %3", dvdomatic_version, dvdomatic_git_commit, dependency_version_summary()));
+	log()->log (String::compose ("DCP-o-matic %1 git %2 using %3", dcpomatic_version, dcpomatic_git_commit, dependency_version_summary()));
 
 	{
 		char buffer[128];
@@ -270,10 +270,10 @@ Film::make_dcp ()
 //	log()->log (String::compose ("Content at %1 fps, DCP at %2 fps", source_frame_rate(), dcp_frame_rate()));
 	log()->log (String::compose ("%1 threads", Config::instance()->num_local_encoding_threads()));
 	log()->log (String::compose ("J2K bandwidth %1", j2k_bandwidth()));
-#ifdef DVDOMATIC_DEBUG
-	log()->log ("DVD-o-matic built in debug mode.");
+#ifdef DCPOMATIC_DEBUG
+	log()->log ("DCP-o-matic built in debug mode.");
 #else
-	log()->log ("DVD-o-matic built in optimised mode.");
+	log()->log ("DCP-o-matic built in optimised mode.");
 #endif
 #ifdef LIBDCP_DEBUG
 	log()->log ("libdcp built in debug mode.");
@@ -432,7 +432,7 @@ Film::read_metadata ()
 	boost::mutex::scoped_lock lm (_state_mutex);
 
 	if (boost::filesystem::exists (file ("metadata")) && !boost::filesystem::exists (file ("metadata.xml"))) {
-		throw StringError (_("This film was created with an older version of DVD-o-matic, and unfortunately it cannot be loaded into this version.  You will need to create a new Film, re-add your content and set it up again.  Sorry!"));
+		throw StringError (_("This film was created with an older version of DCP-o-matic, and unfortunately it cannot be loaded into this version.  You will need to create a new Film, re-add your content and set it up again.  Sorry!"));
 	}
 
 	cxml::File f (file ("metadata.xml"), "Metadata");
diff --git a/src/lib/film.h b/src/lib/film.h
index 4d994996e..ffa5d0690 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -22,8 +22,8 @@
  *  how they should be presented in a DCP.
  */
 
-#ifndef DVDOMATIC_FILM_H
-#define DVDOMATIC_FILM_H
+#ifndef DCPOMATIC_FILM_H
+#define DCPOMATIC_FILM_H
 
 #include <string>
 #include <vector>
@@ -336,7 +336,7 @@ private:
 	/** Mutex for _directory */
 	mutable boost::mutex _directory_mutex;
 	
-	/** Name for DVD-o-matic */
+	/** Name for DCP-o-matic */
 	std::string _name;
 	/** True if a auto-generated DCI-compliant name should be used for our DCP */
 	bool _use_dci_name;
diff --git a/src/lib/filter.h b/src/lib/filter.h
index 205d92482..7587312c2 100644
--- a/src/lib/filter.h
+++ b/src/lib/filter.h
@@ -21,8 +21,8 @@
  *  @brief A class to describe one of FFmpeg's video or post-processing filters.
  */
 
-#ifndef DVDOMATIC_FILTER_H
-#define DVDOMATIC_FILTER_H
+#ifndef DCPOMATIC_FILTER_H
+#define DCPOMATIC_FILTER_H
 
 #include <string>
 #include <vector>
diff --git a/src/lib/filter_graph.h b/src/lib/filter_graph.h
index db86a677d..1ff5527ab 100644
--- a/src/lib/filter_graph.h
+++ b/src/lib/filter_graph.h
@@ -21,8 +21,8 @@
  *  @brief A graph of FFmpeg filters.
  */
 
-#ifndef DVDOMATIC_FILTER_GRAPH_H
-#define DVDOMATIC_FILTER_GRAPH_H
+#ifndef DCPOMATIC_FILTER_GRAPH_H
+#define DCPOMATIC_FILTER_GRAPH_H
 
 #include "util.h"
 #include "ffmpeg_compatibility.h"
diff --git a/src/lib/i18n.h b/src/lib/i18n.h
index 46bb1d565..890313bc6 100644
--- a/src/lib/i18n.h
+++ b/src/lib/i18n.h
@@ -19,5 +19,5 @@
 
 #include <libintl.h>
 
-#define _(x) dgettext ("libdvdomatic", x)
+#define _(x) dgettext ("libdcpomatic", x)
 #define N_(x) x
diff --git a/src/lib/image.h b/src/lib/image.h
index 6b9ade99e..1d7d75dfc 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -21,8 +21,8 @@
  *  @brief A set of classes to describe video images.
  */
 
-#ifndef DVDOMATIC_IMAGE_H
-#define DVDOMATIC_IMAGE_H
+#ifndef DCPOMATIC_IMAGE_H
+#define DCPOMATIC_IMAGE_H
 
 #include <string>
 #include <boost/shared_ptr.hpp>
diff --git a/src/lib/job.cc b/src/lib/job.cc
index f830975af..812380594 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -91,7 +91,7 @@ Job::run_wrapper ()
 		set_state (FINISHED_ERROR);
 		set_error (
 			e.what (),
-			_("It is not known what caused this error.  The best idea is to report the problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)")
+			_("It is not known what caused this error.  The best idea is to report the problem to the DCP-o-matic mailing list (dcpomatic@carlh.net)")
 			);
 
 	} catch (...) {
@@ -100,7 +100,7 @@ Job::run_wrapper ()
 		set_state (FINISHED_ERROR);
 		set_error (
 			_("Unknown error"),
-			_("It is not known what caused this error.  The best idea is to report the problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)")
+			_("It is not known what caused this error.  The best idea is to report the problem to the DCP-o-matic mailing list (dcpomatic@carlh.net)")
 			);
 
 	}
diff --git a/src/lib/job.h b/src/lib/job.h
index f5175c525..2119db2f3 100644
--- a/src/lib/job.h
+++ b/src/lib/job.h
@@ -21,8 +21,8 @@
  *  @brief A parent class to represent long-running tasks which are run in their own thread.
  */
 
-#ifndef DVDOMATIC_JOB_H
-#define DVDOMATIC_JOB_H
+#ifndef DCPOMATIC_JOB_H
+#define DCPOMATIC_JOB_H
 
 #include <string>
 #include <boost/thread/mutex.hpp>
diff --git a/src/lib/job_manager.cc b/src/lib/job_manager.cc
index 910597628..f96275467 100644
--- a/src/lib/job_manager.cc
+++ b/src/lib/job_manager.cc
@@ -126,7 +126,7 @@ JobManager::scheduler ()
 			}
 		}
 
-		dvdomatic_sleep (1);
+		dcpomatic_sleep (1);
 	}
 }
 
diff --git a/src/lib/log.h b/src/lib/log.h
index 3a2cfcbfd..3ad6516c1 100644
--- a/src/lib/log.h
+++ b/src/lib/log.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_LOG_H
-#define DVDOMATIC_LOG_H
+#ifndef DCPOMATIC_LOG_H
+#define DCPOMATIC_LOG_H
 
 /** @file src/log.h
  *  @brief A very simple logging class.
diff --git a/src/lib/player.h b/src/lib/player.h
index 7a99d6561..9a55b8599 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_PLAYER_H
-#define DVDOMATIC_PLAYER_H
+#ifndef DCPOMATIC_PLAYER_H
+#define DCPOMATIC_PLAYER_H
 
 #include <list>
 #include <boost/shared_ptr.hpp>
diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index 17051bd98..5c8d642e3 100644
--- a/src/lib/po/es_ES.po
+++ b/src/lib/po/es_ES.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: LIBDVDOMATIC\n"
+"Project-Id-Version: LIBDCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-04-09 11:14+0100\n"
 "PO-Revision-Date: 2013-04-02 19:10-0500\n"
@@ -250,10 +250,10 @@ msgstr "Horizontal deblocking filter A"
 #: src/lib/job.cc:92 src/lib/job.cc:101
 msgid ""
 "It is not known what caused this error.  The best idea is to report the "
-"problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)"
+"problem to the DCP-o-matic mailing list (dcpomatic@carlh.net)"
 msgstr ""
 "Error desconocido. La mejor idea es informar del problema a la lista de "
-"correo de DVD-O-matic (dvdomatic@carlh.net)"
+"correo de DCP-o-matic (dcpomatic@carlh.net)"
 
 #: src/lib/filter.cc:82
 msgid "Kernel deinterlacer"
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index d9d945b52..af6890d97 100644
--- a/src/lib/po/fr_FR.po
+++ b/src/lib/po/fr_FR.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: DVD-o-matic FRENCH\n"
+"Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-04-09 11:14+0100\n"
 "PO-Revision-Date: 2013-03-20 00:39+0100\n"
@@ -248,10 +248,10 @@ msgstr "Filtre dé-bloc horizontal"
 #: src/lib/job.cc:92 src/lib/job.cc:101
 msgid ""
 "It is not known what caused this error.  The best idea is to report the "
-"problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)"
+"problem to the DCP-o-matic mailing list (dcpomatic@carlh.net)"
 msgstr ""
-"Erreur indéterminée. Merci de rapporter le problème à la liste DVD-o-matic "
-"(dvdomatic@carlh.net)"
+"Erreur indéterminée. Merci de rapporter le problème à la liste DCP-o-matic "
+"(dcpomatic@carlh.net)"
 
 #: src/lib/filter.cc:82
 msgid "Kernel deinterlacer"
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index 992eda107..c1ca26ea3 100644
--- a/src/lib/po/it_IT.po
+++ b/src/lib/po/it_IT.po
@@ -248,10 +248,10 @@ msgstr "Filtro A sblocco orizzontale"
 #: src/lib/job.cc:92 src/lib/job.cc:101
 msgid ""
 "It is not known what caused this error.  The best idea is to report the "
-"problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)"
+"problem to the DCP-o-matic mailing list (dcpomatic@carlh.net)"
 msgstr ""
 "Non sappiamo cosa ha causato questo errore. La cosa migliore è inviare un "
-"report del problema alla mailing list di DVD-o-matic (dvdomatic@carlh.net)"
+"report del problema alla mailing list di DCP-o-matic (dcpomatic@carlh.net)"
 
 #: src/lib/filter.cc:82
 msgid "Kernel deinterlacer"
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index d574261c8..c8695ce4d 100644
--- a/src/lib/po/sv_SE.po
+++ b/src/lib/po/sv_SE.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: DVD-o-matic\n"
+"Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-04-09 11:14+0100\n"
 "PO-Revision-Date: 2013-04-09 10:13+0100\n"
@@ -249,10 +249,10 @@ msgstr "Filter för horisontal kantighetsutjämning A"
 #: src/lib/job.cc:92 src/lib/job.cc:101
 msgid ""
 "It is not known what caused this error.  The best idea is to report the "
-"problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)"
+"problem to the DCP-o-matic mailing list (dcpomatic@carlh.net)"
 msgstr ""
 "Det är inte känt vad som orsakade detta fel. Bästa sättet att rapportera "
-"problemet är till DVD-o-matics mejl-lista (dvdomatic@carlh.net)"
+"problemet är till DCP-o-matics mejl-lista (dcpomatic@carlh.net)"
 
 #: src/lib/filter.cc:82
 msgid "Kernel deinterlacer"
diff --git a/src/lib/processor.h b/src/lib/processor.h
index 1ba396f2f..5dbafab7f 100644
--- a/src/lib/processor.h
+++ b/src/lib/processor.h
@@ -21,8 +21,8 @@
  *  @brief Parent class for classes which accept and then emit video or audio data.
  */
 
-#ifndef DVDOMATIC_PROCESSOR_H
-#define DVDOMATIC_PROCESSOR_H
+#ifndef DCPOMATIC_PROCESSOR_H
+#define DCPOMATIC_PROCESSOR_H
 
 #include "video_source.h"
 #include "video_sink.h"
diff --git a/src/lib/scaler.h b/src/lib/scaler.h
index c80f4b7db..a736e92de 100644
--- a/src/lib/scaler.h
+++ b/src/lib/scaler.h
@@ -21,8 +21,8 @@
  *  @brief A class to describe one of FFmpeg's software scalers.
  */
 
-#ifndef DVDOMATIC_SCALER_H
-#define DVDOMATIC_SCALER_H
+#ifndef DCPOMATIC_SCALER_H
+#define DCPOMATIC_SCALER_H
 
 #include <string>
 #include <vector>
diff --git a/src/lib/sound_processor.h b/src/lib/sound_processor.h
index 2edf38840..bdbe72ba2 100644
--- a/src/lib/sound_processor.h
+++ b/src/lib/sound_processor.h
@@ -21,8 +21,8 @@
  *  @brief A class to describe a sound processor.
  */
 
-#ifndef DVDOMATIC_SOUND_PROCESSOR_H
-#define DVDOMATIC_SOUND_PROCESSOR_H
+#ifndef DCPOMATIC_SOUND_PROCESSOR_H
+#define DCPOMATIC_SOUND_PROCESSOR_H
 
 #include <string>
 #include <vector>
diff --git a/src/lib/timer.h b/src/lib/timer.h
index f509a7492..173d0d961 100644
--- a/src/lib/timer.h
+++ b/src/lib/timer.h
@@ -22,8 +22,8 @@
  *  @brief Some timing classes for debugging and profiling.
  */
 
-#ifndef DVDOMATIC_TIMER_H
-#define DVDOMATIC_TIMER_H
+#ifndef DCPOMATIC_TIMER_H
+#define DCPOMATIC_TIMER_H
 
 #include <string>
 #include <map>
diff --git a/src/lib/types.h b/src/lib/types.h
index f821a74ac..c2bb9d853 100644
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_TYPES_H
-#define DVDOMATIC_TYPES_H
+#ifndef DCPOMATIC_TYPES_H
+#define DCPOMATIC_TYPES_H
 
 #include <vector>
 #include <boost/shared_ptr.hpp>
diff --git a/src/lib/ui_signaller.h b/src/lib/ui_signaller.h
index 221bcbe95..428ab698f 100644
--- a/src/lib/ui_signaller.h
+++ b/src/lib/ui_signaller.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_UI_SIGNALLER_H
-#define DVDOMATIC_UI_SIGNALLER_H
+#ifndef DCPOMATIC_UI_SIGNALLER_H
+#define DCPOMATIC_UI_SIGNALLER_H
 
 #include <boost/bind.hpp>
 #include <boost/asio.hpp>
diff --git a/src/lib/util.cc b/src/lib/util.cc
index 06da94294..ad08c6ab4 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -27,7 +27,7 @@
 #include <iostream>
 #include <fstream>
 #include <climits>
-#ifdef DVDOMATIC_POSIX
+#ifdef DCPOMATIC_POSIX
 #include <execinfo.h>
 #include <cxxabi.h>
 #endif
@@ -148,7 +148,7 @@ seconds_to_approximate_hms (int s)
 	return ap.str ();
 }
 
-#ifdef DVDOMATIC_POSIX
+#ifdef DCPOMATIC_POSIX
 /** @param l Mangled C++ identifier.
  *  @return Demangled version.
  */
@@ -247,11 +247,11 @@ seconds (struct timeval t)
 	return t.tv_sec + (double (t.tv_usec) / 1e6);
 }
 
-/** Call the required functions to set up DVD-o-matic's static arrays, etc.
+/** Call the required functions to set up DCP-o-matic's static arrays, etc.
  *  Must be called from the UI thread, if there is one.
  */
 void
-dvdomatic_setup ()
+dcpomatic_setup ()
 {
 	avfilter_register_all ();
 	
@@ -264,7 +264,7 @@ dvdomatic_setup ()
 	ui_thread = boost::this_thread::get_id ();
 }
 
-#ifdef DVDOMATIC_WINDOWS
+#ifdef DCPOMATIC_WINDOWS
 boost::filesystem::path
 mo_path ()
 {
@@ -279,9 +279,9 @@ mo_path ()
 #endif
 
 void
-dvdomatic_setup_i18n (string lang)
+dcpomatic_setup_i18n (string lang)
 {
-#ifdef DVDOMATIC_POSIX
+#ifdef DCPOMATIC_POSIX
 	lang += ".UTF8";
 #endif
 
@@ -297,15 +297,15 @@ dvdomatic_setup_i18n (string lang)
 	}
 
 	setlocale (LC_ALL, "");
-	textdomain ("libdvdomatic");
+	textdomain ("libdcpomatic");
 
-#ifdef DVDOMATIC_WINDOWS
-	bindtextdomain ("libdvdomatic", mo_path().string().c_str());
-	bind_textdomain_codeset ("libdvdomatic", "UTF8");
+#ifdef DCPOMATIC_WINDOWS
+	bindtextdomain ("libdcpomatic", mo_path().string().c_str());
+	bind_textdomain_codeset ("libdcpomatic", "UTF8");
 #endif	
 
-#ifdef DVDOMATIC_POSIX
-	bindtextdomain ("libdvdomatic", POSIX_LOCALE_PREFIX);
+#ifdef DCPOMATIC_POSIX
+	bindtextdomain ("libdcpomatic", POSIX_LOCALE_PREFIX);
 #endif
 }
 
@@ -909,7 +909,7 @@ cpu_info ()
 	pair<string, int> info;
 	info.second = 0;
 	
-#ifdef DVDOMATIC_POSIX
+#ifdef DCPOMATIC_POSIX
 	ifstream f (N_("/proc/cpuinfo"));
 	while (f.good ()) {
 		string l;
diff --git a/src/lib/util.h b/src/lib/util.h
index f4af7c22b..065801a88 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -22,8 +22,8 @@
  *  @brief Some utility functions and classes.
  */
 
-#ifndef DVDOMATIC_UTIL_H
-#define DVDOMATIC_UTIL_H
+#ifndef DCPOMATIC_UTIL_H
+#define DCPOMATIC_UTIL_H
 
 #include <string>
 #include <vector>
@@ -39,7 +39,7 @@ extern "C" {
 #include "compose.hpp"
 #include "types.h"
 
-#ifdef DVDOMATIC_DEBUG
+#ifdef DCPOMATIC_DEBUG
 #define TIMING(...) _film->log()->microsecond_log (String::compose (__VA_ARGS__), Log::TIMING);
 #else
 #define TIMING(...)
@@ -55,14 +55,14 @@ extern std::string seconds_to_approximate_hms (int);
 extern void stacktrace (std::ostream &, int);
 extern std::string dependency_version_summary ();
 extern double seconds (struct timeval);
-extern void dvdomatic_setup ();
-extern void dvdomatic_setup_i18n (std::string);
+extern void dcpomatic_setup ();
+extern void dcpomatic_setup_i18n (std::string);
 extern std::vector<std::string> split_at_spaces_considering_quotes (std::string);
 extern std::string md5_digest (boost::filesystem::path);
 extern std::string md5_digest (void const *, int);
 extern void ensure_ui_thread ();
 extern std::string audio_channel_name (int);
-#ifdef DVDOMATIC_WINDOWS
+#ifdef DCPOMATIC_WINDOWS
 extern boost::filesystem::path mo_path ();
 #endif
 
@@ -117,7 +117,7 @@ extern std::string get_optional_string (std::multimap<std::string, std::string>
 
 /** @class Socket
  *  @brief A class to wrap a boost::asio::ip::tcp::socket with some things
- *  that are useful for DVD-o-matic.
+ *  that are useful for DCP-o-matic.
  *
  *  This class wraps some things that I could not work out how to do with boost;
  *  most notably, sync read/write calls with timeouts.
diff --git a/src/lib/version.h b/src/lib/version.h
index 71639e3bc..518862fc4 100644
--- a/src/lib/version.h
+++ b/src/lib/version.h
@@ -1,3 +1,3 @@
 
-extern char const * dvdomatic_version;
-extern char const * dvdomatic_git_commit;
+extern char const * dcpomatic_version;
+extern char const * dcpomatic_git_commit;
diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 3d2c4cab2..75e507d4d 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_VIDEO_CONTENT_H
-#define DVDOMATIC_VIDEO_CONTENT_H
+#ifndef DCPOMATIC_VIDEO_CONTENT_H
+#define DCPOMATIC_VIDEO_CONTENT_H
 
 #include "content.h"
 #include "util.h"
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 05cf99a96..23817c055 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_VIDEO_DECODER_H
-#define DVDOMATIC_VIDEO_DECODER_H
+#ifndef DCPOMATIC_VIDEO_DECODER_H
+#define DCPOMATIC_VIDEO_DECODER_H
 
 #include "video_source.h"
 #include "decoder.h"
diff --git a/src/lib/video_sink.h b/src/lib/video_sink.h
index 7c128cf73..c68651005 100644
--- a/src/lib/video_sink.h
+++ b/src/lib/video_sink.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_VIDEO_SINK_H
-#define DVDOMATIC_VIDEO_SINK_H
+#ifndef DCPOMATIC_VIDEO_SINK_H
+#define DCPOMATIC_VIDEO_SINK_H
 
 #include <boost/shared_ptr.hpp>
 #include "util.h"
diff --git a/src/lib/video_source.h b/src/lib/video_source.h
index e60e7dfd0..e7c9805ef 100644
--- a/src/lib/video_source.h
+++ b/src/lib/video_source.h
@@ -21,8 +21,8 @@
  *  @brief Parent class for classes which emit video data.
  */
 
-#ifndef DVDOMATIC_VIDEO_SOURCE_H
-#define DVDOMATIC_VIDEO_SOURCE_H
+#ifndef DCPOMATIC_VIDEO_SOURCE_H
+#define DCPOMATIC_VIDEO_SOURCE_H
 
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
diff --git a/src/lib/wscript b/src/lib/wscript
index 2a26c2bfe..fddebe8e6 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -66,7 +66,7 @@ def build(bld):
     else:
         obj = bld(features = 'cxx cxxshlib')
 
-    obj.name = 'libdvdomatic'
+    obj.name = 'libdcpomatic'
     obj.export_includes = ['.']
     obj.uselib = """
                  AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE 
@@ -78,12 +78,12 @@ def build(bld):
     if bld.env.STATIC:
         obj.uselib += ' XML++'
     obj.source = sources + " version.cc"
-    obj.target = 'dvdomatic'
+    obj.target = 'dcpomatic'
 
-    i18n.po_to_mo(os.path.join('src', 'lib'), 'libdvdomatic', bld)
+    i18n.po_to_mo(os.path.join('src', 'lib'), 'libdcpomatic', bld)
 
 def pot(bld):
-    i18n.pot(os.path.join('src', 'lib'), sources, 'libdvdomatic')
+    i18n.pot(os.path.join('src', 'lib'), sources, 'libdcpomatic')
 
 def pot_merge(bld):
-    i18n.pot_merge(os.path.join('src', 'lib'), 'libdvdomatic')
+    i18n.pot_merge(os.path.join('src', 'lib'), 'libdcpomatic')
diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc
deleted file mode 100644
index 768819abc..000000000
--- a/src/tools/dvdomatic.cc
+++ /dev/null
@@ -1,578 +0,0 @@
-/*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include <iostream>
-#include <boost/filesystem.hpp>
-#ifdef __WXMSW__
-#include <shellapi.h>
-#endif
-#include <wx/aboutdlg.h>
-#include <wx/stdpaths.h>
-#include <wx/cmdline.h>
-#include "wx/film_viewer.h"
-#include "wx/film_editor.h"
-#include "wx/job_manager_view.h"
-#include "wx/config_dialog.h"
-#include "wx/job_wrapper.h"
-#include "wx/wx_util.h"
-#include "wx/new_film_dialog.h"
-#include "wx/properties_dialog.h"
-#include "wx/wx_ui_signaller.h"
-#include "lib/film.h"
-#include "lib/format.h"
-#include "lib/config.h"
-#include "lib/filter.h"
-#include "lib/util.h"
-#include "lib/scaler.h"
-#include "lib/exceptions.h"
-#include "lib/version.h"
-#include "lib/ui_signaller.h"
-#include "lib/log.h"
-
-using std::cout;
-using std::string;
-using std::wstring;
-using std::stringstream;
-using std::map;
-using std::make_pair;
-using std::exception;
-using boost::shared_ptr;
-
-static FilmEditor* film_editor = 0;
-static FilmViewer* film_viewer = 0;
-static shared_ptr<Film> film;
-static std::string log_level;
-static std::string film_to_load;
-static std::string film_to_create;
-static wxMenu* jobs_menu = 0;
-static wxLocale* locale = 0;
-
-static void set_menu_sensitivity ();
-
-class FilmChangedDialog
-{
-public:
-	FilmChangedDialog ()
-	{
-		_dialog = new wxMessageDialog (
-			0,
-			wxString::Format (_("Save changes to film \"%s\" before closing?"), std_to_wx (film->name ()).data()),
-			_("Film changed"),
-			wxYES_NO | wxYES_DEFAULT | wxICON_QUESTION
-			);
-	}
-
-	~FilmChangedDialog ()
-	{
-		_dialog->Destroy ();
-	}
-
-	int run ()
-	{
-		return _dialog->ShowModal ();
-	}
-
-private:	
-	wxMessageDialog* _dialog;
-};
-
-
-void
-maybe_save_then_delete_film ()
-{
-	if (!film) {
-		return;
-	}
-			
-	if (film->dirty ()) {
-		FilmChangedDialog d;
-		switch (d.run ()) {
-		case wxID_NO:
-			break;
-		case wxID_YES:
-			film->write_metadata ();
-			break;
-		}
-	}
-	
-	film.reset ();
-}
-
-enum Sensitivity {
-	ALWAYS,
-	NEEDS_FILM
-};
-
-map<wxMenuItem*, Sensitivity> menu_items;
-	
-void
-add_item (wxMenu* menu, wxString text, int id, Sensitivity sens)
-{
-	wxMenuItem* item = menu->Append (id, text);
-	menu_items.insert (make_pair (item, sens));
-}
-
-void
-set_menu_sensitivity ()
-{
-	for (map<wxMenuItem*, Sensitivity>::iterator i = menu_items.begin(); i != menu_items.end(); ++i) {
-		if (i->second == NEEDS_FILM) {
-			i->first->Enable (film != 0);
-		} else {
-			i->first->Enable (true);
-		}
-	}
-}
-
-enum {
-	ID_file_new = 1,
-	ID_file_open,
-	ID_file_save,
-	ID_file_properties,
-	ID_file_quit,
-	ID_edit_preferences,
-	ID_jobs_make_dcp,
-	ID_jobs_send_dcp_to_tms,
-	ID_jobs_show_dcp,
-	ID_jobs_analyse_audio,
-	ID_help_about
-};
-
-void
-setup_menu (wxMenuBar* m)
-{
-	wxMenu* file = new wxMenu;
-	add_item (file, _("New..."), ID_file_new, ALWAYS);
-	add_item (file, _("&Open..."), ID_file_open, ALWAYS);
-	file->AppendSeparator ();
-	add_item (file, _("&Save"), ID_file_save, NEEDS_FILM);
-	file->AppendSeparator ();
-	add_item (file, _("&Properties..."), ID_file_properties, NEEDS_FILM);
-	file->AppendSeparator ();
-	add_item (file, _("&Quit"), ID_file_quit, ALWAYS);
-
-	wxMenu* edit = new wxMenu;
-	add_item (edit, _("&Preferences..."), ID_edit_preferences, ALWAYS);
-
-	jobs_menu = new wxMenu;
-	add_item (jobs_menu, _("&Make DCP"), ID_jobs_make_dcp, NEEDS_FILM);
-	add_item (jobs_menu, _("&Send DCP to TMS"), ID_jobs_send_dcp_to_tms, NEEDS_FILM);
-	add_item (jobs_menu, _("S&how DCP"), ID_jobs_show_dcp, NEEDS_FILM);
-	jobs_menu->AppendSeparator ();
-	add_item (jobs_menu, _("&Analyse audio"), ID_jobs_analyse_audio, NEEDS_FILM);
-
-	wxMenu* help = new wxMenu;
-	add_item (help, _("About"), ID_help_about, ALWAYS);
-
-	m->Append (file, _("&File"));
-	m->Append (edit, _("&Edit"));
-	m->Append (jobs_menu, _("&Jobs"));
-	m->Append (help, _("&Help"));
-}
-
-bool
-window_closed (wxCommandEvent &)
-{
-	maybe_save_then_delete_film ();
-	return false;
-}
-
-class Frame : public wxFrame
-{
-public:
-	Frame (wxString const & title)
-		: wxFrame (NULL, -1, title)
-	{
-		wxMenuBar* bar = new wxMenuBar;
-		setup_menu (bar);
-		SetMenuBar (bar);
-
-		Connect (ID_file_new, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::file_new));
-		Connect (ID_file_open, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::file_open));
-		Connect (ID_file_save, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::file_save));
-		Connect (ID_file_properties, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::file_properties));
-		Connect (ID_file_quit, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::file_quit));
-		Connect (ID_edit_preferences, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::edit_preferences));
-		Connect (ID_jobs_make_dcp, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_make_dcp));
-		Connect (ID_jobs_send_dcp_to_tms, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_send_dcp_to_tms));
-		Connect (ID_jobs_show_dcp, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_show_dcp));
-		Connect (ID_jobs_analyse_audio, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_analyse_audio));
-		Connect (ID_help_about, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::help_about));
-
-		Connect (wxID_ANY, wxEVT_MENU_OPEN, wxMenuEventHandler (Frame::menu_opened));
-
-		wxPanel* panel = new wxPanel (this);
-		wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-		s->Add (panel, 1, wxEXPAND);
-		SetSizer (s);
-
-		film_editor = new FilmEditor (film, panel);
-		film_viewer = new FilmViewer (film, panel);
-		JobManagerView* job_manager_view = new JobManagerView (panel);
-
-		_top_sizer = new wxBoxSizer (wxHORIZONTAL);
-		_top_sizer->Add (film_editor, 0, wxALL, 6);
-		_top_sizer->Add (film_viewer, 1, wxEXPAND | wxALL, 6);
-
-		wxBoxSizer* main_sizer = new wxBoxSizer (wxVERTICAL);
-		main_sizer->Add (_top_sizer, 2, wxEXPAND | wxALL, 6);
-		main_sizer->Add (job_manager_view, 1, wxEXPAND | wxALL, 6);
-		panel->SetSizer (main_sizer);
-
-		set_menu_sensitivity ();
-
-		film_editor->FileChanged.connect (bind (&Frame::file_changed, this, _1));
-		if (film) {
-			file_changed (film->directory ());
-		} else {
-			file_changed ("");
-		}
-
-		set_film ();
-
-		film_editor->Connect (wxID_ANY, wxEVT_SIZE, wxSizeEventHandler (Frame::film_editor_sized), 0, this);
-	}
-
-private:
-
-	void film_editor_sized (wxSizeEvent &)
-	{
-		static bool in_layout = false;
-		if (!in_layout) {
-			in_layout = true;
-			_top_sizer->Layout ();
-			in_layout = false;
-		}
-	}
-
-	void menu_opened (wxMenuEvent& ev)
-	{
-		if (ev.GetMenu() != jobs_menu) {
-			return;
-		}
-
-		bool const have_dcp = film && film->have_dcp();
-		jobs_menu->Enable (ID_jobs_send_dcp_to_tms, have_dcp);
-		jobs_menu->Enable (ID_jobs_show_dcp, have_dcp);
-	}
-
-	void set_film ()
-	{
-		film_viewer->set_film (film);
-		film_editor->set_film (film);
-		set_menu_sensitivity ();
-	}
-
-	void file_changed (string f)
-	{
-		stringstream s;
-		s << wx_to_std (_("DVD-o-matic"));
-		if (!f.empty ()) {
-			s << " - " << f;
-		}
-		
-		SetTitle (std_to_wx (s.str()));
-	}
-	
-	void file_new (wxCommandEvent &)
-	{
-		NewFilmDialog* d = new NewFilmDialog (this);
-		int const r = d->ShowModal ();
-		
-		if (r == wxID_OK) {
-
-			if (boost::filesystem::exists (d->get_path())) {
-				error_dialog (this, std_to_wx (String::compose (wx_to_std (_("The directory %1 already exists.")), d->get_path().c_str())));
-				return;
-			}
-			
-			maybe_save_then_delete_film ();
-			film.reset (new Film (d->get_path (), false));
-			film->log()->set_level (log_level);
-			film->set_name (boost::filesystem::path (d->get_path()).filename().generic_string());
-			set_film ();
-		}
-		
-		d->Destroy ();
-	}
-
-	void file_open (wxCommandEvent &)
-	{
-		wxDirDialog* c = new wxDirDialog (this, _("Select film to open"), wxStandardPaths::Get().GetDocumentsDir(), wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST);
-		int r;
-		while (1) {
-			r = c->ShowModal ();
-			if (r == wxID_OK && c->GetPath() == wxStandardPaths::Get().GetDocumentsDir()) {
-				error_dialog (this, _("You did not select a folder.  Make sure that you select a folder before clicking Open."));
-			} else {
-				break;
-			}
-		}
-			
-		if (r == wxID_OK) {
-			maybe_save_then_delete_film ();
-			try {
-				film.reset (new Film (wx_to_std (c->GetPath ())));
-				film->log()->set_level (log_level);
-				set_film ();
-			} catch (std::exception& e) {
-				wxString p = c->GetPath ();
-				wxCharBuffer b = p.ToUTF8 ();
-				error_dialog (this, wxString::Format (_("Could not open film at %s (%s)"), p.data(), std_to_wx (e.what()).data()));
-			}
-		}
-
-		c->Destroy ();
-	}
-
-	void file_save (wxCommandEvent &)
-	{
-		film->write_metadata ();
-	}
-
-	void file_properties (wxCommandEvent &)
-	{
-		PropertiesDialog* d = new PropertiesDialog (this, film);
-		d->ShowModal ();
-		d->Destroy ();
-	}
-	
-	void file_quit (wxCommandEvent &)
-	{
-		maybe_save_then_delete_film ();
-		Close (true);
-	}
-
-	void edit_preferences (wxCommandEvent &)
-	{
-		ConfigDialog* d = new ConfigDialog (this);
-		d->ShowModal ();
-		d->Destroy ();
-		Config::instance()->write ();
-	}
-
-	void jobs_make_dcp (wxCommandEvent &)
-	{
-		JobWrapper::make_dcp (this, film);
-	}
-	
-	void jobs_send_dcp_to_tms (wxCommandEvent &)
-	{
-		film->send_dcp_to_tms ();
-	}
-
-	void jobs_show_dcp (wxCommandEvent &)
-	{
-#ifdef __WXMSW__
-		string d = film->directory();
-		wstring w;
-		w.assign (d.begin(), d.end());
-		ShellExecute (0, L"open", w.c_str(), 0, 0, SW_SHOWDEFAULT);
-#else
-		int r = system ("which nautilus");
-		if (WEXITSTATUS (r) == 0) {
-			system (string ("nautilus " + film->directory()).c_str ());
-		} else {
-			int r = system ("which konqueror");
-			if (WEXITSTATUS (r) == 0) {
-				system (string ("konqueror " + film->directory()).c_str ());
-			}
-		}
-#endif		
-	}
-
-	void jobs_analyse_audio (wxCommandEvent &)
-	{
-		film->analyse_audio ();
-	}
-	
-	void help_about (wxCommandEvent &)
-	{
-		wxAboutDialogInfo info;
-		info.SetName (_("DVD-o-matic"));
-		if (strcmp (dvdomatic_git_commit, "release") == 0) {
-			info.SetVersion (std_to_wx (String::compose ("version %1", dvdomatic_version)));
-		} else {
-			info.SetVersion (std_to_wx (String::compose ("version %1 git %2", dvdomatic_version, dvdomatic_git_commit)));
-		}
-		info.SetDescription (_("Free, open-source DCP generation from almost anything."));
-		info.SetCopyright (_("(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"));
-
-		wxArrayString authors;
-		authors.Add (wxT ("Carl Hetherington"));
-		authors.Add (wxT ("Terrence Meiczinger"));
-		authors.Add (wxT ("Paul Davis"));
-		authors.Add (wxT ("Ole Laursen"));
-		info.SetDevelopers (authors);
-
-		wxArrayString translators;
-		translators.Add (wxT ("Olivier Perriere"));
-		translators.Add (wxT ("Lilian Lefranc"));
-		translators.Add (wxT ("Thierry Journet"));
-		translators.Add (wxT ("Massimiliano Broggi"));
-		translators.Add (wxT ("Manuel AC"));
-		translators.Add (wxT ("Adam Klotblixt"));
-		info.SetTranslators (translators);
-		
-		info.SetWebSite (wxT ("http://carlh.net/software/dvdomatic"));
-		wxAboutBox (info);
-	}
-
-	wxSizer* _top_sizer;
-};
-
-#if wxMINOR_VERSION == 9
-static const wxCmdLineEntryDesc command_line_description[] = {
-	{ wxCMD_LINE_OPTION, "l", "log", "set log level (silent, verbose or timing)", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
-	{ wxCMD_LINE_SWITCH, "n", "new", "create new film", wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL },
-        { wxCMD_LINE_PARAM, 0, 0, "film to load or create", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_PARAM_OPTIONAL },
-	{ wxCMD_LINE_NONE, "", "", "", wxCmdLineParamType (0), 0 }
-};
-#else
-static const wxCmdLineEntryDesc command_line_description[] = {
-	{ wxCMD_LINE_OPTION, wxT("l"), wxT("log"), wxT("set log level (silent, verbose or timing)"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
-	{ wxCMD_LINE_SWITCH, wxT("n"), wxT("new"), wxT("create new film"), wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL },
-        { wxCMD_LINE_PARAM, 0, 0, wxT("film to load or create"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_PARAM_OPTIONAL },
-	{ wxCMD_LINE_NONE, wxT(""), wxT(""), wxT(""), wxCmdLineParamType (0), 0 }
-};
-#endif
-
-void
-setup_i18n ()
-{
-	int language = wxLANGUAGE_DEFAULT;
-
-	if (Config::instance()->language()) {
-		wxLanguageInfo const * li = wxLocale::FindLanguageInfo (std_to_wx (Config::instance()->language().get()));
-		if (li) {
-			language = li->Language;
-		}
-	}
- 
-	if (wxLocale::IsAvailable (language)) {
-		locale = new wxLocale (language, wxLOCALE_LOAD_DEFAULT);
-
-#ifdef DVDOMATIC_WINDOWS
-		locale->AddCatalogLookupPathPrefix (std_to_wx (mo_path().string()));
-#endif		
-
-		locale->AddCatalog (wxT ("libdvdomatic-wx"));
-		locale->AddCatalog (wxT ("dvdomatic"));
-		
-		if (!locale->IsOk()) {
-			delete locale;
-			locale = new wxLocale (wxLANGUAGE_ENGLISH);
-			language = wxLANGUAGE_ENGLISH;
-		}
-	}
-
-	if (locale) {
-		dvdomatic_setup_i18n (wx_to_std (locale->GetCanonicalName ()));
-	}
-}
-
-class App : public wxApp
-{
-	bool OnInit ()
-	{
-		if (!wxApp::OnInit()) {
-			return false;
-		}
-		
-#ifdef DVDOMATIC_POSIX		
-		unsetenv ("UBUNTU_MENUPROXY");
-#endif		
-
-		wxInitAllImageHandlers ();
-
-		/* Enable i18n; this will create a Config object
-		   to look for a force-configured language.  This Config
-		   object will be wrong, however, because dvdomatic_setup
-		   hasn't yet been called and there aren't any scalers, filters etc.
-		   set up yet.
-		*/
-		setup_i18n ();
-
-		/* Set things up, including scalers / filters etc.
-		   which will now be internationalised correctly.
-		*/
-		dvdomatic_setup ();
-
-		/* Force the configuration to be re-loaded correctly next
-		   time it is needed.
-		*/
-		Config::drop ();
-
-		if (!film_to_load.empty() && boost::filesystem::is_directory (film_to_load)) {
-			try {
-				film.reset (new Film (film_to_load));
-				film->log()->set_level (log_level);
-			} catch (exception& e) {
-				error_dialog (0, std_to_wx (String::compose (wx_to_std (_("Could not load film %1 (%2)")), film_to_load, e.what())));
-			}
-		}
-
-		if (!film_to_create.empty ()) {
-			film.reset (new Film (film_to_create, false));
-			film->log()->set_level (log_level);
-			film->set_name (boost::filesystem::path (film_to_create).filename().generic_string ());
-		}
-
-		Frame* f = new Frame (_("DVD-o-matic"));
-		SetTopWindow (f);
-		f->Maximize ();
-		f->Show ();
-
-		ui_signaller = new wxUISignaller (this);
-		this->Connect (-1, wxEVT_IDLE, wxIdleEventHandler (App::idle));
-
-		return true;
-	}
-
-	void OnInitCmdLine (wxCmdLineParser& parser)
-	{
-		parser.SetDesc (command_line_description);
-		parser.SetSwitchChars (wxT ("-"));
-	}
-
-	bool OnCmdLineParsed (wxCmdLineParser& parser)
-	{
-		if (parser.GetParamCount() > 0) {
-			if (parser.Found (wxT ("new"))) {
-				film_to_create = wx_to_std (parser.GetParam (0));
-			} else {
-				film_to_load = wx_to_std (parser.GetParam(0));
-			}
-		}
-
-		wxString log;
-		if (parser.Found (wxT ("log"), &log)) {
-			log_level = wx_to_std (log);
-		}
-
-		return true;
-	}
-
-	void idle (wxIdleEvent &)
-	{
-		ui_signaller->ui_idle ();
-	}
-};
-
-IMPLEMENT_APP (App)
diff --git a/src/tools/makedcp.cc b/src/tools/makedcp.cc
index 85134b3c5..e2e1874c4 100644
--- a/src/tools/makedcp.cc
+++ b/src/tools/makedcp.cc
@@ -47,9 +47,9 @@ static void
 help (string n)
 {
 	cerr << "Syntax: " << n << " [OPTION] <FILM>\n"
-	     << "  -v, --version      show DVD-o-matic version\n"
+	     << "  -v, --version      show DCP-o-matic version\n"
 	     << "  -h, --help         show this help\n"
-	     << "  -d, --deps         list DVD-o-matic dependency details and quit\n"
+	     << "  -d, --deps         list DCP-o-matic dependency details and quit\n"
 	     << "  -t, --test         run in test mode (repeatable UUID generation, timestamps etc.)\n"
 	     << "  -n, --no-progress  do not print progress to stdout\n"
 	     << "  -r, --no-remote    do not use any remote servers\n"
@@ -87,7 +87,7 @@ main (int argc, char* argv[])
 
 		switch (c) {
 		case 'v':
-			cout << "dvdomatic version " << dvdomatic_version << " " << dvdomatic_git_commit << "\n";
+			cout << "dcpomatic version " << dcpomatic_version << " " << dcpomatic_git_commit << "\n";
 			exit (EXIT_SUCCESS);
 		case 'h':
 			help (argv[0]);
@@ -117,13 +117,13 @@ main (int argc, char* argv[])
 
 	film_dir = argv[optind];
 			
-	dvdomatic_setup ();
+	dcpomatic_setup ();
 
 	if (no_remote) {
 		Config::instance()->set_servers (vector<ServerDescription*> ());
 	}
 
-	cout << "DVD-o-matic " << dvdomatic_version << " git " << dvdomatic_git_commit;
+	cout << "DCP-o-matic " << dcpomatic_version << " git " << dcpomatic_git_commit;
 	char buf[256];
 	if (gethostname (buf, 256) == 0) {
 		cout << " on " << buf;
@@ -162,7 +162,7 @@ main (int argc, char* argv[])
 	bool error = false;
 	while (!should_stop) {
 
-		dvdomatic_sleep (5);
+		dcpomatic_sleep (5);
 
 		list<shared_ptr<Job> > jobs = JobManager::instance()->get ();
 
diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index abfbfef6d..d35f104c6 100644
--- a/src/tools/po/es_ES.po
+++ b/src/tools/po/es_ES.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: DVDOMATIC\n"
+"Project-Id-Version: DCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-04-09 11:14+0100\n"
 "PO-Revision-Date: 2013-03-23 21:08-0500\n"
@@ -17,111 +17,111 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/tools/dvdomatic.cc:177
+#: src/tools/dcpomatic.cc:177
 msgid "&Analyse audio"
 msgstr "&Analizar audio"
 
-#: src/tools/dvdomatic.cc:183
+#: src/tools/dcpomatic.cc:183
 msgid "&Edit"
 msgstr "&Editar"
 
-#: src/tools/dvdomatic.cc:182
+#: src/tools/dcpomatic.cc:182
 msgid "&File"
 msgstr "&Archivo"
 
-#: src/tools/dvdomatic.cc:185
+#: src/tools/dcpomatic.cc:185
 msgid "&Help"
 msgstr "&Ayuda"
 
-#: src/tools/dvdomatic.cc:184
+#: src/tools/dcpomatic.cc:184
 msgid "&Jobs"
 msgstr "&Tareas"
 
-#: src/tools/dvdomatic.cc:173
+#: src/tools/dcpomatic.cc:173
 msgid "&Make DCP"
 msgstr "&Crear DCP"
 
-#: src/tools/dvdomatic.cc:161
+#: src/tools/dcpomatic.cc:161
 msgid "&Open..."
 msgstr "&Abrir..."
 
-#: src/tools/dvdomatic.cc:170
+#: src/tools/dcpomatic.cc:170
 msgid "&Preferences..."
 msgstr "&Preferencias..."
 
-#: src/tools/dvdomatic.cc:165
+#: src/tools/dcpomatic.cc:165
 msgid "&Properties..."
 msgstr "&Propiedades..."
 
-#: src/tools/dvdomatic.cc:167
+#: src/tools/dcpomatic.cc:167
 msgid "&Quit"
 msgstr "&Salir"
 
-#: src/tools/dvdomatic.cc:163
+#: src/tools/dcpomatic.cc:163
 msgid "&Save"
 msgstr "&Guardar"
 
-#: src/tools/dvdomatic.cc:174
+#: src/tools/dcpomatic.cc:174
 msgid "&Send DCP to TMS"
 msgstr "&Enviar DCP al TMS"
 
-#: src/tools/dvdomatic.cc:417
+#: src/tools/dcpomatic.cc:417
 msgid ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 msgstr ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/tools/dvdomatic.cc:180
+#: src/tools/dcpomatic.cc:180
 msgid "About"
 msgstr "Acerca de"
 
-#: src/tools/dvdomatic.cc:527
+#: src/tools/dcpomatic.cc:527
 #, fuzzy
 msgid "Could not load film %1 (%2)"
 msgstr "No se pudo cargar la película %s (%s)"
 
-#: src/tools/dvdomatic.cc:339
+#: src/tools/dcpomatic.cc:339
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "No se pudo cargar la película en %s (%s)"
 
-#: src/tools/dvdomatic.cc:287 src/tools/dvdomatic.cc:410
-#: src/tools/dvdomatic.cc:531
-msgid "DVD-o-matic"
-msgstr "DVD-o-matic"
+#: src/tools/dcpomatic.cc:287 src/tools/dcpomatic.cc:410
+#: src/tools/dcpomatic.cc:531
+msgid "DCP-o-matic"
+msgstr "DCP-o-matic"
 
-#: src/tools/dvdomatic.cc:75
+#: src/tools/dcpomatic.cc:75
 msgid "Film changed"
 msgstr "Película cambiada"
 
-#: src/tools/dvdomatic.cc:416
+#: src/tools/dcpomatic.cc:416
 msgid "Free, open-source DCP generation from almost anything."
 msgstr ""
 "Generación de DCP a partir de casi cualquier fuente, libre y de código "
 "abierto."
 
-#: src/tools/dvdomatic.cc:160
+#: src/tools/dcpomatic.cc:160
 msgid "New..."
 msgstr "Nuevo..."
 
-#: src/tools/dvdomatic.cc:175
+#: src/tools/dcpomatic.cc:175
 msgid "S&how DCP"
 msgstr "&Mostrar DCP"
 
-#: src/tools/dvdomatic.cc:74
+#: src/tools/dcpomatic.cc:74
 msgid "Save changes to film \"%s\" before closing?"
 msgstr ""
 
-#: src/tools/dvdomatic.cc:319
+#: src/tools/dcpomatic.cc:319
 msgid "Select film to open"
 msgstr "Selecciona la película a abrir"
 
-#: src/tools/dvdomatic.cc:303
+#: src/tools/dcpomatic.cc:303
 #, fuzzy
 msgid "The directory %1 already exists."
 msgstr "La carpeta %s ya existe."
 
-#: src/tools/dvdomatic.cc:324
+#: src/tools/dcpomatic.cc:324
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index b40c86877..ef2246992 100644
--- a/src/tools/po/fr_FR.po
+++ b/src/tools/po/fr_FR.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: DVD-o-matic FRENCH\n"
+"Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-04-09 11:14+0100\n"
 "PO-Revision-Date: 2013-03-13 22:33+0100\n"
@@ -16,109 +16,109 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/tools/dvdomatic.cc:177
+#: src/tools/dcpomatic.cc:177
 msgid "&Analyse audio"
 msgstr "&Analyser le son"
 
-#: src/tools/dvdomatic.cc:183
+#: src/tools/dcpomatic.cc:183
 msgid "&Edit"
 msgstr "&Edition"
 
-#: src/tools/dvdomatic.cc:182
+#: src/tools/dcpomatic.cc:182
 msgid "&File"
 msgstr "&Fichier"
 
-#: src/tools/dvdomatic.cc:185
+#: src/tools/dcpomatic.cc:185
 msgid "&Help"
 msgstr "&Aide"
 
-#: src/tools/dvdomatic.cc:184
+#: src/tools/dcpomatic.cc:184
 msgid "&Jobs"
 msgstr "&Travaux"
 
-#: src/tools/dvdomatic.cc:173
+#: src/tools/dcpomatic.cc:173
 msgid "&Make DCP"
 msgstr "&Créer le DCP"
 
-#: src/tools/dvdomatic.cc:161
+#: src/tools/dcpomatic.cc:161
 msgid "&Open..."
 msgstr "&Ouvrir..."
 
-#: src/tools/dvdomatic.cc:170
+#: src/tools/dcpomatic.cc:170
 msgid "&Preferences..."
 msgstr "&Préférences..."
 
-#: src/tools/dvdomatic.cc:165
+#: src/tools/dcpomatic.cc:165
 msgid "&Properties..."
 msgstr "&Propriétés..."
 
-#: src/tools/dvdomatic.cc:167
+#: src/tools/dcpomatic.cc:167
 msgid "&Quit"
 msgstr "&Quitter"
 
-#: src/tools/dvdomatic.cc:163
+#: src/tools/dcpomatic.cc:163
 msgid "&Save"
 msgstr "&Enregistrer"
 
-#: src/tools/dvdomatic.cc:174
+#: src/tools/dcpomatic.cc:174
 msgid "&Send DCP to TMS"
 msgstr "&Envoyer le DCP dans le TMS"
 
-#: src/tools/dvdomatic.cc:417
+#: src/tools/dcpomatic.cc:417
 msgid ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 msgstr ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/tools/dvdomatic.cc:180
+#: src/tools/dcpomatic.cc:180
 msgid "About"
 msgstr "A Propos"
 
-#: src/tools/dvdomatic.cc:527
+#: src/tools/dcpomatic.cc:527
 #, fuzzy
 msgid "Could not load film %1 (%2)"
 msgstr "Impossible de charger le film %s (%s)"
 
-#: src/tools/dvdomatic.cc:339
+#: src/tools/dcpomatic.cc:339
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Impossible d'ouvrir le film à %s (%s)"
 
-#: src/tools/dvdomatic.cc:287 src/tools/dvdomatic.cc:410
-#: src/tools/dvdomatic.cc:531
-msgid "DVD-o-matic"
-msgstr "DVD-o-matic"
+#: src/tools/dcpomatic.cc:287 src/tools/dcpomatic.cc:410
+#: src/tools/dcpomatic.cc:531
+msgid "DCP-o-matic"
+msgstr "DCP-o-matic"
 
-#: src/tools/dvdomatic.cc:75
+#: src/tools/dcpomatic.cc:75
 msgid "Film changed"
 msgstr "Film changé"
 
-#: src/tools/dvdomatic.cc:416
+#: src/tools/dcpomatic.cc:416
 msgid "Free, open-source DCP generation from almost anything."
 msgstr "Création de DCP libre et open-source à partir de presque tout."
 
-#: src/tools/dvdomatic.cc:160
+#: src/tools/dcpomatic.cc:160
 msgid "New..."
 msgstr "Nouveau..."
 
-#: src/tools/dvdomatic.cc:175
+#: src/tools/dcpomatic.cc:175
 msgid "S&how DCP"
 msgstr "Voir le DCP"
 
-#: src/tools/dvdomatic.cc:74
+#: src/tools/dcpomatic.cc:74
 msgid "Save changes to film \"%s\" before closing?"
 msgstr ""
 
-#: src/tools/dvdomatic.cc:319
+#: src/tools/dcpomatic.cc:319
 msgid "Select film to open"
 msgstr "Sélectionner le film à ouvrir"
 
-#: src/tools/dvdomatic.cc:303
+#: src/tools/dcpomatic.cc:303
 #, fuzzy
 msgid "The directory %1 already exists."
 msgstr "Le dossier %s existe déjà."
 
-#: src/tools/dvdomatic.cc:324
+#: src/tools/dcpomatic.cc:324
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po
index 38cbec157..998f70059 100644
--- a/src/tools/po/it_IT.po
+++ b/src/tools/po/it_IT.po
@@ -17,107 +17,107 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/tools/dvdomatic.cc:177
+#: src/tools/dcpomatic.cc:177
 msgid "&Analyse audio"
 msgstr "&Analizza audio"
 
-#: src/tools/dvdomatic.cc:183
+#: src/tools/dcpomatic.cc:183
 msgid "&Edit"
 msgstr "&Modifica"
 
-#: src/tools/dvdomatic.cc:182
+#: src/tools/dcpomatic.cc:182
 msgid "&File"
 msgstr "&File"
 
-#: src/tools/dvdomatic.cc:185
+#: src/tools/dcpomatic.cc:185
 msgid "&Help"
 msgstr "&Aiuto"
 
-#: src/tools/dvdomatic.cc:184
+#: src/tools/dcpomatic.cc:184
 msgid "&Jobs"
 msgstr "&Lavori"
 
-#: src/tools/dvdomatic.cc:173
+#: src/tools/dcpomatic.cc:173
 msgid "&Make DCP"
 msgstr "&Crea DCP"
 
-#: src/tools/dvdomatic.cc:161
+#: src/tools/dcpomatic.cc:161
 msgid "&Open..."
 msgstr "&Apri..."
 
-#: src/tools/dvdomatic.cc:170
+#: src/tools/dcpomatic.cc:170
 msgid "&Preferences..."
 msgstr "&Preferenze..."
 
-#: src/tools/dvdomatic.cc:165
+#: src/tools/dcpomatic.cc:165
 msgid "&Properties..."
 msgstr "&Proprieta'..."
 
-#: src/tools/dvdomatic.cc:167
+#: src/tools/dcpomatic.cc:167
 msgid "&Quit"
 msgstr "&Esci"
 
-#: src/tools/dvdomatic.cc:163
+#: src/tools/dcpomatic.cc:163
 msgid "&Save"
 msgstr "&Salva"
 
-#: src/tools/dvdomatic.cc:174
+#: src/tools/dcpomatic.cc:174
 msgid "&Send DCP to TMS"
 msgstr "&Invia DCP a TMS"
 
-#: src/tools/dvdomatic.cc:417
+#: src/tools/dcpomatic.cc:417
 msgid ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 msgstr ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/tools/dvdomatic.cc:180
+#: src/tools/dcpomatic.cc:180
 msgid "About"
 msgstr "Informazioni"
 
-#: src/tools/dvdomatic.cc:527
+#: src/tools/dcpomatic.cc:527
 msgid "Could not load film %1 (%2)"
 msgstr "Non posso caricare il film %s (%s)"
 
-#: src/tools/dvdomatic.cc:339
+#: src/tools/dcpomatic.cc:339
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Non posso aprire il film in %s (%s)"
 
-#: src/tools/dvdomatic.cc:287 src/tools/dvdomatic.cc:410
-#: src/tools/dvdomatic.cc:531
-msgid "DVD-o-matic"
-msgstr "DVD-o-matic"
+#: src/tools/dcpomatic.cc:287 src/tools/dcpomatic.cc:410
+#: src/tools/dcpomatic.cc:531
+msgid "DCP-o-matic"
+msgstr "DCP-o-matic"
 
-#: src/tools/dvdomatic.cc:75
+#: src/tools/dcpomatic.cc:75
 msgid "Film changed"
 msgstr "Film modificato"
 
-#: src/tools/dvdomatic.cc:416
+#: src/tools/dcpomatic.cc:416
 msgid "Free, open-source DCP generation from almost anything."
 msgstr "Genera DCP da quasi tutto, free e open-source."
 
-#: src/tools/dvdomatic.cc:160
+#: src/tools/dcpomatic.cc:160
 msgid "New..."
 msgstr "Nuovo"
 
-#: src/tools/dvdomatic.cc:175
+#: src/tools/dcpomatic.cc:175
 msgid "S&how DCP"
 msgstr "&Mostra DCP"
 
-#: src/tools/dvdomatic.cc:74
+#: src/tools/dcpomatic.cc:74
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Salvare i cambiamenti del film \"%s\" prima di chiudere?"
 
-#: src/tools/dvdomatic.cc:319
+#: src/tools/dcpomatic.cc:319
 msgid "Select film to open"
 msgstr "Seleziona il film da aprire"
 
-#: src/tools/dvdomatic.cc:303
+#: src/tools/dcpomatic.cc:303
 msgid "The directory %1 already exists."
 msgstr "La directory %s esiste gia'."
 
-#: src/tools/dvdomatic.cc:324
+#: src/tools/dcpomatic.cc:324
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
diff --git a/src/tools/po/sv_SE.po b/src/tools/po/sv_SE.po
index 57254770c..4765c2d98 100644
--- a/src/tools/po/sv_SE.po
+++ b/src/tools/po/sv_SE.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: DVD-o-matic\n"
+"Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-04-09 11:14+0100\n"
 "PO-Revision-Date: 2013-04-09 10:12+0100\n"
@@ -17,108 +17,108 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/tools/dvdomatic.cc:177
+#: src/tools/dcpomatic.cc:177
 msgid "&Analyse audio"
 msgstr "&Analysera audio"
 
-#: src/tools/dvdomatic.cc:183
+#: src/tools/dcpomatic.cc:183
 msgid "&Edit"
 msgstr "&Redigera"
 
-#: src/tools/dvdomatic.cc:182
+#: src/tools/dcpomatic.cc:182
 msgid "&File"
 msgstr "&Fil"
 
-#: src/tools/dvdomatic.cc:185
+#: src/tools/dcpomatic.cc:185
 msgid "&Help"
 msgstr "&Hjälp"
 
-#: src/tools/dvdomatic.cc:184
+#: src/tools/dcpomatic.cc:184
 msgid "&Jobs"
 msgstr "&Jobb"
 
-#: src/tools/dvdomatic.cc:173
+#: src/tools/dcpomatic.cc:173
 msgid "&Make DCP"
 msgstr "&Skapa DCP"
 
-#: src/tools/dvdomatic.cc:161
+#: src/tools/dcpomatic.cc:161
 msgid "&Open..."
 msgstr "&Öppna"
 
-#: src/tools/dvdomatic.cc:170
+#: src/tools/dcpomatic.cc:170
 msgid "&Preferences..."
 msgstr "&Inställningar"
 
-#: src/tools/dvdomatic.cc:165
+#: src/tools/dcpomatic.cc:165
 msgid "&Properties..."
 msgstr "&Egenskaper"
 
-#: src/tools/dvdomatic.cc:167
+#: src/tools/dcpomatic.cc:167
 msgid "&Quit"
 msgstr "&Avsluta"
 
-#: src/tools/dvdomatic.cc:163
+#: src/tools/dcpomatic.cc:163
 msgid "&Save"
 msgstr "&Spara"
 
-#: src/tools/dvdomatic.cc:174
+#: src/tools/dcpomatic.cc:174
 msgid "&Send DCP to TMS"
 msgstr "&Skicka DCP till TMS"
 
-#: src/tools/dvdomatic.cc:417
+#: src/tools/dcpomatic.cc:417
 msgid ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 msgstr ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/tools/dvdomatic.cc:180
+#: src/tools/dcpomatic.cc:180
 msgid "About"
 msgstr "Om"
 
-#: src/tools/dvdomatic.cc:527
+#: src/tools/dcpomatic.cc:527
 msgid "Could not load film %1 (%2)"
 msgstr "Kunde inte öppna filmen %1 (%2)"
 
-#: src/tools/dvdomatic.cc:339
+#: src/tools/dcpomatic.cc:339
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Kunde inte öppna filmen vid %s (%s)"
 
-#: src/tools/dvdomatic.cc:287 src/tools/dvdomatic.cc:410
-#: src/tools/dvdomatic.cc:531
-msgid "DVD-o-matic"
-msgstr "DVD-o-matic"
+#: src/tools/dcpomatic.cc:287 src/tools/dcpomatic.cc:410
+#: src/tools/dcpomatic.cc:531
+msgid "DCP-o-matic"
+msgstr "DCP-o-matic"
 
-#: src/tools/dvdomatic.cc:75
+#: src/tools/dcpomatic.cc:75
 msgid "Film changed"
 msgstr "Film ändrad"
 
-#: src/tools/dvdomatic.cc:416
+#: src/tools/dcpomatic.cc:416
 msgid "Free, open-source DCP generation from almost anything."
 msgstr ""
 "Fri, öppen-källkodsprogramvara för DCP-generering från nästan vad som helst."
 
-#: src/tools/dvdomatic.cc:160
+#: src/tools/dcpomatic.cc:160
 msgid "New..."
 msgstr "Ny..."
 
-#: src/tools/dvdomatic.cc:175
+#: src/tools/dcpomatic.cc:175
 msgid "S&how DCP"
 msgstr "&Visa DCP"
 
-#: src/tools/dvdomatic.cc:74
+#: src/tools/dcpomatic.cc:74
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Spara ändringarna till filmen \"%s\" före avslut?"
 
-#: src/tools/dvdomatic.cc:319
+#: src/tools/dcpomatic.cc:319
 msgid "Select film to open"
 msgstr "Välj film att öppna"
 
-#: src/tools/dvdomatic.cc:303
+#: src/tools/dcpomatic.cc:303
 msgid "The directory %1 already exists."
 msgstr "Katalogen %1 finns redan."
 
-#: src/tools/dvdomatic.cc:324
+#: src/tools/dcpomatic.cc:324
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
diff --git a/src/tools/servomatic_cli.cc b/src/tools/servomatic_cli.cc
index 6626d45b9..76d085034 100644
--- a/src/tools/servomatic_cli.cc
+++ b/src/tools/servomatic_cli.cc
@@ -51,7 +51,7 @@ static void
 help (string n)
 {
 	cerr << "Syntax: " << n << " [OPTION]\n"
-	     << "  -v, --version      show DVD-o-matic version\n"
+	     << "  -v, --version      show DCP-o-matic version\n"
 	     << "  -h, --help         show this help\n"
 	     << "  -t, --threads      number of parallel encoding threads to use\n";
 }
@@ -78,7 +78,7 @@ main (int argc, char* argv[])
 
 		switch (c) {
 		case 'v':
-			cout << "dvdomatic version " << dvdomatic_version << " " << dvdomatic_git_commit << "\n";
+			cout << "dcpomatic version " << dcpomatic_version << " " << dcpomatic_git_commit << "\n";
 			exit (EXIT_SUCCESS);
 		case 'h':
 			help (argv[0]);
diff --git a/src/tools/servomatic_gui.cc b/src/tools/servomatic_gui.cc
index 5e36660eb..152e063c1 100644
--- a/src/tools/servomatic_gui.cc
+++ b/src/tools/servomatic_gui.cc
@@ -61,7 +61,7 @@ class StatusDialog : public wxDialog
 {
 public:
 	StatusDialog ()
-		: wxDialog (0, wxID_ANY, _("DVD-o-matic encode server"), wxDefaultPosition, wxSize (600, 80), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+		: wxDialog (0, wxID_ANY, _("DCP-o-matic encode server"), wxDefaultPosition, wxSize (600, 80), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
 		, _timer (this, ID_timer)
 	{
 		_sizer = new wxFlexGridSizer (1, 6, 6);
@@ -103,7 +103,7 @@ public:
 		wxIcon icon;
 		icon.CopyFromBitmap (bitmap);
 #endif		
-		SetIcon (icon, std_to_wx ("DVD-o-matic encode server"));
+		SetIcon (icon, std_to_wx ("DCP-o-matic encode server"));
 
 		Connect (ID_status, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (TaskBarIcon::status));
 		Connect (ID_quit, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (TaskBarIcon::quit));
@@ -147,7 +147,7 @@ private:
 			return false;
 		}
 		
-		dvdomatic_setup ();
+		dcpomatic_setup ();
 
 		_icon = new TaskBarIcon;
 		_thread = new thread (bind (&App::main_thread, this));
diff --git a/src/tools/servomatictest.cc b/src/tools/servomatictest.cc
index d3222faa3..42cc76871 100644
--- a/src/tools/servomatictest.cc
+++ b/src/tools/servomatictest.cc
@@ -145,7 +145,7 @@ main (int argc, char* argv[])
 		exit (EXIT_FAILURE);
 	}
 
-	dvdomatic_setup ();
+	dcpomatic_setup ();
 
 	server = new ServerDescription (server_host, 1);
 	shared_ptr<Film> film (new Film (film_dir, true));
diff --git a/src/tools/wscript b/src/tools/wscript
index 9cc7e9d1b..f0ffb8e89 100644
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -8,25 +8,25 @@ def build(bld):
         obj = bld(features = 'cxx cxxprogram')
         obj.uselib = 'BOOST_THREAD OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC'
         obj.includes = ['..']
-        obj.use    = ['libdvdomatic']
+        obj.use    = ['libdcpomatic']
         obj.source = '%s.cc' % t
         obj.target = t
 
     if not bld.env.DISABLE_GUI:
-        for t in ['dvdomatic', 'servomatic_gui']:
+        for t in ['dcpomatic', 'servomatic_gui']:
             obj = bld(features = 'cxx cxxprogram')
             obj.uselib = 'DCP CXML OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC'
             obj.includes = ['..']
-            obj.use    = ['libdvdomatic', 'libdvdomatic-wx']
+            obj.use    = ['libdcpomatic', 'libdcpomatic-wx']
             obj.source = '%s.cc' % t
             if bld.env.TARGET_WINDOWS:
-                obj.source += ' ../../windows/dvdomatic.rc'
+                obj.source += ' ../../windows/dcpomatic.rc'
             obj.target = t
 
-        i18n.po_to_mo(os.path.join('src', 'tools'), 'dvdomatic', bld)
+        i18n.po_to_mo(os.path.join('src', 'tools'), 'dcpomatic', bld)
 
 def pot(bld):
-    i18n.pot(os.path.join('src', 'tools'), 'dvdomatic.cc', 'dvdomatic')
+    i18n.pot(os.path.join('src', 'tools'), 'dcpomatic.cc', 'dcpomatic')
 
 def pot_merge(bld):
-    i18n.pot_merge(os.path.join('src', 'tools'), 'dvdomatic')
+    i18n.pot_merge(os.path.join('src', 'tools'), 'dcpomatic')
diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index bed7aac6d..15d746839 100644
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -100,7 +100,7 @@ AudioDialog::set_film (shared_ptr<Film> f)
 	_film_changed_connection = _film->Changed.connect (bind (&AudioDialog::film_changed, this, _1));
 	_film_audio_analysis_succeeded_connection = _film->AudioAnalysisSucceeded.connect (bind (&AudioDialog::try_to_load_analysis, this));
 
-	SetTitle (wxString::Format (_("DVD-o-matic audio - %s"), std_to_wx(_film->name()).data()));
+	SetTitle (wxString::Format (_("DCP-o-matic audio - %s"), std_to_wx(_film->name()).data()));
 }
 
 
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 1d025f3fa..4ae8f1eb4 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -18,7 +18,7 @@
 */
 
 /** @file src/config_dialog.cc
- *  @brief A dialogue to edit DVD-o-matic configuration.
+ *  @brief A dialogue to edit DCP-o-matic configuration.
  */
 
 #include <iostream>
@@ -41,7 +41,7 @@ using namespace std;
 using boost::bind;
 
 ConfigDialog::ConfigDialog (wxWindow* parent)
-	: wxDialog (parent, wxID_ANY, _("DVD-o-matic Preferences"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+	: wxDialog (parent, wxID_ANY, _("DCP-o-matic Preferences"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
 {
 	wxFlexGridSizer* table = new wxFlexGridSizer (3, 6, 6);
 	table->AddGrowableCol (1, 1);
@@ -58,7 +58,7 @@ ConfigDialog::ConfigDialog (wxWindow* parent)
 	table->AddSpacer (0);
 
 	table->AddSpacer (0);
-	wxStaticText* restart = add_label_to_sizer (table, this, _("(restart DVD-o-matic to see language changes)"));
+	wxStaticText* restart = add_label_to_sizer (table, this, _("(restart DCP-o-matic to see language changes)"));
 	wxFont font = restart->GetFont();
 	font.SetStyle (wxFONTSTYLE_ITALIC);
 	font.SetPointSize (font.GetPointSize() - 1);
diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index f6f3b3707..a2fc1f4b1 100644
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -18,7 +18,7 @@
 */
 
 /** @file src/config_dialog.h
- *  @brief A dialogue to edit DVD-o-matic configuration.
+ *  @brief A dialogue to edit DCP-o-matic configuration.
  */
 
 #include <wx/wx.h>
@@ -31,7 +31,7 @@ class DirPickerCtrl;
 class ServerDescription;
 
 /** @class ConfigDialog
- *  @brief A dialogue to edit DVD-o-matic configuration.
+ *  @brief A dialogue to edit DCP-o-matic configuration.
  */
 class ConfigDialog : public wxDialog
 {
diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po
index 207708589..abb6b780f 100644
--- a/src/wx/po/es_ES.po
+++ b/src/wx/po/es_ES.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: libdvdomatic-wx\n"
+"Project-Id-Version: libdcpomatic-wx\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-04-09 11:14+0100\n"
 "PO-Revision-Date: 2013-04-02 19:08-0500\n"
@@ -22,7 +22,7 @@ msgid "%"
 msgstr "%"
 
 #: src/wx/config_dialog.cc:61
-msgid "(restart DVD-o-matic to see language changes)"
+msgid "(restart DCP-o-matic to see language changes)"
 msgstr ""
 
 #: src/wx/film_editor.cc:1269
@@ -141,17 +141,17 @@ msgid "DCP Name"
 msgstr "Nombre DCP"
 
 #: src/wx/wx_util.cc:61
-msgid "DVD-o-matic"
-msgstr "DVD-o-matic"
+msgid "DCP-o-matic"
+msgstr "DCP-o-matic"
 
 #: src/wx/config_dialog.cc:44
-msgid "DVD-o-matic Preferences"
-msgstr "Preferencias DVD-o-matic"
+msgid "DCP-o-matic Preferences"
+msgstr "Preferencias DCP-o-matic"
 
 #: src/wx/audio_dialog.cc:101
 #, fuzzy, c-format
-msgid "DVD-o-matic audio - %s"
-msgstr "Audio DVD-o-matic - %1"
+msgid "DCP-o-matic audio - %s"
+msgstr "Audio DCP-o-matic - %1"
 
 #: src/wx/config_dialog.cc:102
 msgid "Default DCI name details"
diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index 80ee5dbfd..2aac7114c 100644
--- a/src/wx/po/fr_FR.po
+++ b/src/wx/po/fr_FR.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: DVD-o-matic FRENCH\n"
+"Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-04-09 11:14+0100\n"
 "PO-Revision-Date: 2013-03-20 00:34+0100\n"
@@ -21,7 +21,7 @@ msgid "%"
 msgstr "%"
 
 #: src/wx/config_dialog.cc:61
-msgid "(restart DVD-o-matic to see language changes)"
+msgid "(restart DCP-o-matic to see language changes)"
 msgstr ""
 
 #: src/wx/film_editor.cc:1269
@@ -140,17 +140,17 @@ msgid "DCP Name"
 msgstr "Nom du DCP"
 
 #: src/wx/wx_util.cc:61
-msgid "DVD-o-matic"
-msgstr "DVD-o-matic"
+msgid "DCP-o-matic"
+msgstr "DCP-o-matic"
 
 #: src/wx/config_dialog.cc:44
-msgid "DVD-o-matic Preferences"
-msgstr "Préférences DVD-o-matic"
+msgid "DCP-o-matic Preferences"
+msgstr "Préférences DCP-o-matic"
 
 #: src/wx/audio_dialog.cc:101
 #, c-format
-msgid "DVD-o-matic audio - %s"
-msgstr "Son DVD-o-matic  - %s"
+msgid "DCP-o-matic audio - %s"
+msgstr "Son DCP-o-matic  - %s"
 
 #: src/wx/config_dialog.cc:102
 msgid "Default DCI name details"
diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index 78fd0dee9..7b06495e8 100644
--- a/src/wx/po/it_IT.po
+++ b/src/wx/po/it_IT.po
@@ -22,8 +22,8 @@ msgid "%"
 msgstr "%"
 
 #: src/wx/config_dialog.cc:61
-msgid "(restart DVD-o-matic to see language changes)"
-msgstr "(riavviare DVD-o-matic per vedere i cambiamenti di lingua)"
+msgid "(restart DCP-o-matic to see language changes)"
+msgstr "(riavviare DCP-o-matic per vedere i cambiamenti di lingua)"
 
 #: src/wx/film_editor.cc:1269
 msgid "1 channel"
@@ -141,17 +141,17 @@ msgid "DCP Name"
 msgstr "Nome del DCP"
 
 #: src/wx/wx_util.cc:61
-msgid "DVD-o-matic"
-msgstr "DVD-o-matic"
+msgid "DCP-o-matic"
+msgstr "DCP-o-matic"
 
 #: src/wx/config_dialog.cc:44
-msgid "DVD-o-matic Preferences"
-msgstr "Preferenze DVD-o-matic"
+msgid "DCP-o-matic Preferences"
+msgstr "Preferenze DCP-o-matic"
 
 #: src/wx/audio_dialog.cc:101
 #, c-format
-msgid "DVD-o-matic audio - %s"
-msgstr "Audio DVD-o-matic - %s"
+msgid "DCP-o-matic audio - %s"
+msgstr "Audio DCP-o-matic - %s"
 
 #: src/wx/config_dialog.cc:102
 msgid "Default DCI name details"
diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po
index e52589ff0..96fafadeb 100644
--- a/src/wx/po/sv_SE.po
+++ b/src/wx/po/sv_SE.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: DVD-o-matic\n"
+"Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-04-09 11:14+0100\n"
 "PO-Revision-Date: 2013-04-09 10:13+0100\n"
@@ -22,8 +22,8 @@ msgid "%"
 msgstr "%"
 
 #: src/wx/config_dialog.cc:61
-msgid "(restart DVD-o-matic to see language changes)"
-msgstr "(starta om DVD-o-matic för att se språkändringar)"
+msgid "(restart DCP-o-matic to see language changes)"
+msgstr "(starta om DCP-o-matic för att se språkändringar)"
 
 #: src/wx/film_editor.cc:1269
 msgid "1 channel"
@@ -141,17 +141,17 @@ msgid "DCP Name"
 msgstr "DCP Namn"
 
 #: src/wx/wx_util.cc:61
-msgid "DVD-o-matic"
-msgstr "DVD-o-matic"
+msgid "DCP-o-matic"
+msgstr "DCP-o-matic"
 
 #: src/wx/config_dialog.cc:44
-msgid "DVD-o-matic Preferences"
-msgstr "DVD-o-matic Inställningar"
+msgid "DCP-o-matic Preferences"
+msgstr "DCP-o-matic Inställningar"
 
 #: src/wx/audio_dialog.cc:101
 #, c-format
-msgid "DVD-o-matic audio - %s"
-msgstr "DVD-o-matic audio - %s"
+msgid "DCP-o-matic audio - %s"
+msgstr "DCP-o-matic audio - %s"
 
 #: src/wx/config_dialog.cc:102
 msgid "Default DCI name details"
diff --git a/src/wx/wscript b/src/wx/wscript
index 7f9cde9ac..09bf40393 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -34,18 +34,18 @@ def build(bld):
     else:
         obj = bld(features = 'cxx cxxshlib')
 
-    obj.name   = 'libdvdomatic-wx'
+    obj.name   = 'libdcpomatic-wx'
     obj.includes = [ '..' ]
     obj.export_includes = ['.']
     obj.uselib = 'WXWIDGETS'
-    obj.use = 'libdvdomatic'
+    obj.use = 'libdcpomatic'
     obj.source = sources
-    obj.target = 'dvdomatic-wx'
+    obj.target = 'dcpomatic-wx'
 
-    i18n.po_to_mo(os.path.join('src', 'wx'), 'libdvdomatic-wx', bld)
+    i18n.po_to_mo(os.path.join('src', 'wx'), 'libdcpomatic-wx', bld)
 
 def pot(bld):
-    i18n.pot(os.path.join('src', 'wx'), sources, 'libdvdomatic-wx')
+    i18n.pot(os.path.join('src', 'wx'), sources, 'libdcpomatic-wx')
 
 def pot_merge(bld):
-    i18n.pot_merge(os.path.join('src', 'wx'), 'libdvdomatic-wx')
+    i18n.pot_merge(os.path.join('src', 'wx'), 'libdcpomatic-wx')
diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 720a058cb..3dad6e7fd 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -58,7 +58,7 @@ add_label_to_grid_bag_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, wxGBPos
 void
 error_dialog (wxWindow* parent, wxString m)
 {
-	wxMessageDialog* d = new wxMessageDialog (parent, m, _("DVD-o-matic"), wxOK);
+	wxMessageDialog* d = new wxMessageDialog (parent, m, _("DCP-o-matic"), wxOK);
 	d->ShowModal ();
 	d->Destroy ();
 }