diff --git a/src/emu/machine/6526cia.c b/src/emu/machine/6526cia.c
index c27c5387553..c1974adade7 100644
--- a/src/emu/machine/6526cia.c
+++ b/src/emu/machine/6526cia.c
@@ -97,7 +97,7 @@ legacy_mos6526r2_device::legacy_mos6526r2_device(const machine_config &mconfig,
 	: legacy_mos6526_device(mconfig, LEGACY_MOS6526R2, "LEGACY_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_mos8520", __FILE__) { }
+	: legacy_mos6526_device(mconfig, LEGACY_MOS8520, "8520 CIA", 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_mos5710", __FILE__) { }
diff --git a/src/emu/machine/8042kbdc.c b/src/emu/machine/8042kbdc.c
index 0d4662bd096..00b0e527d73 100644
--- a/src/emu/machine/8042kbdc.c
+++ b/src/emu/machine/8042kbdc.c
@@ -195,7 +195,7 @@ const device_type KBDC8042 = &device_creator<kbdc8042_device>;
 //-------------------------------------------------
 
 kbdc8042_device::kbdc8042_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, KBDC8042, "Keyboard Controller 8042", tag, owner, clock, "kbdc8042", __FILE__)
+	: device_t(mconfig, KBDC8042, "8042 Keyboard Controller", tag, owner, clock, "kbdc8042", __FILE__)
 	, m_keyboard_dev(*this, "at_keyboard")
 	, m_system_reset_cb(*this)
 	, m_gate_a20_cb(*this)
diff --git a/src/emu/machine/8257dma.c b/src/emu/machine/8257dma.c
index 784d2cfde8d..eb006d8a64e 100644
--- a/src/emu/machine/8257dma.c
+++ b/src/emu/machine/8257dma.c
@@ -59,7 +59,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, "i8257", __FILE__),
+	: device_t(mconfig, I8257, "8257 DMA", tag, owner, clock, "i8257", __FILE__),
 		m_out_hrq_cb(*this),
 		m_out_tc_cb(*this),
 		m_out_mark_cb(*this),
diff --git a/src/emu/machine/cr589.c b/src/emu/machine/cr589.c
index 0a7f8e4b4c9..59dc475137c 100644
--- a/src/emu/machine/cr589.c
+++ b/src/emu/machine/cr589.c
@@ -138,7 +138,7 @@ void matsushita_cr589_device::WriteData( UINT8 *data, int dataLength )
 const device_type CR589 = &device_creator<matsushita_cr589_device>;
 
 matsushita_cr589_device::matsushita_cr589_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-	atapi_cdrom_device(mconfig, CR589, "Matsushita CR589", tag, owner, clock, "cr589", __FILE__),
+	atapi_cdrom_device(mconfig, CR589, "Matsushita CR589 CD-ROM Drive", tag, owner, clock, "cr589", __FILE__),
 	device_nvram_interface(mconfig, *this)
 {
 }
diff --git a/src/emu/machine/mb14241.c b/src/emu/machine/mb14241.c
index 6f4187c74b1..6e7872281b5 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, "mb14241", __FILE__)
+	: device_t(mconfig, MB14241, "MB14241 Data Shifter", tag, owner, clock, "mb14241", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/mb3773.c b/src/emu/machine/mb3773.c
index a22e3386868..902b121e16d 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, "mb3773", __FILE__)
+	: device_t(mconfig, MB3773, "MB3773 Power Supply Monitor", tag, owner, clock, "mb3773", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/mb87078.c b/src/emu/machine/mb87078.c
index 5552e44e245..3e955380c94 100644
--- a/src/emu/machine/mb87078.c
+++ b/src/emu/machine/mb87078.c
@@ -103,7 +103,7 @@ static const int mb87078_gain_percent[66] = {
 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, "mb87078", __FILE__),
+	: device_t(mconfig, MB87078, "MB87078 Volume Controller", tag, owner, clock, "mb87078", __FILE__),
 	m_channel_latch(0),
 	m_reset_comp(0),
 	m_gain_changed_cb(*this)
diff --git a/src/emu/machine/mb89371.c b/src/emu/machine/mb89371.c
index 7da9ef30f3e..7bc83755946 100644
--- a/src/emu/machine/mb89371.c
+++ b/src/emu/machine/mb89371.c
@@ -13,7 +13,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, "mb89371", __FILE__)
+	: device_t(mconfig, MB89371, "MB89371 Dual Serial UART", tag, owner, clock, "mb89371", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/rp5h01.c b/src/emu/machine/rp5h01.c
index 64b56ef6644..5131de0cb42 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, "rp5h01", __FILE__)
+	: device_t(mconfig, RP5H01, "RP5H01 6/7-bit Counter", tag, owner, clock, "rp5h01", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/rtc4543.c b/src/emu/machine/rtc4543.c
index ab6fb21555c..78b2b7fd9d7 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, "rtc4543", __FILE__),
+	: device_t(mconfig, RTC4543, "R4543 RTC", tag, owner, clock, "rtc4543", __FILE__),
 		device_rtc_interface(mconfig, *this),
 		data_cb(*this)
 {
diff --git a/src/emu/machine/rtc65271.c b/src/emu/machine/rtc65271.c
index 0a5de8d09e6..fee26078023 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, "rtc65271", __FILE__),
+	: device_t(mconfig, RTC65271, "RTC-65271", tag, owner, clock, "rtc65271", __FILE__),
 		device_nvram_interface(mconfig, *this),
 		m_interrupt_cb(*this)
 {
diff --git a/src/emu/machine/tc009xlvc.c b/src/emu/machine/tc009xlvc.c
index 0a2c520f170..937332ea703 100644
--- a/src/emu/machine/tc009xlvc.c
+++ b/src/emu/machine/tc009xlvc.c
@@ -165,7 +165,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, "tc0091lvc", __FILE__),
+	: device_t(mconfig, TC0091LVC, "TC0091LVC (Custom Z80 CPU + Video)", 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)),
 		m_gfxdecode(*this),
