diff --git a/src/mame/drivers/argo.cpp b/src/mame/drivers/argo.cpp
index 4d0171fdb16..d707f9ac9d0 100644
--- a/src/mame/drivers/argo.cpp
+++ b/src/mame/drivers/argo.cpp
@@ -36,14 +36,19 @@ public:
 	};
 
 	argo_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag),
-			m_maincpu(*this, "maincpu"),
-			m_p_videoram(*this, "p_videoram"){ }
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_p_videoram(*this, "videoram")
+		{ }
 
-	required_device<cpu_device> m_maincpu;
 	DECLARE_WRITE8_MEMBER(argo_videoram_w);
 	DECLARE_READ8_MEMBER(argo_io_r);
 	DECLARE_WRITE8_MEMBER(argo_io_w);
+	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	DECLARE_DRIVER_INIT(argo);
+
+private:
+	required_device<cpu_device> m_maincpu;
 	required_shared_ptr<uint8_t> m_p_videoram;
 	const uint8_t *m_p_chargen;
 	uint8_t m_framecnt;
@@ -53,8 +58,6 @@ public:
 	uint8_t m_scroll_ctrl;
 	virtual void machine_reset() override;
 	virtual void video_start() override;
-	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-	DECLARE_DRIVER_INIT(argo);
 
 protected:
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
diff --git a/src/mame/drivers/beehive.cpp b/src/mame/drivers/beehive.cpp
index 6919a0d34e0..ead41079a16 100644
--- a/src/mame/drivers/beehive.cpp
+++ b/src/mame/drivers/beehive.cpp
@@ -28,19 +28,22 @@ class beehive_state : public driver_device
 {
 public:
 	beehive_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag),
-	m_maincpu(*this, "maincpu"),
-	m_p_videoram(*this, "videoram"){ }
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_p_videoram(*this, "videoram")
+		{ }
 
-	required_device<cpu_device> m_maincpu;
 	DECLARE_READ8_MEMBER(beehive_60_r);
 	DECLARE_WRITE8_MEMBER(beehive_62_w);
+	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+
+private:
+	required_device<cpu_device> m_maincpu;
 	const uint8_t *m_p_chargen;
 	required_shared_ptr<uint8_t> m_p_videoram;
 	uint8_t m_keyline;
 	virtual void machine_reset() override;
 	virtual void video_start() override;
-	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 };
 
 READ8_MEMBER(beehive_state::beehive_60_r)
diff --git a/src/mame/drivers/binbug.cpp b/src/mame/drivers/binbug.cpp
index c03e8b7cba8..acda6b96d55 100644
--- a/src/mame/drivers/binbug.cpp
+++ b/src/mame/drivers/binbug.cpp
@@ -56,14 +56,12 @@
 #include "sound/wave.h"
 #include "imagedev/snapquik.h"
 
-#define KEYBOARD_TAG "keyboard"
-
 class binbug_state : public driver_device
 {
 public:
 	binbug_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
-		m_rs232(*this, KEYBOARD_TAG),
+		m_rs232(*this, "keyboard"),
 		m_cass(*this, "cassette"),
 		m_p_videoram(*this, "videoram"),
 		m_p_attribram(*this, "attribram"),
@@ -309,7 +307,7 @@ static MACHINE_CONFIG_START( binbug, binbug_state )
 	MCFG_PALETTE_ADD_MONOCHROME("palette")
 
 	/* Keyboard */
-	MCFG_RS232_PORT_ADD(KEYBOARD_TAG, default_rs232_devices, "keyboard")
+	MCFG_RS232_PORT_ADD("keyboard", default_rs232_devices, "keyboard")
 	MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("keyboard", keyboard)
 
 	/* Cassette */
diff --git a/src/mame/drivers/c10.cpp b/src/mame/drivers/c10.cpp
index d5df4b8f89d..b9d8348b236 100644
--- a/src/mame/drivers/c10.cpp
+++ b/src/mame/drivers/c10.cpp
@@ -25,17 +25,19 @@ public:
 	};
 
 	c10_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag),
-	m_maincpu(*this, "maincpu"),
-	m_p_videoram(*this, "p_videoram"){ }
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_p_videoram(*this, "videoram")
+		{ }
 
+	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	DECLARE_DRIVER_INIT(c10);
+private:
 	required_device<cpu_device> m_maincpu;
 	const uint8_t *m_p_chargen;
 	required_shared_ptr<uint8_t> m_p_videoram;
 	virtual void machine_reset() override;
 	virtual void video_start() override;
-	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-	DECLARE_DRIVER_INIT(c10);
 
 protected:
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
@@ -49,7 +51,7 @@ static ADDRESS_MAP_START(c10_mem, AS_PROGRAM, 8, c10_state)
 	AM_RANGE(0x1000, 0x7fff) AM_RAM
 	AM_RANGE(0x8000, 0xbfff) AM_ROM
 	AM_RANGE(0xc000, 0xf0a1) AM_RAM
-	AM_RANGE(0xf0a2, 0xffff) AM_RAM AM_SHARE("p_videoram")
+	AM_RANGE(0xf0a2, 0xffff) AM_RAM AM_SHARE("videoram")
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( c10_io, AS_IO, 8, c10_state)
diff --git a/src/mame/drivers/cd2650.cpp b/src/mame/drivers/cd2650.cpp
index eac2095ee6c..d34cd203124 100644
--- a/src/mame/drivers/cd2650.cpp
+++ b/src/mame/drivers/cd2650.cpp
@@ -36,8 +36,6 @@ TODO
 #include "sound/wave.h"
 #include "sound/beep.h"
 
-#define KEYBOARD_TAG "keyboard"
-
 class cd2650_state : public driver_device
 {
 public:
@@ -291,7 +289,7 @@ static MACHINE_CONFIG_START( cd2650, cd2650_state )
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 
 	/* Devices */
-	MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0)
+	MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
 	MCFG_GENERIC_KEYBOARD_CB(WRITE8(cd2650_state, kbd_put))
 	MCFG_CASSETTE_ADD( "cassette" )
 MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cdc721.cpp b/src/mame/drivers/cdc721.cpp
