diff --git a/Machines/Acorn/Archimedes/Archimedes.cpp b/Machines/Acorn/Archimedes/Archimedes.cpp
index 1e03df7ea..1b921f254 100644
--- a/Machines/Acorn/Archimedes/Archimedes.cpp
+++ b/Machines/Acorn/Archimedes/Archimedes.cpp
@@ -749,8 +749,8 @@ private:
 
 using namespace Archimedes;
 
-std::unique_ptr<Machine> Machine::Archimedes(
-	const Analyser::Static::Target *target,
+std::unique_ptr<Machine> Machine::create(
+	const Analyser::Static::Target *const target,
 	const ROMMachine::ROMFetcher &rom_fetcher
 ) {
 	const auto archimedes_target = dynamic_cast<const Analyser::Static::Acorn::ArchimedesTarget *>(target);
diff --git a/Machines/Acorn/Archimedes/Archimedes.hpp b/Machines/Acorn/Archimedes/Archimedes.hpp
index 8f04a1b7d..cbc7d08f8 100644
--- a/Machines/Acorn/Archimedes/Archimedes.hpp
+++ b/Machines/Acorn/Archimedes/Archimedes.hpp
@@ -19,7 +19,7 @@ namespace Archimedes {
 
 struct Machine {
 	virtual ~Machine() = default;
-	static std::unique_ptr<Machine> Archimedes(
+	static std::unique_ptr<Machine> create(
 		const Analyser::Static::Target *target,
 		const ROMMachine::ROMFetcher &rom_fetcher
 	);
diff --git a/Machines/Acorn/BBCMicro/BBCMicro.cpp b/Machines/Acorn/BBCMicro/BBCMicro.cpp
index 80e624d73..9e976c6b3 100644
--- a/Machines/Acorn/BBCMicro/BBCMicro.cpp
+++ b/Machines/Acorn/BBCMicro/BBCMicro.cpp
@@ -1349,8 +1349,8 @@ std::unique_ptr<Machine> machine(const Target &target, const ROMMachine::ROMFetc
 }
 }
 
-std::unique_ptr<Machine> Machine::BBCMicro(
-	const Analyser::Static::Target *target,
+std::unique_ptr<Machine> Machine::create(
+	const Analyser::Static::Target *const target,
 	const ROMMachine::ROMFetcher &rom_fetcher
 ) {
 	const Target *const acorn_target = dynamic_cast<const Target *>(target);
diff --git a/Machines/Acorn/BBCMicro/BBCMicro.hpp b/Machines/Acorn/BBCMicro/BBCMicro.hpp
index dfa90a207..96258f3d9 100644
--- a/Machines/Acorn/BBCMicro/BBCMicro.hpp
+++ b/Machines/Acorn/BBCMicro/BBCMicro.hpp
@@ -20,10 +20,7 @@ namespace BBCMicro {
 struct Machine {
 	virtual ~Machine() = default;
 
-	static std::unique_ptr<Machine> BBCMicro(
-		const Analyser::Static::Target *target,
-		const ROMMachine::ROMFetcher &rom_fetcher
-	);
+	static std::unique_ptr<Machine> create(const Analyser::Static::Target *, const ROMMachine::ROMFetcher &);
 
 	class Options:
 		public Reflection::StructImpl<Options>,
diff --git a/Machines/Acorn/Electron/Electron.cpp b/Machines/Acorn/Electron/Electron.cpp
index c7bad201c..8232e7a0a 100644
--- a/Machines/Acorn/Electron/Electron.cpp
+++ b/Machines/Acorn/Electron/Electron.cpp
@@ -792,7 +792,10 @@ private:
 
 using namespace Electron;
 
-std::unique_ptr<Machine> Machine::Electron(const Analyser::Static::Target *target, const ROMMachine::ROMFetcher &rom_fetcher) {
+std::unique_ptr<Machine> Machine::create(
+	const Analyser::Static::Target *const target,
+	const ROMMachine::ROMFetcher &rom_fetcher
+) {
 	using Target = Analyser::Static::Acorn::ElectronTarget;
 	const Target *const acorn_target = dynamic_cast<const Target *>(target);
 
diff --git a/Machines/Acorn/Electron/Electron.hpp b/Machines/Acorn/Electron/Electron.hpp
index cb37950fe..86f523870 100644
--- a/Machines/Acorn/Electron/Electron.hpp
+++ b/Machines/Acorn/Electron/Electron.hpp
@@ -27,10 +27,7 @@ struct Machine {
 	virtual ~Machine() = default;
 
 	/// Creates and returns an Electron.
-	static std::unique_ptr<Machine> Electron(
-		const Analyser::Static::Target *target,
-		const ROMMachine::ROMFetcher &rom_fetcher
-	);
+	static std::unique_ptr<Machine> create(const Analyser::Static::Target *, const ROMMachine::ROMFetcher &);
 
 	/// Defines the runtime options available for an Electron.
 	class Options:
diff --git a/Machines/Amiga/Amiga.cpp b/Machines/Amiga/Amiga.cpp
index 00fa98c6f..907dfebfa 100644
--- a/Machines/Amiga/Amiga.cpp
+++ b/Machines/Amiga/Amiga.cpp
@@ -251,7 +251,10 @@ private:
 
 using namespace Amiga;
 
-std::unique_ptr<Machine> Machine::Amiga(const Analyser::Static::Target *target, const ROMMachine::ROMFetcher &rom_fetcher) {
+std::unique_ptr<Machine> Machine::create(
+	const Analyser::Static::Target *const target,
+	const ROMMachine::ROMFetcher &rom_fetcher
+) {
 	using Target = Analyser::Static::Amiga::Target;
 	const Target *const amiga_target = dynamic_cast<const Target *>(target);
 	return std::make_unique<Amiga::ConcreteMachine>(*amiga_target, rom_fetcher);
diff --git a/Machines/Amiga/Amiga.hpp b/Machines/Amiga/Amiga.hpp
index 892228883..1faadc449 100644
--- a/Machines/Amiga/Amiga.hpp
+++ b/Machines/Amiga/Amiga.hpp
@@ -19,7 +19,7 @@ struct Machine {
 	virtual ~Machine() = default;
 
 	/// Creates and returns an Amiga.
-	static std::unique_ptr<Machine> Amiga(const Analyser::Static::Target *, const ROMMachine::ROMFetcher &);
+	static std::unique_ptr<Machine> create(const Analyser::Static::Target *, const ROMMachine::ROMFetcher &);
 };
 
 }
diff --git a/Machines/AmstradCPC/AmstradCPC.cpp b/Machines/AmstradCPC/AmstradCPC.cpp
index 9acbf32ad..bf82561e7 100644
--- a/Machines/AmstradCPC/AmstradCPC.cpp
+++ b/Machines/AmstradCPC/AmstradCPC.cpp
@@ -1390,8 +1390,8 @@ std::unique_ptr<Machine> machine(
 }
 
 // See header; constructs and returns an instance of the Amstrad CPC.
-std::unique_ptr<Machine> Machine::AmstradCPC(
-	const Analyser::Static::Target *target,
+std::unique_ptr<Machine> Machine::create(
+	const Analyser::Static::Target *const target,
 	const ROMMachine::ROMFetcher &rom_fetcher
 ) {
 	using Target = Analyser::Static::AmstradCPC::Target;
diff --git a/Machines/AmstradCPC/AmstradCPC.hpp b/Machines/AmstradCPC/AmstradCPC.hpp
index 07b7ecbed..a7c5ec548 100644
--- a/Machines/AmstradCPC/AmstradCPC.hpp
+++ b/Machines/AmstradCPC/AmstradCPC.hpp
@@ -24,8 +24,8 @@ struct Machine {
 	virtual ~Machine() = default;
 
 	/// Creates and returns an Amstrad CPC.
-	static std::unique_ptr<Machine> AmstradCPC(
-		const Analyser::Static::Target *const target,
+	static std::unique_ptr<Machine> create(
+		const Analyser::Static::Target *target,
 		const ROMMachine::ROMFetcher &rom_fetcher
 	);
 
diff --git a/Machines/Apple/AppleII/AppleII.cpp b/Machines/Apple/AppleII/AppleII.cpp
index 20a584087..3ad62b24c 100644
--- a/Machines/Apple/AppleII/AppleII.cpp
+++ b/Machines/Apple/AppleII/AppleII.cpp
@@ -1094,7 +1094,10 @@ public:
 
 using namespace Apple::II;
 
-std::unique_ptr<Machine> Machine::AppleII(const Analyser::Static::Target *target, const ROMMachine::ROMFetcher &rom_fetcher) {
+std::unique_ptr<Machine> Machine::create(
+	const Analyser::Static::Target *const target,
+	const ROMMachine::ROMFetcher &rom_fetcher
+) {
 	using Target = Analyser::Static::AppleII::Target;
 	const Target *const appleii_target = dynamic_cast<const Target *>(target);
 
diff --git a/Machines/Apple/AppleII/AppleII.hpp b/Machines/Apple/AppleII/AppleII.hpp
index b50469676..3264ae9f1 100644
--- a/Machines/Apple/AppleII/AppleII.hpp
+++ b/Machines/Apple/AppleII/AppleII.hpp
@@ -21,7 +21,7 @@ struct Machine {
 	virtual ~Machine() = default;
 
 	/// Creates and returns an AppleII.
-	static std::unique_ptr<Machine> AppleII(const Analyser::Static::Target *, const ROMMachine::ROMFetcher &);
+	static std::unique_ptr<Machine> create(const Analyser::Static::Target *, const ROMMachine::ROMFetcher &);
 
 	/// Defines the runtime options available for an Apple II.
 	class Options: public Reflection::StructImpl<Options>, public Configurable::Options::Display<Options> {
diff --git a/Machines/Apple/AppleIIgs/AppleIIgs.cpp b/Machines/Apple/AppleIIgs/AppleIIgs.cpp
index ce6c798de..5164c00b7 100644
--- a/Machines/Apple/AppleIIgs/AppleIIgs.cpp
+++ b/Machines/Apple/AppleIIgs/AppleIIgs.cpp
@@ -1010,6 +1010,9 @@ private:
 
 using namespace Apple::IIgs;
 
-std::unique_ptr<Machine> Machine::AppleIIgs(const Analyser::Static::Target *target, const ROMMachine::ROMFetcher &rom_fetcher) {
+std::unique_ptr<Machine> Machine::create(
+	const Analyser::Static::Target *const target,
+	const ROMMachine::ROMFetcher &rom_fetcher
+) {
 	return std::make_unique<ConcreteMachine>(*dynamic_cast<const Analyser::Static::AppleIIgs::Target *>(target), rom_fetcher);
 }
diff --git a/Machines/Apple/AppleIIgs/AppleIIgs.hpp b/Machines/Apple/AppleIIgs/AppleIIgs.hpp
index 12224f629..d8996c18f 100644
--- a/Machines/Apple/AppleIIgs/AppleIIgs.hpp
+++ b/Machines/Apple/AppleIIgs/AppleIIgs.hpp
@@ -21,7 +21,7 @@ struct Machine {
 	virtual ~Machine() = default;
 
 	/// Creates and returns an AppleIIgs.
-	static std::unique_ptr<Machine> AppleIIgs(const Analyser::Static::Target *, const ROMMachine::ROMFetcher &);
+	static std::unique_ptr<Machine> create(const Analyser::Static::Target *, const ROMMachine::ROMFetcher &);
 };
 
 }
diff --git a/Machines/Apple/Macintosh/Macintosh.cpp b/Machines/Apple/Macintosh/Macintosh.cpp
index 56fa24056..40f1ca6cc 100644
--- a/Machines/Apple/Macintosh/Macintosh.cpp
+++ b/Machines/Apple/Macintosh/Macintosh.cpp
@@ -842,7 +842,10 @@ private:
 
 using namespace Apple::Macintosh;
 
-std::unique_ptr<Machine> Machine::Macintosh(const Analyser::Static::Target *target, const ROMMachine::ROMFetcher &rom_fetcher) {
+std::unique_ptr<Machine> Machine::create(
+	const Analyser::Static::Target *const target,
+	const ROMMachine::ROMFetcher &rom_fetcher
+) {
 	auto *const mac_target = dynamic_cast<const Analyser::Static::Macintosh::Target *>(target);
 
 	using Model = Analyser::Static::Macintosh::Target::Model;
diff --git a/Machines/Apple/Macintosh/Macintosh.hpp b/Machines/Apple/Macintosh/Macintosh.hpp
index e9e29d309..340af4e30 100644
--- a/Machines/Apple/Macintosh/Macintosh.hpp
+++ b/Machines/Apple/Macintosh/Macintosh.hpp
@@ -19,7 +19,7 @@ struct Machine {
 	virtual ~Machine() = default;
 
 	/// Creates and returns a Macintosh.
-	static std::unique_ptr<Machine> Macintosh(const Analyser::Static::Target *, const ROMMachine::ROMFetcher &);
+	static std::unique_ptr<Machine> create(const Analyser::Static::Target *, const ROMMachine::ROMFetcher &);
 
 	class Options: public Reflection::StructImpl<Options>, public Configurable::Options::QuickBoot<Options> {
 		friend Configurable::Options::QuickBoot<Options>;
diff --git a/Machines/Atari/2600/Atari2600.cpp b/Machines/Atari/2600/Atari2600.cpp
index f4e1c9cca..09eff7da4 100644
--- a/Machines/Atari/2600/Atari2600.cpp
+++ b/Machines/Atari/2600/Atari2600.cpp
@@ -219,7 +219,7 @@ private:
 
 using namespace Atari2600;
 
-std::unique_ptr<Machine> Machine::Atari2600(const Analyser::Static::Target *target, const ROMMachine::ROMFetcher &) {
+std::unique_ptr<Machine> Machine::create(const Analyser::Static::Target *const target, const ROMMachine::ROMFetcher &) {
 	const Target *const atari_target = dynamic_cast<const Target *>(target);
 	return std::make_unique<Atari2600::ConcreteMachine>(*atari_target);
 }
diff --git a/Machines/Atari/2600/Atari2600.hpp b/Machines/Atari/2600/Atari2600.hpp
index 765ad455f..a7f66f224 100644
--- a/Machines/Atari/2600/Atari2600.hpp
+++ b/Machines/Atari/2600/Atari2600.hpp
@@ -25,7 +25,7 @@ struct Machine {
 	virtual ~Machine() = default;
 
 	/// Creates and returns an Atari 2600 on the heap.
-	static std::unique_ptr<Machine> Atari2600(const Analyser::Static::Target *, const ROMMachine::ROMFetcher &);
+	static std::unique_ptr<Machine> create(const Analyser::Static::Target *, const ROMMachine::ROMFetcher &);
 
 	/// Sets the switch @c input to @c state.
 	virtual void set_switch_is_enabled(Atari2600Switch, bool) = 0;
diff --git a/Machines/Atari/ST/AtariST.cpp b/Machines/Atari/ST/AtariST.cpp
index 7402fe5f0..c22ab8fc3 100644
--- a/Machines/Atari/ST/AtariST.cpp
+++ b/Machines/Atari/ST/AtariST.cpp
@@ -708,7 +708,10 @@ private:
 
 using namespace Atari::ST;
 
-std::unique_ptr<Machine> Machine::AtariST(const Analyser::Static::Target *target, const ROMMachine::ROMFetcher &rom_fetcher) {
+std::unique_ptr<Machine> Machine::create(
+	const Analyser::Static::Target *const target,
+	const ROMMachine::ROMFetcher &rom_fetcher
+) {
 	auto *const atari_target = dynamic_cast<const Analyser::Static::AtariST::Target *>(target);
 	if(!atari_target) {
 		return nullptr;
diff --git a/Machines/Atari/ST/AtariST.hpp b/Machines/Atari/ST/AtariST.hpp
index e05dd6777..0ce33f1ef 100644
--- a/Machines/Atari/ST/AtariST.hpp
+++ b/Machines/Atari/ST/AtariST.hpp
@@ -20,7 +20,7 @@ namespace Atari::ST {
 struct Machine {
 	virtual ~Machine() = default;
 
-	static std::unique_ptr<Machine> AtariST(const Analyser::Static::Target *, const ROMMachine::ROMFetcher &);
+	static std::unique_ptr<Machine> create(const Analyser::Static::Target *, const ROMMachine::ROMFetcher &);
 
 	class Options: public Reflection::StructImpl<Options>, public Configurable::Options::Display<Options> {
 		friend Configurable::Options::Display<Options>;
diff --git a/Machines/ColecoVision/ColecoVision.cpp b/Machines/ColecoVision/ColecoVision.cpp
index 3170a413b..be57445b7 100644
--- a/Machines/ColecoVision/ColecoVision.cpp
+++ b/Machines/ColecoVision/ColecoVision.cpp
@@ -420,6 +420,9 @@ private:
 
 using namespace Coleco::Vision;
 
-std::unique_ptr<Machine> Machine::ColecoVision(const Analyser::Static::Target *target, const ROMMachine::ROMFetcher &rom_fetcher) {
+std::unique_ptr<Machine> Machine::create(
+	const Analyser::Static::Target *target,
+	const ROMMachine::ROMFetcher &rom_fetcher
+) {
 	return std::make_unique<ConcreteMachine>(*target, rom_fetcher);
 }
diff --git a/Machines/ColecoVision/ColecoVision.hpp b/Machines/ColecoVision/ColecoVision.hpp
index 99727b14e..a2ef85a42 100644
--- a/Machines/ColecoVision/ColecoVision.hpp
+++ b/Machines/ColecoVision/ColecoVision.hpp
@@ -19,7 +19,7 @@ namespace Coleco::Vision {
 
 struct Machine {
 	virtual ~Machine() = default;
-	static std::unique_ptr<Machine> ColecoVision(const Analyser::Static::Target *, const ROMMachine::ROMFetcher &);
+	static std::unique_ptr<Machine> create(const Analyser::Static::Target *, const ROMMachine::ROMFetcher &);
 
 	class Options: public Reflection::StructImpl<Options>, public Configurable::Options::Display<Options> {
 		friend Configurable::Options::Display<Options>;
diff --git a/Machines/Commodore/Plus4/Plus4.cpp b/Machines/Commodore/Plus4/Plus4.cpp
index 21a63e730..5d59cf4b1 100644
--- a/Machines/Commodore/Plus4/Plus4.cpp
+++ b/Machines/Commodore/Plus4/Plus4.cpp
@@ -751,8 +751,8 @@ private:
 };
 }
 
-std::unique_ptr<Machine> Machine::Plus4(
-	const Analyser::Static::Target *target,
+std::unique_ptr<Machine> Machine::create(
+	const Analyser::Static::Target *const target,
 	const ROMMachine::ROMFetcher &rom_fetcher
 ) {
 	using Target = Analyser::Static::Commodore::Plus4Target;
diff --git a/Machines/Commodore/Plus4/Plus4.hpp b/Machines/Commodore/Plus4/Plus4.hpp
index d32ae0a1d..686f29ee0 100644
--- a/Machines/Commodore/Plus4/Plus4.hpp
+++ b/Machines/Commodore/Plus4/Plus4.hpp
@@ -22,7 +22,7 @@ std::unique_ptr<Reflection::Struct> get_options();
 struct Machine {
 	virtual ~Machine() = default;
 
-	static std::unique_ptr<Machine> Plus4(const Analyser::Static::Target *, const ROMMachine::ROMFetcher &);
+	static std::unique_ptr<Machine> create(const Analyser::Static::Target *, const ROMMachine::ROMFetcher &);
 
 	class Options:
 		public Reflection::StructImpl<Options>,
diff --git a/Machines/Commodore/Vic-20/Vic20.cpp b/Machines/Commodore/Vic-20/Vic20.cpp
index ea84a324a..05dc159f8 100644
--- a/Machines/Commodore/Vic-20/Vic20.cpp
+++ b/Machines/Commodore/Vic-20/Vic20.cpp
@@ -817,7 +817,7 @@ private:
 
 using namespace Commodore::Vic20;
 
-std::unique_ptr<Machine> Machine::Vic20(
+std::unique_ptr<Machine> Machine::create(
 	const Analyser::Static::Target *const target,
 	const ROMMachine::ROMFetcher &rom_fetcher
 ) {
diff --git a/Machines/Commodore/Vic-20/Vic20.hpp b/Machines/Commodore/Vic-20/Vic20.hpp
index 9dd4f27e4..813d058ad 100644
--- a/Machines/Commodore/Vic-20/Vic20.hpp
+++ b/Machines/Commodore/Vic-20/Vic20.hpp
@@ -24,7 +24,7 @@ struct Machine {
 	virtual ~Machine() = default;
 
 	/// Creates and returns a Vic-20.
-	static std::unique_ptr<Machine> Vic20(const Analyser::Static::Target *, const ROMMachine::ROMFetcher &);
+	static std::unique_ptr<Machine> create(const Analyser::Static::Target *, const ROMMachine::ROMFetcher &);
 
 	class Options:
 		public Reflection::StructImpl<Options>,
diff --git a/Machines/Enterprise/Enterprise.cpp b/Machines/Enterprise/Enterprise.cpp
index fff2e3e96..acb01a25a 100644
--- a/Machines/Enterprise/Enterprise.cpp
+++ b/Machines/Enterprise/Enterprise.cpp
@@ -990,7 +990,7 @@ std::unique_ptr<Machine> machine(
 
 }
 
-std::unique_ptr<Machine> Machine::Enterprise(
+std::unique_ptr<Machine> Machine::create(
 	const Analyser::Static::Target *const target,
 	const ROMMachine::ROMFetcher &rom_fetcher
 ) {
diff --git a/Machines/Enterprise/Enterprise.hpp b/Machines/Enterprise/Enterprise.hpp
index 7421f7174..cfe487ca3 100644
--- a/Machines/Enterprise/Enterprise.hpp
+++ b/Machines/Enterprise/Enterprise.hpp
@@ -25,7 +25,7 @@ namespace Enterprise {
 */
 struct Machine {
 	virtual ~Machine() = default;
-	static std::unique_ptr<Machine> Enterprise(const Analyser::Static::Target *, const ROMMachine::ROMFetcher &);
+	static std::unique_ptr<Machine> create(const Analyser::Static::Target *, const ROMMachine::ROMFetcher &);
 
 	/// Defines the runtime options available for an Enterprise.
 	class Options: public Reflection::StructImpl<Options>, public Configurable::Options::Display<Options> {
diff --git a/Machines/MSX/MSX.cpp b/Machines/MSX/MSX.cpp
index 706077797..3901044ba 100644
--- a/Machines/MSX/MSX.cpp
+++ b/Machines/MSX/MSX.cpp
@@ -1039,7 +1039,10 @@ private:
 
 using namespace MSX;
 
-std::unique_ptr<Machine> Machine::MSX(const Analyser::Static::Target *target, const ROMMachine::ROMFetcher &rom_fetcher) {
+std::unique_ptr<Machine> Machine::create(
+	const Analyser::Static::Target *const target,
+	const ROMMachine::ROMFetcher &rom_fetcher
+) {
 	const auto msx_target = dynamic_cast<const Target *>(target);
 	if(msx_target->has_msx_music) {
 		switch(msx_target->model) {
diff --git a/Machines/MSX/MSX.hpp b/Machines/MSX/MSX.hpp
index f89552560..fff6c4fee 100644
--- a/Machines/MSX/MSX.hpp
+++ b/Machines/MSX/MSX.hpp
@@ -19,7 +19,7 @@ namespace MSX {
 
 struct Machine {
 	virtual ~Machine() = default;
-	static std::unique_ptr<Machine> MSX(const Analyser::Static::Target *, const ROMMachine::ROMFetcher &);
+	static std::unique_ptr<Machine> create(const Analyser::Static::Target *, const ROMMachine::ROMFetcher &);
 
 	class Options:
 		public Reflection::StructImpl<Options>,
diff --git a/Machines/MasterSystem/MasterSystem.cpp b/Machines/MasterSystem/MasterSystem.cpp
index b09e33260..315f4bde3 100644
--- a/Machines/MasterSystem/MasterSystem.cpp
+++ b/Machines/MasterSystem/MasterSystem.cpp
@@ -606,8 +606,8 @@ private:
 
 using namespace Sega::MasterSystem;
 
-std::unique_ptr<Machine> Machine::MasterSystem(
-	const Analyser::Static::Target *target,
+std::unique_ptr<Machine> Machine::create(
+	const Analyser::Static::Target *const target,
 	const ROMMachine::ROMFetcher &rom_fetcher
 ) {
 	using Target = Analyser::Static::Sega::Target;
diff --git a/Machines/MasterSystem/MasterSystem.hpp b/Machines/MasterSystem/MasterSystem.hpp
index 1103714f6..6d5c90e44 100644
--- a/Machines/MasterSystem/MasterSystem.hpp
+++ b/Machines/MasterSystem/MasterSystem.hpp
@@ -19,7 +19,7 @@ namespace Sega::MasterSystem {
 
 struct Machine {
 	virtual ~Machine() = default;
-	static std::unique_ptr<Machine> MasterSystem(const Analyser::Static::Target *, const ROMMachine::ROMFetcher &);
+	static std::unique_ptr<Machine> create(const Analyser::Static::Target *, const ROMMachine::ROMFetcher &);
 
 	class Options: public Reflection::StructImpl<Options>, public Configurable::Options::Display<Options> {
 		friend Configurable::Options::Display<Options>;
diff --git a/Machines/Oric/Oric.cpp b/Machines/Oric/Oric.cpp
index daceed2c8..53b42fdce 100644
--- a/Machines/Oric/Oric.cpp
+++ b/Machines/Oric/Oric.cpp
@@ -835,7 +835,10 @@ std::unique_ptr<Machine> machine(const Analyser::Static::Oric::Target &target, c
 
 }
 
-std::unique_ptr<Machine> Machine::Oric(const Analyser::Static::Target *target_hint, const ROMMachine::ROMFetcher &rom_fetcher) {
+std::unique_ptr<Machine> Machine::create(
+	const Analyser::Static::Target *const target_hint,
+	const ROMMachine::ROMFetcher &rom_fetcher
+) {
 	auto *const oric_target = dynamic_cast<const Analyser::Static::Oric::Target *>(target_hint);
 
 	switch(oric_target->processor) {
diff --git a/Machines/Oric/Oric.hpp b/Machines/Oric/Oric.hpp
index 9e5b6b839..9c3e926a4 100644
--- a/Machines/Oric/Oric.hpp
+++ b/Machines/Oric/Oric.hpp
@@ -22,7 +22,7 @@ namespace Oric {
 */
 struct Machine {
 	virtual ~Machine() = default;
-	static std::unique_ptr<Machine> Oric(const Analyser::Static::Target *, const ROMMachine::ROMFetcher &);
+	static std::unique_ptr<Machine> create(const Analyser::Static::Target *, const ROMMachine::ROMFetcher &);
 
 	class Options:
 		public Reflection::StructImpl<Options>,
diff --git a/Machines/PCCompatible/PCCompatible.cpp b/Machines/PCCompatible/PCCompatible.cpp
index 792bbe6ff..fb11df1a2 100644
--- a/Machines/PCCompatible/PCCompatible.cpp
+++ b/Machines/PCCompatible/PCCompatible.cpp
@@ -1153,8 +1153,8 @@ std::unique_ptr<Machine> machine(const Target &target, const ROMMachine::ROMFetc
 }
 }
 
-std::unique_ptr<Machine> Machine::PCCompatible(
-	const Analyser::Static::Target *target,
+std::unique_ptr<Machine> Machine::create(
+	const Analyser::Static::Target *const target,
 	const ROMMachine::ROMFetcher &rom_fetcher
 ) {
 	const Target *const pc_target = dynamic_cast<const Target *>(target);
diff --git a/Machines/PCCompatible/PCCompatible.hpp b/Machines/PCCompatible/PCCompatible.hpp
index 633b180c8..7ae2effed 100644
--- a/Machines/PCCompatible/PCCompatible.hpp
+++ b/Machines/PCCompatible/PCCompatible.hpp
@@ -22,10 +22,7 @@ struct Machine {
 	virtual ~Machine() = default;
 
 	/// Creates and returns a PC Compatible.
-	static std::unique_ptr<Machine> PCCompatible(
-		const Analyser::Static::Target *target,
-		const ROMMachine::ROMFetcher &rom_fetcher
-	);
+	static std::unique_ptr<Machine> create(const Analyser::Static::Target *, const ROMMachine::ROMFetcher &);
 
 	/// Defines the runtime options [sometimes] available for a PC.
 	class Options:
diff --git a/Machines/Sinclair/ZX8081/ZX8081.cpp b/Machines/Sinclair/ZX8081/ZX8081.cpp
index 77e51fff3..639818185 100644
--- a/Machines/Sinclair/ZX8081/ZX8081.cpp
+++ b/Machines/Sinclair/ZX8081/ZX8081.cpp
@@ -498,7 +498,10 @@ private:
 using namespace Sinclair::ZX8081;
 
 // See header; constructs and returns an instance of the ZX80 or 81.
-std::unique_ptr<Machine> Machine::ZX8081(const Analyser::Static::Target *target, const ROMMachine::ROMFetcher &rom_fetcher) {
+std::unique_ptr<Machine> Machine::create(
+	const Analyser::Static::Target *const target,
+	const ROMMachine::ROMFetcher &rom_fetcher
+) {
 	const auto zx_target = dynamic_cast<const Analyser::Static::ZX8081::Target *>(target);
 
 	// Instantiate the correct type of machine.
diff --git a/Machines/Sinclair/ZX8081/ZX8081.hpp b/Machines/Sinclair/ZX8081/ZX8081.hpp
index 89863d93e..d02b5475e 100644
--- a/Machines/Sinclair/ZX8081/ZX8081.hpp
+++ b/Machines/Sinclair/ZX8081/ZX8081.hpp
@@ -20,7 +20,7 @@ namespace Sinclair::ZX8081 {
 /// The ZX80/81 machine.
 struct Machine {
 	virtual ~Machine() = default;
-	static std::unique_ptr<Machine> ZX8081(const Analyser::Static::Target *target, const ROMMachine::ROMFetcher &rom_fetcher);
+	static std::unique_ptr<Machine> create(const Analyser::Static::Target *, const ROMMachine::ROMFetcher &);
 
 	virtual void set_tape_is_playing(bool is_playing) = 0;
 	virtual bool get_tape_is_playing() = 0;
diff --git a/Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp b/Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp
index ec376bffe..8446d668d 100644
--- a/Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp
+++ b/Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp
@@ -1013,7 +1013,10 @@ private:
 
 using namespace Sinclair::ZXSpectrum;
 
-std::unique_ptr<Machine> Machine::ZXSpectrum(const Analyser::Static::Target *target, const ROMMachine::ROMFetcher &rom_fetcher) {
+std::unique_ptr<Machine> Machine::create(
+	const Analyser::Static::Target *const target,
+	const ROMMachine::ROMFetcher &rom_fetcher
+) {
 	const auto zx_target = dynamic_cast<const Analyser::Static::ZXSpectrum::Target *>(target);
 
 	switch(zx_target->model) {
diff --git a/Machines/Sinclair/ZXSpectrum/ZXSpectrum.hpp b/Machines/Sinclair/ZXSpectrum/ZXSpectrum.hpp
index 1da817740..88b4928df 100644
--- a/Machines/Sinclair/ZXSpectrum/ZXSpectrum.hpp
+++ b/Machines/Sinclair/ZXSpectrum/ZXSpectrum.hpp
@@ -19,7 +19,7 @@ namespace Sinclair::ZXSpectrum {
 
 struct Machine {
 	virtual ~Machine() = default;
-	static std::unique_ptr<Machine> ZXSpectrum(const Analyser::Static::Target *, const ROMMachine::ROMFetcher &);
+	static std::unique_ptr<Machine> create(const Analyser::Static::Target *, const ROMMachine::ROMFetcher &);
 
 	virtual void set_tape_is_playing(bool is_playing) = 0;
 	virtual bool get_tape_is_playing() = 0;
diff --git a/Machines/Thomson/MO/MO.cpp b/Machines/Thomson/MO/MO.cpp
index 8e4a7b623..851fae6e9 100644
--- a/Machines/Thomson/MO/MO.cpp
+++ b/Machines/Thomson/MO/MO.cpp
@@ -738,8 +738,8 @@ std::unique_ptr<Machine> machine(const Target &target, const ROMMachine::ROMFetc
 }
 }
 
-std::unique_ptr<Machine> Machine::ThomsonMO(
-	const Analyser::Static::Target *target,
+std::unique_ptr<Machine> Machine::create(
+	const Analyser::Static::Target *const target,
 	const ROMMachine::ROMFetcher &rom_fetcher
 ) {
 	const Target *const thomson_target = dynamic_cast<const Target *>(target);
diff --git a/Machines/Thomson/MO/MO.hpp b/Machines/Thomson/MO/MO.hpp
index eb52217de..6e1baac96 100644
--- a/Machines/Thomson/MO/MO.hpp
+++ b/Machines/Thomson/MO/MO.hpp
@@ -20,10 +20,7 @@ namespace Thomson::MO {
 struct Machine {
 	virtual ~Machine() = default;
 
-	static std::unique_ptr<Machine> ThomsonMO(
-		const Analyser::Static::Target *,
-		const ROMMachine::ROMFetcher &
-	);
+	static std::unique_ptr<Machine> create(const Analyser::Static::Target *, const ROMMachine::ROMFetcher &);
 
 	class Options:
 		public Reflection::StructImpl<Options>,
diff --git a/Machines/Utility/MachineForTarget.cpp b/Machines/Utility/MachineForTarget.cpp
index 97de17f36..670fb9a14 100644
--- a/Machines/Utility/MachineForTarget.cpp
+++ b/Machines/Utility/MachineForTarget.cpp
@@ -68,7 +68,7 @@ std::unique_ptr<Machine::DynamicMachine> Machine::MachineForTarget(
 #define BindD(name, m)	\
 	case Analyser::Machine::m: \
 		machine = std::make_unique<Machine::TypedDynamicMachine<::name::Machine>>(	\
-			name::Machine::m(target, rom_fetcher)	\
+			name::Machine::create(target, rom_fetcher)	\
 		);		\
 	break;
 #define Bind(m)	BindD(m, m)