diff --git a/src/devices/bus/isa/svga_cirrus.cpp b/src/devices/bus/isa/svga_cirrus.cpp
index 2111b8c6e6b..9cf220bbcf1 100644
--- a/src/devices/bus/isa/svga_cirrus.cpp
+++ b/src/devices/bus/isa/svga_cirrus.cpp
@@ -77,9 +77,9 @@ void isa16_svga_cirrus_device::device_add_mconfig(machine_config &config)
 {
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
 	screen.set_raw(25.175_MHz_XTAL, 800, 0, 640, 524, 0, 480);
-	screen.set_screen_update("vga", FUNC(cirrus_gd5430_device::screen_update));
+	screen.set_screen_update("vga", FUNC(cirrus_gd5430_vga_device::screen_update));
 
-	CIRRUS_GD5430(config, m_vga, 0);
+	CIRRUS_GD5430_VGA(config, m_vga, 0);
 	m_vga->set_screen("screen");
 	m_vga->set_vram_size(0x200000);
 }
@@ -110,7 +110,7 @@ isa16_svga_cirrus_device::isa16_svga_cirrus_device(const machine_config &mconfig
 
 void isa16_svga_cirrus_device::io_isa_map(address_map &map)
 {
-	map(0x00, 0x2f).m(m_vga, FUNC(cirrus_gd5430_device::io_map));
+	map(0x00, 0x2f).m(m_vga, FUNC(cirrus_gd5430_vga_device::io_map));
 }
 
 //-------------------------------------------------
@@ -124,7 +124,7 @@ void isa16_svga_cirrus_device::device_start()
 
 	m_isa->install_rom(this, 0xc0000, 0xc7fff, "dm_clgd5430");
 
-	m_isa->install_memory(0xa0000, 0xbffff, read8sm_delegate(*m_vga, FUNC(cirrus_gd5430_device::mem_r)), write8sm_delegate(*m_vga, FUNC(cirrus_gd5430_device::mem_w)));
+	m_isa->install_memory(0xa0000, 0xbffff, read8sm_delegate(*m_vga, FUNC(cirrus_gd5430_vga_device::mem_r)), write8sm_delegate(*m_vga, FUNC(cirrus_gd5430_vga_device::mem_w)));
 	m_isa->install_device(0x03b0, 0x03df, *this, &isa16_svga_cirrus_device::io_isa_map);
 }
 
@@ -304,9 +304,9 @@ void isa16_svga_cirrus_gd542x_device::device_add_mconfig(machine_config &config)
 {
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
 	screen.set_raw(25.175_MHz_XTAL, 800, 0, 640, 524, 0, 480);
-	screen.set_screen_update("vga", FUNC(cirrus_gd5428_device::screen_update));
+	screen.set_screen_update("vga", FUNC(cirrus_gd5428_vga_device::screen_update));
 
-	CIRRUS_GD5428(config, m_vga, 0);
+	CIRRUS_GD5428_VGA(config, m_vga, 0);
 	m_vga->set_screen("screen");
 	m_vga->set_vram_size(0x200000);
 }
@@ -337,7 +337,7 @@ isa16_svga_cirrus_gd542x_device::isa16_svga_cirrus_gd542x_device(const machine_c
 
 void isa16_svga_cirrus_gd542x_device::io_isa_map(address_map &map)
 {
-	map(0x00, 0x2f).m(m_vga, FUNC(cirrus_gd5428_device::io_map));
+	map(0x00, 0x2f).m(m_vga, FUNC(cirrus_gd5428_vga_device::io_map));
 }
 
 //-------------------------------------------------
@@ -351,7 +351,7 @@ void isa16_svga_cirrus_gd542x_device::device_start()
 
 	m_isa->install_rom(this, 0xc0000, 0xc7fff, "clgd542x");
 
-	m_isa->install_memory(0xa0000, 0xbffff, read8sm_delegate(*m_vga, FUNC(cirrus_gd5428_device::mem_r)), write8sm_delegate(*m_vga, FUNC(cirrus_gd5428_device::mem_w)));
+	m_isa->install_memory(0xa0000, 0xbffff, read8sm_delegate(*m_vga, FUNC(cirrus_gd5428_vga_device::mem_r)), write8sm_delegate(*m_vga, FUNC(cirrus_gd5428_vga_device::mem_w)));
 	m_isa->install_device(0x03b0, 0x03df, *this, &isa16_svga_cirrus_gd542x_device::io_isa_map);
 }
 