index 3a50cd3e83e..7f302777a76 100644
--- a/src/mame/drivers/cdc721.cpp
+++ b/src/mame/drivers/cdc721.cpp
@@ -18,17 +18,17 @@ class cdc721_state : public driver_device
 public:
 	cdc721_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
-	, m_p_videoram(*this, "videoram")
-	, m_maincpu(*this, "maincpu")
-	{ }
+		, m_p_videoram(*this, "videoram")
+		, m_maincpu(*this, "maincpu")
+		{ }
 
-public:
-	virtual void machine_reset() override;
-	DECLARE_PALETTE_INIT(cdc721);
-	const uint8_t *m_p_chargen;
 	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-	required_shared_ptr<uint8_t> m_p_videoram;
+	DECLARE_PALETTE_INIT(cdc721);
+
 private:
+	virtual void machine_reset() override;
+	const uint8_t *m_p_chargen;
+	required_shared_ptr<uint8_t> m_p_videoram;
 	required_device<cpu_device> m_maincpu;
 
 
diff --git a/src/mame/drivers/grfd2301.cpp b/src/mame/drivers/grfd2301.cpp
index 087d86273e1..475659ae1c3 100644
--- a/src/mame/drivers/grfd2301.cpp
+++ b/src/mame/drivers/grfd2301.cpp
@@ -39,9 +39,9 @@ class grfd2301_state : public driver_device
 public:
 	grfd2301_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
-	, m_p_videoram(*this, "videoram")
-	, m_maincpu(*this, "maincpu")
-	{ }
+		, m_p_videoram(*this, "videoram")
+		, m_maincpu(*this, "maincpu")
+		{ }
 
 public:
 	virtual void machine_reset() override;
diff --git a/src/mame/drivers/h19.cpp b/src/mame/drivers/h19.cpp
index b7167e05dbb..73332ffe62e 100644
--- a/src/mame/drivers/h19.cpp
+++ b/src/mame/drivers/h19.cpp
@@ -41,8 +41,6 @@
 #include "machine/ins8250.h"
 #include "machine/keyboard.h"
 
-#define KEYBOARD_TAG "keyboard"
-
 #define H19_CLOCK (XTAL_12_288MHz / 6)
 #define H19_BEEP_FRQ (H19_CLOCK / 1024)
 
@@ -407,7 +405,7 @@ static MACHINE_CONFIG_START( h19, h19_state )
 	MCFG_DEVICE_ADD("ins8250", INS8250, XTAL_12_288MHz / 4) // 3.072mhz clock which gets divided down for the various baud rates
 	MCFG_INS8250_OUT_INT_CB(INPUTLINE("maincpu", 0)) // interrupt
 
-	MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0)
+	MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
 	MCFG_GENERIC_KEYBOARD_CB(WRITE8(h19_state, h19_kbd_put))
 
 	/* sound hardware */
diff --git a/src/mame/drivers/homez80.cpp b/src/mame/drivers/homez80.cpp
index fdcb5341abb..f89e76275f6 100644
--- a/src/mame/drivers/homez80.cpp
+++ b/src/mame/drivers/homez80.cpp
@@ -28,10 +28,10 @@ class homez80_state : public driver_device
 {
 public:
 	homez80_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag),
-	m_maincpu(*this, "maincpu")
-	,
-		m_p_videoram(*this, "p_videoram"){ }
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_p_videoram(*this, "videoram")
+		{ }
 
 	required_device<cpu_device> m_maincpu;
 	DECLARE_READ8_MEMBER( homez80_keyboard_r );
@@ -55,7 +55,7 @@ READ8_MEMBER( homez80_state::homez80_keyboard_r )
 static ADDRESS_MAP_START(homez80_mem, AS_PROGRAM, 8, homez80_state)
 	ADDRESS_MAP_UNMAP_HIGH
 	AM_RANGE( 0x0000, 0x0fff ) AM_ROM  // Monitor
-	AM_RANGE( 0x2000, 0x23ff ) AM_RAM  AM_SHARE("p_videoram") // Video RAM
+	AM_RANGE( 0x2000, 0x23ff ) AM_RAM  AM_SHARE("videoram") // Video RAM
 	AM_RANGE( 0x7020, 0x702f ) AM_READ(homez80_keyboard_r)
 	AM_RANGE( 0x8000, 0xffff ) AM_RAM  // 32 K RAM
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/ipds.cpp b/src/mame/drivers/ipds.cpp
index 7790f04c521..7b3df48d8cc 100644
--- a/src/mame/drivers/ipds.cpp
+++ b/src/mame/drivers/ipds.cpp
@@ -13,8 +13,6 @@
 #include "video/i8275.h"
 #include "machine/keyboard.h"
 
-#define KEYBOARD_TAG "keyboard"
-
 class ipds_state : public driver_device
 {
 public:
@@ -146,7 +144,7 @@ static MACHINE_CONFIG_START( ipds, ipds_state )
 	MCFG_I8275_CHARACTER_WIDTH(6)
 	MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(ipds_state, crtc_display_pixels)
 
-	MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0)
+	MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
 	MCFG_GENERIC_KEYBOARD_CB(WRITE8(ipds_state, kbd_put))
 MACHINE_CONFIG_END
 
diff --git a/src/mame/drivers/jupiter.cpp b/src/mame/drivers/jupiter.cpp
index 0c30d5b4b8c..944608f3fa2 100644
--- a/src/mame/drivers/jupiter.cpp
+++ b/src/mame/drivers/jupiter.cpp
@@ -27,9 +27,6 @@ ToDo:
 #include "machine/wd_fdc.h"
 #include "includes/jupiter.h"
 
-#define TERMINAL_TAG "terminal"
-#define KEYBOARD_TAG "keyboard"
-
 
 //**************************************************************************
 //  ADDRESS MAPS
@@ -75,7 +72,7 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( jupiter3_mem, AS_PROGRAM, 8, jupiter3_state )
 	AM_RANGE(0x0000, 0xbfff) AM_RAM AM_SHARE("p_ram")
