diff --git a/src/mame/drivers/acd.cpp b/src/mame/drivers/acd.cpp
index 335eb96a91d..478d6652154 100644
--- a/src/mame/drivers/acd.cpp
+++ b/src/mame/drivers/acd.cpp
@@ -16,11 +16,11 @@ class acd_state : public driver_device
 public:
 	acd_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
-//		, maincpu(*this, "maincpu")
+//		, m_maincpu(*this, "maincpu")
 	{ }
 
 protected:
-//	required_device<i80c52_device> maincpu;
+//	required_device<i80c52_device> m_maincpu;
 };
 
 static INPUT_PORTS_START( acd )
diff --git a/src/mame/drivers/altos2.cpp b/src/mame/drivers/altos2.cpp
index 71e9c4bedbe..4a21768106d 100644
--- a/src/mame/drivers/altos2.cpp
+++ b/src/mame/drivers/altos2.cpp
@@ -22,11 +22,11 @@ class altos2_state : public driver_device
 public:
 	altos2_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
-//		, maincpu(*this, "maincpu")
+//		, m_maincpu(*this, "maincpu")
 	{ }
 
 protected:
-//	required_device<i80c52_device> maincpu;
+//	required_device<i80c52_device> m_maincpu;
 };
 
 static INPUT_PORTS_START( altos2 )
diff --git a/src/mame/drivers/ampscarp.cpp b/src/mame/drivers/ampscarp.cpp
index 9c6e78bee44..065c13fc1c5 100644
--- a/src/mame/drivers/ampscarp.cpp
+++ b/src/mame/drivers/ampscarp.cpp
@@ -16,11 +16,11 @@ class ampscarp_state : public driver_device
 public:
 	ampscarp_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
-//		, maincpu(*this, "maincpu")
+//		, m_maincpu(*this, "maincpu")
 	{ }
 
 protected:
-//	required_device<i80c52_device> maincpu;
+//	required_device<i80c52_device> m_maincpu;
 };
 
 static INPUT_PORTS_START( ampscarp )
diff --git a/src/mame/drivers/basic52.cpp b/src/mame/drivers/basic52.cpp
index e2daa857e20..b998fe53ba6 100644
--- a/src/mame/drivers/basic52.cpp
+++ b/src/mame/drivers/basic52.cpp
@@ -37,22 +37,22 @@ to discover the special features of this Basic.
 #include "machine/i8255.h"
 #include "machine/terminal.h"
 
-#define TERMINAL_TAG "terminal"
 
 class basic52_state : public driver_device
 {
 public:
 	basic52_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag),
-		m_maincpu(*this, "maincpu")
-	{
-	}
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+	{ }
 
 	void kbd_put(u8 data);
 	DECLARE_READ8_MEMBER(unk_r);
+	DECLARE_READ8_MEMBER(from_term);
+
+private:
 	uint8_t m_term_data;
 	required_device<mcs51_cpu_device> m_maincpu;
-	DECLARE_READ8_MEMBER(from_term);
 };
 
 
@@ -103,11 +103,11 @@ static MACHINE_CONFIG_START( basic31 )
 	MCFG_CPU_ADD("maincpu", I8031, XTAL_11_0592MHz)
 	MCFG_CPU_PROGRAM_MAP(basic52_mem)
 	MCFG_CPU_IO_MAP(basic52_io)
-	MCFG_MCS51_SERIAL_TX_CB(DEVWRITE8(TERMINAL_TAG, generic_terminal_device, write))
+	MCFG_MCS51_SERIAL_TX_CB(DEVWRITE8("terminal", generic_terminal_device, write))
 	MCFG_MCS51_SERIAL_RX_CB(READ8(basic52_state, from_term))
 
 	/* video hardware */
-	MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0)
+	MCFG_DEVICE_ADD("terminal", GENERIC_TERMINAL, 0)
 	MCFG_GENERIC_TERMINAL_KEYBOARD_CB(PUT(basic52_state, kbd_put))
 
 	MCFG_DEVICE_ADD("ppi8255", I8255, 0)
@@ -118,7 +118,7 @@ static MACHINE_CONFIG_DERIVED( basic52, basic31 )
 	MCFG_CPU_REPLACE("maincpu", I8052, XTAL_11_0592MHz)
 	MCFG_CPU_PROGRAM_MAP(basic52_mem)
 	MCFG_CPU_IO_MAP(basic52_io)
-	MCFG_MCS51_SERIAL_TX_CB(DEVWRITE8(TERMINAL_TAG, generic_terminal_device, write))
+	MCFG_MCS51_SERIAL_TX_CB(DEVWRITE8("terminal", generic_terminal_device, write))
 	MCFG_MCS51_SERIAL_RX_CB(READ8(basic52_state, from_term))
 MACHINE_CONFIG_END
 
diff --git a/src/mame/drivers/hazeltine.cpp b/src/mame/drivers/hazeltine.cpp
index 340ad1ea06f..9f5d1cde9b5 100644
--- a/src/mame/drivers/hazeltine.cpp
+++ b/src/mame/drivers/hazeltine.cpp
@@ -19,11 +19,11 @@ class hazeltine_state : public driver_device
 public:
 	hazeltine_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
-//		, maincpu(*this, "maincpu")
+//		, m_maincpu(*this, "maincpu")
 	{ }
 
 protected:
-//	required_device<i80c52_device> maincpu;
+//	required_device<i80c52_device> m_maincpu;
 };
 
 static INPUT_PORTS_START( hazeltine )
