diff --git a/src/devices/bus/pci/aha2940au.cpp b/src/devices/bus/pci/aha2940au.cpp
index 2ff802e4a30..5fd4f4668c8 100644
--- a/src/devices/bus/pci/aha2940au.cpp
+++ b/src/devices/bus/pci/aha2940au.cpp
@@ -24,7 +24,7 @@ TODO:
 #define LOGWARN(...)            LOGMASKED(LOG_WARN, __VA_ARGS__)
 
 
-DEFINE_DEVICE_TYPE(AHA2940AU, aha2940au_scsi_device,   "aha2940au",   "Adaptec AHA-2940AU PCI SCSI controller card")
+DEFINE_DEVICE_TYPE(AHA2940AU, aha2940au_scsi_device,   "aha2940au",   "Adaptec AHA-2940AU SCSI controller")
 
 
 
diff --git a/src/devices/bus/pci/audiowerk2.cpp b/src/devices/bus/pci/audiowerk2.cpp
index d3a3e546b9d..d6fbfda7445 100644
--- a/src/devices/bus/pci/audiowerk2.cpp
+++ b/src/devices/bus/pci/audiowerk2.cpp
@@ -38,7 +38,7 @@ cfr. https://admin.pci-ids.ucw.cz/read/PC/1131/7146
 #define LOGWARN(...)            LOGMASKED(LOG_WARN, __VA_ARGS__)
 
 
-DEFINE_DEVICE_TYPE(AUDIOWERK2, audiowerk2_device,   "audiowerk2",   "Emagic Audiowerk2 Digital Audio Recording PCI card")
+DEFINE_DEVICE_TYPE(AUDIOWERK2, audiowerk2_device,   "audiowerk2",   "Emagic Audiowerk2 Digital Audio Recording")
 
 
 
diff --git a/src/devices/bus/pci/ess_maestro.cpp b/src/devices/bus/pci/ess_maestro.cpp
index c32a3b03c3c..1bd479d0cf1 100644
--- a/src/devices/bus/pci/ess_maestro.cpp
+++ b/src/devices/bus/pci/ess_maestro.cpp
@@ -29,7 +29,7 @@ ESS Solo-1/Maestro audio PCI cards
 #define LOGWARN(...)            LOGMASKED(LOG_WARN, __VA_ARGS__)
 
 // ES1938 Solo-1
-DEFINE_DEVICE_TYPE(ES1946_SOLO1E, es1946_solo1e_device,   "es1946_solo1e",   "ES1938/ES1946/ES1969 Solo-1 Audiodrive PCI card")
+DEFINE_DEVICE_TYPE(ES1946_SOLO1E, es1946_solo1e_device,   "es1946_solo1e",   "ES1938/ES1946/ES1969 Solo-1 Audiodrive")
 // ES1969 Solo-1
 // ES1948 Maestro-1
 // ES1968 Maestro-2
diff --git a/src/devices/bus/pci/oti_spitfire.cpp b/src/devices/bus/pci/oti_spitfire.cpp
index 9385d94a396..05203acb224 100644
--- a/src/devices/bus/pci/oti_spitfire.cpp
+++ b/src/devices/bus/pci/oti_spitfire.cpp
@@ -25,7 +25,7 @@ TODO:
 
 //OTI-64105
 //OTI-64107
-DEFINE_DEVICE_TYPE(OTI64111_PCI, oti64111_pci_device,   "oti64111_pci",   "OTI-64111 \"Spitfire\" PCI card")
+DEFINE_DEVICE_TYPE(OTI64111_PCI, oti64111_pci_device,   "oti64111_pci",   "OTI-64111 \"Spitfire\"")
 //OTI-64217
 //OTI-64317
 