-	AM_RANGE(0xc000, 0xdfff) AM_RAM AM_SHARE("p_videoram")
+	AM_RANGE(0xc000, 0xdfff) AM_RAM AM_SHARE("videoram")
 	AM_RANGE(0xe000, 0xefff) AM_ROM AM_REGION(Z80_TAG, 0)
 	AM_RANGE(0xf000, 0xffff) AM_RAM
 ADDRESS_MAP_END
@@ -229,7 +226,7 @@ static MACHINE_CONFIG_START( jupiter, jupiter2_state )
 	MCFG_FLOPPY_DRIVE_ADD(INS1771N1_TAG":0", jupiter_floppies, "525ssdd", floppy_image_device::default_floppy_formats)
 	MCFG_FLOPPY_DRIVE_ADD(INS1771N1_TAG":1", jupiter_floppies, nullptr, floppy_image_device::default_floppy_formats)
 
-	MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
+	MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0)
 
 	// internal ram
 	MCFG_RAM_ADD(RAM_TAG)
@@ -263,7 +260,7 @@ static MACHINE_CONFIG_START( jupiter3, jupiter3_state )
 	MCFG_FLOPPY_DRIVE_ADD(INS1771N1_TAG":0", jupiter_floppies, "525ssdd", floppy_image_device::default_floppy_formats)
 	MCFG_FLOPPY_DRIVE_ADD(INS1771N1_TAG":1", jupiter_floppies, nullptr, floppy_image_device::default_floppy_formats)
 
-	MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0)
+	MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
 	MCFG_GENERIC_KEYBOARD_CB(WRITE8(jupiter3_state, kbd_put))
 
 	// internal ram
diff --git a/src/mame/drivers/k8915.cpp b/src/mame/drivers/k8915.cpp
index 4c2a97662f8..637ff7eb831 100644
--- a/src/mame/drivers/k8915.cpp
+++ b/src/mame/drivers/k8915.cpp
@@ -14,15 +14,13 @@
 #include "cpu/z80/z80.h"
 #include "machine/keyboard.h"
 
-#define KEYBOARD_TAG "keyboard"
-
 class k8915_state : public driver_device
 {
 public:
 	k8915_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
-		m_p_videoram(*this, "p_videoram")
+		m_p_videoram(*this, "videoram")
 	{
 	}
 
@@ -67,7 +65,7 @@ WRITE8_MEMBER( k8915_state::k8915_a8_w )
 static ADDRESS_MAP_START(k8915_mem, AS_PROGRAM, 8, k8915_state)
 	ADDRESS_MAP_UNMAP_HIGH
 	AM_RANGE(0x0000, 0x0fff) AM_RAMBANK("boot")
-	AM_RANGE(0x1000, 0x17ff) AM_RAM AM_SHARE("p_videoram")
+	AM_RANGE(0x1000, 0x17ff) AM_RAM AM_SHARE("videoram")
 	AM_RANGE(0x1800, 0xffff) AM_RAM
 ADDRESS_MAP_END
 
@@ -166,7 +164,7 @@ static MACHINE_CONFIG_START( k8915, k8915_state )
 
 	MCFG_PALETTE_ADD_MONOCHROME("palette")
 
-	MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0)
+	MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
 	MCFG_GENERIC_KEYBOARD_CB(WRITE8(k8915_state, kbd_put))
 MACHINE_CONFIG_END
 
diff --git a/src/mame/drivers/llc.cpp b/src/mame/drivers/llc.cpp
index e01e1ad72b9..e2faf3bf50c 100644
--- a/src/mame/drivers/llc.cpp
+++ b/src/mame/drivers/llc.cpp
@@ -51,8 +51,6 @@
 #include "includes/llc.h"
 #include "llc1.lh"
 
-#define KEYBOARD_TAG "keyboard"
-
 /* Address maps */
 static ADDRESS_MAP_START( llc1_mem, AS_PROGRAM, 8, llc_state )
 	AM_RANGE(0x0000, 0x07ff) AM_ROM // Monitor ROM
@@ -234,7 +232,7 @@ static MACHINE_CONFIG_START( llc1, llc_state )
 	MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg1))
 	MCFG_Z80CTC_ZC1_CB(DEVWRITELINE("z80ctc", z80ctc_device, trg3))
 
-	MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0)
+	MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
 	MCFG_GENERIC_KEYBOARD_CB(WRITE8(llc_state, kbd_put))
 MACHINE_CONFIG_END
 
diff --git a/src/mame/drivers/m20.cpp b/src/mame/drivers/m20.cpp
index 2dd25590d9c..12481737d0f 100644
--- a/src/mame/drivers/m20.cpp
+++ b/src/mame/drivers/m20.cpp
@@ -68,7 +68,7 @@ public:
 		m_floppy0(*this, "fd1797:0:5dd"),
 		m_floppy1(*this, "fd1797:1:5dd"),
 		m_apb(*this, "apb"),
-		m_p_videoram(*this, "p_videoram"),
+		m_p_videoram(*this, "videoram"),
 		m_palette(*this, "palette")
 	{
 	}
@@ -312,13 +312,13 @@ B/W, 128K cards, 3 cards => 512K of memory:
 
 static ADDRESS_MAP_START(m20_program_mem, AS_PROGRAM, 16, m20_state)
 	ADDRESS_MAP_UNMAP_HIGH
-	AM_RANGE( 0x30000, 0x33fff ) AM_RAM AM_SHARE("p_videoram")
+	AM_RANGE( 0x30000, 0x33fff ) AM_RAM AM_SHARE("videoram")
 	AM_RANGE( 0x40000, 0x41fff ) AM_ROM AM_REGION("maincpu", 0x00000)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START(m20_data_mem, AS_DATA, 16, m20_state)
 	ADDRESS_MAP_UNMAP_HIGH
-	AM_RANGE( 0x30000, 0x33fff ) AM_RAM AM_SHARE("p_videoram")
+	AM_RANGE( 0x30000, 0x33fff ) AM_RAM AM_SHARE("videoram")
 	AM_RANGE( 0x40000, 0x41fff ) AM_ROM AM_REGION("maincpu", 0x00000)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/m79152pc.cpp b/src/mame/drivers/m79152pc.cpp
