diff --git a/src/emu/device.h b/src/emu/device.h
index 5d2c6bba26f..59009287eaa 100644
--- a/src/emu/device.h
+++ b/src/emu/device.h
@@ -145,7 +145,7 @@ class device_t : public delegate_late_bind
 
 protected:
 	// construction/destruction
-	device_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,const char *shortname = "", const char *source = __FILE__);
+	device_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 	virtual ~device_t();
 
 public:
diff --git a/src/emu/diserial.c b/src/emu/diserial.c
index 95e8c43ebd8..d404e46b0e3 100644
--- a/src/emu/diserial.c
+++ b/src/emu/diserial.c
@@ -449,7 +449,7 @@ const device_type SERIAL_SOURCE = &device_creator<serial_source_device>;
 //-------------------------------------------------
 
 serial_source_device::serial_source_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, SERIAL_SOURCE, "Serial source", tag, owner, clock),
+	: device_t(mconfig, SERIAL_SOURCE, "Serial source", tag, owner, clock, "serial_source", __FILE__),
 		device_serial_interface(mconfig, *this)
 {
 }
diff --git a/src/emu/imagedev/bitbngr.c b/src/emu/imagedev/bitbngr.c
index 1d509a9dda4..9a7e8242c5d 100644
--- a/src/emu/imagedev/bitbngr.c
+++ b/src/emu/imagedev/bitbngr.c
@@ -22,7 +22,7 @@ const device_type BITBANGER = &device_creator<bitbanger_device>;
 -------------------------------------------------*/
 
 bitbanger_device::bitbanger_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, BITBANGER, "Bitbanger", tag, owner, clock),
+	: device_t(mconfig, BITBANGER, "Bitbanger", tag, owner, clock, "bitbanger", __FILE__),
 		device_image_interface(mconfig, *this)
 {
 	m_output_timer = NULL;
diff --git a/src/emu/imagedev/cartslot.c b/src/emu/imagedev/cartslot.c
index 8f096d72c80..51daf166adb 100644
--- a/src/emu/imagedev/cartslot.c
+++ b/src/emu/imagedev/cartslot.c
@@ -19,7 +19,7 @@ const device_type CARTSLOT = &device_creator<cartslot_image_device>;
 //-------------------------------------------------
 
 cartslot_image_device::cartslot_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, CARTSLOT, "Cartslot", tag, owner, clock),
+	: device_t(mconfig, CARTSLOT, "Cartslot", tag, owner, clock, "cartslot_image", __FILE__),
 		device_image_interface(mconfig, *this),
 		m_extensions("bin"),
 		m_interface(NULL),
diff --git a/src/emu/imagedev/cassette.c b/src/emu/imagedev/cassette.c
index 03b7527a72b..4b075a7718f 100644
--- a/src/emu/imagedev/cassette.c
+++ b/src/emu/imagedev/cassette.c
@@ -37,7 +37,7 @@ const device_type CASSETTE = &device_creator<cassette_image_device>;
 //-------------------------------------------------
 
 cassette_image_device::cassette_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, CASSETTE, "Cassette", tag, owner, clock),
+	: device_t(mconfig, CASSETTE, "Cassette", tag, owner, clock, "cassette_image", __FILE__),
 		device_image_interface(mconfig, *this)
 {
 }
diff --git a/src/emu/imagedev/chd_cd.c b/src/emu/imagedev/chd_cd.c
index 7570430261c..31b29aa1865 100644
--- a/src/emu/imagedev/chd_cd.c
+++ b/src/emu/imagedev/chd_cd.c
@@ -25,13 +25,13 @@ const device_type CDROM = &device_creator<cdrom_image_device>;
 //-------------------------------------------------
 
 cdrom_image_device::cdrom_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, CDROM, "Cdrom", tag, owner, clock),
+	: device_t(mconfig, CDROM, "Cdrom", tag, owner, clock, "cdrom_image", __FILE__),
 		device_image_interface(mconfig, *this)
 {
 }
 
 cdrom_image_device::cdrom_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
-	: device_t(mconfig, type, name,  tag, owner, clock),
+	: device_t(mconfig, type, name,  tag, owner, clock, shortname, source),
 		device_image_interface(mconfig, *this)
 {
 }
diff --git a/src/emu/imagedev/flopdrv.c b/src/emu/imagedev/flopdrv.c
index d7c7499d8e3..c9c97cf5ddc 100644
--- a/src/emu/imagedev/flopdrv.c
+++ b/src/emu/imagedev/flopdrv.c
@@ -848,7 +848,7 @@ const device_type LEGACY_FLOPPY = &device_creator<legacy_floppy_image_device>;
 //-------------------------------------------------
 
 legacy_floppy_image_device::legacy_floppy_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, LEGACY_FLOPPY, "Floppy Disk", tag, owner, clock),
+	: device_t(mconfig, LEGACY_FLOPPY, "Floppy Disk", tag, owner, clock, "legacy_floppy_image", __FILE__),
 		device_image_interface(mconfig, *this),
 		m_token(NULL)
 {
diff --git a/src/emu/imagedev/floppy.c b/src/emu/imagedev/floppy.c
index 9ced42d72a6..18423beb5f0 100644
--- a/src/emu/imagedev/floppy.c
+++ b/src/emu/imagedev/floppy.c
@@ -45,7 +45,7 @@ const floppy_format_type floppy_image_device::default_floppy_formats[] = {
 };
 
 floppy_connector::floppy_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-	device_t(mconfig, FLOPPY_CONNECTOR, "Floppy drive connector abstraction", tag, owner, clock),
+	device_t(mconfig, FLOPPY_CONNECTOR, "Floppy drive connector abstraction", tag, owner, clock, "floppy_connector", __FILE__),
 	device_slot_interface(mconfig, *this)
 {
 }
diff --git a/src/emu/imagedev/harddriv.c b/src/emu/imagedev/harddriv.c
index 9c11cba4fc5..f65be26142c 100644
--- a/src/emu/imagedev/harddriv.c
+++ b/src/emu/imagedev/harddriv.c
@@ -37,7 +37,7 @@ const device_type HARDDISK = &device_creator<harddisk_image_device>;
 //-------------------------------------------------
 
 harddisk_image_device::harddisk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, HARDDISK, "Harddisk", tag, owner, clock),
+	: device_t(mconfig, HARDDISK, "Harddisk", tag, owner, clock, "harddisk_image", __FILE__),
 		device_image_interface(mconfig, *this),
 		m_chd(NULL),
 		m_hard_disk_handle(NULL)
diff --git a/src/emu/imagedev/midiin.c b/src/emu/imagedev/midiin.c
index 75dfd047cdd..182fc148cf5 100644
--- a/src/emu/imagedev/midiin.c
+++ b/src/emu/imagedev/midiin.c
@@ -20,7 +20,7 @@ const device_type MIDIIN = &device_creator<midiin_device>;
 -------------------------------------------------*/
 
 midiin_device::midiin_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MIDIIN, "MIDI In image device", tag, owner, clock),
+	: device_t(mconfig, MIDIIN, "MIDI In image device", tag, owner, clock, "midiin", __FILE__),
 		device_image_interface(mconfig, *this),
 			device_serial_interface(mconfig, *this)
 {
diff --git a/src/emu/imagedev/midiout.c b/src/emu/imagedev/midiout.c
index c0de35d906d..f7d7afaabb0 100644
--- a/src/emu/imagedev/midiout.c
+++ b/src/emu/imagedev/midiout.c
@@ -20,7 +20,7 @@ const device_type MIDIOUT = &device_creator<midiout_device>;
 -------------------------------------------------*/
 
 midiout_device::midiout_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MIDIOUT, "MIDI Out image device", tag, owner, clock),
+	: device_t(mconfig, MIDIOUT, "MIDI Out image device", tag, owner, clock, "midiout", __FILE__),
 	device_image_interface(mconfig, *this),
 		device_serial_interface(mconfig, *this)
 {
diff --git a/src/emu/imagedev/printer.c b/src/emu/imagedev/printer.c
index c062f125887..cbfdd2da93c 100644
--- a/src/emu/imagedev/printer.c
+++ b/src/emu/imagedev/printer.c
@@ -18,7 +18,7 @@ const device_type PRINTER = &device_creator<printer_image_device>;
 //-------------------------------------------------
 
 printer_image_device::printer_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, PRINTER, "Printer", tag, owner, clock),
+	: device_t(mconfig, PRINTER, "Printer", tag, owner, clock, "printer_image", __FILE__),
 		device_image_interface(mconfig, *this)
 {
 }
diff --git a/src/emu/imagedev/serial.c b/src/emu/imagedev/serial.c
index a325520c9f0..cfe2ffa4cf3 100644
--- a/src/emu/imagedev/serial.c
+++ b/src/emu/imagedev/serial.c
@@ -18,7 +18,7 @@ const device_type SERIAL = &device_creator<serial_image_device>;
 //-------------------------------------------------
 
 serial_image_device::serial_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, SERIAL, "Serial", tag, owner, clock),
+	: device_t(mconfig, SERIAL, "Serial", tag, owner, clock, "serial_image", __FILE__),
 		device_serial_interface(mconfig, *this),
 		device_image_interface(mconfig, *this)
 {
diff --git a/src/emu/imagedev/snapquik.c b/src/emu/imagedev/snapquik.c
index 5ffdf691218..8e7cdaca97c 100644
--- a/src/emu/imagedev/snapquik.c
+++ b/src/emu/imagedev/snapquik.c
@@ -17,7 +17,7 @@ const device_type SNAPSHOT = &device_creator<snapshot_image_device>;
 //-------------------------------------------------
 
 snapshot_image_device::snapshot_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, SNAPSHOT, "Snapshot", tag, owner, clock),
+	: device_t(mconfig, SNAPSHOT, "Snapshot", tag, owner, clock, "snapshot_image", __FILE__),
 		device_image_interface(mconfig, *this),
 		m_interface(NULL),
 		m_delay_attoseconds(0)
diff --git a/src/emu/machine/53c810.c b/src/emu/machine/53c810.c
index 4a30126f7df..261130e3233 100644
--- a/src/emu/machine/53c810.c
+++ b/src/emu/machine/53c810.c
@@ -619,7 +619,7 @@ void lsi53c810_device::add_opcode(UINT8 op, UINT8 mask, opcode_handler_delegate
 }
 
 lsi53c810_device::lsi53c810_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, LSI53C810, "53C810 SCSI", tag, owner, clock)
+	: device_t(mconfig, LSI53C810, "53C810 SCSI", tag, owner, clock, "lsi53c810", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/6522via.c b/src/emu/machine/6522via.c
index d21efd8d6ce..f20224acce5 100644
--- a/src/emu/machine/6522via.c
+++ b/src/emu/machine/6522via.c
@@ -147,7 +147,7 @@ const device_type VIA6522 = &device_creator<via6522_device>;
 //-------------------------------------------------
 
 via6522_device::via6522_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, VIA6522, "6522 VIA", tag, owner, clock),
+	: device_t(mconfig, VIA6522, "6522 VIA", tag, owner, clock, "via6522", __FILE__),
 		m_irq(CLEAR_LINE)
 {
 }
diff --git a/src/emu/machine/6525tpi.c b/src/emu/machine/6525tpi.c
index 725c5dfc921..3c828e3a378 100644
--- a/src/emu/machine/6525tpi.c
+++ b/src/emu/machine/6525tpi.c
@@ -619,7 +619,7 @@ UINT8 tpi6525_get_ddr_c(device_t *device)
 const device_type TPI6525 = &device_creator<tpi6525_device>;
 
 tpi6525_device::tpi6525_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, TPI6525, "6525 TPI", tag, owner, clock)
+	: device_t(mconfig, TPI6525, "6525 TPI", tag, owner, clock, "tpi6525", __FILE__)
 {
 	m_token = global_alloc_clear(tpi6525_state);
 }
diff --git a/src/emu/machine/6526cia.c b/src/emu/machine/6526cia.c
index d77e008105c..60e5c2a9b69 100644
--- a/src/emu/machine/6526cia.c
+++ b/src/emu/machine/6526cia.c
@@ -76,22 +76,22 @@ inline attotime legacy_mos6526_device::cycles_to_time(int c)
 //  legacy_mos6526_device - constructor
 //-------------------------------------------------
 
-legacy_mos6526_device::legacy_mos6526_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, type, name, tag, owner, clock)
+legacy_mos6526_device::legacy_mos6526_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+	: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
 {
 }
 
 legacy_mos6526r1_device::legacy_mos6526r1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: legacy_mos6526_device(mconfig, LEGACY_MOS6526R1, "MOS6526r1", tag, owner, clock) { }
+	: legacy_mos6526_device(mconfig, LEGACY_MOS6526R1, "MOS6526r1", tag, owner, clock, "legacy_mos6526r1", __FILE__) { }
 
 legacy_mos6526r2_device::legacy_mos6526r2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: legacy_mos6526_device(mconfig, LEGACY_MOS6526R2, "MOS6526r2", tag, owner, clock) { }
+	: legacy_mos6526_device(mconfig, LEGACY_MOS6526R2, "MOS6526r2", tag, owner, clock, "legacy_mos6526r2", __FILE__) { }
 
 legacy_mos8520_device::legacy_mos8520_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: legacy_mos6526_device(mconfig, LEGACY_MOS8520, "LEGACY_MOS8520", tag, owner, clock) { }
+	: legacy_mos6526_device(mconfig, LEGACY_MOS8520, "LEGACY_MOS8520", tag, owner, clock, "legacy_mos8520", __FILE__) { }
 
 legacy_mos5710_device::legacy_mos5710_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: legacy_mos6526_device(mconfig, LEGACY_MOS5710, "LEGACY_MOS5710", tag, owner, clock) { }
+	: legacy_mos6526_device(mconfig, LEGACY_MOS5710, "LEGACY_MOS5710", tag, owner, clock, "legacy_mos5710", __FILE__) { }
 
 
 void legacy_mos6526_device::static_set_tod_clock(device_t &device, int tod_clock)
diff --git a/src/emu/machine/6526cia.h b/src/emu/machine/6526cia.h
index 0f8e953cee7..ae7a072a9f1 100644
--- a/src/emu/machine/6526cia.h
+++ b/src/emu/machine/6526cia.h
@@ -102,7 +102,7 @@ class legacy_mos6526_device :  public device_t,
 {
 protected:
 	// construction/destruction
-	legacy_mos6526_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	legacy_mos6526_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 
 public:
 	// inline configuration
diff --git a/src/emu/machine/6532riot.c b/src/emu/machine/6532riot.c
index 0bc9e1c76bb..ed868bcbe80 100644
--- a/src/emu/machine/6532riot.c
+++ b/src/emu/machine/6532riot.c
@@ -397,7 +397,7 @@ UINT8 riot6532_device::portb_out_get()
 //-------------------------------------------------
 
 riot6532_device::riot6532_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, RIOT6532, "6532 (RIOT)", tag, owner, clock),
+	: device_t(mconfig, RIOT6532, "6532 (RIOT)", tag, owner, clock, "riot6532", __FILE__),
 		m_irq(CLEAR_LINE)
 {
 }
diff --git a/src/emu/machine/6821pia.c b/src/emu/machine/6821pia.c
index 8f5fb271c82..e2eca6d1cd0 100644
--- a/src/emu/machine/6821pia.c
+++ b/src/emu/machine/6821pia.c
@@ -48,7 +48,7 @@ const device_type PIA6821 = &device_creator<pia6821_device>;
 //-------------------------------------------------
 
 pia6821_device::pia6821_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, PIA6821, "6822 PIA", tag, owner, clock),
+	: device_t(mconfig, PIA6821, "6822 PIA", tag, owner, clock, "pia6821", __FILE__),
 	m_irq_a_state(0),
 	m_in_cb1(0),
 	m_ctl_b(0),
diff --git a/src/emu/machine/6840ptm.c b/src/emu/machine/6840ptm.c
index ecd6815bf17..1f26472fb3d 100644
--- a/src/emu/machine/6840ptm.c
+++ b/src/emu/machine/6840ptm.c
@@ -68,7 +68,7 @@ const device_type PTM6840 = &device_creator<ptm6840_device>;
 //-------------------------------------------------
 
 ptm6840_device::ptm6840_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, PTM6840, "6840 PTM", tag, owner, clock)
+	: device_t(mconfig, PTM6840, "6840 PTM", tag, owner, clock, "ptm6840", __FILE__)
 {
 	memset(static_cast<ptm6840_interface *>(this), 0, sizeof(ptm6840_interface));
 }
diff --git a/src/emu/machine/6850acia.c b/src/emu/machine/6850acia.c
index 4b3fc1ceca9..0e9b2641311 100644
--- a/src/emu/machine/6850acia.c
+++ b/src/emu/machine/6850acia.c
@@ -59,7 +59,7 @@ const device_type ACIA6850 = &device_creator<acia6850_device>;
 //-------------------------------------------------
 
 acia6850_device::acia6850_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, ACIA6850, "6850 ACIA", tag, owner, clock)
+	: device_t(mconfig, ACIA6850, "6850 ACIA", tag, owner, clock, "acia6850", __FILE__)
 {
 	memset(static_cast<acia6850_interface *>(this), 0, sizeof(acia6850_interface));
 }
diff --git a/src/emu/machine/68681.c b/src/emu/machine/68681.c
index e6a12ea038d..9792461da68 100644
--- a/src/emu/machine/68681.c
+++ b/src/emu/machine/68681.c
@@ -906,7 +906,7 @@ static DEVICE_RESET(duart68681)
 const device_type DUART68681 = &device_creator<duart68681_device>;
 
 duart68681_device::duart68681_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, DUART68681, "DUART 68681", tag, owner, clock)
+	: device_t(mconfig, DUART68681, "DUART 68681", tag, owner, clock, "duart68681", __FILE__)
 {
 	m_token = global_alloc_clear(duart68681_state);
 }
diff --git a/src/emu/machine/7200fifo.c b/src/emu/machine/7200fifo.c
index 6913479d4fc..692b5ec3a34 100644
--- a/src/emu/machine/7200fifo.c
+++ b/src/emu/machine/7200fifo.c
@@ -20,7 +20,7 @@ const device_type FIFO7200 = &device_creator<fifo7200_device>;
 //-------------------------------------------------
 
 fifo7200_device::fifo7200_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, FIFO7200, "IDT7200 FIFO", tag, owner, clock),
+	: device_t(mconfig, FIFO7200, "IDT7200 FIFO", tag, owner, clock, "fifo7200", __FILE__),
 		m_ram_size(0),
 		m_ef_handler(*this),
 		m_ff_handler(*this),
diff --git a/src/emu/machine/74123.c b/src/emu/machine/74123.c
index ca822a34464..2f4f2eac5bb 100644
--- a/src/emu/machine/74123.c
+++ b/src/emu/machine/74123.c
@@ -27,7 +27,7 @@ const device_type TTL74123 = &device_creator<ttl74123_device>;
 //-------------------------------------------------
 
 ttl74123_device::ttl74123_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, TTL74123, "TTL74123", tag, owner, clock)
+	: device_t(mconfig, TTL74123, "TTL74123", tag, owner, clock, "ttl74123", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/74145.c b/src/emu/machine/74145.c
index eb3457a7cd8..71bb14eaa2b 100644
--- a/src/emu/machine/74145.c
+++ b/src/emu/machine/74145.c
@@ -75,7 +75,7 @@ const device_type TTL74145 = &device_creator<ttl74145_device>;
 //-------------------------------------------------
 
 ttl74145_device::ttl74145_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, TTL74145, "TTL74145", tag, owner, clock)
+	: device_t(mconfig, TTL74145, "TTL74145", tag, owner, clock, "ttl74145", __FILE__)
 	, m_number(0)
 {
 }
diff --git a/src/emu/machine/74148.c b/src/emu/machine/74148.c
index 00d5f710254..ab6a8e8a265 100644
--- a/src/emu/machine/74148.c
+++ b/src/emu/machine/74148.c
@@ -216,7 +216,7 @@ static DEVICE_RESET( ttl74148 )
 const device_type TTL74148 = &device_creator<ttl74148_device>;
 
 ttl74148_device::ttl74148_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, TTL74148, "74148", tag, owner, clock)
+	: device_t(mconfig, TTL74148, "74148", tag, owner, clock, "74148", __FILE__)
 {
 	m_token = global_alloc_clear(ttl74148_state);
 }
diff --git a/src/emu/machine/74153.c b/src/emu/machine/74153.c
index 09f45e28e31..69e5e37df23 100644
--- a/src/emu/machine/74153.c
+++ b/src/emu/machine/74153.c
@@ -178,7 +178,7 @@ static DEVICE_RESET( ttl74153 )
 const device_type TTL74153 = &device_creator<ttl74153_device>;
 
 ttl74153_device::ttl74153_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, TTL74153, "74153", tag, owner, clock)
+	: device_t(mconfig, TTL74153, "74153", tag, owner, clock, "74153", __FILE__)
 {
 	m_token = global_alloc_clear(ttl74153_state);
 }
diff --git a/src/emu/machine/7474.c b/src/emu/machine/7474.c
index 180dd2c6b79..ced313d42b7 100644
--- a/src/emu/machine/7474.c
+++ b/src/emu/machine/7474.c
@@ -54,7 +54,7 @@ const device_type MACHINE_TTL7474 = &device_creator<ttl7474_device>;
 //-------------------------------------------------
 
 ttl7474_device::ttl7474_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MACHINE_TTL7474, "7474", tag, owner, clock),
+	: device_t(mconfig, MACHINE_TTL7474, "7474", tag, owner, clock, "7474", __FILE__),
 		m_output_func(*this),
 		m_comp_output_func(*this)
 {
diff --git a/src/emu/machine/8257dma.c b/src/emu/machine/8257dma.c
index f777d3096e0..916a5ffa1c9 100644
--- a/src/emu/machine/8257dma.c
+++ b/src/emu/machine/8257dma.c
@@ -57,7 +57,7 @@ const device_type I8257 = &device_creator<i8257_device>;
 //-------------------------------------------------
 
 i8257_device::i8257_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, I8257, "DMA8257", tag, owner, clock),
+	: device_t(mconfig, I8257, "DMA8257", tag, owner, clock, "i8257", __FILE__),
 		m_mode(0),
 		m_rr(0),
 		m_msb(0),
diff --git a/src/emu/machine/aakart.c b/src/emu/machine/aakart.c
index 945b3b716be..316fdd328e6 100644
--- a/src/emu/machine/aakart.c
+++ b/src/emu/machine/aakart.c
@@ -38,7 +38,7 @@ const device_type AAKART = &device_creator<aakart_device>;
 //-------------------------------------------------
 
 aakart_device::aakart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, AAKART, "aakart", tag, owner, clock)
+	: device_t(mconfig, AAKART, "aakart", tag, owner, clock, "aakart", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/adc0808.c b/src/emu/machine/adc0808.c
index 086d7c3352c..729955ec49e 100644
--- a/src/emu/machine/adc0808.c
+++ b/src/emu/machine/adc0808.c
@@ -25,7 +25,7 @@ const device_type ADC0808 = &device_creator<adc0808_device>;
 //-------------------------------------------------
 
 adc0808_device::adc0808_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, ADC0808, "ADC0808", tag, owner, clock),
+	: device_t(mconfig, ADC0808, "ADC0808", tag, owner, clock, "adc0808", __FILE__),
 		m_address(0),
 		m_start(0),
 		m_eoc(0),
diff --git a/src/emu/machine/adc083x.c b/src/emu/machine/adc083x.c
index b123a8bcfe6..55f7ec5134c 100644
--- a/src/emu/machine/adc083x.c
+++ b/src/emu/machine/adc083x.c
@@ -49,8 +49,8 @@ const device_type ADC0832 = &device_creator<adc0832_device>;
 const device_type ADC0834 = &device_creator<adc0834_device>;
 const device_type ADC0838 = &device_creator<adc0838_device>;
 
-adc083x_device::adc083x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, type, name, tag, owner, clock),
+adc083x_device::adc083x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+	: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
 	m_cs(0),
 	m_clk(0),
 	m_di(0),
@@ -67,25 +67,25 @@ adc083x_device::adc083x_device(const machine_config &mconfig, device_type type,
 }
 
 adc0831_device::adc0831_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: adc083x_device(mconfig, ADC0831, "A/D Converters 0831", tag, owner, clock)
+	: adc083x_device(mconfig, ADC0831, "A/D Converters 0831", tag, owner, clock, "adc0831", __FILE__)
 {
 	m_mux_bits = 0;
 }
 
 adc0832_device::adc0832_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: adc083x_device(mconfig, ADC0832, "A/D Converters 0832", tag, owner, clock)
+	: adc083x_device(mconfig, ADC0832, "A/D Converters 0832", tag, owner, clock, "adc0832", __FILE__)
 {
 	m_mux_bits = 2;
 }
 
 adc0834_device::adc0834_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: adc083x_device(mconfig, ADC0834, "A/D Converters 0834", tag, owner, clock)
+	: adc083x_device(mconfig, ADC0834, "A/D Converters 0834", tag, owner, clock, "adc0834", __FILE__)
 {
 	m_mux_bits = 3;
 }
 
 adc0838_device::adc0838_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: adc083x_device(mconfig, ADC0838, "A/D Converters 0838", tag, owner, clock)
+	: adc083x_device(mconfig, ADC0838, "A/D Converters 0838", tag, owner, clock, "adc0838", __FILE__)
 {
 	m_mux_bits = 4;
 }
diff --git a/src/emu/machine/adc083x.h b/src/emu/machine/adc083x.h
index 6b08960da8a..976c2ec4585 100644
--- a/src/emu/machine/adc083x.h
+++ b/src/emu/machine/adc083x.h
@@ -43,7 +43,7 @@ typedef double (*adc083x_input_callback)(device_t *device, UINT8 input);
 class adc083x_device : public device_t
 {
 public:
-	adc083x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	adc083x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 
 	// static configuration helpers
 	static void set_input_callback(device_t &device, adc083x_input_callback input_callback) { downcast<adc083x_device &>(device).m_input_callback = input_callback; }
diff --git a/src/emu/machine/adc1038.c b/src/emu/machine/adc1038.c
index d40614343d3..d82bc24f89d 100644
--- a/src/emu/machine/adc1038.c
+++ b/src/emu/machine/adc1038.c
@@ -14,7 +14,7 @@
 const device_type ADC1038 = &device_creator<adc1038_device>;
 
 adc1038_device::adc1038_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, ADC1038, "A/D Converters 1038", tag, owner, clock)
+	: device_t(mconfig, ADC1038, "A/D Converters 1038", tag, owner, clock, "adc1038", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/adc1213x.c b/src/emu/machine/adc1213x.c
index c14c64732d3..b5fb188983b 100644
--- a/src/emu/machine/adc1213x.c
+++ b/src/emu/machine/adc1213x.c
@@ -35,7 +35,7 @@
 const device_type ADC12130 = &device_creator<adc12130_device>;
 
 adc12130_device::adc12130_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: adc12138_device(mconfig, ADC12130, "A/D Converter 12130", tag, owner, clock)
+	: adc12138_device(mconfig, ADC12130, "A/D Converter 12130", tag, owner, clock, "adc12130", __FILE__)
 {
 }
 
@@ -43,7 +43,7 @@ adc12130_device::adc12130_device(const machine_config &mconfig, const char *tag,
 const device_type ADC12132 = &device_creator<adc12132_device>;
 
 adc12132_device::adc12132_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: adc12138_device(mconfig, ADC12132, "A/D Converter 12132", tag, owner, clock)
+	: adc12138_device(mconfig, ADC12132, "A/D Converter 12132", tag, owner, clock, "adc12132", __FILE__)
 {
 }
 
@@ -51,11 +51,11 @@ adc12132_device::adc12132_device(const machine_config &mconfig, const char *tag,
 const device_type ADC12138 = &device_creator<adc12138_device>;
 
 adc12138_device::adc12138_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, ADC12138, "A/D Converter 12138", tag, owner, clock)
+	: device_t(mconfig, ADC12138, "A/D Converter 12138", tag, owner, clock, "adc12138", __FILE__)
 {
 }
-adc12138_device::adc12138_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, type, name, tag, owner, clock)
+adc12138_device::adc12138_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+	: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
 {
 }
 
diff --git a/src/emu/machine/adc1213x.h b/src/emu/machine/adc1213x.h
index 20616c9c550..de5aa0a87da 100644
--- a/src/emu/machine/adc1213x.h
+++ b/src/emu/machine/adc1213x.h
@@ -31,7 +31,7 @@ class adc12138_device : public device_t,
 {
 public:
 	adc12138_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	adc12138_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	adc12138_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 	~adc12138_device() {}
 
 	DECLARE_WRITE8_MEMBER( di_w );
diff --git a/src/emu/machine/am53cf96.c b/src/emu/machine/am53cf96.c
index ba998405671..3360f445917 100644
--- a/src/emu/machine/am53cf96.c
+++ b/src/emu/machine/am53cf96.c
@@ -158,7 +158,7 @@ WRITE8_MEMBER( am53cf96_device::write )
 }
 
 am53cf96_device::am53cf96_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-	device_t(mconfig, AM53CF96, "53CF96 SCSI", tag, owner, clock),
+	device_t(mconfig, AM53CF96, "53CF96 SCSI", tag, owner, clock, "am53cf96", __FILE__),
 	m_irq_handler(*this)
 {
 }
diff --git a/src/emu/machine/am9517a.c b/src/emu/machine/am9517a.c
index a2cde90c11d..41af3446d90 100644
--- a/src/emu/machine/am9517a.c
+++ b/src/emu/machine/am9517a.c
@@ -372,7 +372,7 @@ inline void am9517a_device::end_of_process()
 //-------------------------------------------------
 
 am9517a_device::am9517a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, AM9517A, "AM9517A", tag, owner, clock),
+	: device_t(mconfig, AM9517A, "AM9517A", tag, owner, clock, "am9517a", __FILE__),
 		device_execute_interface(mconfig, *this),
 		m_icount(0),
 		m_hack(0),
diff --git a/src/emu/machine/amigafdc.c b/src/emu/machine/amigafdc.c
index 6fa02409312..cdd03fc2e4d 100644
--- a/src/emu/machine/amigafdc.c
+++ b/src/emu/machine/amigafdc.c
@@ -51,7 +51,7 @@ FLOPPY_FORMATS_MEMBER( amiga_fdc::floppy_formats )
 FLOPPY_FORMATS_END
 
 amiga_fdc::amiga_fdc(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-	device_t(mconfig, AMIGA_FDC, "Amiga FDC", tag, owner, clock)
+	device_t(mconfig, AMIGA_FDC, "Amiga FDC", tag, owner, clock, "amiga_fdc", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/at28c16.c b/src/emu/machine/at28c16.c
index 9a64b6cdd22..2b9d0b6d985 100644
--- a/src/emu/machine/at28c16.c
+++ b/src/emu/machine/at28c16.c
@@ -38,7 +38,7 @@ const device_type AT28C16 = &device_creator<at28c16_device>;
 //-------------------------------------------------
 
 at28c16_device::at28c16_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
-	: device_t(mconfig, AT28C16, "AT28C16", tag, owner, clock),
+	: device_t(mconfig, AT28C16, "AT28C16", tag, owner, clock, "at28c16", __FILE__),
 		device_memory_interface(mconfig, *this),
 		device_nvram_interface(mconfig, *this),
 		m_a9_12v( 0 ),
diff --git a/src/emu/machine/at29040a.c b/src/emu/machine/at29040a.c
index 95982e67bf0..824d138c515 100644
--- a/src/emu/machine/at29040a.c
+++ b/src/emu/machine/at29040a.c
@@ -33,7 +33,7 @@
     Constructor.
 */
 at29040a_device::at29040a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: device_t(mconfig, AT29040A, "ATMEL 29040A 512K*8 FEEPROM", tag, owner, clock),
+: device_t(mconfig, AT29040A, "ATMEL 29040A 512K*8 FEEPROM", tag, owner, clock, "at29040a", __FILE__),
 	device_nvram_interface(mconfig, *this)
 {
 }
diff --git a/src/emu/machine/at45dbxx.c b/src/emu/machine/at45dbxx.c
index 672d0a7c97f..fea7b59fc69 100644
--- a/src/emu/machine/at45dbxx.c
+++ b/src/emu/machine/at45dbxx.c
@@ -44,27 +44,27 @@ const device_type AT45DB161 = &device_creator<at45db161_device>;
 //-------------------------------------------------
 
 at45db041_device::at45db041_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, AT45DB041, "AT45DB041", tag, owner, clock),
+	: device_t(mconfig, AT45DB041, "AT45DB041", tag, owner, clock, "at45db041", __FILE__),
 	device_nvram_interface(mconfig, *this)
 {
 }
 
 
-at45db041_device::at45db041_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, type, name, tag, owner, clock),
+at45db041_device::at45db041_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+	: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
 	device_nvram_interface(mconfig, *this)
 {
 }
 
 
 at45db081_device::at45db081_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: at45db041_device(mconfig, AT45DB081, "AT45DB081", tag, owner, clock)
+	: at45db041_device(mconfig, AT45DB081, "AT45DB081", tag, owner, clock, "at45db081", __FILE__)
 {
 }
 
 
 at45db161_device::at45db161_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: at45db041_device(mconfig, AT45DB161, "AT45DB161", tag, owner, clock)
+	: at45db041_device(mconfig, AT45DB161, "AT45DB161", tag, owner, clock, "at45db161", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/at45dbxx.h b/src/emu/machine/at45dbxx.h
index 76c8843acb4..9568068a9a6 100644
--- a/src/emu/machine/at45dbxx.h
+++ b/src/emu/machine/at45dbxx.h
@@ -37,7 +37,7 @@ class at45db041_device : public device_t,
 {
 public:
 	at45db041_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	at45db041_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	at45db041_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 
 	DECLARE_WRITE_LINE_MEMBER(cs_w);
 	DECLARE_WRITE_LINE_MEMBER(sck_w);
diff --git a/src/emu/machine/ataintf.c b/src/emu/machine/ataintf.c
index 7d41cd81e5c..d82d5c850a0 100644
--- a/src/emu/machine/ataintf.c
+++ b/src/emu/machine/ataintf.c
@@ -155,8 +155,8 @@ SLOT_INTERFACE_START(ata_devices)
 	SLOT_INTERFACE("hdd", IDE_HARDDISK)
 SLOT_INTERFACE_END
 
-ata_interface_device::ata_interface_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
-	device_t(mconfig, type, name, tag, owner, clock),
+ata_interface_device::ata_interface_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+	device_t(mconfig, type, name, tag, owner, clock, shortname, source),
 	m_irq_handler(*this),
 	m_dmarq_handler(*this)
 {
@@ -166,7 +166,7 @@ ata_interface_device::ata_interface_device(const machine_config &mconfig, device
 const device_type ATA_INTERFACE = &device_creator<ata_interface_device>;
 
 ata_interface_device::ata_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-	device_t(mconfig, ATA_INTERFACE, "ATA Interface", tag, owner, clock),
+	device_t(mconfig, ATA_INTERFACE, "ATA Interface", tag, owner, clock, "ata_interface", __FILE__),
 	m_irq_handler(*this),
 	m_dmarq_handler(*this)
 {
@@ -233,7 +233,7 @@ const device_type ATA_SLOT = &device_creator<ata_slot_device>;
 //-------------------------------------------------
 
 ata_slot_device::ata_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, ATA_SLOT, "ATA Connector", tag, owner, clock),
+	: device_t(mconfig, ATA_SLOT, "ATA Connector", tag, owner, clock, "ata_slot", __FILE__),
 		device_slot_interface(mconfig, *this),
 		m_dev(NULL)
 {
diff --git a/src/emu/machine/ataintf.h b/src/emu/machine/ataintf.h
index db17e736eed..369933e0029 100644
--- a/src/emu/machine/ataintf.h
+++ b/src/emu/machine/ataintf.h
@@ -77,7 +77,7 @@ class ata_interface_device : public device_t
 {
 public:
 	ata_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	ata_interface_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	ata_interface_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 
 	// static configuration helpers
 	template<class _Object> static devcb2_base &set_irq_handler(device_t &device, _Object object) { return downcast<ata_interface_device &>(device).m_irq_handler.set_callback(object); }
diff --git a/src/emu/machine/ay31015.c b/src/emu/machine/ay31015.c
index 037e9381609..ae5954c1cd0 100644
--- a/src/emu/machine/ay31015.c
+++ b/src/emu/machine/ay31015.c
@@ -95,18 +95,18 @@ Start bit (low), Bit 0, Bit 1... highest bit, Parity bit (if enabled), 1-2 stop
 const device_type AY31015 = &device_creator<ay31015_device>;
 const device_type AY51013 = &device_creator<ay51013_device>;
 
-ay31015_device::ay31015_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
-				: device_t(mconfig, type, name, tag, owner, clock)
+ay31015_device::ay31015_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+				: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
 {
 }
 
 ay31015_device::ay31015_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-				: device_t(mconfig, AY31015, "AY-3-1015", tag, owner, clock)
+				: device_t(mconfig, AY31015, "AY-3-1015", tag, owner, clock, "ay31015", __FILE__)
 {
 }
 
 ay51013_device::ay51013_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-				: ay31015_device(mconfig, AY31015, "AY-5-1013", tag, owner, clock)
+				: ay31015_device(mconfig, AY31015, "AY-5-1013", tag, owner, clock, "ay51013", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/ay31015.h b/src/emu/machine/ay31015.h
index b82c7dd124e..c98d0d9c9fa 100644
--- a/src/emu/machine/ay31015.h
+++ b/src/emu/machine/ay31015.h
@@ -71,7 +71,7 @@ class ay31015_device : public device_t,
 {
 public:
 	ay31015_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	ay31015_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	ay31015_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 	~ay31015_device() {}
 
 
diff --git a/src/emu/machine/bankdev.c b/src/emu/machine/bankdev.c
index ec8a4b29a33..c173fb0fd40 100644
--- a/src/emu/machine/bankdev.c
+++ b/src/emu/machine/bankdev.c
@@ -4,7 +4,7 @@
 const device_type ADDRESS_MAP_BANK = &device_creator<address_map_bank_device>;
 
 address_map_bank_device::address_map_bank_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
-	: device_t(mconfig, ADDRESS_MAP_BANK, "Address Map Bank", tag, owner, clock),
+	: device_t(mconfig, ADDRESS_MAP_BANK, "Address Map Bank", tag, owner, clock, "address_map_bank", __FILE__),
 		device_memory_interface(mconfig, *this),
 		m_endianness(ENDIANNESS_NATIVE),
 		m_databus_width(0),
diff --git a/src/emu/machine/cdp1852.c b/src/emu/machine/cdp1852.c
index 24f13095591..adf43728db6 100644
--- a/src/emu/machine/cdp1852.c
+++ b/src/emu/machine/cdp1852.c
@@ -65,7 +65,7 @@ void cdp1852_device::set_sr_line(int state)
 //-------------------------------------------------
 
 cdp1852_device::cdp1852_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, CDP1852, "CDP1852", tag, owner, clock)
+	: device_t(mconfig, CDP1852, "CDP1852", tag, owner, clock, "cdp1852", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/cdp1871.c b/src/emu/machine/cdp1871.c
index 24f27336ca1..4b835d79988 100644
--- a/src/emu/machine/cdp1871.c
+++ b/src/emu/machine/cdp1871.c
@@ -93,7 +93,7 @@ static const UINT8 CDP1871_KEY_CODES[4][11][8] =
 //-------------------------------------------------
 
 cdp1871_device::cdp1871_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, CDP1871, "RCA CDP1871", tag, owner, clock),
+	: device_t(mconfig, CDP1871, "RCA CDP1871", tag, owner, clock, "cdp1871", __FILE__),
 		m_inhibit(false),
 		m_sense(0),
 		m_drive(0),
diff --git a/src/emu/machine/com8116.c b/src/emu/machine/com8116.c
index 9471fccdac8..8d9535fb7df 100644
--- a/src/emu/machine/com8116.c
+++ b/src/emu/machine/com8116.c
@@ -47,7 +47,7 @@ const int com8116_device::divisors_32X_5_0688MHz[] =
 //-------------------------------------------------
 
 com8116_device::com8116_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, COM8116, "COM8116", tag, owner, clock),
+	: device_t(mconfig, COM8116, "COM8116", tag, owner, clock, "com8116", __FILE__),
 		m_write_fx4(*this),
 		m_write_fr(*this),
 		m_write_ft(*this)
diff --git a/src/emu/machine/ctronics.c b/src/emu/machine/ctronics.c
index d58cbede8e2..d091ca267d7 100644
--- a/src/emu/machine/ctronics.c
+++ b/src/emu/machine/ctronics.c
@@ -19,7 +19,7 @@ const device_type CENTRONICS = &device_creator<centronics_device>;
 //-------------------------------------------------
 
 centronics_device::centronics_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, CENTRONICS, "Centronics", tag, owner, clock),
+	: device_t(mconfig, CENTRONICS, "Centronics", tag, owner, clock, "centronics", __FILE__),
 		device_slot_interface(mconfig, *this),
 		m_dev(NULL)
 {
diff --git a/src/emu/machine/ds1302.c b/src/emu/machine/ds1302.c
index 9866d1805d7..3460db16ea8 100644
--- a/src/emu/machine/ds1302.c
+++ b/src/emu/machine/ds1302.c
@@ -74,7 +74,7 @@ const device_type DS1302 = &device_creator<ds1302_device>;
 //-------------------------------------------------
 
 ds1302_device::ds1302_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, DS1302, "Dallas DS1302", tag, owner, clock),
+	: device_t(mconfig, DS1302, "Dallas DS1302", tag, owner, clock, "ds1302", __FILE__),
 		device_rtc_interface(mconfig, *this),
 		device_nvram_interface(mconfig, *this)
 {
diff --git a/src/emu/machine/ds2401.c b/src/emu/machine/ds2401.c
index 2d28c5efe8b..77c1c571b88 100644
--- a/src/emu/machine/ds2401.c
+++ b/src/emu/machine/ds2401.c
@@ -28,7 +28,7 @@ inline void ATTR_PRINTF(3,4) ds2401_device::verboselog(int n_level, const char *
 const device_type DS2401 = &device_creator<ds2401_device>;
 
 ds2401_device::ds2401_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, DS2401, "DS2401", tag, owner, clock)
+	: device_t(mconfig, DS2401, "DS2401", tag, owner, clock, "ds2401", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/ds2404.c b/src/emu/machine/ds2404.c
index 1d4208d247e..a02dd2d5a0a 100644
--- a/src/emu/machine/ds2404.c
+++ b/src/emu/machine/ds2404.c
@@ -23,7 +23,7 @@ const device_type DS2404 = &device_creator<ds2404_device>;
 //-------------------------------------------------
 
 ds2404_device::ds2404_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, DS2404, "DS2404", tag, owner, clock),
+	: device_t(mconfig, DS2404, "DS2404", tag, owner, clock, "ds2404", __FILE__),
 		device_nvram_interface(mconfig, *this)
 {
 }
diff --git a/src/emu/machine/ds75160a.c b/src/emu/machine/ds75160a.c
index 9e12c66d3c2..b6646e077e8 100644
--- a/src/emu/machine/ds75160a.c
+++ b/src/emu/machine/ds75160a.c
@@ -28,7 +28,7 @@ const device_type DS75160A = &device_creator<ds75160a_device>;
 //-------------------------------------------------
 
 ds75160a_device::ds75160a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, DS75160A, "DS75160A", tag, owner, clock),
+	: device_t(mconfig, DS75160A, "DS75160A", tag, owner, clock, "ds75160a", __FILE__),
 		m_read(*this),
 		m_write(*this),
 		m_data(0xff),
diff --git a/src/emu/machine/ds75161a.c b/src/emu/machine/ds75161a.c
index 72fadb57677..bf0f55a9a8e 100644
--- a/src/emu/machine/ds75161a.c
+++ b/src/emu/machine/ds75161a.c
@@ -28,7 +28,7 @@ const device_type DS75161A = &device_creator<ds75161a_device>;
 //-------------------------------------------------
 
 ds75161a_device::ds75161a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, DS75161A, "DS75161A", tag, owner, clock),
+	: device_t(mconfig, DS75161A, "DS75161A", tag, owner, clock, "ds75161a", __FILE__),
 		m_ren(1),
 		m_ifc(1),
 		m_ndac(1),
diff --git a/src/emu/machine/e0516.c b/src/emu/machine/e0516.c
index 1416314cac3..52b1fa840c6 100644
--- a/src/emu/machine/e0516.c
+++ b/src/emu/machine/e0516.c
@@ -40,7 +40,7 @@ const device_type E0516 = &device_creator<e0516_device>;
 //-------------------------------------------------
 
 e0516_device::e0516_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, E0516, "E05-16", tag, owner, clock),
+	: device_t(mconfig, E0516, "E05-16", tag, owner, clock, "e0516", __FILE__),
 		device_rtc_interface(mconfig, *this)
 {
 }
diff --git a/src/emu/machine/eeprom.c b/src/emu/machine/eeprom.c
index 067f33bf7ca..18481ace058 100644
--- a/src/emu/machine/eeprom.c
+++ b/src/emu/machine/eeprom.c
@@ -93,7 +93,7 @@ ADDRESS_MAP_END
 //-------------------------------------------------
 
 eeprom_device::eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, EEPROM, "EEPROM", tag, owner, clock),
+	: device_t(mconfig, EEPROM, "EEPROM", tag, owner, clock, "eeprom", __FILE__),
 		device_memory_interface(mconfig, *this),
 		device_nvram_interface(mconfig, *this),
 		m_default_data_size(0),
diff --git a/src/emu/machine/er2055.c b/src/emu/machine/er2055.c
index 39db037c5fc..7b78545d04f 100644
--- a/src/emu/machine/er2055.c
+++ b/src/emu/machine/er2055.c
@@ -63,7 +63,7 @@ ADDRESS_MAP_END
 //-------------------------------------------------
 
 er2055_device::er2055_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, ER2055, "ER2055", tag, owner, clock),
+	: device_t(mconfig, ER2055, "ER2055", tag, owner, clock, "er2055", __FILE__),
 		device_memory_interface(mconfig, *this),
 		device_nvram_interface(mconfig, *this),
 		m_space_config("EAROM", ENDIANNESS_BIG, 8, 6, 0, *ADDRESS_MAP_NAME(er2055_map)),
diff --git a/src/emu/machine/er59256.c b/src/emu/machine/er59256.c
index 6eedb17a68a..bc8930e2be6 100644
--- a/src/emu/machine/er59256.c
+++ b/src/emu/machine/er59256.c
@@ -225,7 +225,7 @@ static void decode_command(er59256_t *er59256)
 const device_type ER59256 = &device_creator<er59256_device>;
 
 er59256_device::er59256_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, ER59256, "Microchip ER59256 serial eeprom.", tag, owner, clock)
+	: device_t(mconfig, ER59256, "Microchip ER59256 serial eeprom.", tag, owner, clock, "er59256", __FILE__)
 {
 	m_token = global_alloc_clear(er59256_t);
 }
diff --git a/src/emu/machine/f3853.c b/src/emu/machine/f3853.c
index 65ee33267b5..45eb4ec47be 100644
--- a/src/emu/machine/f3853.c
+++ b/src/emu/machine/f3853.c
@@ -48,7 +48,7 @@ const device_type F3853 = &device_creator<f3853_device>;
 //-------------------------------------------------
 
 f3853_device::f3853_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, F3853, "F3853", tag, owner, clock)
+	: device_t(mconfig, F3853, "F3853", tag, owner, clock, "f3853", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/i2cmem.c b/src/emu/machine/i2cmem.c
index 75fd490fc83..c49eb9c77df 100644
--- a/src/emu/machine/i2cmem.c
+++ b/src/emu/machine/i2cmem.c
@@ -73,7 +73,7 @@ ADDRESS_MAP_END
 //-------------------------------------------------
 
 i2cmem_device::i2cmem_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
-	: device_t(mconfig, I2CMEM, "I2CMEM", tag, owner, clock),
+	: device_t(mconfig, I2CMEM, "I2CMEM", tag, owner, clock, "i2cmem", __FILE__),
 		device_memory_interface(mconfig, *this),
 		device_nvram_interface(mconfig, *this),
 	m_scl( 0 ),
diff --git a/src/emu/machine/i8155.c b/src/emu/machine/i8155.c
index d4140e38a98..c7b0d870eb1 100644
--- a/src/emu/machine/i8155.c
+++ b/src/emu/machine/i8155.c
@@ -199,7 +199,7 @@ inline void i8155_device::write_port(int port, UINT8 data)
 //-------------------------------------------------
 
 i8155_device::i8155_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, I8155, "Intel 8155", tag, owner, clock),
+	: device_t(mconfig, I8155, "Intel 8155", tag, owner, clock, "i8155", __FILE__),
 		device_memory_interface(mconfig, *this),
 		m_command(0),
 		m_status(0),
diff --git a/src/emu/machine/i8212.c b/src/emu/machine/i8212.c
index d2a07b49177..4e5ebd17d15 100644
--- a/src/emu/machine/i8212.c
+++ b/src/emu/machine/i8212.c
@@ -32,7 +32,7 @@ const device_type I8212 = &device_creator<i8212_device>;
 //-------------------------------------------------
 
 i8212_device::i8212_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, I8212, "Intel 8212", tag, owner, clock),
+	: device_t(mconfig, I8212, "Intel 8212", tag, owner, clock, "i8212", __FILE__),
 		m_md(I8212_MODE_INPUT),
 		m_stb(0)
 {
diff --git a/src/emu/machine/i8214.c b/src/emu/machine/i8214.c
index c76f4101081..45b0fbd4b51 100644
--- a/src/emu/machine/i8214.c
+++ b/src/emu/machine/i8214.c
@@ -90,7 +90,7 @@ inline void i8214_device::check_interrupt()
 //-------------------------------------------------
 
 i8214_device::i8214_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, I8214, "I8214", tag, owner, clock)
+	: device_t(mconfig, I8214, "I8214", tag, owner, clock, "i8214", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/i8243.c b/src/emu/machine/i8243.c
index 6ad42c8ea71..c6cc437c9cb 100644
--- a/src/emu/machine/i8243.c
+++ b/src/emu/machine/i8243.c
@@ -23,7 +23,7 @@ const device_type I8243 = &device_creator<i8243_device>;
 //-------------------------------------------------
 
 i8243_device::i8243_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, I8243, "I8243", tag, owner, clock),
+	: device_t(mconfig, I8243, "I8243", tag, owner, clock, "i8243", __FILE__),
 		m_readhandler(*this),
 		m_writehandler(*this)
 {
diff --git a/src/emu/machine/i8251.c b/src/emu/machine/i8251.c
index 47c21286bdf..ff67bfe9acf 100644
--- a/src/emu/machine/i8251.c
+++ b/src/emu/machine/i8251.c
@@ -59,7 +59,7 @@ const device_type I8251 = &device_creator<i8251_device>;
 //-------------------------------------------------
 
 i8251_device::i8251_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, I8251, "I8251", tag, owner, clock),
+	: device_t(mconfig, I8251, "I8251", tag, owner, clock, "i8251", __FILE__),
 		device_serial_interface(mconfig, *this)
 {
 }
diff --git a/src/emu/machine/i8255.c b/src/emu/machine/i8255.c
index 192d5af3fd4..f8c7731206d 100644
--- a/src/emu/machine/i8255.c
+++ b/src/emu/machine/i8255.c
@@ -260,7 +260,7 @@ inline int i8255_device::port_c_upper_mode()
 //-------------------------------------------------
 
 i8255_device::i8255_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, I8255, "I8255", tag, owner, clock)
+	: device_t(mconfig, I8255, "I8255", tag, owner, clock, "i8279", __FILE__)
 {
 	m_intr[PORT_A] = m_intr[PORT_B] = 0;
 	m_control = 0;
diff --git a/src/emu/machine/i8279.c b/src/emu/machine/i8279.c
index bb6bc9812da..14367283bc3 100644
--- a/src/emu/machine/i8279.c
+++ b/src/emu/machine/i8279.c
@@ -88,7 +88,7 @@ const device_type I8279 = &device_creator<i8279_device>;
 //-------------------------------------------------
 
 i8279_device::i8279_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, I8279, "Intel 8279", tag, owner, clock)
+	: device_t(mconfig, I8279, "Intel 8279", tag, owner, clock, "i8279", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/i8355.c b/src/emu/machine/i8355.c
index 826e0a6f2c2..69f38ecc8fa 100644
--- a/src/emu/machine/i8355.c
+++ b/src/emu/machine/i8355.c
@@ -92,7 +92,7 @@ inline void i8355_device::write_port(int port, UINT8 data)
 //-------------------------------------------------
 
 i8355_device::i8355_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, I8355, "Intel 8355", tag, owner, clock),
+	: device_t(mconfig, I8355, "Intel 8355", tag, owner, clock, "i8355", __FILE__),
 		device_memory_interface(mconfig, *this),
 		m_space_config("ram", ENDIANNESS_LITTLE, 8, 11, 0, NULL, *ADDRESS_MAP_NAME(i8355))
 {
diff --git a/src/emu/machine/idectrl.c b/src/emu/machine/idectrl.c
index 0352e7cfa35..495ffd0510a 100644
--- a/src/emu/machine/idectrl.c
+++ b/src/emu/machine/idectrl.c
@@ -28,12 +28,12 @@
 const device_type IDE_CONTROLLER = &device_creator<ide_controller_device>;
 
 ide_controller_device::ide_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-	ata_interface_device(mconfig, IDE_CONTROLLER, "IDE Controller", tag, owner, clock)
+	ata_interface_device(mconfig, IDE_CONTROLLER, "IDE Controller", tag, owner, clock, "ide_controller", __FILE__)
 {
 }
 
-ide_controller_device::ide_controller_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
-	ata_interface_device(mconfig, type, name, tag, owner, clock)
+ide_controller_device::ide_controller_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+	ata_interface_device(mconfig, type, name, tag, owner, clock, shortname, source)
 {
 }
 
@@ -92,7 +92,7 @@ WRITE16_MEMBER( ide_controller_device::write_cs1 )
 const device_type BUS_MASTER_IDE_CONTROLLER = &device_creator<bus_master_ide_controller_device>;
 
 bus_master_ide_controller_device::bus_master_ide_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-	ide_controller_device(mconfig, BUS_MASTER_IDE_CONTROLLER, "Bus Master IDE Controller", tag, owner, clock),
+	ide_controller_device(mconfig, BUS_MASTER_IDE_CONTROLLER, "Bus Master IDE Controller", tag, owner, clock, "bus_master_ide_controller", __FILE__),
 	dma_address(0),
 	dma_bytes_left(0),
 	dma_descriptor(0),
diff --git a/src/emu/machine/idectrl.h b/src/emu/machine/idectrl.h
index 789fceddccc..896b25b2aa7 100644
--- a/src/emu/machine/idectrl.h
+++ b/src/emu/machine/idectrl.h
@@ -30,7 +30,7 @@ class ide_controller_device : public ata_interface_device
 {
 public:
 	ide_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	ide_controller_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	ide_controller_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 
 	virtual DECLARE_READ16_MEMBER(read_cs0);
 	virtual DECLARE_READ16_MEMBER(read_cs1);
diff --git a/src/emu/machine/im6402.c b/src/emu/machine/im6402.c
index 2dcd019e8da..d1d4b9bf728 100644
--- a/src/emu/machine/im6402.c
+++ b/src/emu/machine/im6402.c
@@ -77,7 +77,7 @@ inline void im6402_device::set_tre(int state)
 //-------------------------------------------------
 
 im6402_device::im6402_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, IM6402, "Intersil IM6402", tag, owner, clock),
+	: device_t(mconfig, IM6402, "Intersil IM6402", tag, owner, clock, "im6402", __FILE__),
 		device_serial_interface(mconfig, *this),
 		m_rrc_count(0),
 		m_trc_count(0)
diff --git a/src/emu/machine/ins8154.c b/src/emu/machine/ins8154.c
index 9854430c172..c459068432c 100644
--- a/src/emu/machine/ins8154.c
+++ b/src/emu/machine/ins8154.c
@@ -42,7 +42,7 @@ const device_type INS8154 = &device_creator<ins8154_device>;
 //-------------------------------------------------
 
 ins8154_device::ins8154_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, INS8154, "INS8154", tag, owner, clock)
+	: device_t(mconfig, INS8154, "INS8154", tag, owner, clock, "ins8154", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/intelfsh.c b/src/emu/machine/intelfsh.c
index 4794f4f68c1..446a63b0ff8 100644
--- a/src/emu/machine/intelfsh.c
+++ b/src/emu/machine/intelfsh.c
@@ -149,8 +149,8 @@ ADDRESS_MAP_END
 //  intelfsh_device - constructor
 //-------------------------------------------------
 
-intelfsh_device::intelfsh_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant)
-	: device_t(mconfig, type, name, tag, owner, clock),
+intelfsh_device::intelfsh_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
+	: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
 		device_memory_interface(mconfig, *this),
 		device_nvram_interface(mconfig, *this),
 		m_type(variant),
@@ -314,72 +314,72 @@ intelfsh_device::intelfsh_device(const machine_config &mconfig, device_type type
 	m_space_config = address_space_config("flash", ENDIANNESS_BIG, m_bits, addrbits, (m_bits == 8) ? 0 : -1, map);
 }
 
-intelfsh8_device::intelfsh8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant)
-	: intelfsh_device(mconfig, type, name, tag, owner, clock, variant) { }
+intelfsh8_device::intelfsh8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
+	: intelfsh_device(mconfig, type, name, tag, owner, clock, variant, shortname, source) { }
 
-intelfsh16_device::intelfsh16_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant)
-	: intelfsh_device(mconfig, type, name, tag, owner, clock, variant) { }
+intelfsh16_device::intelfsh16_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
+	: intelfsh_device(mconfig, type, name, tag, owner, clock, variant, shortname, source) { }
 
 
 intel_28f016s5_device::intel_28f016s5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: intelfsh8_device(mconfig, INTEL_28F016S5, "Intel 28F016S5 Flash", tag, owner, clock, FLASH_INTEL_28F016S5) { }
+	: intelfsh8_device(mconfig, INTEL_28F016S5, "Intel 28F016S5 Flash", tag, owner, clock, FLASH_INTEL_28F016S5, "intel_28f016s5", __FILE__) { }
 
 fujitsu_29f016a_device::fujitsu_29f016a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: intelfsh8_device(mconfig, FUJITSU_29F016A, "Fujitsu 29F016A Flash", tag, owner, clock, FLASH_FUJITSU_29F016A) { }
+	: intelfsh8_device(mconfig, FUJITSU_29F016A, "Fujitsu 29F016A Flash", tag, owner, clock, FLASH_FUJITSU_29F016A, "fujitsu_29f016a", __FILE__) { }
 
 fujitsu_29dl16x_device::fujitsu_29dl16x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: intelfsh8_device(mconfig, FUJITSU_29DL16X, "Fujitsu 29DL16X Flash", tag, owner, clock, FLASH_FUJITSU_29DL16X) { }
+	: intelfsh8_device(mconfig, FUJITSU_29DL16X, "Fujitsu 29DL16X Flash", tag, owner, clock, FLASH_FUJITSU_29DL16X, "fujitsu_29dl16x", __FILE__) { }
 
 sharp_lh28f016s_device::sharp_lh28f016s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: intelfsh8_device(mconfig, SHARP_LH28F016S, "Sharp LH28F016S Flash", tag, owner, clock, FLASH_SHARP_LH28F016S) { }
+	: intelfsh8_device(mconfig, SHARP_LH28F016S, "Sharp LH28F016S Flash", tag, owner, clock, FLASH_SHARP_LH28F016S, "sharp_lh28f016s", __FILE__) { }
 
 atmel_29c010_device::atmel_29c010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: intelfsh8_device(mconfig, ATMEL_29C010, "Atmel 29C010 Flash", tag, owner, clock, FLASH_ATMEL_29C010) { }
+	: intelfsh8_device(mconfig, ATMEL_29C010, "Atmel 29C010 Flash", tag, owner, clock, FLASH_ATMEL_29C010, "atmel_29c010", __FILE__) { }
 
 amd_29f010_device::amd_29f010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: intelfsh8_device(mconfig, AMD_29F010, "AMD 29F010 Flash", tag, owner, clock, FLASH_AMD_29F010) { }
+	: intelfsh8_device(mconfig, AMD_29F010, "AMD 29F010 Flash", tag, owner, clock, FLASH_AMD_29F010, "amd_29f010", __FILE__) { }
 
 amd_29f040_device::amd_29f040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: intelfsh8_device(mconfig, AMD_29F040, "AMD 29F040 Flash", tag, owner, clock, FLASH_AMD_29F040) { }
+	: intelfsh8_device(mconfig, AMD_29F040, "AMD 29F040 Flash", tag, owner, clock, FLASH_AMD_29F040, "amd_29f040", __FILE__) { }
 
 amd_29f080_device::amd_29f080_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: intelfsh8_device(mconfig, AMD_29F080, "AMD 29F080 Flash", tag, owner, clock, FLASH_AMD_29F080) { }
+	: intelfsh8_device(mconfig, AMD_29F080, "AMD 29F080 Flash", tag, owner, clock, FLASH_AMD_29F080, "amd_29f080", __FILE__) { }
 
 intel_e28f008sa_device::intel_e28f008sa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: intelfsh8_device(mconfig, INTEL_E28F008SA, "Intel E28F008SA Flash", tag, owner, clock, FLASH_INTEL_E28F008SA) { }
+	: intelfsh8_device(mconfig, INTEL_E28F008SA, "Intel E28F008SA Flash", tag, owner, clock, FLASH_INTEL_E28F008SA, "intel_e28f008sa", __FILE__) { }
 
 macronix_29l001mc_device::macronix_29l001mc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: intelfsh8_device(mconfig, MACRONIX_29L001MC, "Macronix 29L001MC Flash", tag, owner, clock, FLASH_MACRONIX_29L001MC) { }
+	: intelfsh8_device(mconfig, MACRONIX_29L001MC, "Macronix 29L001MC Flash", tag, owner, clock, FLASH_MACRONIX_29L001MC, "macronix_29l001mc", __FILE__) { }
 
 panasonic_mn63f805mnp_device::panasonic_mn63f805mnp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: intelfsh8_device(mconfig, PANASONIC_MN63F805MNP, "Panasonic MN63F805MNP Flash", tag, owner, clock, FLASH_PANASONIC_MN63F805MNP) { }
+	: intelfsh8_device(mconfig, PANASONIC_MN63F805MNP, "Panasonic MN63F805MNP Flash", tag, owner, clock, FLASH_PANASONIC_MN63F805MNP, "panasonic_mn63f805mnp", __FILE__) { }
 
 sanyo_le26fv10n1ts_device::sanyo_le26fv10n1ts_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: intelfsh8_device(mconfig, SANYO_LE26FV10N1TS, "Sanyo LE26FV10N1TS Flash", tag, owner, clock, FLASH_SANYO_LE26FV10N1TS) { }
+	: intelfsh8_device(mconfig, SANYO_LE26FV10N1TS, "Sanyo LE26FV10N1TS Flash", tag, owner, clock, FLASH_SANYO_LE26FV10N1TS, "sanyo_le26fv10n1ts", __FILE__) { }
 
 sst_28sf040_device::sst_28sf040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: intelfsh8_device(mconfig, SST_28SF040, "SST 28SF040 Flash", tag, owner, clock, FLASH_SST_28SF040) { }
+	: intelfsh8_device(mconfig, SST_28SF040, "SST 28SF040 Flash", tag, owner, clock, FLASH_SST_28SF040, "sst_28sf040", __FILE__) { }
 
 sst_39vf020_device::sst_39vf020_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: intelfsh8_device(mconfig, SST_39VF020, "SST 39VF020 Flash", tag, owner, clock, FLASH_SST_39VF020) { }
+	: intelfsh8_device(mconfig, SST_39VF020, "SST 39VF020 Flash", tag, owner, clock, FLASH_SST_39VF020, "sst_39vf020", __FILE__) { }
 
 sharp_lh28f400_device::sharp_lh28f400_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: intelfsh16_device(mconfig, SHARP_LH28F400, "Sharp LH28F400 Flash", tag, owner, clock, FLASH_SHARP_LH28F400) { }
+	: intelfsh16_device(mconfig, SHARP_LH28F400, "Sharp LH28F400 Flash", tag, owner, clock, FLASH_SHARP_LH28F400, "sharp_lh28f400", __FILE__) { }
 
 intel_te28f160_device::intel_te28f160_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: intelfsh16_device(mconfig, INTEL_TE28F160, "Intel TE28F160 Flash", tag, owner, clock, FLASH_INTEL_TE28F160) { }
+	: intelfsh16_device(mconfig, INTEL_TE28F160, "Intel TE28F160 Flash", tag, owner, clock, FLASH_INTEL_TE28F160, "intel_te28f160", __FILE__) { }
 
 intel_e28f400_device::intel_e28f400_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: intelfsh16_device(mconfig, INTEL_E28F400, "Intel E28F400 Flash", tag, owner, clock, FLASH_INTEL_E28F400) { }
+	: intelfsh16_device(mconfig, INTEL_E28F400, "Intel E28F400 Flash", tag, owner, clock, FLASH_INTEL_E28F400, "intel_e28f400", __FILE__) { }
 
 sharp_unk128mbit_device::sharp_unk128mbit_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: intelfsh16_device(mconfig, SHARP_UNK128MBIT, "Sharp Unknown 128Mbit Flash", tag, owner, clock, FLASH_SHARP_UNK128MBIT) { }
+	: intelfsh16_device(mconfig, SHARP_UNK128MBIT, "Sharp Unknown 128Mbit Flash", tag, owner, clock, FLASH_SHARP_UNK128MBIT, "sharp_unk128mbit", __FILE__) { }
 
 intel_28f320j3d_device::intel_28f320j3d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: intelfsh16_device(mconfig, INTEL_28F320J3D, "Intel 28F320J3D Flash", tag, owner, clock, FLASH_INTEL_28F320J3D) { }
+	: intelfsh16_device(mconfig, INTEL_28F320J3D, "Intel 28F320J3D Flash", tag, owner, clock, FLASH_INTEL_28F320J3D, "intel_28f320j3d", __FILE__) { }
 
 sst_39vf400a_device::sst_39vf400a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: intelfsh16_device(mconfig, SST_39VF400A, "SST 39VF400A Flash", tag, owner, clock, FLASH_SST_39VF400A) { }
+	: intelfsh16_device(mconfig, SST_39VF400A, "SST 39VF400A Flash", tag, owner, clock, FLASH_SST_39VF400A, "sst_39vf400a", __FILE__) { }
 
 //-------------------------------------------------
 //  device_start - device-specific startup
diff --git a/src/emu/machine/intelfsh.h b/src/emu/machine/intelfsh.h
index 231b7daf1bc..3c579bf491f 100644
--- a/src/emu/machine/intelfsh.h
+++ b/src/emu/machine/intelfsh.h
@@ -113,7 +113,7 @@ public:
 
 protected:
 	// construction/destruction
-	intelfsh_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant);
+	intelfsh_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
 
 protected:
 	// device-level overrides
@@ -159,7 +159,7 @@ class intelfsh8_device : public intelfsh_device
 {
 protected:
 	// construction/destruction
-	intelfsh8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant);
+	intelfsh8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
 
 public:
 	// public interface
@@ -179,7 +179,7 @@ class intelfsh16_device : public intelfsh_device
 {
 protected:
 	// construction/destruction
-	intelfsh16_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant);
+	intelfsh16_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
 
 public:
 	// public interface
diff --git a/src/emu/machine/jvsdev.c b/src/emu/machine/jvsdev.c
index 22ef6abb9d5..5402bb81118 100644
--- a/src/emu/machine/jvsdev.c
+++ b/src/emu/machine/jvsdev.c
@@ -7,7 +7,8 @@ void jvs_device::static_set_jvs_host_tag(device_t &device, const char *jvs_host_
 	jvsdev.jvs_host_tag = jvs_host_tag;
 }
 
-jvs_device::jvs_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, type, name, tag, owner, clock)
+jvs_device::jvs_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+   : device_t(mconfig, type, name, tag, owner, clock, shortname, source)
 {
 	jvs_host_tag = 0;
 	next_device = 0;
diff --git a/src/emu/machine/jvsdev.h b/src/emu/machine/jvsdev.h
index fb2adfe2afb..a0c6711652c 100644
--- a/src/emu/machine/jvsdev.h
+++ b/src/emu/machine/jvsdev.h
@@ -11,7 +11,7 @@ class jvs_host;
 class jvs_device : public device_t
 {
 public:
-	jvs_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	jvs_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 	static void static_set_jvs_host_tag(device_t &device, const char *jvs_host_tag);
 
 	void chain(jvs_device *dev);
diff --git a/src/emu/machine/jvshost.c b/src/emu/machine/jvshost.c
index 819d20ca736..11351d66e7d 100644
--- a/src/emu/machine/jvshost.c
+++ b/src/emu/machine/jvshost.c
@@ -26,7 +26,8 @@ void jvs_host::device_reset()
 	memset(recv_buffer, 0, sizeof(recv_buffer));
 }
 
-jvs_host::jvs_host(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, type, name, tag, owner, clock)
+jvs_host::jvs_host(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) 
+  : device_t(mconfig, type, name, tag, owner, clock, shortname, source)
 {
 	first_device = 0;
 }
diff --git a/src/emu/machine/jvshost.h b/src/emu/machine/jvshost.h
index 3a1fcc47add..249048ec512 100644
--- a/src/emu/machine/jvshost.h
+++ b/src/emu/machine/jvshost.h
@@ -7,7 +7,7 @@ class jvs_device;
 
 class jvs_host : public device_t {
 public:
-	jvs_host(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	jvs_host(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 
 	void add_device(jvs_device *dev);
 
diff --git a/src/emu/machine/k033906.c b/src/emu/machine/k033906.c
index bba18440d86..3c859d8981a 100644
--- a/src/emu/machine/k033906.c
+++ b/src/emu/machine/k033906.c
@@ -21,7 +21,7 @@ const device_type K033906 = &device_creator<k033906_device>;
 //-------------------------------------------------
 
 k033906_device::k033906_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, K033906, "Konami 033906", tag, owner, clock)
+	: device_t(mconfig, K033906, "Konami 033906", tag, owner, clock, "k033906", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/k053252.c b/src/emu/machine/k053252.c
index bf159f6e6cb..4eb38a0dfb6 100644
--- a/src/emu/machine/k053252.c
+++ b/src/emu/machine/k053252.c
@@ -59,7 +59,7 @@ TODO:
 const device_type K053252 = &device_creator<k053252_device>;
 
 k053252_device::k053252_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, K053252, "Konami 053252", tag, owner, clock)
+	: device_t(mconfig, K053252, "Konami 053252", tag, owner, clock, "k053252", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/k056230.c b/src/emu/machine/k056230.c
index 42c0dba7d22..acf86c95b2c 100644
--- a/src/emu/machine/k056230.c
+++ b/src/emu/machine/k056230.c
@@ -20,7 +20,7 @@ const device_type K056230 = &device_creator<k056230_device>;
 //-------------------------------------------------
 
 k056230_device::k056230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, K056230, "Konami 056230", tag, owner, clock)
+	: device_t(mconfig, K056230, "Konami 056230", tag, owner, clock, "k056230", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/latch8.c b/src/emu/machine/latch8.c
index d99d9872e44..6176e3953a6 100644
--- a/src/emu/machine/latch8.c
+++ b/src/emu/machine/latch8.c
@@ -234,7 +234,7 @@ static DEVICE_RESET( latch8 )
 const device_type LATCH8 = &device_creator<latch8_device>;
 
 latch8_device::latch8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-		: device_t(mconfig, LATCH8, "8 bit latch", tag, owner, clock)
+		: device_t(mconfig, LATCH8, "8 bit latch", tag, owner, clock, "latch8", __FILE__)
 {
 	m_token = global_alloc_clear(latch8_t);
 	memset((void*)&m_inline_config,0,sizeof(m_inline_config));
diff --git a/src/emu/machine/lc89510.c b/src/emu/machine/lc89510.c
index be0aa027339..3de42fd6c55 100644
--- a/src/emu/machine/lc89510.c
+++ b/src/emu/machine/lc89510.c
@@ -10,7 +10,7 @@
 const device_type LC89510 = &device_creator<lc89510_device>;
 
 lc89510_device::lc89510_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, LC89510, "lc89510_device", tag, owner, clock)
+	: device_t(mconfig, LC89510, "lc89510_device", tag, owner, clock, "lc89510", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/m6m80011ap.c b/src/emu/machine/m6m80011ap.c
index 6640ed2e367..d47a550fe95 100644
--- a/src/emu/machine/m6m80011ap.c
+++ b/src/emu/machine/m6m80011ap.c
@@ -26,7 +26,7 @@ const device_type M6M80011AP = &device_creator<m6m80011ap_device>;
 //-------------------------------------------------
 
 m6m80011ap_device::m6m80011ap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, M6M80011AP, "m6m80011ap", tag, owner, clock),
+	: device_t(mconfig, M6M80011AP, "m6m80011ap", tag, owner, clock, "m6m80011ap", __FILE__),
 		device_nvram_interface(mconfig, *this)
 {
 }
diff --git a/src/emu/machine/mb14241.c b/src/emu/machine/mb14241.c
index 6cc861e9272..6f4187c74b1 100644
--- a/src/emu/machine/mb14241.c
+++ b/src/emu/machine/mb14241.c
@@ -16,7 +16,7 @@
 const device_type MB14241 = &device_creator<mb14241_device>;
 
 mb14241_device::mb14241_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MB14241, "MB14241", tag, owner, clock)
+	: device_t(mconfig, MB14241, "MB14241", tag, owner, clock, "mb14241", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/mb3773.c b/src/emu/machine/mb3773.c
index 9493b6cd585..a22e3386868 100644
--- a/src/emu/machine/mb3773.c
+++ b/src/emu/machine/mb3773.c
@@ -26,7 +26,7 @@ const device_type MB3773 = &device_creator<mb3773_device>;
 //-------------------------------------------------
 
 mb3773_device::mb3773_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
-	: device_t(mconfig, MB3773, "MB3773", tag, owner, clock)
+	: device_t(mconfig, MB3773, "MB3773", tag, owner, clock, "mb3773", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/mb87078.c b/src/emu/machine/mb87078.c
index ae4bfa1b677..0eed46a5645 100644
--- a/src/emu/machine/mb87078.c
+++ b/src/emu/machine/mb87078.c
@@ -268,7 +268,7 @@ static DEVICE_RESET( mb87078 )
 const device_type MB87078 = &device_creator<mb87078_device>;
 
 mb87078_device::mb87078_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MB87078, "Fujitsu MB87078", tag, owner, clock)
+	: device_t(mconfig, MB87078, "Fujitsu MB87078", tag, owner, clock, "mb87078", __FILE__)
 {
 	m_token = global_alloc_clear(mb87078_state);
 }
diff --git a/src/emu/machine/mb89371.c b/src/emu/machine/mb89371.c
index e14eacb0f66..45b140b6cae 100644
--- a/src/emu/machine/mb89371.c
+++ b/src/emu/machine/mb89371.c
@@ -11,7 +11,7 @@
 const device_type MB89371 = &device_creator<mb89371_device>;
 
 mb89371_device::mb89371_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
-	: device_t(mconfig, MB89371, "MB89371", tag, owner, clock)
+	: device_t(mconfig, MB89371, "MB89371", tag, owner, clock, "mb89371", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/mc146818.c b/src/emu/machine/mc146818.c
index 6d56339ca0d..131ebcba492 100644
--- a/src/emu/machine/mc146818.c
+++ b/src/emu/machine/mc146818.c
@@ -112,7 +112,7 @@ const device_type MC146818 = &device_creator<mc146818_device>;
 //-------------------------------------------------
 
 mc146818_device::mc146818_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MC146818, "NVRAM", tag, owner, clock),
+	: device_t(mconfig, MC146818, "NVRAM", tag, owner, clock, "mc146818", __FILE__),
 		device_rtc_interface(mconfig, *this),
 		device_nvram_interface(mconfig, *this),
 		m_write_irq(*this),
diff --git a/src/emu/machine/mc2661.c b/src/emu/machine/mc2661.c
index 4e57c2bed01..e2c5c27c697 100644
--- a/src/emu/machine/mc2661.c
+++ b/src/emu/machine/mc2661.c
@@ -100,7 +100,7 @@ enum
 //-------------------------------------------------
 
 mc2661_device::mc2661_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MC2661, "MC2661", tag, owner, clock),
+	: device_t(mconfig, MC2661, "MC2661", tag, owner, clock, "mc2661", __FILE__),
 		device_serial_interface(mconfig, *this)
 {
 }
diff --git a/src/emu/machine/mc6843.c b/src/emu/machine/mc6843.c
index a3a4660be3b..0166f69a111 100644
--- a/src/emu/machine/mc6843.c
+++ b/src/emu/machine/mc6843.c
@@ -829,7 +829,7 @@ static DEVICE_START( mc6843 )
 const device_type MC6843 = &device_creator<mc6843_device>;
 
 mc6843_device::mc6843_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MC6843, "Motorola MC6843 floppy controller", tag, owner, clock)
+	: device_t(mconfig, MC6843, "Motorola MC6843 floppy controller", tag, owner, clock, "mc6843", __FILE__)
 {
 	m_token = global_alloc_clear(mc6843_t);
 }
diff --git a/src/emu/machine/mc6846.c b/src/emu/machine/mc6846.c
index 2db1709d9cd..662f7624e0a 100644
--- a/src/emu/machine/mc6846.c
+++ b/src/emu/machine/mc6846.c
@@ -637,7 +637,7 @@ static DEVICE_START( mc6846 )
 const device_type MC6846 = &device_creator<mc6846_device>;
 
 mc6846_device::mc6846_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MC6846, "Motorola MC6846 programmable timer", tag, owner, clock)
+	: device_t(mconfig, MC6846, "Motorola MC6846 programmable timer", tag, owner, clock, "mc6846", __FILE__)
 {
 	m_token = global_alloc_clear(mc6846_t);
 }
diff --git a/src/emu/machine/mc6852.c b/src/emu/machine/mc6852.c
index 37dcf5a3729..b9bb5dd0040 100644
--- a/src/emu/machine/mc6852.c
+++ b/src/emu/machine/mc6852.c
@@ -105,7 +105,7 @@ inline void mc6852_device::transmit()
 //-------------------------------------------------
 
 mc6852_device::mc6852_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MC6852, "MC6852", tag, owner, clock)
+	: device_t(mconfig, MC6852, "MC6852", tag, owner, clock, "mc6852", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/mc6854.c b/src/emu/machine/mc6854.c
index f453647b60b..57194aee4e3 100644
--- a/src/emu/machine/mc6854.c
+++ b/src/emu/machine/mc6854.c
@@ -1038,7 +1038,7 @@ static DEVICE_START( mc6854 )
 const device_type MC6854 = &device_creator<mc6854_device>;
 
 mc6854_device::mc6854_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MC6854, "Motorola MC6854 ADLC", tag, owner, clock)
+	: device_t(mconfig, MC6854, "Motorola MC6854 ADLC", tag, owner, clock, "mc6854", __FILE__)
 {
 	m_token = global_alloc_clear(mc6854_t);
 }
diff --git a/src/emu/machine/mc68901.c b/src/emu/machine/mc68901.c
index d0b6558c55c..7404044031e 100644
--- a/src/emu/machine/mc68901.c
+++ b/src/emu/machine/mc68901.c
@@ -651,7 +651,7 @@ inline void mc68901_device::gpio_input(int bit, int state)
 //-------------------------------------------------
 
 mc68901_device::mc68901_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MC68901, "Motorola MC68901", tag, owner, clock),
+	: device_t(mconfig, MC68901, "Motorola MC68901", tag, owner, clock, "mc68901", __FILE__),
 		device_serial_interface(mconfig, *this),
 		m_gpip(0),
 		m_tsr(TSR_BUFFER_EMPTY)
diff --git a/src/emu/machine/mccs1850.c b/src/emu/machine/mccs1850.c
index cad29077455..b534443594c 100644
--- a/src/emu/machine/mccs1850.c
+++ b/src/emu/machine/mccs1850.c
@@ -281,7 +281,7 @@ inline void mccs1850_device::advance_seconds()
 //-------------------------------------------------
 
 mccs1850_device::mccs1850_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MCCS1850, "MCCS1850", tag, owner, clock),
+	: device_t(mconfig, MCCS1850, "MCCS1850", tag, owner, clock, "mccs1850", __FILE__),
 		device_rtc_interface(mconfig, *this),
 		device_nvram_interface(mconfig, *this),
 		m_pse(1),
diff --git a/src/emu/machine/mcf5206e.c b/src/emu/machine/mcf5206e.c
index 2679a7b62cb..bab4725afc0 100644
--- a/src/emu/machine/mcf5206e.c
+++ b/src/emu/machine/mcf5206e.c
@@ -829,7 +829,7 @@ const device_type MCF5206E_PERIPHERAL = &device_creator<mcf5206e_peripheral_devi
 //-------------------------------------------------
 
 mcf5206e_peripheral_device::mcf5206e_peripheral_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MCF5206E_PERIPHERAL, "MCF5206E Peripheral", tag, owner, clock),
+	: device_t(mconfig, MCF5206E_PERIPHERAL, "MCF5206E Peripheral", tag, owner, clock, "mcf5206e", __FILE__),
 		device_memory_interface(mconfig, *this),
 		m_space_config("coldfire_regs", ENDIANNESS_BIG, 32,10, 0, NULL, *ADDRESS_MAP_NAME(coldfire_regs_map))
 
diff --git a/src/emu/machine/microtch.c b/src/emu/machine/microtch.c
index 194ed82ad34..293f4597e51 100644
--- a/src/emu/machine/microtch.c
+++ b/src/emu/machine/microtch.c
@@ -15,8 +15,8 @@
 
 const device_type MICROTOUCH = &device_creator<microtouch_device>;
 
-microtouch_device::microtouch_device(const machine_config &mconfig, device_type type, const char* name, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, type, name, tag, owner, clock, "microtouch", __FILE__),
+microtouch_device::microtouch_device(const machine_config &mconfig, device_type type, const char* name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+	: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
 	m_out_tx_func(*this),
 	m_touch(*this, "TOUCH"),
 	m_touchx(*this, "TOUCH_X"),
@@ -283,7 +283,7 @@ ioport_constructor microtouch_device::device_input_ports() const
 const device_type MICROTOUCH_SERIAL = &device_creator<microtouch_serial_device>;
 
 microtouch_serial_device::microtouch_serial_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: microtouch_device(mconfig, MICROTOUCH_SERIAL, "Microtouch Serial Touchscreen", tag, owner, clock),
+	: microtouch_device(mconfig, MICROTOUCH_SERIAL, "Microtouch Serial Touchscreen", tag, owner, clock, "microtouch_serial", __FILE__),
 	device_serial_interface(mconfig, *this),
 	m_out_stx_func(*this)
 {
diff --git a/src/emu/machine/microtch.h b/src/emu/machine/microtch.h
index 988c4e712b4..e7a09726921 100644
--- a/src/emu/machine/microtch.h
+++ b/src/emu/machine/microtch.h
@@ -8,7 +8,7 @@ class microtouch_device :
 		public device_t
 {
 public:
-	microtouch_device(const machine_config &mconfig, device_type type, const char* name, const char *tag, device_t *owner, UINT32 clock);
+	microtouch_device(const machine_config &mconfig, device_type type, const char* name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 	microtouch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
 	template<class _Object> static devcb2_base &static_set_tx_callback(device_t &device, _Object object) { return downcast<microtouch_device &>(device).m_out_tx_func.set_callback(object); }
 
diff --git a/src/emu/machine/mm58274c.c b/src/emu/machine/mm58274c.c
index 56e94eecad1..08c47847b73 100644
--- a/src/emu/machine/mm58274c.c
+++ b/src/emu/machine/mm58274c.c
@@ -46,7 +46,7 @@ const device_type MM58274C = &device_creator<mm58274c_device>;
 
 
 mm58274c_device::mm58274c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-				: device_t(mconfig, MM58274C, "National Semiconductor MM58274C", tag, owner, clock)
+				: device_t(mconfig, MM58274C, "National Semiconductor MM58274C", tag, owner, clock, "mm58274c", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/mm74c922.c b/src/emu/machine/mm74c922.c
index a9a943b0eec..36dc7047fee 100644
--- a/src/emu/machine/mm74c922.c
+++ b/src/emu/machine/mm74c922.c
@@ -115,7 +115,7 @@ inline void mm74c922_device::detect_keypress()
 //-------------------------------------------------
 
 mm74c922_device::mm74c922_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MM74C922, "MM74C922", tag, owner, clock),
+	: device_t(mconfig, MM74C922, "MM74C922", tag, owner, clock, "mm74c922", __FILE__),
 		m_inhibit(0),
 		m_x(0),
 		m_y(0),
diff --git a/src/emu/machine/mos6526.c b/src/emu/machine/mos6526.c
index 1b68d63845a..f28a5361365 100644
--- a/src/emu/machine/mos6526.c
+++ b/src/emu/machine/mos6526.c
@@ -590,8 +590,8 @@ inline void mos6526_device::synchronize()
 //  mos6526_device - constructor
 //-------------------------------------------------
 
-mos6526_device::mos6526_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant)
-	: device_t(mconfig, type, name, tag, owner, clock),
+mos6526_device::mos6526_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
+	: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
 		device_execute_interface(mconfig, *this),
 		m_icount(0),
 		m_variant(variant),
@@ -607,7 +607,7 @@ mos6526_device::mos6526_device(const machine_config &mconfig, device_type type,
 }
 
 mos6526_device::mos6526_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MOS6526, "MOS6526", tag, owner, clock),
+	: device_t(mconfig, MOS6526, "MOS6526", tag, owner, clock, "mos6526", __FILE__),
 		device_execute_interface(mconfig, *this),
 		m_icount(0),
 		m_variant(TYPE_6526),
@@ -622,13 +622,13 @@ mos6526_device::mos6526_device(const machine_config &mconfig, const char *tag, d
 { }
 
 mos6526a_device::mos6526a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: mos6526_device(mconfig, MOS6526A, "MOS6526A", tag, owner, clock, TYPE_6526A) { }
+	: mos6526_device(mconfig, MOS6526A, "MOS6526A", tag, owner, clock, TYPE_6526A, "mos6526a", __FILE__) { }
 
 mos8520_device::mos8520_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: mos6526_device(mconfig, MOS8520, "MOS8520", tag, owner, clock, TYPE_8520) { }
+	: mos6526_device(mconfig, MOS8520, "MOS8520", tag, owner, clock, TYPE_8520, "mos8520", __FILE__) { }
 
 mos5710_device::mos5710_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: mos6526_device(mconfig, MOS5710, "MOS5710", tag, owner, clock, TYPE_5710) { }
+	: mos6526_device(mconfig, MOS5710, "MOS5710", tag, owner, clock, TYPE_5710, "mos5710", __FILE__) { }
 
 
 //-------------------------------------------------
diff --git a/src/emu/machine/mos6526.h b/src/emu/machine/mos6526.h
index 3670e7d5e96..cd9f5484bbd 100644
--- a/src/emu/machine/mos6526.h
+++ b/src/emu/machine/mos6526.h
@@ -108,7 +108,7 @@ class mos6526_device :  public device_t,
 {
 public:
 	// construction/destruction
-	mos6526_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant);
+	mos6526_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
 	mos6526_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
 
 	template<class _irq> void set_callbacks(int tod_clock, _irq irq) {
diff --git a/src/emu/machine/mos6529.c b/src/emu/machine/mos6529.c
index 7a6db300541..7e444e5ef9d 100644
--- a/src/emu/machine/mos6529.c
+++ b/src/emu/machine/mos6529.c
@@ -37,7 +37,7 @@ const device_type MOS6529 = &device_creator<mos6529_device>;
 //-------------------------------------------------
 
 mos6529_device::mos6529_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MOS6529, "MOS6529", tag, owner, clock),
+	: device_t(mconfig, MOS6529, "MOS6529", tag, owner, clock, "mos6529", __FILE__),
 		m_read_port(*this),
 		m_write_port(*this)
 {
diff --git a/src/emu/machine/mos6530.c b/src/emu/machine/mos6530.c
index 9075b9a2cb5..042d2843ada 100644
--- a/src/emu/machine/mos6530.c
+++ b/src/emu/machine/mos6530.c
@@ -435,7 +435,7 @@ static DEVICE_RESET( mos6530 )
 const device_type MOS6530 = &device_creator<mos6530_device>;
 
 mos6530_device::mos6530_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MOS6530, "MOS6530", tag, owner, clock)
+	: device_t(mconfig, MOS6530, "MOS6530", tag, owner, clock, "mos6530", __FILE__)
 {
 	m_token = global_alloc_clear(mos6530_state);
 }
diff --git a/src/emu/machine/mos6551.c b/src/emu/machine/mos6551.c
index 4192cd49e94..d43e1112477 100644
--- a/src/emu/machine/mos6551.c
+++ b/src/emu/machine/mos6551.c
@@ -53,7 +53,7 @@ const device_type MOS6551 = &device_creator<mos6551_device>;
 //-------------------------------------------------
 
 mos6551_device::mos6551_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MOS6551, "MOS6551", tag, owner, clock),
+	: device_t(mconfig, MOS6551, "MOS6551", tag, owner, clock, "mos6551", __FILE__),
 		device_serial_interface(mconfig, *this),
 		m_write_irq(*this),
 		m_read_rxd(*this),
diff --git a/src/emu/machine/msm5832.c b/src/emu/machine/msm5832.c
index fbcc277e601..f7fece2757c 100644
--- a/src/emu/machine/msm5832.c
+++ b/src/emu/machine/msm5832.c
@@ -89,7 +89,7 @@ inline void msm5832_device::write_counter(int counter, int value)
 //-------------------------------------------------
 
 msm5832_device::msm5832_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MSM5832, "MSM5832", tag, owner, clock),
+	: device_t(mconfig, MSM5832, "MSM5832", tag, owner, clock, "msm5832", __FILE__),
 		device_rtc_interface(mconfig, *this),
 		m_hold(0),
 		m_address(0),
diff --git a/src/emu/machine/msm58321.c b/src/emu/machine/msm58321.c
index ed45d55d5b0..7c0a96583a0 100644
--- a/src/emu/machine/msm58321.c
+++ b/src/emu/machine/msm58321.c
@@ -92,7 +92,7 @@ inline void msm58321_device::write_counter(int counter, int value)
 //-------------------------------------------------
 
 msm58321_device::msm58321_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MSM58321, "MSM58321", tag, owner, clock),
+	: device_t(mconfig, MSM58321, "MSM58321", tag, owner, clock, "msm58321", __FILE__),
 		device_rtc_interface(mconfig, *this),
 		m_cs2(0)
 {
diff --git a/src/emu/machine/msm6242.c b/src/emu/machine/msm6242.c
index 61280ef375a..6ad5b587def 100644
--- a/src/emu/machine/msm6242.c
+++ b/src/emu/machine/msm6242.c
@@ -64,7 +64,7 @@ const device_type msm6242 = &device_creator<msm6242_device>;
 //-------------------------------------------------
 
 msm6242_device::msm6242_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, msm6242, "msm6242", tag, owner, clock),
+	: device_t(mconfig, msm6242, "msm6242", tag, owner, clock, "msm6242", __FILE__),
 		device_rtc_interface(mconfig, *this)
 {
 }
diff --git a/src/emu/machine/n68681.c b/src/emu/machine/n68681.c
index e3ad5c55327..0cb152c4ce4 100644
--- a/src/emu/machine/n68681.c
+++ b/src/emu/machine/n68681.c
@@ -489,7 +489,7 @@ void duartn68681_device::set_ISR_bits(int mask)
 // DUART channel class stuff
 
 duart68681_channel::duart68681_channel(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, DUART68681CHANNEL, "DUART 68681 channel", tag, owner, clock),
+	: device_t(mconfig, DUART68681CHANNEL, "DUART 68681 channel", tag, owner, clock, "duart68681_channel", __FILE__),
 	device_serial_interface(mconfig, *this),
 	MR1(0),
 	MR2(0),
diff --git a/src/emu/machine/ncr539x.c b/src/emu/machine/ncr539x.c
index 2a28e18866e..2d5a23f9a41 100644
--- a/src/emu/machine/ncr539x.c
+++ b/src/emu/machine/ncr539x.c
@@ -138,7 +138,7 @@ const device_type NCR539X = &device_creator<ncr539x_device>;
 //-------------------------------------------------
 
 ncr539x_device::ncr539x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, NCR539X, "539x SCSI", tag, owner, clock)
+	: device_t(mconfig, NCR539X, "539x SCSI", tag, owner, clock, "ncr539x", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/netlist.c b/src/emu/machine/netlist.c
index 7d6671842e7..70b89756e2c 100644
--- a/src/emu/machine/netlist.c
+++ b/src/emu/machine/netlist.c
@@ -881,7 +881,7 @@ NETLIB_UPDATE(netdev_callback)
 const device_type NETLIST = &device_creator<netlist_mame_device>;
 
 netlist_mame_device::netlist_mame_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, NETLIST, "netlist", tag, owner, clock),
+	: device_t(mconfig, NETLIST, "netlist", tag, owner, clock, "netlist_mame", __FILE__),
 		device_execute_interface(mconfig, *this)
 {
 }
diff --git a/src/emu/machine/nmc9306.c b/src/emu/machine/nmc9306.c
index 9a232f8a5d2..ba8c27f59f3 100644
--- a/src/emu/machine/nmc9306.c
+++ b/src/emu/machine/nmc9306.c
@@ -105,7 +105,7 @@ inline void nmc9306_device::erase(offs_t offset)
 //-------------------------------------------------
 
 nmc9306_device::nmc9306_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, NMC9306, "NMC9306", tag, owner, clock),
+	: device_t(mconfig, NMC9306, "NMC9306", tag, owner, clock, "nmc9306", __FILE__),
 		device_nvram_interface(mconfig, *this),
 		m_state(STATE_IDLE),
 		m_ewen(false)
diff --git a/src/emu/machine/nscsi_bus.c b/src/emu/machine/nscsi_bus.c
index 615263d0489..4a31b02fda9 100644
--- a/src/emu/machine/nscsi_bus.c
+++ b/src/emu/machine/nscsi_bus.c
@@ -4,7 +4,7 @@ const device_type NSCSI_BUS = &device_creator<nscsi_bus_device>;
 const device_type NSCSI_CONNECTOR = &device_creator<nscsi_connector>;
 
 nscsi_bus_device::nscsi_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-	device_t(mconfig, NSCSI_BUS, "SCSI Bus", tag, owner, clock)
+	device_t(mconfig, NSCSI_BUS, "SCSI Bus", tag, owner, clock, "nscsi_bus", __FILE__)
 {
 	devcnt = 0;
 	memset(dev, 0, sizeof(dev));
@@ -124,7 +124,7 @@ void nscsi_bus_device::device_config_complete()
 
 
 nscsi_connector::nscsi_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-	device_t(mconfig, NSCSI_CONNECTOR, "NSCSI device connector abstraction", tag, owner, clock),
+	device_t(mconfig, NSCSI_CONNECTOR, "NSCSI device connector abstraction", tag, owner, clock, "nscsi_connector", __FILE__),
 	device_slot_interface(mconfig, *this)
 {
 }
diff --git a/src/emu/machine/nvram.c b/src/emu/machine/nvram.c
index 864416d3426..1e32e7965d4 100644
--- a/src/emu/machine/nvram.c
+++ b/src/emu/machine/nvram.c
@@ -54,7 +54,7 @@ const device_type NVRAM = &device_creator<nvram_device>;
 //-------------------------------------------------
 
 nvram_device::nvram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, NVRAM, "NVRAM", tag, owner, clock),
+	: device_t(mconfig, NVRAM, "NVRAM", tag, owner, clock, "nvram", __FILE__),
 		device_nvram_interface(mconfig, *this),
 		m_default_value(DEFAULT_ALL_1),
 		m_base(NULL),
diff --git a/src/emu/machine/pcf8593.c b/src/emu/machine/pcf8593.c
index 6dd6c894354..db237678804 100644
--- a/src/emu/machine/pcf8593.c
+++ b/src/emu/machine/pcf8593.c
@@ -45,7 +45,7 @@ const device_type PCF8593 = &device_creator<pcf8593_device>;
 //-------------------------------------------------
 
 pcf8593_device::pcf8593_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, PCF8593, "PCF8593 RTC", tag, owner, clock),
+	: device_t(mconfig, PCF8593, "PCF8593 RTC", tag, owner, clock, "pcf8593", __FILE__),
 		device_rtc_interface(mconfig, *this),
 		device_nvram_interface(mconfig, *this)
 {
diff --git a/src/emu/machine/pci.c b/src/emu/machine/pci.c
index efdcf64e19c..dc5927de688 100644
--- a/src/emu/machine/pci.c
+++ b/src/emu/machine/pci.c
@@ -88,7 +88,7 @@ const device_type PCI_BUS_LEGACY = &device_creator<pci_bus_legacy_device>;
 //  pci_bus_legacy_device - constructor
 //-------------------------------------------------
 pci_bus_legacy_device::pci_bus_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, PCI_BUS, "PCI Bus", tag, owner, clock),
+		device_t(mconfig, PCI_BUS, "PCI Bus", tag, owner, clock, "pci_bus_legacy", __FILE__),
 		m_father(NULL)
 {
 	for (int i = 0; i < ARRAY_LENGTH(m_devtag); i++) {
@@ -305,7 +305,7 @@ const device_type PCI_BUS = &device_creator<pci_bus_device>;
 //  pci_bus_device - constructor
 //-------------------------------------------------
 pci_bus_device::pci_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, PCI_BUS, "PCI Bus", tag, owner, clock),
+		device_t(mconfig, PCI_BUS, "PCI Bus", tag, owner, clock, "pci_bus", __FILE__),
 		m_father(NULL)
 {
 	for (int i = 0; i < ARRAY_LENGTH(m_devtag); i++) {
@@ -530,7 +530,7 @@ const device_type PCI_CONNECTOR = &device_creator<pci_connector>;
 
 
 pci_connector::pci_connector(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-	device_t(mconfig, PCI_CONNECTOR, "PCI device connector abstraction", tag, owner, clock),
+	device_t(mconfig, PCI_CONNECTOR, "PCI device connector abstraction", tag, owner, clock, "pci_connector", __FILE__),
 	device_slot_interface(mconfig, *this)
 {
 }
diff --git a/src/emu/machine/pd4990a.c b/src/emu/machine/pd4990a.c
index 88cd6bdaf97..56badddd88c 100644
--- a/src/emu/machine/pd4990a.c
+++ b/src/emu/machine/pd4990a.c
@@ -523,7 +523,7 @@ static DEVICE_RESET( upd4990a )
 const device_type UPD4990A_OLD = &device_creator<upd4990a_old_device>;
 
 upd4990a_old_device::upd4990a_old_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, UPD4990A_OLD, "NEC uPD4990A", tag, owner, clock)
+	: device_t(mconfig, UPD4990A_OLD, "NEC uPD4990A", tag, owner, clock, "upd4990a_old", __FILE__)
 {
 	m_token = global_alloc_clear(upd4990a_state);
 }
diff --git a/src/emu/machine/pic8259.c b/src/emu/machine/pic8259.c
index 3f96d96734c..53482ffad82 100644
--- a/src/emu/machine/pic8259.c
+++ b/src/emu/machine/pic8259.c
@@ -441,7 +441,7 @@ void pic8259_device::device_reset()
 const device_type PIC8259 = &device_creator<pic8259_device>;
 
 pic8259_device::pic8259_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, PIC8259, "Intel PIC8259", tag, owner, clock)
+	: device_t(mconfig, PIC8259, "Intel PIC8259", tag, owner, clock, "pit8259", __FILE__)
 	, m_out_int_func(*this)
 	, m_sp_en_func(*this)
 	, m_read_slave_ack_func(*this)
diff --git a/src/emu/machine/pit8253.c b/src/emu/machine/pit8253.c
index bf2e31c1577..e046c586522 100644
--- a/src/emu/machine/pit8253.c
+++ b/src/emu/machine/pit8253.c
@@ -42,17 +42,17 @@ const device_type PIT8254 = &device_creator<pit8254_device>;
 
 
 pit8253_device::pit8253_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-				: device_t(mconfig, PIT8253, "Intel PIT8253", tag, owner, clock)
+				: device_t(mconfig, PIT8253, "Intel PIT8253", tag, owner, clock, "pit8253", __FILE__)
 {
 }
 
-pit8253_device::pit8253_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
-				: device_t(mconfig, type, name, tag, owner, clock)
+pit8253_device::pit8253_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+				: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
 {
 }
 
 pit8254_device::pit8254_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-				: pit8253_device(mconfig, PIT8254, "Intel PIT8254", tag, owner, clock)
+				: pit8253_device(mconfig, PIT8254, "Intel PIT8254", tag, owner, clock, "pit8254", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/pit8253.h b/src/emu/machine/pit8253.h
index e8ef8bc2b9e..f07740f1db6 100644
--- a/src/emu/machine/pit8253.h
+++ b/src/emu/machine/pit8253.h
@@ -84,7 +84,7 @@ class pit8253_device : public device_t,
 {
 public:
 	pit8253_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	pit8253_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	pit8253_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 	~pit8253_device() {}
 
 
diff --git a/src/emu/machine/pla.c b/src/emu/machine/pla.c
index 812b7b3732e..e157cb8f5dd 100644
--- a/src/emu/machine/pla.c
+++ b/src/emu/machine/pla.c
@@ -28,8 +28,8 @@ const device_type MOS8721 = &device_creator<mos8721_device>;
 //  pla_device - constructor
 //-------------------------------------------------
 
-pla_device::pla_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, int inputs, int outputs, int terms, UINT32 input_mask)
-	: device_t(mconfig, type, name, tag, owner, clock),
+pla_device::pla_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, int inputs, int outputs, int terms, UINT32 input_mask, const char *shortname, const char *source)
+	: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
 		m_inputs(inputs),
 		m_outputs(outputs),
 		m_terms(terms),
@@ -38,12 +38,12 @@ pla_device::pla_device(const machine_config &mconfig, device_type type, const ch
 }
 
 pls100_device::pls100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: pla_device(mconfig, PLS100, "PLS100", tag, owner, clock, 16, 8, 48, 0xffff)
+	: pla_device(mconfig, PLS100, "PLS100", tag, owner, clock, 16, 8, 48, 0xffff, "pls100", __FILE__)
 {
 }
 
 mos8721_device::mos8721_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: pla_device(mconfig, MOS8721, "MOS8721", tag, owner, clock, 27, 18, 379, 0x7ffffff) // TODO actual number of terms is unknown
+	: pla_device(mconfig, MOS8721, "MOS8721", tag, owner, clock, 27, 18, 379, 0x7ffffff, "mos8721", __FILE__) // TODO actual number of terms is unknown
 {
 }
 
diff --git a/src/emu/machine/pla.h b/src/emu/machine/pla.h
index 4bd1480f621..1800f602b46 100644
--- a/src/emu/machine/pla.h
+++ b/src/emu/machine/pla.h
@@ -64,7 +64,7 @@ class pla_device :  public device_t
 {
 public:
 	// construction/destruction
-	pla_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, int inputs, int outputs, int terms, UINT32 output_mask);
+	pla_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, int inputs, int outputs, int terms, UINT32 output_mask, const char *shortname, const char *source);
 
 	UINT32 read(UINT32 input);
 
diff --git a/src/emu/machine/ram.c b/src/emu/machine/ram.c
index c7ac5bf09ee..987f8f7317b 100644
--- a/src/emu/machine/ram.c
+++ b/src/emu/machine/ram.c
@@ -28,7 +28,7 @@ const device_type RAM = &device_creator<ram_device>;
 //-------------------------------------------------
 
 ram_device::ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, RAM, "RAM", tag, owner, clock)
+	: device_t(mconfig, RAM, "RAM", tag, owner, clock, "ram", __FILE__)
 {
 	m_size = 0;
 	m_pointer = NULL;
diff --git a/src/emu/machine/roc10937.c b/src/emu/machine/roc10937.c
index eab1779ef03..ecd50bc6ca6 100644
--- a/src/emu/machine/roc10937.c
+++ b/src/emu/machine/roc10937.c
@@ -124,8 +124,8 @@ static const int roc10937poslut[]=
 
 const device_type ROC10937 = &device_creator<roc10937_t>;
 
-rocvfd_t::rocvfd_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
-	device_t(mconfig, type, name, tag, owner, clock)
+rocvfd_t::rocvfd_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+	device_t(mconfig, type, name, tag, owner, clock, shortname, source)
 {
 	m_port_val=0;
 	m_reversed=0;
@@ -229,7 +229,7 @@ void rocvfd_t::shift_data(int data)
 
 ///////////////////////////////////////////////////////////////////////////
 roc10937_t::roc10937_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: rocvfd_t(mconfig, ROC10937, "Rockwell 10937 VFD controller and compatible", tag, owner, clock)
+	: rocvfd_t(mconfig, ROC10937, "Rockwell 10937 VFD controller and compatible", tag, owner, clock, "roc10937", __FILE__)
 {
 	m_port_val=0;
 	m_reversed=0;
@@ -238,7 +238,7 @@ roc10937_t::roc10937_t(const machine_config &mconfig, const char *tag, device_t
 const device_type MSC1937 = &device_creator<msc1937_t>;
 
 msc1937_t::msc1937_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: rocvfd_t(mconfig, MSC1937, "OKI MSC1937 VFD controller", tag, owner, clock)
+	: rocvfd_t(mconfig, MSC1937, "OKI MSC1937 VFD controller", tag, owner, clock, "msc1937", __FILE__)
 {
 	m_port_val=0;
 	m_reversed=0;
@@ -298,7 +298,7 @@ void rocvfd_t::write_char(int data)
 const device_type ROC10957 = &device_creator<roc10957_t>;
 
 roc10957_t::roc10957_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: rocvfd_t(mconfig, ROC10957, "Rockwell 10957 VFD controller and compatible", tag, owner, clock)
+	: rocvfd_t(mconfig, ROC10957, "Rockwell 10957 VFD controller and compatible", tag, owner, clock, "roc10957", __FILE__)
 {
 	m_port_val=0;
 	m_reversed=0;
diff --git a/src/emu/machine/roc10937.h b/src/emu/machine/roc10937.h
index 40ad878a871..d32d9cf2dbe 100644
--- a/src/emu/machine/roc10937.h
+++ b/src/emu/machine/roc10937.h
@@ -51,7 +51,7 @@ class rocvfd_t : public device_t {
 public:
 	typedef delegate<void (bool state)> line_cb;
 
-	rocvfd_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	rocvfd_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 
 	// inline configuration helpers
 	static void static_set_value(device_t &device, int val);
diff --git a/src/emu/machine/rp5c01.c b/src/emu/machine/rp5c01.c
index 7c528feb3a5..dc9e472693b 100644
--- a/src/emu/machine/rp5c01.c
+++ b/src/emu/machine/rp5c01.c
@@ -173,7 +173,7 @@ inline void rp5c01_device::check_alarm()
 //-------------------------------------------------
 
 rp5c01_device::rp5c01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, RP5C01, "RP5C01", tag, owner, clock),
+	: device_t(mconfig, RP5C01, "RP5C01", tag, owner, clock, "rp5c01", __FILE__),
 		device_rtc_interface(mconfig, *this),
 		device_nvram_interface(mconfig, *this),
 		m_mode(0),
diff --git a/src/emu/machine/rp5c15.c b/src/emu/machine/rp5c15.c
index a086c8be90d..388f6f47845 100644
--- a/src/emu/machine/rp5c15.c
+++ b/src/emu/machine/rp5c15.c
@@ -184,7 +184,7 @@ inline void rp5c15_device::check_alarm()
 //-------------------------------------------------
 
 rp5c15_device::rp5c15_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, RP5C15, "RP5C15", tag, owner, clock),
+	: device_t(mconfig, RP5C15, "RP5C15", tag, owner, clock, "rp5c15", __FILE__),
 		device_rtc_interface(mconfig, *this),
 		m_alarm(1),
 		m_alarm_on(1),
diff --git a/src/emu/machine/rp5h01.c b/src/emu/machine/rp5h01.c
index b368b005be0..64b56ef6644 100644
--- a/src/emu/machine/rp5h01.c
+++ b/src/emu/machine/rp5h01.c
@@ -19,7 +19,7 @@
 const device_type RP5H01 = &device_creator<rp5h01_device>;
 
 rp5h01_device::rp5h01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, RP5H01, "RP5H01", tag, owner, clock)
+	: device_t(mconfig, RP5H01, "RP5H01", tag, owner, clock, "rp5h01", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/rtc4543.c b/src/emu/machine/rtc4543.c
index e77f5d42552..d2f0d4baa39 100644
--- a/src/emu/machine/rtc4543.c
+++ b/src/emu/machine/rtc4543.c
@@ -28,7 +28,7 @@ const device_type RTC4543 = &device_creator<rtc4543_device>;
 //-------------------------------------------------
 
 rtc4543_device::rtc4543_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, RTC4543, "Epson R4543", tag, owner, clock),
+	: device_t(mconfig, RTC4543, "Epson R4543", tag, owner, clock, "rtc4543", __FILE__),
 		device_rtc_interface(mconfig, *this)
 {
 }
diff --git a/src/emu/machine/rtc65271.c b/src/emu/machine/rtc65271.c
index 82c8cab0a84..79c8dd73e27 100644
--- a/src/emu/machine/rtc65271.c
+++ b/src/emu/machine/rtc65271.c
@@ -671,7 +671,7 @@ const device_type RTC65271 = &device_creator<rtc65271_device>;
 //-------------------------------------------------
 
 rtc65271_device::rtc65271_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, RTC65271, "RTC65271", tag, owner, clock),
+	: device_t(mconfig, RTC65271, "RTC65271", tag, owner, clock, "rtc65271", __FILE__),
 		device_nvram_interface(mconfig, *this)
 {
 }
diff --git a/src/emu/machine/rtc9701.c b/src/emu/machine/rtc9701.c
index 20c6dcc6a95..f98665eaa74 100644
--- a/src/emu/machine/rtc9701.c
+++ b/src/emu/machine/rtc9701.c
@@ -31,7 +31,7 @@ const device_type rtc9701 = &device_creator<rtc9701_device>;
 //-------------------------------------------------
 
 rtc9701_device::rtc9701_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, rtc9701, "rtc9701", tag, owner, clock),
+	: device_t(mconfig, rtc9701, "rtc9701", tag, owner, clock, "rtc9701", __FILE__),
 		device_nvram_interface(mconfig, *this),
 		m_latch(0),
 		m_reset_line(CLEAR_LINE),
diff --git a/src/emu/machine/s3520cf.c b/src/emu/machine/s3520cf.c
index 0e844cd41a5..98e1ec524d3 100644
--- a/src/emu/machine/s3520cf.c
+++ b/src/emu/machine/s3520cf.c
@@ -34,7 +34,7 @@ const device_type S3520CF = &device_creator<s3520cf_device>;
 //-------------------------------------------------
 
 s3520cf_device::s3520cf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, S3520CF, "s3520cf", tag, owner, clock)
+	: device_t(mconfig, S3520CF, "s3520cf", tag, owner, clock, "s3520cf", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/s3c2400.c b/src/emu/machine/s3c2400.c
index a9db12f0670..fd3952b2dfb 100644
--- a/src/emu/machine/s3c2400.c
+++ b/src/emu/machine/s3c2400.c
@@ -69,7 +69,7 @@ DEVICE_START( s3c2400 )
 const device_type S3C2400 = &device_creator<s3c2400_device>;
 
 s3c2400_device::s3c2400_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-		: device_t(mconfig, S3C2400, "Samsung S3C2400", tag, owner, clock)
+		: device_t(mconfig, S3C2400, "Samsung S3C2400", tag, owner, clock, "s3c2400", __FILE__)
 {
 	m_token = global_alloc_clear(s3c24xx_t);
 }
diff --git a/src/emu/machine/s3c2410.c b/src/emu/machine/s3c2410.c
index 4b4a83fa38f..90a08028c7f 100644
--- a/src/emu/machine/s3c2410.c
+++ b/src/emu/machine/s3c2410.c
@@ -72,7 +72,7 @@ DEVICE_START( s3c2410 )
 const device_type S3C2410 = &device_creator<s3c2410_device>;
 
 s3c2410_device::s3c2410_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-		: device_t(mconfig, S3C2410, "Samsung S3C2410", tag, owner, clock)
+		: device_t(mconfig, S3C2410, "Samsung S3C2410", tag, owner, clock, "s3c2410", __FILE__)
 {
 	m_token = global_alloc_clear(s3c24xx_t);
 }
diff --git a/src/emu/machine/s3c2440.c b/src/emu/machine/s3c2440.c
index e5170cfc57a..75c64b16cd3 100644
--- a/src/emu/machine/s3c2440.c
+++ b/src/emu/machine/s3c2440.c
@@ -74,7 +74,7 @@ DEVICE_START( s3c2440 )
 const device_type S3C2440 = &device_creator<s3c2440_device>;
 
 s3c2440_device::s3c2440_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-		: device_t(mconfig, S3C2440, "Samsung S3C2440", tag, owner, clock)
+		: device_t(mconfig, S3C2440, "Samsung S3C2440", tag, owner, clock, "s3c2440", __FILE__)
 {
 	m_token = global_alloc_clear(s3c24xx_t);
 }
diff --git a/src/emu/machine/scsibus.c b/src/emu/machine/scsibus.c
index 6ea20167a54..7ca98a1e94c 100644
--- a/src/emu/machine/scsibus.c
+++ b/src/emu/machine/scsibus.c
@@ -32,7 +32,7 @@ void scsibus_device::scsi_update()
 }
 
 scsibus_device::scsibus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, SCSIBUS, "SCSI bus", tag, owner, clock)
+	: device_t(mconfig, SCSIBUS, "SCSI bus", tag, owner, clock, "scsibus", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/secflash.c b/src/emu/machine/secflash.c
index 0e6876760fa..6456cbd4b0e 100644
--- a/src/emu/machine/secflash.c
+++ b/src/emu/machine/secflash.c
@@ -4,8 +4,8 @@
 device_secure_serial_flash::device_secure_serial_flash(const machine_config &mconfig,
 																		device_type type,
 																		const char *name, const char *tag,
-																		device_t *owner, UINT32 clock) :
-	device_t(mconfig, type, name, tag, owner, clock),
+																		device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+	device_t(mconfig, type, name, tag, owner, clock, shortname, source),
 	device_nvram_interface(mconfig, *this)
 {
 }
diff --git a/src/emu/machine/secflash.h b/src/emu/machine/secflash.h
index 4a2e441d65e..7c70c0a53a3 100644
--- a/src/emu/machine/secflash.h
+++ b/src/emu/machine/secflash.h
@@ -27,7 +27,7 @@ protected:
 	virtual void sda_0() = 0;
 	virtual void sda_1() = 0;
 
-	device_secure_serial_flash(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	device_secure_serial_flash(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 	virtual void device_start();
 	virtual void device_reset();
 };
diff --git a/src/emu/machine/seibu_cop.c b/src/emu/machine/seibu_cop.c
index 7418ea81ee7..35a4490fd16 100644
--- a/src/emu/machine/seibu_cop.c
+++ b/src/emu/machine/seibu_cop.c
@@ -67,7 +67,7 @@ inline void seibu_cop_device::write_word(offs_t address, UINT16 data)
 //-------------------------------------------------
 
 seibu_cop_device::seibu_cop_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, SEIBU_COP, "seibu_cop", tag, owner, clock),
+	: device_t(mconfig, SEIBU_COP, "seibu_cop", tag, owner, clock, "seibu_cop", __FILE__),
 		device_memory_interface(mconfig, *this),
 		m_space_config("io", ENDIANNESS_LITTLE, 16, 16, 0, NULL, *ADDRESS_MAP_NAME(seibu_cop_io))
 {
diff --git a/src/emu/machine/serflash.c b/src/emu/machine/serflash.c
index 5653e58f4f0..836195dd4a7 100644
--- a/src/emu/machine/serflash.c
+++ b/src/emu/machine/serflash.c
@@ -20,7 +20,7 @@ const device_type SERFLASH = &device_creator<serflash_device>;
 //-------------------------------------------------
 
 serflash_device::serflash_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, SERFLASH, "SERFLASH", tag, owner, clock),
+	: device_t(mconfig, SERFLASH, "SERFLASH", tag, owner, clock, "serflash", __FILE__),
 		device_nvram_interface(mconfig, *this),
 		m_length(0)
 {
diff --git a/src/emu/machine/smc91c9x.c b/src/emu/machine/smc91c9x.c
index 70866ddcba9..bfff8d3ef8f 100644
--- a/src/emu/machine/smc91c9x.c
+++ b/src/emu/machine/smc91c9x.c
@@ -583,8 +583,8 @@ static DEVICE_RESET( smc91c9x )
 }
 
 
-smc91c9x_device::smc91c9x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, type, name, tag, owner, clock)
+smc91c9x_device::smc91c9x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+	: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
 {
 	m_token = global_alloc_clear(smc91c9x_state);
 }
@@ -621,7 +621,7 @@ void smc91c9x_device::device_reset()
 const device_type SMC91C94 = &device_creator<smc91c94_device>;
 
 smc91c94_device::smc91c94_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: smc91c9x_device(mconfig, SMC91C94, "SMC91C94", tag, owner, clock)
+	: smc91c9x_device(mconfig, SMC91C94, "SMC91C94", tag, owner, clock, "smc91c94", __FILE__)
 {
 }
 
@@ -629,6 +629,6 @@ smc91c94_device::smc91c94_device(const machine_config &mconfig, const char *tag,
 const device_type SMC91C96 = &device_creator<smc91c96_device>;
 
 smc91c96_device::smc91c96_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: smc91c9x_device(mconfig, SMC91C96, "SMC91C96", tag, owner, clock)
+	: smc91c9x_device(mconfig, SMC91C96, "SMC91C96", tag, owner, clock, "smc91c96", __FILE__)
 {
 }
diff --git a/src/emu/machine/smc91c9x.h b/src/emu/machine/smc91c9x.h
index 9a45f0d47e5..c9fcaea2ab1 100644
--- a/src/emu/machine/smc91c9x.h
+++ b/src/emu/machine/smc91c9x.h
@@ -52,7 +52,7 @@ DECLARE_WRITE16_DEVICE_HANDLER( smc91c9x_w );
 class smc91c9x_device : public device_t
 {
 public:
-	smc91c9x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	smc91c9x_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 	~smc91c9x_device() { global_free(m_token); }
 
 	// access to legacy token
diff --git a/src/emu/machine/spchrom.c b/src/emu/machine/spchrom.c
index 37678a9296d..22883a2ed2e 100644
--- a/src/emu/machine/spchrom.c
+++ b/src/emu/machine/spchrom.c
@@ -24,7 +24,7 @@
 const device_type SPEECHROM = &device_creator<speechrom_device>;
 
 speechrom_device::speechrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, SPEECHROM, "SPEECHROM", tag, owner, clock),
+	: device_t(mconfig, SPEECHROM, "SPEECHROM", tag, owner, clock, "speechrom", __FILE__),
 	m_speechROMaddr(0),
 	m_load_pointer(0),
 	m_ROM_bits_count(0)
diff --git a/src/emu/machine/tc009xlvc.c b/src/emu/machine/tc009xlvc.c
index e66ecbdc18f..c81cedf4f68 100644
--- a/src/emu/machine/tc009xlvc.c
+++ b/src/emu/machine/tc009xlvc.c
@@ -163,7 +163,7 @@ static ADDRESS_MAP_START( tc0091lvc_map8, AS_0, 8, tc0091lvc_device )
 ADDRESS_MAP_END
 
 tc0091lvc_device::tc0091lvc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, TC0091LVC, "TC0091LVC", tag, owner, clock),
+	: device_t(mconfig, TC0091LVC, "TC0091LVC", tag, owner, clock, "tc0091lvc", __FILE__),
 		device_memory_interface(mconfig, *this),
 		m_space_config("tc0091lvc", ENDIANNESS_LITTLE, 8,20, 0, NULL, *ADDRESS_MAP_NAME(tc0091lvc_map8))
 {
diff --git a/src/emu/machine/timekpr.c b/src/emu/machine/timekpr.c
index dc7008fda74..1ba33fd46d8 100644
--- a/src/emu/machine/timekpr.c
+++ b/src/emu/machine/timekpr.c
@@ -117,14 +117,14 @@ static int counter_from_ram( UINT8 *data, int offset )
 //  timekeeper_device_config - constructor
 //-------------------------------------------------
 
-timekeeper_device::timekeeper_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, type, name, tag, owner, clock),
+timekeeper_device::timekeeper_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+	: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
 		device_nvram_interface(mconfig, *this)
 {
 }
 
 m48t02_device::m48t02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: timekeeper_device(mconfig, M48T02, "M48T02", tag, owner, clock)
+	: timekeeper_device(mconfig, M48T02, "M48T02", tag, owner, clock, "m48t02", __FILE__)
 {
 	m_offset_control = 0x7f8;
 	m_offset_seconds = 0x7f9;
@@ -140,7 +140,7 @@ m48t02_device::m48t02_device(const machine_config &mconfig, const char *tag, dev
 }
 
 m48t35_device::m48t35_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: timekeeper_device(mconfig, M48T35, "M48T35", tag, owner, clock)
+	: timekeeper_device(mconfig, M48T35, "M48T35", tag, owner, clock, "m48t35", __FILE__)
 {
 	m_offset_control = 0x7ff8;
 	m_offset_seconds = 0x7ff9;
@@ -156,7 +156,7 @@ m48t35_device::m48t35_device(const machine_config &mconfig, const char *tag, dev
 }
 
 m48t37_device::m48t37_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: timekeeper_device(mconfig, M48T37, "M48T37", tag, owner, clock)
+	: timekeeper_device(mconfig, M48T37, "M48T37", tag, owner, clock, "m48t37", __FILE__)
 {
 	m_offset_control = 0x7ff8;
 	m_offset_seconds = 0x7ff9;
@@ -172,7 +172,7 @@ m48t37_device::m48t37_device(const machine_config &mconfig, const char *tag, dev
 }
 
 m48t58_device::m48t58_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: timekeeper_device(mconfig, M48T58, "M48T58", tag, owner, clock)
+	: timekeeper_device(mconfig, M48T58, "M48T58", tag, owner, clock, "m48t58", __FILE__)
 {
 	m_offset_control = 0x1ff8;
 	m_offset_seconds = 0x1ff9;
@@ -188,7 +188,7 @@ m48t58_device::m48t58_device(const machine_config &mconfig, const char *tag, dev
 }
 
 mk48t08_device::mk48t08_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: timekeeper_device(mconfig, MK48T08, "MK48T08", tag, owner, clock)
+	: timekeeper_device(mconfig, MK48T08, "MK48T08", tag, owner, clock, "m48t08", __FILE__)
 {
 	m_offset_control = 0x1ff8;
 	m_offset_seconds = 0x1ff9;
diff --git a/src/emu/machine/timekpr.h b/src/emu/machine/timekpr.h
index c7c31418177..2ba4b76dac4 100644
--- a/src/emu/machine/timekpr.h
+++ b/src/emu/machine/timekpr.h
@@ -61,7 +61,7 @@ class timekeeper_device :   public device_t,
 {
 protected:
 	// construction/destruction
-	timekeeper_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	timekeeper_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 
 public:
 	DECLARE_WRITE8_MEMBER( write );
diff --git a/src/emu/machine/tms6100.c b/src/emu/machine/tms6100.c
index 9fd5bf7c77e..fa32e7d7d7f 100644
--- a/src/emu/machine/tms6100.c
+++ b/src/emu/machine/tms6100.c
@@ -76,20 +76,20 @@
 
 const device_type TMS6100 = &device_creator<tms6100_device>;
 
-tms6100_device::tms6100_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, type, name, tag, owner, clock)
+tms6100_device::tms6100_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+	: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
 {
 }
 
 tms6100_device::tms6100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, TMS6100, "TMS6100", tag, owner, clock)
+	: device_t(mconfig, TMS6100, "TMS6100", tag, owner, clock, "tms6100", __FILE__)
 {
 }
 
 const device_type M58819 = &device_creator<m58819_device>;
 
 m58819_device::m58819_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: tms6100_device(mconfig, M58819, "M58819", tag, owner, clock)
+	: tms6100_device(mconfig, M58819, "M58819", tag, owner, clock, "m58819", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/tms6100.h b/src/emu/machine/tms6100.h
index edfb348c6b1..98754b91335 100644
--- a/src/emu/machine/tms6100.h
+++ b/src/emu/machine/tms6100.h
@@ -9,7 +9,7 @@ class tms6100_device : public device_t
 {
 public:
 	tms6100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	tms6100_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	tms6100_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 
 	DECLARE_WRITE_LINE_MEMBER( tms6100_m0_w );
 	DECLARE_WRITE_LINE_MEMBER( tms6100_m1_w );
diff --git a/src/emu/machine/tms9901.c b/src/emu/machine/tms9901.c
index b37f1e1ad7d..91537988d77 100644
--- a/src/emu/machine/tms9901.c
+++ b/src/emu/machine/tms9901.c
@@ -106,7 +106,7 @@ TODO: Tests on a real machine
     Constructor
 */
 tms9901_device::tms9901_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: device_t(mconfig, TMS9901, "TMS9901 Programmable System Interface", tag, owner, clock)
+: device_t(mconfig, TMS9901, "TMS9901 Programmable System Interface", tag, owner, clock, "tms9901", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/tms9902.c b/src/emu/machine/tms9902.c
index 45fe67dfa1e..9abd47c9c50 100644
--- a/src/emu/machine/tms9902.c
+++ b/src/emu/machine/tms9902.c
@@ -59,7 +59,7 @@ enum
     Constructor
 */
 tms9902_device::tms9902_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: device_t(mconfig, TMS9902, "TMS9902 Asynchronous Communication Controller", tag, owner, clock)
+: device_t(mconfig, TMS9902, "TMS9902 Asynchronous Communication Controller", tag, owner, clock, "tms9902", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/upd1990a.c b/src/emu/machine/upd1990a.c
index a9089a92c9f..056ccc46f33 100644
--- a/src/emu/machine/upd1990a.c
+++ b/src/emu/machine/upd1990a.c
@@ -46,8 +46,8 @@ const device_type UPD4990A = &device_creator<upd4990a_device>;
 //  upd1990a_device - constructor
 //-------------------------------------------------
 
-upd1990a_device::upd1990a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant)
-	: device_t(mconfig, type, name, tag, owner, clock),
+upd1990a_device::upd1990a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
+	: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
 		device_rtc_interface(mconfig, *this),
 		m_write_data(*this),
 		m_write_tp(*this),
@@ -59,7 +59,7 @@ upd1990a_device::upd1990a_device(const machine_config &mconfig, device_type type
 }
 
 upd1990a_device::upd1990a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, UPD1990A, "uPD1990A", tag, owner, clock),
+	: device_t(mconfig, UPD1990A, "uPD1990A", tag, owner, clock, "upd1990a", __FILE__),
 		device_rtc_interface(mconfig, *this),
 		m_write_data(*this),
 		m_write_tp(*this),
@@ -71,7 +71,7 @@ upd1990a_device::upd1990a_device(const machine_config &mconfig, const char *tag,
 }
 
 upd4990a_device::upd4990a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: upd1990a_device(mconfig, UPD4990A, "uPD4990A", tag, owner, clock, TYPE_4990A) { }
+	: upd1990a_device(mconfig, UPD4990A, "uPD4990A", tag, owner, clock, TYPE_4990A, "upd4990a", __FILE__) { }
 
 
 //-------------------------------------------------
diff --git a/src/emu/machine/upd1990a.h b/src/emu/machine/upd1990a.h
index 914f7290d77..e37b00bde43 100644
--- a/src/emu/machine/upd1990a.h
+++ b/src/emu/machine/upd1990a.h
@@ -53,7 +53,7 @@ class upd1990a_device : public device_t,
 {
 public:
 	// construction/destruction
-	upd1990a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant);
+	upd1990a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
 	upd1990a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
 
 	template<class _data> void set_data_callback(_data data) { m_write_data.set_callback(data); }
diff --git a/src/emu/machine/upd4701.c b/src/emu/machine/upd4701.c
index 871a2ccc220..4f1654ecbeb 100644
--- a/src/emu/machine/upd4701.c
+++ b/src/emu/machine/upd4701.c
@@ -17,7 +17,7 @@
 const device_type UPD4701 = &device_creator<upd4701_device>;
 
 upd4701_device::upd4701_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, UPD4701, "NEC uPD4701 Encoder", tag, owner, clock)
+	: device_t(mconfig, UPD4701, "NEC uPD4701 Encoder", tag, owner, clock, "upd4701", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/upd7002.c b/src/emu/machine/upd7002.c
index 84770daa1cf..b586b879a11 100644
--- a/src/emu/machine/upd7002.c
+++ b/src/emu/machine/upd7002.c
@@ -211,7 +211,7 @@ static DEVICE_RESET( uPD7002 )
 const device_type UPD7002 = &device_creator<uPD7002_device>;
 
 uPD7002_device::uPD7002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, UPD7002, "uPD7002", tag, owner, clock)
+	: device_t(mconfig, UPD7002, "uPD7002", tag, owner, clock, "upd7002", __FILE__)
 {
 	m_token = global_alloc_clear(uPD7002_t);
 }
diff --git a/src/emu/machine/v3021.c b/src/emu/machine/v3021.c
index 57b617e2a70..626e2e0ed5d 100644
--- a/src/emu/machine/v3021.c
+++ b/src/emu/machine/v3021.c
@@ -32,7 +32,7 @@ const device_type v3021 = &device_creator<v3021_device>;
 //-------------------------------------------------
 
 v3021_device::v3021_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, v3021, "v3021", tag, owner, clock)
+	: device_t(mconfig, v3021, "v3021", tag, owner, clock, "v3021", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/vt83c461.c b/src/emu/machine/vt83c461.c
index 4da2166a9f4..05400710197 100644
--- a/src/emu/machine/vt83c461.c
+++ b/src/emu/machine/vt83c461.c
@@ -17,7 +17,7 @@
 const device_type VT83C461 = &device_creator<vt83c461_device>;
 
 vt83c461_device::vt83c461_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-	ide_controller_device(mconfig, VT83C461, "VIA VT83C461", tag, owner, clock),
+	ide_controller_device(mconfig, VT83C461, "VIA VT83C461", tag, owner, clock, "vt83c461", __FILE__),
 	m_config_unknown(0),
 	m_config_register_num(0)
 {
diff --git a/src/emu/machine/wd11c00_17.c b/src/emu/machine/wd11c00_17.c
index 58e956b311a..ebda87dc15d 100644
--- a/src/emu/machine/wd11c00_17.c
+++ b/src/emu/machine/wd11c00_17.c
@@ -209,7 +209,7 @@ inline void wd11c00_17_device::select()
 //-------------------------------------------------
 
 wd11c00_17_device::wd11c00_17_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, WD11C00_17, "Western Digital WD11C00-17", tag, owner, clock),
+	: device_t(mconfig, WD11C00_17, "Western Digital WD11C00-17", tag, owner, clock, "wd11c00_17", __FILE__),
 		m_status(0),
 		m_ra(0),
 		m_irq5(CLEAR_LINE),
diff --git a/src/emu/machine/wd17xx.c b/src/emu/machine/wd17xx.c
index 19802c3e028..cd4d63827e8 100644
--- a/src/emu/machine/wd17xx.c
+++ b/src/emu/machine/wd17xx.c
@@ -2099,7 +2099,7 @@ void wd17xx_reset(device_t *device)
 const device_type FD1771 = &device_creator<fd1771_device>;
 
 fd1771_device::fd1771_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: wd1770_device(mconfig, FD1771, "FD1771", tag, owner, clock)
+	: wd1770_device(mconfig, FD1771, "FD1771", tag, owner, clock, "fd1771", __FILE__)
 {
 }
 
@@ -2107,7 +2107,7 @@ fd1771_device::fd1771_device(const machine_config &mconfig, const char *tag, dev
 const device_type FD1781 = &device_creator<fd1781_device>;
 
 fd1781_device::fd1781_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: wd1770_device(mconfig, FD1781, "FD1781", tag, owner, clock)
+	: wd1770_device(mconfig, FD1781, "FD1781", tag, owner, clock, "fd1781", __FILE__)
 {
 }
 
@@ -2115,7 +2115,7 @@ fd1781_device::fd1781_device(const machine_config &mconfig, const char *tag, dev
 const device_type FD1791 = &device_creator<fd1791_device>;
 
 fd1791_device::fd1791_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: wd1770_device(mconfig, FD1791, "FD1791", tag, owner, clock)
+	: wd1770_device(mconfig, FD1791, "FD1791", tag, owner, clock, "fd1791", __FILE__)
 {
 }
 
@@ -2123,7 +2123,7 @@ fd1791_device::fd1791_device(const machine_config &mconfig, const char *tag, dev
 const device_type FD1792 = &device_creator<fd1792_device>;
 
 fd1792_device::fd1792_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: wd1770_device(mconfig, FD1792, "FD1792", tag, owner, clock)
+	: wd1770_device(mconfig, FD1792, "FD1792", tag, owner, clock, "fd1792", __FILE__)
 {
 }
 
@@ -2131,7 +2131,7 @@ fd1792_device::fd1792_device(const machine_config &mconfig, const char *tag, dev
 const device_type FD1793 = &device_creator<fd1793_device>;
 
 fd1793_device::fd1793_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: wd1770_device(mconfig, FD1793, "FD1793", tag, owner, clock)
+	: wd1770_device(mconfig, FD1793, "FD1793", tag, owner, clock, "fd1793", __FILE__)
 {
 }
 
@@ -2139,7 +2139,7 @@ fd1793_device::fd1793_device(const machine_config &mconfig, const char *tag, dev
 const device_type FD1794 = &device_creator<fd1794_device>;
 
 fd1794_device::fd1794_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: wd1770_device(mconfig, FD1794, "FD1794", tag, owner, clock)
+	: wd1770_device(mconfig, FD1794, "FD1794", tag, owner, clock, "fd1794", __FILE__)
 {
 }
 
@@ -2147,7 +2147,7 @@ fd1794_device::fd1794_device(const machine_config &mconfig, const char *tag, dev
 const device_type FD1795 = &device_creator<fd1795_device>;
 
 fd1795_device::fd1795_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: wd1770_device(mconfig, FD1795, "FD1795", tag, owner, clock)
+	: wd1770_device(mconfig, FD1795, "FD1795", tag, owner, clock, "fd1795", __FILE__)
 {
 }
 
@@ -2155,7 +2155,7 @@ fd1795_device::fd1795_device(const machine_config &mconfig, const char *tag, dev
 const device_type FD1797 = &device_creator<fd1797_device>;
 
 fd1797_device::fd1797_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: wd1770_device(mconfig, FD1797, "FD1797", tag, owner, clock)
+	: wd1770_device(mconfig, FD1797, "FD1797", tag, owner, clock, "fd1797", __FILE__)
 {
 }
 
@@ -2163,7 +2163,7 @@ fd1797_device::fd1797_device(const machine_config &mconfig, const char *tag, dev
 const device_type FD1761 = &device_creator<fd1761_device>;
 
 fd1761_device::fd1761_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: wd1770_device(mconfig, FD1761, "FD1761", tag, owner, clock)
+	: wd1770_device(mconfig, FD1761, "FD1761", tag, owner, clock, "fd1761", __FILE__)
 {
 }
 
@@ -2171,7 +2171,7 @@ fd1761_device::fd1761_device(const machine_config &mconfig, const char *tag, dev
 const device_type FD1762 = &device_creator<fd1762_device>;
 
 fd1762_device::fd1762_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: wd1770_device(mconfig, FD1762, "FD1762", tag, owner, clock)
+	: wd1770_device(mconfig, FD1762, "FD1762", tag, owner, clock, "fd1762", __FILE__)
 {
 }
 
@@ -2179,7 +2179,7 @@ fd1762_device::fd1762_device(const machine_config &mconfig, const char *tag, dev
 const device_type FD1763 = &device_creator<fd1763_device>;
 
 fd1763_device::fd1763_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: wd1770_device(mconfig, FD1763, "FD1763", tag, owner, clock)
+	: wd1770_device(mconfig, FD1763, "FD1763", tag, owner, clock, "fd1763", __FILE__)
 {
 }
 
@@ -2187,7 +2187,7 @@ fd1763_device::fd1763_device(const machine_config &mconfig, const char *tag, dev
 const device_type FD1764 = &device_creator<fd1764_device>;
 
 fd1764_device::fd1764_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: wd1770_device(mconfig, FD1764, "FD1764", tag, owner, clock)
+	: wd1770_device(mconfig, FD1764, "FD1764", tag, owner, clock, "fd1764", __FILE__)
 {
 }
 
@@ -2195,7 +2195,7 @@ fd1764_device::fd1764_device(const machine_config &mconfig, const char *tag, dev
 const device_type FD1765 = &device_creator<fd1765_device>;
 
 fd1765_device::fd1765_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: wd1770_device(mconfig, FD1765, "FD1765", tag, owner, clock)
+	: wd1770_device(mconfig, FD1765, "FD1765", tag, owner, clock, "fd1765", __FILE__)
 {
 }
 
@@ -2203,7 +2203,7 @@ fd1765_device::fd1765_device(const machine_config &mconfig, const char *tag, dev
 const device_type FD1767 = &device_creator<fd1767_device>;
 
 fd1767_device::fd1767_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: wd1770_device(mconfig, FD1767, "FD1767", tag, owner, clock)
+	: wd1770_device(mconfig, FD1767, "FD1767", tag, owner, clock, "fd1767", __FILE__)
 {
 }
 
@@ -2211,7 +2211,7 @@ fd1767_device::fd1767_device(const machine_config &mconfig, const char *tag, dev
 const device_type WD2791 = &device_creator<wd2791_device>;
 
 wd2791_device::wd2791_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: wd1770_device(mconfig, WD2791, "WD2791", tag, owner, clock)
+	: wd1770_device(mconfig, WD2791, "WD2791", tag, owner, clock, "wd2791", __FILE__)
 {
 }
 
@@ -2219,7 +2219,7 @@ wd2791_device::wd2791_device(const machine_config &mconfig, const char *tag, dev
 const device_type WD2793 = &device_creator<wd2793_device>;
 
 wd2793_device::wd2793_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: wd1770_device(mconfig, WD2793, "WD2793", tag, owner, clock)
+	: wd1770_device(mconfig, WD2793, "WD2793", tag, owner, clock, "wd2793", __FILE__)
 {
 }
 
@@ -2227,7 +2227,7 @@ wd2793_device::wd2793_device(const machine_config &mconfig, const char *tag, dev
 const device_type WD2795 = &device_creator<wd2795_device>;
 
 wd2795_device::wd2795_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: wd1770_device(mconfig, WD2795, "WD2795", tag, owner, clock)
+	: wd1770_device(mconfig, WD2795, "WD2795", tag, owner, clock, "wd2795", __FILE__)
 {
 }
 
@@ -2235,7 +2235,7 @@ wd2795_device::wd2795_device(const machine_config &mconfig, const char *tag, dev
 const device_type WD2797 = &device_creator<wd2797_device>;
 
 wd2797_device::wd2797_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: wd1770_device(mconfig, WD2797, "WD2797", tag, owner, clock)
+	: wd1770_device(mconfig, WD2797, "WD2797", tag, owner, clock, "wd2797", __FILE__)
 {
 }
 
@@ -2243,12 +2243,12 @@ wd2797_device::wd2797_device(const machine_config &mconfig, const char *tag, dev
 const device_type WD1770 = &device_creator<wd1770_device>;
 
 wd1770_device::wd1770_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, WD1770, "WD1770", tag, owner, clock)
+	: device_t(mconfig, WD1770, "WD1770", tag, owner, clock, "wd1770", __FILE__)
 {
 	m_token = global_alloc_clear(wd1770_state);
 }
-wd1770_device::wd1770_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, type, name, tag, owner, clock)
+wd1770_device::wd1770_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+	: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
 {
 	m_token = global_alloc_clear(wd1770_state);
 }
@@ -2285,7 +2285,7 @@ void wd1770_device::device_reset()
 const device_type WD1772 = &device_creator<wd1772_device>;
 
 wd1772_device::wd1772_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: wd1770_device(mconfig, WD1772, "WD1772", tag, owner, clock)
+	: wd1770_device(mconfig, WD1772, "WD1772", tag, owner, clock, "wd1772", __FILE__)
 {
 }
 
@@ -2302,7 +2302,7 @@ void wd1772_device::device_start()
 const device_type WD1773 = &device_creator<wd1773_device>;
 
 wd1773_device::wd1773_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: wd1770_device(mconfig, WD1773, "WD1773", tag, owner, clock)
+	: wd1770_device(mconfig, WD1773, "WD1773", tag, owner, clock, "wd1773", __FILE__)
 {
 }
 
@@ -2310,7 +2310,7 @@ wd1773_device::wd1773_device(const machine_config &mconfig, const char *tag, dev
 const device_type MB8866 = &device_creator<mb8866_device>;
 
 mb8866_device::mb8866_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: wd1770_device(mconfig, MB8866, "MB8866", tag, owner, clock)
+	: wd1770_device(mconfig, MB8866, "MB8866", tag, owner, clock, "mb8866", __FILE__)
 {
 }
 
@@ -2318,7 +2318,7 @@ mb8866_device::mb8866_device(const machine_config &mconfig, const char *tag, dev
 const device_type MB8876 = &device_creator<mb8876_device>;
 
 mb8876_device::mb8876_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: wd1770_device(mconfig, MB8876, "MB8876", tag, owner, clock)
+	: wd1770_device(mconfig, MB8876, "MB8876", tag, owner, clock, "mb8876", __FILE__)
 {
 }
 
@@ -2326,6 +2326,6 @@ mb8876_device::mb8876_device(const machine_config &mconfig, const char *tag, dev
 const device_type MB8877 = &device_creator<mb8877_device>;
 
 mb8877_device::mb8877_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: wd1770_device(mconfig, MB8877, "MB8877", tag, owner, clock)
+	: wd1770_device(mconfig, MB8877, "MB8877", tag, owner, clock, "mb8877", __FILE__)
 {
 }
diff --git a/src/emu/machine/wd17xx.h b/src/emu/machine/wd17xx.h
index 28cd57ad5d4..f73a3c51093 100644
--- a/src/emu/machine/wd17xx.h
+++ b/src/emu/machine/wd17xx.h
@@ -21,7 +21,7 @@ class wd1770_device : public device_t
 {
 public:
 	wd1770_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	wd1770_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	wd1770_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 	~wd1770_device() { global_free(m_token); }
 
 	// access to legacy token
diff --git a/src/emu/machine/wd2010.c b/src/emu/machine/wd2010.c
index 2cd62904222..cfe52a0ce70 100644
--- a/src/emu/machine/wd2010.c
+++ b/src/emu/machine/wd2010.c
@@ -140,7 +140,7 @@ void wd2010_device::device_config_complete()
 //-------------------------------------------------
 
 wd2010_device::wd2010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, WD2010, "Western Digital WD2010", tag, owner, clock),
+	: device_t(mconfig, WD2010, "Western Digital WD2010", tag, owner, clock, "wd2010", __FILE__),
 	m_status(0),
 	m_error(0)
 {
diff --git a/src/emu/machine/wd33c93.c b/src/emu/machine/wd33c93.c
index 5325a13fbc3..bb16ee721eb 100644
--- a/src/emu/machine/wd33c93.c
+++ b/src/emu/machine/wd33c93.c
@@ -740,7 +740,7 @@ READ8_MEMBER(wd33c93_device::read)
 }
 
 wd33c93_device::wd33c93_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, WD33C93, "33C93 SCSI", tag, owner, clock)
+	: device_t(mconfig, WD33C93, "33C93 SCSI", tag, owner, clock, "wd33c93", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/wd_fdc.c b/src/emu/machine/wd_fdc.c
index 9231d175605..efe07aa0ba4 100644
--- a/src/emu/machine/wd_fdc.c
+++ b/src/emu/machine/wd_fdc.c
@@ -58,8 +58,8 @@ const device_type WD1770x = &device_creator<wd1770_t>;
 const device_type WD1772x = &device_creator<wd1772_t>;
 const device_type WD1773x = &device_creator<wd1773_t>;
 
-wd_fdc_t::wd_fdc_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
-	device_t(mconfig, type, name, tag, owner, clock)
+wd_fdc_t::wd_fdc_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+	device_t(mconfig, type, name, tag, owner, clock, shortname, source)
 {
 }
 
@@ -1928,8 +1928,8 @@ int wd_fdc_t::settle_time() const
 	return 60000;
 }
 
-wd_fdc_analog_t::wd_fdc_analog_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
-	wd_fdc_t(mconfig, type, name, tag, owner, clock)
+wd_fdc_analog_t::wd_fdc_analog_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+	wd_fdc_t(mconfig, type, name, tag, owner, clock, shortname, source)
 {
 	clock_ratio = 1;
 }
@@ -1975,8 +1975,8 @@ bool wd_fdc_analog_t::pll_write_next_bit(bool bit, attotime &tm, floppy_image_de
 	return cur_pll.write_next_bit(bit, tm, floppy, limit);
 }
 
-wd_fdc_digital_t::wd_fdc_digital_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
-	wd_fdc_t(mconfig, type, name, tag, owner, clock)
+wd_fdc_digital_t::wd_fdc_digital_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+	wd_fdc_t(mconfig, type, name, tag, owner, clock, shortname, source)
 {
 	clock_ratio = 4;
 }
@@ -2179,7 +2179,7 @@ void wd_fdc_digital_t::digital_pll_t::commit(floppy_image_device *floppy, attoti
 	write_position = 0;
 }
 
-fd1771_t::fd1771_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1771x, "FD1771", tag, owner, clock)
+fd1771_t::fd1771_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1771x, "FD1771", tag, owner, clock, "fd1771", __FILE__)
 {
 	const static int fd1771_step_times[4] = { 12000, 12000, 20000, 40000 };
 
@@ -2203,7 +2203,7 @@ int fd1771_t::calc_sector_size(UINT8 size, UINT8 command) const
 		return size ? size << 4 : 4096;
 }
 
-fd1781_t::fd1781_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1781x, "FD1781", tag, owner, clock)
+fd1781_t::fd1781_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1781x, "FD1781", tag, owner, clock, "fd1781", __FILE__)
 {
 	const static int fd1781_step_times[4] = { 6000, 12000, 20000, 40000 };
 
@@ -2230,7 +2230,7 @@ int fd1781_t::calc_sector_size(UINT8 size, UINT8 command) const
 const int wd_fdc_t::fd179x_step_times[4] = {  6000, 12000, 20000, 30000 };
 const int wd_fdc_t::fd176x_step_times[4] = { 12000, 24000, 40000, 60000 };
 
-fd1791_t::fd1791_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1791x, "FD1791", tag, owner, clock)
+fd1791_t::fd1791_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1791x, "FD1791", tag, owner, clock, "fd1791", __FILE__)
 {
 	step_times = fd179x_step_times;
 	delay_register_commit = 4;
@@ -2244,7 +2244,7 @@ fd1791_t::fd1791_t(const machine_config &mconfig, const char *tag, device_t *own
 	ready_hooked = true;
 }
 
-fd1792_t::fd1792_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1792x, "FD1792", tag, owner, clock)
+fd1792_t::fd1792_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1792x, "FD1792", tag, owner, clock, "fd1792", __FILE__)
 {
 	step_times = fd179x_step_times;
 	delay_register_commit = 4;
@@ -2258,7 +2258,7 @@ fd1792_t::fd1792_t(const machine_config &mconfig, const char *tag, device_t *own
 	ready_hooked = true;
 }
 
-fd1793_t::fd1793_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1793x, "FD1793", tag, owner, clock)
+fd1793_t::fd1793_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1793x, "FD1793", tag, owner, clock, "fd1793", __FILE__)
 {
 	step_times = fd179x_step_times;
 	delay_register_commit = 4;
@@ -2272,7 +2272,7 @@ fd1793_t::fd1793_t(const machine_config &mconfig, const char *tag, device_t *own
 	ready_hooked = true;
 }
 
-fd1794_t::fd1794_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1794x, "FD1794", tag, owner, clock)
+fd1794_t::fd1794_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1794x, "FD1794", tag, owner, clock, "fd1794", __FILE__)
 {
 	step_times = fd179x_step_times;
 	delay_register_commit = 4;
@@ -2286,7 +2286,7 @@ fd1794_t::fd1794_t(const machine_config &mconfig, const char *tag, device_t *own
 	ready_hooked = true;
 }
 
-fd1795_t::fd1795_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1795x, "FD1795", tag, owner, clock)
+fd1795_t::fd1795_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1795x, "FD1795", tag, owner, clock, "fd1795", __FILE__)
 {
 	step_times = fd179x_step_times;
 	delay_register_commit = 4;
@@ -2308,7 +2308,7 @@ int fd1795_t::calc_sector_size(UINT8 size, UINT8 command) const
 		return 128 << ((size + 1) & 3);
 }
 
-fd1797_t::fd1797_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1797x, "FD1797", tag, owner, clock)
+fd1797_t::fd1797_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1797x, "FD1797", tag, owner, clock, "fd1797", __FILE__)
 {
 	step_times = fd179x_step_times;
 	delay_register_commit = 4;
@@ -2330,7 +2330,7 @@ int fd1797_t::calc_sector_size(UINT8 size, UINT8 command) const
 		return 128 << ((size + 1) & 3);
 }
 
-mb8866_t::mb8866_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, MB8866x, "MB8866", tag, owner, clock)
+mb8866_t::mb8866_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, MB8866x, "MB8866", tag, owner, clock, "mb8866", __FILE__)
 {
 	step_times = fd179x_step_times;
 	delay_register_commit = 4;
@@ -2344,7 +2344,7 @@ mb8866_t::mb8866_t(const machine_config &mconfig, const char *tag, device_t *own
 	ready_hooked = true;
 }
 
-mb8876_t::mb8876_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, MB8876x, "MB8876", tag, owner, clock)
+mb8876_t::mb8876_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, MB8876x, "MB8876", tag, owner, clock, "mb8876", __FILE__)
 {
 	step_times = fd179x_step_times;
 	delay_register_commit = 4;
@@ -2358,7 +2358,7 @@ mb8876_t::mb8876_t(const machine_config &mconfig, const char *tag, device_t *own
 	ready_hooked = true;
 }
 
-mb8877_t::mb8877_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, MB8877x, "MB8877", tag, owner, clock)
+mb8877_t::mb8877_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, MB8877x, "MB8877", tag, owner, clock, "mb8877", __FILE__)
 {
 	step_times = fd179x_step_times;
 	delay_register_commit = 4;
@@ -2372,7 +2372,7 @@ mb8877_t::mb8877_t(const machine_config &mconfig, const char *tag, device_t *own
 	ready_hooked = true;
 }
 
-fd1761_t::fd1761_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1761x, "FD1761", tag, owner, clock)
+fd1761_t::fd1761_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1761x, "FD1761", tag, owner, clock, "fd1761", __FILE__)
 {
 	step_times = fd176x_step_times;
 	delay_register_commit = 16;
@@ -2386,7 +2386,7 @@ fd1761_t::fd1761_t(const machine_config &mconfig, const char *tag, device_t *own
 	ready_hooked = true;
 }
 
-fd1763_t::fd1763_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1763x, "FD1763", tag, owner, clock)
+fd1763_t::fd1763_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1763x, "FD1763", tag, owner, clock, "fd1763", __FILE__)
 {
 	step_times = fd176x_step_times;
 	delay_register_commit = 16;
@@ -2400,7 +2400,7 @@ fd1763_t::fd1763_t(const machine_config &mconfig, const char *tag, device_t *own
 	ready_hooked = true;
 }
 
-fd1765_t::fd1765_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1765x, "FD1765", tag, owner, clock)
+fd1765_t::fd1765_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1765x, "FD1765", tag, owner, clock, "fd1765", __FILE__)
 {
 	step_times = fd176x_step_times;
 	delay_register_commit = 16;
@@ -2422,7 +2422,7 @@ int fd1765_t::calc_sector_size(UINT8 size, UINT8 command) const
 		return 128 << ((size + 1) & 3);
 }
 
-fd1767_t::fd1767_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1767x, "FD1767", tag, owner, clock)
+fd1767_t::fd1767_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, FD1767x, "FD1767", tag, owner, clock, "fd1767", __FILE__)
 {
 	step_times = fd179x_step_times;
 	delay_register_commit = 16;
@@ -2444,7 +2444,7 @@ int fd1767_t::calc_sector_size(UINT8 size, UINT8 command) const
 		return 128 << ((size + 1) & 3);
 }
 
-wd2791_t::wd2791_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, WD2791x, "WD2791", tag, owner, clock)
+wd2791_t::wd2791_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, WD2791x, "WD2791", tag, owner, clock, "wd2791", __FILE__)
 {
 	step_times = fd179x_step_times;
 	delay_register_commit = 16;
@@ -2458,7 +2458,7 @@ wd2791_t::wd2791_t(const machine_config &mconfig, const char *tag, device_t *own
 	ready_hooked = true;
 }
 
-wd2793_t::wd2793_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, WD2793x, "WD2793", tag, owner, clock)
+wd2793_t::wd2793_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, WD2793x, "WD2793", tag, owner, clock, "wd2793", __FILE__)
 {
 	step_times = fd179x_step_times;
 	delay_register_commit = 16;
@@ -2472,7 +2472,7 @@ wd2793_t::wd2793_t(const machine_config &mconfig, const char *tag, device_t *own
 	ready_hooked = true;
 }
 
-wd2795_t::wd2795_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, WD2795x, "WD2795", tag, owner, clock)
+wd2795_t::wd2795_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, WD2795x, "WD2795", tag, owner, clock, "wd2795", __FILE__)
 {
 	step_times = fd179x_step_times;
 	delay_register_commit = 16;
@@ -2494,7 +2494,7 @@ int wd2795_t::calc_sector_size(UINT8 size, UINT8 command) const
 		return 128 << ((size + 1) & 3);
 }
 
-wd2797_t::wd2797_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, WD2797x, "WD2797", tag, owner, clock)
+wd2797_t::wd2797_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_analog_t(mconfig, WD2797x, "WD2797", tag, owner, clock, "wd2797", __FILE__)
 {
 	step_times = fd179x_step_times;
 	delay_register_commit = 16;
@@ -2516,7 +2516,7 @@ int wd2797_t::calc_sector_size(UINT8 size, UINT8 command) const
 		return 128 << ((size + 1) & 3);
 }
 
-wd1770_t::wd1770_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_digital_t(mconfig, WD1770x, "WD1770", tag, owner, clock)
+wd1770_t::wd1770_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_digital_t(mconfig, WD1770x, "WD1770", tag, owner, clock, "wd1770", __FILE__)
 {
 	step_times = wd_digital_step_times;
 	delay_register_commit = 32;
@@ -2530,7 +2530,7 @@ wd1770_t::wd1770_t(const machine_config &mconfig, const char *tag, device_t *own
 	ready_hooked = false;
 }
 
-wd1772_t::wd1772_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_digital_t(mconfig, WD1772x, "WD1772", tag, owner, clock)
+wd1772_t::wd1772_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_digital_t(mconfig, WD1772x, "WD1772", tag, owner, clock, "wd1772", __FILE__)
 {
 	const static int wd1772_step_times[4] = { 12000, 24000, 4000, 6000 };
 
@@ -2551,7 +2551,7 @@ int wd1772_t::settle_time() const
 	return 30000;
 }
 
-wd1773_t::wd1773_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_digital_t(mconfig, WD1773x, "WD1773", tag, owner, clock)
+wd1773_t::wd1773_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : wd_fdc_digital_t(mconfig, WD1773x, "WD1773", tag, owner, clock, "wd1773", __FILE__)
 {
 	step_times = wd_digital_step_times;
 	delay_register_commit = 32;
diff --git a/src/emu/machine/wd_fdc.h b/src/emu/machine/wd_fdc.h
index 8b87e7f56b3..90f99941134 100644
--- a/src/emu/machine/wd_fdc.h
+++ b/src/emu/machine/wd_fdc.h
@@ -112,7 +112,7 @@ class wd_fdc_t : public device_t {
 public:
 	typedef delegate<void (bool state)> line_cb;
 
-	wd_fdc_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	wd_fdc_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 
 	void dden_w(bool dden);
 	void set_floppy(floppy_image_device *floppy);
@@ -414,7 +414,7 @@ private:
 
 class wd_fdc_analog_t : public wd_fdc_t {
 public:
-	wd_fdc_analog_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	wd_fdc_analog_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 
 protected:
 	virtual void pll_reset(bool fm, attotime when);
@@ -432,7 +432,7 @@ private:
 
 class wd_fdc_digital_t : public wd_fdc_t {
 public:
-	wd_fdc_digital_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	wd_fdc_digital_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 
 protected:
 	static const int wd_digital_step_times[4];
diff --git a/src/emu/machine/x2212.c b/src/emu/machine/x2212.c
index 9629d593a3e..40469ce607c 100644
--- a/src/emu/machine/x2212.c
+++ b/src/emu/machine/x2212.c
@@ -36,7 +36,7 @@ const device_type X2212 = &device_creator<x2212_device>;
 //-------------------------------------------------
 
 x2212_device::x2212_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, X2212, "X2212", tag, owner, clock),
+	: device_t(mconfig, X2212, "X2212", tag, owner, clock, "x2212", __FILE__),
 		device_memory_interface(mconfig, *this),
 		device_nvram_interface(mconfig, *this),
 		m_auto_save(false),
diff --git a/src/emu/machine/x76f041.c b/src/emu/machine/x76f041.c
index 7fc2bd8b23e..1d9a64f0868 100644
--- a/src/emu/machine/x76f041.c
+++ b/src/emu/machine/x76f041.c
@@ -33,7 +33,7 @@ inline void ATTR_PRINTF(3,4) x76f041_device::verboselog(int n_level, const char
 const device_type X76F041 = &device_creator<x76f041_device>;
 
 x76f041_device::x76f041_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_secure_serial_flash(mconfig, X76F041, "X76F041", tag, owner, clock)
+	: device_secure_serial_flash(mconfig, X76F041, "X76F041", tag, owner, clock, "x76f041", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/x76f100.c b/src/emu/machine/x76f100.c
index 245e96237fc..6fdf91ab66f 100644
--- a/src/emu/machine/x76f100.c
+++ b/src/emu/machine/x76f100.c
@@ -31,7 +31,7 @@ inline void ATTR_PRINTF(3,4) x76f100_device::verboselog(int n_level, const char
 const device_type X76F100 = &device_creator<x76f100_device>;
 
 x76f100_device::x76f100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_secure_serial_flash(mconfig, X76F100, "X76F100", tag, owner, clock)
+	: device_secure_serial_flash(mconfig, X76F100, "X76F100", tag, owner, clock, "x76f100", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/z80ctc.c b/src/emu/machine/z80ctc.c
index be5be3e8f63..57b8d49f953 100644
--- a/src/emu/machine/z80ctc.c
+++ b/src/emu/machine/z80ctc.c
@@ -80,7 +80,7 @@ const device_type Z80CTC = &device_creator<z80ctc_device>;
 //-------------------------------------------------
 
 z80ctc_device::z80ctc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, Z80CTC, "Zilog Z80 CTC", tag, owner, clock),
+	: device_t(mconfig, Z80CTC, "Zilog Z80 CTC", tag, owner, clock, "z80ctc", __FILE__),
 		device_z80daisy_interface(mconfig, *this)
 {
 }
diff --git a/src/emu/machine/z80dart.c b/src/emu/machine/z80dart.c
index 1b032422f57..ff3c6acf30c 100644
--- a/src/emu/machine/z80dart.c
+++ b/src/emu/machine/z80dart.c
@@ -467,7 +467,7 @@ WRITE8_MEMBER( z80dart_device::ba_cd_w )
 //-------------------------------------------------
 
 z80dart_channel::z80dart_channel(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, Z80DART_CHANNEL, "Z80-DART channel", tag, owner, clock),
+	: device_t(mconfig, Z80DART_CHANNEL, "Z80-DART channel", tag, owner, clock, "z80dart_channel", __FILE__),
 		device_serial_interface(mconfig, *this),
 		m_rx_error(0),
 		m_rx_fifo(-1),
diff --git a/src/emu/machine/z80dma.c b/src/emu/machine/z80dma.c
index 34ba154a0e7..ccfa60ac4ab 100644
--- a/src/emu/machine/z80dma.c
+++ b/src/emu/machine/z80dma.c
@@ -144,7 +144,7 @@ const device_type Z80DMA = &device_creator<z80dma_device>;
 //-------------------------------------------------
 
 z80dma_device::z80dma_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, Z80DMA, "Z8410", tag, owner, clock),
+	: device_t(mconfig, Z80DMA, "Z8410", tag, owner, clock, "z80dma", __FILE__),
 		device_z80daisy_interface(mconfig, *this)
 {
 }
diff --git a/src/emu/machine/z80pio.c b/src/emu/machine/z80pio.c
index a0041c816d9..a53e0a48941 100644
--- a/src/emu/machine/z80pio.c
+++ b/src/emu/machine/z80pio.c
@@ -56,7 +56,7 @@ const device_type Z80PIO = &device_creator<z80pio_device>;
 //-------------------------------------------------
 
 z80pio_device::z80pio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, Z80PIO, "Z8420", tag, owner, clock),
+	: device_t(mconfig, Z80PIO, "Z8420", tag, owner, clock, "z80pio", __FILE__),
 		device_z80daisy_interface(mconfig, *this)
 {
 }
diff --git a/src/emu/machine/z80sio.c b/src/emu/machine/z80sio.c
index f254963e16d..313e69c3fa1 100644
--- a/src/emu/machine/z80sio.c
+++ b/src/emu/machine/z80sio.c
@@ -298,7 +298,7 @@ inline attotime z80sio_device::sio_channel::compute_time_per_character()
 //-------------------------------------------------
 
 z80sio_device::z80sio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, Z80SIO, "Zilog Z80 SIO", tag, owner, clock),
+	: device_t(mconfig, Z80SIO, "Zilog Z80 SIO", tag, owner, clock, "z80sio", __FILE__),
 		device_z80daisy_interface(mconfig, *this)
 {
 	for (int i = 0; i < 8; i++)
diff --git a/src/emu/machine/z80sti.c b/src/emu/machine/z80sti.c
index e58a16811dd..1d8373faa67 100644
--- a/src/emu/machine/z80sti.c
+++ b/src/emu/machine/z80sti.c
@@ -84,7 +84,7 @@ const int z80sti_device::PRESCALER[] = { 0, 4, 10, 16, 50, 64, 100, 200 };
 //-------------------------------------------------
 
 z80sti_device::z80sti_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, Z80STI, "Mostek MK3801", tag, owner, clock),
+	: device_t(mconfig, Z80STI, "Mostek MK3801", tag, owner, clock, "z80sti", __FILE__),
 		device_serial_interface(mconfig, *this),
 		device_z80daisy_interface(mconfig, *this),
 		m_gpip(0),
diff --git a/src/emu/machine/z8536.c b/src/emu/machine/z8536.c
index d58070164e3..7540d68b9a4 100644
--- a/src/emu/machine/z8536.c
+++ b/src/emu/machine/z8536.c
@@ -1016,7 +1016,7 @@ inline void z8536_device::external_port_w(int port, int bit, int state)
 //-------------------------------------------------
 
 z8536_device::z8536_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, Z8536, "Zilog Z8536", tag, owner, clock),
+	: device_t(mconfig, Z8536, "Zilog Z8536", tag, owner, clock, "z8536", __FILE__),
 		device_z80daisy_interface(mconfig, *this),
 		m_int(CLEAR_LINE)
 {
diff --git a/src/emu/screen.c b/src/emu/screen.c
index cc48e50bef1..2f75d534d70 100644
--- a/src/emu/screen.c
+++ b/src/emu/screen.c
@@ -73,7 +73,7 @@ UINT32 screen_device::m_id_counter = 0;
 //-------------------------------------------------
 
 screen_device::screen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, SCREEN, "Video Screen", tag, owner, clock),
+	: device_t(mconfig, SCREEN, "Video Screen", tag, owner, clock, "screen", __FILE__),
 		m_type(SCREEN_TYPE_RASTER),
 		m_oldstyle_vblank_supplied(false),
 		m_refresh(0),
diff --git a/src/emu/softlist.c b/src/emu/softlist.c
index f764382f5f8..6747c70828a 100644
--- a/src/emu/softlist.c
+++ b/src/emu/softlist.c
@@ -32,7 +32,7 @@ const device_type SOFTWARE_LIST = &device_creator<software_list_device>;
 //-------------------------------------------------
 
 software_list_device::software_list_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, SOFTWARE_LIST, "Software list", tag, owner, clock),
+	: device_t(mconfig, SOFTWARE_LIST, "Software list", tag, owner, clock, "software_list", __FILE__),
 		m_list_name(NULL),
 		m_list_type(SOFTWARE_LIST_ORIGINAL_SYSTEM),
 		m_filter(NULL)
diff --git a/src/emu/sound/speaker.c b/src/emu/sound/speaker.c
index 82bdda0ae28..9a11267ad65 100644
--- a/src/emu/sound/speaker.c
+++ b/src/emu/sound/speaker.c
@@ -82,7 +82,7 @@ static const int RATE_MULTIPLIER = 4;
 const device_type SPEAKER_SOUND = &device_creator<speaker_sound_device>;
 
 speaker_sound_device::speaker_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-					: device_t(mconfig, SPEAKER_SOUND, "Filtered 1-bit DAC", tag, owner, clock, "speaker", __FILE__),
+					: device_t(mconfig, SPEAKER_SOUND, "Filtered 1-bit DAC", tag, owner, clock, "speaker_sound", __FILE__),
 						device_sound_interface(mconfig, *this)
 {
 }
diff --git a/src/emu/speaker.c b/src/emu/speaker.c
index 565a4f36360..ab9e9bbb623 100644
--- a/src/emu/speaker.c
+++ b/src/emu/speaker.c
@@ -73,7 +73,7 @@ const device_type SPEAKER = &device_creator<speaker_device>;
 //-------------------------------------------------
 
 speaker_device::speaker_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, SPEAKER, "Speaker", tag, owner, clock),
+	: device_t(mconfig, SPEAKER, "Speaker", tag, owner, clock, "speaker", __FILE__),
 		device_mixer_interface(mconfig, *this),
 		m_x(0.0),
 		m_y(0.0),
diff --git a/src/emu/timer.c b/src/emu/timer.c
index f74915d9fc5..44dde1f139d 100644
--- a/src/emu/timer.c
+++ b/src/emu/timer.c
@@ -62,7 +62,7 @@ const device_type TIMER = &device_creator<timer_device>;
 //-------------------------------------------------
 
 timer_device::timer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, TIMER, "Timer", tag, owner, clock),
+	: device_t(mconfig, TIMER, "Timer", tag, owner, clock, "timer", __FILE__),
 		m_type(TIMER_TYPE_GENERIC),
 		m_callback(timer_device_expired_delegate()),
 		m_ptr(NULL),
diff --git a/src/emu/video/315_5124.c b/src/emu/video/315_5124.c
index d0db9c292df..a30f9c62d4c 100644
--- a/src/emu/video/315_5124.c
+++ b/src/emu/video/315_5124.c
@@ -139,7 +139,7 @@ ADDRESS_MAP_END
 
 
 sega315_5124_device::sega315_5124_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t( mconfig, SEGA315_5124, "Sega 315-5124", tag, owner, clock )
+	: device_t( mconfig, SEGA315_5124, "Sega 315-5124", tag, owner, clock, "sega315_5124", __FILE__)
 	, device_memory_interface(mconfig, *this)
 	, m_cram_size( SEGA315_5124_CRAM_SIZE )
 	, m_palette_offset( 0 )
@@ -149,8 +149,8 @@ sega315_5124_device::sega315_5124_device(const machine_config &mconfig, const ch
 }
 
 
-sega315_5124_device::sega315_5124_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT8 cram_size, UINT8 palette_offset, bool supports_224_240)
-	: device_t( mconfig, type, name, tag, owner, clock )
+sega315_5124_device::sega315_5124_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT8 cram_size, UINT8 palette_offset, bool supports_224_240, const char *shortname, const char *source)
+	: device_t( mconfig, type, name, tag, owner, clock, shortname, source)
 	, device_memory_interface(mconfig, *this)
 	, m_cram_size( cram_size )
 	, m_palette_offset( palette_offset )
@@ -161,13 +161,13 @@ sega315_5124_device::sega315_5124_device(const machine_config &mconfig, device_t
 
 
 sega315_5246_device::sega315_5246_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: sega315_5124_device( mconfig, SEGA315_5246, "Sega 315-5246", tag, owner, clock, SEGA315_5124_CRAM_SIZE, 0, true )
+	: sega315_5124_device( mconfig, SEGA315_5246, "Sega 315-5246", tag, owner, clock, SEGA315_5124_CRAM_SIZE, 0, true, "sega315_5246", __FILE__)
 {
 }
 
 
 sega315_5378_device::sega315_5378_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: sega315_5124_device( mconfig, SEGA315_5378, "Sega 315-5378", tag, owner, clock, SEGA315_5378_CRAM_SIZE, 0x10, true )
+	: sega315_5124_device( mconfig, SEGA315_5378, "Sega 315-5378", tag, owner, clock, SEGA315_5378_CRAM_SIZE, 0x10, true, "sega315_5378", __FILE__)
 {
 }
 
diff --git a/src/emu/video/315_5124.h b/src/emu/video/315_5124.h
index 08327f725cb..f6066f0ad0a 100644
--- a/src/emu/video/315_5124.h
+++ b/src/emu/video/315_5124.h
@@ -73,7 +73,7 @@ class sega315_5124_device : public device_t,
 public:
 	// construction/destruction
 	sega315_5124_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	sega315_5124_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT8 cram_size, UINT8 palette_offset, bool supports_224_240);
+	sega315_5124_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT8 cram_size, UINT8 palette_offset, bool supports_224_240, const char *shortname, const char *source);
 
 	DECLARE_READ8_MEMBER( vram_read );
 	DECLARE_WRITE8_MEMBER( vram_write );
diff --git a/src/emu/video/cdp1861.c b/src/emu/video/cdp1861.c
index f9e6420c6a5..23a6157e3e0 100644
--- a/src/emu/video/cdp1861.c
+++ b/src/emu/video/cdp1861.c
@@ -40,7 +40,7 @@ const device_type CDP1861 = &device_creator<cdp1861_device>;
 //-------------------------------------------------
 
 cdp1861_device::cdp1861_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, CDP1861, "CDP1861", tag, owner, clock),
+	: device_t(mconfig, CDP1861, "CDP1861", tag, owner, clock, "cdp1861", __FILE__),
 		m_write_irq(*this),
 		m_write_dma_out(*this),
 		m_write_efx(*this)
diff --git a/src/emu/video/cdp1862.c b/src/emu/video/cdp1862.c
index 9370f09dc93..d57b2678f18 100644
--- a/src/emu/video/cdp1862.c
+++ b/src/emu/video/cdp1862.c
@@ -77,7 +77,7 @@ inline void cdp1862_device::initialize_palette()
 //-------------------------------------------------
 
 cdp1862_device::cdp1862_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, CDP1862, "CDP1862", tag, owner, clock),
+	: device_t(mconfig, CDP1862, "CDP1862", tag, owner, clock, "cdp1862", __FILE__),
 		m_read_rd(*this),
 		m_read_bd(*this),
 		m_read_gd(*this)
diff --git a/src/emu/video/crt9007.c b/src/emu/video/crt9007.c
index 8b37807a9cd..5fcf834e7d4 100644
--- a/src/emu/video/crt9007.c
+++ b/src/emu/video/crt9007.c
@@ -446,7 +446,7 @@ inline void crt9007_device::recompute_parameters()
 //-------------------------------------------------
 
 crt9007_device::crt9007_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, CRT9007, "SMC CRT9007", tag, owner, clock),
+	: device_t(mconfig, CRT9007, "SMC CRT9007", tag, owner, clock, "crt9007", __FILE__),
 		device_memory_interface(mconfig, *this),
 		m_space_config("videoram", ENDIANNESS_LITTLE, 8, 14, 0, NULL, *ADDRESS_MAP_NAME(crt9007))
 {
diff --git a/src/emu/video/crt9021.c b/src/emu/video/crt9021.c
index d6ed7ba6aec..08615054fbe 100644
--- a/src/emu/video/crt9021.c
+++ b/src/emu/video/crt9021.c
@@ -82,7 +82,7 @@ enum
 //-------------------------------------------------
 
 crt9021_device::crt9021_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, CRT9021, "SMC CRT9021", tag, owner, clock)
+	: device_t(mconfig, CRT9021, "SMC CRT9021", tag, owner, clock, "crt9021", __FILE__)
 {
 }
 
diff --git a/src/emu/video/crt9212.c b/src/emu/video/crt9212.c
index b847e7f97aa..9835cce07d8 100644
--- a/src/emu/video/crt9212.c
+++ b/src/emu/video/crt9212.c
@@ -53,7 +53,7 @@ const device_type CRT9212 = &device_creator<crt9212_device>;
 //-------------------------------------------------
 
 crt9212_device::crt9212_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, CRT9212, "SMC CRT9212", tag, owner, clock)
+	: device_t(mconfig, CRT9212, "SMC CRT9212", tag, owner, clock, "crt9212", __FILE__)
 {
 }
 
diff --git a/src/emu/video/dl1416.c b/src/emu/video/dl1416.c
index 4584cef0161..69fb93afed8 100644
--- a/src/emu/video/dl1416.c
+++ b/src/emu/video/dl1416.c
@@ -296,8 +296,8 @@ WRITE8_DEVICE_HANDLER( dl1416_data_w )
 	}
 }
 
-dl1416_device::dl1416_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, type, name, tag, owner, clock)
+dl1416_device::dl1416_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+	: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
 {
 	m_token = global_alloc_clear(dl1416_state);
 }
@@ -334,7 +334,7 @@ void dl1416_device::device_reset()
 const device_type DL1416B = &device_creator<dl1416b_device>;
 
 dl1416b_device::dl1416b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: dl1416_device(mconfig, DL1416B, "DL1416B", tag, owner, clock)
+	: dl1416_device(mconfig, DL1416B, "DL1416B", tag, owner, clock, "dl1416b", __FILE__)
 {
 }
 
@@ -342,6 +342,6 @@ dl1416b_device::dl1416b_device(const machine_config &mconfig, const char *tag, d
 const device_type DL1416T = &device_creator<dl1416t_device>;
 
 dl1416t_device::dl1416t_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: dl1416_device(mconfig, DL1416T, "DL1416T", tag, owner, clock)
+	: dl1416_device(mconfig, DL1416T, "DL1416T", tag, owner, clock, "dl1416t", __FILE__)
 {
 }
diff --git a/src/emu/video/dl1416.h b/src/emu/video/dl1416.h
index d59c6ab5c70..d3a61010a40 100644
--- a/src/emu/video/dl1416.h
+++ b/src/emu/video/dl1416.h
@@ -53,7 +53,7 @@ DECLARE_WRITE8_DEVICE_HANDLER( dl1416_data_w );
 class dl1416_device : public device_t
 {
 public:
-	dl1416_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	dl1416_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 	~dl1416_device() { global_free(m_token); }
 
 	// access to legacy token
diff --git a/src/emu/video/dm9368.c b/src/emu/video/dm9368.c
index 2cd2e694748..2ec02977979 100644
--- a/src/emu/video/dm9368.c
+++ b/src/emu/video/dm9368.c
@@ -70,7 +70,7 @@ inline void dm9368_device::set_rbo(int state)
 //-------------------------------------------------
 
 dm9368_device::dm9368_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, DM9368, "DM9368", tag, owner, clock),
+	: device_t(mconfig, DM9368, "DM9368", tag, owner, clock, "dm9368", __FILE__),
 		m_rbi(1),
 		m_rbo(1)
 {
diff --git a/src/emu/video/ef9340_1.c b/src/emu/video/ef9340_1.c
index b5c0581ca80..1265e0f840a 100644
--- a/src/emu/video/ef9340_1.c
+++ b/src/emu/video/ef9340_1.c
@@ -22,7 +22,7 @@ static const UINT8 bgr2rgb[8] =
 
 
 ef9340_1_device::ef9340_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, EF9340_1, "EF9340+EF9341", tag, owner, clock)
+	: device_t(mconfig, EF9340_1, "EF9340+EF9341", tag, owner, clock, "ef9340_1", __FILE__)
 	, m_screen_tag(NULL)
 	, m_screen(NULL)
 	//, m_start_vpos(START_Y)
diff --git a/src/emu/video/hd44102.c b/src/emu/video/hd44102.c
index 88e5c59c023..fbfa65687af 100644
--- a/src/emu/video/hd44102.c
+++ b/src/emu/video/hd44102.c
@@ -69,7 +69,7 @@ inline void hd44102_device::count_up_or_down()
 //-------------------------------------------------
 
 hd44102_device::hd44102_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, HD44102, "HD44102", tag, owner, clock),
+	: device_t(mconfig, HD44102, "HD44102", tag, owner, clock, "hd44102", __FILE__),
 		m_cs2(0),
 		m_page(0),
 		m_x(0),
diff --git a/src/emu/video/hd44352.c b/src/emu/video/hd44352.c
index 9cd6142c9b1..9bd42ff165e 100644
--- a/src/emu/video/hd44352.c
+++ b/src/emu/video/hd44352.c
@@ -33,7 +33,7 @@ const device_type HD44352 = &device_creator<hd44352_device>;
 //-------------------------------------------------
 
 hd44352_device::hd44352_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock):
-	device_t(mconfig, HD44352, "hd44352", tag, owner, clock)
+	device_t(mconfig, HD44352, "hd44352", tag, owner, clock, "hd44352", __FILE__)
 {
 }
 
diff --git a/src/emu/video/hd63484.c b/src/emu/video/hd63484.c
index acc90695839..7686b31cc94 100644
--- a/src/emu/video/hd63484.c
+++ b/src/emu/video/hd63484.c
@@ -1579,7 +1579,7 @@ static DEVICE_RESET( hd63484 )
 const device_type HD63484 = &device_creator<hd63484_device>;
 
 hd63484_device::hd63484_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, HD63484, "HD63484", tag, owner, clock)
+	: device_t(mconfig, HD63484, "HD63484", tag, owner, clock, "hd63484", __FILE__)
 {
 	m_token = global_alloc_clear(hd63484_state);
 }
diff --git a/src/emu/video/hd66421.c b/src/emu/video/hd66421.c
index 93b2856235d..f74b9ac1aa7 100644
--- a/src/emu/video/hd66421.c
+++ b/src/emu/video/hd66421.c
@@ -115,7 +115,7 @@ inline void hd66421_device::writebyte(offs_t address, UINT8 data)
 //-------------------------------------------------
 
 hd66421_device::hd66421_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, HD66421, "Hitachi HD66421 LCD Controller", tag, owner, clock),
+	: device_t(mconfig, HD66421, "Hitachi HD66421 LCD Controller", tag, owner, clock, "hd66421", __FILE__),
 		device_memory_interface(mconfig, *this),
 		m_space_config("videoram", ENDIANNESS_LITTLE, 8, 17, 0, NULL, *ADDRESS_MAP_NAME(hd66421)),
 		m_cmd(0),
diff --git a/src/emu/video/huc6202.c b/src/emu/video/huc6202.c
index 9b7dde457aa..d9147f06adb 100644
--- a/src/emu/video/huc6202.c
+++ b/src/emu/video/huc6202.c
@@ -39,7 +39,7 @@ void huc6202_device::device_config_complete()
 
 
 huc6202_device::huc6202_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, HUC6202, "HuC6202", tag, owner, clock)
+	: device_t(mconfig, HUC6202, "HuC6202", tag, owner, clock, "huc6202", __FILE__)
 {
 }
 
diff --git a/src/emu/video/huc6260.c b/src/emu/video/huc6260.c
index 07dd1fad91c..4ab802fd13a 100644
--- a/src/emu/video/huc6260.c
+++ b/src/emu/video/huc6260.c
@@ -63,7 +63,7 @@ void huc6260_device::device_config_complete()
 
 
 huc6260_device::huc6260_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, HUC6260, "HuC6260", tag, owner, clock)
+	: device_t(mconfig, HUC6260, "HuC6260", tag, owner, clock, "huc6260", __FILE__)
 {
 }
 
diff --git a/src/emu/video/huc6261.c b/src/emu/video/huc6261.c
index 550f7fa2859..6455ac5a385 100644
--- a/src/emu/video/huc6261.c
+++ b/src/emu/video/huc6261.c
@@ -39,7 +39,7 @@ void huc6261_device::device_config_complete()
 
 
 huc6261_device::huc6261_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, HUC6261, "HuC6261", tag, owner, clock)
+	: device_t(mconfig, HUC6261, "HuC6261", tag, owner, clock, "huc6261", __FILE__)
 {
 	// Set up UV lookup table
 	for ( int ur = 0; ur < 256; ur++ )
diff --git a/src/emu/video/huc6270.c b/src/emu/video/huc6270.c
index 4a6ffc38a55..6d7452f193f 100644
--- a/src/emu/video/huc6270.c
+++ b/src/emu/video/huc6270.c
@@ -112,7 +112,7 @@ void huc6270_device::device_config_complete()
 
 
 huc6270_device::huc6270_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, HUC6270, "Hudson/NEC HuC6270", tag, owner, clock)
+	: device_t(mconfig, HUC6270, "Hudson/NEC HuC6270", tag, owner, clock, "huc6270", __FILE__)
 {
 }
 
diff --git a/src/emu/video/huc6272.c b/src/emu/video/huc6272.c
index efb382f6bc6..bad0fb69da9 100644
--- a/src/emu/video/huc6272.c
+++ b/src/emu/video/huc6272.c
@@ -64,7 +64,7 @@ inline void huc6272_device::write_dword(offs_t address, UINT32 data)
 //-------------------------------------------------
 
 huc6272_device::huc6272_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, huc6272, "huc6272", tag, owner, clock),
+	: device_t(mconfig, huc6272, "huc6272", tag, owner, clock, "huc6272", __FILE__),
 		device_memory_interface(mconfig, *this),
 		m_space_config("videoram", ENDIANNESS_LITTLE, 32, 32, 0, NULL, *ADDRESS_MAP_NAME(huc6272_vram))
 {
diff --git a/src/emu/video/i8244.c b/src/emu/video/i8244.c
index 5320fc066ab..32908dfabbf 100644
--- a/src/emu/video/i8244.c
+++ b/src/emu/video/i8244.c
@@ -98,7 +98,7 @@ static const UINT8 bgr2rgb[8] =
 //-------------------------------------------------
 
 i8244_device::i8244_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, I8244, "I8244", tag, owner, clock)
+	: device_t(mconfig, I8244, "I8244", tag, owner, clock, "i8244", __FILE__)
 	, device_sound_interface(mconfig, *this)
 	, m_irq_func(*this)
 	, m_postprocess_func(*this)
@@ -111,8 +111,8 @@ i8244_device::i8244_device(const machine_config &mconfig, const char *tag, devic
 }
 
 
-i8244_device::i8244_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, int lines)
-	: device_t(mconfig, type, name, tag, owner, clock)
+i8244_device::i8244_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, int lines, const char *shortname, const char *source)
+	: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
 	, device_sound_interface(mconfig, *this)
 	, m_irq_func(*this)
 	, m_postprocess_func(*this)
@@ -126,7 +126,7 @@ i8244_device::i8244_device(const machine_config &mconfig, device_type type, cons
 
 
 i8245_device::i8245_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: i8244_device(mconfig, I8245, "I8245", tag, owner, clock, i8245_device::LINES)
+	: i8244_device(mconfig, I8245, "I8245", tag, owner, clock, i8245_device::LINES, "i8245", __FILE__)
 {
 }
 
diff --git a/src/emu/video/i8244.h b/src/emu/video/i8244.h
index 76e22a69172..82c330aa86b 100644
--- a/src/emu/video/i8244.h
+++ b/src/emu/video/i8244.h
@@ -80,7 +80,7 @@ class i8244_device :  public device_t
 public:
 	// construction/destruction
 	i8244_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	i8244_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, int lines);
+	i8244_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, int lines, const char *shortname, const char *source);
 
 	// static configuration helpers
 	static void set_screen_tag(device_t &device, const char *screen_tag) { downcast<i8244_device &>(device).m_screen_tag = screen_tag; }
diff --git a/src/emu/video/i8275.c b/src/emu/video/i8275.c
index a1b0b19af23..3a0e282a227 100644
--- a/src/emu/video/i8275.c
+++ b/src/emu/video/i8275.c
@@ -410,7 +410,7 @@ UINT32 i8275_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap,
 const device_type I8275 = &device_creator<i8275_device>;
 
 i8275_device::i8275_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, I8275, "Intel 8275", tag, owner, clock)
+	: device_t(mconfig, I8275, "Intel 8275", tag, owner, clock, "i8275", __FILE__)
 {
 }
 
diff --git a/src/emu/video/i8275x.c b/src/emu/video/i8275x.c
index 8ee7fe1a938..4ff6ea40edd 100644
--- a/src/emu/video/i8275x.c
+++ b/src/emu/video/i8275x.c
@@ -80,7 +80,7 @@ const device_type I8275x = &device_creator<i8275x_device>;
 //-------------------------------------------------
 
 i8275x_device::i8275x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, I8275x, "I8275", tag, owner, clock),
+	: device_t(mconfig, I8275x, "I8275", tag, owner, clock, "i8275x", __FILE__),
 		m_status(0),
 		m_param_idx(0),
 		m_param_end(0),
diff --git a/src/emu/video/k053250.c b/src/emu/video/k053250.c
index 095b84269f4..014bfc11554 100644
--- a/src/emu/video/k053250.c
+++ b/src/emu/video/k053250.c
@@ -3,7 +3,7 @@
 const device_type K053250 = &device_creator<k053250_device>;
 
 k053250_device::k053250_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, K053250, "K053250", tag, owner, clock)
+	: device_t(mconfig, K053250, "K053250", tag, owner, clock, "k053250", __FILE__)
 {
 }
 
diff --git a/src/emu/video/mc6845.c b/src/emu/video/mc6845.c
index 8844cb1bbc0..141bfe02379 100644
--- a/src/emu/video/mc6845.c
+++ b/src/emu/video/mc6845.c
@@ -114,13 +114,13 @@ void mc6845_device::device_config_complete()
 }
 
 
-mc6845_device::mc6845_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, type, name, tag, owner, clock)
+mc6845_device::mc6845_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+	: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
 {
 }
 
 mc6845_device::mc6845_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MC6845, "mc6845", tag, owner, clock)
+	: device_t(mconfig, MC6845, "mc6845", tag, owner, clock, "mc6845", __FILE__)
 {
 }
 
@@ -1370,61 +1370,61 @@ ADDRESS_MAP_END
 
 
 r6545_1_device::r6545_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: mc6845_device(mconfig, R6545_1, "R6545-1", tag, owner, clock)
+	: mc6845_device(mconfig, R6545_1, "R6545-1", tag, owner, clock, "r6545_1", __FILE__)
 {
 }
 
 
 h46505_device::h46505_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: mc6845_device(mconfig, H46505, "H46505", tag, owner, clock)
+	: mc6845_device(mconfig, H46505, "H46505", tag, owner, clock, "h46505", __FILE__)
 {
 }
 
 
 mc6845_1_device::mc6845_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: mc6845_device(mconfig, MC6845_1, "MC6845-1", tag, owner, clock)
+	: mc6845_device(mconfig, MC6845_1, "MC6845-1", tag, owner, clock, "mc6845_1", __FILE__)
 {
 }
 
 
 hd6845_device::hd6845_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: mc6845_device(mconfig, HD6845, "HD6845", tag, owner, clock)
+	: mc6845_device(mconfig, HD6845, "HD6845", tag, owner, clock, "hd6845", __FILE__)
 {
 }
 
 
 c6545_1_device::c6545_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: mc6845_device(mconfig, C6545_1, "C6545-1", tag, owner, clock)
+	: mc6845_device(mconfig, C6545_1, "C6545-1", tag, owner, clock, "c6545_1", __FILE__)
 {
 }
 
 
 sy6545_1_device::sy6545_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: mc6845_device(mconfig, SY6545_1, "SY6545-1", tag, owner, clock)
+	: mc6845_device(mconfig, SY6545_1, "SY6545-1", tag, owner, clock, "sy6545_1", __FILE__)
 {
 }
 
 
 sy6845e_device::sy6845e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: mc6845_device(mconfig, SY6845E, "SY6845E", tag, owner, clock)
+	: mc6845_device(mconfig, SY6845E, "SY6845E", tag, owner, clock, "sy6845e", __FILE__)
 {
 }
 
 
 hd6345_device::hd6345_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: mc6845_device(mconfig, HD6345, "HD6345", tag, owner, clock)
+	: mc6845_device(mconfig, HD6345, "HD6345", tag, owner, clock, "hd6345", __FILE__)
 {
 }
 
 
 ams40041_device::ams40041_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: mc6845_device(mconfig, AMS40041, "40041", tag, owner, clock)
+	: mc6845_device(mconfig, AMS40041, "40041", tag, owner, clock, "ams40041", __FILE__)
 {
 }
 
 
-mos8563_device::mos8563_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
-	: mc6845_device(mconfig, type, name, tag, owner, clock),
+mos8563_device::mos8563_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+	: mc6845_device(mconfig, type, name, tag, owner, clock, shortname, source),
 		device_memory_interface(mconfig, *this),
 		m_videoram_space_config("videoram", ENDIANNESS_LITTLE, 8, 16, 0, NULL, *ADDRESS_MAP_NAME(mos8563_videoram_map))
 {
@@ -1432,7 +1432,7 @@ mos8563_device::mos8563_device(const machine_config &mconfig, device_type type,
 
 
 mos8563_device::mos8563_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: mc6845_device(mconfig, MOS8563, "MOS8563", tag, owner, clock),
+	: mc6845_device(mconfig, MOS8563, "MOS8563", tag, owner, clock, "mos8563", __FILE__),
 		device_memory_interface(mconfig, *this),
 		m_videoram_space_config("videoram", ENDIANNESS_LITTLE, 8, 16, 0, NULL, *ADDRESS_MAP_NAME(mos8563_videoram_map))
 {
@@ -1440,7 +1440,7 @@ mos8563_device::mos8563_device(const machine_config &mconfig, const char *tag, d
 
 
 mos8568_device::mos8568_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: mos8563_device(mconfig, MOS8568, "MOS8568", tag, owner, clock)
+	: mos8563_device(mconfig, MOS8568, "MOS8568", tag, owner, clock, "mos8568", __FILE__)
 {
 }
 
diff --git a/src/emu/video/mc6845.h b/src/emu/video/mc6845.h
index da02e16fea2..a7b05ed7c21 100644
--- a/src/emu/video/mc6845.h
+++ b/src/emu/video/mc6845.h
@@ -123,7 +123,7 @@ class mc6845_device :   public device_t,
 public:
 	// construction/destruction
 	mc6845_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	mc6845_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	mc6845_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 
 	/* select one of the registers for reading or writing */
 	DECLARE_WRITE8_MEMBER( address_w );
@@ -380,7 +380,7 @@ class mos8563_device : public mc6845_device,
 						public device_memory_interface
 {
 public:
-	mos8563_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	mos8563_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 	mos8563_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
 
 	virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const;
diff --git a/src/emu/video/mc6847.c b/src/emu/video/mc6847.c
index e4c681ef4b1..ca2d5a4b7e5 100644
--- a/src/emu/video/mc6847.c
+++ b/src/emu/video/mc6847.c
@@ -128,8 +128,8 @@ const UINT32 mc6847_base_device::s_palette[mc6847_base_device::PALETTE_LENGTH] =
 //-------------------------------------------------
 
 mc6847_friend_device::mc6847_friend_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,
-		const UINT8 *fontdata, bool is_mc6847t1, double tpfs, int field_sync_falling_edge_scanline, bool supports_partial_body_scanlines)
-	: device_t(mconfig, type, name, tag, owner, clock),
+		const UINT8 *fontdata, bool is_mc6847t1, double tpfs, int field_sync_falling_edge_scanline, bool supports_partial_body_scanlines, const char *shortname, const char *source)
+	: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
 		m_character_map(fontdata, is_mc6847t1)
 {
 	m_tpfs = tpfs;
@@ -542,8 +542,8 @@ const char *mc6847_friend_device::describe_context(void)
 //  ctor
 //-------------------------------------------------
 
-mc6847_base_device::mc6847_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const UINT8 *fontdata, double tpfs)
-	:   mc6847_friend_device(mconfig, type, name, tag, owner, clock, fontdata, (type == MC6847T1_NTSC) || (type == MC6847T1_PAL), tpfs, 25+191, true)
+mc6847_base_device::mc6847_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const UINT8 *fontdata, double tpfs, const char *shortname, const char *source)
+	:   mc6847_friend_device(mconfig, type, name, tag, owner, clock, fontdata, (type == MC6847T1_NTSC) || (type == MC6847T1_PAL), tpfs, 25+191, true, shortname, source)
 {
 	m_palette = s_palette;
 
@@ -1682,7 +1682,7 @@ const device_type MC6847T1_PAL = &device_creator<mc6847t1_pal_device>;
 //-------------------------------------------------
 
 mc6847_ntsc_device::mc6847_ntsc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: mc6847_base_device(mconfig, MC6847_NTSC, "MC6847_NTSC", tag, owner, clock, ntsc_square_fontdata8x12, 262.0)
+	: mc6847_base_device(mconfig, MC6847_NTSC, "MC6847_NTSC", tag, owner, clock, ntsc_square_fontdata8x12, 262.0, "mc6847_ntsc", __FILE__)
 {
 }
 
@@ -1693,7 +1693,7 @@ mc6847_ntsc_device::mc6847_ntsc_device(const machine_config &mconfig, const char
 //-------------------------------------------------
 
 mc6847_pal_device::mc6847_pal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: mc6847_base_device(mconfig, MC6847_PAL, "MC6847_PAL", tag, owner, clock, pal_square_fontdata8x12, 313.0)
+	: mc6847_base_device(mconfig, MC6847_PAL, "MC6847_PAL", tag, owner, clock, pal_square_fontdata8x12, 313.0, "mc6847_pal", __FILE__)
 {
 }
 
@@ -1704,7 +1704,7 @@ mc6847_pal_device::mc6847_pal_device(const machine_config &mconfig, const char *
 //-------------------------------------------------
 
 mc6847y_ntsc_device::mc6847y_ntsc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: mc6847_base_device(mconfig, MC6847Y_NTSC, "MC6847Y_NTSC", tag, owner, clock, ntsc_square_fontdata8x12, 262.5)
+	: mc6847_base_device(mconfig, MC6847Y_NTSC, "MC6847Y_NTSC", tag, owner, clock, ntsc_square_fontdata8x12, 262.5, "mc6847y", __FILE__)
 {
 }
 
@@ -1715,7 +1715,7 @@ mc6847y_ntsc_device::mc6847y_ntsc_device(const machine_config &mconfig, const ch
 //-------------------------------------------------
 
 mc6847y_pal_device::mc6847y_pal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: mc6847_base_device(mconfig, MC6847Y_PAL, "MC6847Y_PAL", tag, owner, clock, pal_square_fontdata8x12, 313.0)
+	: mc6847_base_device(mconfig, MC6847Y_PAL, "MC6847Y_PAL", tag, owner, clock, pal_square_fontdata8x12, 313.0, "mc6847y_pal", __FILE__)
 {
 }
 
@@ -1726,7 +1726,7 @@ mc6847y_pal_device::mc6847y_pal_device(const machine_config &mconfig, const char
 //-------------------------------------------------
 
 mc6847t1_ntsc_device::mc6847t1_ntsc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: mc6847_base_device(mconfig, MC6847T1_NTSC, "MC6847T1_NTSC", tag, owner, clock, ntsc_round_fontdata8x12, 262.0)
+	: mc6847_base_device(mconfig, MC6847T1_NTSC, "MC6847T1_NTSC", tag, owner, clock, ntsc_round_fontdata8x12, 262.0, "mc6847t1_ntsc", __FILE__)
 {
 }
 
@@ -1737,6 +1737,6 @@ mc6847t1_ntsc_device::mc6847t1_ntsc_device(const machine_config &mconfig, const
 //-------------------------------------------------
 
 mc6847t1_pal_device::mc6847t1_pal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: mc6847_base_device(mconfig, MC6847T1_PAL, "MC6847T1_PAL", tag, owner, clock, pal_round_fontdata8x12, 313.0)
+	: mc6847_base_device(mconfig, MC6847T1_PAL, "MC6847T1_PAL", tag, owner, clock, pal_round_fontdata8x12, 313.0, "mc6847t1_pal", __FILE__)
 {
 }
diff --git a/src/emu/video/mc6847.h b/src/emu/video/mc6847.h
index 88027023d65..673fddb6f22 100644
--- a/src/emu/video/mc6847.h
+++ b/src/emu/video/mc6847.h
@@ -91,7 +91,7 @@ public:
 
 protected:
 	mc6847_friend_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,
-		const UINT8 *fontdata, bool is_mc6847t1, double tpfs, int field_sync_falling_edge_scanline, bool supports_partial_body_scanlines);
+		const UINT8 *fontdata, bool is_mc6847t1, double tpfs, int field_sync_falling_edge_scanline, bool supports_partial_body_scanlines, const char *shortname, const char *source);
 
 	// video mode constants
 	static const UINT8 MODE_AG      = 0x80;
@@ -510,7 +510,7 @@ public:
 	DECLARE_WRITE_LINE_MEMBER( inv_w )      { change_mode(MODE_INV, state); }
 
 protected:
-	mc6847_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const UINT8 *fontdata, double tpfs);
+	mc6847_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const UINT8 *fontdata, double tpfs, const char *shortname, const char *source);
 
 	// device-level overrides
 	virtual void device_start();
diff --git a/src/emu/video/pc_vga.c b/src/emu/video/pc_vga.c
index 1093e0df1cd..0d21fd7a534 100644
--- a/src/emu/video/pc_vga.c
+++ b/src/emu/video/pc_vga.c
@@ -124,78 +124,78 @@ const device_type CIRRUS_VGA = &device_creator<cirrus_vga_device>;
 const device_type IBM8514A = &device_creator<ibm8514a_device>;
 const device_type MACH8 = &device_creator<mach8_device>;
 
-vga_device::vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, type, name, tag, owner, clock)
+vga_device::vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+	: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
 {
 }
 
 vga_device::vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, VGA, "VGA", tag, owner, clock)
+	: device_t(mconfig, VGA, "VGA", tag, owner, clock, "vga", __FILE__)
 {
 }
 
-svga_device::svga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
-	: vga_device(mconfig, type, name, tag, owner, clock)
+svga_device::svga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+	: vga_device(mconfig, type, name, tag, owner, clock, shortname, source)
 {
 }
 
 tseng_vga_device::tseng_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: svga_device(mconfig, TSENG_VGA, "TSENG_VGA", tag, owner, clock)
+	: svga_device(mconfig, TSENG_VGA, "TSENG_VGA", tag, owner, clock, "tseng_vga", __FILE__)
 {
 }
 
 trident_vga_device::trident_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: svga_device(mconfig, TRIDENT_VGA, "TRIDENT_VGA", tag, owner, clock)
+	: svga_device(mconfig, TRIDENT_VGA, "TRIDENT_VGA", tag, owner, clock, "trident_vga", __FILE__)
 {
 }
 
 s3_vga_device::s3_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: ati_vga_device(mconfig, S3_VGA, "S3_VGA", tag, owner, clock)
+	: ati_vga_device(mconfig, S3_VGA, "S3_VGA", tag, owner, clock, "s3_vga", __FILE__)
 {
 }
 
-s3_vga_device::s3_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
-	: ati_vga_device(mconfig, type, name, tag, owner, clock)
+s3_vga_device::s3_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+	: ati_vga_device(mconfig, type, name, tag, owner, clock, shortname, source)
 {
 }
 
 gamtor_vga_device::gamtor_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: svga_device(mconfig, GAMTOR_VGA, "GAMTOR_VGA", tag, owner, clock)
+	: svga_device(mconfig, GAMTOR_VGA, "GAMTOR_VGA", tag, owner, clock, "gamtor_vga", __FILE__)
 {
 }
 
 ati_vga_device::ati_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: svga_device(mconfig, ATI_VGA, "ATI_VGA", tag, owner, clock)
+	: svga_device(mconfig, ATI_VGA, "ATI_VGA", tag, owner, clock, "ati_vga", __FILE__)
 {
 }
 
-ati_vga_device::ati_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
-	: svga_device(mconfig, type, name, tag, owner, clock)
+ati_vga_device::ati_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+	: svga_device(mconfig, type, name, tag, owner, clock, shortname, source)
 {
 }
 
 cirrus_vga_device::cirrus_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: svga_device(mconfig, CIRRUS_VGA, "CIRRUS_VGA", tag, owner, clock)
+	: svga_device(mconfig, CIRRUS_VGA, "CIRRUS_VGA", tag, owner, clock, "cirrus_vga", __FILE__)
 {
 }
 
 ibm8514a_device::ibm8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, IBM8514A, "IBM8514A", tag, owner, clock)
+	: device_t(mconfig, IBM8514A, "IBM8514A", tag, owner, clock, "ibm8514a", __FILE__)
 {
 }
 
-ibm8514a_device::ibm8514a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, type, name, tag, owner, clock)
+ibm8514a_device::ibm8514a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+	: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
 {
 }
 
-mach8_device::mach8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
-	: ibm8514a_device(mconfig, type, name, tag, owner, clock)
+mach8_device::mach8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+	: ibm8514a_device(mconfig, type, name, tag, owner, clock, shortname, source)
 {
 }
 
 mach8_device::mach8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: ibm8514a_device(mconfig, MACH8, "MACH8", tag, owner, clock)
+	: ibm8514a_device(mconfig, MACH8, "MACH8", tag, owner, clock, "mach8", __FILE__)
 {
 }
 
diff --git a/src/emu/video/pc_vga.h b/src/emu/video/pc_vga.h
index 29e8bd10866..ec8131acc4f 100644
--- a/src/emu/video/pc_vga.h
+++ b/src/emu/video/pc_vga.h
@@ -24,7 +24,7 @@ class vga_device :  public device_t
 public:
 	// construction/destruction
 	vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 
 
 	virtual UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
@@ -202,7 +202,7 @@ class svga_device :  public vga_device
 {
 public:
 	// construction/destruction
-	svga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	svga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 
 	virtual UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
 protected:
@@ -231,7 +231,7 @@ private:
 class ibm8514a_device :  public device_t
 {
 public:
-	ibm8514a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	ibm8514a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 	ibm8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
 
 	void set_vga(const char* tag) { m_vga_tag.cpy(tag); }
@@ -370,7 +370,7 @@ extern const device_type IBM8514A;
 class mach8_device :  public ibm8514a_device
 {
 public:
-	mach8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	mach8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 	mach8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
 
 	READ16_MEMBER(mach8_ec0_r);
@@ -499,7 +499,7 @@ class ati_vga_device :  public svga_device
 public:
 	// construction/destruction
 	ati_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	ati_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	ati_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 
 	virtual READ8_MEMBER(mem_r);
 	virtual WRITE8_MEMBER(mem_w);
@@ -536,7 +536,7 @@ class s3_vga_device :  public ati_vga_device
 public:
 	// construction/destruction
 	s3_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	s3_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	s3_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 
 	virtual READ8_MEMBER(port_03b0_r);
 	virtual WRITE8_MEMBER(port_03b0_w);
diff --git a/src/emu/video/psx.c b/src/emu/video/psx.c
index 03074fdea9a..200de65a6bf 100644
--- a/src/emu/video/psx.c
+++ b/src/emu/video/psx.c
@@ -18,8 +18,8 @@ const device_type CXD8561BQ = &device_creator<cxd8561bq_device>;
 const device_type CXD8561CQ = &device_creator<cxd8561cq_device>;
 const device_type CXD8654Q = &device_creator<cxd8654q_device>;
 
-psxgpu_device::psxgpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
-	device_t(mconfig, type, name, tag, owner, clock),
+psxgpu_device::psxgpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+	device_t(mconfig, type, name, tag, owner, clock, shortname, source),
 	m_vblank_handler(*this)
 {
 }
@@ -44,32 +44,32 @@ void psxgpu_device::device_reset( void )
 }
 
 cxd8514q_device::cxd8514q_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: psxgpu_device(mconfig, CXD8514Q, "CXD8514Q", tag, owner, clock)
+	: psxgpu_device(mconfig, CXD8514Q, "CXD8514Q", tag, owner, clock, "cxd8514q", __FILE__)
 {
 }
 
 cxd8538q_device::cxd8538q_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: psxgpu_device(mconfig, CXD8538Q, "CXD8538Q", tag, owner, clock)
+	: psxgpu_device(mconfig, CXD8538Q, "CXD8538Q", tag, owner, clock, "cxd8538q", __FILE__)
 {
 }
 
 cxd8561q_device::cxd8561q_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: psxgpu_device(mconfig, CXD8561Q, "CXD8561Q", tag, owner, clock)
+	: psxgpu_device(mconfig, CXD8561Q, "CXD8561Q", tag, owner, clock, "cxd8561q", __FILE__)
 {
 }
 
 cxd8561bq_device::cxd8561bq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: psxgpu_device(mconfig, CXD8561BQ, "CXD8561BQ", tag, owner, clock)
+	: psxgpu_device(mconfig, CXD8561BQ, "CXD8561BQ", tag, owner, clock, "cxd8561bq", __FILE__)
 {
 }
 
 cxd8561cq_device::cxd8561cq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: psxgpu_device(mconfig, CXD8561CQ, "CXD8561CQ", tag, owner, clock)
+	: psxgpu_device(mconfig, CXD8561CQ, "CXD8561CQ", tag, owner, clock, "cxd8561cq", __FILE__)
 {
 }
 
 cxd8654q_device::cxd8654q_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: psxgpu_device(mconfig, CXD8654Q, "CXD8654Q", tag, owner, clock)
+	: psxgpu_device(mconfig, CXD8654Q, "CXD8654Q", tag, owner, clock, "cxd8654q", __FILE__)
 {
 }
 
diff --git a/src/emu/video/psx.h b/src/emu/video/psx.h
index 758b398824f..340d6ed29c8 100644
--- a/src/emu/video/psx.h
+++ b/src/emu/video/psx.h
@@ -187,7 +187,7 @@ class psxgpu_device : public device_t
 {
 public:
 	// construction/destruction
-	psxgpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	psxgpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 	virtual machine_config_constructor device_mconfig_additions() const;
 
 	// static configuration helpers
diff --git a/src/emu/video/ramdac.c b/src/emu/video/ramdac.c
index 4f3df8fffa5..dbdd312fd0a 100644
--- a/src/emu/video/ramdac.c
+++ b/src/emu/video/ramdac.c
@@ -38,7 +38,7 @@ const device_type RAMDAC = &device_creator<ramdac_device>;
 //-------------------------------------------------
 
 ramdac_device::ramdac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, RAMDAC, "ramdac", tag, owner, clock),
+	: device_t(mconfig, RAMDAC, "ramdac", tag, owner, clock, "ramdac", __FILE__),
 		device_memory_interface(mconfig, *this),
 		m_space_config("videoram", ENDIANNESS_LITTLE, 8, 10, 0, NULL, *ADDRESS_MAP_NAME(ramdac_palram))
 {
diff --git a/src/emu/video/s2636.c b/src/emu/video/s2636.c
index d6ff2915547..ee408a254c5 100644
--- a/src/emu/video/s2636.c
+++ b/src/emu/video/s2636.c
@@ -367,7 +367,7 @@ static DEVICE_START( s2636 )
 const device_type S2636 = &device_creator<s2636_device>;
 
 s2636_device::s2636_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, S2636, "Signetics 2636", tag, owner, clock)
+	: device_t(mconfig, S2636, "Signetics 2636", tag, owner, clock, "s2636", __FILE__)
 {
 	m_token = global_alloc_clear(s2636_state);
 }
diff --git a/src/emu/video/tlc34076.c b/src/emu/video/tlc34076.c
index ed812ee8d34..0eaee1ae6be 100644
--- a/src/emu/video/tlc34076.c
+++ b/src/emu/video/tlc34076.c
@@ -40,7 +40,7 @@ const device_type TLC34076 = &device_creator<tlc34076_device>;
 //  tlc34076_device - constructor
 //-------------------------------------------------
 tlc34076_device::tlc34076_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	:   device_t(mconfig, TLC34076, "TLC34076", tag, owner, clock),
+	:   device_t(mconfig, TLC34076, "TLC34076", tag, owner, clock, "tlc34076", __FILE__),
 		m_dacbits(6)
 {
 }
diff --git a/src/emu/video/tms3556.c b/src/emu/video/tms3556.c
index 861dff5682f..de351849041 100644
--- a/src/emu/video/tms3556.c
+++ b/src/emu/video/tms3556.c
@@ -77,7 +77,7 @@ inline void tms3556_device::writebyte(offs_t address, UINT8 data)
 //-------------------------------------------------
 
 tms3556_device::tms3556_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, TMS3556, "Texas Instruments VDP TMS3556", tag, owner, clock),
+	: device_t(mconfig, TMS3556, "Texas Instruments VDP TMS3556", tag, owner, clock, "tms3556", __FILE__),
 		device_memory_interface(mconfig, *this),
 		m_space_config("videoram", ENDIANNESS_LITTLE, 8, 17, 0, NULL, *ADDRESS_MAP_NAME(tms3556)),
 		m_write_ptr(0),
diff --git a/src/emu/video/tms9927.c b/src/emu/video/tms9927.c
index 8f68236dfb0..975cceba0b6 100644
--- a/src/emu/video/tms9927.c
+++ b/src/emu/video/tms9927.c
@@ -36,27 +36,27 @@ const device_type CRT5037 = &device_creator<crt5037_device>;
 const device_type CRT5057 = &device_creator<crt5057_device>;
 
 tms9927_device::tms9927_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-				: device_t(mconfig, TMS9927, "TMS9927", tag, owner, clock)
+				: device_t(mconfig, TMS9927, "TMS9927", tag, owner, clock, "tms9927", __FILE__)
 {
 }
 
-tms9927_device::tms9927_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
-				: device_t(mconfig, type, name, tag, owner, clock)
+tms9927_device::tms9927_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+				: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
 {
 }
 
 crt5027_device::crt5027_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-				: tms9927_device(mconfig, CRT5027, "CRT5027", tag, owner, clock)
+				: tms9927_device(mconfig, CRT5027, "CRT5027", tag, owner, clock, "crt5027", __FILE__)
 {
 }
 
 crt5037_device::crt5037_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-				: tms9927_device(mconfig, CRT5037, "CRT5037", tag, owner, clock)
+				: tms9927_device(mconfig, CRT5037, "CRT5037", tag, owner, clock, "crt5037", __FILE__)
 {
 }
 
 crt5057_device::crt5057_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-				: tms9927_device(mconfig, CRT5057, "CRT5057", tag, owner, clock)
+				: tms9927_device(mconfig, CRT5057, "CRT5057", tag, owner, clock, "crt5057", __FILE__)
 {
 }
 
diff --git a/src/emu/video/tms9927.h b/src/emu/video/tms9927.h
index 94ba9919eee..4e13d22e254 100644
--- a/src/emu/video/tms9927.h
+++ b/src/emu/video/tms9927.h
@@ -24,7 +24,7 @@ class tms9927_device : public device_t,
 {
 public:
 	tms9927_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	tms9927_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	tms9927_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 	~tms9927_device() {}
 
 	DECLARE_WRITE8_MEMBER(write);
diff --git a/src/emu/video/tms9928a.c b/src/emu/video/tms9928a.c
index 99f05b9cb5e..781d1a65bd4 100644
--- a/src/emu/video/tms9928a.c
+++ b/src/emu/video/tms9928a.c
@@ -90,8 +90,8 @@ static const rgb_t tms9928a_palette[TMS9928A_PALETTE_SIZE] =
 	RGB_WHITE
 };
 
-tms9928a_device::tms9928a_device( const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, bool is_50hz, bool is_reva, bool is_99 )
-	: device_t( mconfig, type, name, tag, owner, clock ),
+tms9928a_device::tms9928a_device( const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, bool is_50hz, bool is_reva, bool is_99, const char *shortname, const char *source)
+	: device_t( mconfig, type, name, tag, owner, clock, shortname, source),
 		device_memory_interface(mconfig, *this),
 		m_space_config("vram",ENDIANNESS_BIG, 8, 14, 0, NULL, *ADDRESS_MAP_NAME(memmap))
 {
@@ -103,7 +103,7 @@ tms9928a_device::tms9928a_device( const machine_config &mconfig, device_type typ
 
 
 tms9928a_device::tms9928a_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
-	: device_t( mconfig, TMS9928A, "TMS9928A", tag, owner, clock ),
+	: device_t( mconfig, TMS9928A, "TMS9928A", tag, owner, clock, "tms9928a", __FILE__),
 		device_memory_interface(mconfig, *this),
 	m_space_config("vram",ENDIANNESS_BIG, 8, 14, 0, NULL, *ADDRESS_MAP_NAME(memmap))
 {
diff --git a/src/emu/video/tms9928a.h b/src/emu/video/tms9928a.h
index f6b781af5c5..53fea59e460 100644
--- a/src/emu/video/tms9928a.h
+++ b/src/emu/video/tms9928a.h
@@ -87,7 +87,7 @@ class tms9928a_device : public device_t,
 public:
 	// construction/destruction
 	tms9928a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	tms9928a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, bool is_50hz = false, bool is_reva = true, bool is_99 = true);
+	tms9928a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, bool is_50hz, bool is_reva, bool is_99, const char *shortname, const char *source);
 
 	DECLARE_READ8_MEMBER( vram_read );
 	DECLARE_WRITE8_MEMBER( vram_write );
@@ -160,7 +160,7 @@ class tms9918_device : public tms9928a_device
 {
 public:
 	tms9918_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-		: tms9928a_device( mconfig, TMS9918, "TMS9918", tag, owner, clock, false, false, true ) { }
+		: tms9928a_device( mconfig, TMS9918, "TMS9918", tag, owner, clock, false, false, true, "tms9918", __FILE__) { }
 };
 
 
@@ -168,7 +168,7 @@ class tms9918a_device : public tms9928a_device
 {
 public:
 	tms9918a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-		: tms9928a_device( mconfig, TMS9918A, "TMS9918A", tag, owner, clock, false, true, true ) { }
+		: tms9928a_device( mconfig, TMS9918A, "TMS9918A", tag, owner, clock, false, true, true, "tms9918a", __FILE__) { }
 };
 
 
@@ -176,7 +176,7 @@ class tms9118_device : public tms9928a_device
 {
 public:
 	tms9118_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-		: tms9928a_device( mconfig, TMS9118, "TMS9118", tag, owner, clock, false, true, false ) { }
+		: tms9928a_device( mconfig, TMS9118, "TMS9118", tag, owner, clock, false, true, false, "tms9118", __FILE__) { }
 };
 
 
@@ -184,7 +184,7 @@ class tms9128_device : public tms9928a_device
 {
 public:
 	tms9128_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-		: tms9928a_device( mconfig, TMS9128, "TMS9128", tag, owner, clock, false, true, false ) { }
+		: tms9928a_device( mconfig, TMS9128, "TMS9128", tag, owner, clock, false, true, false, "tms9128", __FILE__) { }
 };
 
 
@@ -192,7 +192,7 @@ class tms9929_device : public tms9928a_device
 {
 public:
 	tms9929_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-		: tms9928a_device( mconfig, TMS9929, "TMS9929", tag, owner, clock, true, false, true ) { }
+		: tms9928a_device( mconfig, TMS9929, "TMS9929", tag, owner, clock, true, false, true, "tms9929", __FILE__) { }
 };
 
 
@@ -200,7 +200,7 @@ class tms9929a_device : public tms9928a_device
 {
 public:
 	tms9929a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-		: tms9928a_device( mconfig, TMS9929A, "TMS9929A", tag, owner, clock, true, true, true ) { }
+		: tms9928a_device( mconfig, TMS9929A, "TMS9929A", tag, owner, clock, true, true, true, "tms9929a", __FILE__) { }
 };
 
 
@@ -208,7 +208,7 @@ class tms9129_device : public tms9928a_device
 {
 public:
 	tms9129_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-		: tms9928a_device( mconfig, TMS9129, "TMS9129", tag, owner, clock, true, true, false ) { }
+		: tms9928a_device( mconfig, TMS9129, "TMS9129", tag, owner, clock, true, true, false, "tms9129", __FILE__) { }
 };
 
 
diff --git a/src/emu/video/upd3301.c b/src/emu/video/upd3301.c
index c64f2ef7ac1..959b5138d69 100644
--- a/src/emu/video/upd3301.c
+++ b/src/emu/video/upd3301.c
@@ -193,7 +193,7 @@ inline void upd3301_device::recompute_parameters()
 //-------------------------------------------------
 
 upd3301_device::upd3301_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, UPD3301, "UPD3301", tag, owner, clock),
+	: device_t(mconfig, UPD3301, "UPD3301", tag, owner, clock, "upd3301", __FILE__),
 		m_status(0),
 		m_param_count(0),
 		m_data_fifo_pos(0),
diff --git a/src/emu/video/upd7227.c b/src/emu/video/upd7227.c
index 0b3c3f37a17..e46405baa85 100644
--- a/src/emu/video/upd7227.c
+++ b/src/emu/video/upd7227.c
@@ -43,7 +43,7 @@ ADDRESS_MAP_END
 //-------------------------------------------------
 
 upd7227_device::upd7227_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, UPD7227, "uPD7227", tag, owner, clock),
+	: device_t(mconfig, UPD7227, "uPD7227", tag, owner, clock, "upd7227", __FILE__),
 		device_memory_interface(mconfig, *this),
 		m_space_config("videoram", ENDIANNESS_BIG, 8, 7, 0, *ADDRESS_MAP_NAME(upd7227_map)),
 		m_cs(1),
diff --git a/src/emu/video/voodoo.c b/src/emu/video/voodoo.c
index 872caabbb7b..ff246207610 100644
--- a/src/emu/video/voodoo.c
+++ b/src/emu/video/voodoo.c
@@ -5730,8 +5730,8 @@ static void dump_rasterizer_stats(voodoo_state *v)
 	}
 }
 
-voodoo_device::voodoo_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, type, name, tag, owner, clock)
+voodoo_device::voodoo_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+	: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
 {
 	m_token = global_alloc_clear(voodoo_state);
 }
@@ -5768,7 +5768,7 @@ void voodoo_device::device_stop()
 const device_type VOODOO_1 = &device_creator<voodoo_1_device>;
 
 voodoo_1_device::voodoo_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: voodoo_device(mconfig, VOODOO_1, "3dfx Voodoo Graphics", tag, owner, clock)
+	: voodoo_device(mconfig, VOODOO_1, "3dfx Voodoo Graphics", tag, owner, clock, "voodoo_1", __FILE__)
 {
 }
 
@@ -5785,7 +5785,7 @@ void voodoo_1_device::device_start()
 const device_type VOODOO_2 = &device_creator<voodoo_2_device>;
 
 voodoo_2_device::voodoo_2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: voodoo_device(mconfig, VOODOO_2, "3dfx Voodoo 2", tag, owner, clock)
+	: voodoo_device(mconfig, VOODOO_2, "3dfx Voodoo 2", tag, owner, clock, "voodoo_2", __FILE__)
 {
 }
 
@@ -5802,7 +5802,7 @@ void voodoo_2_device::device_start()
 const device_type VOODOO_BANSHEE = &device_creator<voodoo_banshee_device>;
 
 voodoo_banshee_device::voodoo_banshee_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: voodoo_device(mconfig, VOODOO_BANSHEE, "3dfx Voodoo Banshee", tag, owner, clock)
+	: voodoo_device(mconfig, VOODOO_BANSHEE, "3dfx Voodoo Banshee", tag, owner, clock, "voodoo_banshee", __FILE__)
 {
 }
 
@@ -5819,7 +5819,7 @@ void voodoo_banshee_device::device_start()
 const device_type VOODOO_3 = &device_creator<voodoo_3_device>;
 
 voodoo_3_device::voodoo_3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: voodoo_device(mconfig, VOODOO_3, "3dfx Voodoo 3", tag, owner, clock)
+	: voodoo_device(mconfig, VOODOO_3, "3dfx Voodoo 3", tag, owner, clock, "voodoo_3", __FILE__)
 {
 }
 
diff --git a/src/emu/video/voodoo.h b/src/emu/video/voodoo.h
index 5e8063c35d2..833f92138da 100644
--- a/src/emu/video/voodoo.h
+++ b/src/emu/video/voodoo.h
@@ -126,7 +126,7 @@ DECLARE_READ32_DEVICE_HANDLER( banshee_rom_r );
 class voodoo_device : public device_t
 {
 public:
-	voodoo_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	voodoo_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 	~voodoo_device() { global_free(m_token); }
 
 	// access to legacy token
diff --git a/src/mame/drivers/cobra.c b/src/mame/drivers/cobra.c
index d54ce42c7c6..a50b9599d1d 100644
--- a/src/mame/drivers/cobra.c
+++ b/src/mame/drivers/cobra.c
@@ -499,7 +499,7 @@ protected:
 const device_type COBRA_JVS = &device_creator<cobra_jvs>;
 
 cobra_jvs::cobra_jvs(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: jvs_device(mconfig, COBRA_JVS, "COBRA_JVS", tag, owner, clock)
+	: jvs_device(mconfig, COBRA_JVS, "COBRA_JVS", tag, owner, clock, "cobra_jvs", __FILE__)
 {
 }
 
@@ -557,7 +557,7 @@ private:
 const device_type COBRA_JVS_HOST = &device_creator<cobra_jvs_host>;
 
 cobra_jvs_host::cobra_jvs_host(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: jvs_host(mconfig, COBRA_JVS_HOST, "COBRA_JVS_HOST", tag, owner, clock)
+	: jvs_host(mconfig, COBRA_JVS_HOST, "COBRA_JVS_HOST", tag, owner, clock, "cobra_jvs_host", __FILE__)
 {
 	m_send_ptr = 0;
 }
diff --git a/src/mame/machine/jvs13551.c b/src/mame/machine/jvs13551.c
index 37849b07dba..fabe1740b52 100644
--- a/src/mame/machine/jvs13551.c
+++ b/src/mame/machine/jvs13551.c
@@ -31,7 +31,7 @@ ioport_constructor sega_837_13551::device_input_ports() const
 	return INPUT_PORTS_NAME(sega_837_13551_coins);
 }
 
-sega_837_13551::sega_837_13551(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : jvs_device(mconfig, SEGA_837_13551, "SEGA-837-13551", tag, owner, clock)
+sega_837_13551::sega_837_13551(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : jvs_device(mconfig, SEGA_837_13551, "SEGA-837-13551", tag, owner, clock, "sega_837_13551", __FILE__)
 {
 	memset(port_tag, 0, sizeof(port_tag));
 }
diff --git a/src/mame/machine/megavdp.c b/src/mame/machine/megavdp.c
index 19b1171d5aa..478be4c05e5 100644
--- a/src/mame/machine/megavdp.c
+++ b/src/mame/machine/megavdp.c
@@ -41,7 +41,7 @@ void genesis_vdp_lv4irqline_callback_default(running_machine &machine, bool stat
 const device_type SEGA_GEN_VDP = &device_creator<sega_genesis_vdp_device>;
 
 sega_genesis_vdp_device::sega_genesis_vdp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: sega315_5124_device( mconfig, SEGA315_5246, "Sega Genesis VDP", tag, owner, clock, SEGA315_5124_CRAM_SIZE, 0, true )
+	: sega315_5124_device( mconfig, SEGA315_5246, "Sega Genesis VDP", tag, owner, clock, SEGA315_5124_CRAM_SIZE, 0, true, "sega_genesis_vdp", __FILE__)
 {
 	m_genesis_vdp_sndirqline_callback = genesis_vdp_sndirqline_callback_default;
 	m_genesis_vdp_lv6irqline_callback = genesis_vdp_lv6irqline_callback_default;
diff --git a/src/mame/machine/mie.c b/src/mame/machine/mie.c
index a7ed5bbbd6b..9f31d9b8e3f 100644
--- a/src/mame/machine/mie.c
+++ b/src/mame/machine/mie.c
@@ -77,7 +77,7 @@ machine_config_constructor mie_device::device_mconfig_additions() const
 }
 
 mie_jvs_device::mie_jvs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: jvs_host(mconfig, MIE_JVS, "MIE-JVS", tag, owner, clock)
+	: jvs_host(mconfig, MIE_JVS, "MIE-JVS", tag, owner, clock, "mie_jvs", __FILE__)
 {
 }
 
diff --git a/src/mame/machine/zs01.c b/src/mame/machine/zs01.c
index 06a96c3baa3..4a92199e7f4 100644
--- a/src/mame/machine/zs01.c
+++ b/src/mame/machine/zs01.c
@@ -35,7 +35,7 @@ void zs01_device::static_set_ds2401_tag(device_t &device, const char *ds2401_tag
 }
 
 zs01_device::zs01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_secure_serial_flash(mconfig, ZS01, "ZS01", tag, owner, clock)
+	: device_secure_serial_flash(mconfig, ZS01, "ZS01", tag, owner, clock, "zs01", __FILE__)
 {
 }
 
diff --git a/src/mess/audio/alesis.c b/src/mess/audio/alesis.c
index f801384d143..fd2e92376eb 100644
--- a/src/mess/audio/alesis.c
+++ b/src/mess/audio/alesis.c
@@ -33,7 +33,7 @@ MACHINE_CONFIG_END
 //-------------------------------------------------
 
 alesis_dm3ag_device::alesis_dm3ag_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, ALESIS_DM3AG, "Alesis DM3AG", tag, owner, clock),
+	: device_t(mconfig, ALESIS_DM3AG, "Alesis DM3AG", tag, owner, clock, "alesis_dm3ag", __FILE__),
 		m_dac(*this, "dac")
 {
 }
diff --git a/src/mess/audio/arcadia.c b/src/mess/audio/arcadia.c
index f60dca8ce55..cd9555f77af 100644
--- a/src/mess/audio/arcadia.c
+++ b/src/mess/audio/arcadia.c
@@ -46,7 +46,7 @@ const device_type ARCADIA_SOUND = &device_creator<arcadia_sound_device>;
 //-------------------------------------------------
 
 arcadia_sound_device::arcadia_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, ARCADIA_SOUND, "Arcadia Custom Sound", tag, owner, clock),
+	: device_t(mconfig, ARCADIA_SOUND, "Arcadia Custom Sound", tag, owner, clock, "arcadia_sound", __FILE__),
 		device_sound_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/audio/channelf.c b/src/mess/audio/channelf.c
index 66de0612224..bbcdcc9d6d3 100644
--- a/src/mess/audio/channelf.c
+++ b/src/mess/audio/channelf.c
@@ -7,7 +7,7 @@
 const device_type CHANNELF_SOUND = &device_creator<channelf_sound_device>;
 
 channelf_sound_device::channelf_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, CHANNELF_SOUND, "Channel F Sound", tag, owner, clock),
+	: device_t(mconfig, CHANNELF_SOUND, "Channel F Sound", tag, owner, clock, "channelf_sound", __FILE__),
 		device_sound_interface(mconfig, *this),
 		m_channel(NULL),
 		m_sound_mode(0),
diff --git a/src/mess/audio/dai.c b/src/mess/audio/dai.c
index 9242b592f42..5663e57e9c5 100644
--- a/src/mess/audio/dai.c
+++ b/src/mess/audio/dai.c
@@ -20,7 +20,7 @@ const device_type DAI_SOUND = &device_creator<dai_sound_device>;
 //-------------------------------------------------
 
 dai_sound_device::dai_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, DAI_SOUND, "DAI Custom Sound", tag, owner, clock),
+	: device_t(mconfig, DAI_SOUND, "DAI Custom Sound", tag, owner, clock, "dai_sound", __FILE__),
 		device_sound_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/audio/gb.c b/src/mess/audio/gb.c
index a318e33d698..14d0e072bf3 100644
--- a/src/mess/audio/gb.c
+++ b/src/mess/audio/gb.c
@@ -104,7 +104,7 @@ const device_type GAMEBOY = &device_creator<gameboy_sound_device>;
 //-------------------------------------------------
 
 gameboy_sound_device::gameboy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-					: device_t(mconfig, GAMEBOY, "LR35902", tag, owner, clock),
+					: device_t(mconfig, GAMEBOY, "LR35902", tag, owner, clock, "gameboy_sound", __FILE__),
 						device_sound_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/audio/mac.c b/src/mess/audio/mac.c
index 82b064eacc3..e17af486ef1 100644
--- a/src/mess/audio/mac.c
+++ b/src/mess/audio/mac.c
@@ -31,7 +31,7 @@
 const device_type MAC_SOUND = &device_creator<mac_sound_device>;
 
 mac_sound_device::mac_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-					: device_t(mconfig, MAC_SOUND, "Mac Custom", tag, owner, clock),
+					: device_t(mconfig, MAC_SOUND, "Mac Custom", tag, owner, clock, "mac_sound", __FILE__),
 						device_sound_interface(mconfig, *this),
 						m_sample_enable(0),
 						m_mac_snd_buf_ptr(NULL),
diff --git a/src/mess/audio/mea8000.c b/src/mess/audio/mea8000.c
index 65482e5c252..a88838e5224 100644
--- a/src/mess/audio/mea8000.c
+++ b/src/mess/audio/mea8000.c
@@ -113,7 +113,7 @@ const device_type MEA8000 = &device_creator<mea8000_device>;
 
 
 mea8000_device::mea8000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-			: device_t(mconfig, MEA8000, "Philips / Signetics MEA 8000 speech synthesizer", tag, owner, clock)
+			: device_t(mconfig, MEA8000, "Philips / Signetics MEA 8000 speech synthesizer", tag, owner, clock, "mea8000", __FILE__)
 {
 }
 
diff --git a/src/mess/audio/socrates.c b/src/mess/audio/socrates.c
index 18d6f7cc1ab..9bcce819c5a 100644
--- a/src/mess/audio/socrates.c
+++ b/src/mess/audio/socrates.c
@@ -20,7 +20,7 @@ const device_type SOCRATES_SOUND = &device_creator<socrates_snd_device>;
 //-------------------------------------------------
 
 socrates_snd_device::socrates_snd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, SOCRATES_SOUND, "Socrates Sound", tag, owner, clock),
+	: device_t(mconfig, SOCRATES_SOUND, "Socrates Sound", tag, owner, clock, "socrates_snd", __FILE__),
 	device_sound_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/audio/special.c b/src/mess/audio/special.c
index d5d13c96f32..27ddf666ba1 100644
--- a/src/mess/audio/special.c
+++ b/src/mess/audio/special.c
@@ -23,7 +23,7 @@ const device_type SPECIMX = &device_creator<specimx_sound_device>;
 //-------------------------------------------------
 
 specimx_sound_device::specimx_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, SPECIMX, "Specialist MX Custom", tag, owner, clock),
+	: device_t(mconfig, SPECIMX, "Specialist MX Custom", tag, owner, clock, "specimx_sound", __FILE__),
 		device_sound_interface(mconfig, *this),
 		m_mixer_channel(NULL)
 {
diff --git a/src/mess/audio/svision.c b/src/mess/audio/svision.c
index 0913c08dd57..da40b99eff1 100644
--- a/src/mess/audio/svision.c
+++ b/src/mess/audio/svision.c
@@ -21,7 +21,7 @@ const device_type SVISION = &device_creator<svision_sound_device>;
 //-------------------------------------------------
 
 svision_sound_device::svision_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, SVISION, "Super Vision Custom", tag, owner, clock),
+	: device_t(mconfig, SVISION, "Super Vision Custom", tag, owner, clock, "svision_sound", __FILE__),
 		device_sound_interface(mconfig, *this),
 		m_mixer_channel(NULL)
 {
diff --git a/src/mess/audio/tvc.c b/src/mess/audio/tvc.c
index 8ab3fa2c7df..3e9c56d4c72 100644
--- a/src/mess/audio/tvc.c
+++ b/src/mess/audio/tvc.c
@@ -15,7 +15,7 @@ const device_type TVC_SOUND = &device_creator<tvc_sound_device>;
 //-------------------------------------------------
 
 tvc_sound_device::tvc_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, TVC_SOUND, "TVC 64 Custom Sound", tag, owner, clock),
+	: device_t(mconfig, TVC_SOUND, "TVC 64 Custom Sound", tag, owner, clock, "tvc_sound", __FILE__),
 		device_sound_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/audio/upd1771.c b/src/mess/audio/upd1771.c
index ad07d815a98..972353098e6 100644
--- a/src/mess/audio/upd1771.c
+++ b/src/mess/audio/upd1771.c
@@ -222,7 +222,7 @@ const device_type UPD1771C = &device_creator<upd1771c_device>;
 
 
 upd1771c_device::upd1771c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-				: device_t(mconfig, UPD1771C, "NEC uPD1771C 017", tag, owner, clock),
+				: device_t(mconfig, UPD1771C, "NEC uPD1771C 017", tag, owner, clock, "upd1771c", __FILE__),
 					device_sound_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/audio/vboy.c b/src/mess/audio/vboy.c
index 38076e8b268..27569aedd72 100644
--- a/src/mess/audio/vboy.c
+++ b/src/mess/audio/vboy.c
@@ -194,7 +194,7 @@ INLINE void mputb(UINT8 *ptr, INT8 data) { *ptr = data; }
 //-------------------------------------------------
 
 vboysnd_device::vboysnd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, VBOYSND, "Virtual Boy audio", tag, owner, clock),
+	: device_t(mconfig, VBOYSND, "Virtual Boy audio", tag, owner, clock, "vboysnd", __FILE__),
 		device_sound_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/audio/vc4000.c b/src/mess/audio/vc4000.c
index 80736eeecb1..7228fe09d06 100644
--- a/src/mess/audio/vc4000.c
+++ b/src/mess/audio/vc4000.c
@@ -11,7 +11,7 @@
 const device_type VC4000 = &device_creator<vc4000_sound_device>;
 
 vc4000_sound_device::vc4000_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, VC4000, "VC 4000 Custom", tag, owner, clock),
+	: device_t(mconfig, VC4000, "VC 4000 Custom", tag, owner, clock, "vc4000_sound", __FILE__),
 		device_sound_interface(mconfig, *this),
 		m_channel(NULL),
 		m_size(0),
diff --git a/src/mess/audio/vrc6.c b/src/mess/audio/vrc6.c
index 4553dd118da..715ce688a08 100644
--- a/src/mess/audio/vrc6.c
+++ b/src/mess/audio/vrc6.c
@@ -28,7 +28,7 @@ const device_type VRC6 = &device_creator<vrc6snd_device>;
 //-------------------------------------------------
 
 vrc6snd_device::vrc6snd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, VRC6, "VRC6 sound", tag, owner, clock),
+	: device_t(mconfig, VRC6, "VRC6 sound", tag, owner, clock, "vrc6snd", __FILE__),
 		device_sound_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/audio/wswan.c b/src/mess/audio/wswan.c
index a44d6279818..0b4629d1de3 100644
--- a/src/mess/audio/wswan.c
+++ b/src/mess/audio/wswan.c
@@ -24,7 +24,7 @@ const device_type WSWAN = &device_creator<wswan_sound_device>;
 //-------------------------------------------------
 
 wswan_sound_device::wswan_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, WSWAN, "WonderSwan Custom", tag, owner, clock),
+	: device_t(mconfig, WSWAN, "WonderSwan Custom", tag, owner, clock, "wswan_sound", __FILE__),
 		device_sound_interface(mconfig, *this),
 		m_channel(NULL),
 		m_sweep_step(0),
diff --git a/src/mess/drivers/apexc.c b/src/mess/drivers/apexc.c
index a2b34a5baff..ab4b8c04a13 100644
--- a/src/mess/drivers/apexc.c
+++ b/src/mess/drivers/apexc.c
@@ -93,7 +93,7 @@ private:
 const device_type APEXC_CYLINDER = &device_creator<apexc_cylinder_image_device>;
 
 apexc_cylinder_image_device::apexc_cylinder_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, APEXC_CYLINDER, "APEXC Cylinder", tag, owner, clock),
+	: device_t(mconfig, APEXC_CYLINDER, "APEXC Cylinder", tag, owner, clock, "apexc_cylinder_image", __FILE__),
 		device_image_interface(mconfig, *this)
 {
 }
@@ -223,7 +223,7 @@ protected:
 const device_type APEXC_TAPE_PUNCHER = &device_creator<apexc_tape_puncher_image_device>;
 
 apexc_tape_puncher_image_device::apexc_tape_puncher_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, APEXC_TAPE_PUNCHER, "APEXC Tape Puncher", tag, owner, clock),
+	: device_t(mconfig, APEXC_TAPE_PUNCHER, "APEXC Tape Puncher", tag, owner, clock, "apexc_tape_puncher_image", __FILE__),
 		device_image_interface(mconfig, *this)
 {
 }
@@ -257,7 +257,7 @@ protected:
 const device_type APEXC_TAPE_READER = &device_creator<apexc_tape_reader_image_device>;
 
 apexc_tape_reader_image_device::apexc_tape_reader_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, APEXC_TAPE_READER, "APEXC Tape Reader", tag, owner, clock),
+	: device_t(mconfig, APEXC_TAPE_READER, "APEXC Tape Reader", tag, owner, clock, "apexc_tape_reader_image", __FILE__),
 		device_image_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/drivers/esq5505.c b/src/mess/drivers/esq5505.c
index 740bb48da36..8f4974fc0bc 100644
--- a/src/mess/drivers/esq5505.c
+++ b/src/mess/drivers/esq5505.c
@@ -204,7 +204,7 @@ private:
 const device_type ESQ_5505_5510_PUMP = &device_creator<esq_5505_5510_pump>;
 
 esq_5505_5510_pump::esq_5505_5510_pump(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, ESQ_5505_5510_PUMP, "ESQ_5505_5510_PUMP", tag, owner, clock),
+	: device_t(mconfig, ESQ_5505_5510_PUMP, "ESQ_5505_5510_PUMP", tag, owner, clock, "esq_5505_5510_pump", __FILE__),
 		device_sound_interface(mconfig, *this),
 		m_esp_halted(true)
 {
diff --git a/src/mess/drivers/pdp1.c b/src/mess/drivers/pdp1.c
index 9a0ba8d5bee..cab6dbdc628 100644
--- a/src/mess/drivers/pdp1.c
+++ b/src/mess/drivers/pdp1.c
@@ -692,7 +692,7 @@ protected:
 const device_type PDP1_READTAPE = &device_creator<pdp1_readtape_image_device>;
 
 pdp1_readtape_image_device::pdp1_readtape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, PDP1_READTAPE, "PDP1 Tape Reader", tag, owner, clock),
+	: device_t(mconfig, PDP1_READTAPE, "PDP1 Tape Reader", tag, owner, clock, "pdp1_readtape_image", __FILE__),
 		device_image_interface(mconfig, *this)
 {
 }
@@ -727,7 +727,7 @@ protected:
 const device_type PDP1_PUNCHTAPE = &device_creator<pdp1_punchtape_image_device>;
 
 pdp1_punchtape_image_device::pdp1_punchtape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, PDP1_PUNCHTAPE, "PDP1 Tape Puncher", tag, owner, clock),
+	: device_t(mconfig, PDP1_PUNCHTAPE, "PDP1 Tape Puncher", tag, owner, clock, "pdp1_punchtape_image", __FILE__),
 		device_image_interface(mconfig, *this)
 {
 }
@@ -763,7 +763,7 @@ protected:
 const device_type PDP1_PRINTER = &device_creator<pdp1_printer_image_device>;
 
 pdp1_printer_image_device::pdp1_printer_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, PDP1_PRINTER, "PDP1 Typewriter", tag, owner, clock),
+	: device_t(mconfig, PDP1_PRINTER, "PDP1 Typewriter", tag, owner, clock, "pdp1_printer_image", __FILE__),
 		device_image_interface(mconfig, *this)
 {
 }
@@ -798,7 +798,7 @@ protected:
 const device_type PDP1_CYLINDER = &device_creator<pdp1_cylinder_image_device>;
 
 pdp1_cylinder_image_device::pdp1_cylinder_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, PDP1_CYLINDER, "PDP1 Cylinder", tag, owner, clock),
+	: device_t(mconfig, PDP1_CYLINDER, "PDP1 Cylinder", tag, owner, clock, "pdp1_cylinder_image", __FILE__),
 		device_image_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/drivers/pv1000.c b/src/mess/drivers/pv1000.c
index d24046625c8..4d35938b273 100644
--- a/src/mess/drivers/pv1000.c
+++ b/src/mess/drivers/pv1000.c
@@ -44,7 +44,7 @@ extern const device_type PV1000;
 const device_type PV1000 = &device_creator<pv1000_sound_device>;
 
 pv1000_sound_device::pv1000_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-				: device_t(mconfig, PV1000, "NEC D65010G031", tag, owner, clock),
+				: device_t(mconfig, PV1000, "NEC D65010G031", tag, owner, clock, "pv1000_sound", __FILE__),
 					device_sound_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/drivers/tm990189.c b/src/mess/drivers/tm990189.c
index ca24b14f35e..e30285cdea9 100644
--- a/src/mess/drivers/tm990189.c
+++ b/src/mess/drivers/tm990189.c
@@ -465,7 +465,7 @@ protected:
 const device_type TM990_189_RS232 = &device_creator<tm990_189_rs232_image_device>;
 
 tm990_189_rs232_image_device::tm990_189_rs232_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, TM990_189_RS232, "TM990/189 RS232 port", tag, owner, clock),
+	: device_t(mconfig, TM990_189_RS232, "TM990/189 RS232 port", tag, owner, clock, "tm990_189_rs232_image", __FILE__),
 		device_image_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/drivers/tx0.c b/src/mess/drivers/tx0.c
index a72fbc44385..f4e57d2a376 100644
--- a/src/mess/drivers/tx0.c
+++ b/src/mess/drivers/tx0.c
@@ -425,7 +425,7 @@ protected:
 const device_type TX0_READTAPE = &device_creator<tx0_readtape_image_device>;
 
 tx0_readtape_image_device::tx0_readtape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, TX0_READTAPE, "TX0 Tape Reader", tag, owner, clock),
+	: device_t(mconfig, TX0_READTAPE, "TX0 Tape Reader", tag, owner, clock, "tx0_readtape_image", __FILE__),
 		device_image_interface(mconfig, *this)
 {
 }
@@ -460,7 +460,7 @@ protected:
 const device_type TX0_PUNCHTAPE = &device_creator<tx0_punchtape_image_device>;
 
 tx0_punchtape_image_device::tx0_punchtape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, TX0_PUNCHTAPE, "TX0 Tape Puncher", tag, owner, clock),
+	: device_t(mconfig, TX0_PUNCHTAPE, "TX0 Tape Puncher", tag, owner, clock, "tx0_punchtape_image", __FILE__),
 		device_image_interface(mconfig, *this)
 {
 }
@@ -496,7 +496,7 @@ protected:
 const device_type TX0_PRINTER = &device_creator<tx0_printer_image_device>;
 
 tx0_printer_image_device::tx0_printer_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, TX0_PRINTER, "TX0 Typewriter", tag, owner, clock),
+	: device_t(mconfig, TX0_PRINTER, "TX0 Typewriter", tag, owner, clock, "tx0_printer_image", __FILE__),
 		device_image_interface(mconfig, *this)
 {
 }
@@ -531,7 +531,7 @@ protected:
 const device_type TX0_MAGTAPE = &device_creator<tx0_magtape_image_device>;
 
 tx0_magtape_image_device::tx0_magtape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, TX0_MAGTAPE, "TX0 Magnetic Tape", tag, owner, clock),
+	: device_t(mconfig, TX0_MAGTAPE, "TX0 Magnetic Tape", tag, owner, clock, "tx0_magtape_image", __FILE__),
 		device_image_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/machine/3c505.c b/src/mess/machine/3c505.c
index 2d250ba74e6..16c8f3f7540 100644
--- a/src/mess/machine/3c505.c
+++ b/src/mess/machine/3c505.c
@@ -196,7 +196,7 @@ const device_type THREECOM3C505 = &device_creator<threecom3c505_device> ;
 //-------------------------------------------------
 
 threecom3c505_device::threecom3c505_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, THREECOM3C505, "Threecom 3C505", tag, owner, clock),
+	: device_t(mconfig, THREECOM3C505, "Threecom 3C505", tag, owner, clock, "threecom3c505", __FILE__),
 		device_network_interface(mconfig, *this, 10.0f)
 {
 	memset(static_cast<threecom3c505_interface *>(this), 0, sizeof(threecom3c505_interface));
diff --git a/src/mess/machine/64h156.c b/src/mess/machine/64h156.c
index f0cb2a69c50..2bc986ca527 100644
--- a/src/mess/machine/64h156.c
+++ b/src/mess/machine/64h156.c
@@ -397,7 +397,7 @@ inline void c64h156_device::decode_bit()
 //-------------------------------------------------
 
 c64h156_device::c64h156_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, C64H156, "64H156", tag, owner, clock),
+	: device_t(mconfig, C64H156, "64H156", tag, owner, clock, "c64h156", __FILE__),
 		device_execute_interface(mconfig, *this),
 		m_icount(0),
 		m_floppy(NULL),
diff --git a/src/mess/machine/68561mpcc.c b/src/mess/machine/68561mpcc.c
index ef29f95a98d..6558e801215 100644
--- a/src/mess/machine/68561mpcc.c
+++ b/src/mess/machine/68561mpcc.c
@@ -27,7 +27,7 @@ const device_type MPCC68561 = &device_creator<mpcc68561_t>;
     IMPLEMENTATION
 ***************************************************************************/
 
-mpcc68561_t::mpcc68561_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MPCC68561, "Rockwell 68561 MPCC", tag, owner, clock)
+mpcc68561_t::mpcc68561_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MPCC68561, "Rockwell 68561 MPCC", tag, owner, clock, "mpcc68561", __FILE__)
 {
 }
 
diff --git a/src/mess/machine/6883sam.c b/src/mess/machine/6883sam.c
index 653df9534f5..1a9c545a3cd 100644
--- a/src/mess/machine/6883sam.c
+++ b/src/mess/machine/6883sam.c
@@ -69,7 +69,7 @@ const device_type SAM6883 = &device_creator<sam6883_device>;
 //-------------------------------------------------
 
 sam6883_device::sam6883_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, SAM6883, "SAM6883", tag, owner, clock),
+	: device_t(mconfig, SAM6883, "SAM6883", tag, owner, clock, "sam6883", __FILE__),
 		m_space_0000(*this),
 		m_space_8000(*this),
 		m_space_A000(*this),
diff --git a/src/mess/machine/8530scc.c b/src/mess/machine/8530scc.c
index 3992236f7fb..6c6a25b92dc 100644
--- a/src/mess/machine/8530scc.c
+++ b/src/mess/machine/8530scc.c
@@ -23,7 +23,7 @@ const device_type SCC8530 = &device_creator<scc8530_t>;
     IMPLEMENTATION
 ***************************************************************************/
 
-scc8530_t::scc8530_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SCC8530, "Zilog 8530 SCC", tag, owner, clock)
+scc8530_t::scc8530_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, SCC8530, "Zilog 8530 SCC", tag, owner, clock, "scc8530", __FILE__)
 {
 }
 
diff --git a/src/mess/machine/990_tap.c b/src/mess/machine/990_tap.c
index 02b74eebb97..54b3d5164f6 100644
--- a/src/mess/machine/990_tap.c
+++ b/src/mess/machine/990_tap.c
@@ -972,7 +972,7 @@ protected:
 const device_type TI990_TAPE = &device_creator<ti990_tape_image_device>;
 
 ti990_tape_image_device::ti990_tape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, TI990_TAPE, "TI990 Magnetic Tape", tag, owner, clock),
+	: device_t(mconfig, TI990_TAPE, "TI990 Magnetic Tape", tag, owner, clock, "ti990_tape_image", __FILE__),
 		device_image_interface(mconfig, *this)
 {
 }
@@ -1067,7 +1067,7 @@ static DEVICE_START(tap_990)
 const device_type TI990_TAPE_CTRL = &device_creator<tap_990_device>;
 
 tap_990_device::tap_990_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, TI990_TAPE_CTRL, "Generic TI990 Tape Controller", tag, owner, clock)
+	: device_t(mconfig, TI990_TAPE_CTRL, "Generic TI990 Tape Controller", tag, owner, clock, "tap_990", __FILE__)
 {
 	m_token = global_alloc_clear(tap_990_t);
 }
diff --git a/src/mess/machine/a2bus.c b/src/mess/machine/a2bus.c
index 23c8715acbc..c88798682bc 100644
--- a/src/mess/machine/a2bus.c
+++ b/src/mess/machine/a2bus.c
@@ -87,7 +87,7 @@ const device_type A2BUS_SLOT = &device_creator<a2bus_slot_device>;
 //  a2bus_slot_device - constructor
 //-------------------------------------------------
 a2bus_slot_device::a2bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, A2BUS_SLOT, "Apple II Slot", tag, owner, clock),
+		device_t(mconfig, A2BUS_SLOT, "Apple II Slot", tag, owner, clock, "a2bus_slot", __FILE__),
 		device_slot_interface(mconfig, *this)
 {
 }
@@ -161,7 +161,7 @@ void a2bus_device::device_config_complete()
 //-------------------------------------------------
 
 a2bus_device::a2bus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, A2BUS, "Apple II Bus", tag, owner, clock)
+		device_t(mconfig, A2BUS, "Apple II Bus", tag, owner, clock, "a2bus", __FILE__)
 {
 }
 
diff --git a/src/mess/machine/a2eauxslot.c b/src/mess/machine/a2eauxslot.c
index aa4db3e853a..9105e01a97d 100644
--- a/src/mess/machine/a2eauxslot.c
+++ b/src/mess/machine/a2eauxslot.c
@@ -25,7 +25,7 @@ const device_type A2EAUXSLOT_SLOT = &device_creator<a2eauxslot_slot_device>;
 //  a2eauxslot_slot_device - constructor
 //-------------------------------------------------
 a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, A2EAUXSLOT_SLOT, "Apple II Slot", tag, owner, clock),
+		device_t(mconfig, A2EAUXSLOT_SLOT, "Apple II Slot", tag, owner, clock, "a2eauxslot_slot", __FILE__),
 		device_slot_interface(mconfig, *this)
 {
 }
@@ -98,7 +98,7 @@ void a2eauxslot_device::device_config_complete()
 //-------------------------------------------------
 
 a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, A2EAUXSLOT, "Apple II Bus", tag, owner, clock)
+		device_t(mconfig, A2EAUXSLOT, "Apple II Bus", tag, owner, clock, "a2eauxslot", __FILE__)
 {
 }
 
diff --git a/src/mess/machine/abc1600_bus.c b/src/mess/machine/abc1600_bus.c
index 710e8492eac..7283e8fd57e 100644
--- a/src/mess/machine/abc1600_bus.c
+++ b/src/mess/machine/abc1600_bus.c
@@ -52,7 +52,7 @@ device_abc1600bus_card_interface::~device_abc1600bus_card_interface()
 //-------------------------------------------------
 
 abc1600bus_slot_device::abc1600bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, ABC1600BUS_SLOT, "ABC 1600 bus slot", tag, owner, clock),
+		device_t(mconfig, ABC1600BUS_SLOT, "ABC 1600 bus slot", tag, owner, clock, "abc1600bus_slot", __FILE__),
 		device_slot_interface(mconfig, *this),
 		m_int(CLEAR_LINE),
 		m_pren(1),
diff --git a/src/mess/machine/abcbus.c b/src/mess/machine/abcbus.c
index cec60f35237..0a25db22d84 100644
--- a/src/mess/machine/abcbus.c
+++ b/src/mess/machine/abcbus.c
@@ -44,7 +44,7 @@ device_abcbus_card_interface::device_abcbus_card_interface(const machine_config
 //-------------------------------------------------
 
 abcbus_slot_device::abcbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-	device_t(mconfig, ABCBUS_SLOT, "ABC bus slot", tag, owner, clock),
+	device_t(mconfig, ABCBUS_SLOT, "ABC bus slot", tag, owner, clock, "abcbus_slot", __FILE__),
 	device_slot_interface(mconfig, *this),
 	m_write_int(*this),
 	m_write_nmi(*this),
diff --git a/src/mess/machine/abckb.c b/src/mess/machine/abckb.c
index f5145bd2c5e..48564d6bbcd 100644
--- a/src/mess/machine/abckb.c
+++ b/src/mess/machine/abckb.c
@@ -48,7 +48,7 @@ abc_keyboard_interface::abc_keyboard_interface(const machine_config &mconfig, de
 //-------------------------------------------------
 
 abc_keyboard_port_device::abc_keyboard_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-	device_t(mconfig, ABC_KEYBOARD_PORT, "Luxor ABC keyboard port", tag, owner, clock),
+	device_t(mconfig, ABC_KEYBOARD_PORT, "Luxor ABC keyboard port", tag, owner, clock, "abc_keyboard_port", __FILE__),
 	device_slot_interface(mconfig, *this),
 	m_write_trxc(*this),
 	m_write_keydown(*this)
diff --git a/src/mess/machine/adamexp.c b/src/mess/machine/adamexp.c
index 3505eda46c1..1e0b00ad59d 100644
--- a/src/mess/machine/adamexp.c
+++ b/src/mess/machine/adamexp.c
@@ -99,7 +99,7 @@ UINT8* device_adam_expansion_slot_card_interface::adam_ram_pointer(running_machi
 //-------------------------------------------------
 
 adam_expansion_slot_device::adam_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, ADAM_EXPANSION_SLOT, "ADAM expansion slot", tag, owner, clock),
+		device_t(mconfig, ADAM_EXPANSION_SLOT, "ADAM expansion slot", tag, owner, clock, "adam_expansion_slot", __FILE__),
 		device_slot_interface(mconfig, *this),
 		device_image_interface(mconfig, *this)
 {
diff --git a/src/mess/machine/adamnet.c b/src/mess/machine/adamnet.c
index b0aa7822fd2..dd06f786086 100644
--- a/src/mess/machine/adamnet.c
+++ b/src/mess/machine/adamnet.c
@@ -52,7 +52,7 @@ device_adamnet_card_interface::~device_adamnet_card_interface()
 //  adamnet_slot_device - constructor
 //-------------------------------------------------
 adamnet_slot_device::adamnet_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-	device_t(mconfig, ADAMNET_SLOT, "ADAMnet slot", tag, owner, clock),
+	device_t(mconfig, ADAMNET_SLOT, "ADAMnet slot", tag, owner, clock, "adamnet_slot", __FILE__),
 	device_slot_interface(mconfig, *this)
 {
 }
@@ -80,7 +80,7 @@ void adamnet_slot_device::device_start()
 //-------------------------------------------------
 
 adamnet_device::adamnet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-	device_t(mconfig, ADAMNET, "ADAMnet bus", tag, owner, clock),
+	device_t(mconfig, ADAMNET, "ADAMnet bus", tag, owner, clock, "adamnet", __FILE__),
 	m_txd(1),
 	m_reset(CLEAR_LINE)
 {
diff --git a/src/mess/machine/amigakbd.c b/src/mess/machine/amigakbd.c
index eb6f16a2c97..6e50fbc3d8e 100644
--- a/src/mess/machine/amigakbd.c
+++ b/src/mess/machine/amigakbd.c
@@ -20,7 +20,7 @@ const device_type AMIGAKBD = &device_creator<amigakbd_device>;
 //-------------------------------------------------
 
 amigakbd_device::amigakbd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, AMIGAKBD, "Amiga Keyboard", tag, owner, clock)
+	: device_t(mconfig, AMIGAKBD, "Amiga Keyboard", tag, owner, clock, "amigakbd", __FILE__)
 {
 }
 
diff --git a/src/mess/machine/apollo.c b/src/mess/machine/apollo.c
index bf842dae2cb..7b6af33a882 100644
--- a/src/mess/machine/apollo.c
+++ b/src/mess/machine/apollo.c
@@ -151,7 +151,7 @@ extern const device_type APOLLO_CONF;
 const device_type APOLLO_CONF = &device_creator<apollo_config_device>;
 
 apollo_config_device::apollo_config_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, APOLLO_CONF, "Apollo Configuration", tag, owner, clock)
+	: device_t(mconfig, APOLLO_CONF, "Apollo Configuration", tag, owner, clock, "apollo_config", __FILE__)
 {
 }
 
diff --git a/src/mess/machine/apollo_kbd.c b/src/mess/machine/apollo_kbd.c
index c028f89542e..4afa7d7f4fc 100644
--- a/src/mess/machine/apollo_kbd.c
+++ b/src/mess/machine/apollo_kbd.c
@@ -73,7 +73,7 @@ const device_type APOLLO_KBD = &device_creator<apollo_kbd_device>;
 //-------------------------------------------------
 
 apollo_kbd_device::apollo_kbd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, APOLLO_KBD, "Apollo Keyboard", tag, owner, clock)
+	: device_t(mconfig, APOLLO_KBD, "Apollo Keyboard", tag, owner, clock, "apollo_kbd", __FILE__)
 {
 	memset(static_cast<apollo_kbd_interface *>(this), 0, sizeof(apollo_kbd_interface));
 }
diff --git a/src/mess/machine/atarifdc.c b/src/mess/machine/atarifdc.c
index 163f583e6ce..ab831de0e43 100644
--- a/src/mess/machine/atarifdc.c
+++ b/src/mess/machine/atarifdc.c
@@ -815,7 +815,7 @@ static DEVICE_RESET(atari_fdc)
 const device_type ATARI_FDC = &device_creator<atari_fdc_device>;
 
 atari_fdc_device::atari_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, ATARI_FDC, "Atari FDC", tag, owner, clock)
+	: device_t(mconfig, ATARI_FDC, "Atari FDC", tag, owner, clock, "atari_fdc", __FILE__)
 {
 	m_token = global_alloc_clear(atari_fdc_t);
 }
diff --git a/src/mess/machine/bw2exp.c b/src/mess/machine/bw2exp.c
index fa41befb470..e7bcee99ae7 100644
--- a/src/mess/machine/bw2exp.c
+++ b/src/mess/machine/bw2exp.c
@@ -53,7 +53,7 @@ device_bw2_expansion_slot_interface::~device_bw2_expansion_slot_interface()
 //-------------------------------------------------
 
 bw2_expansion_slot_device::bw2_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-	device_t(mconfig, BW2_EXPANSION_SLOT, "Bondwell 2 expansion port", tag, owner, clock),
+	device_t(mconfig, BW2_EXPANSION_SLOT, "Bondwell 2 expansion port", tag, owner, clock, "bw2_expansion_slot", __FILE__),
 	device_slot_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/machine/c64exp.c b/src/mess/machine/c64exp.c
index e968d048c58..4c0f6f2d847 100644
--- a/src/mess/machine/c64exp.c
+++ b/src/mess/machine/c64exp.c
@@ -132,7 +132,7 @@ UINT8* device_c64_expansion_card_interface::c64_nvram_pointer(running_machine &m
 //-------------------------------------------------
 
 c64_expansion_slot_device::c64_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, C64_EXPANSION_SLOT, "C64 expansion port", tag, owner, clock),
+		device_t(mconfig, C64_EXPANSION_SLOT, "C64 expansion port", tag, owner, clock, "c64_expansion_slot", __FILE__),
 		device_slot_interface(mconfig, *this),
 		device_image_interface(mconfig, *this),
 		m_read_dma_cd(*this),
diff --git a/src/mess/machine/c64user.c b/src/mess/machine/c64user.c
index 8d3e8c5ef7a..305c7153f19 100644
--- a/src/mess/machine/c64user.c
+++ b/src/mess/machine/c64user.c
@@ -53,7 +53,7 @@ device_c64_user_port_interface::~device_c64_user_port_interface()
 //-------------------------------------------------
 
 c64_user_port_device::c64_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, C64_USER_PORT, "C64 user port", tag, owner, clock),
+		device_t(mconfig, C64_USER_PORT, "C64 user port", tag, owner, clock, "c64_user_port", __FILE__),
 		device_slot_interface(mconfig, *this),
 		m_write_cnt1(*this),
 		m_write_sp1(*this),
diff --git a/src/mess/machine/cbm2exp.c b/src/mess/machine/cbm2exp.c
index 9726f861937..c30fea140cf 100644
--- a/src/mess/machine/cbm2exp.c
+++ b/src/mess/machine/cbm2exp.c
@@ -157,7 +157,7 @@ UINT8* device_cbm2_expansion_card_interface::cbm2_nvram_pointer(running_machine
 //-------------------------------------------------
 
 cbm2_expansion_slot_device::cbm2_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, CBM2_EXPANSION_SLOT, "CBM-II expansion port", tag, owner, clock),
+		device_t(mconfig, CBM2_EXPANSION_SLOT, "CBM-II expansion port", tag, owner, clock, "cbm2_expansion_slot", __FILE__),
 		device_slot_interface(mconfig, *this),
 		device_image_interface(mconfig, *this)
 {
diff --git a/src/mess/machine/cbm2user.c b/src/mess/machine/cbm2user.c
index 48c89f3361c..0130521a71d 100644
--- a/src/mess/machine/cbm2user.c
+++ b/src/mess/machine/cbm2user.c
@@ -53,7 +53,7 @@ device_cbm2_user_port_interface::~device_cbm2_user_port_interface()
 //-------------------------------------------------
 
 cbm2_user_port_device::cbm2_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, CBM2_USER_PORT, "CBM2 user port", tag, owner, clock),
+		device_t(mconfig, CBM2_USER_PORT, "CBM2 user port", tag, owner, clock, "cbm2_user_port", __FILE__),
 		device_slot_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/machine/cbmiec.c b/src/mess/machine/cbmiec.c
index e609cf3e2aa..3c86baad01c 100644
--- a/src/mess/machine/cbmiec.c
+++ b/src/mess/machine/cbmiec.c
@@ -255,7 +255,7 @@ device_cbm_iec_interface::~device_cbm_iec_interface()
 //-------------------------------------------------
 
 cbm_iec_slot_device::cbm_iec_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, CBM_IEC_SLOT, "CBM IEC slot", tag, owner, clock),
+		device_t(mconfig, CBM_IEC_SLOT, "CBM IEC slot", tag, owner, clock, "cbm_iec_slot", __FILE__),
 		device_slot_interface(mconfig, *this)
 {
 }
@@ -411,7 +411,7 @@ inline int cbm_iec_device::get_signal(int signal)
 //-------------------------------------------------
 
 cbm_iec_device::cbm_iec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, CBM_IEC, "CBM IEC bus", tag, owner, clock),
+	: device_t(mconfig, CBM_IEC, "CBM IEC bus", tag, owner, clock, "cbm_iec", __FILE__),
 		m_write_srq(*this),
 		m_write_atn(*this),
 		m_write_clk(*this),
diff --git a/src/mess/machine/coco_vhd.c b/src/mess/machine/coco_vhd.c
index dfa1c95214f..4f0761e056c 100644
--- a/src/mess/machine/coco_vhd.c
+++ b/src/mess/machine/coco_vhd.c
@@ -70,7 +70,7 @@ const device_type COCO_VHD = &device_creator<coco_vhd_image_device>;
 //-------------------------------------------------
 
 coco_vhd_image_device::coco_vhd_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, COCO_VHD, "Virtual Hard Disk", tag, owner, clock),
+	: device_t(mconfig, COCO_VHD, "Virtual Hard Disk", tag, owner, clock, "coco_vhd_image", __FILE__),
 		device_image_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/machine/cococart.c b/src/mess/machine/cococart.c
index da10ee3669d..98689ce8d59 100644
--- a/src/mess/machine/cococart.c
+++ b/src/mess/machine/cococart.c
@@ -34,7 +34,7 @@ const device_type COCOCART_SLOT = &device_creator<cococart_slot_device>;
 //  cococart_slot_device - constructor
 //-------------------------------------------------
 cococart_slot_device::cococart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, COCOCART_SLOT, "CoCo Cartridge Slot", tag, owner, clock),
+		device_t(mconfig, COCOCART_SLOT, "CoCo Cartridge Slot", tag, owner, clock, "cococart_slot", __FILE__),
 		device_slot_interface(mconfig, *this),
 		device_image_interface(mconfig, *this)
 {
diff --git a/src/mess/machine/comxexp.c b/src/mess/machine/comxexp.c
index 07297ac9d3f..1177640ab2d 100644
--- a/src/mess/machine/comxexp.c
+++ b/src/mess/machine/comxexp.c
@@ -54,7 +54,7 @@ device_comx_expansion_card_interface::~device_comx_expansion_card_interface()
 //-------------------------------------------------
 
 comx_expansion_slot_device::comx_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, COMX_EXPANSION_SLOT, "COMX-35 expansion slot", tag, owner, clock),
+		device_t(mconfig, COMX_EXPANSION_SLOT, "COMX-35 expansion slot", tag, owner, clock, "comx_expansion_slot", __FILE__),
 		device_slot_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/machine/concept_exp.c b/src/mess/machine/concept_exp.c
index 94a8be1119b..cba226ff04d 100644
--- a/src/mess/machine/concept_exp.c
+++ b/src/mess/machine/concept_exp.c
@@ -39,7 +39,7 @@ const device_type CONCEPT_EXP_PORT = &device_creator<concept_exp_port_device>;
 //-------------------------------------------------
 
 concept_exp_port_device::concept_exp_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-					device_t(mconfig, CONCEPT_EXP_PORT, "Corvus Concept expansion port", tag, owner, clock),
+					device_t(mconfig, CONCEPT_EXP_PORT, "Corvus Concept expansion port", tag, owner, clock, "concept_exp_port", __FILE__),
 					device_slot_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/machine/cpc_rom.c b/src/mess/machine/cpc_rom.c
index b6c880f2eee..f11b774ab90 100644
--- a/src/mess/machine/cpc_rom.c
+++ b/src/mess/machine/cpc_rom.c
@@ -81,7 +81,7 @@ const device_type ROMSLOT = &device_creator<rom_image_device>;
 //-------------------------------------------------
 
 rom_image_device::rom_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, ROMSLOT, "ROM image", tag, owner, clock),
+	: device_t(mconfig, ROMSLOT, "ROM image", tag, owner, clock, "rom_image", __FILE__),
 		device_image_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/machine/cpcexp.c b/src/mess/machine/cpcexp.c
index 4d43df10bbd..6c2115d4dc3 100644
--- a/src/mess/machine/cpcexp.c
+++ b/src/mess/machine/cpcexp.c
@@ -40,7 +40,7 @@ device_cpc_expansion_card_interface::~device_cpc_expansion_card_interface()
 //**************************************************************************
 
 cpc_expansion_slot_device::cpc_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, CPC_EXPANSION_SLOT, "Amstrad CPC expansion port", tag, owner, clock),
+		device_t(mconfig, CPC_EXPANSION_SLOT, "Amstrad CPC expansion port", tag, owner, clock, "cpc_expansion_slot", __FILE__),
 		device_slot_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/machine/cs4031.c b/src/mess/machine/cs4031.c
index 261b78c5205..60056017267 100644
--- a/src/mess/machine/cs4031.c
+++ b/src/mess/machine/cs4031.c
@@ -187,7 +187,7 @@ machine_config_constructor cs4031_device::device_mconfig_additions() const
 //-------------------------------------------------
 
 cs4031_device::cs4031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-	device_t(mconfig, CS4031, "CS4031", tag, owner, clock),
+	device_t(mconfig, CS4031, "CS4031", tag, owner, clock, "cs4031", __FILE__),
 	m_read_ior(*this),
 	m_write_iow(*this),
 	m_write_tc(*this),
diff --git a/src/mess/machine/cs8221.c b/src/mess/machine/cs8221.c
index cb46215cb4a..f62c1280ed3 100644
--- a/src/mess/machine/cs8221.c
+++ b/src/mess/machine/cs8221.c
@@ -57,7 +57,7 @@ static const char *const register_names[] =
 //-------------------------------------------------
 
 cs8221_device::cs8221_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, CS8221, "CS8221", tag, owner, clock),
+	: device_t(mconfig, CS8221, "CS8221", tag, owner, clock, "cs8221", __FILE__),
 		m_address(0),
 		m_address_valid(false)
 {
diff --git a/src/mess/machine/docg3.c b/src/mess/machine/docg3.c
index 308643aa7aa..8abc48343d4 100644
--- a/src/mess/machine/docg3.c
+++ b/src/mess/machine/docg3.c
@@ -37,7 +37,7 @@ const device_type DISKONCHIP_G3 = &device_creator<diskonchip_g3_device>;
 //-------------------------------------------------
 
 diskonchip_g3_device::diskonchip_g3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, DISKONCHIP_G3, "DiskOnChip G3", tag, owner, clock),
+	: device_t(mconfig, DISKONCHIP_G3, "DiskOnChip G3", tag, owner, clock, "diskonchip_g3", __FILE__),
 		device_nvram_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/machine/ds1315.c b/src/mess/machine/ds1315.c
index f5a9d0903c5..c64ee315962 100644
--- a/src/mess/machine/ds1315.c
+++ b/src/mess/machine/ds1315.c
@@ -15,7 +15,7 @@
 const device_type DS1315 = &device_creator<ds1315_device>;
 
 ds1315_device::ds1315_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-				: device_t(mconfig, DS1315, "Dallas Semiconductor DS1315", tag, owner, clock)
+				: device_t(mconfig, DS1315, "Dallas Semiconductor DS1315", tag, owner, clock, "ds1315", __FILE__)
 {
 }
 
diff --git a/src/mess/machine/e05a03.c b/src/mess/machine/e05a03.c
index 2962497dc07..21c3ffe7e41 100644
--- a/src/mess/machine/e05a03.c
+++ b/src/mess/machine/e05a03.c
@@ -218,7 +218,7 @@ WRITE_LINE_DEVICE_HANDLER( e05a03_init_w )
 const device_type E05A03 = &device_creator<e05a03_device>;
 
 e05a03_device::e05a03_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, E05A03, "E05A03", tag, owner, clock)
+	: device_t(mconfig, E05A03, "E05A03", tag, owner, clock, "e05a03", __FILE__)
 {
 	m_token = global_alloc_clear(e05a03_state);
 }
diff --git a/src/mess/machine/ecbbus.c b/src/mess/machine/ecbbus.c
index 6fcdc78ff1f..8b91e2b0845 100644
--- a/src/mess/machine/ecbbus.c
+++ b/src/mess/machine/ecbbus.c
@@ -28,7 +28,7 @@ const device_type ECBBUS_SLOT = &device_creator<ecbbus_slot_device>;
 //-------------------------------------------------
 
 ecbbus_slot_device::ecbbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, ECBBUS_SLOT, "ECB bus slot", tag, owner, clock),
+		device_t(mconfig, ECBBUS_SLOT, "ECB bus slot", tag, owner, clock, "ecbbus_slot", __FILE__),
 		device_slot_interface(mconfig, *this)
 {
 }
@@ -132,7 +132,7 @@ device_ecbbus_card_interface::~device_ecbbus_card_interface()
 //-------------------------------------------------
 
 ecbbus_device::ecbbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, ECBBUS, "ECB bus", tag, owner, clock)
+		device_t(mconfig, ECBBUS, "ECB bus", tag, owner, clock, "ecbbus", __FILE__)
 {
 	for (int i = 0; i < MAX_ECBBUS_SLOTS; i++)
 		m_ecbbus_device[i] = NULL;
diff --git a/src/mess/machine/econet.c b/src/mess/machine/econet.c
index 43795273d53..a5de1620ca8 100644
--- a/src/mess/machine/econet.c
+++ b/src/mess/machine/econet.c
@@ -64,7 +64,7 @@ device_econet_interface::~device_econet_interface()
 //-------------------------------------------------
 
 econet_slot_device::econet_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, ECONET_SLOT, "Econet station", tag, owner, clock),
+		device_t(mconfig, ECONET_SLOT, "Econet station", tag, owner, clock, "econet_slot", __FILE__),
 		device_slot_interface(mconfig, *this)
 {
 }
@@ -231,7 +231,7 @@ inline int econet_device::get_signal(int signal)
 //-------------------------------------------------
 
 econet_device::econet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, ECONET, "Econet", tag, owner, clock)
+	: device_t(mconfig, ECONET, "Econet", tag, owner, clock, "econet", __FILE__)
 {
 	for (int i = 0; i < SIGNAL_COUNT; i++)
 	{
diff --git a/src/mess/machine/einstein.c b/src/mess/machine/einstein.c
index 9e64e10b256..c16016561eb 100644
--- a/src/mess/machine/einstein.c
+++ b/src/mess/machine/einstein.c
@@ -18,7 +18,7 @@ const device_type EINSTEIN_KEYBOARD_DAISY = &device_creator<einstein_keyboard_da
 //-------------------------------------------------
 
 einstein_keyboard_daisy_device::einstein_keyboard_daisy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, EINSTEIN_KEYBOARD_DAISY, "Einstein keyboard daisy chain", tag, owner, clock),
+	: device_t(mconfig, EINSTEIN_KEYBOARD_DAISY, "Einstein keyboard daisy chain", tag, owner, clock, "einstein_keyboard", __FILE__),
 		device_z80daisy_interface(mconfig, *this)
 {
 }
@@ -81,7 +81,7 @@ const device_type EINSTEIN_ADC_DAISY = &device_creator<einstein_adc_daisy_device
 //-------------------------------------------------
 
 einstein_adc_daisy_device::einstein_adc_daisy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, EINSTEIN_ADC_DAISY, "Einstein ADC daisy chain", tag, owner, clock),
+	: device_t(mconfig, EINSTEIN_ADC_DAISY, "Einstein ADC daisy chain", tag, owner, clock, "einstein_adc_daisy", __FILE__),
 		device_z80daisy_interface(mconfig, *this)
 {
 }
@@ -146,7 +146,7 @@ const device_type EINSTEIN_FIRE_DAISY = &device_creator<einstein_fire_daisy_devi
 //-------------------------------------------------
 
 einstein_fire_daisy_device::einstein_fire_daisy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, EINSTEIN_FIRE_DAISY, "Einstein fire button daisy chain", tag, owner, clock),
+	: device_t(mconfig, EINSTEIN_FIRE_DAISY, "Einstein fire button daisy chain", tag, owner, clock, "einstein_fire_daisy", __FILE__),
 		device_z80daisy_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/machine/ep64exp.c b/src/mess/machine/ep64exp.c
index c359cdcc010..f19a5de7307 100644
--- a/src/mess/machine/ep64exp.c
+++ b/src/mess/machine/ep64exp.c
@@ -44,7 +44,7 @@ device_ep64_expansion_bus_card_interface::device_ep64_expansion_bus_card_interfa
 //-------------------------------------------------
 
 ep64_expansion_bus_slot_device::ep64_expansion_bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-	device_t(mconfig, EP64_EXPANSION_BUS_SLOT, "Enterprise Sixty Four expansion bus slot", tag, owner, clock),
+	device_t(mconfig, EP64_EXPANSION_BUS_SLOT, "Enterprise Sixty Four expansion bus slot", tag, owner, clock, "ep64_expansion_bus_slot", __FILE__),
 	device_slot_interface(mconfig, *this),
 	m_write_irq(*this),
 	m_write_nmi(*this),
diff --git a/src/mess/machine/epson_sio.c b/src/mess/machine/epson_sio.c
index 1620e5184cd..fd3f5826489 100644
--- a/src/mess/machine/epson_sio.c
+++ b/src/mess/machine/epson_sio.c
@@ -54,7 +54,7 @@ device_epson_sio_interface::~device_epson_sio_interface()
 //-------------------------------------------------
 
 epson_sio_device::epson_sio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, EPSON_SIO, "EPSON SIO port", tag, owner, clock),
+		device_t(mconfig, EPSON_SIO, "EPSON SIO port", tag, owner, clock, "epson_sio", __FILE__),
 		device_slot_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/machine/esqvfd.c b/src/mess/machine/esqvfd.c
index cc3d618e4b3..2c2f6f4937c 100644
--- a/src/mess/machine/esqvfd.c
+++ b/src/mess/machine/esqvfd.c
@@ -112,8 +112,8 @@ static const UINT16 font[]=
 	0x0000, // 0000 0000 0000 0000 (DEL)
 };
 
-esqvfd_t::esqvfd_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
-	device_t(mconfig, type, name, tag, owner, clock)
+esqvfd_t::esqvfd_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+	device_t(mconfig, type, name, tag, owner, clock, shortname, source)
 {
 }
 
@@ -265,7 +265,7 @@ void esq2x40_t::write_char(int data)
 	update_display();
 }
 
-esq2x40_t::esq2x40_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : esqvfd_t(mconfig, ESQ2x40, "Ensoniq 2x40 VFD", tag, owner, clock)
+esq2x40_t::esq2x40_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : esqvfd_t(mconfig, ESQ2x40, "Ensoniq 2x40 VFD", tag, owner, clock, "esq2x40", __FILE__)
 {
 	m_rows = 2;
 	m_cols = 40;
@@ -318,7 +318,7 @@ void esq1x22_t::write_char(int data)
 	update_display();
 }
 
-esq1x22_t::esq1x22_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : esqvfd_t(mconfig, ESQ1x22, "Ensoniq 1x22 VFD", tag, owner, clock)
+esq1x22_t::esq1x22_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : esqvfd_t(mconfig, ESQ1x22, "Ensoniq 1x22 VFD", tag, owner, clock, "esq1x22", __FILE__)
 {
 	m_rows = 1;
 	m_cols = 22;
@@ -382,7 +382,7 @@ void esq2x40_sq1_t::write_char(int data)
 	}
 }
 
-esq2x40_sq1_t::esq2x40_sq1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : esqvfd_t(mconfig, ESQ2x40_SQ1, "Ensoniq 2x40 VFD (SQ-1 variant)", tag, owner, clock)
+esq2x40_sq1_t::esq2x40_sq1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : esqvfd_t(mconfig, ESQ2x40_SQ1, "Ensoniq 2x40 VFD (SQ-1 variant)", tag, owner, clock, "esq2x40_sq1", __FILE__)
 {
 	m_rows = 2;
 	m_cols = 40;
diff --git a/src/mess/machine/esqvfd.h b/src/mess/machine/esqvfd.h
index 6e0703e3db2..9ae68c03e8b 100644
--- a/src/mess/machine/esqvfd.h
+++ b/src/mess/machine/esqvfd.h
@@ -25,7 +25,7 @@ class esqvfd_t : public device_t {
 public:
 	typedef delegate<void (bool state)> line_cb;
 
-	esqvfd_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	esqvfd_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 
 	DECLARE_WRITE8_MEMBER( write ) { write_char(data); }
 
diff --git a/src/mess/machine/fm_scsi.c b/src/mess/machine/fm_scsi.c
index a0a83ace0e3..74fb40c3765 100644
--- a/src/mess/machine/fm_scsi.c
+++ b/src/mess/machine/fm_scsi.c
@@ -37,7 +37,7 @@ const device_type FMSCSI = &device_creator<fmscsi_device>;
  */
 
 fmscsi_device::fmscsi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, FMSCSI, "FM-SCSI", tag, owner, clock),
+	: device_t(mconfig, FMSCSI, "FM-SCSI", tag, owner, clock, "fmscsi", __FILE__),
 	m_irq_handler(*this),
 	m_drq_handler(*this)
 {
diff --git a/src/mess/machine/gb_slot.c b/src/mess/machine/gb_slot.c
index 15c9cf27bda..e9f9d26f62e 100644
--- a/src/mess/machine/gb_slot.c
+++ b/src/mess/machine/gb_slot.c
@@ -139,8 +139,8 @@ void device_gb_cart_interface::ram_map_setup(UINT8 banks)
 //-------------------------------------------------
 //  base_gb_cart_slot_device - constructor
 //-------------------------------------------------
-base_gb_cart_slot_device::base_gb_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
-						device_t(mconfig, type, name, tag, owner, clock),
+base_gb_cart_slot_device::base_gb_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+						device_t(mconfig, type, name, tag, owner, clock, shortname, source),
 						device_image_interface(mconfig, *this),
 						device_slot_interface(mconfig, *this),
 						m_sgb_hack(0),
@@ -149,12 +149,12 @@ base_gb_cart_slot_device::base_gb_cart_slot_device(const machine_config &mconfig
 }
 
 gb_cart_slot_device::gb_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-						base_gb_cart_slot_device(mconfig, GB_CART_SLOT, "Game Boy Cartridge Slot", tag, owner, clock)
+						base_gb_cart_slot_device(mconfig, GB_CART_SLOT, "Game Boy Cartridge Slot", tag, owner, clock, "gba_cart_slot", __FILE__)
 {
 }
 
 megaduck_cart_slot_device::megaduck_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-						base_gb_cart_slot_device(mconfig, MEGADUCK_CART_SLOT, "Megaduck Cartridge Slot", tag, owner, clock)
+						base_gb_cart_slot_device(mconfig, MEGADUCK_CART_SLOT, "Megaduck Cartridge Slot", tag, owner, clock, "megaduck_cart_slot", __FILE__)
 {
 }
 
diff --git a/src/mess/machine/gb_slot.h b/src/mess/machine/gb_slot.h
index 4d7eabf807e..66d9988f0ff 100644
--- a/src/mess/machine/gb_slot.h
+++ b/src/mess/machine/gb_slot.h
@@ -107,7 +107,7 @@ class base_gb_cart_slot_device : public device_t,
 {
 public:
 	// construction/destruction
-	base_gb_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	base_gb_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 	virtual ~base_gb_cart_slot_device();
 
 	// device-level overrides
diff --git a/src/mess/machine/gba_slot.c b/src/mess/machine/gba_slot.c
index 4486d07b0a9..ac1f9797a59 100644
--- a/src/mess/machine/gba_slot.c
+++ b/src/mess/machine/gba_slot.c
@@ -65,7 +65,7 @@ void device_gba_cart_interface::nvram_alloc(running_machine &machine, UINT32 siz
 //  gba_cart_slot_device - constructor
 //-------------------------------------------------
 gba_cart_slot_device::gba_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-						device_t(mconfig, GBA_CART_SLOT, "Game Boy Advance Cartridge Slot", tag, owner, clock),
+						device_t(mconfig, GBA_CART_SLOT, "Game Boy Advance Cartridge Slot", tag, owner, clock, "gba_cart_slot", __FILE__),
 						device_image_interface(mconfig, *this),
 						device_slot_interface(mconfig, *this),
 						m_type(GBA_STD)
diff --git a/src/mess/machine/genpc.c b/src/mess/machine/genpc.c
index 7451ec0e8d6..cab98efc357 100644
--- a/src/mess/machine/genpc.c
+++ b/src/mess/machine/genpc.c
@@ -544,7 +544,7 @@ void ibm5160_mb_device::static_set_cputag(device_t &device, const char *tag)
 //-------------------------------------------------
 
 ibm5160_mb_device::ibm5160_mb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-		: device_t(mconfig, IBM5160_MOTHERBOARD, "IBM5160_MOTHERBOARD", tag, owner, clock),
+		: device_t(mconfig, IBM5160_MOTHERBOARD, "IBM5160_MOTHERBOARD", tag, owner, clock, "ibm5160_mb", __FILE__),
 		m_maincpu(*owner, "maincpu"),
 		m_pic8259(*this, "pic8259"),
 		m_dma8237(*this, "dma8237"),
diff --git a/src/mess/machine/hd63450.c b/src/mess/machine/hd63450.c
index de4dad12216..bebd8337708 100644
--- a/src/mess/machine/hd63450.c
+++ b/src/mess/machine/hd63450.c
@@ -465,7 +465,7 @@ WRITE16_DEVICE_HANDLER(hd63450_w) { hd63450_write(device,offset,data,mem_mask);
 const device_type HD63450 = &device_creator<hd63450_device>;
 
 hd63450_device::hd63450_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, HD63450, "Hitachi HD63450", tag, owner, clock)
+	: device_t(mconfig, HD63450, "Hitachi HD63450", tag, owner, clock, "hd63450", __FILE__)
 {
 	m_token = global_alloc_clear(hd63450_t);
 }
diff --git a/src/mess/machine/hd64610.c b/src/mess/machine/hd64610.c
index c14e0eceddc..06de797474d 100644
--- a/src/mess/machine/hd64610.c
+++ b/src/mess/machine/hd64610.c
@@ -149,7 +149,7 @@ inline void hd64610_device::check_alarm()
 //-------------------------------------------------
 
 hd64610_device::hd64610_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, HD64610, "HD64610", tag, owner, clock),
+	: device_t(mconfig, HD64610, "HD64610", tag, owner, clock, "hd64610", __FILE__),
 		device_rtc_interface(mconfig, *this),
 		device_nvram_interface(mconfig, *this),
 		m_hline_state(1),
diff --git a/src/mess/machine/hp48.c b/src/mess/machine/hp48.c
index 68a7a949afe..ede0ea35109 100644
--- a/src/mess/machine/hp48.c
+++ b/src/mess/machine/hp48.c
@@ -1059,7 +1059,7 @@ void hp48_port_image_device::device_start()
 }
 
 hp48_port_image_device::hp48_port_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, HP48_PORT, "HP48 memory card", tag, owner, clock),
+	: device_t(mconfig, HP48_PORT, "HP48 memory card", tag, owner, clock, "hp48_port_image", __FILE__),
 		device_image_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/machine/i8271.c b/src/mess/machine/i8271.c
index d6ce2a37036..b48acccdb85 100644
--- a/src/mess/machine/i8271.c
+++ b/src/mess/machine/i8271.c
@@ -1570,7 +1570,7 @@ static DEVICE_RESET( i8271 )
 const device_type I8271 = &device_creator<i8271_device>;
 
 i8271_device::i8271_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, I8271, "Intel 8271", tag, owner, clock)
+	: device_t(mconfig, I8271, "Intel 8271", tag, owner, clock, "i8271", __FILE__)
 {
 	m_token = global_alloc_clear(i8271_t);
 }
diff --git a/src/mess/machine/ieee488.c b/src/mess/machine/ieee488.c
index 17182109655..c85090ba48b 100644
--- a/src/mess/machine/ieee488.c
+++ b/src/mess/machine/ieee488.c
@@ -65,7 +65,7 @@ device_ieee488_interface::~device_ieee488_interface()
 //-------------------------------------------------
 
 ieee488_slot_device::ieee488_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, IEEE488_SLOT, "IEEE-488 slot", tag, owner, clock),
+		device_t(mconfig, IEEE488_SLOT, "IEEE-488 slot", tag, owner, clock, "ieee488_slot", __FILE__),
 		device_slot_interface(mconfig, *this)
 {
 }
@@ -291,7 +291,7 @@ inline UINT8 ieee488_device::get_data()
 //-------------------------------------------------
 
 ieee488_device::ieee488_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, IEEE488, "IEEE488 bus", tag, owner, clock),
+	: device_t(mconfig, IEEE488, "IEEE488 bus", tag, owner, clock, "ieee488", __FILE__),
 		m_write_eoi(*this),
 		m_write_dav(*this),
 		m_write_nrfd(*this),
diff --git a/src/mess/machine/iq151cart.c b/src/mess/machine/iq151cart.c
index ba553e8ac93..39dd6abd99b 100644
--- a/src/mess/machine/iq151cart.c
+++ b/src/mess/machine/iq151cart.c
@@ -52,7 +52,7 @@ device_iq151cart_interface::~device_iq151cart_interface()
 //  iq151cart_slot_device - constructor
 //-------------------------------------------------
 iq151cart_slot_device::iq151cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, IQ151CART_SLOT, "IQ151 cartridge slot", tag, owner, clock),
+		device_t(mconfig, IQ151CART_SLOT, "IQ151 cartridge slot", tag, owner, clock, "iq151cart_slot", __FILE__),
 		device_slot_interface(mconfig, *this),
 		device_image_interface(mconfig, *this)
 {
diff --git a/src/mess/machine/isa.c b/src/mess/machine/isa.c
index fa0a513e3de..a4c843dff0a 100644
--- a/src/mess/machine/isa.c
+++ b/src/mess/machine/isa.c
@@ -23,13 +23,13 @@ const device_type ISA8_SLOT = &device_creator<isa8_slot_device>;
 //  isa8_slot_device - constructor
 //-------------------------------------------------
 isa8_slot_device::isa8_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, ISA8_SLOT, "ISA8_SLOT", tag, owner, clock),
+		device_t(mconfig, ISA8_SLOT, "ISA8_SLOT", tag, owner, clock, "isa8_slot", __FILE__),
 		device_slot_interface(mconfig, *this)
 {
 }
 
-isa8_slot_device::isa8_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, type, name, tag, owner, clock),
+isa8_slot_device::isa8_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+		device_t(mconfig, type, name, tag, owner, clock, shortname, source),
 		device_slot_interface(mconfig, *this)
 {
 }
@@ -71,7 +71,7 @@ const device_type ISA16_SLOT = &device_creator<isa16_slot_device>;
 //  isa16_slot_device - constructor
 //-------------------------------------------------
 isa16_slot_device::isa16_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		isa8_slot_device(mconfig, ISA16_SLOT, "ISA16_SLOT", tag, owner, clock)
+		isa8_slot_device(mconfig, ISA16_SLOT, "ISA16_SLOT", tag, owner, clock, "isa16_slot", __FILE__)
 {
 }
 
@@ -145,7 +145,7 @@ void isa8_device::device_config_complete()
 //-------------------------------------------------
 
 isa8_device::isa8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, ISA8, "ISA8", tag, owner, clock),
+		device_t(mconfig, ISA8, "ISA8", tag, owner, clock, "isa8", __FILE__),
 		m_write_iochck(*this)
 {
 	for(int i=0;i<8;i++)
@@ -156,8 +156,8 @@ isa8_device::isa8_device(const machine_config &mconfig, const char *tag, device_
 	m_nmi_enabled = false;
 }
 
-isa8_device::isa8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, type, name, tag, owner, clock),
+isa8_device::isa8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+		device_t(mconfig, type, name, tag, owner, clock, shortname, source),
 		m_write_iochck(*this)
 {
 	for(int i=0;i<8;i++)
@@ -469,7 +469,7 @@ const device_type ISA16 = &device_creator<isa16_device>;
 //-------------------------------------------------
 
 isa16_device::isa16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		isa8_device(mconfig, ISA16, "ISA16", tag, owner, clock)
+		isa8_device(mconfig, ISA16, "ISA16", tag, owner, clock, "isa16", __FILE__)
 {
 }
 
diff --git a/src/mess/machine/isa.h b/src/mess/machine/isa.h
index c906cedfeb3..35819ca65c6 100644
--- a/src/mess/machine/isa.h
+++ b/src/mess/machine/isa.h
@@ -104,7 +104,7 @@ class isa8_slot_device : public device_t,
 public:
 	// construction/destruction
 	isa8_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	isa8_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	isa8_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 
 	// device-level overrides
 	virtual void device_start();
@@ -143,7 +143,7 @@ class isa8_device : public device_t,
 public:
 	// construction/destruction
 	isa8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	isa8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	isa8_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 	// inline configuration
 	static void static_set_cputag(device_t &device, const char *tag);
 	template<class _iochck> void set_iochck_callback(_iochck iochck) { m_write_iochck.set_callback(iochck); }
diff --git a/src/mess/machine/isa_gus.c b/src/mess/machine/isa_gus.c
index 4cb044490dc..6fbbc982e12 100644
--- a/src/mess/machine/isa_gus.c
+++ b/src/mess/machine/isa_gus.c
@@ -331,7 +331,7 @@ void gf1_device::sound_stream_update(sound_stream &stream, stream_sample_t **inp
 //-------------------------------------------------
 
 gf1_device::gf1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-		: device_t(mconfig, GGF1, "Gravis GF1", tag, owner, clock),
+		: device_t(mconfig, GGF1, "Gravis GF1", tag, owner, clock, "gf1", __FILE__),
 		device_sound_interface( mconfig, *this )
 {
 }
diff --git a/src/mess/machine/kb3600.c b/src/mess/machine/kb3600.c
index 6f87fd3eb5d..7d9af023879 100644
--- a/src/mess/machine/kb3600.c
+++ b/src/mess/machine/kb3600.c
@@ -75,7 +75,7 @@ void ay3600_device::device_config_complete()
 //-------------------------------------------------
 
 ay3600_device::ay3600_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, AY3600, "AY-5-3600", tag, owner, clock)
+	: device_t(mconfig, AY3600, "AY-5-3600", tag, owner, clock, "ay3600", __FILE__)
 {
 }
 
diff --git a/src/mess/machine/kc_keyb.c b/src/mess/machine/kc_keyb.c
index 28c3c832326..4aeb9ce6919 100644
--- a/src/mess/machine/kc_keyb.c
+++ b/src/mess/machine/kc_keyb.c
@@ -434,7 +434,7 @@ INPUT_PORTS_END
 //  kc_keyboard_device - constructor
 //-------------------------------------------------
 kc_keyboard_device::kc_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, KC_KEYBOARD, "KC Keyboard", tag, owner, clock)
+		device_t(mconfig, KC_KEYBOARD, "KC Keyboard", tag, owner, clock, "kc_keyboard", __FILE__)
 {
 }
 
diff --git a/src/mess/machine/kcexp.c b/src/mess/machine/kcexp.c
index 7945ffb1bbb..724d8e344c8 100644
--- a/src/mess/machine/kcexp.c
+++ b/src/mess/machine/kcexp.c
@@ -152,13 +152,13 @@ device_kcexp_interface::~device_kcexp_interface()
 //  kcexp_slot_device - constructor
 //-------------------------------------------------
 kcexp_slot_device::kcexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, KCEXP_SLOT, "KC85 Expansion Slot", tag, owner, clock),
+		device_t(mconfig, KCEXP_SLOT, "KC85 Expansion Slot", tag, owner, clock, "kcexp_slot", __FILE__),
 		device_slot_interface(mconfig, *this)
 {
 }
 
-kcexp_slot_device::kcexp_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, type, name, tag, owner, clock),
+kcexp_slot_device::kcexp_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+		device_t(mconfig, type, name, tag, owner, clock, shortname, source),
 		device_slot_interface(mconfig, *this)
 {
 }
@@ -316,7 +316,7 @@ WRITE_LINE_MEMBER( kcexp_slot_device::meo_w )
 //  kccart_slot_device - constructor
 //-------------------------------------------------
 kccart_slot_device::kccart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		kcexp_slot_device(mconfig, KCCART_SLOT, "KC85 Cartridge Slot", tag, owner, clock),
+		kcexp_slot_device(mconfig, KCCART_SLOT, "KC85 Cartridge Slot", tag, owner, clock, "kccart_slot", __FILE__),
 		device_image_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/machine/kcexp.h b/src/mess/machine/kcexp.h
index f9cf2e659cf..0c0ca03596a 100644
--- a/src/mess/machine/kcexp.h
+++ b/src/mess/machine/kcexp.h
@@ -52,7 +52,7 @@ class kcexp_slot_device : public device_t,
 public:
 	// construction/destruction
 	kcexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	kcexp_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	kcexp_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 	virtual ~kcexp_slot_device();
 
 	// device-level overrides
diff --git a/src/mess/machine/keyboard.c b/src/mess/machine/keyboard.c
index 15c746c5bf0..ea173ed2d28 100644
--- a/src/mess/machine/keyboard.c
+++ b/src/mess/machine/keyboard.c
@@ -49,7 +49,7 @@ generic_keyboard_device::generic_keyboard_device(const machine_config &mconfig,
 }
 
 generic_keyboard_device::generic_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, GENERIC_KEYBOARD, "Generic Keyboard", tag, owner, clock)
+	: device_t(mconfig, GENERIC_KEYBOARD, "Generic Keyboard", tag, owner, clock, "generic_keyboard", __FILE__)
 	, m_io_kbd0(*this, "TERM_LINE0")
 	, m_io_kbd1(*this, "TERM_LINE1")
 	, m_io_kbd2(*this, "TERM_LINE2")
diff --git a/src/mess/machine/kr2376.c b/src/mess/machine/kr2376.c
index 7ab781b8d29..20a246ccdde 100644
--- a/src/mess/machine/kr2376.c
+++ b/src/mess/machine/kr2376.c
@@ -377,7 +377,7 @@ static DEVICE_START( kr2376 )
 const device_type KR2376 = &device_creator<kr2376_device>;
 
 kr2376_device::kr2376_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, KR2376, "SMC KR2376", tag, owner, clock)
+	: device_t(mconfig, KR2376, "SMC KR2376", tag, owner, clock, "kr2376", __FILE__)
 {
 	m_token = global_alloc_clear(kr2376_t);
 }
diff --git a/src/mess/machine/lh5810.c b/src/mess/machine/lh5810.c
index 01a2ea3f921..138b7a0620d 100644
--- a/src/mess/machine/lh5810.c
+++ b/src/mess/machine/lh5810.c
@@ -53,7 +53,7 @@ void lh5810_device::device_config_complete()
 //-------------------------------------------------
 
 lh5810_device::lh5810_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, LH5810, "LH5810", tag, owner, clock)
+	: device_t(mconfig, LH5810, "LH5810", tag, owner, clock, "lh5810", __FILE__)
 {
 }
 
diff --git a/src/mess/machine/macrtc.c b/src/mess/machine/macrtc.c
index bf4d41966f8..b8d3aca5e7d 100644
--- a/src/mess/machine/macrtc.c
+++ b/src/mess/machine/macrtc.c
@@ -39,7 +39,7 @@ const device_type RTC3430042 = &device_creator<rtc3430042_device>;
 //-------------------------------------------------
 
 rtc3430042_device::rtc3430042_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, RTC3430042, "Apple 343-0042 clock/PRAM", tag, owner, clock),
+	: device_t(mconfig, RTC3430042, "Apple 343-0042 clock/PRAM", tag, owner, clock, "rtc3430042", __FILE__),
 		device_rtc_interface(mconfig, *this),
 		device_nvram_interface(mconfig, *this)
 {
diff --git a/src/mess/machine/mb8795.c b/src/mess/machine/mb8795.c
index 58b4265b3d4..ae22e629f44 100644
--- a/src/mess/machine/mb8795.c
+++ b/src/mess/machine/mb8795.c
@@ -17,7 +17,7 @@ DEVICE_ADDRESS_MAP_START(map, 8, mb8795_device)
 ADDRESS_MAP_END
 
 mb8795_device::mb8795_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MB8795, "Fujitsu MB8795", tag, owner, clock),
+	: device_t(mconfig, MB8795, "Fujitsu MB8795", tag, owner, clock, "mb8795", __FILE__),
 		device_network_interface(mconfig, *this, 10)
 {
 }
diff --git a/src/mess/machine/mb89352.c b/src/mess/machine/mb89352.c
index aa62ac20d0f..b0138c51b8e 100644
--- a/src/mess/machine/mb89352.c
+++ b/src/mess/machine/mb89352.c
@@ -129,7 +129,7 @@ void mb89352_device::device_config_complete()
  */
 
 mb89352_device::mb89352_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MB89352A, "MB89352A", tag, owner, clock)
+	: device_t(mconfig, MB89352A, "MB89352A", tag, owner, clock, "mb89352", __FILE__)
 {
 }
 
diff --git a/src/mess/machine/mc68328.c b/src/mess/machine/mc68328.c
index 89fbb7be55b..2969e004e16 100644
--- a/src/mess/machine/mc68328.c
+++ b/src/mess/machine/mc68328.c
@@ -31,7 +31,7 @@ const device_type MC68328 = &device_creator<mc68328_device>;
 
 
 mc68328_device::mc68328_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-				: device_t(mconfig, MC68328, "Motorola MC68328 (DragonBall) Integrated Processor", tag, owner, clock)
+				: device_t(mconfig, MC68328, "Motorola MC68328 (DragonBall) Integrated Processor", tag, owner, clock, "mc68328", __FILE__)
 {
 }
 
diff --git a/src/mess/machine/md_slot.c b/src/mess/machine/md_slot.c
index 3941568b06f..fa3afc135d1 100644
--- a/src/mess/machine/md_slot.c
+++ b/src/mess/machine/md_slot.c
@@ -165,8 +165,8 @@ UINT32 device_md_cart_interface::get_padded_size(UINT32 size)
 //-------------------------------------------------
 //  base_md_cart_slot_device - constructor
 //-------------------------------------------------
-base_md_cart_slot_device::base_md_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
-						device_t(mconfig, type, name, tag, owner, clock),
+base_md_cart_slot_device::base_md_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+						device_t(mconfig, type, name, tag, owner, clock, shortname, source),
 						device_image_interface(mconfig, *this),
 						device_slot_interface(mconfig, *this),
 						m_type(SEGA_STD),
@@ -175,12 +175,12 @@ base_md_cart_slot_device::base_md_cart_slot_device(const machine_config &mconfig
 }
 
 md_cart_slot_device::md_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-						base_md_cart_slot_device(mconfig, MD_CART_SLOT, "MD Cartridge Slot", tag, owner, clock)
+						base_md_cart_slot_device(mconfig, MD_CART_SLOT, "MD Cartridge Slot", tag, owner, clock, "md_cart_slot", __FILE__)
 {
 }
 
 pico_cart_slot_device::pico_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-						base_md_cart_slot_device(mconfig, PICO_CART_SLOT, "Pico Cartridge Slot", tag, owner, clock)
+						base_md_cart_slot_device(mconfig, PICO_CART_SLOT, "Pico Cartridge Slot", tag, owner, clock, "pico_cart_slot", __FILE__)
 {
 }
 
diff --git a/src/mess/machine/md_slot.h b/src/mess/machine/md_slot.h
index 034061b3330..5b9af5cba62 100644
--- a/src/mess/machine/md_slot.h
+++ b/src/mess/machine/md_slot.h
@@ -145,7 +145,7 @@ class base_md_cart_slot_device : public device_t,
 {
 public:
 	// construction/destruction
-	base_md_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	base_md_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 	virtual ~base_md_cart_slot_device();
 
 	// device-level overrides
diff --git a/src/mess/machine/microdrv.c b/src/mess/machine/microdrv.c
index 6a454fa0ba1..feee73efc54 100644
--- a/src/mess/machine/microdrv.c
+++ b/src/mess/machine/microdrv.c
@@ -42,7 +42,7 @@ const device_type MICRODRIVE = &device_creator<microdrive_image_device>;
 //-------------------------------------------------
 
 microdrive_image_device::microdrive_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MICRODRIVE, "Microdrive", tag, owner, clock),
+	: device_t(mconfig, MICRODRIVE, "Microdrive", tag, owner, clock, "microdrive_image", __FILE__),
 		device_image_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/machine/micropolis.c b/src/mess/machine/micropolis.c
index a286a07dd0a..20ca9780de8 100644
--- a/src/mess/machine/micropolis.c
+++ b/src/mess/machine/micropolis.c
@@ -379,7 +379,7 @@ void micropolis_reset(device_t *device)
 const device_type MICROPOLIS = &device_creator<micropolis_device>;
 
 micropolis_device::micropolis_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MICROPOLIS, "MICROPOLIS", tag, owner, clock)
+	: device_t(mconfig, MICROPOLIS, "MICROPOLIS", tag, owner, clock, "micropolis", __FILE__)
 {
 	m_token = global_alloc_clear(micropolis_state);
 }
diff --git a/src/mess/machine/mos8706.c b/src/mess/machine/mos8706.c
index 5c83553eb80..f5284213f88 100644
--- a/src/mess/machine/mos8706.c
+++ b/src/mess/machine/mos8706.c
@@ -37,7 +37,7 @@ const device_type MOS8706 = &device_creator<mos8706_device>;
 //-------------------------------------------------
 
 mos8706_device::mos8706_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MOS8706, "MOS8706", tag, owner, clock)
+	: device_t(mconfig, MOS8706, "MOS8706", tag, owner, clock, "mos8706", __FILE__)
 {
 }
 
diff --git a/src/mess/machine/mos8722.c b/src/mess/machine/mos8722.c
index 14e10a95fda..cfbeb9ac8c3 100644
--- a/src/mess/machine/mos8722.c
+++ b/src/mess/machine/mos8722.c
@@ -110,7 +110,7 @@ const device_type MOS8722 = &device_creator<mos8722_device>;
 //-------------------------------------------------
 
 mos8722_device::mos8722_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MOS8722, "MOS8722", tag, owner, clock)
+	: device_t(mconfig, MOS8722, "MOS8722", tag, owner, clock, "mos8722", __FILE__)
 {
 }
 
diff --git a/src/mess/machine/mos8726.c b/src/mess/machine/mos8726.c
index 0fc272f0769..f9dbee86726 100644
--- a/src/mess/machine/mos8726.c
+++ b/src/mess/machine/mos8726.c
@@ -42,7 +42,7 @@ const device_type MOS8726 = &device_creator<mos8726_device>;
 //-------------------------------------------------
 
 mos8726_device::mos8726_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MOS8726, "MOS8726", tag, owner, clock),
+	: device_t(mconfig, MOS8726, "MOS8726", tag, owner, clock, "mos8726", __FILE__),
 		device_execute_interface(mconfig, *this),
 		m_icount(0),
 		m_bs(1)
diff --git a/src/mess/machine/ncr5380.c b/src/mess/machine/ncr5380.c
index e748576b78c..61cff50e0e4 100644
--- a/src/mess/machine/ncr5380.c
+++ b/src/mess/machine/ncr5380.c
@@ -95,7 +95,7 @@ const device_type NCR5380 = &device_creator<ncr5380_device>;
 //-------------------------------------------------
 
 ncr5380_device::ncr5380_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, NCR5380, "5380 SCSI", tag, owner, clock)
+	: device_t(mconfig, NCR5380, "5380 SCSI", tag, owner, clock, "ncr5380", __FILE__)
 {
 }
 
diff --git a/src/mess/machine/nes_slot.c b/src/mess/machine/nes_slot.c
index 0b716529323..98f13cecfeb 100644
--- a/src/mess/machine/nes_slot.c
+++ b/src/mess/machine/nes_slot.c
@@ -797,7 +797,7 @@ void device_nes_cart_interface::nes_banks_restore()
 //  nes_cart_slot_device - constructor
 //-------------------------------------------------
 nes_cart_slot_device::nes_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-						device_t(mconfig, NES_CART_SLOT, "NES Cartridge Slot", tag, owner, clock),
+						device_t(mconfig, NES_CART_SLOT, "NES Cartridge Slot", tag, owner, clock, "nes_cart_slot", __FILE__),
 						device_image_interface(mconfig, *this),
 						device_slot_interface(mconfig, *this),
 						m_crc_hack(0),
diff --git a/src/mess/machine/nes_sunsoft_dcs.c b/src/mess/machine/nes_sunsoft_dcs.c
index 9e815f71f59..91a2e7e3bbc 100644
--- a/src/mess/machine/nes_sunsoft_dcs.c
+++ b/src/mess/machine/nes_sunsoft_dcs.c
@@ -47,7 +47,7 @@ ntb_cart_interface::~ntb_cart_interface()
 const device_type NES_NTB_SLOT = &device_creator<nes_ntb_slot_device>;
 
 nes_ntb_slot_device::nes_ntb_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-						device_t(mconfig, NES_NTB_SLOT, "NES NTB Cartridge Slot", tag, owner, clock),
+						device_t(mconfig, NES_NTB_SLOT, "NES NTB Cartridge Slot", tag, owner, clock, "nes_ntb_slot", __FILE__),
 						device_image_interface(mconfig, *this),
 						device_slot_interface(mconfig, *this)
 {
diff --git a/src/mess/machine/nextkbd.c b/src/mess/machine/nextkbd.c
index 019fd7bc223..6967d04052b 100644
--- a/src/mess/machine/nextkbd.c
+++ b/src/mess/machine/nextkbd.c
@@ -9,7 +9,7 @@ DEVICE_ADDRESS_MAP_START(amap, 32, nextkbd_device)
 	AM_RANGE(0x8, 0xb) AM_READWRITE(data_r,  data_w)
 ADDRESS_MAP_END
 
-nextkbd_device::nextkbd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NEXTKBD, "NEXTKBD", tag, owner, clock)
+nextkbd_device::nextkbd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, NEXTKBD, "NEXTKBD", tag, owner, clock, "nextkbd", __FILE__)
 {
 }
 
diff --git a/src/mess/machine/nextmo.c b/src/mess/machine/nextmo.c
index e2b536ad570..bb1db037dca 100644
--- a/src/mess/machine/nextmo.c
+++ b/src/mess/machine/nextmo.c
@@ -17,7 +17,7 @@ DEVICE_ADDRESS_MAP_START(map, 8, nextmo_device)
 ADDRESS_MAP_END
 
 nextmo_device::nextmo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-		: device_t(mconfig, NEXTMO, "NeXT Magneto-optical drive", tag, owner, clock)
+		: device_t(mconfig, NEXTMO, "NeXT Magneto-optical drive", tag, owner, clock, "nextmo", __FILE__)
 		, r4(0)
 {
 }
diff --git a/src/mess/machine/nubus.c b/src/mess/machine/nubus.c
index d8934fc3f44..37b2d1830a9 100644
--- a/src/mess/machine/nubus.c
+++ b/src/mess/machine/nubus.c
@@ -25,7 +25,7 @@ const device_type NUBUS_SLOT = &device_creator<nubus_slot_device>;
 //  nubus_slot_device - constructor
 //-------------------------------------------------
 nubus_slot_device::nubus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, NUBUS_SLOT, "NUBUS_SLOT", tag, owner, clock),
+		device_t(mconfig, NUBUS_SLOT, "NUBUS_SLOT", tag, owner, clock, "nubus_slot", __FILE__),
 		device_slot_interface(mconfig, *this)
 {
 }
@@ -102,7 +102,7 @@ void nubus_device::device_config_complete()
 //-------------------------------------------------
 
 nubus_device::nubus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, NUBUS, "NUBUS", tag, owner, clock)
+		device_t(mconfig, NUBUS, "NUBUS", tag, owner, clock, "nubus", __FILE__)
 {
 }
 
diff --git a/src/mess/machine/nubus_image.c b/src/mess/machine/nubus_image.c
index 43ee5901166..0d7fe98dfd6 100644
--- a/src/mess/machine/nubus_image.c
+++ b/src/mess/machine/nubus_image.c
@@ -54,7 +54,7 @@ extern const device_type MESSIMG_DISK;
 const device_type MESSIMG_DISK = &device_creator<messimg_disk_image_device>;
 
 messimg_disk_image_device::messimg_disk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MESSIMG_DISK, "Mac image", tag, owner, clock),
+	: device_t(mconfig, MESSIMG_DISK, "Mac image", tag, owner, clock, "messimg_disk_image", __FILE__),
 		device_image_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/machine/omti8621.c b/src/mess/machine/omti8621.c
index c38a5d85514..a2b19f77674 100644
--- a/src/mess/machine/omti8621.c
+++ b/src/mess/machine/omti8621.c
@@ -1157,7 +1157,7 @@ extern const device_type OMTI_DISK;
 const device_type OMTI_DISK = &device_creator<omti_disk_image_device>;
 
 omti_disk_image_device::omti_disk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, OMTI_DISK, "Winchester", tag, owner, clock),
+	: device_t(mconfig, OMTI_DISK, "Winchester", tag, owner, clock, "omti_disk_image", __FILE__),
 		device_image_interface(mconfig, *this)
 {
 }
@@ -1332,7 +1332,7 @@ static DEVICE_RESET( omti8621 )
 const device_type OMTI8621 = &device_creator<omti8621_device>;
 
 omti8621_device::omti8621_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, OMTI8621, "OMTI 8621", tag, owner, clock)
+	: device_t(mconfig, OMTI8621, "OMTI 8621", tag, owner, clock, "omti8621", __FILE__)
 {
 	m_token = global_alloc_clear(omti8621_state);
 }
diff --git a/src/mess/machine/osborne1.c b/src/mess/machine/osborne1.c
index da346f770f8..4510880e05d 100644
--- a/src/mess/machine/osborne1.c
+++ b/src/mess/machine/osborne1.c
@@ -508,7 +508,7 @@ const device_type OSBORNE1_DAISY = &device_creator<osborne1_daisy_device>;
 //  z80ctc_device - constructor
 //-------------------------------------------------
 osborne1_daisy_device::osborne1_daisy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, OSBORNE1_DAISY, "Osborne 1 daisy", tag, owner, clock),
+	: device_t(mconfig, OSBORNE1_DAISY, "Osborne 1 daisy", tag, owner, clock, "osborne1_daisy", __FILE__),
 		device_z80daisy_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/machine/pc9801_cbus.c b/src/mess/machine/pc9801_cbus.c
index 3bde4713905..267d8e6143e 100644
--- a/src/mess/machine/pc9801_cbus.c
+++ b/src/mess/machine/pc9801_cbus.c
@@ -50,7 +50,7 @@ device_pc9801cbus_card_interface::~device_pc9801cbus_card_interface()
 //-------------------------------------------------
 
 pc9801_slot_device::pc9801_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, PC9801CBUS_SLOT, "PC-9801 sound cbus slot", tag, owner, clock),
+		device_t(mconfig, PC9801CBUS_SLOT, "PC-9801 sound cbus slot", tag, owner, clock, "pc9801_slot", __FILE__),
 		device_slot_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/machine/pc9801_kbd.c b/src/mess/machine/pc9801_kbd.c
index d39f5934d29..3dbc0cd7653 100644
--- a/src/mess/machine/pc9801_kbd.c
+++ b/src/mess/machine/pc9801_kbd.c
@@ -34,7 +34,7 @@ const device_type PC9801_KBD = &device_creator<pc9801_kbd_device>;
 //-------------------------------------------------
 
 pc9801_kbd_device::pc9801_kbd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, PC9801_KBD, "pc9801_kbd", tag, owner, clock)
+	: device_t(mconfig, PC9801_KBD, "pc9801_kbd", tag, owner, clock, "pc9801_kbd_", __FILE__)
 {
 }
 
diff --git a/src/mess/machine/pc_kbdc.c b/src/mess/machine/pc_kbdc.c
index b5f3cea49cd..b510a83e645 100644
--- a/src/mess/machine/pc_kbdc.c
+++ b/src/mess/machine/pc_kbdc.c
@@ -30,7 +30,7 @@ const device_type PC_KBDC_SLOT = &device_creator<pc_kbdc_slot_device>;
 //  pc_kbdc_slot_device - constructor
 //-------------------------------------------------
 pc_kbdc_slot_device::pc_kbdc_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, PC_KBDC_SLOT, "PC_KBDC_SLOT", tag, owner, clock),
+		device_t(mconfig, PC_KBDC_SLOT, "PC_KBDC_SLOT", tag, owner, clock, "pc_kbdc_slot", __FILE__),
 		device_slot_interface(mconfig, *this)
 {
 }
@@ -68,7 +68,7 @@ const device_type PC_KBDC = &device_creator<pc_kbdc_device>;
 //  pc_kbdc_device - constructor
 //-------------------------------------------------
 pc_kbdc_device::pc_kbdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, PC_KBDC, "PC_KBDC", tag, owner, clock),
+		device_t(mconfig, PC_KBDC, "PC_KBDC", tag, owner, clock, "pc_kbdc", __FILE__),
 		m_clock_state(-1),
 		m_data_state(-1),
 		m_kb_clock_state(1),
diff --git a/src/mess/machine/pc_lpt.c b/src/mess/machine/pc_lpt.c
index 4f17bea8828..1a337a5599d 100644
--- a/src/mess/machine/pc_lpt.c
+++ b/src/mess/machine/pc_lpt.c
@@ -229,7 +229,7 @@ WRITE8_DEVICE_HANDLER( pc_lpt_w )
 const device_type PC_LPT = &device_creator<pc_lpt_device>;
 
 pc_lpt_device::pc_lpt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, PC_LPT, "PC-LPT", tag, owner, clock)
+	: device_t(mconfig, PC_LPT, "PC-LPT", tag, owner, clock, "pc_lpt", __FILE__)
 {
 	m_token = global_alloc_clear(pc_lpt_state);
 }
diff --git a/src/mess/machine/pce220_ser.c b/src/mess/machine/pce220_ser.c
index 1bd13eec165..42eeffbaf82 100644
--- a/src/mess/machine/pce220_ser.c
+++ b/src/mess/machine/pce220_ser.c
@@ -42,7 +42,7 @@ const device_type PCE220SERIAL = &device_creator<pce220_serial_device>;
 //-------------------------------------------------
 
 pce220_serial_device::pce220_serial_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, PCE220SERIAL, "Sharp PC-E220 serial", tag, owner, clock),
+	: device_t(mconfig, PCE220SERIAL, "Sharp PC-E220 serial", tag, owner, clock, "pce220_serial", __FILE__),
 		device_image_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/machine/pce_slot.c b/src/mess/machine/pce_slot.c
index bb190ca7dd8..b500982ae88 100644
--- a/src/mess/machine/pce_slot.c
+++ b/src/mess/machine/pce_slot.c
@@ -125,7 +125,7 @@ void device_pce_cart_interface::rom_map_setup(UINT32 size)
 //  pce_cart_slot_device - constructor
 //-------------------------------------------------
 pce_cart_slot_device::pce_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-						device_t(mconfig, PCE_CART_SLOT, "PCE & TG16 Cartridge Slot", tag, owner, clock),
+						device_t(mconfig, PCE_CART_SLOT, "PCE & TG16 Cartridge Slot", tag, owner, clock, "pce_cart_slot", __FILE__),
 						device_image_interface(mconfig, *this),
 						device_slot_interface(mconfig, *this),
 						m_interface("pce_cart"),
diff --git a/src/mess/machine/petcass.c b/src/mess/machine/petcass.c
index bfe065a6d48..2157277afca 100644
--- a/src/mess/machine/petcass.c
+++ b/src/mess/machine/petcass.c
@@ -53,7 +53,7 @@ device_pet_datassette_port_interface::~device_pet_datassette_port_interface()
 //-------------------------------------------------
 
 pet_datassette_port_device::pet_datassette_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-	device_t(mconfig, PET_DATASSETTE_PORT, "Datassette Port", tag, owner, clock),
+	device_t(mconfig, PET_DATASSETTE_PORT, "Datassette Port", tag, owner, clock, "pet_datassette_port", __FILE__),
 	device_slot_interface(mconfig, *this),
 	m_read_handler(*this)
 {
diff --git a/src/mess/machine/petexp.c b/src/mess/machine/petexp.c
index 5969a438233..78cf58a6db0 100644
--- a/src/mess/machine/petexp.c
+++ b/src/mess/machine/petexp.c
@@ -36,7 +36,7 @@ const device_type PET_EXPANSION_SLOT = &device_creator<pet_expansion_slot_device
 //-------------------------------------------------
 
 pet_expansion_slot_device::pet_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-	device_t(mconfig, PET_EXPANSION_SLOT, "PET memory expansion port", tag, owner, clock),
+	device_t(mconfig, PET_EXPANSION_SLOT, "PET memory expansion port", tag, owner, clock, "pet_expansion_slot", __FILE__),
 	device_slot_interface(mconfig, *this),
 	m_read_dma(*this),
 	m_write_dma(*this)
diff --git a/src/mess/machine/petuser.c b/src/mess/machine/petuser.c
index ba77bae04e7..963262cdffb 100644
--- a/src/mess/machine/petuser.c
+++ b/src/mess/machine/petuser.c
@@ -53,7 +53,7 @@ device_pet_user_port_interface::~device_pet_user_port_interface()
 //-------------------------------------------------
 
 pet_user_port_device::pet_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, PET_USER_PORT, "PET user port", tag, owner, clock),
+		device_t(mconfig, PET_USER_PORT, "PET user port", tag, owner, clock, "pet_user_port", __FILE__),
 		device_slot_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/machine/plus4exp.c b/src/mess/machine/plus4exp.c
index 7afd194ee14..077cd92fea6 100644
--- a/src/mess/machine/plus4exp.c
+++ b/src/mess/machine/plus4exp.c
@@ -176,7 +176,7 @@ UINT8* device_plus4_expansion_card_interface::plus4_nvram_pointer(running_machin
 //-------------------------------------------------
 
 plus4_expansion_slot_device::plus4_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, PLUS4_EXPANSION_SLOT, "Expansion Port", tag, owner, clock),
+		device_t(mconfig, PLUS4_EXPANSION_SLOT, "Expansion Port", tag, owner, clock, "plus4_expansion_slot", __FILE__),
 		device_slot_interface(mconfig, *this),
 		device_image_interface(mconfig, *this),
 		m_write_irq(*this),
diff --git a/src/mess/machine/plus4user.c b/src/mess/machine/plus4user.c
index 91145ec3234..76dfbb061fb 100644
--- a/src/mess/machine/plus4user.c
+++ b/src/mess/machine/plus4user.c
@@ -53,7 +53,7 @@ device_plus4_user_port_interface::~device_plus4_user_port_interface()
 //-------------------------------------------------
 
 plus4_user_port_device::plus4_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, PLUS4_USER_PORT, "User Port", tag, owner, clock),
+		device_t(mconfig, PLUS4_USER_PORT, "User Port", tag, owner, clock, "plus4_user_port", __FILE__),
 		device_slot_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/machine/psion_pack.c b/src/mess/machine/psion_pack.c
index aaed9bf44be..d679ad3169c 100644
--- a/src/mess/machine/psion_pack.c
+++ b/src/mess/machine/psion_pack.c
@@ -59,7 +59,7 @@ const device_type PSION_DATAPACK = &device_creator<datapack_device>;
 //-------------------------------------------------
 
 datapack_device::datapack_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, PSION_DATAPACK, "Psion Datapack", tag, owner, clock),
+	: device_t(mconfig, PSION_DATAPACK, "Psion Datapack", tag, owner, clock, "datapack", __FILE__),
 		device_image_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/machine/psxcard.c b/src/mess/machine/psxcard.c
index 18b4c1e4ebb..1d8f6761313 100644
--- a/src/mess/machine/psxcard.c
+++ b/src/mess/machine/psxcard.c
@@ -40,7 +40,7 @@ enum transfer_states
 };
 
 psxcard_device::psxcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, PSXCARD, "Sony PSX Memory Card", tag, owner, clock),
+	: device_t(mconfig, PSXCARD, "Sony PSX Memory Card", tag, owner, clock, "psxcard", __FILE__),
 	device_image_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/machine/psxcport.c b/src/mess/machine/psxcport.c
index 4847aa01786..cfb38c27570 100644
--- a/src/mess/machine/psxcport.c
+++ b/src/mess/machine/psxcport.c
@@ -7,7 +7,7 @@
 const device_type PSX_CONTROLLER_PORT = &device_creator<psx_controller_port_device>;
 
 psx_controller_port_device::psx_controller_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, PSX_CONTROLLER_PORT, "Playstation Controller Port", tag, owner, clock),
+		device_t(mconfig, PSX_CONTROLLER_PORT, "Playstation Controller Port", tag, owner, clock, "psx_controller_port", __FILE__),
 		device_slot_interface(mconfig, *this),
 		m_card(*this, "card")
 {
diff --git a/src/mess/machine/rx01.c b/src/mess/machine/rx01.c
index 22dd3759510..b9b7d66b88b 100644
--- a/src/mess/machine/rx01.c
+++ b/src/mess/machine/rx01.c
@@ -54,7 +54,7 @@ const device_type RX01 = &device_creator<rx01_device>;
 //-------------------------------------------------
 
 rx01_device::rx01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, RX01, "RX01", tag, owner, clock)
+	: device_t(mconfig, RX01, "RX01", tag, owner, clock, "rx01", __FILE__)
 {
 }
 
diff --git a/src/mess/machine/s100.c b/src/mess/machine/s100.c
index 26598f17dbe..03136ebadff 100644
--- a/src/mess/machine/s100.c
+++ b/src/mess/machine/s100.c
@@ -26,7 +26,7 @@ const device_type S100_SLOT = &device_creator<s100_slot_device>;
 //  s100_slot_device - constructor
 //-------------------------------------------------
 s100_slot_device::s100_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, S100_SLOT, "S100 slot", tag, owner, clock),
+		device_t(mconfig, S100_SLOT, "S100 slot", tag, owner, clock, "s100_slot", __FILE__),
 		device_slot_interface(mconfig, *this)
 {
 }
@@ -101,7 +101,7 @@ void s100_device::device_config_complete()
 //-------------------------------------------------
 
 s100_device::s100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, S100, "S100", tag, owner, clock)
+		device_t(mconfig, S100, "S100", tag, owner, clock, "s100", __FILE__)
 {
 }
 
diff --git a/src/mess/machine/s3c44b0.c b/src/mess/machine/s3c44b0.c
index 18e4df1cfb2..b696b5119c5 100644
--- a/src/mess/machine/s3c44b0.c
+++ b/src/mess/machine/s3c44b0.c
@@ -31,7 +31,7 @@ INLINE void ATTR_PRINTF(3,4) verboselog( running_machine &machine, int n_level,
 const device_type S3C44B0 = &device_creator<s3c44b0_device>;
 
 s3c44b0_device::s3c44b0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-				: device_t(mconfig, S3C44B0, "Samsung S3C44B0", tag, owner, clock)
+				: device_t(mconfig, S3C44B0, "Samsung S3C44B0", tag, owner, clock, "s3c44b0", __FILE__)
 {
 	memset(&m_irq, 0, sizeof(s3c44b0_irq_t));
 	memset(m_zdma, 0, sizeof(s3c44b0_dma_t)*2);
diff --git a/src/mess/machine/sat_slot.c b/src/mess/machine/sat_slot.c
index c05e15c8b05..673a54f2cef 100644
--- a/src/mess/machine/sat_slot.c
+++ b/src/mess/machine/sat_slot.c
@@ -79,7 +79,7 @@ void device_sat_cart_interface::rom_alloc(running_machine &machine, UINT32 size)
 //  sat_cart_slot_device - constructor
 //-------------------------------------------------
 sat_cart_slot_device::sat_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-						device_t(mconfig, SATURN_CART_SLOT, "Saturn Cartridge Slot", tag, owner, clock),
+						device_t(mconfig, SATURN_CART_SLOT, "Saturn Cartridge Slot", tag, owner, clock, "sat_cart_slot", __FILE__),
 						device_image_interface(mconfig, *this),
 						device_slot_interface(mconfig, *this)
 {
diff --git a/src/mess/machine/sc499.c b/src/mess/machine/sc499.c
index fe3dde033a2..48d5d8b2d84 100644
--- a/src/mess/machine/sc499.c
+++ b/src/mess/machine/sc499.c
@@ -161,7 +161,7 @@ const device_type SC499 = &device_creator<sc499_device>;
 //-------------------------------------------------
 
 sc499_device::sc499_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, SC499, "Archive SC-499", tag, owner, clock)
+	: device_t(mconfig, SC499, "Archive SC-499", tag, owner, clock, "sc499", __FILE__)
 {
 	memset(static_cast<sc499_interface *>(this), 0, sizeof(sc499_interface));
 }
@@ -1171,7 +1171,7 @@ extern const device_type SC499_CTAPE;
 const device_type SC499_CTAPE = &device_creator<sc499_ctape_image_device>;
 
 sc499_ctape_image_device::sc499_ctape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, SC499_CTAPE, "Cartridge Tape", tag, owner, clock),
+	: device_t(mconfig, SC499_CTAPE, "Cartridge Tape", tag, owner, clock, "sc499_ctape", __FILE__),
 		device_image_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/machine/sega8_slot.c b/src/mess/machine/sega8_slot.c
index 5b4f53bb810..6853e0e558a 100644
--- a/src/mess/machine/sega8_slot.c
+++ b/src/mess/machine/sega8_slot.c
@@ -112,8 +112,8 @@ void device_sega8_cart_interface::ram_alloc(running_machine &machine, UINT32 siz
 //  sega8_cart_slot_device - constructor
 //-------------------------------------------------
 
-sega8_cart_slot_device::sega8_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, bool is_card) :
-						device_t(mconfig, type, name, tag, owner, clock),
+sega8_cart_slot_device::sega8_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, bool is_card, const char *shortname, const char *source) :
+						device_t(mconfig, type, name, tag, owner, clock, shortname, source),
 						device_image_interface(mconfig, *this),
 						device_slot_interface(mconfig, *this),
 						m_type(SEGA8_BASE_ROM),
@@ -125,7 +125,7 @@ sega8_cart_slot_device::sega8_cart_slot_device(const machine_config &mconfig, de
 }
 
 sega8_cart_slot_device::sega8_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-						device_t(mconfig, SEGA8_CART_SLOT, "Sega Master System / Game Gear / SG1000 Cartridge Slot", tag, owner, clock),
+						device_t(mconfig, SEGA8_CART_SLOT, "Sega Master System / Game Gear / SG1000 Cartridge Slot", tag, owner, clock, "sega8_cart_slot", __FILE__),
 						device_image_interface(mconfig, *this),
 						device_slot_interface(mconfig, *this),
 						m_type(SEGA8_BASE_ROM),
@@ -137,7 +137,7 @@ sega8_cart_slot_device::sega8_cart_slot_device(const machine_config &mconfig, co
 }
 
 sega8_card_slot_device::sega8_card_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-						sega8_cart_slot_device(mconfig, SEGA8_CARD_SLOT, "Sega Master System / Game Gear / SG1000 Card Slot", tag, owner, clock, TRUE)
+						sega8_cart_slot_device(mconfig, SEGA8_CARD_SLOT, "Sega Master System / Game Gear / SG1000 Card Slot", tag, owner, clock, TRUE, "sega8_card_slot", __FILE__)
 {
 }
 
diff --git a/src/mess/machine/sega8_slot.h b/src/mess/machine/sega8_slot.h
index 7e681ae294b..16e1bb1dc5d 100644
--- a/src/mess/machine/sega8_slot.h
+++ b/src/mess/machine/sega8_slot.h
@@ -99,7 +99,7 @@ class sega8_cart_slot_device : public device_t,
 {
 public:
 	// construction/destruction
-	sega8_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, bool is_card);
+	sega8_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, bool is_card, const char *shortname, const char *source);
 	sega8_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
 	virtual ~sega8_cart_slot_device();
 
diff --git a/src/mess/machine/serial.c b/src/mess/machine/serial.c
index 8041bc6b204..2c5566aeaa5 100644
--- a/src/mess/machine/serial.c
+++ b/src/mess/machine/serial.c
@@ -15,7 +15,7 @@ device_serial_port_interface::~device_serial_port_interface()
 }
 
 serial_port_device::serial_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, SERIAL_PORT, "Serial Port", tag, owner, clock),
+	: device_t(mconfig, SERIAL_PORT, "Serial Port", tag, owner, clock, "serial_port", __FILE__),
 		device_slot_interface(mconfig, *this),
 		m_dev(NULL)
 {
diff --git a/src/mess/machine/smartmed.c b/src/mess/machine/smartmed.c
index cf231dc30c3..e30c7599024 100644
--- a/src/mess/machine/smartmed.c
+++ b/src/mess/machine/smartmed.c
@@ -75,7 +75,7 @@ enum
 const device_type NAND = &device_creator<nand_device>;
 
 nand_device::nand_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, NAND, "NAND Flash Memory", tag, owner, clock)
+	: device_t(mconfig, NAND, "NAND Flash Memory", tag, owner, clock, "nand", __FILE__)
 {
 }
 nand_device::nand_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
diff --git a/src/mess/machine/smc92x4.c b/src/mess/machine/smc92x4.c
index fa2280abb8d..7b1028e90eb 100644
--- a/src/mess/machine/smc92x4.c
+++ b/src/mess/machine/smc92x4.c
@@ -188,7 +188,7 @@ enum
 #define LOG logerror
 
 smc92x4_device::smc92x4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: device_t(mconfig, SMC92X4, "SMC 9224/9234 Hard/Floppy Disk Controller", tag, owner, clock)
+: device_t(mconfig, SMC92X4, "SMC 9224/9234 Hard/Floppy Disk Controller", tag, owner, clock, "smc92x4", __FILE__)
 {
 }
 
diff --git a/src/mess/machine/smsctrl.c b/src/mess/machine/smsctrl.c
index 7956a9016aa..20f2efc022c 100644
--- a/src/mess/machine/smsctrl.c
+++ b/src/mess/machine/smsctrl.c
@@ -53,7 +53,7 @@ device_sms_control_port_interface::~device_sms_control_port_interface()
 //-------------------------------------------------
 
 sms_control_port_device::sms_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-						device_t(mconfig, SMS_CONTROL_PORT, "Sega SMS control port", tag, owner, clock),
+						device_t(mconfig, SMS_CONTROL_PORT, "Sega SMS control port", tag, owner, clock, "sms_control_port", __FILE__),
 						device_slot_interface(mconfig, *this),
 						m_th_pin_handler(*this),
 						m_pixel_handler(*this)
diff --git a/src/mess/machine/sns_slot.c b/src/mess/machine/sns_slot.c
index 1ab55407cf8..b22f96edddb 100644
--- a/src/mess/machine/sns_slot.c
+++ b/src/mess/machine/sns_slot.c
@@ -190,8 +190,8 @@ void device_sns_cart_interface::rom_map_setup(UINT32 size)
 //-------------------------------------------------
 //  base_sns_cart_slot_device - constructor
 //-------------------------------------------------
-base_sns_cart_slot_device::base_sns_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock) :
-						device_t(mconfig, type, name, tag, owner, clock),
+base_sns_cart_slot_device::base_sns_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+						device_t(mconfig, type, name, tag, owner, clock, shortname, source),
 						device_image_interface(mconfig, *this),
 						device_slot_interface(mconfig, *this),
 						m_addon(ADDON_NONE),
@@ -200,17 +200,17 @@ base_sns_cart_slot_device::base_sns_cart_slot_device(const machine_config &mconf
 }
 
 sns_cart_slot_device::sns_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-						base_sns_cart_slot_device(mconfig, SNS_CART_SLOT, "SNES Cartridge Slot", tag, owner, clock)
+						base_sns_cart_slot_device(mconfig, SNS_CART_SLOT, "SNES Cartridge Slot", tag, owner, clock, "sns_cart_slot", __FILE__)
 {
 }
 
 sns_sufami_cart_slot_device::sns_sufami_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-						base_sns_cart_slot_device(mconfig, SNS_SUFAMI_CART_SLOT, "SNES Sufami Turbo Cartridge Slot", tag, owner, clock)
+						base_sns_cart_slot_device(mconfig, SNS_SUFAMI_CART_SLOT, "SNES Sufami Turbo Cartridge Slot", tag, owner, clock, "sns_sufami_cart_slot", __FILE__)
 {
 }
 
 sns_bsx_cart_slot_device::sns_bsx_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-						base_sns_cart_slot_device(mconfig, SNS_BSX_CART_SLOT, "SNES BS-X Cartridge Slot", tag, owner, clock)
+						base_sns_cart_slot_device(mconfig, SNS_BSX_CART_SLOT, "SNES BS-X Cartridge Slot", tag, owner, clock, "sns_bsx_cart_slot", __FILE__)
 {
 }
 
diff --git a/src/mess/machine/sns_slot.h b/src/mess/machine/sns_slot.h
index f20c3594619..a5710cda74b 100644
--- a/src/mess/machine/sns_slot.h
+++ b/src/mess/machine/sns_slot.h
@@ -156,7 +156,7 @@ class base_sns_cart_slot_device : public device_t,
 {
 public:
 	// construction/destruction
-	base_sns_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	base_sns_cart_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 	virtual ~base_sns_cart_slot_device();
 
 	// device-level overrides
diff --git a/src/mess/machine/strata.c b/src/mess/machine/strata.c
index aead20c731e..51bdef74184 100644
--- a/src/mess/machine/strata.c
+++ b/src/mess/machine/strata.c
@@ -102,7 +102,7 @@ static DEVICE_START( strataflash )
 const device_type STRATAFLASH = &device_creator<strataflash_device>;
 
 strataflash_device::strataflash_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, STRATAFLASH, "Intel 28F640J5", tag, owner, clock)
+	: device_t(mconfig, STRATAFLASH, "Intel 28F640J5", tag, owner, clock, "strataflash", __FILE__)
 {
 	m_token = global_alloc_clear(strata_t);
 }
diff --git a/src/mess/machine/terminal.c b/src/mess/machine/terminal.c
index 1e7b92df3c7..5516e8f66bf 100644
--- a/src/mess/machine/terminal.c
+++ b/src/mess/machine/terminal.c
@@ -144,7 +144,7 @@ generic_terminal_device::generic_terminal_device(const machine_config &mconfig,
 }
 
 generic_terminal_device::generic_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, GENERIC_TERMINAL, "Generic Terminal", tag, owner, clock),
+	: device_t(mconfig, GENERIC_TERMINAL, "Generic Terminal", tag, owner, clock, "generic_terminal", __FILE__),
 		m_io_term_frame(*this, "TERM_FRAME"),
 		m_io_term_conf(*this, "TERM_CONF")
 {
diff --git a/src/mess/machine/thomson.c b/src/mess/machine/thomson.c
index 95307897084..c06eaa20b5d 100644
--- a/src/mess/machine/thomson.c
+++ b/src/mess/machine/thomson.c
@@ -670,7 +670,7 @@ const device_type TO7_IO_LINE = &device_creator<to7_io_line_device>;
 //-------------------------------------------------
 
 to7_io_line_device::to7_io_line_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, TO7_IO_LINE, "Serial source", tag, owner, clock),
+	: device_t(mconfig, TO7_IO_LINE, "Serial source", tag, owner, clock, "to7_io_line", __FILE__),
 		device_serial_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/machine/ti99/datamux.c b/src/mess/machine/ti99/datamux.c
index 38e7dc2e9fb..29ab91b3170 100644
--- a/src/mess/machine/ti99/datamux.c
+++ b/src/mess/machine/ti99/datamux.c
@@ -73,7 +73,7 @@
     Constructor
 */
 ti99_datamux_device::ti99_datamux_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: device_t(mconfig, DATAMUX, "Databus multiplexer", tag, owner, clock)
+: device_t(mconfig, DATAMUX, "Databus multiplexer", tag, owner, clock, "ti99_datamux", __FILE__)
 {
 }
 
diff --git a/src/mess/machine/ti99/genboard.c b/src/mess/machine/ti99/genboard.c
index 26842cf94ce..6d062f07fed 100644
--- a/src/mess/machine/ti99/genboard.c
+++ b/src/mess/machine/ti99/genboard.c
@@ -146,7 +146,7 @@
 #define LOG logerror
 
 geneve_mapper_device::geneve_mapper_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: device_t(mconfig, GENEVE_MAPPER, "Geneve Gate Array", tag, owner, clock)
+: device_t(mconfig, GENEVE_MAPPER, "Geneve Gate Array", tag, owner, clock, "geneve_mapper", __FILE__)
 {
 	m_eprom = NULL;
 }
@@ -958,7 +958,7 @@ static const UINT8 MF1_CODE[0xe] =
 };
 
 geneve_keyboard_device::geneve_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: device_t(mconfig, GENEVE_KEYBOARD, "Geneve XT-style keyboard", tag, owner, clock)
+: device_t(mconfig, GENEVE_KEYBOARD, "Geneve XT-style keyboard", tag, owner, clock, "geneve_keyboard", __FILE__)
 {
 }
 
@@ -1415,7 +1415,7 @@ const device_type GENEVE_KEYBOARD = &device_creator<geneve_keyboard_device>;
 ****************************************************************************/
 
 geneve_mouse_device::geneve_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: device_t(mconfig, GENEVE_MOUSE, "Geneve mouse", tag, owner, clock)
+: device_t(mconfig, GENEVE_MOUSE, "Geneve mouse", tag, owner, clock, "geneve_mouse", __FILE__)
 {
 }
 
diff --git a/src/mess/machine/ti99/joyport.c b/src/mess/machine/ti99/joyport.c
index aa9302e3b80..151e0a38df4 100644
--- a/src/mess/machine/ti99/joyport.c
+++ b/src/mess/machine/ti99/joyport.c
@@ -38,7 +38,7 @@
 #include "mecmouse.h"
 
 joyport_device::joyport_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	:   device_t(mconfig, JOYPORT, "Joystick port", tag, owner, clock),
+	:   device_t(mconfig, JOYPORT, "Joystick port", tag, owner, clock, "ti99_joyport", __FILE__),
 		device_slot_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/machine/ti99/peribox.c b/src/mess/machine/ti99/peribox.c
index 8afbbe7acc5..a31f7e17526 100644
--- a/src/mess/machine/ti99/peribox.c
+++ b/src/mess/machine/ti99/peribox.c
@@ -227,6 +227,12 @@ peribox_device::peribox_device(const machine_config &mconfig, const char *tag, d
 	for (int i=2; i <= 8; i++) m_slot[i] = NULL;
 }
 
+peribox_device::peribox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+: bus8z_device(mconfig, PERIBOX, "Peripheral expansion box", tag, owner, clock, shortname, source)
+{
+	for (int i=2; i <= 8; i++) m_slot[i] = NULL;
+}
+
 READ8Z_MEMBER(peribox_device::readz)
 {
 	for (int i=2; i <= 8; i++)
@@ -430,7 +436,7 @@ machine_config_constructor peribox_device::device_mconfig_additions() const
 *****************************************************************************/
 
 peribox_gen_device::peribox_gen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: peribox_device(mconfig, tag, owner, clock)
+: peribox_device(mconfig, tag, owner, clock, "peribox_gen", __FILE__)
 {
 };
 
@@ -467,7 +473,7 @@ machine_config_constructor peribox_gen_device::device_mconfig_additions() const
 *****************************************************************************/
 
 peribox_sg_device::peribox_sg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: peribox_device(mconfig, tag, owner, clock)
+: peribox_device(mconfig, tag, owner, clock, "peribox_sg", __FILE__)
 {
 };
 
@@ -511,7 +517,7 @@ machine_config_constructor peribox_sg_device::device_mconfig_additions() const
 *****************************************************************************/
 
 peribox_ev_device::peribox_ev_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: peribox_device(mconfig, tag, owner, clock)
+: peribox_device(mconfig, tag, owner, clock, "peribox_ev", __FILE__)
 {
 };
 
diff --git a/src/mess/machine/ti99/peribox.h b/src/mess/machine/ti99/peribox.h
index 9a144c9c8e8..4964881c98e 100644
--- a/src/mess/machine/ti99/peribox.h
+++ b/src/mess/machine/ti99/peribox.h
@@ -47,6 +47,7 @@ class peribox_device : public bus8z_device
 	friend class peribox_slot_device;
 public:
 	peribox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+	peribox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 
 	// Next six methods are called from the console
 	DECLARE_READ8Z_MEMBER(readz);
diff --git a/src/mess/machine/ti99/ti99_hd.c b/src/mess/machine/ti99/ti99_hd.c
index e8098668b56..a1976b00444 100644
--- a/src/mess/machine/ti99/ti99_hd.c
+++ b/src/mess/machine/ti99/ti99_hd.c
@@ -32,7 +32,7 @@
 #define SYNC 13
 
 mfm_harddisk_device::mfm_harddisk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: device_t(mconfig, TI99_MFMHD, "MFM Harddisk", tag, owner, clock)
+: device_t(mconfig, TI99_MFMHD, "MFM Harddisk", tag, owner, clock, "mfm_harddisk", __FILE__)
 {
 }
 
diff --git a/src/mess/machine/ti99/ti_rs232.c b/src/mess/machine/ti99/ti_rs232.c
index 64722f64916..9b1f8e7e7c1 100644
--- a/src/mess/machine/ti99/ti_rs232.c
+++ b/src/mess/machine/ti99/ti_rs232.c
@@ -124,13 +124,13 @@ ti_rs232_pio_device::ti_rs232_pio_device(const machine_config &mconfig, const ch
 /* Ports */
 
 ti_rs232_attached_device::ti_rs232_attached_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: device_t(mconfig, TI99_RS232_DEV, "Serial attached device", tag, owner, clock),
+: device_t(mconfig, TI99_RS232_DEV, "Serial attached device", tag, owner, clock, "ti_rs232_attached", __FILE__),
 	device_image_interface(mconfig, *this)
 {
 }
 
 ti_pio_attached_device::ti_pio_attached_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-: device_t(mconfig, TI99_PIO_DEV, "Parallel attached device", tag, owner, clock),
+: device_t(mconfig, TI99_PIO_DEV, "Parallel attached device", tag, owner, clock, "ti_pio_attached", __FILE__),
 	device_image_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/machine/tms5501.c b/src/mess/machine/tms5501.c
index 339b0297ff3..daeab25b888 100644
--- a/src/mess/machine/tms5501.c
+++ b/src/mess/machine/tms5501.c
@@ -78,7 +78,7 @@ static const UINT8 timer_name[] = { TMS5501_TIMER_0_INT, TMS5501_TIMER_1_INT, TM
 //-------------------------------------------------
 
 tms5501_device::tms5501_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, TMS5501, "TMS5501", tag, owner, clock)
+	: device_t(mconfig, TMS5501, "TMS5501", tag, owner, clock, "tms5501", __FILE__)
 {
 }
 
diff --git a/src/mess/machine/tvcexp.c b/src/mess/machine/tvcexp.c
index 298141fd686..be967632e00 100644
--- a/src/mess/machine/tvcexp.c
+++ b/src/mess/machine/tvcexp.c
@@ -51,7 +51,7 @@ device_tvcexp_interface::~device_tvcexp_interface()
 //  tvcexp_slot_device - constructor
 //-------------------------------------------------
 tvcexp_slot_device::tvcexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, TVCEXP_SLOT, "TVC64 Expansion Slot", tag, owner, clock),
+		device_t(mconfig, TVCEXP_SLOT, "TVC64 Expansion Slot", tag, owner, clock, "tvcexp_slot", __FILE__),
 		device_slot_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/machine/upd65031.c b/src/mess/machine/upd65031.c
index 5e0c7497798..822a2d3822c 100644
--- a/src/mess/machine/upd65031.c
+++ b/src/mess/machine/upd65031.c
@@ -194,7 +194,7 @@ inline void upd65031_device::set_mode(int mode)
 //-------------------------------------------------
 
 upd65031_device::upd65031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, UPD65031, "NEC uPD65031", tag, owner, clock)
+	: device_t(mconfig, UPD65031, "NEC uPD65031", tag, owner, clock, "upd65031", __FILE__)
 {
 }
 
diff --git a/src/mess/machine/upd71071.c b/src/mess/machine/upd71071.c
index 58fa6a44e90..573c3f933c4 100644
--- a/src/mess/machine/upd71071.c
+++ b/src/mess/machine/upd71071.c
@@ -84,7 +84,7 @@
 const device_type UPD71071 = &device_creator<upd71071_device>;
 
 upd71071_device::upd71071_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-				: device_t(mconfig, UPD71071, "NEC uPD71071", tag, owner, clock)
+				: device_t(mconfig, UPD71071, "NEC uPD71071", tag, owner, clock, "upd71071", __FILE__)
 {
 }
 
diff --git a/src/mess/machine/vcsctrl.c b/src/mess/machine/vcsctrl.c
index 60bb1e14b4c..4ae631d1f7e 100644
--- a/src/mess/machine/vcsctrl.c
+++ b/src/mess/machine/vcsctrl.c
@@ -53,7 +53,7 @@ device_vcs_control_port_interface::~device_vcs_control_port_interface()
 //-------------------------------------------------
 
 vcs_control_port_device::vcs_control_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-	device_t(mconfig, VCS_CONTROL_PORT, "Atari VCS control port", tag, owner, clock),
+	device_t(mconfig, VCS_CONTROL_PORT, "Atari VCS control port", tag, owner, clock, "vcs_control_port", __FILE__),
 	device_slot_interface(mconfig, *this),
 	m_trigger_handler(*this)
 {
diff --git a/src/mess/machine/vic10exp.c b/src/mess/machine/vic10exp.c
index 355a4b50fdc..6e1369266dc 100644
--- a/src/mess/machine/vic10exp.c
+++ b/src/mess/machine/vic10exp.c
@@ -106,7 +106,7 @@ UINT8* device_vic10_expansion_card_interface::vic10_exram_pointer(running_machin
 //-------------------------------------------------
 
 vic10_expansion_slot_device::vic10_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, VIC10_EXPANSION_SLOT, "VIC-10 expansion port", tag, owner, clock),
+		device_t(mconfig, VIC10_EXPANSION_SLOT, "VIC-10 expansion port", tag, owner, clock, "vic10_expansion_slot", __FILE__),
 		device_slot_interface(mconfig, *this),
 		device_image_interface(mconfig, *this),
 		m_write_irq(*this),
diff --git a/src/mess/machine/vic20exp.c b/src/mess/machine/vic20exp.c
index 3b594085852..e9a52a37345 100644
--- a/src/mess/machine/vic20exp.c
+++ b/src/mess/machine/vic20exp.c
@@ -157,7 +157,7 @@ device_vic20_expansion_card_interface::~device_vic20_expansion_card_interface()
 //-------------------------------------------------
 
 vic20_expansion_slot_device::vic20_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, VIC20_EXPANSION_SLOT, "VIC-20 expansion port", tag, owner, clock),
+		device_t(mconfig, VIC20_EXPANSION_SLOT, "VIC-20 expansion port", tag, owner, clock, "vic20_expansion_slot", __FILE__),
 		device_slot_interface(mconfig, *this),
 		device_image_interface(mconfig, *this),
 		m_write_irq(*this),
diff --git a/src/mess/machine/vic20user.c b/src/mess/machine/vic20user.c
index 7aef40eb826..0752c4b7024 100644
--- a/src/mess/machine/vic20user.c
+++ b/src/mess/machine/vic20user.c
@@ -53,7 +53,7 @@ device_vic20_user_port_interface::~device_vic20_user_port_interface()
 //-------------------------------------------------
 
 vic20_user_port_device::vic20_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, VIC20_USER_PORT, "VIC-20 user port", tag, owner, clock),
+		device_t(mconfig, VIC20_USER_PORT, "VIC-20 user port", tag, owner, clock, "vic20_user_port", __FILE__),
 		device_slot_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/machine/vidbrain_exp.c b/src/mess/machine/vidbrain_exp.c
index acc0f03c5a0..de83f638f2c 100644
--- a/src/mess/machine/vidbrain_exp.c
+++ b/src/mess/machine/vidbrain_exp.c
@@ -99,7 +99,7 @@ UINT8* device_videobrain_expansion_card_interface::videobrain_ram_pointer(runnin
 //-------------------------------------------------
 
 videobrain_expansion_slot_device::videobrain_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, VIDEOBRAIN_EXPANSION_SLOT, "VideoBrain expansion port", tag, owner, clock),
+		device_t(mconfig, VIDEOBRAIN_EXPANSION_SLOT, "VideoBrain expansion port", tag, owner, clock, "videobrain_expansion_slot", __FILE__),
 		device_slot_interface(mconfig, *this),
 		device_image_interface(mconfig, *this)
 {
diff --git a/src/mess/machine/vip_byteio.c b/src/mess/machine/vip_byteio.c
index 2d856c9623c..77316a53537 100644
--- a/src/mess/machine/vip_byteio.c
+++ b/src/mess/machine/vip_byteio.c
@@ -44,7 +44,7 @@ device_vip_byteio_port_interface::device_vip_byteio_port_interface(const machine
 //-------------------------------------------------
 
 vip_byteio_port_device::vip_byteio_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, VIP_BYTEIO_PORT, "VIP byte I/O port", tag, owner, clock),
+		device_t(mconfig, VIP_BYTEIO_PORT, "VIP byte I/O port", tag, owner, clock, "vip_byteio_port", __FILE__),
 		device_slot_interface(mconfig, *this),
 		m_write_inst(*this)
 {
diff --git a/src/mess/machine/vip_exp.c b/src/mess/machine/vip_exp.c
index 832d0d0592a..538b2888f47 100644
--- a/src/mess/machine/vip_exp.c
+++ b/src/mess/machine/vip_exp.c
@@ -52,7 +52,7 @@ device_vip_expansion_card_interface::device_vip_expansion_card_interface(const m
 //-------------------------------------------------
 
 vip_expansion_slot_device::vip_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-	device_t(mconfig, VIP_EXPANSION_SLOT, "VIP expansion port", tag, owner, clock),
+	device_t(mconfig, VIP_EXPANSION_SLOT, "VIP expansion port", tag, owner, clock, "vip_expansion_slot", __FILE__),
 	device_slot_interface(mconfig, *this),
 	m_write_irq(*this),
 	m_write_dma_out(*this),
diff --git a/src/mess/machine/wangpcbus.c b/src/mess/machine/wangpcbus.c
index 874c477605a..852ccf2c4e4 100644
--- a/src/mess/machine/wangpcbus.c
+++ b/src/mess/machine/wangpcbus.c
@@ -29,7 +29,7 @@ const device_type WANGPC_BUS_SLOT = &device_creator<wangpcbus_slot_device>;
 //-------------------------------------------------
 
 wangpcbus_slot_device::wangpcbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, WANGPC_BUS_SLOT, "Wang PC bus slot", tag, owner, clock),
+		device_t(mconfig, WANGPC_BUS_SLOT, "Wang PC bus slot", tag, owner, clock, "wangpcbus_slot", __FILE__),
 		device_slot_interface(mconfig, *this)
 {
 }
@@ -103,7 +103,7 @@ void wangpcbus_device::device_config_complete()
 //-------------------------------------------------
 
 wangpcbus_device::wangpcbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, WANGPC_BUS, "Wang PC bus", tag, owner, clock)
+		device_t(mconfig, WANGPC_BUS, "Wang PC bus", tag, owner, clock, "wangpcbus", __FILE__)
 {
 }
 
diff --git a/src/mess/machine/x1.c b/src/mess/machine/x1.c
index edecd6bbb5d..50892eddeda 100644
--- a/src/mess/machine/x1.c
+++ b/src/mess/machine/x1.c
@@ -13,7 +13,7 @@ const device_type X1_KEYBOARD = &device_creator<x1_keyboard_device>;
 //-------------------------------------------------
 
 x1_keyboard_device::x1_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, X1_KEYBOARD, "X1 Keyboard", tag, owner, clock),
+	: device_t(mconfig, X1_KEYBOARD, "X1 Keyboard", tag, owner, clock, "x1_keyboard", __FILE__),
 		device_z80daisy_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/machine/x68k_hdc.c b/src/mess/machine/x68k_hdc.c
index fea87539976..65a5bfbdeb2 100644
--- a/src/mess/machine/x68k_hdc.c
+++ b/src/mess/machine/x68k_hdc.c
@@ -22,7 +22,7 @@
 const device_type X68KHDC = &device_creator<x68k_hdc_image_device>;
 
 x68k_hdc_image_device::x68k_hdc_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, X68KHDC, "SASI Hard Disk", tag, owner, clock),
+	: device_t(mconfig, X68KHDC, "SASI Hard Disk", tag, owner, clock, "x68k_hdc_image", __FILE__),
 		device_image_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/machine/x68kexp.c b/src/mess/machine/x68kexp.c
index 627ce06e814..eeb37ac85ac 100644
--- a/src/mess/machine/x68kexp.c
+++ b/src/mess/machine/x68kexp.c
@@ -33,7 +33,7 @@ device_x68k_expansion_card_interface::~device_x68k_expansion_card_interface()
 //**************************************************************************
 
 x68k_expansion_slot_device::x68k_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, X68K_EXPANSION_SLOT, "Sharp X680x0 expansion slot", tag, owner, clock),
+		device_t(mconfig, X68K_EXPANSION_SLOT, "Sharp X680x0 expansion slot", tag, owner, clock, "x68k_expansion_slot", __FILE__),
 		device_slot_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/machine/z88cart.c b/src/mess/machine/z88cart.c
index b3db76386e8..3e4e612a8f3 100644
--- a/src/mess/machine/z88cart.c
+++ b/src/mess/machine/z88cart.c
@@ -55,7 +55,7 @@ device_z88cart_interface::~device_z88cart_interface()
 //  z88cart_slot_device - constructor
 //-------------------------------------------------
 z88cart_slot_device::z88cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-		device_t(mconfig, Z88CART_SLOT, "Z88 Cartridge Slot", tag, owner, clock),
+		device_t(mconfig, Z88CART_SLOT, "Z88 Cartridge Slot", tag, owner, clock, "z88cart_slot", __FILE__),
 		device_image_interface(mconfig, *this),
 		device_slot_interface(mconfig, *this)
 {
diff --git a/src/mess/machine/zx8302.c b/src/mess/machine/zx8302.c
index bee0c0cd567..13863c9b88e 100644
--- a/src/mess/machine/zx8302.c
+++ b/src/mess/machine/zx8302.c
@@ -171,7 +171,7 @@ inline void zx8302_device::transmit_ipc_data()
 //-------------------------------------------------
 
 zx8302_device::zx8302_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, ZX8302, "Sinclair ZX8302", tag, owner, clock),
+	: device_t(mconfig, ZX8302, "Sinclair ZX8302", tag, owner, clock, "zx8302", __FILE__),
 		device_serial_interface(mconfig, *this),
 		m_idr(1),
 		m_irq(0),
diff --git a/src/mess/video/733_asr.c b/src/mess/video/733_asr.c
index 39bfe5c3db9..8225b4da961 100644
--- a/src/mess/video/733_asr.c
+++ b/src/mess/video/733_asr.c
@@ -219,7 +219,7 @@ static DEVICE_RESET( asr733 )
 const device_type ASR733 = &device_creator<asr733_device>;
 
 asr733_device::asr733_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, ASR733, "733 ASR", tag, owner, clock)
+	: device_t(mconfig, ASR733, "733 ASR", tag, owner, clock, "asr733", __FILE__)
 {
 	m_token = global_alloc_clear(asr_t);
 }
diff --git a/src/mess/video/911_vdt.c b/src/mess/video/911_vdt.c
index 75ad9b6f212..bb716df92ac 100644
--- a/src/mess/video/911_vdt.c
+++ b/src/mess/video/911_vdt.c
@@ -271,7 +271,7 @@ static DEVICE_START( vdt911 )
 const device_type VDT911 = &device_creator<vdt911_device>;
 
 vdt911_device::vdt911_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, VDT911, "911 VDT", tag, owner, clock)
+	: device_t(mconfig, VDT911, "911 VDT", tag, owner, clock, "vdt911", __FILE__)
 {
 	m_token = global_alloc_clear(vdt_t);
 }
diff --git a/src/mess/video/crt.c b/src/mess/video/crt.c
index 9340ad87d53..47f0ccf291e 100644
--- a/src/mess/video/crt.c
+++ b/src/mess/video/crt.c
@@ -49,7 +49,7 @@ const device_type CRT = &device_creator<crt_device>;
 //-------------------------------------------------
 
 crt_device::crt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, CRT, "CRT Video", tag, owner, clock),
+	: device_t(mconfig, CRT, "CRT Video", tag, owner, clock, "crt", __FILE__),
 		m_list(NULL),
 		m_list_head(NULL),
 		m_decay_counter(0),
diff --git a/src/mess/video/crtc_ega.c b/src/mess/video/crtc_ega.c
index ad2daba6c4b..88bdf7a3932 100644
--- a/src/mess/video/crtc_ega.c
+++ b/src/mess/video/crtc_ega.c
@@ -40,7 +40,7 @@ void crtc_ega_device::device_config_complete()
 
 
 crtc_ega_device::crtc_ega_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, CRTC_EGA, "crtc_EGA", tag, owner, clock)
+	: device_t(mconfig, CRTC_EGA, "crtc_EGA", tag, owner, clock, "crtc_ega", __FILE__)
 {
 }
 
diff --git a/src/mess/video/ef9345.c b/src/mess/video/ef9345.c
index bb8a2110875..044d01786bc 100644
--- a/src/mess/video/ef9345.c
+++ b/src/mess/video/ef9345.c
@@ -121,7 +121,7 @@ inline void ef9345_device::inc_y(UINT8 r)
 //-------------------------------------------------
 
 ef9345_device::ef9345_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-	device_t(mconfig, EF9345, "EF9345", tag, owner, clock),
+	device_t(mconfig, EF9345, "EF9345", tag, owner, clock, "ef9345", __FILE__),
 	device_memory_interface(mconfig, *this),
 	m_space_config("videoram", ENDIANNESS_LITTLE, 8, 16, 0, NULL, *ADDRESS_MAP_NAME(ef9345))
 {
diff --git a/src/mess/video/gf4500.c b/src/mess/video/gf4500.c
index 4ca6cbf3789..f148a396f34 100644
--- a/src/mess/video/gf4500.c
+++ b/src/mess/video/gf4500.c
@@ -34,7 +34,7 @@ const device_type GF4500 = &device_creator<gf4500_device>;
 
 
 gf4500_device::gf4500_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-				: device_t(mconfig, GF4500, "NVIDIA GoForce 4500", tag, owner, clock)
+				: device_t(mconfig, GF4500, "NVIDIA GoForce 4500", tag, owner, clock, "gf4500", __FILE__)
 {
 }
 
diff --git a/src/mess/video/gime.c b/src/mess/video/gime.c
index f28364f8881..aed740b01b1 100644
--- a/src/mess/video/gime.c
+++ b/src/mess/video/gime.c
@@ -106,8 +106,8 @@
 //  ctor
 //-------------------------------------------------
 
-gime_base_device::gime_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const UINT8 *fontdata)
-	:   mc6847_friend_device(mconfig, type, name, tag, owner, clock, fontdata, true, 263, 25+192+26+3, false)
+gime_base_device::gime_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const UINT8 *fontdata, const char *shortname, const char *source)
+	:   mc6847_friend_device(mconfig, type, name, tag, owner, clock, fontdata, true, 263, 25+192+26+3, false, shortname, source)
 {
 }
 
@@ -2054,7 +2054,7 @@ const device_type GIME_PAL = &device_creator<gime_pal_device>;
 //-------------------------------------------------
 
 gime_ntsc_device::gime_ntsc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: gime_base_device(mconfig, GIME_NTSC, "GIME_NTSC", tag, owner, clock, ntsc_round_fontdata8x12)
+	: gime_base_device(mconfig, GIME_NTSC, "GIME_NTSC", tag, owner, clock, ntsc_round_fontdata8x12, "gime_ntsc", __FILE__)
 {
 }
 
@@ -2065,6 +2065,6 @@ gime_ntsc_device::gime_ntsc_device(const machine_config &mconfig, const char *ta
 //-------------------------------------------------
 
 gime_pal_device::gime_pal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: gime_base_device(mconfig, GIME_PAL, "GIME_PAL", tag, owner, clock, pal_round_fontdata8x12)
+	: gime_base_device(mconfig, GIME_PAL, "GIME_PAL", tag, owner, clock, pal_round_fontdata8x12, "gime_pal", __FILE__)
 {
 }
diff --git a/src/mess/video/gime.h b/src/mess/video/gime.h
index 3943290d95e..e289b5d01d3 100644
--- a/src/mess/video/gime.h
+++ b/src/mess/video/gime.h
@@ -85,7 +85,7 @@ public:
 	void set_il2(bool value) { set_interrupt_value(INTERRUPT_EI2, value); }
 
 protected:
-	gime_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const UINT8 *fontdata);
+	gime_base_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const UINT8 *fontdata, const char *shortname, const char *source);
 
 	// device-level overrides
 	virtual void device_start(void);
diff --git a/src/mess/video/k1ge.c b/src/mess/video/k1ge.c
index e0d1309c2d7..c05ee880e13 100644
--- a/src/mess/video/k1ge.c
+++ b/src/mess/video/k1ge.c
@@ -873,14 +873,14 @@ void k1ge_device::device_reset()
 const device_type K1GE = &device_creator<k1ge_device>;
 
 k1ge_device::k1ge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, K1GE, "K1GE Monochrome Graphics + LCD", tag, owner, clock)
+	: device_t(mconfig, K1GE, "K1GE Monochrome Graphics + LCD", tag, owner, clock, "k1ge", __FILE__)
 	, m_vblank_pin_w(*this)
 	, m_hblank_pin_w(*this)
 {
 }
 
-k1ge_device::k1ge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, type, name, tag, owner, clock)
+k1ge_device::k1ge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+	: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
 	, m_vblank_pin_w(*this)
 	, m_hblank_pin_w(*this)
 {
@@ -890,6 +890,6 @@ k1ge_device::k1ge_device(const machine_config &mconfig, device_type type, const
 const device_type K2GE = &device_creator<k2ge_device>;
 
 k2ge_device::k2ge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: k1ge_device(mconfig, K2GE, "K2GE Color Graphics + LCD", tag, owner, clock)
+	: k1ge_device(mconfig, K2GE, "K2GE Color Graphics + LCD", tag, owner, clock, "k2ge", __FILE__)
 {
 }
diff --git a/src/mess/video/k1ge.h b/src/mess/video/k1ge.h
index c7b268b7788..e2c21eaa3f2 100644
--- a/src/mess/video/k1ge.h
+++ b/src/mess/video/k1ge.h
@@ -22,7 +22,7 @@ class k1ge_device : public device_t
 {
 public:
 	k1ge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	k1ge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	k1ge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 
 	DECLARE_READ8_MEMBER( reg_read );
 	DECLARE_WRITE8_MEMBER( reg_write );
diff --git a/src/mess/video/mos6566.c b/src/mess/video/mos6566.c
index 6677da12aa3..2c8183197ad 100644
--- a/src/mess/video/mos6566.c
+++ b/src/mess/video/mos6566.c
@@ -580,7 +580,7 @@ inline void mos6566_device::draw_multi( UINT16 p, UINT8 c0, UINT8 c1, UINT8 c2,
 //-------------------------------------------------
 
 mos6566_device::mos6566_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MOS6566, "MOS6566", tag, owner, clock),
+	: device_t(mconfig, MOS6566, "MOS6566", tag, owner, clock, "mos6566", __FILE__),
 		device_memory_interface(mconfig, *this),
 		device_execute_interface(mconfig, *this),
 		m_icount(0),
@@ -594,8 +594,8 @@ mos6566_device::mos6566_device(const machine_config &mconfig, const char *tag, d
 {
 }
 
-mos6566_device::mos6566_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant)
-	: device_t(mconfig, type, name, tag, owner, clock),
+mos6566_device::mos6566_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
+	: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
 		device_memory_interface(mconfig, *this),
 		device_execute_interface(mconfig, *this),
 		m_icount(0),
@@ -613,28 +613,28 @@ mos6566_device::mos6566_device(const machine_config &mconfig, device_type type,
 }
 
 mos6567_device::mos6567_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	:mos6566_device(mconfig, MOS6567, "MOS6567", tag, owner, clock, TYPE_6567) { }
+	:mos6566_device(mconfig, MOS6567, "MOS6567", tag, owner, clock, TYPE_6567, "mos6567", __FILE__) { }
 
-mos6567_device::mos6567_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant)
-	:mos6566_device(mconfig, type, name, tag, owner, clock, TYPE_6567) { }
+mos6567_device::mos6567_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
+	:mos6566_device(mconfig, type, name, tag, owner, clock, variant, shortname, source) { }
 
 mos8562_device::mos8562_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	:mos6567_device(mconfig, MOS8562, "MOS8562", tag, owner, clock, TYPE_8562) { }
+	:mos6567_device(mconfig, MOS8562, "MOS8562", tag, owner, clock, TYPE_8562, "mos8562", __FILE__) { }
 
 mos8564_device::mos8564_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	:mos6567_device(mconfig, MOS8564, "MOS8564", tag, owner, clock, TYPE_8564) { }
+	:mos6567_device(mconfig, MOS8564, "MOS8564", tag, owner, clock, TYPE_8564, "mos8564", __FILE__) { }
 
 mos6569_device::mos6569_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	:mos6566_device(mconfig, MOS6566, "MOS6569", tag, owner, clock, TYPE_6569) { }
+	:mos6566_device(mconfig, MOS6566, "MOS6569", tag, owner, clock, TYPE_6569, "mos6569", __FILE__) { }
 
-mos6569_device::mos6569_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant)
-	:mos6566_device(mconfig, type, name, tag, owner, clock, TYPE_6569) { }
+mos6569_device::mos6569_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source)
+	:mos6566_device(mconfig, type, name, tag, owner, clock, variant, shortname, source) { }
 
 mos8565_device::mos8565_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	:mos6569_device(mconfig, MOS8565, "MOS8565", tag, owner, clock, TYPE_8565) { }
+	:mos6569_device(mconfig, MOS8565, "MOS8565", tag, owner, clock, TYPE_8565, "mos8565", __FILE__) { }
 
 mos8566_device::mos8566_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	:mos6569_device(mconfig, MOS8566, "MOS8566", tag, owner, clock, TYPE_8566) { }
+	:mos6569_device(mconfig, MOS8566, "MOS8566", tag, owner, clock, TYPE_8566, "mos8566", __FILE__) { }
 
 
 //-------------------------------------------------
diff --git a/src/mess/video/mos6566.h b/src/mess/video/mos6566.h
index c1cb80d866b..713ee68c8af 100644
--- a/src/mess/video/mos6566.h
+++ b/src/mess/video/mos6566.h
@@ -273,7 +273,7 @@ class mos6566_device :  public device_t,
 {
 public:
 	// construction/destruction
-	mos6566_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant);
+	mos6566_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
 	mos6566_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
 
 	template<class _irq, class _k> void set_callbacks(const char *screen_tag, const char *cpu_tag, _irq irq, _k k) {
@@ -441,7 +441,7 @@ class mos6567_device :  public mos6566_device
 public:
 	// construction/destruction
 	mos6567_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	mos6567_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant);
+	mos6567_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
 };
 
 
@@ -472,7 +472,7 @@ class mos6569_device :  public mos6566_device
 public:
 	// construction/destruction
 	mos6569_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-	mos6569_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant);
+	mos6569_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source);
 
 	// device-level overrides
 	virtual void execute_run();
diff --git a/src/mess/video/newport.c b/src/mess/video/newport.c
index 210d6406f8f..13cb0196758 100644
--- a/src/mess/video/newport.c
+++ b/src/mess/video/newport.c
@@ -80,7 +80,7 @@ const device_type NEWPORT_VIDEO = &device_creator<newport_video_device>;
 
 
 newport_video_device::newport_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-				: device_t(mconfig, NEWPORT_VIDEO, "SGI Newport graphics board", tag, owner, clock)
+				: device_t(mconfig, NEWPORT_VIDEO, "SGI Newport graphics board", tag, owner, clock, "newport_video", __FILE__)
 {
 }
 
diff --git a/src/mess/video/s3virge.c b/src/mess/video/s3virge.c
index ac695c16566..a3fcc06f920 100644
--- a/src/mess/video/s3virge.c
+++ b/src/mess/video/s3virge.c
@@ -17,7 +17,7 @@
 const device_type S3VIRGE = &device_creator<s3virge_vga_device>;
 
 s3virge_vga_device::s3virge_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: s3_vga_device(mconfig, S3VIRGE, "S3VIRGE", tag, owner, clock)
+	: s3_vga_device(mconfig, S3VIRGE, "S3VIRGE", tag, owner, clock, "s3virge_vga", __FILE__)
 {
 }
 
diff --git a/src/mess/video/t6a04.c b/src/mess/video/t6a04.c
index 145b062bd4c..b6b78535162 100644
--- a/src/mess/video/t6a04.c
+++ b/src/mess/video/t6a04.c
@@ -57,7 +57,7 @@ void t6a04_device::device_validity_check(validity_checker &valid) const
 //-------------------------------------------------
 
 t6a04_device::t6a04_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-	device_t(mconfig, T6A04, "T6A04", tag, owner, clock)
+	device_t(mconfig, T6A04, "T6A04", tag, owner, clock, "t6a04", __FILE__)
 {
 }
 
diff --git a/src/mess/video/uv201.c b/src/mess/video/uv201.c
index ceef753738b..f46bd240f51 100644
--- a/src/mess/video/uv201.c
+++ b/src/mess/video/uv201.c
@@ -98,7 +98,7 @@ const device_type UV201 = &device_creator<uv201_device>;
 //-------------------------------------------------
 
 uv201_device::uv201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, UV201, "UV201", tag, owner, clock)
+	: device_t(mconfig, UV201, "UV201", tag, owner, clock, "uv201", __FILE__)
 {
 }
 
diff --git a/src/mess/video/vic4567.c b/src/mess/video/vic4567.c
index 88262ed9d41..35ef8b4d019 100644
--- a/src/mess/video/vic4567.c
+++ b/src/mess/video/vic4567.c
@@ -143,7 +143,7 @@
 const device_type VIC3 = &device_creator<vic3_device>;
 
 vic3_device::vic3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-			: device_t(mconfig, VIC3, "4567 VIC III", tag, owner, clock)
+			: device_t(mconfig, VIC3, "4567 VIC III", tag, owner, clock, "vic3", __FILE__)
 {
 }
 
diff --git a/src/mess/video/vtvideo.c b/src/mess/video/vtvideo.c
index cf20bdc7052..cc52a033359 100644
--- a/src/mess/video/vtvideo.c
+++ b/src/mess/video/vtvideo.c
@@ -26,20 +26,20 @@ const device_type VT100_VIDEO = &device_creator<vt100_video_device>;
 const device_type RAINBOW_VIDEO = &device_creator<rainbow_video_device>;
 
 
-vt100_video_device::vt100_video_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock)
-					: device_t(mconfig, type, name, tag, owner, clock)
+vt100_video_device::vt100_video_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)
+					: device_t(mconfig, type, name, tag, owner, clock, shortname, source)
 {
 }
 
 
 vt100_video_device::vt100_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-					: device_t(mconfig, VT100_VIDEO, "VT100 Video", tag, owner, clock)
+					: device_t(mconfig, VT100_VIDEO, "VT100 Video", tag, owner, clock, "vt100_video", __FILE__)
 {
 }
 
 
 rainbow_video_device::rainbow_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-					: vt100_video_device(mconfig, RAINBOW_VIDEO, "Rainbow Video", tag, owner, clock)
+					: vt100_video_device(mconfig, RAINBOW_VIDEO, "Rainbow Video", tag, owner, clock, "rainbow_video", __FILE__)
 {
 }
 
diff --git a/src/mess/video/vtvideo.h b/src/mess/video/vtvideo.h
index 956a84d175b..678697a2074 100644
--- a/src/mess/video/vtvideo.h
+++ b/src/mess/video/vtvideo.h
@@ -30,7 +30,7 @@ class vt100_video_device : public device_t,
 							public vt_video_interface
 {
 public:
-	vt100_video_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
+	vt100_video_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
 	vt100_video_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
 	~vt100_video_device() {}
 
diff --git a/src/mess/video/zx8301.c b/src/mess/video/zx8301.c
index 7cd0d24b852..f8075eb6d32 100644
--- a/src/mess/video/zx8301.c
+++ b/src/mess/video/zx8301.c
@@ -127,7 +127,7 @@ inline void zx8301_device::writebyte(offs_t address, UINT8 data)
 //-------------------------------------------------
 
 zx8301_device::zx8301_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, ZX8301, "Sinclair ZX8301", tag, owner, clock),
+	: device_t(mconfig, ZX8301, "Sinclair ZX8301", tag, owner, clock, "zx8301", __FILE__),
 		device_memory_interface(mconfig, *this),
 		m_space_config("videoram", ENDIANNESS_LITTLE, 8, 17, 0, NULL, *ADDRESS_MAP_NAME(zx8301)),
 		m_dispoff(1),