diff --git a/src/emu/machine/timekpr.c b/src/emu/machine/timekpr.c
index 27641a42a83..91b019caa5d 100644
--- a/src/emu/machine/timekpr.c
+++ b/src/emu/machine/timekpr.c
@@ -124,7 +124,7 @@ timekeeper_device::timekeeper_device(const machine_config &mconfig, device_type
 }
 
 m48t02_device::m48t02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: timekeeper_device(mconfig, M48T02, "M48T02 TIMEKEEPER", tag, owner, clock, "m48t02", __FILE__)
+	: timekeeper_device(mconfig, M48T02, "M48T02 Timekeeper", 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 TIMEKEEPER", tag, owner, clock, "m48t35", __FILE__)
+	: timekeeper_device(mconfig, M48T35, "M48T35 Timekeeper", 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 TIMEKEEPER", tag, owner, clock, "m48t37", __FILE__)
+	: timekeeper_device(mconfig, M48T37, "M48T37 Timekeeper", 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 TIMEKEEPER", tag, owner, clock, "m48t58", __FILE__)
+	: timekeeper_device(mconfig, M48T58, "M48T58 Timekeeper", 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 TIMEKEEPER", tag, owner, clock, "m48t08", __FILE__)
+	: timekeeper_device(mconfig, MK48T08, "MK48T08 Timekeeper", tag, owner, clock, "m48t08", __FILE__)
 {
 	m_offset_control = 0x1ff8;
 	m_offset_seconds = 0x1ff9;
diff --git a/src/emu/machine/tms6100.c b/src/emu/machine/tms6100.c
index fa32e7d7d7f..8f414deb392 100644
--- a/src/emu/machine/tms6100.c
+++ b/src/emu/machine/tms6100.c
@@ -89,7 +89,7 @@ tms6100_device::tms6100_device(const machine_config &mconfig, const char *tag, d
 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, "m58819", __FILE__)
+	: tms6100_device(mconfig, M58819, "M58819 Memory Controller", tag, owner, clock, "m58819", __FILE__)
 {
 }
 
diff --git a/src/emu/machine/upd1990a.c b/src/emu/machine/upd1990a.c
index 0f3145f1f3b..1b251ad4fed 100644
--- a/src/emu/machine/upd1990a.c
+++ b/src/emu/machine/upd1990a.c
@@ -66,7 +66,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, "upd4990a", __FILE__) { }
+	: upd1990a_device(mconfig, UPD4990A, "uPD4990A RTC", tag, owner, clock, TYPE_4990A, "upd4990a", __FILE__) { }
 
 
 bool upd1990a_device::is_serial_mode()
diff --git a/src/emu/machine/upd4701.c b/src/emu/machine/upd4701.c
index 4f1654ecbeb..7cbe7204050 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, "upd4701", __FILE__)
+	: device_t(mconfig, UPD4701, "uPD4701 Encoder", tag, owner, clock, "upd4701", __FILE__)
 {
 }
 
diff --git a/src/emu/video/315_5124.c b/src/emu/video/315_5124.c
index 4a22afd4e6f..2cfb39b89dc 100644
--- a/src/emu/video/315_5124.c
+++ b/src/emu/video/315_5124.c
@@ -152,7 +152,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, "sega315_5124", __FILE__)
+	: device_t( mconfig, SEGA315_5124, "Sega 315-5124 VDP", tag, owner, clock, "sega315_5124", __FILE__)
 	, device_memory_interface(mconfig, *this)
 	, device_video_interface(mconfig, *this)
 	, m_cram_size( SEGA315_5124_CRAM_SIZE )
@@ -184,7 +184,7 @@ 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_5246", __FILE__)
+	: sega315_5124_device( mconfig, SEGA315_5246, "Sega 315-5246 VDP", tag, owner, clock, SEGA315_5124_CRAM_SIZE, 0, true, "sega315_5246", __FILE__)
 {
 }
 
diff --git a/src/emu/video/epic12.c b/src/emu/video/epic12.c
index b9a4bd2d75d..d64d5d8d005 100644
--- a/src/emu/video/epic12.c
+++ b/src/emu/video/epic12.c
@@ -8,7 +8,7 @@
 const device_type EPIC12 = &device_creator<epic12_device>;
 
 epic12_device::epic12_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, EPIC12, "EP1C12 BLITTER", tag, owner, clock, "epic12", __FILE__),
+	: device_t(mconfig, EPIC12, "EP1C12 Blitter", tag, owner, clock, "epic12", __FILE__),
 		device_video_interface(mconfig, *this)
 {
 	m_is_unsafe = 0;
diff --git a/src/emu/video/mb90082.c b/src/emu/video/mb90082.c
index 56f0b793431..523171a975c 100644
--- a/src/emu/video/mb90082.c
+++ b/src/emu/video/mb90082.c
@@ -86,7 +86,7 @@ inline void mb90082_device::write_word(offs_t address, UINT16 data)
 //-------------------------------------------------
 
 mb90082_device::mb90082_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MB90082, "mb90082", tag, owner, clock, "mb90082", __FILE__),
+	: device_t(mconfig, MB90082, "MB90082 OSD", tag, owner, clock, "mb90082", __FILE__),
 		device_memory_interface(mconfig, *this),
 		m_space_config("videoram", ENDIANNESS_LITTLE, 16, 16, 0, NULL, *ADDRESS_MAP_NAME(mb90082_vram))
 {
diff --git a/src/emu/video/pc_vga.c b/src/emu/video/pc_vga.c
index b61637b13ec..4aaa4648e37 100644
--- a/src/emu/video/pc_vga.c
+++ b/src/emu/video/pc_vga.c
@@ -184,7 +184,7 @@ cirrus_vga_device::cirrus_vga_device(const machine_config &mconfig, const char *
 }
 
 ibm8514a_device::ibm8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, IBM8514A, "IBM8514A", tag, owner, clock, "ibm8514a", __FILE__)
+	: device_t(mconfig, IBM8514A, "IBM8514A Video", tag, owner, clock, "ibm8514a", __FILE__)
 {
 }
 
diff --git a/src/emu/video/psx.c b/src/emu/video/psx.c
index 54b81137941..1c012c86b86 100644
--- a/src/emu/video/psx.c
+++ b/src/emu/video/psx.c
@@ -52,17 +52,17 @@ 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, "cxd8514q", __FILE__)
+	: psxgpu_device(mconfig, CXD8514Q, "CXD8514Q GPU", 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, "cxd8538q", __FILE__)
+	: psxgpu_device(mconfig, CXD8538Q, "CXD8538Q GPU", 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, "cxd8561q", __FILE__)
+	: psxgpu_device(mconfig, CXD8561Q, "CXD8561Q GPU", tag, owner, clock, "cxd8561q", __FILE__)
 {
 }
 