index 33793aee66b..4228c278336 100644
--- a/src/mame/drivers/m79152pc.cpp
+++ b/src/mame/drivers/m79152pc.cpp
@@ -18,8 +18,8 @@ class m79152pc_state : public driver_device
 public:
 	m79152pc_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
-		m_p_videoram(*this, "p_videoram"),
-		m_p_attributes(*this, "p_attributes"),
+		m_p_videoram(*this, "videoram"),
+		m_p_attributes(*this, "attributes"),
 		m_maincpu(*this, "maincpu") { }
 
 	uint8_t *m_p_chargen;
@@ -35,8 +35,8 @@ static ADDRESS_MAP_START(m79152pc_mem, AS_PROGRAM, 8, m79152pc_state)
 	ADDRESS_MAP_UNMAP_HIGH
 	AM_RANGE(0x0000, 0x3fff) AM_ROM
 	AM_RANGE(0x4000, 0x47ff) AM_RAM
-	AM_RANGE(0x8000, 0x8fff) AM_RAM AM_SHARE("p_videoram")
-	AM_RANGE(0x9000, 0x9fff) AM_RAM AM_SHARE("p_attributes")
+	AM_RANGE(0x8000, 0x8fff) AM_RAM AM_SHARE("videoram")
+	AM_RANGE(0x9000, 0x9fff) AM_RAM AM_SHARE("attributes")
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( m79152pc_io, AS_IO, 8, m79152pc_state)
diff --git a/src/mame/drivers/mes.cpp b/src/mame/drivers/mes.cpp
index 416d76dc6cd..0f8daa02678 100644
--- a/src/mame/drivers/mes.cpp
+++ b/src/mame/drivers/mes.cpp
@@ -18,7 +18,7 @@ public:
 	mes_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
 	m_maincpu(*this, "maincpu"),
-	m_p_videoram(*this, "p_videoram"){ }
+	m_p_videoram(*this, "videoram"){ }
 
 	required_device<cpu_device> m_maincpu;
 	const uint8_t *m_p_chargen;
@@ -34,7 +34,7 @@ static ADDRESS_MAP_START(mes_mem, AS_PROGRAM, 8, mes_state)
 	ADDRESS_MAP_UNMAP_HIGH
 	AM_RANGE(0x0000, 0x0fff) AM_ROM
 	AM_RANGE(0x1000, 0xefff) AM_RAM
-	AM_RANGE(0xf000, 0xffff) AM_RAM AM_SHARE("p_videoram")
+	AM_RANGE(0xf000, 0xffff) AM_RAM AM_SHARE("videoram")
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( mes_io, AS_IO, 8, mes_state)
diff --git a/src/mame/drivers/modellot.cpp b/src/mame/drivers/modellot.cpp
index 6d8317f1a8a..4db699ae724 100644
--- a/src/mame/drivers/modellot.cpp
+++ b/src/mame/drivers/modellot.cpp
@@ -20,8 +20,6 @@
 #include "cpu/z80/z80.h"
 #include "machine/keyboard.h"
 
-#define KEYBOARD_TAG "keyboard"
-
 class modellot_state : public driver_device
 {
 public:
@@ -167,7 +165,7 @@ static MACHINE_CONFIG_START( modellot, modellot_state )
 	MCFG_PALETTE_ADD_MONOCHROME("palette")
 
 	/* Devices */
-	MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0)
+	MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
 	MCFG_GENERIC_KEYBOARD_CB(WRITE8(modellot_state, kbd_put))
 MACHINE_CONFIG_END
 
diff --git a/src/mame/drivers/mx2178.cpp b/src/mame/drivers/mx2178.cpp
index 627d65b5043..6fd41d07583 100644
--- a/src/mame/drivers/mx2178.cpp
+++ b/src/mame/drivers/mx2178.cpp
@@ -26,8 +26,6 @@
 #include "machine/clock.h"
 #include "machine/keyboard.h"
 
-#define KEYBOARD_TAG "keyboard"
-
 class mx2178_state : public driver_device
 {
 public:
@@ -181,7 +179,7 @@ static MACHINE_CONFIG_START( mx2178, mx2178_state )
 
 	/// TODO: hook up acia to keyboard and memory map
 
-	MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0)
+	MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
 	MCFG_GENERIC_KEYBOARD_CB(WRITE8(mx2178_state, kbd_put))
 
 	MCFG_DEVICE_ADD("acia_clock", CLOCK, 614400)
diff --git a/src/mame/drivers/mz80.cpp b/src/mame/drivers/mz80.cpp
index 661671ac470..cbba39680b1 100644
--- a/src/mame/drivers/mz80.cpp
+++ b/src/mame/drivers/mz80.cpp
@@ -244,7 +244,7 @@ static ADDRESS_MAP_START( mz80k_mem, AS_PROGRAM, 8, mz80_state )
 	ADDRESS_MAP_UNMAP_HIGH
 	AM_RANGE(0x0000, 0x0fff) AM_ROM
 	AM_RANGE(0x1000, 0xcfff) AM_RAM AM_SHARE("p_ram") // 48 KB of RAM
-	AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_SHARE("p_videoram") // Video RAM
+	AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_SHARE("videoram") // Video RAM
 	AM_RANGE(0xe000, 0xe003) AM_DEVREADWRITE("ppi8255", i8255_device, read, write) /* PPIA 8255 */
 	AM_RANGE(0xe004, 0xe007) AM_DEVREADWRITE("pit8253", pit8253_device, read, write)  /* PIT 8253  */
 	AM_RANGE(0xe008, 0xe00b) AM_READWRITE( mz80k_strobe_r, mz80k_strobe_w)
diff --git a/src/mame/drivers/okean240.cpp b/src/mame/drivers/okean240.cpp
index 5810d6983d2..a1657b61367 100644
--- a/src/mame/drivers/okean240.cpp
+++ b/src/mame/drivers/okean240.cpp
@@ -54,9 +54,6 @@ Usage of terminal:
 #include "machine/keyboard.h"
 #include "machine/terminal.h"
 
