diff --git a/src/emu/cpu/adsp2100/adsp2100.c b/src/emu/cpu/adsp2100/adsp2100.c
index 1b33655cdee..7dd8fc162ba 100644
--- a/src/emu/cpu/adsp2100/adsp2100.c
+++ b/src/emu/cpu/adsp2100/adsp2100.c
@@ -148,9 +148,9 @@ const device_type ADSP2181 = adsp2181_device_config::static_alloc_device_config;
 //  TRIVIAL IMPLEMENTATIONS
 //**************************************************************************
 
-DEFINE_TRIVIAL_DERIVED_DEVICE(adsp2104_device_config, adsp2101_device_config, adsp2104_device, adsp2101_device, "ADSP-2104", CHIP_TYPE_ADSP2104)
-DEFINE_TRIVIAL_DERIVED_DEVICE(adsp2105_device_config, adsp2101_device_config, adsp2105_device, adsp2101_device, "ADSP-2105", CHIP_TYPE_ADSP2105)
-DEFINE_TRIVIAL_DERIVED_DEVICE(adsp2115_device_config, adsp2101_device_config, adsp2115_device, adsp2101_device, "ADSP-2115", CHIP_TYPE_ADSP2115)
+DEFINE_TRIVIAL_DERIVED_DEVICE(adsp2104_device_config, adsp2101_device_config, adsp2104_device, adsp2101_device, "ADSP-2104", "adsp2104", CHIP_TYPE_ADSP2104)
+DEFINE_TRIVIAL_DERIVED_DEVICE(adsp2105_device_config, adsp2101_device_config, adsp2105_device, adsp2101_device, "ADSP-2105", "adsp2105", CHIP_TYPE_ADSP2105)
+DEFINE_TRIVIAL_DERIVED_DEVICE(adsp2115_device_config, adsp2101_device_config, adsp2115_device, adsp2101_device, "ADSP-2115", "adsp2115", CHIP_TYPE_ADSP2115)
 
 
 