@@ -72,12 +72,12 @@ cxd8561bq_device::cxd8561bq_device(const machine_config &mconfig, const char *ta
 }
 
 cxd8561cq_device::cxd8561cq_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: psxgpu_device(mconfig, CXD8561CQ, "CXD8561CQ", tag, owner, clock, "cxd8561cq", __FILE__)
+	: psxgpu_device(mconfig, CXD8561CQ, "CXD8561CQ GPU", 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, "cxd8654q", __FILE__)
+	: psxgpu_device(mconfig, CXD8654Q, "CXD8654Q GPU", tag, owner, clock, "cxd8654q", __FILE__)
 {
 }
 
diff --git a/src/emu/video/saa5050.c b/src/emu/video/saa5050.c
index fa3aa3605cd..421c637fa0a 100644
--- a/src/emu/video/saa5050.c
+++ b/src/emu/video/saa5050.c
@@ -184,7 +184,7 @@ saa5050_device::saa5050_device(const machine_config &mconfig, device_type type,
 }
 
 saa5050_device::saa5050_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
-	device_t(mconfig, SAA5050, "SAA5050 video", tag, owner, clock, "saa5050", __FILE__),
+	device_t(mconfig, SAA5050, "SAA5050 Video", tag, owner, clock, "saa5050", __FILE__),
 	m_char_rom(*this, "chargen"),
 	m_read_d(*this),
 	m_frame_count(0),
diff --git a/src/emu/video/tlc34076.c b/src/emu/video/tlc34076.c
index 5d8dcf7bf64..cf5ee62ef9f 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, "tlc34076", __FILE__),
+	:   device_t(mconfig, TLC34076, "TLC34076 VIP", tag, owner, clock, "tlc34076", __FILE__),
 		m_dacbits(6)
 {
 }
diff --git a/src/mame/audio/cclimber.c b/src/mame/audio/cclimber.c
index 42f080033b9..8b5f23700e5 100644
--- a/src/mame/audio/cclimber.c
+++ b/src/mame/audio/cclimber.c
@@ -60,7 +60,7 @@ const device_type CCLIMBER_AUDIO = &device_creator<cclimber_audio_device>;
 //-------------------------------------------------
 
 cclimber_audio_device::cclimber_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, CCLIMBER_AUDIO, "cclimber Sound Board", tag, owner, clock, "cclimber_audio", __FILE__),
+	: device_t(mconfig, CCLIMBER_AUDIO, "Crazy Climber Sound Board", tag, owner, clock, "cclimber_audio", __FILE__),
 	m_sample_num(0),
 	m_sample_freq(0),
 	m_sample_volume(0),
diff --git a/src/mame/audio/cps3.c b/src/mame/audio/cps3.c
index b8c6a1b47c9..a2d12c3c034 100644
--- a/src/mame/audio/cps3.c
+++ b/src/mame/audio/cps3.c
@@ -21,7 +21,7 @@ const device_type CPS3 = &device_creator<cps3_sound_device>;
 //-------------------------------------------------
 
 cps3_sound_device::cps3_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, CPS3, "CPS3 Custom", tag, owner, clock, "cps3_custom", __FILE__),
+	: device_t(mconfig, CPS3, "CPS3 Audio Custom", tag, owner, clock, "cps3_custom", __FILE__),
 		device_sound_interface(mconfig, *this),
 		m_stream(NULL),
 		m_key(0),
diff --git a/src/mame/audio/flower.c b/src/mame/audio/flower.c
index c09f11f9c5c..275f8e3828d 100644
--- a/src/mame/audio/flower.c
+++ b/src/mame/audio/flower.c
@@ -22,7 +22,7 @@ TODO:
 const device_type FLOWER = &device_creator<flower_sound_device>;
 
 flower_sound_device::flower_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, FLOWER, "Flower Custom Sound", tag, owner, clock, "flower_sound", __FILE__),
+	: device_t(mconfig, FLOWER, "Flower Audio Custom", tag, owner, clock, "flower_sound", __FILE__),
 		device_sound_interface(mconfig, *this)
 {
 }
diff --git a/src/mame/audio/galaxian.c b/src/mame/audio/galaxian.c
index 23169c1dfe6..997eb0c5fae 100644
--- a/src/mame/audio/galaxian.c
+++ b/src/mame/audio/galaxian.c
@@ -388,7 +388,7 @@ DISCRETE_SOUND_END
 const device_type GALAXIAN = &device_creator<galaxian_sound_device>;
 
 galaxian_sound_device::galaxian_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, GALAXIAN, "Galaxian Custom", tag, owner, clock, "galaxian_sound", __FILE__),
+	: device_t(mconfig, GALAXIAN, "Galaxian Audio Custom", tag, owner, clock, "galaxian_sound", __FILE__),
 		device_sound_interface(mconfig, *this),
 		m_lfo_val(0)
 {
diff --git a/src/mame/audio/geebee.c b/src/mame/audio/geebee.c
index 6087308292a..9dda7f678d3 100644
--- a/src/mame/audio/geebee.c
+++ b/src/mame/audio/geebee.c
@@ -14,7 +14,7 @@
 const device_type GEEBEE = &device_creator<geebee_sound_device>;
 
 geebee_sound_device::geebee_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, GEEBEE, "Gee Bee Custom", tag, owner, clock, "geebee_sound", __FILE__),
