diff --git a/src/devices/bus/psx/memcard.cpp b/src/devices/bus/psx/memcard.cpp
index 5b8ff16933b..68aecb19e01 100644
--- a/src/devices/bus/psx/memcard.cpp
+++ b/src/devices/bus/psx/memcard.cpp
@@ -313,7 +313,7 @@ bool psxcard_device::call_load()
 	return IMAGE_INIT_PASS;
 }
 
-bool psxcard_device::call_create(int format_type, option_resolution *format_options)
+bool psxcard_device::call_create(int format_type, util::option_resolution *format_options)
 {
 	UINT8 block[block_size];
 	int i, ret;
diff --git a/src/devices/bus/psx/memcard.h b/src/devices/bus/psx/memcard.h
index 762545d60db..3b03e4220c9 100644
--- a/src/devices/bus/psx/memcard.h
+++ b/src/devices/bus/psx/memcard.h
@@ -29,7 +29,7 @@ public:
 	virtual const option_guide *create_option_guide() const override { return nullptr; }
 
 	virtual bool call_load() override;
-	virtual bool call_create(int format_type, option_resolution *format_options) override;
+	virtual bool call_create(int format_type, util::option_resolution *format_options) override;
 
 	void disable(bool state) { m_disabled = state; if(state) unload(); }
 
diff --git a/src/devices/machine/hp_taco.cpp b/src/devices/machine/hp_taco.cpp
index e8d8e8651d5..0abbef130cb 100644
--- a/src/devices/machine/hp_taco.cpp
+++ b/src/devices/machine/hp_taco.cpp
@@ -1668,7 +1668,7 @@ bool hp_taco_device::call_load()
 	return IMAGE_INIT_PASS;
 }
 