diff --git a/src/mame/drivers/lg-dvd.cpp b/src/mame/drivers/lg-dvd.cpp
index e3aba7d3d0b..c393a4cdaa5 100644
--- a/src/mame/drivers/lg-dvd.cpp
+++ b/src/mame/drivers/lg-dvd.cpp
@@ -14,11 +14,11 @@ class lg_dvd_state : public driver_device
 public:
 	lg_dvd_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
-		, maincpu(*this, "maincpu")
+		, m_maincpu(*this, "maincpu")
 	{ }
 
 protected:
-	required_device<i80c52_device> maincpu;
+	required_device<i80c52_device> m_maincpu;
 };
 
 static INPUT_PORTS_START( lg )
diff --git a/src/mame/drivers/perq.cpp b/src/mame/drivers/perq.cpp
index 2ba2d57a9c6..89d8cb20770 100644
--- a/src/mame/drivers/perq.cpp
+++ b/src/mame/drivers/perq.cpp
@@ -19,11 +19,11 @@ class perq_state : public driver_device
 public:
 	perq_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
-//		, maincpu(*this, "maincpu")
+//		, m_maincpu(*this, "maincpu")
 	{ }
 
 protected:
-//	required_device<i80c52_device> maincpu;
+//	required_device<i80c52_device> m_maincpu;
 };
 
 static INPUT_PORTS_START( perq )
diff --git a/src/mame/drivers/powerstack.cpp b/src/mame/drivers/powerstack.cpp
index b09a206a57a..984474cda59 100644
--- a/src/mame/drivers/powerstack.cpp
+++ b/src/mame/drivers/powerstack.cpp
@@ -4,7 +4,7 @@
 
 2017-10-29 Skeleton
 
-Motorola Powerstack II. CPU is a RISC-type.
+Motorola Powerstack II. CPU is a PowerPC 604e @ 300MHz.
 
 ************************************************************************************************************************************/
 
@@ -16,11 +16,11 @@ class powerstack_state : public driver_device
 public:
 	powerstack_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
-//		, maincpu(*this, "maincpu")
+//		, m_maincpu(*this, "maincpu")
 	{ }
 
 protected:
-//	required_device<i80c52_device> maincpu;
+//	required_device<i80c52_device> m_maincpu;
 };
 
 static INPUT_PORTS_START( powerstack )
diff --git a/src/mame/drivers/solbourne.cpp b/src/mame/drivers/solbourne.cpp
index 32a28630712..3da81a220d1 100644
--- a/src/mame/drivers/solbourne.cpp
+++ b/src/mame/drivers/solbourne.cpp
@@ -16,11 +16,11 @@ class solbourne_state : public driver_device
 public:
 	solbourne_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
-//		, maincpu(*this, "maincpu")
+//		, m_maincpu(*this, "maincpu")
 	{ }
 
 protected:
-//	required_device<i80c52_device> maincpu;
+//	required_device<i80c52_device> m_maincpu;
 };
 
 static INPUT_PORTS_START( solbourne )
diff --git a/src/mame/drivers/ts3000.cpp b/src/mame/drivers/ts3000.cpp
index c65364da180..40199fad7e7 100644
--- a/src/mame/drivers/ts3000.cpp
+++ b/src/mame/drivers/ts3000.cpp
@@ -18,11 +18,11 @@ class ts3000_state : public driver_device
 public:
 	ts3000_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
-//		, maincpu(*this, "maincpu")
+//		, m_maincpu(*this, "maincpu")
 	{ }
 
 protected:
-//	required_device<i80c52_device> maincpu;
+//	required_device<i80c52_device> m_maincpu;
 };
 
 static INPUT_PORTS_START( ts3000 )
diff --git a/src/mame/drivers/vectrix.cpp b/src/mame/drivers/vectrix.cpp
index c6a39afd09e..f8b329ea39c 100644
--- a/src/mame/drivers/vectrix.cpp
+++ b/src/mame/drivers/vectrix.cpp
@@ -22,11 +22,11 @@ class vectrix_state : public driver_device
 public:
 	vectrix_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
-//		, maincpu(*this, "maincpu")
+//		, m_maincpu(*this, "maincpu")
 	{ }
 
 protected:
-//	required_device<i80c52_device> maincpu;
+//	required_device<i80c52_device> m_maincpu;
 };
 
 static INPUT_PORTS_START( vectrix )
diff --git a/src/mame/drivers/wyse.cpp b/src/mame/drivers/wyse.cpp
index d041390c904..5ed9746330f 100644
--- a/src/mame/drivers/wyse.cpp
+++ b/src/mame/drivers/wyse.cpp
@@ -16,11 +16,11 @@ class wyse_state : public driver_device
 public:
 	wyse_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
-//		, maincpu(*this, "maincpu")
+//		, m_maincpu(*this, "maincpu")
 	{ }
 
 protected:
-//	required_device<i80c52_device> maincpu;
+//	required_device<i80c52_device> m_maincpu;
 };
 
 static INPUT_PORTS_START( wyse )
diff --git a/src/mame/drivers/zt8802.cpp b/src/mame/drivers/zt8802.cpp
index dd22587b546..97285db67ca 100644
--- a/src/mame/drivers/zt8802.cpp
+++ b/src/mame/drivers/zt8802.cpp
@@ -21,11 +21,11 @@ class zt8802_state : public driver_device
 public:
 	zt8802_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
-//		, maincpu(*this, "maincpu")
+//		, m_maincpu(*this, "maincpu")
 	{ }
 
 protected:
-//	required_device<i80c52_device> maincpu;
+//	required_device<i80c52_device> m_maincpu;
 };
 
 static INPUT_PORTS_START( zt8802 )