+	: device_t(mconfig, GEEBEE, "Gee Bee Audio Custom", tag, owner, clock, "geebee_sound", __FILE__),
 		device_sound_interface(mconfig, *this),
 		m_decay(NULL),
 		m_channel(NULL),
diff --git a/src/mame/audio/gomoku.c b/src/mame/audio/gomoku.c
index 22cf2dd819b..8a7338fa69f 100644
--- a/src/mame/audio/gomoku.c
+++ b/src/mame/audio/gomoku.c
@@ -26,7 +26,7 @@ const device_type GOMOKU = &device_creator<gomoku_sound_device>;
 //-------------------------------------------------
 
 gomoku_sound_device::gomoku_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, GOMOKU, "Gomoku Custom", tag, owner, clock, "gomoku_sound", __FILE__),
+	: device_t(mconfig, GOMOKU, "Gomoku Narabe Renju Audio Custom", tag, owner, clock, "gomoku_sound", __FILE__),
 		device_sound_interface(mconfig, *this),
 		m_last_channel(NULL),
 		m_sound_rom(NULL),
diff --git a/src/mame/audio/gridlee.c b/src/mame/audio/gridlee.c
index 859dec6f6c8..e91a0e38758 100644
--- a/src/mame/audio/gridlee.c
+++ b/src/mame/audio/gridlee.c
@@ -23,7 +23,7 @@ const device_type GRIDLEE = &device_creator<gridlee_sound_device>;
 //-------------------------------------------------
 
 gridlee_sound_device::gridlee_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, GRIDLEE, "Gridlee Custom", tag, owner, clock, "gridlee_sound", __FILE__),
+	: device_t(mconfig, GRIDLEE, "Gridlee Audio Custom", tag, owner, clock, "gridlee_sound", __FILE__),
 		device_sound_interface(mconfig, *this),
 		m_tone_step(0),
 		m_tone_fraction(0),
diff --git a/src/mame/audio/m72.c b/src/mame/audio/m72.c
index 110c1904593..701b1d04277 100644
--- a/src/mame/audio/m72.c
+++ b/src/mame/audio/m72.c
@@ -47,7 +47,7 @@ Shisensho II                            1993  Rev 3.34 M81  Yes
 const device_type M72 = &device_creator<m72_audio_device>;
 
 m72_audio_device::m72_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, M72, "M72 Custom", tag, owner, clock, "m72_audio", __FILE__),
+	: device_t(mconfig, M72, "Irem M72 Audio Custom", tag, owner, clock, "m72_audio", __FILE__),
 		device_sound_interface(mconfig, *this),
 		m_irqvector(0),
 		m_sample_addr(0),
diff --git a/src/mame/audio/micro3d.c b/src/mame/audio/micro3d.c
index c4dbb3fd7c8..63a1979ebad 100644
--- a/src/mame/audio/micro3d.c
+++ b/src/mame/audio/micro3d.c
@@ -166,7 +166,7 @@ void micro3d_sound_device::noise_sh_w(UINT8 data)
 const device_type MICRO3D = &device_creator<micro3d_sound_device>;
 
 micro3d_sound_device::micro3d_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MICRO3D, "Microprose Custom", tag, owner, clock, "micro3d_sound", __FILE__),
+	: device_t(mconfig, MICRO3D, "Microprose Audio Custom", tag, owner, clock, "micro3d_sound", __FILE__),
 		device_sound_interface(mconfig, *this),
 		m_vcf(0),
 		m_vcq(0),
diff --git a/src/mame/audio/phoenix.c b/src/mame/audio/phoenix.c
index a4b63275d98..e160f8c3910 100644
--- a/src/mame/audio/phoenix.c
+++ b/src/mame/audio/phoenix.c
@@ -52,7 +52,7 @@
 const device_type PHOENIX = &device_creator<phoenix_sound_device>;
 
 phoenix_sound_device::phoenix_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, PHOENIX, "Phoenix Custom", tag, owner, clock, "phoenix_sound", __FILE__),
+	: device_t(mconfig, PHOENIX, "Phoenix Audio Custom", tag, owner, clock, "phoenix_sound", __FILE__),
 		device_sound_interface(mconfig, *this)
 {
 }
diff --git a/src/mame/audio/pleiads.c b/src/mame/audio/pleiads.c
index 5ddb1a2d6f7..eefccc8fd2a 100644
--- a/src/mame/audio/pleiads.c
+++ b/src/mame/audio/pleiads.c
@@ -22,7 +22,7 @@
 const device_type PLEIADS = &device_creator<pleiads_sound_device>;
 
 pleiads_sound_device::pleiads_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, PLEIADS, "Pleiads Custom", tag, owner, clock, "pleiads_sound", __FILE__),
+	: device_t(mconfig, PLEIADS, "Pleiads Audio Custom", tag, owner, clock, "pleiads_sound", __FILE__),
 		device_sound_interface(mconfig, *this)
 {
 }
@@ -121,7 +121,7 @@ void pleiads_sound_device::device_start()
 const device_type NAUGHTYB = &device_creator<naughtyb_sound_device>;
 
 naughtyb_sound_device::naughtyb_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: pleiads_sound_device(mconfig, NAUGHTYB, "Naughty Boy Custom", tag, owner, clock, "naughtyb_sound", __FILE__)
+	: pleiads_sound_device(mconfig, NAUGHTYB, "Naughty Boy Audio Custom", tag, owner, clock, "naughtyb_sound", __FILE__)
 {
 }
 
@@ -199,7 +199,7 @@ void naughtyb_sound_device::device_start()
 const device_type POPFLAME = &device_creator<popflame_sound_device>;
 
 popflame_sound_device::popflame_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: pleiads_sound_device(mconfig, POPFLAME, "Pop Flamer Custom", tag, owner, clock, "popflame_sound", __FILE__)
+	: pleiads_sound_device(mconfig, POPFLAME, "Pop Flamer Audio Custom", tag, owner, clock, "popflame_sound", __FILE__)
 {
 }
 