diff --git a/src/devices/bus/pci/rtl8029as_pci.cpp b/src/devices/bus/pci/rtl8029as_pci.cpp
index 54a4493ae68..6f322d21f0b 100644
--- a/src/devices/bus/pci/rtl8029as_pci.cpp
+++ b/src/devices/bus/pci/rtl8029as_pci.cpp
@@ -28,7 +28,7 @@ TODO:
 #define LOGWARN(...)            LOGMASKED(LOG_WARN, __VA_ARGS__)
 
 
-DEFINE_DEVICE_TYPE(RTL8029AS_PCI, rtl8029as_pci_device,   "rtl8029as_pci",   "Realtek RTL8029AS PCI Full-Duplex Ethernet card")
+DEFINE_DEVICE_TYPE(RTL8029AS_PCI, rtl8029as_pci_device,   "rtl8029as_pci",   "Realtek RTL8029AS Full-Duplex Ethernet")
 
 
 
diff --git a/src/devices/bus/pci/sonicvibes.cpp b/src/devices/bus/pci/sonicvibes.cpp
index 193917c29d6..6b1f0398824 100644
--- a/src/devices/bus/pci/sonicvibes.cpp
+++ b/src/devices/bus/pci/sonicvibes.cpp
@@ -41,7 +41,7 @@ TODO:
 
 
 // Documentation spells "SonicVibes", on-chip markings says "Sonic Vibes" instead
-DEFINE_DEVICE_TYPE(SONICVIBES, sonicvibes_device,   "sonicvibes",   "S3 Sonic Vibes 86C617 PCI card")
+DEFINE_DEVICE_TYPE(SONICVIBES, sonicvibes_device,   "sonicvibes",   "S3 Sonic Vibes 86C617")
 
 
 
diff --git a/src/devices/bus/pci/virge_pci.cpp b/src/devices/bus/pci/virge_pci.cpp
index 93853ed5cfa..b2df4142800 100644
--- a/src/devices/bus/pci/virge_pci.cpp
+++ b/src/devices/bus/pci/virge_pci.cpp
@@ -241,5 +241,5 @@ const tiny_rom_entry *virgedx_pci_device::device_rom_region() const
 	return ROM_NAME( virgedx_pci );
 }
 
-DEFINE_DEVICE_TYPE(VIRGE_PCI, virge_pci_device, "virge_pci", "S3 86C325 ViRGE PCI")
-DEFINE_DEVICE_TYPE(VIRGEDX_PCI, virgedx_pci_device, "virgedx_pci", "S3 86C375 ViRGE/DX PCI")
+DEFINE_DEVICE_TYPE(VIRGE_PCI, virge_pci_device, "virge_pci", "S3 86C325 ViRGE")
+DEFINE_DEVICE_TYPE(VIRGEDX_PCI, virgedx_pci_device, "virgedx_pci", "S3 86C375 ViRGE/DX")
diff --git a/src/devices/bus/pci/zr36057.cpp b/src/devices/bus/pci/zr36057.cpp
index c72dd7cd2c5..a2064613546 100644
--- a/src/devices/bus/pci/zr36057.cpp
+++ b/src/devices/bus/pci/zr36057.cpp
@@ -25,8 +25,8 @@ iterations.
 #define LOGWARN(...)            LOGMASKED(LOG_WARN, __VA_ARGS__)
 
 
-DEFINE_DEVICE_TYPE(ZR36057_PCI, zr36057_device,   "zr36057",   "Zoran ZR36057-based PCI Enhanced Multimedia Controller card")
-//DEFINE_DEVICE_TYPE(ZR36067_PCI, zr36067_device,   "zr36067",   "Zoran ZR36067-based PCI AV Controller card")
+DEFINE_DEVICE_TYPE(ZR36057_PCI, zr36057_device,   "zr36057",   "Zoran ZR36057-based Enhanced Multimedia Controller")
+//DEFINE_DEVICE_TYPE(ZR36067_PCI, zr36067_device,   "zr36067",   "Zoran ZR36067-based AV Controller")
 
 
 zr36057_device::zr36057_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)