diff --git a/lib/config.proto b/lib/config.proto
index 52b00604..8f148dd3 100644
--- a/lib/config.proto
+++ b/lib/config.proto
@@ -11,14 +11,14 @@ import "lib/common.proto";
 
 message InputProto {
 	oneof input {
-		InputFileProto image = 1;
+		ImageReaderProto image = 1;
 		FluxSourceProto flux = 2;
 	}
 }
 
 message OutputProto {
 	oneof output {
-		OutputFileProto image = 1;
+		ImageWriterProto image = 1;
 		FluxSinkProto flux = 2;
 	}
 }
diff --git a/lib/imagereader/diskcopyimagereader.cc b/lib/imagereader/diskcopyimagereader.cc
index f4326480..33e06a30 100644
--- a/lib/imagereader/diskcopyimagereader.cc
+++ b/lib/imagereader/diskcopyimagereader.cc
@@ -13,7 +13,7 @@
 class DiskCopyImageReader : public ImageReader
 {
 public:
-	DiskCopyImageReader(const InputFileProto& config):
+	DiskCopyImageReader(const ImageReaderProto& config):
 		ImageReader(config)
 	{}
 
@@ -121,7 +121,7 @@ public:
 };
 
 std::unique_ptr<ImageReader> ImageReader::createDiskCopyImageReader(
-	const InputFileProto& config)
+	const ImageReaderProto& config)
 {
     return std::unique_ptr<ImageReader>(new DiskCopyImageReader(config));
 }
diff --git a/lib/imagereader/imagereader.cc b/lib/imagereader/imagereader.cc
index 4dc8d717..a7612655 100644
--- a/lib/imagereader/imagereader.cc
+++ b/lib/imagereader/imagereader.cc
@@ -11,20 +11,20 @@
 #include <algorithm>
 #include <ctype.h>
 