diff --git a/src/mame/audio/polepos.c b/src/mame/audio/polepos.c
index 9e8decdc645..3b97a06e5cb 100644
--- a/src/mame/audio/polepos.c
+++ b/src/mame/audio/polepos.c
@@ -50,7 +50,7 @@ const device_type POLEPOS = &device_creator<polepos_sound_device>;
 //-------------------------------------------------
 
 polepos_sound_device::polepos_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, POLEPOS, "Pole Position Custom", tag, owner, clock, "polepos_sound", __FILE__),
+	: device_t(mconfig, POLEPOS, "Pole Position Audio Custom", tag, owner, clock, "polepos_sound", __FILE__),
 		device_sound_interface(mconfig, *this),
 		m_current_position(0),
 		m_sample_msb(0),
diff --git a/src/mame/audio/redbaron.c b/src/mame/audio/redbaron.c
index 0a1b6c66282..09682515160 100644
--- a/src/mame/audio/redbaron.c
+++ b/src/mame/audio/redbaron.c
@@ -34,7 +34,7 @@ const device_type REDBARON = &device_creator<redbaron_sound_device>;
 //-------------------------------------------------
 
 redbaron_sound_device::redbaron_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, REDBARON, "Red Baron Custom", tag, owner, clock, "redbaron_custom", __FILE__),
+	: device_t(mconfig, REDBARON, "Red Baron Audio Custom", tag, owner, clock, "redbaron_custom", __FILE__),
 		device_sound_interface(mconfig, *this),
 		m_vol_lookup(NULL),
 		m_channel(NULL),
diff --git a/src/mame/audio/segag80r.c b/src/mame/audio/segag80r.c
index 9cc65bbd33a..6efbf89d914 100644
--- a/src/mame/audio/segag80r.c
+++ b/src/mame/audio/segag80r.c
@@ -31,7 +31,7 @@
 const device_type SEGA005 = &device_creator<sega005_sound_device>;
 
 sega005_sound_device::sega005_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, SEGA005, "005 Custom", tag, owner, clock, "sega005_sound", __FILE__),
+	: device_t(mconfig, SEGA005, "Sega 005 Audio Custom", tag, owner, clock, "sega005_sound", __FILE__),
 		device_sound_interface(mconfig, *this),
 		m_sega005_sound_timer(NULL),
 		m_sega005_stream(NULL)
diff --git a/src/mame/audio/snk6502.c b/src/mame/audio/snk6502.c
index faf561eafe7..273c36f9f1f 100644
--- a/src/mame/audio/snk6502.c
+++ b/src/mame/audio/snk6502.c
@@ -352,7 +352,7 @@ DISCRETE_SOUND_END
 const device_type SNK6502 = &device_creator<snk6502_sound_device>;
 
 snk6502_sound_device::snk6502_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, SNK6502, "snk6502 Custom", tag, owner, clock, "snk6502_sound", __FILE__),
+	: device_t(mconfig, SNK6502, "SNK6502 Audio Custom", tag, owner, clock, "snk6502_sound", __FILE__),
 		device_sound_interface(mconfig, *this),
 		//m_tone_channels[CHANNELS],
 		m_tone_clock_expire(0),
diff --git a/src/mame/audio/tiamc1.c b/src/mame/audio/tiamc1.c
index 40d1f933bdb..b8958254ccd 100644
--- a/src/mame/audio/tiamc1.c
+++ b/src/mame/audio/tiamc1.c
@@ -56,7 +56,7 @@ const device_type TIAMC1 = &device_creator<tiamc1_sound_device>;
 //-------------------------------------------------
 
 tiamc1_sound_device::tiamc1_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, TIAMC1, "TIA-MC1 Custom", tag, owner, clock, "tiamc1_sound", __FILE__),
+	: device_t(mconfig, TIAMC1, "TIA-MC1 Audio Custom", tag, owner, clock, "tiamc1_sound", __FILE__),
 		device_sound_interface(mconfig, *this),
 		m_channel(NULL),
 		m_timer1_divider(0)
diff --git a/src/mame/audio/tx1.c b/src/mame/audio/tx1.c
index 240fe2a6d71..0de9c28c6e6 100644
--- a/src/mame/audio/tx1.c
+++ b/src/mame/audio/tx1.c
@@ -52,7 +52,7 @@ static const double tx1_engine_gains[16] =
 const device_type TX1 = &device_creator<tx1_sound_device>;
 
 tx1_sound_device::tx1_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, TX1, "TX-1 Custom", tag, owner, clock, "tx1_sound", __FILE__),
+	: device_t(mconfig, TX1, "TX-1 Audio Custom", tag, owner, clock, "tx1_sound", __FILE__),
 		device_sound_interface(mconfig, *this)
 {
 }
@@ -345,7 +345,7 @@ static const double bb_engine_gains[16] =
 const device_type BUGGYBOY = &device_creator<buggyboy_sound_device>;
 
 buggyboy_sound_device::buggyboy_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: tx1_sound_device(mconfig, BUGGYBOY, "Buggy Boy Custom", tag, owner, clock, "buggyboy_sound", __FILE__)
+	: tx1_sound_device(mconfig, BUGGYBOY, "Buggy Boy Audio Custom", tag, owner, clock, "buggyboy_sound", __FILE__)
 {
 }
 
diff --git a/src/mame/audio/warpwarp.c b/src/mame/audio/warpwarp.c
index e9d96a9df72..40daae36915 100644
--- a/src/mame/audio/warpwarp.c
+++ b/src/mame/audio/warpwarp.c
@@ -17,7 +17,7 @@
 const device_type WARPWARP = &device_creator<warpwarp_sound_device>;
 
 warpwarp_sound_device::warpwarp_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, WARPWARP, "Warp Warp Custom", tag, owner, clock, "warpwarp_sound", __FILE__),
+	: device_t(mconfig, WARPWARP, "Warp Warp Audio Custom", tag, owner, clock, "warpwarp_sound", __FILE__),
 		device_sound_interface(mconfig, *this),
 		m_decay(NULL),
 		m_channel(NULL),