-#define KEYBOARD_TAG "keyboard"
-#define TERMINAL_TAG "terminal"
-
 class okean240_state : public driver_device
 {
 public:
@@ -70,7 +67,7 @@ public:
 		m_term_data(0),
 		m_j(0),
 		m_scroll(0),
-		m_p_videoram(*this, "p_videoram"),
+		m_p_videoram(*this, "videoram"),
 		m_io_modifiers(*this, "MODIFIERS"),
 		m_maincpu(*this, "maincpu")
 	{
@@ -206,7 +203,7 @@ static ADDRESS_MAP_START(okean240_mem, AS_PROGRAM, 8, okean240_state)
 	ADDRESS_MAP_UNMAP_HIGH
 	AM_RANGE(0x0000, 0x07ff) AM_RAMBANK("boot")
 	AM_RANGE(0x0800, 0x3fff) AM_RAM
-	AM_RANGE(0x4000, 0x7fff) AM_RAM AM_SHARE("p_videoram")
+	AM_RANGE(0x4000, 0x7fff) AM_RAM AM_SHARE("videoram")
 	AM_RANGE(0x8000, 0xbfff) AM_RAM
 	AM_RANGE(0xc000, 0xffff) AM_ROM
 ADDRESS_MAP_END
@@ -243,7 +240,7 @@ static ADDRESS_MAP_START(okean240t_io, AS_IO, 8, okean240_state)
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x40, 0x42) AM_READWRITE(okean240_keyboard_r,okean240_keyboard_w)
 	AM_RANGE(0x80, 0x80) AM_READ(okean240_kbd_status_r)
-	AM_RANGE(0xa0, 0xa0) AM_DEVWRITE(TERMINAL_TAG, generic_terminal_device, write)
+	AM_RANGE(0xa0, 0xa0) AM_DEVWRITE("terminal", generic_terminal_device, write)
 	AM_RANGE(0xa0, 0xa0) AM_READ(term_r)
 	AM_RANGE(0xa1, 0xa1) AM_READ(term_status_r)
 	AM_RANGE(0xc0, 0xc0) AM_WRITE(scroll_w)
@@ -490,7 +487,7 @@ static MACHINE_CONFIG_START( okean240t, okean240_state )
 
 	MCFG_PALETTE_ADD_MONOCHROME("palette")
 
-	MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
+	MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0)
 	MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(okean240_state, kbd_put))
 MACHINE_CONFIG_END
 
@@ -498,8 +495,8 @@ static MACHINE_CONFIG_DERIVED( okean240a, okean240t )
 	MCFG_CPU_MODIFY("maincpu")
 	MCFG_CPU_IO_MAP(okean240a_io)
 	MCFG_GFXDECODE_ADD("gfxdecode", "palette", okean240a)
-	MCFG_DEVICE_REMOVE(TERMINAL_TAG)
-	MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0)
+	MCFG_DEVICE_REMOVE("terminal")
+	MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
 	MCFG_GENERIC_KEYBOARD_CB(WRITE8(okean240_state, kbd_put))
 MACHINE_CONFIG_END
 
@@ -507,8 +504,8 @@ static MACHINE_CONFIG_DERIVED( okean240, okean240t )
 	MCFG_CPU_MODIFY("maincpu")
 	MCFG_CPU_IO_MAP(okean240_io)
 	MCFG_GFXDECODE_ADD("gfxdecode", "palette", okean240)
-	MCFG_DEVICE_REMOVE(TERMINAL_TAG)
-	MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0)
+	MCFG_DEVICE_REMOVE("terminal")
+	MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
 	MCFG_GENERIC_KEYBOARD_CB(WRITE8(okean240_state, kbd_put))
 MACHINE_CONFIG_END
 
diff --git a/src/mame/drivers/phunsy.cpp b/src/mame/drivers/phunsy.cpp
index 2221597d4b5..f93e0d68fc2 100644
--- a/src/mame/drivers/phunsy.cpp
+++ b/src/mame/drivers/phunsy.cpp
@@ -37,8 +37,6 @@
 
 #define LOG 1
 
-#define KEYBOARD_TAG "keyboard"
-
 class phunsy_state : public driver_device
 {
 public:
@@ -363,7 +361,7 @@ static MACHINE_CONFIG_START( phunsy, phunsy_state )
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 
 	/* Devices */
-	MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0)
+	MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
 	MCFG_GENERIC_KEYBOARD_CB(WRITE8(phunsy_state, kbd_put))
 	MCFG_CASSETTE_ADD( "cassette" )
 
diff --git a/src/mame/drivers/plan80.cpp b/src/mame/drivers/plan80.cpp
index 99ef3aabe0e..af9d3de4f74 100644
--- a/src/mame/drivers/plan80.cpp
+++ b/src/mame/drivers/plan80.cpp
@@ -38,7 +38,7 @@ public:
 	plan80_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
 		, m_maincpu(*this, "maincpu")
-		, m_p_videoram(*this, "p_videoram")
+		, m_p_videoram(*this, "videoram")
 	{ }
 
 	required_device<cpu_device> m_maincpu;
@@ -88,7 +88,7 @@ static ADDRESS_MAP_START(plan80_mem, AS_PROGRAM, 8, plan80_state)
 	ADDRESS_MAP_UNMAP_HIGH
 	AM_RANGE(0x0000, 0x07ff) AM_RAMBANK("boot")
 	AM_RANGE(0x0800, 0xefff) AM_RAM
-	AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_SHARE("p_videoram")
+	AM_RANGE(0xf000, 0xf7ff) AM_RAM AM_SHARE("videoram")
 	AM_RANGE(0xf800, 0xffff) AM_ROM
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/poly.cpp b/src/mame/drivers/poly.cpp
index 3557dd0d7f6..6771465d81a 100644
--- a/src/mame/drivers/poly.cpp
+++ b/src/mame/drivers/poly.cpp
@@ -41,8 +41,6 @@
 #include "machine/keyboard.h"
 #include "sound/speaker.h"
 
-#define KEYBOARD_TAG "keyboard"
-
 class poly_state : public driver_device
 {
 public:
@@ -198,7 +196,7 @@ static MACHINE_CONFIG_START( poly, poly_state )
 
 	MCFG_DEVICE_ADD("adlc", MC6854, 0)
 
-	MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0)
+	MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
 	MCFG_GENERIC_KEYBOARD_CB(WRITE8(poly_state, kbd_put))
 MACHINE_CONFIG_END
 