@@ -359,7 +359,7 @@ void isa16_svga_cirrus_gd542x_device::remap(int space_id, offs_t start, offs_t e
 {
 	if (space_id == AS_PROGRAM)
 	{
-		m_isa->install_memory(0xa0000, 0xbffff, read8sm_delegate(*m_vga, FUNC(cirrus_gd5428_device::mem_r)), write8sm_delegate(*m_vga, FUNC(cirrus_gd5428_device::mem_w)));
+		m_isa->install_memory(0xa0000, 0xbffff, read8sm_delegate(*m_vga, FUNC(cirrus_gd5428_vga_device::mem_r)), write8sm_delegate(*m_vga, FUNC(cirrus_gd5428_vga_device::mem_w)));
 		m_isa->install_rom(this, 0xc0000, 0xc7fff, "clgd542x");
 	}
 	else if (space_id == AS_IO)
diff --git a/src/devices/bus/isa/svga_cirrus.h b/src/devices/bus/isa/svga_cirrus.h
index dafb11c84d5..cfc4d495c1c 100644
--- a/src/devices/bus/isa/svga_cirrus.h
+++ b/src/devices/bus/isa/svga_cirrus.h
@@ -34,7 +34,7 @@ protected:
 	void io_isa_map(address_map &map);
 
 private:
-	required_device<cirrus_gd5430_device> m_vga;
+	required_device<cirrus_gd5430_vga_device> m_vga;
 };
 
 class isa16_svga_cirrus_gd542x_device :
@@ -60,7 +60,7 @@ protected:
 	void io_isa_map(address_map &map);
 
 private:
-	required_device<cirrus_gd5428_device> m_vga;
+	required_device<cirrus_gd5428_vga_device> m_vga;
 };
 
 