-std::unique_ptr<ImageReader> ImageReader::create(const InputFileProto& config)
+std::unique_ptr<ImageReader> ImageReader::create(const ImageReaderProto& config)
 {
 	switch (config.format_case())
 	{
-		case InputFileProto::kImd:
+		case ImageReaderProto::kImd:
 			return ImageReader::createIMDImageReader(config);
 
-		case InputFileProto::kImg:
+		case ImageReaderProto::kImg:
 			return ImageReader::createImgImageReader(config);
 
-		case InputFileProto::kDiskcopy:
+		case ImageReaderProto::kDiskcopy:
 			return ImageReader::createDiskCopyImageReader(config);
 
-		case InputFileProto::kJv3:
+		case ImageReaderProto::kJv3:
 			return ImageReader::createJv3ImageReader(config);
 	}
 
@@ -34,7 +34,7 @@ std::unique_ptr<ImageReader> ImageReader::create(const InputFileProto& config)
 
 void ImageReader::updateConfigForFilename(const std::string& filename)
 {
-	InputFileProto* f = config.mutable_input()->mutable_image();
+	ImageReaderProto* f = config.mutable_input()->mutable_image();
 	static const std::map<std::string, std::function<void(void)>> formats =
 	{
 		{".adf",      [&]() { f->mutable_img(); }},
@@ -58,7 +58,7 @@ void ImageReader::updateConfigForFilename(const std::string& filename)
 	Error() << fmt::format("unrecognised image filename '{}'", filename);
 }
 
-ImageReader::ImageReader(const InputFileProto& config):
+ImageReader::ImageReader(const ImageReaderProto& config):
     _config(config)
 {}
 
diff --git a/lib/imagereader/imagereader.h b/lib/imagereader/imagereader.h
index 98f27716..8213debb 100644
--- a/lib/imagereader/imagereader.h
+++ b/lib/imagereader/imagereader.h
@@ -3,29 +3,29 @@
 
 class SectorSet;
 class ImageSpec;
-class InputFileProto;
+class ImageReaderProto;
 
 class ImageReader
 {
 public:
-	ImageReader(const InputFileProto& config);
+	ImageReader(const ImageReaderProto& config);
 	virtual ~ImageReader() {};
 
 public:
-    static std::unique_ptr<ImageReader> create(const InputFileProto& config);
+    static std::unique_ptr<ImageReader> create(const ImageReaderProto& config);
 	static void updateConfigForFilename(const std::string& filename);
 
 public:
-    static std::unique_ptr<ImageReader> createDiskCopyImageReader(const InputFileProto& config);
-    static std::unique_ptr<ImageReader> createImgImageReader(const InputFileProto& config);
-    static std::unique_ptr<ImageReader> createJv3ImageReader(const InputFileProto& config);
-    static std::unique_ptr<ImageReader> createIMDImageReader(const InputFileProto& config);
+    static std::unique_ptr<ImageReader> createDiskCopyImageReader(const ImageReaderProto& config);
+    static std::unique_ptr<ImageReader> createImgImageReader(const ImageReaderProto& config);
+    static std::unique_ptr<ImageReader> createJv3ImageReader(const ImageReaderProto& config);
+    static std::unique_ptr<ImageReader> createIMDImageReader(const ImageReaderProto& config);
 
 public:
 	virtual SectorSet readImage() = 0;
 
 protected:
-	const InputFileProto& _config;
+	const ImageReaderProto& _config;
 };
 
 #endif
diff --git a/lib/imagereader/imagereader.proto b/lib/imagereader/imagereader.proto
index ddab0c0f..8aa3707f 100644
--- a/lib/imagereader/imagereader.proto
+++ b/lib/imagereader/imagereader.proto
@@ -18,7 +18,7 @@ message DiskCopyInputProto {}
 message ImdInputProto {}
 message Jv3InputProto {}
 
-message InputFileProto {
+message ImageReaderProto {
 	optional string filename = 1;
 	oneof format {
 		ImgInputOutputProto img = 2;
diff --git a/lib/imagereader/imdimagereader.cc b/lib/imagereader/imdimagereader.cc
index c64f64e7..b5cc4470 100644
--- a/lib/imagereader/imdimagereader.cc
+++ b/lib/imagereader/imdimagereader.cc
@@ -85,7 +85,7 @@ static unsigned getSectorSize(uint8_t flags)
 class IMDImageReader : public ImageReader
 {
 public:
-	IMDImageReader(const InputFileProto& config):
+	IMDImageReader(const ImageReaderProto& config):
 		ImageReader(config)
 	{}
 
@@ -274,7 +274,7 @@ public:
 };
 
 std::unique_ptr<ImageReader> ImageReader::createIMDImageReader(
-	const InputFileProto& config)
+	const ImageReaderProto& config)
 {
     return std::unique_ptr<ImageReader>(new IMDImageReader(config));
 }
diff --git a/lib/imagereader/imgimagereader.cc b/lib/imagereader/imgimagereader.cc
index b6bf4a45..7eb5cd20 100644
--- a/lib/imagereader/imgimagereader.cc
+++ b/lib/imagereader/imgimagereader.cc
@@ -13,7 +13,7 @@
 class ImgImageReader : public ImageReader
 {
 public:
-	ImgImageReader(const InputFileProto& config):
+	ImgImageReader(const ImageReaderProto& config):
 		ImageReader(config)
 	{}
 
@@ -74,7 +74,7 @@ private:
 };
 
 std::unique_ptr<ImageReader> ImageReader::createImgImageReader(
-	const InputFileProto& config)
+	const ImageReaderProto& config)
 {
     return std::unique_ptr<ImageReader>(new ImgImageReader(config));
 }
diff --git a/lib/imagereader/jv3imagereader.cc b/lib/imagereader/jv3imagereader.cc
index 30cd6863..d1b97ce7 100644
--- a/lib/imagereader/jv3imagereader.cc
+++ b/lib/imagereader/jv3imagereader.cc
@@ -78,7 +78,7 @@ static unsigned getSectorSize(uint8_t flags)
 class Jv3ImageReader : public ImageReader
 {
 public:
-	Jv3ImageReader(const InputFileProto& config):
+	Jv3ImageReader(const ImageReaderProto& config):
 		ImageReader(config)
 	{}
 
@@ -133,7 +133,7 @@ public:
 	}
 };
 
-std::unique_ptr<ImageReader> ImageReader::createJv3ImageReader(const InputFileProto& config)
+std::unique_ptr<ImageReader> ImageReader::createJv3ImageReader(const ImageReaderProto& config)
 {
     return std::unique_ptr<ImageReader>(new Jv3ImageReader(config));
 }
diff --git a/lib/imagewriter/d64imagewriter.cc b/lib/imagewriter/d64imagewriter.cc
index f9a10349..fff3ba2b 100644
--- a/lib/imagewriter/d64imagewriter.cc
+++ b/lib/imagewriter/d64imagewriter.cc
@@ -25,7 +25,7 @@ static int sectors_per_track(int track)
 class D64ImageWriter : public ImageWriter
 {
 public:
-	D64ImageWriter(const OutputFileProto& config):
+	D64ImageWriter(const ImageWriterProto& config):
 		ImageWriter(config)
 	{}
 
@@ -56,7 +56,7 @@ public:
     }
 };
 
-std::unique_ptr<ImageWriter> ImageWriter::createD64ImageWriter(const OutputFileProto& config)
+std::unique_ptr<ImageWriter> ImageWriter::createD64ImageWriter(const ImageWriterProto& config)
 {
     return std::unique_ptr<ImageWriter>(new D64ImageWriter(config));
 }
diff --git a/lib/imagewriter/diskcopyimagewriter.cc b/lib/imagewriter/diskcopyimagewriter.cc
index 5ee668e2..c3b40b94 100644
--- a/lib/imagewriter/diskcopyimagewriter.cc
+++ b/lib/imagewriter/diskcopyimagewriter.cc
@@ -28,7 +28,7 @@ static void write_and_update_checksum(ByteWriter& bw, uint32_t& checksum, const
 class DiskCopyImageWriter : public ImageWriter
 {
 public:
-	DiskCopyImageWriter(const OutputFileProto& config):
+	DiskCopyImageWriter(const ImageWriterProto& config):
 		ImageWriter(config)
 	{}
 
@@ -170,7 +170,7 @@ public:
 };
 
 std::unique_ptr<ImageWriter> ImageWriter::createDiskCopyImageWriter(
-	const OutputFileProto& config)
+	const ImageWriterProto& config)
 {
     return std::unique_ptr<ImageWriter>(new DiskCopyImageWriter(config));
 }
diff --git a/lib/imagewriter/imagewriter.cc b/lib/imagewriter/imagewriter.cc
index 260da3b7..47103ab7 100644
--- a/lib/imagewriter/imagewriter.cc
+++ b/lib/imagewriter/imagewriter.cc
@@ -11,20 +11,20 @@
 #include <iostream>
 #include <fstream>
 
-std::unique_ptr<ImageWriter> ImageWriter::create(const OutputFileProto& config)
+std::unique_ptr<ImageWriter> ImageWriter::create(const ImageWriterProto& config)
 {
 	switch (config.format_case())
 	{
-		case OutputFileProto::kImg:
+		case ImageWriterProto::kImg:
 			return ImageWriter::createImgImageWriter(config);
 
-		case OutputFileProto::kD64:
+		case ImageWriterProto::kD64:
 			return ImageWriter::createD64ImageWriter(config);
 
-		case OutputFileProto::kLdbs:
+		case ImageWriterProto::kLdbs:
 			return ImageWriter::createLDBSImageWriter(config);
 
-		case OutputFileProto::kDiskcopy:
+		case ImageWriterProto::kDiskcopy:
 			return ImageWriter::createDiskCopyImageWriter(config);
 	}
 	Error() << "bad output image config";
@@ -33,7 +33,7 @@ std::unique_ptr<ImageWriter> ImageWriter::create(const OutputFileProto& config)
 
 void ImageWriter::updateConfigForFilename(const std::string& filename)
 {
-	OutputFileProto* f = config.mutable_output()->mutable_image();
+	ImageWriterProto* f = config.mutable_output()->mutable_image();
 	static const std::map<std::string, std::function<void(void)>> formats =
 	{
 		{".adf",      [&]() { f->mutable_img(); }},
@@ -58,7 +58,7 @@ void ImageWriter::updateConfigForFilename(const std::string& filename)
 	Error() << fmt::format("unrecognised image filename '{}'", filename);
 }
 
-ImageWriter::ImageWriter(const OutputFileProto& config):
+ImageWriter::ImageWriter(const ImageWriterProto& config):
 	_config(config)
 {}
 
diff --git a/lib/imagewriter/imagewriter.h b/lib/imagewriter/imagewriter.h
index 40738457..19b5ce9a 100644
--- a/lib/imagewriter/imagewriter.h
+++ b/lib/imagewriter/imagewriter.h
@@ -2,26 +2,26 @@
 #define IMAGEWRITER_H
 
 class SectorSet;
-class OutputFileProto;
+class ImageWriterProto;
 
 class ImageWriter
 {
 public:
-	ImageWriter(const OutputFileProto& config);
+	ImageWriter(const ImageWriterProto& config);
 	virtual ~ImageWriter() {};
 
 public:
-    static std::unique_ptr<ImageWriter> create(const OutputFileProto& config);
+    static std::unique_ptr<ImageWriter> create(const ImageWriterProto& config);
 	static void updateConfigForFilename(const std::string& filename);
 
     static std::unique_ptr<ImageWriter> createImgImageWriter(
-		const OutputFileProto& config);
+		const ImageWriterProto& config);
     static std::unique_ptr<ImageWriter> createLDBSImageWriter(
-		const OutputFileProto& config);
+		const ImageWriterProto& config);
     static std::unique_ptr<ImageWriter> createD64ImageWriter(
-		const OutputFileProto& config);
+		const ImageWriterProto& config);
     static std::unique_ptr<ImageWriter> createDiskCopyImageWriter(
-		const OutputFileProto& config);
+		const ImageWriterProto& config);
 
 public:
 	void printMap(const SectorSet& sectors);