@@ -162,8 +162,8 @@ DEFINE_TRIVIAL_DERIVED_DEVICE(adsp2115_device_config, adsp2101_device_config, ad
 //  adsp21xx_device_config - constructor
 //-------------------------------------------------
 
-adsp21xx_device_config::adsp21xx_device_config(const machine_config &mconfig, device_type type, const char *name, const char *tag, const device_config *owner, UINT32 clock, UINT32 chiptype)
-	: cpu_device_config(mconfig, type, name, tag, owner, clock),
+adsp21xx_device_config::adsp21xx_device_config(const machine_config &mconfig, device_type type, const char *name, const char *shortname, const char *tag, const device_config *owner, UINT32 clock, UINT32 chiptype)
+	: cpu_device_config(mconfig, type, name, shortname, tag, owner, clock),
 	  m_program_config("program", ENDIANNESS_LITTLE, 32, 14, -2),
 	  m_data_config("data", ENDIANNESS_LITTLE, 16, 14, -1),
 	  m_chip_type(chiptype)
@@ -174,13 +174,13 @@ adsp21xx_device_config::adsp21xx_device_config(const machine_config &mconfig, de
 }
 
 adsp2100_device_config::adsp2100_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-	: adsp21xx_device_config(mconfig, static_alloc_device_config, "ADSP-2100", tag, owner, clock, CHIP_TYPE_ADSP2100) { }
+	: adsp21xx_device_config(mconfig, static_alloc_device_config, "ADSP-2100", "adsp2100", tag, owner, clock, CHIP_TYPE_ADSP2100) { }
 
-adsp2101_device_config::adsp2101_device_config(const machine_config &mconfig, device_type type, const char *name, const char *tag, const device_config *owner, UINT32 clock, UINT32 chiptype)
-	: adsp21xx_device_config(mconfig, type, name, tag, owner, clock, chiptype) { }
+adsp2101_device_config::adsp2101_device_config(const machine_config &mconfig, device_type type, const char *name, const char *shortname, const char *tag, const device_config *owner, UINT32 clock, UINT32 chiptype)
+	: adsp21xx_device_config(mconfig, type, name, shortname, tag, owner, clock, chiptype) { }
 
 adsp2181_device_config::adsp2181_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-	: adsp21xx_device_config(mconfig, static_alloc_device_config, "ADSP-2181", tag, owner, clock, CHIP_TYPE_ADSP2181),
+	: adsp21xx_device_config(mconfig, static_alloc_device_config, "ADSP-2181", "adsp2181", tag, owner, clock, CHIP_TYPE_ADSP2181),
 	  m_io_config("I/O", ENDIANNESS_LITTLE, 16, 11, -1) { }
 
 
@@ -196,7 +196,7 @@ device_config *adsp2100_device_config::static_alloc_device_config(const machine_
 
 device_config *adsp2101_device_config::static_alloc_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
 {
-	return global_alloc(adsp2101_device_config(mconfig, static_alloc_device_config, "ADSP-2101", tag, owner, clock, CHIP_TYPE_ADSP2101));
+	return global_alloc(adsp2101_device_config(mconfig, static_alloc_device_config, "ADSP-2101", "adsp2101", tag, owner, clock, CHIP_TYPE_ADSP2101));
 }
 
 device_config *adsp2181_device_config::static_alloc_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
diff --git a/src/emu/cpu/adsp2100/adsp2100.h b/src/emu/cpu/adsp2100/adsp2100.h
index 286fecb5379..2eef0aabfaf 100644
--- a/src/emu/cpu/adsp2100/adsp2100.h
+++ b/src/emu/cpu/adsp2100/adsp2100.h
@@ -276,7 +276,7 @@ protected:
 	};
 
 	// construction/destruction
-	adsp21xx_device_config(const machine_config &mconfig, device_type type, const char *name, const char *tag, const device_config *owner, UINT32 clock, UINT32 chiptype);
+	adsp21xx_device_config(const machine_config &mconfig, device_type type, const char *name, const char *shortname, const char *tag, const device_config *owner, UINT32 clock, UINT32 chiptype);
 
 public:
 	// inline configuration helpers
@@ -605,7 +605,7 @@ class adsp2101_device_config : public adsp21xx_device_config
 
 protected:
 	// construction/destruction
-	adsp2101_device_config(const machine_config &mconfig, device_type type, const char *name, const char *tag, const device_config *owner, UINT32 clock, UINT32 chiptype);
+	adsp2101_device_config(const machine_config &mconfig, device_type type, const char *name, const char *shortname, const char *tag, const device_config *owner, UINT32 clock, UINT32 chiptype);
 
 public:
 	// allocators
diff --git a/src/emu/cpu/asap/asap.c b/src/emu/cpu/asap/asap.c
index d7f19a6dc94..ff6f44ed027 100644
--- a/src/emu/cpu/asap/asap.c
+++ b/src/emu/cpu/asap/asap.c
@@ -171,7 +171,7 @@ const asap_device::ophandler asap_device::s_conditiontable[16] =
 //-------------------------------------------------
 
 asap_device_config::asap_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-	: cpu_device_config(mconfig, static_alloc_device_config, "ASAP", tag, owner, clock),
+	: cpu_device_config(mconfig, static_alloc_device_config, "ASAP", "asap", tag, owner, clock),
 	  m_program_config("program", ENDIANNESS_LITTLE, 32, 32)
 {
 }
diff --git a/src/emu/cpu/cosmac/cosmac.c b/src/emu/cpu/cosmac/cosmac.c
index 5c0eaaadeca..ec24ea064f1 100644
--- a/src/emu/cpu/cosmac/cosmac.c
+++ b/src/emu/cpu/cosmac/cosmac.c
@@ -190,7 +190,7 @@ const cosmac_device::ophandler cosmac_device::s_opcodetable[256] =
 //-------------------------------------------------
 
 cosmac_device_config::cosmac_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-	: cpu_device_config(mconfig, static_alloc_device_config, "COSMAC", tag, owner, clock),
+	: cpu_device_config(mconfig, static_alloc_device_config, "COSMAC", "cosmac", tag, owner, clock),
 	  m_program_config("program", ENDIANNESS_LITTLE, 8, 16),
 	  m_io_config("io", ENDIANNESS_LITTLE, 8, 3)
 {
diff --git a/src/emu/cpu/dsp16/dsp16.c b/src/emu/cpu/dsp16/dsp16.c
index 0c253b24621..89396ddabf1 100644
--- a/src/emu/cpu/dsp16/dsp16.c
+++ b/src/emu/cpu/dsp16/dsp16.c
@@ -23,7 +23,7 @@ const device_type DSP16 = dsp16_device_config::static_alloc_device_config;
 //**************************************************************************
 
 dsp16_device_config::dsp16_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-	: cpu_device_config(mconfig, static_alloc_device_config, "DSP16", tag, owner, clock),
+	: cpu_device_config(mconfig, static_alloc_device_config, "DSP16", "dsp16", tag, owner, clock),
 	  m_program_config("program", ENDIANNESS_LITTLE, 16, 16, -1)
 { }
 
diff --git a/src/emu/cpu/dsp32/dsp32.c b/src/emu/cpu/dsp32/dsp32.c
index ed5e8595153..b53c0e71e75 100644
--- a/src/emu/cpu/dsp32/dsp32.c
+++ b/src/emu/cpu/dsp32/dsp32.c
@@ -178,7 +178,7 @@ const device_type DSP32C = dsp32c_device_config::static_alloc_device_config;
 //-------------------------------------------------
 
 dsp32c_device_config::dsp32c_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-	: cpu_device_config(mconfig, static_alloc_device_config, "DSP32C", tag, owner, clock),
+	: cpu_device_config(mconfig, static_alloc_device_config, "DSP32C", "dsp32", tag, owner, clock),
 	  m_program_config("program", ENDIANNESS_LITTLE, 32, 24)
 {
 	m_output_pins_changed = NULL;
diff --git a/src/emu/cpu/hd61700/hd61700.c b/src/emu/cpu/hd61700/hd61700.c
index bebddfe52e2..ce4507d67a9 100644
--- a/src/emu/cpu/hd61700/hd61700.c
+++ b/src/emu/cpu/hd61700/hd61700.c
@@ -105,7 +105,7 @@ const device_type HD61700 = hd61700_cpu_device_config::static_alloc_device_confi
 //-------------------------------------------------
 
 hd61700_cpu_device_config::hd61700_cpu_device_config(const machine_config &mconfig, device_type type, const char *tag, const device_config *owner, UINT32 clock)
-	: cpu_device_config(mconfig, type, "HD61700", tag, owner, clock),
+	: cpu_device_config(mconfig, type, "HD61700", "hd61700", tag, owner, clock),
 	 m_program_config("program", ENDIANNESS_BIG, 16, 18, -1)
 {
 }
diff --git a/src/emu/cpu/tms32031/tms32031.c b/src/emu/cpu/tms32031/tms32031.c
index 618d978f675..139a3c3a909 100644
--- a/src/emu/cpu/tms32031/tms32031.c
+++ b/src/emu/cpu/tms32031/tms32031.c
@@ -139,7 +139,7 @@ ADDRESS_MAP_END
 //-------------------------------------------------
 
 tms3203x_device_config::tms3203x_device_config(const machine_config &mconfig, device_type type, const char *name, const char *tag, const device_config *owner, UINT32 clock, UINT32 chiptype, address_map_constructor internal_map)
-	: cpu_device_config(mconfig, type, name, tag, owner, clock),
+	: cpu_device_config(mconfig, type, name, "tms32031", tag, owner, clock),
 	  m_program_config("program", ENDIANNESS_LITTLE, 32, 24, -2, internal_map),
 	  m_chip_type(chiptype)
 {
diff --git a/src/emu/cpu/upd7725/upd7725.c b/src/emu/cpu/upd7725/upd7725.c
index 5466143268e..68993d197b5 100755
--- a/src/emu/cpu/upd7725/upd7725.c
+++ b/src/emu/cpu/upd7725/upd7725.c
@@ -29,7 +29,7 @@ const device_type UPD96050 = upd96050_device_config::static_alloc_device_config;
 //-------------------------------------------------
 
 necdsp_device_config::necdsp_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock, UINT32 abits, UINT32 dbits, const char *name)
-	: cpu_device_config(mconfig, static_alloc_device_config, name, tag, owner, clock),
+	: cpu_device_config(mconfig, static_alloc_device_config, name, "necdsp", tag, owner, clock),
 	  m_program_config("program", ENDIANNESS_BIG, 32, abits, -2),	// data bus width, address bus width, -2 means DWORD-addressable
 	  m_data_config("data", ENDIANNESS_BIG, 16, dbits, -1)	// -1 for WORD-addressable
 {
diff --git a/src/emu/devcpu.c b/src/emu/devcpu.c
index eebe865f0c9..44ac22b74f2 100644
--- a/src/emu/devcpu.c
+++ b/src/emu/devcpu.c
@@ -50,8 +50,8 @@
 //  cpu_device_config - constructor
 //-------------------------------------------------
 
-cpu_device_config::cpu_device_config(const machine_config &mconfig, device_type type, const char *name, const char *tag, const device_config *owner, UINT32 clock)
-	: device_config(mconfig, type, name, tag, owner, clock),
+cpu_device_config::cpu_device_config(const machine_config &mconfig, device_type type, const char *name, const char *shortname, const char *tag, const device_config *owner, UINT32 clock)
+	: device_config(mconfig, type, name, shortname, tag, owner, clock),
 	  device_config_execute_interface(mconfig, *this),
 	  device_config_memory_interface(mconfig, *this),
 	  device_config_state_interface(mconfig, *this),
@@ -65,7 +65,7 @@ cpu_device_config::cpu_device_config(const machine_config &mconfig, device_type
 //-------------------------------------------------
 
 legacy_cpu_device_config::legacy_cpu_device_config(const machine_config &mconfig, device_type type, const char *tag, const device_config *owner, UINT32 clock, cpu_get_info_func get_info)
-	: cpu_device_config(mconfig, type, "CPU", tag, owner, clock),
+	: cpu_device_config(mconfig, type, "CPU", "cpu", tag, owner, clock),
 	  m_get_info(get_info)
 {
 	// build up our address spaces; legacy devices don't have logical spaces
@@ -87,6 +87,7 @@ legacy_cpu_device_config::legacy_cpu_device_config(const machine_config &mconfig
 
 	// set the real name
 	m_name = get_legacy_config_string(DEVINFO_STR_NAME);
+	m_shortname = get_legacy_config_string(DEVINFO_STR_SHORTNAME);
 }
 
 
diff --git a/src/emu/devcpu.h b/src/emu/devcpu.h
index f4926dee28c..fad68f4650a 100644
--- a/src/emu/devcpu.h
+++ b/src/emu/devcpu.h
@@ -404,7 +404,7 @@ class cpu_device_config :	public device_config,
 
 protected:
 	// construction/destruction
-	cpu_device_config(const machine_config &mconfig, device_type type, const char *name, const char *tag, const device_config *owner, UINT32 clock);
+	cpu_device_config(const machine_config &mconfig, device_type type, const char *name, const char *shortname, const char *tag, const device_config *owner, UINT32 clock);
 };
 
 
diff --git a/src/emu/devintrf.c b/src/emu/devintrf.c
index 3fc292e60e0..ea1e2035db9 100644
--- a/src/emu/devintrf.c
+++ b/src/emu/devintrf.c
@@ -285,7 +285,7 @@ bool device_config_interface::interface_validity_check(const game_driver &driver
 //  device configuration
 //-------------------------------------------------
 
-device_config::device_config(const machine_config &mconfig, device_type type, const char *name, const char *tag, const device_config *owner, UINT32 clock, UINT32 param)
+device_config::device_config(const machine_config &mconfig, device_type type, const char *name, const char *shortname, const char *tag, const device_config *owner, UINT32 clock, UINT32 param)
 	: m_next(NULL),
 	  m_owner(const_cast<device_config *>(owner)),
 	  m_interface_list(NULL),
@@ -294,6 +294,7 @@ device_config::device_config(const machine_config &mconfig, device_type type, co
 	  m_machine_config(mconfig),
 	  m_static_config(NULL),
 	  m_name(name),
+	  m_shortname(shortname),
 	  m_tag(tag),
 	  m_config_complete(false)
 {
diff --git a/src/emu/devintrf.h b/src/emu/devintrf.h
index bf53185ee9f..ba106e1b139 100644
--- a/src/emu/devintrf.h
+++ b/src/emu/devintrf.h
@@ -76,9 +76,9 @@ public: 																				\
 };																						\
 
 // use this macro to define the actual implementation in the source file
-#define DEFINE_TRIVIAL_DERIVED_DEVICE(_ConfigClass, _ConfigBase, _DeviceClass, _DeviceBase, _Name, _Param) \
+#define DEFINE_TRIVIAL_DERIVED_DEVICE(_ConfigClass, _ConfigBase, _DeviceClass, _DeviceBase, _Name, _ShortName, _Param) \
 _ConfigClass::_ConfigClass(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock, UINT32 param) \
-	: _ConfigBase(mconfig, static_alloc_device_config, _Name, tag, owner, clock, param)	\
+	: _ConfigBase(mconfig, static_alloc_device_config, _Name, _ShortName, tag, owner, clock, param)	\
 {																						\
 }																						\
 																						\
@@ -257,7 +257,7 @@ class device_config
 
 protected:
 	// construction/destruction
-	device_config(const machine_config &mconfig, device_type type, const char *name, const char *tag, const device_config *owner, UINT32 clock, UINT32 param = 0);
+	device_config(const machine_config &mconfig, device_type type, const char *name, const char *shortname, const char *tag, const device_config *owner, UINT32 clock, UINT32 param = 0);
 	virtual ~device_config();
 
 public:
@@ -284,6 +284,7 @@ public:
 	device_type type() const { return m_type; }
 	UINT32 clock() const { return m_clock; }
 	const char *name() const { return m_name; }
+	const char *shortname() const { return m_shortname; }
 	const char *tag() const { return m_tag; }
 	const void *static_config() const { return m_static_config; }
 	const machine_config &mconfig() const { return m_machine_config; }
@@ -326,7 +327,7 @@ protected:
 	const void *			m_static_config;		// static device configuration
 
 	astring					m_name;					// name of the device
-
+	astring					m_shortname;			// short name of the device, used for potential romload
 private:
 	astring 				m_tag;					// tag for this instance
 	bool					m_config_complete;		// have we completed our configuration?
diff --git a/src/emu/devlegcy.c b/src/emu/devlegcy.c
index f542ff61054..dac827bd1b4 100644
--- a/src/emu/devlegcy.c
+++ b/src/emu/devlegcy.c
@@ -50,7 +50,7 @@
 //-------------------------------------------------
 
 legacy_device_config_base::legacy_device_config_base(const machine_config &mconfig, device_type type, const char *tag, const device_config *owner, UINT32 clock, device_get_config_func get_config)
-	: device_config(mconfig, type, "Legacy Device", tag, owner, clock),
+	: device_config(mconfig, type, "Legacy Device", "legacy", tag, owner, clock),
 	  m_get_config_func(get_config),
 	  m_inline_config(NULL)
 {
@@ -61,6 +61,7 @@ legacy_device_config_base::legacy_device_config_base(const machine_config &mconf
 
 	// set the proper name
 	m_name = get_legacy_config_string(DEVINFO_STR_NAME);
+	m_shortname = get_legacy_config_string(DEVINFO_STR_SHORTNAME);
 }
 
 
diff --git a/src/emu/devlegcy.h b/src/emu/devlegcy.h
index b75f3138ab1..4ad8e3f434a 100644
--- a/src/emu/devlegcy.h
+++ b/src/emu/devlegcy.h
@@ -125,6 +125,7 @@ enum
 	DEVINFO_STR_FIRST = 0x30000,
 
 		DEVINFO_STR_NAME = DEVINFO_STR_FIRST,			// R/O: name of the device
+		DEVINFO_STR_SHORTNAME,							// R/O: short name of device, used in case of romload
 		DEVINFO_STR_FAMILY,								// R/O: family of the device
 		DEVINFO_STR_VERSION,							// R/O: version of the device
 		DEVINFO_STR_SOURCE_FILE,						// R/O: file containing the device implementation
diff --git a/src/emu/devtempl.h b/src/emu/devtempl.h
index 671298d108a..7b71d815493 100644
--- a/src/emu/devtempl.h
+++ b/src/emu/devtempl.h
@@ -217,6 +217,9 @@ DEVICE_GET_INFO( DEVTEMPLATE_ID(,) )
 
 		/* --- the following bits of info are returned as NULL-terminated strings --- */
 		case DEVINFO_STR_NAME:					strcpy(info->s, DEVTEMPLATE_NAME);								break;
+#ifdef DEVTEMPLATE_SHORTNAME
+		case DEVINFO_STR_SHORTNAME:				strcpy(info->s, DEVTEMPLATE_SHORTNAME);								break;
+#endif
 	}
 }
 
diff --git a/src/emu/machine.c b/src/emu/machine.c
index 4b152e53e5f..da03ed80f6c 100644
--- a/src/emu/machine.c
+++ b/src/emu/machine.c
@@ -942,7 +942,7 @@ running_machine::logerror_callback_item::logerror_callback_item(logerror_callbac
 //-------------------------------------------------
 
 driver_device_config_base::driver_device_config_base(const machine_config &mconfig, device_type type, const char *tag, const device_config *owner)
-	: device_config(mconfig, type, "Driver Device", tag, owner, 0),
+	: device_config(mconfig, type, "Driver Device", "driver", tag, owner, 0),
 	  m_game(NULL),
 	  m_palette_init(NULL),
 	  m_video_update(NULL)
@@ -959,6 +959,7 @@ driver_device_config_base::driver_device_config_base(const machine_config &mconf
 void driver_device_config_base::static_set_game(device_config *device, const game_driver *game)
 {
 	downcast<driver_device_config_base *>(device)->m_game = game;
+	downcast<driver_device_config_base *>(device)->m_shortname = game->name;
 }
 
 
diff --git a/src/emu/machine/6522via.c b/src/emu/machine/6522via.c
index 7a956c37897..f924cf9865a 100644
--- a/src/emu/machine/6522via.c
+++ b/src/emu/machine/6522via.c
@@ -109,7 +109,7 @@
 //  DEVICE CONFIGURATION
 //**************************************************************************
 
-GENERIC_DEVICE_CONFIG_SETUP(via6522, "6522 VIA")
+GENERIC_DEVICE_CONFIG_SETUP(via6522, "6522 VIA", "6522via")
 
 //-------------------------------------------------
 //  device_config_complete - perform any
diff --git a/src/emu/machine/6526cia.c b/src/emu/machine/6526cia.c
index a90652efded..8e6b597617d 100644
--- a/src/emu/machine/6526cia.c
+++ b/src/emu/machine/6526cia.c
@@ -50,7 +50,7 @@
 //-------------------------------------------------
 
 mos6526_device_config::mos6526_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-    : device_config(mconfig, static_alloc_device_config, "MOS6526", tag, owner, clock)
+    : device_config(mconfig, static_alloc_device_config, "MOS6526", "6526cia", tag, owner, clock)
 {
 }
 
diff --git a/src/emu/machine/6532riot.c b/src/emu/machine/6532riot.c
index 63437a2dfa5..67c1393d8fd 100644
--- a/src/emu/machine/6532riot.c
+++ b/src/emu/machine/6532riot.c
@@ -48,7 +48,7 @@ enum
 //-------------------------------------------------
 
 riot6532_device_config::riot6532_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-	: device_config(mconfig, static_alloc_device_config, "6532 (RIOT)", tag, owner, clock)
+	: device_config(mconfig, static_alloc_device_config, "6532 (RIOT)", "6532riot", tag, owner, clock)
 {
 }
 
diff --git a/src/emu/machine/6821pia.c b/src/emu/machine/6821pia.c
index 03afe7986c2..694d7d97e48 100644
--- a/src/emu/machine/6821pia.c
+++ b/src/emu/machine/6821pia.c
@@ -44,7 +44,7 @@
 //-------------------------------------------------
 
 pia6821_device_config::pia6821_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-    : device_config(mconfig, static_alloc_device_config, "6822 PIA", tag, owner, clock)
+    : device_config(mconfig, static_alloc_device_config, "6822 PIA", "6821pia", tag, owner, clock)
 {
 }
 
diff --git a/src/emu/machine/6840ptm.c b/src/emu/machine/6840ptm.c
index e239e5b0446..bc8c10e0941 100644
--- a/src/emu/machine/6840ptm.c
+++ b/src/emu/machine/6840ptm.c
@@ -61,7 +61,7 @@ const char *const ptm6840_device::opmode[] =
     IMPLEMENTATION
 ***************************************************************************/
 
-GENERIC_DEVICE_CONFIG_SETUP(ptm6840, "6840 PTM")
+GENERIC_DEVICE_CONFIG_SETUP(ptm6840, "6840 PTM", "6840ptm")
 
 const device_type PTM6840 = ptm6840_device_config::static_alloc_device_config;
 
diff --git a/src/emu/machine/6850acia.c b/src/emu/machine/6850acia.c
index fba99000c12..c1f278844bd 100644
--- a/src/emu/machine/6850acia.c
+++ b/src/emu/machine/6850acia.c
@@ -54,7 +54,7 @@ const int acia6850_device::ACIA6850_WORD[8][3] =
 
 const device_type ACIA6850 = acia6850_device_config::static_alloc_device_config;
 
-GENERIC_DEVICE_CONFIG_SETUP(acia6850, "6850 ACIA")
+GENERIC_DEVICE_CONFIG_SETUP(acia6850, "6850 ACIA", "6850acia")
 
 //-------------------------------------------------
 //  device_config_complete - perform any
diff --git a/src/emu/machine/74123.c b/src/emu/machine/74123.c
index 2ab8ff8619f..5ded2c1c19c 100644
--- a/src/emu/machine/74123.c
+++ b/src/emu/machine/74123.c
@@ -30,7 +30,7 @@ const device_type TTL74123 = ttl74123_device_config::static_alloc_device_config;
 //-------------------------------------------------
 
 ttl74123_device_config::ttl74123_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-	: device_config(mconfig, static_alloc_device_config, "TTL74123", tag, owner, clock)
+	: device_config(mconfig, static_alloc_device_config, "TTL74123", "74123", tag, owner, clock)
 {
 }
 
diff --git a/src/emu/machine/7474.c b/src/emu/machine/7474.c
index 5e537210d89..60adae2ed62 100644
--- a/src/emu/machine/7474.c
+++ b/src/emu/machine/7474.c
@@ -58,7 +58,7 @@ const device_type MACHINE_TTL7474 = ttl7474_device_config::static_alloc_device_c
 //-------------------------------------------------
 
 ttl7474_device_config::ttl7474_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-    : device_config(mconfig, static_alloc_device_config, "7474", tag, owner, clock)
+    : device_config(mconfig, static_alloc_device_config, "7474", "7474", tag, owner, clock)
 {
 }
 
diff --git a/src/emu/machine/8237dma.c b/src/emu/machine/8237dma.c
index 9d79da3aa9c..e8222e381d3 100644
--- a/src/emu/machine/8237dma.c
+++ b/src/emu/machine/8237dma.c
@@ -48,7 +48,7 @@
 //  DEVICE CONFIGURATION
 //**************************************************************************
 
-GENERIC_DEVICE_CONFIG_SETUP(i8237, "Intel 8237")
+GENERIC_DEVICE_CONFIG_SETUP(i8237, "Intel 8237", "8237dma")
 
 //-------------------------------------------------
 //  device_config_complete - perform any
diff --git a/src/emu/machine/8255ppi.c b/src/emu/machine/8255ppi.c
index 5ed908be7bb..e94acf235ca 100644
--- a/src/emu/machine/8255ppi.c
+++ b/src/emu/machine/8255ppi.c
@@ -98,7 +98,7 @@
 //  DEVICE CONFIGURATION
 //**************************************************************************
 
-GENERIC_DEVICE_CONFIG_SETUP(ppi8255, "Intel PPI8255")
+GENERIC_DEVICE_CONFIG_SETUP(ppi8255, "Intel PPI8255", "8255ppi")
 
 //-------------------------------------------------
 //  device_config_complete - perform any
diff --git a/src/emu/machine/8257dma.c b/src/emu/machine/8257dma.c
index 1a762eecca5..3307170d264 100644
--- a/src/emu/machine/8257dma.c
+++ b/src/emu/machine/8257dma.c
@@ -51,7 +51,7 @@
 //  DEVICE CONFIGURATION
 //**************************************************************************
 
-GENERIC_DEVICE_CONFIG_SETUP(i8257, "DMA8257")
+GENERIC_DEVICE_CONFIG_SETUP(i8257, "DMA8257", "8257dma")
 
 //-------------------------------------------------
 //  device_config_complete - perform any
diff --git a/src/emu/machine/at28c16.c b/src/emu/machine/at28c16.c
index 78fff44edfc..3537b8b6344 100644
--- a/src/emu/machine/at28c16.c
+++ b/src/emu/machine/at28c16.c
@@ -36,10 +36,10 @@ ADDRESS_MAP_END
 //  at28c16_device_config - constructor
 //-------------------------------------------------
 
-at28c16_device_config::at28c16_device_config( const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock ) :
-	device_config( mconfig, static_alloc_device_config, "AT28C16", tag, owner, clock),
-	device_config_memory_interface(mconfig, *this),
-	device_config_nvram_interface(mconfig, *this)
+at28c16_device_config::at28c16_device_config( const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock )
+	: device_config(mconfig, static_alloc_device_config, "AT28C16", "at28c16", tag, owner, clock),
+	  device_config_memory_interface(mconfig, *this),
+	  device_config_nvram_interface(mconfig, *this)
 {
 }
 
diff --git a/src/emu/machine/devhelpr.h b/src/emu/machine/devhelpr.h
index 8d35dc7a295..0a68502fcec 100644
--- a/src/emu/machine/devhelpr.h
+++ b/src/emu/machine/devhelpr.h
@@ -38,9 +38,9 @@
 	{ return downcast<devname##_device *>(device)->funcname(state); } \
 	void devname##_device::funcname(UINT8 state)
 
-#define GENERIC_DEVICE_CONFIG_SETUP(devname, devtag) \
+#define GENERIC_DEVICE_CONFIG_SETUP(devname, devtag, shortname) \
 	devname##_device_config::devname##_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock) \
-	    : device_config(mconfig, static_alloc_device_config, devtag, tag, owner, clock) \
+	    : device_config(mconfig, static_alloc_device_config, devtag, shortname, tag, owner, clock) \
 	{ } \
 	\
 	device_config *devname##_device_config::static_alloc_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock) \
diff --git a/src/emu/machine/ds1302.c b/src/emu/machine/ds1302.c
index 6b59a0d6a09..c5477b263f1 100644
--- a/src/emu/machine/ds1302.c
+++ b/src/emu/machine/ds1302.c
@@ -48,7 +48,7 @@ INLINE UINT8 convert_to_bcd(int val)
 //-------------------------------------------------
 
 ds1302_device_config::ds1302_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-    : device_config(mconfig, static_alloc_device_config, "Dallas DS1302 RTC", tag, owner, clock)
+    : device_config(mconfig, static_alloc_device_config, "Dallas DS1302 RTC", "ds1302", tag, owner, clock)
 {
 }
 
diff --git a/src/emu/machine/ds2404.c b/src/emu/machine/ds2404.c
index f5a0c7c3bd9..d95e045f54a 100644
--- a/src/emu/machine/ds2404.c
+++ b/src/emu/machine/ds2404.c
@@ -24,7 +24,7 @@
 //-------------------------------------------------
 
 ds2404_device_config::ds2404_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-    : device_config(mconfig, static_alloc_device_config, "DS2404", tag, owner, clock),
+    : device_config(mconfig, static_alloc_device_config, "DS2404", "ds2404", tag, owner, clock),
       device_config_nvram_interface(mconfig, *this)
 {
 }
diff --git a/src/emu/machine/eeprom.c b/src/emu/machine/eeprom.c
index f3bac1f6674..a3e1323b564 100644
--- a/src/emu/machine/eeprom.c
+++ b/src/emu/machine/eeprom.c
@@ -77,7 +77,7 @@ ADDRESS_MAP_END
 //-------------------------------------------------
 
 eeprom_device_config::eeprom_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-	: device_config(mconfig, static_alloc_device_config, "EEPROM", tag, owner, clock),
+	: device_config(mconfig, static_alloc_device_config, "EEPROM", "eeprom", tag, owner, clock),
 	  device_config_memory_interface(mconfig, *this),
 	  device_config_nvram_interface(mconfig, *this),
 	  m_default_data_size(0),
diff --git a/src/emu/machine/er2055.c b/src/emu/machine/er2055.c
index 4594f9ff7b2..644637fcbf3 100644
--- a/src/emu/machine/er2055.c
+++ b/src/emu/machine/er2055.c
@@ -62,7 +62,7 @@ ADDRESS_MAP_END
 //-------------------------------------------------
 
 er2055_device_config::er2055_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-	: device_config(mconfig, static_alloc_device_config, "ER2055", tag, owner, clock),
+	: device_config(mconfig, static_alloc_device_config, "ER2055", "er2055", tag, owner, clock),
 	  device_config_memory_interface(mconfig, *this),
 	  device_config_nvram_interface(mconfig, *this),
 	  m_space_config("EAROM", ENDIANNESS_BIG, 8, 6, 0, *ADDRESS_MAP_NAME(er2055_map))
diff --git a/src/emu/machine/f3853.c b/src/emu/machine/f3853.c
index 0cb2db9bb20..a0359741dea 100644
--- a/src/emu/machine/f3853.c
+++ b/src/emu/machine/f3853.c
@@ -46,7 +46,7 @@
 //-------------------------------------------------
 
 f3853_device_config::f3853_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-    : device_config(mconfig, static_alloc_device_config, "F3853", tag, owner, clock)
+    : device_config(mconfig, static_alloc_device_config, "F3853", "f3853", tag, owner, clock)
 {
 }
 
diff --git a/src/emu/machine/i2cmem.c b/src/emu/machine/i2cmem.c
index 393c56eadb0..7f24ad2224f 100644
--- a/src/emu/machine/i2cmem.c
+++ b/src/emu/machine/i2cmem.c
@@ -71,10 +71,10 @@ ADDRESS_MAP_END
 //  i2cmem_device_config - constructor
 //-------------------------------------------------
 
-i2cmem_device_config::i2cmem_device_config( const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock ) :
-	device_config( mconfig, static_alloc_device_config, "I2CMEM", tag, owner, clock),
-	device_config_memory_interface(mconfig, *this),
-	device_config_nvram_interface(mconfig, *this)
+i2cmem_device_config::i2cmem_device_config( const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock )
+	: device_config(mconfig, static_alloc_device_config, "I2CMEM", "i2cmem", tag, owner, clock),
+	  device_config_memory_interface(mconfig, *this),
+	  device_config_nvram_interface(mconfig, *this)
 {
 	m_address_bits = 0;
 
diff --git a/src/emu/machine/i8243.c b/src/emu/machine/i8243.c
index 70bb448afb3..c8c55c3a42d 100644
--- a/src/emu/machine/i8243.c
+++ b/src/emu/machine/i8243.c
@@ -16,7 +16,7 @@
 //  DEVICE CONFIGURATION
 //**************************************************************************
 
-GENERIC_DEVICE_CONFIG_SETUP(i8243, "I8243")
+GENERIC_DEVICE_CONFIG_SETUP(i8243, "I8243", "i8243")
 
 //-------------------------------------------------
 //  static_set_read_handler - configuration helper
diff --git a/src/emu/machine/ins8154.c b/src/emu/machine/ins8154.c
index f075ad39a13..2707cc16e06 100644
--- a/src/emu/machine/ins8154.c
+++ b/src/emu/machine/ins8154.c
@@ -38,7 +38,7 @@ enum
 //  DEVICE CONFIGURATION
 //**************************************************************************
 
-GENERIC_DEVICE_CONFIG_SETUP(ins8154, "INS8154")
+GENERIC_DEVICE_CONFIG_SETUP(ins8154, "INS8154", "ins8154")
 
 //-------------------------------------------------
 //  device_config_complete - perform any
diff --git a/src/emu/machine/intelfsh.c b/src/emu/machine/intelfsh.c
index aec0c7bac68..49ad51dd54c 100644
--- a/src/emu/machine/intelfsh.c
+++ b/src/emu/machine/intelfsh.c
@@ -45,13 +45,13 @@ enum
 //**************************************************************************
 
 // 8-bit variants
-DEFINE_TRIVIAL_DERIVED_DEVICE(intel_28f016s5_device_config, intelfsh8_device_config, intel_28f016s5_device, intelfsh8_device, "Sharp LH28F400 Flash", intelfsh_device_config::FLASH_SHARP_LH28F400)
-DEFINE_TRIVIAL_DERIVED_DEVICE(fujitsu_29f016a_device_config, intelfsh8_device_config, fujitsu_29f016a_device, intelfsh8_device, "Fujitsu 29F016A Flash", intelfsh_device_config::FLASH_FUJITSU_29F016A)
-DEFINE_TRIVIAL_DERIVED_DEVICE(sharp_lh28f016s_device_config, intelfsh8_device_config, sharp_lh28f016s_device, intelfsh8_device, "Sharp LH28F016S Flash", intelfsh_device_config::FLASH_SHARP_LH28F016S)
-DEFINE_TRIVIAL_DERIVED_DEVICE(intel_e28f008sa_device_config, intelfsh8_device_config, intel_e28f008sa_device, intelfsh8_device, "Intel E28F008SA Flash", intelfsh_device_config::FLASH_INTEL_E28F008SA)
-DEFINE_TRIVIAL_DERIVED_DEVICE(macronix_29l001mc_device_config, intelfsh8_device_config, macronix_29l001mc_device, intelfsh8_device, "Macronix 29L001MC Flash", intelfsh_device_config::FLASH_MACRONIX_29L001MC)
-DEFINE_TRIVIAL_DERIVED_DEVICE(panasonic_mn63f805mnp_device_config, intelfsh8_device_config, panasonic_mn63f805mnp_device, intelfsh8_device, "Panasonic MN63F805MNP Flash", intelfsh_device_config::FLASH_PANASONIC_MN63F805MNP)
-DEFINE_TRIVIAL_DERIVED_DEVICE(sanyo_le26fv10n1ts_device_config, intelfsh8_device_config, sanyo_le26fv10n1ts_device, intelfsh8_device, "Sanyo LE26FV10N1TS Flash", intelfsh_device_config::FLASH_SANYO_LE26FV10N1TS)
+DEFINE_TRIVIAL_DERIVED_DEVICE(intel_28f016s5_device_config, intelfsh8_device_config, intel_28f016s5_device, intelfsh8_device, "Sharp LH28F400 Flash", "lh28f400", intelfsh_device_config::FLASH_SHARP_LH28F400)
+DEFINE_TRIVIAL_DERIVED_DEVICE(fujitsu_29f016a_device_config, intelfsh8_device_config, fujitsu_29f016a_device, intelfsh8_device, "Fujitsu 29F016A Flash", "29f016a", intelfsh_device_config::FLASH_FUJITSU_29F016A)
+DEFINE_TRIVIAL_DERIVED_DEVICE(sharp_lh28f016s_device_config, intelfsh8_device_config, sharp_lh28f016s_device, intelfsh8_device, "Sharp LH28F016S Flash", "lh28f016s", intelfsh_device_config::FLASH_SHARP_LH28F016S)
+DEFINE_TRIVIAL_DERIVED_DEVICE(intel_e28f008sa_device_config, intelfsh8_device_config, intel_e28f008sa_device, intelfsh8_device, "Intel E28F008SA Flash", "e28f008sa", intelfsh_device_config::FLASH_INTEL_E28F008SA)
+DEFINE_TRIVIAL_DERIVED_DEVICE(macronix_29l001mc_device_config, intelfsh8_device_config, macronix_29l001mc_device, intelfsh8_device, "Macronix 29L001MC Flash", "29l001mc", intelfsh_device_config::FLASH_MACRONIX_29L001MC)
+DEFINE_TRIVIAL_DERIVED_DEVICE(panasonic_mn63f805mnp_device_config, intelfsh8_device_config, panasonic_mn63f805mnp_device, intelfsh8_device, "Panasonic MN63F805MNP Flash", "mn63f805mnp", intelfsh_device_config::FLASH_PANASONIC_MN63F805MNP)
+DEFINE_TRIVIAL_DERIVED_DEVICE(sanyo_le26fv10n1ts_device_config, intelfsh8_device_config, sanyo_le26fv10n1ts_device, intelfsh8_device, "Sanyo LE26FV10N1TS Flash", "le26fv10n1ts", intelfsh_device_config::FLASH_SANYO_LE26FV10N1TS)
 
 const device_type INTEL_28F016S5 = intel_28f016s5_device_config::static_alloc_device_config;
 const device_type SHARP_LH28F016S = sharp_lh28f016s_device_config::static_alloc_device_config;
@@ -63,10 +63,10 @@ const device_type SANYO_LE26FV10N1TS = sanyo_le26fv10n1ts_device_config::static_
 
 
 // 16-bit variants
-DEFINE_TRIVIAL_DERIVED_DEVICE(sharp_lh28f400_device_config, intelfsh16_device_config, sharp_lh28f400_device, intelfsh16_device, "Sharp LH28F400 Flash", intelfsh_device_config::FLASH_SHARP_LH28F400)
-DEFINE_TRIVIAL_DERIVED_DEVICE(intel_te28f160_device_config, intelfsh16_device_config, intel_te28f160_device, intelfsh16_device, "Intel TE28F160 Flash", intelfsh_device_config::FLASH_INTEL_TE28F160)
-DEFINE_TRIVIAL_DERIVED_DEVICE(intel_e28f400_device_config, intelfsh16_device_config, intel_e28f400_device, intelfsh16_device, "Intel E28F400 Flash", intelfsh_device_config::FLASH_INTEL_E28F400)
-DEFINE_TRIVIAL_DERIVED_DEVICE(sharp_unk128mbit_device_config, intelfsh16_device_config, sharp_unk128mbit_device, intelfsh16_device, "Sharp Unknown 128Mb Flash", intelfsh_device_config::FLASH_SHARP_UNK128MBIT)
+DEFINE_TRIVIAL_DERIVED_DEVICE(sharp_lh28f400_device_config, intelfsh16_device_config, sharp_lh28f400_device, intelfsh16_device, "Sharp LH28F400 Flash", "lh28f400", intelfsh_device_config::FLASH_SHARP_LH28F400)
+DEFINE_TRIVIAL_DERIVED_DEVICE(intel_te28f160_device_config, intelfsh16_device_config, intel_te28f160_device, intelfsh16_device, "Intel TE28F160 Flash", "te28f160", intelfsh_device_config::FLASH_INTEL_TE28F160)
+DEFINE_TRIVIAL_DERIVED_DEVICE(intel_e28f400_device_config, intelfsh16_device_config, intel_e28f400_device, intelfsh16_device, "Intel E28F400 Flash", "e28f400", intelfsh_device_config::FLASH_INTEL_E28F400)
+DEFINE_TRIVIAL_DERIVED_DEVICE(sharp_unk128mbit_device_config, intelfsh16_device_config, sharp_unk128mbit_device, intelfsh16_device, "Sharp Unknown 128Mb Flash", "unk128mb", intelfsh_device_config::FLASH_SHARP_UNK128MBIT)
 
 const device_type SHARP_LH28F400 = sharp_lh28f400_device_config::static_alloc_device_config;
 const device_type INTEL_TE28F160 = intel_te28f160_device_config::static_alloc_device_config;
@@ -118,8 +118,8 @@ ADDRESS_MAP_END
 //  intelfsh_device_config - constructor
 //-------------------------------------------------
 
-intelfsh_device_config::intelfsh_device_config(const machine_config &mconfig, device_type type, const char *name, const char *tag, const device_config *owner, UINT32 clock, UINT32 variant)
-	: device_config(mconfig, type, name, tag, owner, clock),
+intelfsh_device_config::intelfsh_device_config(const machine_config &mconfig, device_type type, const char *name, const char *shortname, const char *tag, const device_config *owner, UINT32 clock, UINT32 variant)
+	: device_config(mconfig, type, name, shortname, tag, owner, clock),
 	  device_config_memory_interface(mconfig, *this),
 	  device_config_nvram_interface(mconfig, *this),
 	  m_type(variant),
@@ -210,13 +210,13 @@ intelfsh_device_config::intelfsh_device_config(const machine_config &mconfig, de
 	m_space_config = address_space_config("flash", ENDIANNESS_BIG, m_bits, addrbits, (m_bits == 8) ? 0 : -1, map);
 }
 
-intelfsh8_device_config::intelfsh8_device_config(const machine_config &mconfig, device_type type, const char *name, const char *tag, const device_config *owner, UINT32 clock, UINT32 variant)
-	: intelfsh_device_config(mconfig, type, name, tag, owner, clock, variant)
+intelfsh8_device_config::intelfsh8_device_config(const machine_config &mconfig, device_type type, const char *name, const char *shortname, const char *tag, const device_config *owner, UINT32 clock, UINT32 variant)
+	: intelfsh_device_config(mconfig, type, name, shortname, tag, owner, clock, variant)
 {
 }
 
-intelfsh16_device_config::intelfsh16_device_config(const machine_config &mconfig, device_type type, const char *name, const char *tag, const device_config *owner, UINT32 clock, UINT32 variant)
-	: intelfsh_device_config(mconfig, type, name, tag, owner, clock, variant)
+intelfsh16_device_config::intelfsh16_device_config(const machine_config &mconfig, device_type type, const char *name, const char *shortname, const char *tag, const device_config *owner, UINT32 clock, UINT32 variant)
+	: intelfsh_device_config(mconfig, type, name, shortname, tag, owner, clock, variant)
 {
 }
 
diff --git a/src/emu/machine/intelfsh.h b/src/emu/machine/intelfsh.h
index 1a8ec03c9f7..58fe7ce29d0 100644
--- a/src/emu/machine/intelfsh.h
+++ b/src/emu/machine/intelfsh.h
@@ -81,7 +81,7 @@ protected:
 	};
 
 	// construction/destruction
-	intelfsh_device_config(const machine_config &mconfig, device_type type, const char *name, const char *tag, const device_config *owner, UINT32 clock, UINT32 variant);
+	intelfsh_device_config(const machine_config &mconfig, device_type type, const char *name, const char *shortname, const char *tag, const device_config *owner, UINT32 clock, UINT32 variant);
 
 	// device_config_memory_interface overrides
 	virtual const address_space_config *memory_space_config(int spacenum = 0) const;
@@ -143,7 +143,7 @@ class intelfsh8_device_config : public intelfsh_device_config
 
 protected:
 	// construction/destruction
-	intelfsh8_device_config(const machine_config &mconfig, device_type type, const char *name, const char *tag, const device_config *owner, UINT32 clock, UINT32 variant);
+	intelfsh8_device_config(const machine_config &mconfig, device_type type, const char *name, const char *sharename, const char *tag, const device_config *owner, UINT32 clock, UINT32 variant);
 };
 
 
@@ -182,7 +182,7 @@ class intelfsh16_device_config : public intelfsh_device_config
 
 protected:
 	// construction/destruction
-	intelfsh16_device_config(const machine_config &mconfig, device_type type, const char *name, const char *tag, const device_config *owner, UINT32 clock, UINT32 variant);
+	intelfsh16_device_config(const machine_config &mconfig, device_type type, const char *name, const char *sharename, const char *tag, const device_config *owner, UINT32 clock, UINT32 variant);
 };
 
 
diff --git a/src/emu/machine/k033906.c b/src/emu/machine/k033906.c
index 30f8fa35baf..2415de859d8 100644
--- a/src/emu/machine/k033906.c
+++ b/src/emu/machine/k033906.c
@@ -14,7 +14,7 @@
 //  DEVICE CONFIGURATION
 //**************************************************************************
 
-GENERIC_DEVICE_CONFIG_SETUP(k033906, "Konami 033906")
+GENERIC_DEVICE_CONFIG_SETUP(k033906, "Konami 033906", "k033906")
 
 //-------------------------------------------------
 //  device_config_complete - perform any
diff --git a/src/emu/machine/k056230.c b/src/emu/machine/k056230.c
index df91b168eb6..55ed79d8e46 100644
--- a/src/emu/machine/k056230.c
+++ b/src/emu/machine/k056230.c
@@ -13,7 +13,7 @@
 //  DEVICE CONFIGURATION
 //**************************************************************************
 
-GENERIC_DEVICE_CONFIG_SETUP(k056230, "Konami 056230")
+GENERIC_DEVICE_CONFIG_SETUP(k056230, "Konami 056230", "k056230")
 
 //-------------------------------------------------
 //  device_config_complete - perform any
diff --git a/src/emu/machine/ldcore.c b/src/emu/machine/ldcore.c
index 28a4f9f1164..25d12396b19 100644
--- a/src/emu/machine/ldcore.c
+++ b/src/emu/machine/ldcore.c
@@ -1653,6 +1653,7 @@ DEVICE_GET_INFO( laserdisc )
 
 		/* --- the following bits of info are returned as NULL-terminated strings --- */
 		case DEVINFO_STR_NAME:					intf = get_interface(device); strcpy(info->s, (intf != NULL) ? intf->name : "Unknown Laserdisc Player");	break;
+		case DEVINFO_STR_SHORTNAME:				intf = get_interface(device); strcpy(info->s, (intf != NULL) ? intf->shortname : "unkldplay");	break;
 		case DEVINFO_STR_FAMILY:				strcpy(info->s, "Laserdisc Player");				break;
 		case DEVINFO_STR_VERSION:				strcpy(info->s, "1.0");								break;
 		case DEVINFO_STR_SOURCE_FILE:			strcpy(info->s, __FILE__);							break;
diff --git a/src/emu/machine/ldcore.h b/src/emu/machine/ldcore.h
index 9573841a0fd..24f6361930a 100644
--- a/src/emu/machine/ldcore.h
+++ b/src/emu/machine/ldcore.h
@@ -147,6 +147,7 @@ struct _ldplayer_interface
 	int						type;					/* type of the player */
 	size_t					statesize;				/* size of the state */
 	const char *			name;					/* name of the player */
+	const char *			shortname;				/* shortname of the player */
 	const rom_entry *		romregion;				/* pointer to ROM region information */
 	machine_config_constructor machine_config;		/* pointer to machine configuration */
 	laserdisc_init_func		init;					/* initialization callback */
diff --git a/src/emu/machine/ldpr8210.c b/src/emu/machine/ldpr8210.c
index bf2a40c04dd..78a9d7eb9ef 100644
--- a/src/emu/machine/ldpr8210.c
+++ b/src/emu/machine/ldpr8210.c
@@ -307,6 +307,7 @@ const ldplayer_interface pr8210_interface =
 	LASERDISC_TYPE_PIONEER_PR8210,				/* type of the player */
 	sizeof(ldplayer_data),						/* size of the state */
 	"Pioneer PR-8210",							/* name of the player */
+	"pr8210",									/* shortname of the player */
 	ROM_NAME(pr8210),							/* pointer to ROM region information */
 	MACHINE_CONFIG_NAME(pr8210),				/* pointer to machine configuration */
 	pr8210_init,								/* initialization callback */
@@ -1022,6 +1023,7 @@ const ldplayer_interface simutrek_interface =
 	LASERDISC_TYPE_SIMUTREK_SPECIAL,			/* type of the player */
 	sizeof(ldplayer_data),						/* size of the state */
 	"Simutrek Modified PR-8210",				/* name of the player */
+	"mpr8210",									/* shortname of the player */
 	ROM_NAME(simutrek),							/* pointer to ROM region information */
 	MACHINE_CONFIG_NAME(simutrek),				/* pointer to machine configuration */
 	simutrek_init,								/* initialization callback */
diff --git a/src/emu/machine/ldv1000.c b/src/emu/machine/ldv1000.c
index c905352d2b9..617591a885c 100644
--- a/src/emu/machine/ldv1000.c
+++ b/src/emu/machine/ldv1000.c
@@ -195,6 +195,7 @@ const ldplayer_interface ldv1000_interface =
 	LASERDISC_TYPE_PIONEER_LDV1000,				/* type of the player */
 	sizeof(ldplayer_data),						/* size of the state */
 	"Pioneer LD-V1000",							/* name of the player */
+	"ldv1000",									/* shortname of the player */
 	ROM_NAME(ldv1000),							/* pointer to ROM region information */
 	MACHINE_CONFIG_NAME(ldv1000),				/* pointer to machine configuration */
 	ldv1000_init,								/* initialization callback */
diff --git a/src/emu/machine/ldvp931.c b/src/emu/machine/ldvp931.c
index 65ed3b618c9..04919fdcbca 100644
--- a/src/emu/machine/ldvp931.c
+++ b/src/emu/machine/ldvp931.c
@@ -156,6 +156,7 @@ const ldplayer_interface vp931_interface =
 	LASERDISC_TYPE_PHILLIPS_22VP931,			/* type of the player */
 	sizeof(ldplayer_data),						/* size of the state */
 	"Phillips 22VP931",							/* name of the player */
+	"22vp931",									/* shortname of the player */
 	ROM_NAME(vp931),							/* pointer to ROM region information */
 	MACHINE_CONFIG_NAME(vp931),					/* pointer to machine configuration */
 	vp931_init,									/* initialization callback */
diff --git a/src/emu/machine/mb3773.c b/src/emu/machine/mb3773.c
index 1f11cf1f4c3..ddf48d8cbac 100644
--- a/src/emu/machine/mb3773.c
+++ b/src/emu/machine/mb3773.c
@@ -30,8 +30,8 @@ const device_type MB3773 = mb3773_device_config::static_alloc_device_config;
 //  mb3773_device_config - constructor
 //-------------------------------------------------
 
-mb3773_device_config::mb3773_device_config( const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock ) :
-	device_config( mconfig, static_alloc_device_config, "MB3773", tag, owner, clock)
+mb3773_device_config::mb3773_device_config( const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock )
+	: device_config(mconfig, static_alloc_device_config, "MB3773", "mb3773", tag, owner, clock)
 {
 }
 
diff --git a/src/emu/machine/mc146818.c b/src/emu/machine/mc146818.c
index ab6da420424..7fc900c7f54 100644
--- a/src/emu/machine/mc146818.c
+++ b/src/emu/machine/mc146818.c
@@ -117,7 +117,7 @@ const device_type MC146818 = mc146818_device_config::static_alloc_device_config;
 //-------------------------------------------------
 
 mc146818_device_config::mc146818_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-	: device_config(mconfig, static_alloc_device_config, "NVRAM", tag, owner, clock),
+	: device_config(mconfig, static_alloc_device_config, "NVRAM", "mc146818", tag, owner, clock),
 	  device_config_nvram_interface(mconfig, *this),
 	  m_type(MC146818_STANDARD)
 {
diff --git a/src/emu/machine/mc68901.c b/src/emu/machine/mc68901.c
index cc3bc818c1b..4556e426d3b 100644
--- a/src/emu/machine/mc68901.c
+++ b/src/emu/machine/mc68901.c
@@ -273,7 +273,7 @@ const device_type MC68901 = mc68901_device_config::static_alloc_device_config;
 //  DEVICE CONFIGURATION
 //**************************************************************************
 
-GENERIC_DEVICE_CONFIG_SETUP(mc68901, "Motorola MC68901")
+GENERIC_DEVICE_CONFIG_SETUP(mc68901, "Motorola MC68901", "mc68901")
 
 
 //-------------------------------------------------
diff --git a/src/emu/machine/nvram.c b/src/emu/machine/nvram.c
index be30ff82002..4902ca2065c 100644
--- a/src/emu/machine/nvram.c
+++ b/src/emu/machine/nvram.c
@@ -59,7 +59,7 @@ const device_type NVRAM = nvram_device_config::static_alloc_device_config;
 //-------------------------------------------------
 
 nvram_device_config::nvram_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-	: device_config(mconfig, static_alloc_device_config, "NVRAM", tag, owner, clock),
+	: device_config(mconfig, static_alloc_device_config, "NVRAM", "nvram", tag, owner, clock),
 	  device_config_nvram_interface(mconfig, *this),
 	  m_default_value(DEFAULT_ALL_1)
 {
diff --git a/src/emu/machine/timekpr.c b/src/emu/machine/timekpr.c
index 1dd0fa0d342..1a2d2444df3 100644
--- a/src/emu/machine/timekpr.c
+++ b/src/emu/machine/timekpr.c
@@ -48,9 +48,9 @@
 		: timekeeper_device(_machine, config) \
 	{ }
 
-#define TIMEKPR_DEVCFG_DERIVED_CTOR(devtype, name) \
+#define TIMEKPR_DEVCFG_DERIVED_CTOR(devtype, name, shortname) \
 	devtype##_device_config::devtype##_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock) \
-    : timekeeper_device_config(mconfig, name, tag, owner, clock) \
+    : timekeeper_device_config(mconfig, name, shortname, tag, owner, clock) \
 	{ }
 
 #define TIMEKPR_DEVCFG_DERIVED_STATIC_ALLOC(devtype) \
@@ -61,9 +61,9 @@
 	device_t *devtype##_device_config::alloc_device(running_machine &machine) const \
 	{ return auto_alloc(&machine, devtype##_device(machine, *this)); }
 
-#define TIMEKPR_DERIVE(devtype, name) \
+#define TIMEKPR_DERIVE(devtype, name, shortname) \
 	TIMEKPR_DEV_DERIVED_CTOR(devtype) \
-	TIMEKPR_DEVCFG_DERIVED_CTOR(devtype, name) \
+	TIMEKPR_DEVCFG_DERIVED_CTOR(devtype, name, shortname) \
 	TIMEKPR_DEVCFG_DERIVED_STATIC_ALLOC(devtype) \
 	TIMEKPR_DEVCFG_DERIVED_DEV_ALLOC(devtype)
 
@@ -76,8 +76,8 @@
 //  timekeeper_device_config - constructor
 //-------------------------------------------------
 
-timekeeper_device_config::timekeeper_device_config(const machine_config &mconfig, const char *type, const char *tag, const device_config *owner, UINT32 clock)
-    : device_config(mconfig, static_alloc_device_config, type, tag, owner, clock),
+timekeeper_device_config::timekeeper_device_config(const machine_config &mconfig, const char *type, const char *shortname, const char *tag, const device_config *owner, UINT32 clock)
+    : device_config(mconfig, static_alloc_device_config, type, shortname, tag, owner, clock),
 	  device_config_nvram_interface(mconfig, *this)
 {
 
@@ -91,7 +91,7 @@ timekeeper_device_config::timekeeper_device_config(const machine_config &mconfig
 
 device_config *timekeeper_device_config::static_alloc_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
 {
-    return global_alloc(timekeeper_device_config(mconfig, "TIMEKEEPER", tag, owner, clock));
+    return global_alloc(timekeeper_device_config(mconfig, "TIMEKEEPER", "timekpr", tag, owner, clock));
 }
 
 
@@ -167,10 +167,10 @@ const device_type M48T35 = m48t35_device_config::static_alloc_device_config;
 const device_type M48T58 = m48t58_device_config::static_alloc_device_config;
 const device_type MK48T08 = mk48t08_device_config::static_alloc_device_config;
 
-TIMEKPR_DERIVE(m48t02, "M48T02")
-TIMEKPR_DERIVE(m48t35, "M48T35")
-TIMEKPR_DERIVE(m48t58, "M48T58")
-TIMEKPR_DERIVE(mk48t08, "MK48T08")
+TIMEKPR_DERIVE(m48t02, "M48T02", "m48t02")
+TIMEKPR_DERIVE(m48t35, "M48T35", "m48t35")
+TIMEKPR_DERIVE(m48t58, "M48T58", "m48t58")
+TIMEKPR_DERIVE(mk48t08, "MK48T08", "mk48t08")
 
 //-------------------------------------------------
 //  timekeeper_device - constructor
diff --git a/src/emu/machine/timekpr.h b/src/emu/machine/timekpr.h
index 09374ab73db..dd0427e9be6 100644
--- a/src/emu/machine/timekpr.h
+++ b/src/emu/machine/timekpr.h
@@ -64,7 +64,7 @@ class timekeeper_device_config :	public device_config,
 
 protected:
 	// construction/destruction
-	timekeeper_device_config(const machine_config &mconfig, const char *type, const char *tag, const device_config *owner, UINT32 clock);
+	timekeeper_device_config(const machine_config &mconfig, const char *type, const char *shortname, const char *tag, const device_config *owner, UINT32 clock);
 
 public:
 	// allocators
diff --git a/src/emu/machine/x2212.c b/src/emu/machine/x2212.c
index cc79b1be176..4aab5e2296d 100644
--- a/src/emu/machine/x2212.c
+++ b/src/emu/machine/x2212.c
@@ -35,7 +35,7 @@ ADDRESS_MAP_END
 //-------------------------------------------------
 
 x2212_device_config::x2212_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-	: device_config(mconfig, static_alloc_device_config, "X2212", tag, owner, clock),
+	: device_config(mconfig, static_alloc_device_config, "X2212", "x2212", tag, owner, clock),
 	  device_config_memory_interface(mconfig, *this),
 	  device_config_nvram_interface(mconfig, *this),
 	  m_sram_space_config("SRAM", ENDIANNESS_BIG, 8, 8, 0, *ADDRESS_MAP_NAME(x2212_sram_map)),
diff --git a/src/emu/machine/z80ctc.c b/src/emu/machine/z80ctc.c
index e112707233b..8a578a6e9b3 100644
--- a/src/emu/machine/z80ctc.c
+++ b/src/emu/machine/z80ctc.c
@@ -85,7 +85,7 @@ const int WAITING_FOR_TRIG	= 0x100;
 //-------------------------------------------------
 
 z80ctc_device_config::z80ctc_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-	: device_config(mconfig, static_alloc_device_config, "Zilog Z80 CTC", tag, owner, clock),
+	: device_config(mconfig, static_alloc_device_config, "Zilog Z80 CTC", "z80ctc", tag, owner, clock),
 	  device_config_z80daisy_interface(mconfig, *this)
 {
 }
diff --git a/src/emu/machine/z80dart.c b/src/emu/machine/z80dart.c
index 8791de96b04..807304c5313 100644
--- a/src/emu/machine/z80dart.c
+++ b/src/emu/machine/z80dart.c
@@ -198,7 +198,7 @@ const int WR5_DTR					= 0x80;
 //-------------------------------------------------
 
 z80dart_device_config::z80dart_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-	: device_config(mconfig, static_alloc_device_config, "Zilog Z80 DART", tag, owner, clock),
+	: device_config(mconfig, static_alloc_device_config, "Zilog Z80 DART", "z80dart", tag, owner, clock),
 	  device_config_z80daisy_interface(mconfig, *this)
 {
 }
diff --git a/src/emu/machine/z80dma.c b/src/emu/machine/z80dma.c
index 49ed267748d..4212dde6428 100644
--- a/src/emu/machine/z80dma.c
+++ b/src/emu/machine/z80dma.c
@@ -151,7 +151,7 @@ const int TM_SEARCH_TRANSFER	= 0x03;
 //-------------------------------------------------
 
 z80dma_device_config::z80dma_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-	: device_config(mconfig, static_alloc_device_config, "Z8410", tag, owner, clock),
+	: device_config(mconfig, static_alloc_device_config, "Z8410", "z80dma", tag, owner, clock),
 	  device_config_z80daisy_interface(mconfig, *this)
 {
 }
diff --git a/src/emu/machine/z80pio.c b/src/emu/machine/z80pio.c
index 3ca7bbd330c..3951202f582 100644
--- a/src/emu/machine/z80pio.c
+++ b/src/emu/machine/z80pio.c
@@ -61,7 +61,7 @@ const int ICW_MASK_FOLLOWS	= 0x10;
 //-------------------------------------------------
 
 z80pio_device_config::z80pio_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-	: device_config(mconfig, static_alloc_device_config, "Z8420", tag, owner, clock),
+	: device_config(mconfig, static_alloc_device_config, "Z8420", "z80pio", tag, owner, clock),
 	  device_config_z80daisy_interface(mconfig, *this)
 {
 }
diff --git a/src/emu/machine/z80sio.c b/src/emu/machine/z80sio.c
index cb39ca4c90d..61a6fe0bd79 100644
--- a/src/emu/machine/z80sio.c
+++ b/src/emu/machine/z80sio.c
@@ -303,7 +303,7 @@ inline attotime z80sio_device::sio_channel::compute_time_per_character()
 //-------------------------------------------------
 
 z80sio_device_config::z80sio_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-	: device_config(mconfig, static_alloc_device_config, "Zilog Z80 SIO", tag, owner, clock),
+	: device_config(mconfig, static_alloc_device_config, "Zilog Z80 SIO", "z80sio", tag, owner, clock),
 	  device_config_z80daisy_interface(mconfig, *this)
 {
 }
diff --git a/src/emu/machine/z80sti.c b/src/emu/machine/z80sti.c
index 61442abc32d..1ed49ec0d7b 100644
--- a/src/emu/machine/z80sti.c
+++ b/src/emu/machine/z80sti.c
@@ -152,7 +152,7 @@ static const int PRESCALER[] = { 0, 4, 10, 16, 50, 64, 100, 200 };
 //-------------------------------------------------
 
 z80sti_device_config::z80sti_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-	: device_config(mconfig, static_alloc_device_config, "Mostek MK3801", tag, owner, clock),
+	: device_config(mconfig, static_alloc_device_config, "Mostek MK3801", "z80sti", tag, owner, clock),
 	  device_config_z80daisy_interface(mconfig, *this)
 {
 }
diff --git a/src/emu/screen.c b/src/emu/screen.c
index 9f3cba08710..cd5ed6e54e7 100644
--- a/src/emu/screen.c
+++ b/src/emu/screen.c
@@ -72,7 +72,7 @@ const attotime screen_device::DEFAULT_FRAME_PERIOD(attotime::from_hz(DEFAULT_FRA
 //-------------------------------------------------
 
 screen_device_config::screen_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-	: device_config(mconfig, static_alloc_device_config, "Video Screen", tag, owner, clock),
+	: device_config(mconfig, static_alloc_device_config, "Video Screen", "video", tag, owner, clock),
 	  m_type(SCREEN_TYPE_RASTER),
 	  m_width(0),
 	  m_height(0),
diff --git a/src/emu/sound/asc.c b/src/emu/sound/asc.c
index 7440b1b885b..4a84275e08b 100644
--- a/src/emu/sound/asc.c
+++ b/src/emu/sound/asc.c
@@ -70,7 +70,7 @@ void asc_device_config::static_set_irqf(device_config *device, void (*irqf)(devi
 //-------------------------------------------------
 
 asc_device_config::asc_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-	: device_config(mconfig, static_alloc_device_config, "ASC", tag, owner, clock),
+	: device_config(mconfig, static_alloc_device_config, "ASC", "asc", tag, owner, clock),
 	  device_config_sound_interface(mconfig, *this)
 {
 }
diff --git a/src/emu/sound/bsmt2000.c b/src/emu/sound/bsmt2000.c
index e372c8e50fa..69fcb020f82 100644
--- a/src/emu/sound/bsmt2000.c
+++ b/src/emu/sound/bsmt2000.c
@@ -107,7 +107,7 @@ ROM_END
 //-------------------------------------------------
 
 bsmt2000_device_config::bsmt2000_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-	: device_config(mconfig, static_alloc_device_config, "BSMT2000", tag, owner, clock),
+	: device_config(mconfig, static_alloc_device_config, "BSMT2000", "bsmt2000", tag, owner, clock),
 	  device_config_sound_interface(mconfig, *this),
 	  device_config_memory_interface(mconfig, *this),
 	  m_space_config("samples", ENDIANNESS_LITTLE, 8, 32, 0, NULL, *ADDRESS_MAP_NAME(bsmt2000)),
diff --git a/src/emu/sound/cdp1869.c b/src/emu/sound/cdp1869.c
index 51e459115a2..4cabdfd7f7f 100644
--- a/src/emu/sound/cdp1869.c
+++ b/src/emu/sound/cdp1869.c
@@ -76,7 +76,7 @@ ADDRESS_MAP_END
 //-------------------------------------------------
 
 cdp1869_device_config::cdp1869_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-	: device_config(mconfig, static_alloc_device_config, "RCA CDP1869", tag, owner, clock),
+	: device_config(mconfig, static_alloc_device_config, "RCA CDP1869", "cdp1869", tag, owner, clock),
 	  device_config_sound_interface(mconfig, *this),
 	  device_config_memory_interface(mconfig, *this),
 	  m_space_config("pageram", ENDIANNESS_LITTLE, 8, 11, 0, NULL, *ADDRESS_MAP_NAME(cdp1869))
diff --git a/src/emu/sound/discrete.c b/src/emu/sound/discrete.c
index 7eb28f9de7e..f763c2cc5d9 100644
--- a/src/emu/sound/discrete.c
+++ b/src/emu/sound/discrete.c
@@ -828,13 +828,13 @@ void discrete_device_config::static_set_intf(device_config *device, const discre
 //-------------------------------------------------
 //  discrete_device_config - constructor
 //-------------------------------------------------
-discrete_device_config::discrete_device_config(const machine_config &mconfig, device_type type, const char *name, const char *tag, const device_config *owner, UINT32 clock)
-	: device_config(mconfig, type, name, tag, owner, clock), m_intf(NULL)
+discrete_device_config::discrete_device_config(const machine_config &mconfig, device_type type, const char *name, const char *shortname, const char *tag, const device_config *owner, UINT32 clock)
+	: device_config(mconfig, type, name, shortname, tag, owner, clock), m_intf(NULL)
 {
 }
 
 discrete_sound_device_config::discrete_sound_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-	: discrete_device_config(mconfig, static_alloc_device_config, "DISCRETE", tag, owner, clock),
+	: discrete_device_config(mconfig, static_alloc_device_config, "DISCRETE", "discrete", tag, owner, clock),
 	  device_config_sound_interface(mconfig, *this)
 {
 }
@@ -846,7 +846,7 @@ discrete_sound_device_config::discrete_sound_device_config(const machine_config
 
 device_config *discrete_device_config::static_alloc_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
 {
-	return global_alloc(discrete_device_config(mconfig, static_alloc_device_config, "PUREDISC", tag, owner, clock));
+	return global_alloc(discrete_device_config(mconfig, static_alloc_device_config, "PUREDISC", "puredisc", tag, owner, clock));
 }
 
 device_config *discrete_sound_device_config::static_alloc_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
diff --git a/src/emu/sound/discrete.h b/src/emu/sound/discrete.h
index 9174c9753a9..cc081463ae1 100644
--- a/src/emu/sound/discrete.h
+++ b/src/emu/sound/discrete.h
@@ -4303,7 +4303,7 @@ class discrete_device_config :	public device_config
 
 protected:
 	// construction/destruction
-	discrete_device_config(const machine_config &mconfig, device_type type, const char *name, const char *tag, const device_config *owner, UINT32 clock);
+	discrete_device_config(const machine_config &mconfig, device_type type, const char *name, const char *shortname, const char *tag, const device_config *owner, UINT32 clock);
 
 public:
 	// allocators
diff --git a/src/emu/sound/ics2115.c b/src/emu/sound/ics2115.c
index 0a15dae9b6d..5758294e935 100644
--- a/src/emu/sound/ics2115.c
+++ b/src/emu/sound/ics2115.c
@@ -21,7 +21,7 @@ void ics2115_device_config::static_set_irqf(device_config *device, void (*irqf)(
 }
 
 ics2115_device_config::ics2115_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-	: device_config(mconfig, static_alloc_device_config, "ICS2115", tag, owner, clock),
+	: device_config(mconfig, static_alloc_device_config, "ICS2115", "ics2115", tag, owner, clock),
 	  device_config_sound_interface(mconfig, *this)
 {
 }
diff --git a/src/emu/sound/mas3507d.c b/src/emu/sound/mas3507d.c
index c88a3d4e477..1797e8b18c7 100644
--- a/src/emu/sound/mas3507d.c
+++ b/src/emu/sound/mas3507d.c
@@ -9,7 +9,7 @@ const device_type MAS3507D = mas3507d_device_config::static_alloc_device_config;
 
 
 mas3507d_device_config::mas3507d_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-	: device_config(mconfig, static_alloc_device_config, "MAS3507D", tag, owner, clock),
+	: device_config(mconfig, static_alloc_device_config, "MAS3507D", "mas3507d", tag, owner, clock),
 	  device_config_sound_interface(mconfig, *this)
 {
 }
diff --git a/src/emu/sound/okim6295.c b/src/emu/sound/okim6295.c
index 9ac2a107121..65d655b7941 100644
--- a/src/emu/sound/okim6295.c
+++ b/src/emu/sound/okim6295.c
@@ -90,7 +90,7 @@ ADDRESS_MAP_END
 //-------------------------------------------------
 
 okim6295_device_config::okim6295_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-	: device_config(mconfig, static_alloc_device_config, "OKI6295", tag, owner, clock),
+	: device_config(mconfig, static_alloc_device_config, "OKI6295", "oki6295", tag, owner, clock),
 	  device_config_sound_interface(mconfig, *this),
 	  device_config_memory_interface(mconfig, *this),
 	  m_space_config("samples", ENDIANNESS_LITTLE, 8, 18, 0, NULL, *ADDRESS_MAP_NAME(okim6295))
diff --git a/src/emu/sound/okim9810.c b/src/emu/sound/okim9810.c
index 183693639ea..2c37d75ed43 100644
--- a/src/emu/sound/okim9810.c
+++ b/src/emu/sound/okim9810.c
@@ -33,7 +33,7 @@ ADDRESS_MAP_END
 //-------------------------------------------------
 
 okim9810_device_config::okim9810_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-	: device_config(mconfig, static_alloc_device_config, "OKI9810", tag, owner, clock),
+	: device_config(mconfig, static_alloc_device_config, "OKI9810", "oki9810", tag, owner, clock),
 	  device_config_sound_interface(mconfig, *this),
 	  device_config_memory_interface(mconfig, *this),
 	  m_space_config("samples", ENDIANNESS_BIG, 8, 24, 0, NULL, *ADDRESS_MAP_NAME(okim9810))
diff --git a/src/emu/speaker.c b/src/emu/speaker.c
index 4b681acf815..386940da5ad 100644
--- a/src/emu/speaker.c
+++ b/src/emu/speaker.c
@@ -73,7 +73,7 @@ const device_type SPEAKER = speaker_device_config::static_alloc_device_config;
 //-------------------------------------------------
 
 speaker_device_config::speaker_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-	: device_config(mconfig, static_alloc_device_config, "Speaker", tag, owner, clock),
+	: device_config(mconfig, static_alloc_device_config, "Speaker", "speaker", tag, owner, clock),
 	  device_config_sound_interface(mconfig, *this),
 	  m_x(0.0),
 	  m_y(0.0),
diff --git a/src/emu/timer.c b/src/emu/timer.c
index 698f01345fc..8ce5db9a853 100644
--- a/src/emu/timer.c
+++ b/src/emu/timer.c
@@ -69,7 +69,7 @@ const device_type TIMER = timer_device_config::static_alloc_device_config;
 //-------------------------------------------------
 
 timer_device_config::timer_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-	: device_config(mconfig, static_alloc_device_config, "Timer", tag, owner, clock),
+	: device_config(mconfig, static_alloc_device_config, "Timer", "timer", tag, owner, clock),
 	  m_type(TIMER_TYPE_GENERIC),
 	  m_callback(NULL),
 	  m_ptr(NULL),
diff --git a/src/emu/validity.c b/src/emu/validity.c
index bfcaa928ae7..221ed4b8881 100644
--- a/src/emu/validity.c
+++ b/src/emu/validity.c
@@ -1096,6 +1096,10 @@ static bool validate_devices(const machine_config &config, const ioport_list &po
 				break;
 			}
 
+		if (devconfig->rom_region()!=NULL && (strcmp(devconfig->shortname(),"") == 0)) {
+			mame_printf_warning("Device %s does not have short name defined\n", devconfig->name());
+			break;
+		}
 		/* check for device-specific validity check */
 		if (devconfig->validity_check(driver))
 			error = true;
diff --git a/src/mame/audio/namco52.c b/src/mame/audio/namco52.c
index 9fd9d4195eb..20f5b6e44ac 100644
--- a/src/mame/audio/namco52.c
+++ b/src/mame/audio/namco52.c
@@ -233,6 +233,7 @@ static const char DEVTEMPLATE_SOURCE[] = __FILE__;
 #define DEVTEMPLATE_ID(p,s)		p##namco_52xx##s
 #define DEVTEMPLATE_FEATURES	DT_HAS_START | DT_HAS_ROM_REGION | DT_HAS_MACHINE_CONFIG
 #define DEVTEMPLATE_NAME		"Namco 52xx"
+#define DEVTEMPLATE_SHORTNAME   "namco52"
 #define DEVTEMPLATE_FAMILY		"Namco I/O"
 #include "devtempl.h"
 
diff --git a/src/mame/audio/namco54.c b/src/mame/audio/namco54.c
index a7bce265c67..47df262a954 100644
--- a/src/mame/audio/namco54.c
+++ b/src/mame/audio/namco54.c
@@ -189,6 +189,7 @@ static const char DEVTEMPLATE_SOURCE[] = __FILE__;
 #define DEVTEMPLATE_ID(p,s)		p##namco_54xx##s
 #define DEVTEMPLATE_FEATURES	DT_HAS_START | DT_HAS_ROM_REGION | DT_HAS_MACHINE_CONFIG | DT_HAS_INLINE_CONFIG
 #define DEVTEMPLATE_NAME		"Namco 54xx"
+#define DEVTEMPLATE_SHORTNAME   "namco54"
 #define DEVTEMPLATE_FAMILY		"Namco I/O"
 #include "devtempl.h"
 
diff --git a/src/mame/drivers/littlerb.c b/src/mame/drivers/littlerb.c
index 829e659fbbf..b501bfd3ec2 100644
--- a/src/mame/drivers/littlerb.c
+++ b/src/mame/drivers/littlerb.c
@@ -189,7 +189,7 @@ littlerb_vdp_device::littlerb_vdp_device(running_machine &_machine, const little
 }
 
 littlerb_vdp_device_config::littlerb_vdp_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-	: device_config(mconfig, static_alloc_device_config, "LITTLERBVDP", tag, owner, clock),
+	: device_config(mconfig, static_alloc_device_config, "LITTLERBVDP", "littlerb", tag, owner, clock),
 	  device_config_memory_interface(mconfig, *this),
 	  m_space_config("littlerb_vdp", ENDIANNESS_LITTLE, 16,32, 0, NULL, *ADDRESS_MAP_NAME(littlerb_vdp_map8))
 {
diff --git a/src/mame/drivers/pinkiri8.c b/src/mame/drivers/pinkiri8.c
index 45166628f8f..340ba2606ee 100644
--- a/src/mame/drivers/pinkiri8.c
+++ b/src/mame/drivers/pinkiri8.c
@@ -94,7 +94,7 @@ protected:
 const device_type JANSHIVDP = janshi_vdp_device_config::static_alloc_device_config;
 
 janshi_vdp_device_config::janshi_vdp_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-	: device_config(mconfig, static_alloc_device_config, "JANSHIVDP", tag, owner, clock),
+	: device_config(mconfig, static_alloc_device_config, "JANSHIVDP", "janshvdp", tag, owner, clock),
 	  device_config_memory_interface(mconfig, *this),
 	  m_space_config("janshi_vdp", ENDIANNESS_LITTLE, 8,24, 0, NULL, *ADDRESS_MAP_NAME(janshi_vdp_map8))
 {
diff --git a/src/mame/machine/cdicdic.c b/src/mame/machine/cdicdic.c
index 24084022185..c2b58bc505d 100644
--- a/src/mame/machine/cdicdic.c
+++ b/src/mame/machine/cdicdic.c
@@ -99,7 +99,7 @@ const INT32 cdicdic_device::s_cdic_adpcm_filter_coef[5][2] =
 //-------------------------------------------------
 
 cdicdic_device_config::cdicdic_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-    : device_config(mconfig, static_alloc_device_config, "CDICDIC", tag, owner, clock)
+    : device_config(mconfig, static_alloc_device_config, "CDICDIC", "cdicdic", tag, owner, clock)
 {
 
 }
diff --git a/src/mame/machine/cdislave.c b/src/mame/machine/cdislave.c
index 52c01f0d2fe..b627ba43973 100644
--- a/src/mame/machine/cdislave.c
+++ b/src/mame/machine/cdislave.c
@@ -51,7 +51,7 @@ INLINE void verboselog(running_machine *machine, int n_level, const char *s_fmt,
 //-------------------------------------------------
 
 cdislave_device_config::cdislave_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-    : device_config(mconfig, static_alloc_device_config, "CDISLAVE", tag, owner, clock)
+    : device_config(mconfig, static_alloc_device_config, "CDISLAVE", "cdislave", tag, owner, clock)
 {
 
 }
diff --git a/src/mame/machine/namco06.c b/src/mame/machine/namco06.c
index 43a4eba28fe..f3caaa8e577 100644
--- a/src/mame/machine/namco06.c
+++ b/src/mame/machine/namco06.c
@@ -298,6 +298,7 @@ static const char DEVTEMPLATE_SOURCE[] = __FILE__;
 #define DEVTEMPLATE_FEATURES	DT_HAS_START | DT_HAS_RESET | DT_HAS_INLINE_CONFIG
 #define DEVTEMPLATE_NAME		"Namco 06xx"
 #define DEVTEMPLATE_FAMILY		"Namco I/O"
+#define DEVTEMPLATE_SHORTNAME   "namco06xx"
 #include "devtempl.h"
 
 
diff --git a/src/mame/machine/namco50.c b/src/mame/machine/namco50.c
index 9f0cdf68fc9..133429855ac 100644
--- a/src/mame/machine/namco50.c
+++ b/src/mame/machine/namco50.c
@@ -301,6 +301,7 @@ static const char DEVTEMPLATE_SOURCE[] = __FILE__;
 #define DEVTEMPLATE_ID(p,s)		p##namco_50xx##s
 #define DEVTEMPLATE_FEATURES	DT_HAS_START | DT_HAS_ROM_REGION | DT_HAS_MACHINE_CONFIG
 #define DEVTEMPLATE_NAME		"Namco 50xx"
+#define DEVTEMPLATE_SHORTNAME   "namco50"
 #define DEVTEMPLATE_FAMILY		"Namco I/O"
 #include "devtempl.h"
 
diff --git a/src/mame/machine/namco51.c b/src/mame/machine/namco51.c
index 8f05318abc5..4fbfc8bcb62 100644
--- a/src/mame/machine/namco51.c
+++ b/src/mame/machine/namco51.c
@@ -446,6 +446,7 @@ static const char DEVTEMPLATE_SOURCE[] = __FILE__;
 #define DEVTEMPLATE_ID(p,s)		p##namco_51xx##s
 #define DEVTEMPLATE_FEATURES	DT_HAS_START | DT_HAS_RESET | DT_HAS_ROM_REGION | DT_HAS_MACHINE_CONFIG
 #define DEVTEMPLATE_NAME		"Namco 51xx"
+#define DEVTEMPLATE_SHORTNAME   "namco51"
 #define DEVTEMPLATE_FAMILY		"Namco I/O"
 #include "devtempl.h"
 
diff --git a/src/mame/machine/namco53.c b/src/mame/machine/namco53.c
index eadefa985e7..48e34fab63c 100644
--- a/src/mame/machine/namco53.c
+++ b/src/mame/machine/namco53.c
@@ -201,6 +201,7 @@ static const char DEVTEMPLATE_SOURCE[] = __FILE__;
 #define DEVTEMPLATE_ID(p,s)		p##namco_53xx##s
 #define DEVTEMPLATE_FEATURES	DT_HAS_START | DT_HAS_ROM_REGION | DT_HAS_MACHINE_CONFIG
 #define DEVTEMPLATE_NAME		"Namco 53xx"
+#define DEVTEMPLATE_SHORTNAME   "namco53"
 #define DEVTEMPLATE_FAMILY		"Namco I/O"
 #include "devtempl.h"
 
diff --git a/src/mame/machine/namco62.c b/src/mame/machine/namco62.c
index 62e3b64efc9..fa5e5475171 100644
--- a/src/mame/machine/namco62.c
+++ b/src/mame/machine/namco62.c
@@ -94,6 +94,7 @@ static const char DEVTEMPLATE_SOURCE[] = __FILE__;
 #define DEVTEMPLATE_ID(p,s)		p##namco_62xx##s
 #define DEVTEMPLATE_FEATURES	DT_HAS_START | DT_HAS_ROM_REGION | DT_HAS_MACHINE_CONFIG
 #define DEVTEMPLATE_NAME		"Namco 62xx"
+#define DEVTEMPLATE_SHORTNAME   "namco62"
 #define DEVTEMPLATE_FAMILY		"Namco I/O"
 #include "devtempl.h"
 
diff --git a/src/mame/video/gp9001.c b/src/mame/video/gp9001.c
index e0ca2fcd9a8..2be3e6f6b9e 100644
--- a/src/mame/video/gp9001.c
+++ b/src/mame/video/gp9001.c
@@ -212,7 +212,7 @@ ADDRESS_MAP_END
 
 
 gp9001vdp_device_config::gp9001vdp_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
-	: device_config(mconfig, static_alloc_device_config, "gp9001vdp_", tag, owner, clock),
+	: device_config(mconfig, static_alloc_device_config, "gp9001vdp_", "gp9001", tag, owner, clock),
 	  device_config_memory_interface(mconfig, *this),
 	  m_space_config("gp9001vdp", ENDIANNESS_BIG, 16,14, 0, NULL, *ADDRESS_MAP_NAME(gp9001vdp_map))
 {