diff --git a/src/devices/bus/pci/clgd546x_laguna.cpp b/src/devices/bus/pci/clgd546x_laguna.cpp
index 8ba4e7329ab..014f2145bad 100644
--- a/src/devices/bus/pci/clgd546x_laguna.cpp
+++ b/src/devices/bus/pci/clgd546x_laguna.cpp
@@ -20,7 +20,7 @@ DEFINE_DEVICE_TYPE(CIRRUS_GD5465_LAGUNA3D, cirrus_gd5465_laguna3d_device, "clgd5
 
 cirrus_gd5465_laguna3d_device::cirrus_gd5465_laguna3d_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
 	: pci_device(mconfig, CIRRUS_GD5465_LAGUNA3D, tag, owner, clock)
-	, m_svga(*this, "svga")
+	, m_vga(*this, "svga")
 	, m_vga_rom(*this, "vga_rom")
 {
 	// device ID 0x1013 Cirrus Logic
@@ -56,14 +56,14 @@ void cirrus_gd5465_laguna3d_device::device_add_mconfig(machine_config &config)
 {
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
 	screen.set_raw(XTAL(25'174'800), 900, 0, 640, 526, 0, 480);
-	screen.set_screen_update(m_svga, FUNC(cirrus_gd5446_device::screen_update));
+	screen.set_screen_update(m_vga, FUNC(cirrus_gd5446_vga_device::screen_update));
 
 	// TODO: bump to GD5465
-	CIRRUS_GD5446(config, m_svga, 0);
-	m_svga->set_screen("screen");
+	CIRRUS_GD5446_VGA(config, m_vga, 0);
+	m_vga->set_screen("screen");
 	// FIXME: shared RAM
 	// in 4 and 8 MB versions
-	m_svga->set_vram_size(8*1024*1024);
+	m_vga->set_vram_size(8*1024*1024);
 }
 
 void cirrus_gd5465_laguna3d_device::device_start()
@@ -121,17 +121,17 @@ void cirrus_gd5465_laguna3d_device::legacy_memory_map(address_map &map)
 
 void cirrus_gd5465_laguna3d_device::legacy_io_map(address_map &map)
 {
-	map(0, 0x02f).m(m_svga, FUNC(cirrus_gd5446_device::io_map));
+	map(0, 0x02f).m(m_vga, FUNC(cirrus_gd5446_vga_device::io_map));
 }
 
 uint8_t cirrus_gd5465_laguna3d_device::vram_r(offs_t offset)
 {
-	return downcast<cirrus_gd5446_device *>(m_svga.target())->mem_r(offset);
+	return downcast<cirrus_gd5446_vga_device *>(m_vga.target())->mem_r(offset);
 }
 
 void cirrus_gd5465_laguna3d_device::vram_w(offs_t offset, uint8_t data)
 {
-	downcast<cirrus_gd5446_device *>(m_svga.target())->mem_w(offset, data);
+	downcast<cirrus_gd5446_vga_device *>(m_vga.target())->mem_w(offset, data);
 }
 
 void cirrus_gd5465_laguna3d_device::map_extra(uint64_t memory_window_start, uint64_t memory_window_end, uint64_t memory_offset, address_space *memory_space,
diff --git a/src/devices/bus/pci/clgd546x_laguna.h b/src/devices/bus/pci/clgd546x_laguna.h
index 3eea0fcba27..81d8479fa8d 100644
--- a/src/devices/bus/pci/clgd546x_laguna.h
+++ b/src/devices/bus/pci/clgd546x_laguna.h
@@ -31,7 +31,7 @@ protected:
 	virtual void mmio_map(address_map &map);
 	virtual void vram_aperture_map(address_map &map);
 private:
-	required_device<cirrus_gd5446_device> m_svga;
+	required_device<cirrus_gd5446_vga_device> m_vga;
 	required_memory_region m_vga_rom;
 
 	u8 vram_r(offs_t offset);
diff --git a/src/devices/video/pc_vga_cirrus.cpp b/src/devices/video/pc_vga_cirrus.cpp
index c775e5794e0..5976114fbb1 100644
--- a/src/devices/video/pc_vga_cirrus.cpp
+++ b/src/devices/video/pc_vga_cirrus.cpp
@@ -28,49 +28,49 @@
 #include "logmacro.h"
 
 
-DEFINE_DEVICE_TYPE(CIRRUS_GD5428, cirrus_gd5428_device, "clgd5428", "Cirrus Logic GD5428 i/f")
-DEFINE_DEVICE_TYPE(CIRRUS_GD5430, cirrus_gd5430_device, "clgd5430", "Cirrus Logic GD5430 i/f")
-DEFINE_DEVICE_TYPE(CIRRUS_GD5446, cirrus_gd5446_device, "clgd5446", "Cirrus Logic GD5446 i/f")
+DEFINE_DEVICE_TYPE(CIRRUS_GD5428_VGA, cirrus_gd5428_vga_device, "clgd5428", "Cirrus Logic GD5428 VGA i/f")
+DEFINE_DEVICE_TYPE(CIRRUS_GD5430_VGA, cirrus_gd5430_vga_device, "clgd5430", "Cirrus Logic GD5430 VGA i/f")
+DEFINE_DEVICE_TYPE(CIRRUS_GD5446_VGA, cirrus_gd5446_vga_device, "clgd5446", "Cirrus Logic GD5446 VGA i/f")
 
 
 
-cirrus_gd5428_device::cirrus_gd5428_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: cirrus_gd5428_device(mconfig, CIRRUS_GD5428, tag, owner, clock)
+cirrus_gd5428_vga_device::cirrus_gd5428_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: cirrus_gd5428_vga_device(mconfig, CIRRUS_GD5428_VGA, tag, owner, clock)
 {
-	m_crtc_space_config = address_space_config("crtc_regs", ENDIANNESS_LITTLE, 8, 8, 0, address_map_constructor(FUNC(cirrus_gd5428_device::crtc_map), this));
-	m_gc_space_config = address_space_config("gc_regs", ENDIANNESS_LITTLE, 8, 8, 0, address_map_constructor(FUNC(cirrus_gd5428_device::gc_map), this));
-	m_seq_space_config = address_space_config("sequencer_regs", ENDIANNESS_LITTLE, 8, 8, 0, address_map_constructor(FUNC(cirrus_gd5428_device::sequencer_map), this));
+	m_crtc_space_config = address_space_config("crtc_regs", ENDIANNESS_LITTLE, 8, 8, 0, address_map_constructor(FUNC(cirrus_gd5428_vga_device::crtc_map), this));
+	m_gc_space_config = address_space_config("gc_regs", ENDIANNESS_LITTLE, 8, 8, 0, address_map_constructor(FUNC(cirrus_gd5428_vga_device::gc_map), this));
+	m_seq_space_config = address_space_config("sequencer_regs", ENDIANNESS_LITTLE, 8, 8, 0, address_map_constructor(FUNC(cirrus_gd5428_vga_device::sequencer_map), this));
 }
 
-cirrus_gd5428_device::cirrus_gd5428_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+cirrus_gd5428_vga_device::cirrus_gd5428_vga_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
 	: svga_device(mconfig, type, tag, owner, clock)
 {
 }
 
-cirrus_gd5430_device::cirrus_gd5430_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: cirrus_gd5428_device(mconfig, CIRRUS_GD5430, tag, owner, clock)
+cirrus_gd5430_vga_device::cirrus_gd5430_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: cirrus_gd5428_vga_device(mconfig, CIRRUS_GD5430_VGA, tag, owner, clock)
 {
-	m_crtc_space_config = address_space_config("crtc_regs", ENDIANNESS_LITTLE, 8, 8, 0, address_map_constructor(FUNC(cirrus_gd5430_device::crtc_map), this));
-	m_gc_space_config = address_space_config("gc_regs", ENDIANNESS_LITTLE, 8, 8, 0, address_map_constructor(FUNC(cirrus_gd5430_device::gc_map), this));
-	m_seq_space_config = address_space_config("sequencer_regs", ENDIANNESS_LITTLE, 8, 8, 0, address_map_constructor(FUNC(cirrus_gd5430_device::sequencer_map), this));
+	m_crtc_space_config = address_space_config("crtc_regs", ENDIANNESS_LITTLE, 8, 8, 0, address_map_constructor(FUNC(cirrus_gd5430_vga_device::crtc_map), this));
+	m_gc_space_config = address_space_config("gc_regs", ENDIANNESS_LITTLE, 8, 8, 0, address_map_constructor(FUNC(cirrus_gd5430_vga_device::gc_map), this));
+	m_seq_space_config = address_space_config("sequencer_regs", ENDIANNESS_LITTLE, 8, 8, 0, address_map_constructor(FUNC(cirrus_gd5430_vga_device::sequencer_map), this));
 }
 
-cirrus_gd5446_device::cirrus_gd5446_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: cirrus_gd5428_device(mconfig, CIRRUS_GD5446, tag, owner, clock)
+cirrus_gd5446_vga_device::cirrus_gd5446_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: cirrus_gd5428_vga_device(mconfig, CIRRUS_GD5446_VGA, tag, owner, clock)
 {
-	m_crtc_space_config = address_space_config("crtc_regs", ENDIANNESS_LITTLE, 8, 8, 0, address_map_constructor(FUNC(cirrus_gd5446_device::crtc_map), this));
-	m_gc_space_config = address_space_config("gc_regs", ENDIANNESS_LITTLE, 8, 8, 0, address_map_constructor(FUNC(cirrus_gd5446_device::gc_map), this));
-	m_seq_space_config = address_space_config("sequencer_regs", ENDIANNESS_LITTLE, 8, 8, 0, address_map_constructor(FUNC(cirrus_gd5446_device::sequencer_map), this));
+	m_crtc_space_config = address_space_config("crtc_regs", ENDIANNESS_LITTLE, 8, 8, 0, address_map_constructor(FUNC(cirrus_gd5446_vga_device::crtc_map), this));
+	m_gc_space_config = address_space_config("gc_regs", ENDIANNESS_LITTLE, 8, 8, 0, address_map_constructor(FUNC(cirrus_gd5446_vga_device::gc_map), this));
+	m_seq_space_config = address_space_config("sequencer_regs", ENDIANNESS_LITTLE, 8, 8, 0, address_map_constructor(FUNC(cirrus_gd5446_vga_device::sequencer_map), this));
 }
 
-void cirrus_gd5428_device::io_3cx_map(address_map &map)
+void cirrus_gd5428_vga_device::io_3cx_map(address_map &map)
 {
 	svga_device::io_3cx_map(map);
-	map(0x06, 0x06).rw(FUNC(cirrus_gd5428_device::ramdac_hidden_mask_r), FUNC(cirrus_gd5428_device::ramdac_hidden_mask_w));
-	map(0x09, 0x09).rw(FUNC(cirrus_gd5428_device::ramdac_overlay_r), FUNC(cirrus_gd5428_device::ramdac_overlay_w));
+	map(0x06, 0x06).rw(FUNC(cirrus_gd5428_vga_device::ramdac_hidden_mask_r), FUNC(cirrus_gd5428_vga_device::ramdac_hidden_mask_w));
+	map(0x09, 0x09).rw(FUNC(cirrus_gd5428_vga_device::ramdac_overlay_r), FUNC(cirrus_gd5428_vga_device::ramdac_overlay_w));
 }
 
-u8 cirrus_gd5428_device::ramdac_hidden_mask_r(offs_t offset)
+u8 cirrus_gd5428_vga_device::ramdac_hidden_mask_r(offs_t offset)
 {
 	if (!machine().side_effects_disabled())
 		m_hidden_dac_phase ++;
@@ -88,7 +88,7 @@ u8 cirrus_gd5428_device::ramdac_hidden_mask_r(offs_t offset)
 	return vga_device::ramdac_mask_r(0);
 }
 
-void cirrus_gd5428_device::ramdac_hidden_mask_w(offs_t offset, u8 data)
+void cirrus_gd5428_vga_device::ramdac_hidden_mask_w(offs_t offset, u8 data)
 {
 	if (m_hidden_dac_phase >= 4)
 	{
@@ -104,7 +104,7 @@ void cirrus_gd5428_device::ramdac_hidden_mask_w(offs_t offset, u8 data)
 	vga_device::ramdac_mask_w(0, data);
 }
 
-u8 cirrus_gd5428_device::ramdac_overlay_r(offs_t offset)
+u8 cirrus_gd5428_vga_device::ramdac_overlay_r(offs_t offset)
 {
 	if(!m_ext_palette_enabled)
 		return vga_device::ramdac_data_r(0);
@@ -135,7 +135,7 @@ u8 cirrus_gd5428_device::ramdac_overlay_r(offs_t offset)
 	return res;
 }
 
-void cirrus_gd5428_device::ramdac_overlay_w(offs_t offset, u8 data)
+void cirrus_gd5428_vga_device::ramdac_overlay_w(offs_t offset, u8 data)
 {
 	if(!m_ext_palette_enabled)
 	{
@@ -165,7 +165,7 @@ void cirrus_gd5428_device::ramdac_overlay_w(offs_t offset, u8 data)
 	}
 }
 
-void cirrus_gd5428_device::crtc_map(address_map &map)
+void cirrus_gd5428_vga_device::crtc_map(address_map &map)
 {
 	svga_device::crtc_map(map);
 	// VGA Vertical Blank end
@@ -225,7 +225,7 @@ void cirrus_gd5428_device::crtc_map(address_map &map)
 	);
 }
 
-void cirrus_gd5428_device::gc_map(address_map &map)
+void cirrus_gd5428_vga_device::gc_map(address_map &map)
 {
 	svga_device::gc_map(map);
 	map(0x00, 0x00).lrw8(
@@ -487,7 +487,7 @@ void cirrus_gd5428_device::gc_map(address_map &map)
 	);
 }
 
-void cirrus_gd5428_device::sequencer_map(address_map &map)
+void cirrus_gd5428_vga_device::sequencer_map(address_map &map)
 {
 	svga_device::sequencer_map(map);
 	map(0x02, 0x02).lrw8(
@@ -616,7 +616,7 @@ void cirrus_gd5428_device::sequencer_map(address_map &map)
 	);
 }
 
-void cirrus_gd5428_device::device_start()
+void cirrus_gd5428_vga_device::device_start()
 {
 	zero();
 
@@ -644,20 +644,20 @@ void cirrus_gd5428_device::device_start()
 	m_chip_id = 0x98;  // GD5428 - Rev 0
 }
 
-void cirrus_gd5430_device::device_start()
+void cirrus_gd5430_vga_device::device_start()
 {
-	cirrus_gd5428_device::device_start();
+	cirrus_gd5428_vga_device::device_start();
 	m_chip_id = 0xa0;  // GD5430 - Rev 0
 }
 
-void cirrus_gd5446_device::device_start()
+void cirrus_gd5446_vga_device::device_start()
 {
-	cirrus_gd5428_device::device_start();
+	cirrus_gd5428_vga_device::device_start();
 	m_chip_id = 0x80 | 0x39;  // GD5446
 }
 
 
-void cirrus_gd5428_device::device_reset()
+void cirrus_gd5428_vga_device::device_reset()
 {
 	vga_device::device_reset();
 	gc_locked = true;
@@ -682,7 +682,7 @@ void cirrus_gd5428_device::device_reset()
 	m_hidden_dac_mode = 0;
 }
 
-uint32_t cirrus_gd5428_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+uint32_t cirrus_gd5428_vga_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
 {
 	uint32_t ptr = (vga.svga_intf.vram_size - 0x4000);  // cursor patterns are stored in the last 16kB of VRAM
 	svga_device::screen_update(screen, bitmap, cliprect);
@@ -755,7 +755,7 @@ uint32_t cirrus_gd5428_device::screen_update(screen_device &screen, bitmap_rgb32
 	return 0;
 }
 
-void cirrus_gd5428_device::cirrus_define_video_mode()
+void cirrus_gd5428_vga_device::cirrus_define_video_mode()
 {
 	uint8_t divisor = 1;
 	float clock;
@@ -836,7 +836,7 @@ void cirrus_gd5428_device::cirrus_define_video_mode()
 	recompute_params_clock(divisor, (int)clock);
 }
 
-uint16_t cirrus_gd5428_device::offset()
+uint16_t cirrus_gd5428_vga_device::offset()
 {
 	uint16_t off = vga_device::offset();
 
@@ -847,7 +847,7 @@ uint16_t cirrus_gd5428_device::offset()
 	return off;
 }
 
-void cirrus_gd5428_device::start_bitblt()
+void cirrus_gd5428_vga_device::start_bitblt()
 {
 	uint32_t x,y;
 
@@ -928,7 +928,7 @@ void cirrus_gd5428_device::start_bitblt()
 	m_blt_status &= ~0x02;
 }
 
-void cirrus_gd5428_device::start_reverse_bitblt()
+void cirrus_gd5428_vga_device::start_reverse_bitblt()
 {
 	uint32_t x,y;
 
@@ -1003,7 +1003,7 @@ void cirrus_gd5428_device::start_reverse_bitblt()
 	m_blt_status &= ~0x02;
 }
 
-void cirrus_gd5428_device::start_system_bitblt()
+void cirrus_gd5428_vga_device::start_system_bitblt()
 {
 	LOGMASKED(LOG_BLIT, "CL: BitBLT from system memory started: Src: %06x Dst: %06x Width: %i Height %i ROP: %02x Mode: %02x\n",m_blt_source,m_blt_dest,m_blt_width,m_blt_height,m_blt_rop,m_blt_mode);
 	m_blt_system_transfer = true;
@@ -1016,7 +1016,7 @@ void cirrus_gd5428_device::start_system_bitblt()
 }
 
 // non colour-expanded BitBLTs from system memory must be doubleword sized, extra bytes are ignored
-void cirrus_gd5428_device::blit_dword()
+void cirrus_gd5428_vga_device::blit_dword()
 {
 	// TODO: add support for reverse direction
 	uint8_t x,pixel;
@@ -1043,7 +1043,7 @@ void cirrus_gd5428_device::blit_dword()
 }
 
 // colour-expanded BitBLTs from system memory are on a byte boundary, unused bits are ignored
-void cirrus_gd5428_device::blit_byte()
+void cirrus_gd5428_vga_device::blit_byte()
 {
 	// TODO: add support for reverse direction
 	uint8_t x,pixel;
@@ -1073,7 +1073,7 @@ void cirrus_gd5428_device::blit_byte()
 	}
 }
 
-void cirrus_gd5428_device::copy_pixel(uint8_t src, uint8_t dst)
+void cirrus_gd5428_vga_device::copy_pixel(uint8_t src, uint8_t dst)
 {
 	uint8_t res = src;
 
@@ -1109,7 +1109,7 @@ void cirrus_gd5428_device::copy_pixel(uint8_t src, uint8_t dst)
 	vga.memory[m_blt_dest_current % vga.svga_intf.vram_size] = res;
 }
 
-uint8_t cirrus_gd5428_device::vga_latch_write(int offs, uint8_t data)
+uint8_t cirrus_gd5428_vga_device::vga_latch_write(int offs, uint8_t data)
 {
 	uint8_t res = 0;
 	uint8_t mode_mask = (gc_mode_ext & 0x04) ? 0x07 : 0x03;
@@ -1134,7 +1134,7 @@ uint8_t cirrus_gd5428_device::vga_latch_write(int offs, uint8_t data)
 	return res;
 }
 
-uint8_t cirrus_gd5428_device::mem_r(offs_t offset)
+uint8_t cirrus_gd5428_vga_device::mem_r(offs_t offset)
 {
 	uint32_t addr;
 	uint8_t bank;
@@ -1267,7 +1267,7 @@ uint8_t cirrus_gd5428_device::mem_r(offs_t offset)
 	}
 }
 
-void cirrus_gd5428_device::mem_w(offs_t offset, uint8_t data)
+void cirrus_gd5428_vga_device::mem_w(offs_t offset, uint8_t data)
 {
 	uint32_t addr;
 	uint8_t bank;
diff --git a/src/devices/video/pc_vga_cirrus.h b/src/devices/video/pc_vga_cirrus.h
index 03d9b735de5..b90b31e36bf 100644
--- a/src/devices/video/pc_vga_cirrus.h
+++ b/src/devices/video/pc_vga_cirrus.h
@@ -12,11 +12,11 @@
 
 #include "video/pc_vga.h"
 
-class cirrus_gd5428_device :  public svga_device
+class cirrus_gd5428_vga_device :  public svga_device
 {
 public:
 	// construction/destruction
-	cirrus_gd5428_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	cirrus_gd5428_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 	virtual uint8_t mem_r(offs_t offset) override;
 	virtual void mem_w(offs_t offset, uint8_t data) override;
@@ -24,7 +24,7 @@ public:
 	virtual uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) override;
 
 protected:
-	cirrus_gd5428_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+	cirrus_gd5428_vga_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
 
 	// device-level overrides
 	virtual void device_start() override;
@@ -106,19 +106,19 @@ private:
 	void copy_pixel(uint8_t src, uint8_t dst);
 };
 
-class cirrus_gd5430_device :  public cirrus_gd5428_device
+class cirrus_gd5430_vga_device :  public cirrus_gd5428_vga_device
 {
 public:
-	cirrus_gd5430_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	cirrus_gd5430_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 protected:
 	virtual void device_start() override;
 };
 
-class cirrus_gd5446_device :  public cirrus_gd5428_device
+class cirrus_gd5446_vga_device :  public cirrus_gd5428_vga_device
 {
 public:
-	cirrus_gd5446_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	cirrus_gd5446_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 protected:
 	virtual void device_start() override;
@@ -126,8 +126,8 @@ protected:
 
 
 // device type definition
-DECLARE_DEVICE_TYPE(CIRRUS_GD5428, cirrus_gd5428_device)
-DECLARE_DEVICE_TYPE(CIRRUS_GD5430, cirrus_gd5430_device)
-DECLARE_DEVICE_TYPE(CIRRUS_GD5446, cirrus_gd5446_device)
+DECLARE_DEVICE_TYPE(CIRRUS_GD5428_VGA, cirrus_gd5428_vga_device)
+DECLARE_DEVICE_TYPE(CIRRUS_GD5430_VGA, cirrus_gd5430_vga_device)
+DECLARE_DEVICE_TYPE(CIRRUS_GD5446_VGA, cirrus_gd5446_vga_device)
 
 #endif // MAME_VIDEO_PC_VGA_CIRRUS_H
diff --git a/src/mame/be/bebox.cpp b/src/mame/be/bebox.cpp
index 9a5fba66b39..487e7e81f36 100644
--- a/src/mame/be/bebox.cpp
+++ b/src/mame/be/bebox.cpp
@@ -52,7 +52,7 @@ void bebox_state::main_mem(address_map &map)
 	map(0x800002F8, 0x800002FF).rw("ns16550_1", FUNC(ns16550_device::ins8250_r), FUNC(ns16550_device::ins8250_w));
 	map(0x80000380, 0x80000387).rw("ns16550_2", FUNC(ns16550_device::ins8250_r), FUNC(ns16550_device::ins8250_w));
 	map(0x80000388, 0x8000038F).rw("ns16550_3", FUNC(ns16550_device::ins8250_r), FUNC(ns16550_device::ins8250_w));
-	map(0x800003B0, 0x800003DF).m(m_vga, FUNC(cirrus_gd5428_device::io_map));
+	map(0x800003B0, 0x800003DF).m(m_vga, FUNC(cirrus_gd5446_vga_device::io_map));
 	map(0x800003F0, 0x800003F7).rw("ide", FUNC(ide_controller_device::cs1_r), FUNC(ide_controller_device::cs1_w));
 	map(0x800003F0, 0x800003F7).m(m_smc37c78, FUNC(smc37c78_device::map));
 	map(0x800003F8, 0x800003FF).rw("ns16550_0", FUNC(ns16550_device::ins8250_r), FUNC(ns16550_device::ins8250_w));
@@ -61,8 +61,8 @@ void bebox_state::main_mem(address_map &map)
 	//map(0x800042E8, 0x800042EF).w("cirrus", FUNC(cirrus_device::cirrus_42E8_w));
 
 	map(0xBFFFFFF0, 0xBFFFFFFF).r(FUNC(bebox_state::bebox_interrupt_ack_r));
-	map(0xC00A0000, 0xC00BFFFF).rw(m_vga, FUNC(cirrus_gd5428_device::mem_r), FUNC(cirrus_gd5428_device::mem_w));
-	map(0xC1000000, 0xC11FFFFF).rw(m_vga, FUNC(cirrus_gd5428_device::mem_linear_r), FUNC(cirrus_gd5428_device::mem_linear_w));
+	map(0xC00A0000, 0xC00BFFFF).rw(m_vga, FUNC(cirrus_gd5446_vga_device::mem_r), FUNC(cirrus_gd5446_vga_device::mem_w));
+	map(0xC1000000, 0xC11FFFFF).rw(m_vga, FUNC(cirrus_gd5446_vga_device::mem_linear_r), FUNC(cirrus_gd5446_vga_device::mem_linear_w));
 	map(0xFFF00000, 0xFFF03FFF).bankr("bank2");
 	map(0xFFF04000, 0xFFFFFFFF).rw(FUNC(bebox_state::bebox_flash_r), FUNC(bebox_state::bebox_flash_w));
 }
@@ -187,9 +187,10 @@ void bebox_state::bebox_peripherals(machine_config &config)
 	/* video hardware */
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
 	screen.set_raw(XTAL(25'174'800), 900, 0, 640, 526, 0, 480);
-	screen.set_screen_update(m_vga, FUNC(cirrus_gd5428_device::screen_update));
+	screen.set_screen_update(m_vga, FUNC(cirrus_gd5446_vga_device::screen_update));
 
-	CIRRUS_GD5428(config, m_vga, 0);
+	// was GD5428, assume mistake (GD5446 is PCI)
+	CIRRUS_GD5446_VGA(config, m_vga, 0);
 	m_vga->set_screen("screen");
 	m_vga->set_vram_size(0x200000);
 
diff --git a/src/mame/funworld/photoply.cpp b/src/mame/funworld/photoply.cpp
index 6ec7dc91eb9..80c04eb28bd 100644
--- a/src/mame/funworld/photoply.cpp
+++ b/src/mame/funworld/photoply.cpp
@@ -235,7 +235,7 @@ void photoply_state::eeprom_w(uint8_t data)
 void photoply_state::photoply_map(address_map &map)
 {
 	map(0x00000000, 0x0009ffff).ram();
-	map(0x000a0000, 0x000bffff).rw("vga", FUNC(cirrus_gd5446_device::mem_r), FUNC(cirrus_gd5446_device::mem_w));
+	map(0x000a0000, 0x000bffff).rw("vga", FUNC(cirrus_gd5446_vga_device::mem_r), FUNC(cirrus_gd5446_vga_device::mem_w));
 //  map(0x000c0000, 0x000c7fff).rom().region("video_bios", 0);
 //  map(0x000c8000, 0x000cffff).rom().region("ex_bios", 0);
 	map(0x000c0000, 0x000fffff).rw(FUNC(photoply_state::bios_r), FUNC(photoply_state::bios_w));
@@ -254,7 +254,7 @@ void photoply_state::photoply_io(address_map &map)
 //  map(0x0278, 0x027f).ram(); //parallel port 2
 	map(0x0370, 0x0377).rw("ide2", FUNC(ide_controller_32_device::cs1_r), FUNC(ide_controller_32_device::cs1_w));
 //  map(0x0378, 0x037f).ram(); //parallel port
-	map(0x03b0, 0x03df).m("vga", FUNC(cirrus_gd5446_device::io_map));
+	map(0x03b0, 0x03df).m("vga", FUNC(cirrus_gd5446_vga_device::io_map));
 
 	map(0x03f0, 0x03f7).rw("ide", FUNC(ide_controller_32_device::cs1_r), FUNC(ide_controller_32_device::cs1_w));
 
@@ -315,9 +315,9 @@ void photoply_state::photoply(machine_config &config)
 
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
 	screen.set_raw(XTAL(25'174'800),900,0,640,526,0,480);
-	screen.set_screen_update("vga", FUNC(cirrus_gd5446_device::screen_update));
+	screen.set_screen_update("vga", FUNC(cirrus_gd5446_vga_device::screen_update));
 
-	cirrus_gd5446_device &vga(CIRRUS_GD5446(config, "vga", 0));
+	cirrus_gd5446_vga_device &vga(CIRRUS_GD5446_VGA(config, "vga", 0));
 	vga.set_screen("screen");
 	vga.set_vram_size(0x200000);
 
diff --git a/src/mame/misc/gambl186.cpp b/src/mame/misc/gambl186.cpp
index 29175794f20..3e324e8b511 100644
--- a/src/mame/misc/gambl186.cpp
+++ b/src/mame/misc/gambl186.cpp
@@ -387,13 +387,13 @@ void gambl186_state::gambl186_map(address_map &map)
 {
 	map(0x00000, 0x0ffff).ram().share("nvram");
 	map(0x40000, 0x7ffff).bankr(m_data_bank);
-	map(0xa0000, 0xbffff).rw("vga", FUNC(cirrus_gd5428_device::mem_r), FUNC(cirrus_gd5428_device::mem_w));
+	map(0xa0000, 0xbffff).rw("vga", FUNC(cirrus_gd5428_vga_device::mem_r), FUNC(cirrus_gd5428_vga_device::mem_w));
 	map(0xc0000, 0xfffff).rom().region("ipl", 0);
 }
 
 void gambl186_state::gambl186_io(address_map &map)
 {
-	map(0x03b0, 0x03df).m("vga", FUNC(cirrus_gd5428_device::io_map));
+	map(0x03b0, 0x03df).m("vga", FUNC(cirrus_gd5428_vga_device::io_map));
 	map(0x0400, 0x0401).w(FUNC(gambl186_state::upd_w));      // upd7759 sample index/input
 	map(0x0500, 0x0501).portr("IN0");
 	map(0x0502, 0x0503).portr("IN1");
@@ -509,9 +509,9 @@ void gambl186_state::gambl186(machine_config &config)
 
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
 	screen.set_raw(XTAL(25'174'800),900,0,640,526,0,480);
-	screen.set_screen_update("vga", FUNC(cirrus_gd5428_device::screen_update));
+	screen.set_screen_update("vga", FUNC(cirrus_gd5428_vga_device::screen_update));
 
-	cirrus_gd5428_device &vga(CIRRUS_GD5428(config, "vga", 0));
+	cirrus_gd5428_vga_device &vga(CIRRUS_GD5428_VGA(config, "vga", 0));
 	vga.set_screen("screen");
 	vga.set_vram_size(0x200000);
 
diff --git a/src/mame/pc/pcat_nit.cpp b/src/mame/pc/pcat_nit.cpp
index ba46242612f..cfe31cb9dd9 100644
--- a/src/mame/pc/pcat_nit.cpp
+++ b/src/mame/pc/pcat_nit.cpp
@@ -181,7 +181,7 @@ void pcat_nit_state::pcat_map(address_map &map)
 void pcat_nit_state::bonanza_map(address_map &map)
 {
 	map(0x00000000, 0x0009ffff).ram();
-	map(0x000a0000, 0x000bffff).rw("vga", FUNC(cirrus_gd5428_device::mem_r), FUNC(cirrus_gd5428_device::mem_w));
+	map(0x000a0000, 0x000bffff).rw("vga", FUNC(cirrus_gd5428_vga_device::mem_r), FUNC(cirrus_gd5428_vga_device::mem_w));
 	map(0x000c0000, 0x000c7fff).rom().region("video_bios", 0).nopw();
 	map(0x000d0000, 0x000d3fff).ram().share("disk_bios");
 	map(0x000d7000, 0x000d7000).w(FUNC(pcat_nit_state::pcat_nit_rombank_w));
@@ -219,7 +219,7 @@ void pcat_nit_state::bonanza_io_map(address_map &map)
 	pcat32_io_common(map);
 	map(0x0278, 0x027f).r(FUNC(pcat_nit_state::pcat_nit_io_r)).nopw();
 	map(0x0280, 0x0283).nopr();
-	map(0x03b0, 0x03df).m("vga", FUNC(cirrus_gd5428_device::io_map));
+	map(0x03b0, 0x03df).m("vga", FUNC(cirrus_gd5428_vga_device::io_map));
 	map(0x03f8, 0x03ff).rw(m_uart, FUNC(ns16450_device::ins8250_r), FUNC(ns16450_device::ins8250_w));
 }
 
@@ -283,9 +283,9 @@ void pcat_nit_state::bonanza(machine_config &config)
 	// TODO: map to ISA bus
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
 	screen.set_raw(25.1748_MHz_XTAL, 900, 0, 640, 526, 0, 480);
-	screen.set_screen_update("vga", FUNC(cirrus_gd5428_device::screen_update));
+	screen.set_screen_update("vga", FUNC(cirrus_gd5428_vga_device::screen_update));
 
-	cirrus_gd5428_device &vga(CIRRUS_GD5428(config, "vga", 0));
+	cirrus_gd5428_vga_device &vga(CIRRUS_GD5428_VGA(config, "vga", 0));
 	vga.set_screen("screen");
 	vga.set_vram_size(0x200000);