diff --git a/src/mame/drivers/pv1000.cpp b/src/mame/drivers/pv1000.cpp
index 1b7bf3402bd..924a8293a64 100644
--- a/src/mame/drivers/pv1000.cpp
+++ b/src/mame/drivers/pv1000.cpp
@@ -147,7 +147,7 @@ public:
 		m_maincpu(*this, "maincpu"),
 		m_sound(*this, "pv1000_sound"),
 		m_cart(*this, "cartslot"),
-		m_p_videoram(*this, "p_videoram"),
+		m_p_videoram(*this, "videoram"),
 		m_gfxdecode(*this, "gfxdecode"),
 		m_screen(*this, "screen"),
 		m_palette(*this, "palette")
@@ -187,7 +187,7 @@ public:
 
 static ADDRESS_MAP_START( pv1000, AS_PROGRAM, 8, pv1000_state )
 	//AM_RANGE(0x0000, 0x7fff)      // mapped by the cartslot
-	AM_RANGE(0xb800, 0xbbff) AM_RAM AM_SHARE("p_videoram")
+	AM_RANGE(0xb800, 0xbbff) AM_RAM AM_SHARE("videoram")
 	AM_RANGE(0xbc00, 0xbfff) AM_RAM_WRITE(gfxram_w) AM_REGION("gfxram", 0)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/sapi1.cpp b/src/mame/drivers/sapi1.cpp
index bd4a9591b7e..afda5083ffc 100644
--- a/src/mame/drivers/sapi1.cpp
+++ b/src/mame/drivers/sapi1.cpp
@@ -38,9 +38,6 @@ Unable to proceed due to no info available (& in English).
 #include "machine/keyboard.h"
 #include "machine/terminal.h"
 
-#define TERMINAL_TAG "terminal"
-#define KEYBOARD_TAG "keyboard"
-
 class sapi1_state : public driver_device
 {
 public:
@@ -226,7 +223,7 @@ static ADDRESS_MAP_START( sapi3a_io, AS_IO, 8, sapi1_state )
 	ADDRESS_MAP_UNMAP_HIGH
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x00) AM_WRITE(sapi3_00_w)
-	AM_RANGE(0x12, 0x12) AM_READ(sapi2_keyboard_data_r) AM_DEVWRITE(TERMINAL_TAG, generic_terminal_device, write)
+	AM_RANGE(0x12, 0x12) AM_READ(sapi2_keyboard_data_r) AM_DEVWRITE("terminal", generic_terminal_device, write)
 	AM_RANGE(0x25, 0x25) AM_READWRITE(sapi3_25_r,sapi3_25_w)
 ADDRESS_MAP_END
 
@@ -560,7 +557,7 @@ static MACHINE_CONFIG_DERIVED( sapi2, sapi1 )
 	/* basic machine hardware */
 	MCFG_CPU_MODIFY("maincpu")
 	MCFG_CPU_PROGRAM_MAP(sapi2_mem)
-	MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0)
+	MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
 	MCFG_GENERIC_KEYBOARD_CB(WRITE8(sapi1_state, kbd_put))
 MACHINE_CONFIG_END
 
@@ -600,7 +597,7 @@ static MACHINE_CONFIG_START( sapi3a, sapi1_state )
 	MCFG_MACHINE_RESET_OVERRIDE(sapi1_state, sapizps3 )
 
 	/* video hardware */
-	MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
+	MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0)
 	MCFG_GENERIC_TERMINAL_KEYBOARD_CB(WRITE8(sapi1_state, kbd_put))
 
 	/* internal ram */
diff --git a/src/mame/drivers/special.cpp b/src/mame/drivers/special.cpp
index b4ce4e5ac49..dc3c07ba188 100644
--- a/src/mame/drivers/special.cpp
+++ b/src/mame/drivers/special.cpp
@@ -17,7 +17,7 @@
 static ADDRESS_MAP_START(specialist_mem, AS_PROGRAM, 8, special_state )
 	AM_RANGE( 0x0000, 0x2fff ) AM_RAMBANK("bank1") // First bank
 	AM_RANGE( 0x3000, 0x8fff ) AM_RAM  // RAM
-	AM_RANGE( 0x9000, 0xbfff ) AM_RAM  AM_SHARE("p_videoram") // Video RAM
+	AM_RANGE( 0x9000, 0xbfff ) AM_RAM  AM_SHARE("videoram") // Video RAM
 	AM_RANGE( 0xc000, 0xefff ) AM_ROM  // System ROM
 	AM_RANGE( 0xf800, 0xf803 ) AM_MIRROR(0x7fc) AM_DEVREADWRITE("ppi8255", i8255_device, read, write)
 ADDRESS_MAP_END
@@ -25,7 +25,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START(specialp_mem, AS_PROGRAM, 8, special_state )
 	AM_RANGE( 0x0000, 0x2fff ) AM_RAMBANK("bank1") // First bank
 	AM_RANGE( 0x3000, 0x7fff ) AM_RAM  // RAM
-	AM_RANGE( 0x8000, 0xbfff ) AM_RAM  AM_SHARE("p_videoram") // Video RAM
+	AM_RANGE( 0x8000, 0xbfff ) AM_RAM  AM_SHARE("videoram") // Video RAM
 	AM_RANGE( 0xc000, 0xefff ) AM_ROM  // System ROM
 	AM_RANGE( 0xf800, 0xf803 ) AM_MIRROR(0x7fc) AM_DEVREADWRITE("ppi8255", i8255_device, read, write)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/tavernie.cpp b/src/mame/drivers/tavernie.cpp
index 89496153b65..36f4a86e8d0 100644
--- a/src/mame/drivers/tavernie.cpp
+++ b/src/mame/drivers/tavernie.cpp
@@ -62,8 +62,6 @@ Z - more scan lines per row (cursor is bigger)
 #include "sound/beep.h"
 #include "tavernie.lh"
 
