Simplify NameFormat stuff.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/dcp.cc b/src/dcp.cc
index ba72df8c..6af144dd 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -459,21 +459,21 @@ DCP::write_xml (
 	Standard standard,
 	XMLMetadata metadata,
 	shared_ptr<const CertificateChain> signer,
-	FilenameFormat filename_format
+	NameFormat name_format
 	)
 {
 	BOOST_FOREACH (shared_ptr<CPL> i, cpls ()) {
 		NameFormat::Map values;
 		values['t'] = "cpl";
 		values['i'] = i->id();
-		i->write_xml (_directory / (filename_format.get(values) + ".xml"), standard, signer);
+		i->write_xml (_directory / (name_format.get(values) + ".xml"), standard, signer);
 	}
 
 	string const pkl_uuid = make_uuid ();
 	NameFormat::Map values;
 	values['t'] = "pkl";
 	values['i'] = pkl_uuid;
-	boost::filesystem::path const pkl_path = write_pkl (filename_format.get(values) + ".xml", standard, pkl_uuid, metadata, signer);
+	boost::filesystem::path const pkl_path = write_pkl (name_format.get(values) + ".xml", standard, pkl_uuid, metadata, signer);
 
 	write_volindex (standard);
 	write_assetmap (standard, pkl_uuid, boost::filesystem::file_size (pkl_path), metadata);