diff --git a/src/mame/audio/wiping.c b/src/mame/audio/wiping.c
index 76c0de192f1..1dd37427a32 100644
--- a/src/mame/audio/wiping.c
+++ b/src/mame/audio/wiping.c
@@ -15,7 +15,7 @@ static const int defgain = 48;
 const device_type WIPING = &device_creator<wiping_sound_device>;
 
 wiping_sound_device::wiping_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, WIPING, "Wiping Custom", tag, owner, clock, "wiping_sound", __FILE__),
+	: device_t(mconfig, WIPING, "Wiping Audio Custom", tag, owner, clock, "wiping_sound", __FILE__),
 		device_sound_interface(mconfig, *this),
 	m_last_channel(NULL),
 	m_sound_prom(NULL),
diff --git a/src/mame/drivers/mjkjidai.c b/src/mame/drivers/mjkjidai.c
index edcf3dae819..78c23e5d768 100644
--- a/src/mame/drivers/mjkjidai.c
+++ b/src/mame/drivers/mjkjidai.c
@@ -31,7 +31,7 @@ TODO:
 const device_type MJKJIDAI = &device_creator<mjkjidai_adpcm_device>;
 
 mjkjidai_adpcm_device::mjkjidai_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MJKJIDAI, "Custom ADPCM", tag, owner, clock, "mjkjidai_adpcm", __FILE__),
+	: device_t(mconfig, MJKJIDAI, "Mahjong Kyou Jidai ADPCM Custom", tag, owner, clock, "mjkjidai_adpcm", __FILE__),
 		device_sound_interface(mconfig, *this),
 		m_stream(NULL),
 		m_current(0),
diff --git a/src/mame/drivers/pinkiri8.c b/src/mame/drivers/pinkiri8.c
index aa1d7d25ac2..d1472a513d5 100644
--- a/src/mame/drivers/pinkiri8.c
+++ b/src/mame/drivers/pinkiri8.c
@@ -132,7 +132,7 @@ ADDRESS_MAP_END
 const device_type JANSHIVDP = &device_creator<janshi_vdp_device>;
 
 janshi_vdp_device::janshi_vdp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, JANSHIVDP, "JANSHIVDP", tag, owner, clock, "janshi_vdp", __FILE__),
+	: device_t(mconfig, JANSHIVDP, "Janshi VDP", tag, owner, clock, "janshi_vdp", __FILE__),
 		device_memory_interface(mconfig, *this),
 		m_space_config("janshi_vdp", ENDIANNESS_LITTLE, 8,24, 0, address_map_delegate(FUNC(janshi_vdp_device::map), this))
 {
diff --git a/src/mame/drivers/renegade.c b/src/mame/drivers/renegade.c
index baa5bb594a0..5afb95a224e 100644
--- a/src/mame/drivers/renegade.c
+++ b/src/mame/drivers/renegade.c
@@ -113,7 +113,7 @@ $8000 - $ffff   ROM
 const device_type RENEGADE_ADPCM = &device_creator<renegade_adpcm_device>;
 
 renegade_adpcm_device::renegade_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, RENEGADE_ADPCM, "Renegade Custom ADPCM", tag, owner, clock, "renegade_adpcm", __FILE__),
+	: device_t(mconfig, RENEGADE_ADPCM, "Renegade ADPCM Custom", tag, owner, clock, "renegade_adpcm", __FILE__),
 		device_sound_interface(mconfig, *this),
 		m_stream(NULL),
 		m_current(0),
diff --git a/src/mame/machine/buggychl.c b/src/mame/machine/buggychl.c
index d1ba1f79900..041bf1f44a8 100644
--- a/src/mame/machine/buggychl.c
+++ b/src/mame/machine/buggychl.c
@@ -6,7 +6,7 @@
 const device_type BUGGYCHL_MCU = &device_creator<buggychl_mcu_device>;
 
 buggychl_mcu_device::buggychl_mcu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, BUGGYCHL_MCU, "BuggyChl MCU", tag, owner, clock, "buggychl_mcu", __FILE__),
+	: device_t(mconfig, BUGGYCHL_MCU, "Buggy Challenge MCU Simulation", tag, owner, clock, "buggychl_mcu", __FILE__),
 	m_port_a_in(0),
 	m_port_a_out(0),
 	m_ddr_a(0),
diff --git a/src/mame/machine/gaelco3d.c b/src/mame/machine/gaelco3d.c
index cb69251eea8..fa75cf46c91 100644
--- a/src/mame/machine/gaelco3d.c
+++ b/src/mame/machine/gaelco3d.c
@@ -187,7 +187,7 @@ static void buf_reset(buf_t *buf)
 const device_type GAELCO_SERIAL = &device_creator<gaelco_serial_device>;
 
 gaelco_serial_device::gaelco_serial_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, GAELCO_SERIAL, "gaelco_serial", tag, owner, clock, "gaelco_serial", __FILE__),
+	: device_t(mconfig, GAELCO_SERIAL, "Gaelco 3D Serial Hardware", tag, owner, clock, "gaelco_serial", __FILE__),
 	m_irq_handler(*this),
 	m_status(0),
 	m_last_in_msg_cnt(0),
diff --git a/src/mame/machine/jvs13551.c b/src/mame/machine/jvs13551.c
index fabe1740b52..f5a3e0a87b1 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", __FILE__)
+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 I/O Board", tag, owner, clock, "sega_837_13551", __FILE__)
 {
 	memset(port_tag, 0, sizeof(port_tag));
 }
diff --git a/src/mame/machine/nb1413m3.c b/src/mame/machine/nb1413m3.c
index c64bfae1199..d5a399cad7b 100644
--- a/src/mame/machine/nb1413m3.c
+++ b/src/mame/machine/nb1413m3.c
@@ -22,7 +22,7 @@ Memo:
 const device_type NB1413M3 = &device_creator<nb1413m3_device>;
 
 nb1413m3_device::nb1413m3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, NB1413M3, "Nichibutsu NB1413M3", tag, owner, clock, "nb1413m3", __FILE__),