@@ -29,7 +29,7 @@ public:
 	virtual void writeImage(const SectorSet& sectors) = 0;
 
 protected:
-	const OutputFileProto& _config;
+	const ImageWriterProto& _config;
 };
 
 #endif
diff --git a/lib/imagewriter/imagewriter.proto b/lib/imagewriter/imagewriter.proto
index b2efcb15..4ed36ccf 100644
--- a/lib/imagewriter/imagewriter.proto
+++ b/lib/imagewriter/imagewriter.proto
@@ -6,7 +6,7 @@ message D64OutputProto {}
 message LDBSOutputProto {}
 message DiskCopyOutputProto {}
 
-message OutputFileProto {
+message ImageWriterProto {
 	optional string filename = 1;
 	oneof format {
 		ImgInputOutputProto img = 2;
diff --git a/lib/imagewriter/imgimagewriter.cc b/lib/imagewriter/imgimagewriter.cc
index ad7bea4a..333f525b 100644
--- a/lib/imagewriter/imgimagewriter.cc
+++ b/lib/imagewriter/imgimagewriter.cc
@@ -13,7 +13,7 @@
 class ImgImageWriter : public ImageWriter
 {
 public:
-	ImgImageWriter(const OutputFileProto& config):
+	ImgImageWriter(const ImageWriterProto& config):
 		ImageWriter(config)
 	{}
 
@@ -57,7 +57,7 @@ public:
 };
 
 std::unique_ptr<ImageWriter> ImageWriter::createImgImageWriter(
-	const OutputFileProto& config)
+	const ImageWriterProto& config)
 {
     return std::unique_ptr<ImageWriter>(new ImgImageWriter(config));
 }
diff --git a/lib/imagewriter/ldbsimagewriter.cc b/lib/imagewriter/ldbsimagewriter.cc
index 097f326f..133d8a5d 100644
--- a/lib/imagewriter/ldbsimagewriter.cc
+++ b/lib/imagewriter/ldbsimagewriter.cc
@@ -14,7 +14,7 @@
 class LDBSImageWriter : public ImageWriter
 {
 public:
-	LDBSImageWriter(const OutputFileProto& config):
+	LDBSImageWriter(const ImageWriterProto& config):
 		ImageWriter(config)
 	{}
 
@@ -102,7 +102,7 @@ public:
     }
 };
 
-std::unique_ptr<ImageWriter> ImageWriter::createLDBSImageWriter(const OutputFileProto& config)
+std::unique_ptr<ImageWriter> ImageWriter::createLDBSImageWriter(const ImageWriterProto& config)
 {
     return std::unique_ptr<ImageWriter>(new LDBSImageWriter(config));
 }