-bool hp_taco_device::call_create(int format_type, option_resolution *format_options)
+bool hp_taco_device::call_create(int format_type, util::option_resolution *format_options)
 {
 		LOG(("call_create %d\n" , has_been_created()));
 		return call_load();
diff --git a/src/devices/machine/hp_taco.h b/src/devices/machine/hp_taco.h
index e8a4f06cb65..13afa8b6a1f 100644
--- a/src/devices/machine/hp_taco.h
+++ b/src/devices/machine/hp_taco.h
@@ -45,7 +45,7 @@ public:
 
 		// device_image_interface overrides
 	virtual bool call_load() override;
-	virtual bool call_create(int format_type, option_resolution *format_options) override;
+	virtual bool call_create(int format_type, util::option_resolution *format_options) override;
 	virtual void call_unload() override;
 	virtual std::string call_display() override;
 	virtual iodevice_t image_type() const override { return IO_MAGTAPE; }
diff --git a/src/mame/includes/apollo.h b/src/mame/includes/apollo.h
index 978d2ef0257..cd6b6ba249e 100644
--- a/src/mame/includes/apollo.h
+++ b/src/mame/includes/apollo.h
@@ -372,7 +372,7 @@ public:
 
 	// image-level overrides
 	virtual bool call_load() override;
-	virtual bool call_create(int format_type, option_resolution *format_options) override;
+	virtual bool call_create(int format_type, util::option_resolution *format_options) override;
 	virtual void call_unload() override;
 
 	void set_node_id_from_disk();
diff --git a/src/mame/includes/hp48.h b/src/mame/includes/hp48.h
index 748a81bee55..2ca07fecbb8 100644
--- a/src/mame/includes/hp48.h
+++ b/src/mame/includes/hp48.h
@@ -196,7 +196,7 @@ public:
 
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual bool call_create(int format_type, option_resolution *format_options) override;
+	virtual bool call_create(int format_type, util::option_resolution *format_options) override;
 protected:
 	// device-level overrides
 	virtual void device_config_complete() override;
diff --git a/src/mame/machine/apollo.cpp b/src/mame/machine/apollo.cpp
index 8815e961759..7f3c505b050 100644
--- a/src/mame/machine/apollo.cpp
+++ b/src/mame/machine/apollo.cpp
@@ -1000,7 +1000,7 @@ bool apollo_ni::call_load()
  DEVICE_IMAGE_CREATE( rom )
  -------------------------------------------------*/
 
-bool apollo_ni::call_create(int format_type, option_resolution *format_options)
+bool apollo_ni::call_create(int format_type, util::option_resolution *format_options)
 {
 	CLOG1(("apollo_ni::call_create:"));
 
diff --git a/src/mame/machine/hp48.cpp b/src/mame/machine/hp48.cpp
index c7674751b16..3b7643e4dd9 100644
--- a/src/mame/machine/hp48.cpp
+++ b/src/mame/machine/hp48.cpp
@@ -967,7 +967,7 @@ bool hp48_port_image_device::call_load()
 	return IMAGE_INIT_PASS;
 }
 
-bool hp48_port_image_device::call_create(int format_type, option_resolution *format_options)
+bool hp48_port_image_device::call_create(int format_type, util::option_resolution *format_options)
 {
 	hp48_state *state = machine().driver_data<hp48_state>();
 	int size = m_max_size;
diff --git a/src/mame/machine/ng_memcard.cpp b/src/mame/machine/ng_memcard.cpp
index f4c816c6f1c..17b2c3178f5 100644
--- a/src/mame/machine/ng_memcard.cpp
+++ b/src/mame/machine/ng_memcard.cpp
@@ -72,7 +72,7 @@ void ng_memcard_device::call_unload()
 	fwrite(m_memcard_data, 0x800);
 }
 
-bool ng_memcard_device::call_create(int format_type, option_resolution *format_options)
+bool ng_memcard_device::call_create(int format_type, util::option_resolution *format_options)
 {
 	memset(m_memcard_data, 0, 0x800);
 
diff --git a/src/mame/machine/ng_memcard.h b/src/mame/machine/ng_memcard.h
index 4752c1d1a67..a0638ffdb32 100644
--- a/src/mame/machine/ng_memcard.h
+++ b/src/mame/machine/ng_memcard.h
@@ -45,7 +45,7 @@ public:
 
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual bool call_create(int format_type, option_resolution *format_options) override;
+	virtual bool call_create(int format_type, util::option_resolution *format_options) override;
 
 	// device-level overrides
 	virtual void device_start() override;
diff --git a/src/mame/machine/pce220_ser.cpp b/src/mame/machine/pce220_ser.cpp
index 59aaf593e73..b4fc31c0a6c 100644
--- a/src/mame/machine/pce220_ser.cpp
+++ b/src/mame/machine/pce220_ser.cpp
@@ -240,7 +240,7 @@ bool pce220_serial_device::call_load()
     DEVICE_IMAGE_CREATE( pce220_serial )
 -------------------------------------------------*/
 
-bool pce220_serial_device::call_create(int format_type, option_resolution *format_options)
+bool pce220_serial_device::call_create(int format_type, util::option_resolution *format_options)
 {
 	m_state = SIO_WAIT;
 	m_bytes_count = 0;
diff --git a/src/mame/machine/pce220_ser.h b/src/mame/machine/pce220_ser.h
index dd351a4d9ff..6e035fc8521 100644
--- a/src/mame/machine/pce220_ser.h
+++ b/src/mame/machine/pce220_ser.h
@@ -29,7 +29,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual bool call_create(int format_type, option_resolution *format_options) override;
+	virtual bool call_create(int format_type, util::option_resolution *format_options) override;
 
 	virtual iodevice_t image_type() const override { return IO_SERIAL; }
 
diff --git a/src/mame/machine/psion_pack.cpp b/src/mame/machine/psion_pack.cpp
index 40b176e55e8..a773f7114e5 100644
--- a/src/mame/machine/psion_pack.cpp
+++ b/src/mame/machine/psion_pack.cpp
@@ -278,19 +278,19 @@ bool datapack_device::call_load()
     DEVICE_IMAGE_CREATE( datapack )
 -------------------------------------------------*/
 
-bool datapack_device::call_create(int format_type, option_resolution *create_args)
+bool datapack_device::call_create(int format_type, util::option_resolution *create_args)
 {
 	static const UINT8 opk_head[6] = {'O', 'P', 'K', 0x00, 0x00, 0x00};
 
 	if (create_args != nullptr)
 	{
 		m_id = 0x40;
-		m_id |= (option_resolution_lookup_int(create_args, 'R')) ? 0x00 : 0x02;
-		m_id |= (option_resolution_lookup_int(create_args, 'P')) ? 0x04 : 0x00;
-		m_id |= (option_resolution_lookup_int(create_args, 'W')) ? 0x00 : 0x08;
-		m_id |= (option_resolution_lookup_int(create_args, 'B')) ? 0x00 : 0x10;
-		m_id |= (option_resolution_lookup_int(create_args, 'C')) ? 0x20 : 0x00;
-		m_size = option_resolution_lookup_int(create_args, 'S');
+		m_id |= (create_args->lookup_int('R')) ? 0x00 : 0x02;
+		m_id |= (create_args->lookup_int('P')) ? 0x04 : 0x00;
+		m_id |= (create_args->lookup_int('W')) ? 0x00 : 0x08;
+		m_id |= (create_args->lookup_int('B')) ? 0x00 : 0x10;
+		m_id |= (create_args->lookup_int('C')) ? 0x20 : 0x00;
+		m_size = create_args->lookup_int('S');
 	}
 	else
 	{
diff --git a/src/mame/machine/psion_pack.h b/src/mame/machine/psion_pack.h
index d5d68aca7b1..708ec9a5dbd 100644
--- a/src/mame/machine/psion_pack.h
+++ b/src/mame/machine/psion_pack.h
@@ -27,7 +27,7 @@ public:
 	// image-level overrides
 	virtual bool call_load() override;
 	virtual void call_unload() override;
-	virtual bool call_create(int format_type, option_resolution *create_args) override;
+	virtual bool call_create(int format_type, util::option_resolution *create_args) override;
 	virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override { return load_software(swlist, swname, start_entry); }
 
 	virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
diff --git a/src/mame/machine/x68k_hdc.cpp b/src/mame/machine/x68k_hdc.cpp
index bdc1612da23..35cda8b65ec 100644
--- a/src/mame/machine/x68k_hdc.cpp
+++ b/src/mame/machine/x68k_hdc.cpp
@@ -47,7 +47,7 @@ void x68k_hdc_image_device::device_start()
 	m_phase = SASI_PHASE_BUSFREE;
 }
 
-bool x68k_hdc_image_device::call_create(int format_type, option_resolution *format_options)
+bool x68k_hdc_image_device::call_create(int format_type, util::option_resolution *format_options)
 {
 	// create 20MB HD
 	int x;
diff --git a/src/mame/machine/x68k_hdc.h b/src/mame/machine/x68k_hdc.h
index a4ea3e92165..a79f3d956a6 100644
--- a/src/mame/machine/x68k_hdc.h
+++ b/src/mame/machine/x68k_hdc.h
@@ -95,7 +95,7 @@ public:
 	virtual const char *image_interface() const override { return nullptr; }
 	virtual const char *file_extensions() const override { return "hdf"; }
 	virtual const option_guide *create_option_guide() const override { return nullptr; }
-	virtual bool call_create(int format_type, option_resolution *format_options) override;
+	virtual bool call_create(int format_type, util::option_resolution *format_options) override;
 
 	DECLARE_WRITE16_MEMBER( hdc_w );
 	DECLARE_READ16_MEMBER( hdc_r );