-#define KEYBOARD_TAG "keyboard"
-
 class tavernie_state : public driver_device
 {
 public:
@@ -356,7 +354,7 @@ static MACHINE_CONFIG_DERIVED( ivg09, cpu09 )
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 
 	/* Devices */
-	MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0)
+	MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
 	MCFG_GENERIC_KEYBOARD_CB(WRITE8(tavernie_state, kbd_put))
 
 	MCFG_MC6845_ADD("crtc", MC6845, "screen", 1008000) // unknown clock
diff --git a/src/mame/drivers/tk80bs.cpp b/src/mame/drivers/tk80bs.cpp
index 728e6c8401b..81d38d4a795 100644
--- a/src/mame/drivers/tk80bs.cpp
+++ b/src/mame/drivers/tk80bs.cpp
@@ -27,8 +27,6 @@ TODO:
 #include "machine/i8255.h"
 #include "machine/keyboard.h"
 
-#define KEYBOARD_TAG "keyboard"
-
 class tk80bs_state : public driver_device
 {
 public:
@@ -189,7 +187,7 @@ static MACHINE_CONFIG_START( tk80bs, tk80bs_state )
 	MCFG_I8255_IN_PORTA_CB(READ8(tk80bs_state, port_a_r))
 	MCFG_I8255_IN_PORTB_CB(READ8(tk80bs_state, port_b_r))
 
-	MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0)
+	MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
 	MCFG_GENERIC_KEYBOARD_CB(WRITE8(tk80bs_state, kbd_put))
 MACHINE_CONFIG_END
 
diff --git a/src/mame/drivers/trs80.cpp b/src/mame/drivers/trs80.cpp
index 46bf876a5d9..b5800cae666 100644
--- a/src/mame/drivers/trs80.cpp
+++ b/src/mame/drivers/trs80.cpp
@@ -143,7 +143,7 @@ There don't seem to be any JV1 boot disks for Model III/4.
 static ADDRESS_MAP_START( trs80_map, AS_PROGRAM, 8, trs80_state )
 	AM_RANGE(0x0000, 0x0fff) AM_ROM
 	AM_RANGE(0x3800, 0x38ff) AM_READ(trs80_keyboard_r)
-	AM_RANGE(0x3c00, 0x3fff) AM_READWRITE(trs80_videoram_r, trs80_videoram_w) AM_SHARE("p_videoram")
+	AM_RANGE(0x3c00, 0x3fff) AM_READWRITE(trs80_videoram_r, trs80_videoram_w) AM_SHARE("videoram")
 	AM_RANGE(0x4000, 0x7fff) AM_RAM
 ADDRESS_MAP_END
 
@@ -166,7 +166,7 @@ static ADDRESS_MAP_START( model1_map, AS_PROGRAM, 8, trs80_state )
 	AM_RANGE(0x37ee, 0x37ee) AM_DEVREADWRITE("fdc", fd1793_t, sector_r, sector_w)
 	AM_RANGE(0x37ef, 0x37ef) AM_DEVREADWRITE("fdc", fd1793_t, data_r, data_w)
 	AM_RANGE(0x3800, 0x38ff) AM_MIRROR(0x300) AM_READ(trs80_keyboard_r)
-	AM_RANGE(0x3c00, 0x3fff) AM_READWRITE(trs80_videoram_r, trs80_videoram_w) AM_SHARE("p_videoram")
+	AM_RANGE(0x3c00, 0x3fff) AM_READWRITE(trs80_videoram_r, trs80_videoram_w) AM_SHARE("videoram")
 	AM_RANGE(0x4000, 0xffff) AM_RAM
 ADDRESS_MAP_END
 
@@ -274,7 +274,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( meritum_map, AS_PROGRAM, 8, trs80_state )
 	AM_RANGE(0x0000, 0x37ff) AM_ROM
 	AM_RANGE(0x3800, 0x38ff) AM_MIRROR(0x300) AM_READ(trs80_keyboard_r)
-	AM_RANGE(0x3c00, 0x3fff) AM_READWRITE(trs80_videoram_r, trs80_videoram_w) AM_SHARE("p_videoram")
+	AM_RANGE(0x3c00, 0x3fff) AM_READWRITE(trs80_videoram_r, trs80_videoram_w) AM_SHARE("videoram")
 	AM_RANGE(0x4000, 0xffff) AM_RAM
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/ut88.cpp b/src/mame/drivers/ut88.cpp
index 85e51348cbf..3c66e2d6165 100644
--- a/src/mame/drivers/ut88.cpp
+++ b/src/mame/drivers/ut88.cpp
@@ -44,7 +44,7 @@ static ADDRESS_MAP_START( ut88_mem, AS_PROGRAM, 8, ut88_state )
 	AM_RANGE( 0x0000, 0x07ff ) AM_RAMBANK("bank1") // First bank
 	AM_RANGE( 0x0800, 0xdfff ) AM_RAM  // RAM
 	AM_RANGE( 0xe000, 0xe7ff ) AM_RAM  // Video RAM (not used)
-	AM_RANGE( 0xe800, 0xefff ) AM_RAM AM_SHARE("p_videoram") // Video RAM
+	AM_RANGE( 0xe800, 0xefff ) AM_RAM AM_SHARE("videoram") // Video RAM
 	AM_RANGE( 0xf400, 0xf7ff ) AM_RAM  // System RAM
 	AM_RANGE( 0xf800, 0xffff ) AM_ROM  // System ROM
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/v6809.cpp b/src/mame/drivers/v6809.cpp
index abdfabadf6d..80af98465fa 100644
--- a/src/mame/drivers/v6809.cpp
+++ b/src/mame/drivers/v6809.cpp
@@ -60,8 +60,6 @@ ToDo:
 #include "sound/speaker.h"
 #include "machine/wd_fdc.h"
 
-#define KEYBOARD_TAG "keyboard"
-
 class v6809_state : public driver_device
 {
 public:
@@ -323,7 +321,7 @@ static MACHINE_CONFIG_START( v6809, v6809_state )
 	MCFG_MC6845_UPDATE_ROW_CB(v6809_state, crtc_update_row)
 	MCFG_MC6845_ADDR_CHANGED_CB(v6809_state, crtc_update_addr)
 
-	MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0)
+	MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
 	MCFG_GENERIC_KEYBOARD_CB(WRITE8(v6809_state, kbd_put))
 
 // port A = drive select and 2 control lines ; port B = keyboard