+	: device_t(mconfig, NB1413M3, "NB1413M3 Mahjong Custom", tag, owner, clock, "nb1413m3", __FILE__),
 	m_sndromrgntag("voice"),
 	m_sndrombank1(0),
 	m_sndrombank2(0),
diff --git a/src/mame/machine/nmk112.c b/src/mame/machine/nmk112.c
index fcb0fbadd2f..859641a7bff 100644
--- a/src/mame/machine/nmk112.c
+++ b/src/mame/machine/nmk112.c
@@ -18,7 +18,7 @@
 const device_type NMK112 = &device_creator<nmk112_device>;
 
 nmk112_device::nmk112_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, NMK112, "NMK 112", tag, owner, clock, "nmk112", __FILE__),
+	: device_t(mconfig, NMK112, "NMK112", tag, owner, clock, "nmk112", __FILE__),
 		m_page_mask(0xff),
 		m_rom0(NULL),
 		m_rom1(NULL),
diff --git a/src/mame/machine/tait8741.c b/src/mame/machine/tait8741.c
index 86428a308ce..7cabdda12df 100644
--- a/src/mame/machine/tait8741.c
+++ b/src/mame/machine/tait8741.c
@@ -34,7 +34,7 @@ gladiatr and Great Swordsman set.
 const device_type TAITO8741_4PACK = &device_creator<taito8741_4pack_device>;
 
 taito8741_4pack_device::taito8741_4pack_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, TAITO8741_4PACK, "Taito 8741 MCU 4 pack", tag, owner, clock, "taito8741_4pack", __FILE__),
+	: device_t(mconfig, TAITO8741_4PACK, "Taito '4Pack' 8741 MCU Simulation", tag, owner, clock, "taito8741_4pack", __FILE__),
 	m_port_handler_0_r(*this),
 	m_port_handler_1_r(*this),
 	m_port_handler_2_r(*this),
@@ -330,7 +330,7 @@ joshi Vollyball set.
 const device_type JOSVOLLY8741_4PACK = &device_creator<josvolly8741_4pack_device>;
 
 josvolly8741_4pack_device::josvolly8741_4pack_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, JOSVOLLY8741_4PACK, "joshi Vollyball 8741 MCU 4 pack", tag, owner, clock, "josvolly8741_4pack", __FILE__),
+	: device_t(mconfig, JOSVOLLY8741_4PACK, "Joshi Volleyball 8741 MCU Simulation", tag, owner, clock, "josvolly8741_4pack", __FILE__),
 	m_port_handler_0_r(*this),
 	m_port_handler_1_r(*this),
 	m_port_handler_2_r(*this),
diff --git a/src/mame/video/decbac06.c b/src/mame/video/decbac06.c
index 62168bbeb83..3ac259a87b4 100644
--- a/src/mame/video/decbac06.c
+++ b/src/mame/video/decbac06.c
@@ -66,7 +66,7 @@ Priority word (Midres):
 const device_type DECO_BAC06 = &device_creator<deco_bac06_device>;
 
 deco_bac06_device::deco_bac06_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, DECO_BAC06, "decbac06_device", tag, owner, clock, "deco_bac06", __FILE__),
+	: device_t(mconfig, DECO_BAC06, "DECO BAC06 Tilemap", tag, owner, clock, "deco_bac06", __FILE__),
 		m_pf_data(NULL),
 		m_pf_rowscroll(NULL),
 		m_pf_colscroll(NULL),
diff --git a/src/mame/video/decmxc06.c b/src/mame/video/decmxc06.c
index 68765e4a5ab..168e304bf94 100644
--- a/src/mame/video/decmxc06.c
+++ b/src/mame/video/decmxc06.c
@@ -48,7 +48,7 @@ void deco_mxc06_device::set_gfx_region(device_t &device, int region)
 const device_type DECO_MXC06 = &device_creator<deco_mxc06_device>;
 
 deco_mxc06_device::deco_mxc06_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, DECO_MXC06, "decmxc06_device", tag, owner, clock, "deco_mxc06", __FILE__),
+	: device_t(mconfig, DECO_MXC06, "DECO MXC06 Sprite", tag, owner, clock, "deco_mxc06", __FILE__),
 		m_gfxregion(0),
 		m_gfxdecode(*this),
 		m_palette(*this)
diff --git a/src/mame/video/decospr.c b/src/mame/video/decospr.c
index 8cd4b1f5b08..19895e83e55 100644
--- a/src/mame/video/decospr.c
+++ b/src/mame/video/decospr.c
@@ -146,7 +146,7 @@ void decospr_device::set_gfx_region(device_t &device, int gfxregion)
 const device_type DECO_SPRITE = &device_creator<decospr_device>;
 
 decospr_device::decospr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, DECO_SPRITE, "decospr_device", tag, owner, clock, "decospr", __FILE__),
+	: device_t(mconfig, DECO_SPRITE, "DECO 52 Sprite", tag, owner, clock, "decospr", __FILE__),
 		device_video_interface(mconfig, *this),
 		m_gfxregion(0),
 		m_is_bootleg(false),
diff --git a/src/mame/video/mcd212.c b/src/mame/video/mcd212.c
index eb052f20a7c..155a3e4cceb 100644
--- a/src/mame/video/mcd212.c
+++ b/src/mame/video/mcd212.c
@@ -1509,7 +1509,7 @@ void mcd212_device::device_reset()
 //-------------------------------------------------
 
 mcd212_device::mcd212_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, MACHINE_MCD212, "MCD212 video", tag, owner, clock, "mcd212", __FILE__),
+	: device_t(mconfig, MACHINE_MCD212, "MCD212 Video", tag, owner, clock, "mcd212", __FILE__),
 		device_video_interface(mconfig, *this)
 {
 }