diff --git a/src/mame/drivers/z9001.cpp b/src/mame/drivers/z9001.cpp
index 7ce228bafd7..3c144f6eb01 100644
--- a/src/mame/drivers/z9001.cpp
+++ b/src/mame/drivers/z9001.cpp
@@ -39,8 +39,6 @@ ToDo:
 // temporary
 #include "machine/keyboard.h"
 
-#define KEYBOARD_TAG "keyboard"
-
 class z9001_state : public driver_device
 {
 public:
@@ -227,7 +225,7 @@ static MACHINE_CONFIG_START( z9001, z9001_state )
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
 
 	/* Devices */
-	MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0)
+	MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
 	MCFG_GENERIC_KEYBOARD_CB(WRITE8(z9001_state, kbd_put))
 	MCFG_TIMER_DRIVER_ADD_PERIODIC("z9001_timer", z9001_state, timer_callback, attotime::from_msec(10))
 
diff --git a/src/mame/drivers/zrt80.cpp b/src/mame/drivers/zrt80.cpp
index d6d652a85ae..f6f14dee9ba 100644
--- a/src/mame/drivers/zrt80.cpp
+++ b/src/mame/drivers/zrt80.cpp
@@ -23,8 +23,6 @@
 #include "machine/keyboard.h"
 #include "sound/beep.h"
 
-#define KEYBOARD_TAG "keyboard"
-
 class zrt80_state : public driver_device
 {
 public:
@@ -302,7 +300,7 @@ static MACHINE_CONFIG_START( zrt80, zrt80_state )
 
 	MCFG_DEVICE_ADD( "ins8250", INS8250, 2457600 )
 	MCFG_INS8250_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
-	MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0)
+	MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
 	MCFG_GENERIC_KEYBOARD_CB(WRITE8(zrt80_state, kbd_put))
 MACHINE_CONFIG_END
 
diff --git a/src/mame/includes/jupiter.h b/src/mame/includes/jupiter.h
index 479e57f8807..4a10d99bfb9 100644
--- a/src/mame/includes/jupiter.h
+++ b/src/mame/includes/jupiter.h
@@ -17,43 +17,42 @@ class jupiter2_state : public driver_device
 {
 public:
 	jupiter2_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag),
-	m_maincpu(*this, MCM6571AP_TAG)
-	{ }
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, MCM6571AP_TAG)
+		{ }
 
-	required_device<cpu_device> m_maincpu;
-
-	virtual void machine_start() override;
 	DECLARE_DRIVER_INIT(jupiter);
+
+private:
+	required_device<cpu_device> m_maincpu;
+	virtual void machine_start() override;
 };
 
 class jupiter3_state : public driver_device
 {
 public:
 	jupiter3_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag),
-	m_maincpu(*this, Z80_TAG),
-	m_p_videoram(*this, "p_videoram"),
-	m_p_ram(*this, "p_ram")
-	{ }
-
-	required_device<cpu_device> m_maincpu;
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, Z80_TAG)
+		, m_p_videoram(*this, "videoram")
+		, m_p_ram(*this, "p_ram")
+		{ }
 
+	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	DECLARE_DRIVER_INIT(jupiter3);
 	DECLARE_WRITE8_MEMBER(kbd_put);
 	DECLARE_READ8_MEMBER(status_r);
 	DECLARE_READ8_MEMBER(key_r);
 	DECLARE_READ8_MEMBER(ff_r);
-	uint8_t m_term_data;
 
+private:
+	required_device<cpu_device> m_maincpu;
+	uint8_t m_term_data;
 	required_shared_ptr<uint8_t> m_p_videoram;
 	required_shared_ptr<uint8_t> m_p_ram;
 	const uint8_t *m_p_chargen;
-
 	virtual void machine_reset() override;
 	virtual void video_start() override;
-	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-
-	DECLARE_DRIVER_INIT(jupiter3);
 };
 
 #endif
diff --git a/src/mame/includes/trs80.h b/src/mame/includes/trs80.h
index 013d4037d13..2ebbe72230e 100644
--- a/src/mame/includes/trs80.h
+++ b/src/mame/includes/trs80.h
@@ -40,7 +40,7 @@ public:
 		m_floppy3(*this, "fdc:3"),
 		m_speaker(*this, "speaker"),
 		m_cassette(*this, "cassette"),
-		m_p_videoram(*this, "p_videoram"),
+		m_p_videoram(*this, "videoram"),
 		m_region_maincpu(*this, "maincpu"),
 		m_io_config(*this, "CONFIG"),
 		m_io_line0(*this, "LINE0"),
diff --git a/src/mame/machine/teleprinter.cpp b/src/mame/machine/teleprinter.cpp
index 658bdf691b6..8ffc4144794 100644
--- a/src/mame/machine/teleprinter.cpp
+++ b/src/mame/machine/teleprinter.cpp
@@ -2,8 +2,6 @@
 // copyright-holders:Miodrag Milanovic
 #include "teleprinter.h"
 
-#define KEYBOARD_TAG "keyboard"
-
 static const uint8_t teleprinter_font[128*8] =
 {
 	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@@ -215,7 +213,7 @@ MACHINE_CONFIG_FRAGMENT( generic_teleprinter )
 	MCFG_SCREEN_SIZE(TELEPRINTER_WIDTH*8, TELEPRINTER_HEIGHT*8)
 	MCFG_SCREEN_VISIBLE_AREA(0, TELEPRINTER_WIDTH*8-1, 0, TELEPRINTER_HEIGHT*8-1)
 	MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, teleprinter_device, tp_update)
-	MCFG_DEVICE_ADD(KEYBOARD_TAG, GENERIC_KEYBOARD, 0)
+	MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
 	MCFG_GENERIC_KEYBOARD_CB(WRITE8(generic_terminal_device, kbd_put))
 
 	MCFG_SPEAKER_STANDARD_MONO("bell")