diff --git a/src/mame/video/seta001.c b/src/mame/video/seta001.c
index 07b5640e4bb..8050bd7b776 100644
--- a/src/mame/video/seta001.c
+++ b/src/mame/video/seta001.c
@@ -30,7 +30,7 @@
 const device_type SETA001_SPRITE = &device_creator<seta001_device>;
 
 seta001_device::seta001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, SETA001_SPRITE, "SETA001 SPRITE", tag, owner, clock, "seta001", __FILE__),
+	: device_t(mconfig, SETA001_SPRITE, "SETA001 Sprite", tag, owner, clock, "seta001", __FILE__),
 		m_gfxdecode(*this),
 		m_palette(*this)
 {
diff --git a/src/mame/video/sknsspr.c b/src/mame/video/sknsspr.c
index 4755124201e..6c87a4ff714 100644
--- a/src/mame/video/sknsspr.c
+++ b/src/mame/video/sknsspr.c
@@ -20,7 +20,7 @@ const device_type SKNS_SPRITE = &device_creator<sknsspr_device>;
 
 
 sknsspr_device::sknsspr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
-	: device_t(mconfig, SKNS_SPRITE, "sknsspr_device", tag, owner, clock, "sknsspr", __FILE__)
+	: device_t(mconfig, SKNS_SPRITE, "SKNS Sprite", tag, owner, clock, "sknsspr", __FILE__)
 {
 }
 
diff --git a/src/mame/video/ygv608.c b/src/mame/video/ygv608.c
index 7766c7f2c09..dddefc0c47d 100644
--- a/src/mame/video/ygv608.c
+++ b/src/mame/video/ygv608.c
@@ -50,7 +50,7 @@
 const device_type YGV608 = &device_creator<ygv608_device>;
 
 ygv608_device::ygv608_device( const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock )
-	: device_t(mconfig, YGV608, "YGV608", tag, owner, clock, "ygv608", __FILE__),
+	: device_t(mconfig, YGV608, "YGV608 VDP", tag, owner, clock, "ygv608", __FILE__),
 	m_gfxdecode(*this),
 	m_palette(*this)
 {
diff --git a/src/mess/audio/arcadia.c b/src/mess/audio/arcadia.c
index cd9555f77af..5023238e9f2 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, "arcadia_sound", __FILE__),
+	: device_t(mconfig, ARCADIA_SOUND, "Arcadia Audio Custom", tag, owner, clock, "arcadia_sound", __FILE__),
 		device_sound_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/audio/dai.c b/src/mess/audio/dai.c
index 5663e57e9c5..3bb161a3984 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, "dai_sound", __FILE__),
+	: device_t(mconfig, DAI_SOUND, "DAI Audio Custom", tag, owner, clock, "dai_sound", __FILE__),
 		device_sound_interface(mconfig, *this)
 {
 }
diff --git a/src/mess/audio/mac.c b/src/mess/audio/mac.c
index e17af486ef1..2268560a635 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, "mac_sound", __FILE__),
+					: device_t(mconfig, MAC_SOUND, "Mac Audio 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/special.c b/src/mess/audio/special.c
index e5b37e5ceb7..e2fabca2451 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, "specimx_sound", __FILE__),
+	: device_t(mconfig, SPECIMX, "Specialist MX Audio 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 da40b99eff1..de7a4984eee 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, "svision_sound", __FILE__),
+	: device_t(mconfig, SVISION, "Super Vision Audio 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 b19dc523f0f..30b491a115b 100644
--- a/src/mess/audio/tvc.c
+++ b/src/mess/audio/tvc.c
@@ -17,7 +17,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, "tvc_sound", __FILE__),
+	device_t(mconfig, TVC_SOUND, "TVC 64 Audio Custom", tag, owner, clock, "tvc_sound", __FILE__),
 	device_sound_interface(mconfig, *this),
 	m_write_sndint(*this)
 {
diff --git a/src/mess/audio/vc4000.c b/src/mess/audio/vc4000.c
index 7228fe09d06..d914930c44e 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, "vc4000_sound", __FILE__),
+	: device_t(mconfig, VC4000, "Intertion Electronic VC 4000 Audio Custom", tag, owner, clock, "vc4000_sound", __FILE__),
 		device_sound_interface(mconfig, *this),
 		m_channel(NULL),
 		m_size(0),
diff --git a/src/mess/audio/wswan.c b/src/mess/audio/wswan.c
index 0b4629d1de3..2d1c143c436 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, "wswan_sound", __FILE__),
+	: device_t(mconfig, WSWAN, "WonderSwan Audio 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/vc4000.c b/src/mess/drivers/vc4000.c
index 00e6a6527b5..36c3bdf5f0e 100644
--- a/src/mess/drivers/vc4000.c
+++ b/src/mess/drivers/vc4000.c
@@ -676,7 +676,7 @@ QUICKLOAD_LOAD_MEMBER( vc4000_state,vc4000)
 
 
 /*   YEAR  NAME      PARENT     COMPAT    MACHINE    INPUT        INIT      COMPANY             FULLNAME */
-CONS(1978, vc4000,   0,         0,        vc4000,    vc4000, driver_device,      0,        "Interton",         "VC 4000",          GAME_IMPERFECT_GRAPHICS )          /* Germany, Austria, UK, Australia */
+CONS(1978, vc4000,   0,         0,        vc4000,    vc4000, driver_device,      0,        "Interton",         "Intertion Electronic VC 4000", GAME_IMPERFECT_GRAPHICS )          /* Germany, Austria, UK, Australia */
 CONS(1979, spc4000,  vc4000,    0,        vc4000,    vc4000, driver_device,      0,        "Grundig",          "Super Play Computer 4000", GAME_IMPERFECT_GRAPHICS )  /* Germany, Austria */
 CONS(1979, cx3000tc, vc4000,    0,        vc4000,    vc4000, driver_device,      0,        "Palson",           "CX 3000 Tele Computer", GAME_IMPERFECT_GRAPHICS )     /* Spain */
 CONS(1979, tvc4000,  vc4000,    0,        vc4000,    vc4000, driver_device,      0,        "Koerting",         "TVC-4000",         GAME_IMPERFECT_GRAPHICS )          /* Argentina */