diff --git a/src/emu/netlist/analog/nld_opamps.h b/src/emu/netlist/analog/nld_opamps.h
index 28628797ab3..f870c58b465 100644
--- a/src/emu/netlist/analog/nld_opamps.h
+++ b/src/emu/netlist/analog/nld_opamps.h
@@ -24,7 +24,7 @@
 		NETDEV_PARAMI(_name, model, _model)
 
 #define LM3900(_name)                                                          \
-	SUBMODEL(opamp_lm3900, name)
+	SUBMODEL(opamp_lm3900, _name)
 
 // ----------------------------------------------------------------------------------------
 // Devices ...
diff --git a/src/emu/netlist/devices/net_lib.c b/src/emu/netlist/devices/net_lib.c
index e5214392cc4..3be8da86fa7 100644
--- a/src/emu/netlist/devices/net_lib.c
+++ b/src/emu/netlist/devices/net_lib.c
@@ -43,7 +43,7 @@ NETLIST_END()
 
 NETLIST_START(family_models)
 	NET_MODEL(".model 74XXOC FAMILY(IVL=0.8 IVH=2.0 OVL=0.1 OVH=4.95 ORL=10.0 ORH=1.0e8)")
-	NET_MODEL(".model CD4000 FAMILY(TYPE=CD4000)")
+	NET_MODEL(".model CD4XXX FAMILY(TYPE=CD4XXX)")
 NETLIST_END()
 
 
@@ -88,8 +88,6 @@ void initialize_factory(factory_list_t &factory)
 	ENTRY(switch2,              SWITCH2,                "-")
 	ENTRY(nicRSFF,              NETDEV_RSFF,            "+S,R")
 	ENTRY(nicDelay,             NETDEV_DELAY,            "-")
-	ENTRY(4020,                 CD_4020,                "+IP,RESET,VDD,VSS")
-	//ENTRY(4066,                 CD_4066,                "+A,B")
 	ENTRY(7400,                 TTL_7400_NAND,          "+A,B")
 	ENTRY(7402,                 TTL_7402_NOR,           "+A,B")
 	ENTRY(7404,                 TTL_7404_INVERT,        "+A")
@@ -122,11 +120,15 @@ void initialize_factory(factory_list_t &factory)
 	ENTRY(9310,                 TTL_9310,               "-")
 	ENTRY(9312,                 TTL_9312,               "-")
 	ENTRY(9316,                 TTL_9316,               "+CLK,ENP,ENT,CLRQ,LOADQ,A,B,C,D")
+	ENTRY(CD4020,               CD4020,                 "")
+	/* entries with suffix _WI are legacy only */
+	ENTRY(CD4020,               CD4020_WI,              "+IP,RESET,VDD,VSS")
+	//ENTRY(4066,                 CD_4066,              "+A,B")
 	ENTRY(NE555,                NE555,                  "-")
 	ENTRY(r2r_dac,              R2R_DAC,                "+VIN,R,N")
-	ENTRY(4020_dip,             CD_4020_DIP,            "-")
-	ENTRY(4016_dip,             CD_4016_DIP,            "-")
-	ENTRY(4066_dip,             CD_4066_DIP,            "-")
+	ENTRY(CD4020_DIP,           CD4020_DIP,             "-")
+	ENTRY(CD4016_DIP,           CD4016_DIP,             "-")
+	ENTRY(CD4066_DIP,           CD4066_DIP,             "-")
 	ENTRY(4538_dip,             CD4538_DIP,             "-")
 	ENTRY(7400_dip,             TTL_7400_DIP,           "-")
 	ENTRY(7402_dip,             TTL_7402_DIP,           "-")
diff --git a/src/emu/netlist/devices/nld_4020.c b/src/emu/netlist/devices/nld_4020.c
index 6fbeb14cee0..1b0600ca7a8 100644
--- a/src/emu/netlist/devices/nld_4020.c
+++ b/src/emu/netlist/devices/nld_4020.c
@@ -9,7 +9,7 @@
 
 NETLIB_NAMESPACE_DEVICES_START()
 
-NETLIB_START(4020)
+NETLIB_START(CD4020)
 {
 	register_sub("sub", sub);
 	register_sub("supply", m_supply);
@@ -32,13 +32,13 @@ NETLIB_START(4020)
 	register_subalias("VSS", m_supply.m_vss);
 }
 
-NETLIB_RESET(4020)
+NETLIB_RESET(CD4020)
 {
 	sub.do_reset();
 }
 
 
-NETLIB_START(4020_sub)
+NETLIB_START(CD4020_sub)
 {
 	register_input("IP", m_IP);
 
@@ -58,13 +58,13 @@ NETLIB_START(4020_sub)
 	save(NLNAME(m_cnt));
 }
 
-NETLIB_RESET(4020_sub)
+NETLIB_RESET(CD4020_sub)
 {
 	m_IP.set_state(logic_t::STATE_INP_HL);
 	m_cnt = 0;
 }
 
-NETLIB_UPDATE(4020_sub)
+NETLIB_UPDATE(CD4020_sub)
 {
 	UINT8 cnt = m_cnt;
 	cnt = ( cnt + 1) & 0x3fff;
@@ -72,7 +72,7 @@ NETLIB_UPDATE(4020_sub)
 	m_cnt = cnt;
 }
 
-NETLIB_UPDATE(4020)
+NETLIB_UPDATE(CD4020)
 {
 	if (INPLOGIC(m_RESET))
 	{
@@ -87,7 +87,7 @@ NETLIB_UPDATE(4020)
 		sub.m_IP.activate_hl();
 }
 
-inline NETLIB_FUNC_VOID(4020_sub, update_outputs, (const UINT16 cnt))
+inline NETLIB_FUNC_VOID(CD4020_sub, update_outputs, (const UINT16 cnt))
 {
 	/* static */ const netlist_time out_delayQn[14] = {
 			NLTIME_FROM_NS(180), NLTIME_FROM_NS(280),
@@ -104,9 +104,9 @@ inline NETLIB_FUNC_VOID(4020_sub, update_outputs, (const UINT16 cnt))
 		OUTLOGIC(m_Q[i], (cnt >> i) & 1, out_delayQn[i]);
 }
 
-NETLIB_START(4020_dip)
+NETLIB_START(CD4020_DIP)
 {
-	NETLIB_NAME(4020)::start();
+	NETLIB_NAME(CD4020)::start();
 
 		/*          +--------------+
 		*      Q12 |1     ++    16| VDD
@@ -139,14 +139,14 @@ NETLIB_START(4020_dip)
 	register_subalias("16", m_supply.m_vdd);
 }
 
-NETLIB_UPDATE(4020_dip)
+NETLIB_UPDATE(CD4020_DIP)
 {
-	NETLIB_NAME(4020)::update();
+	NETLIB_NAME(CD4020)::update();
 }
 
-NETLIB_RESET(4020_dip)
+NETLIB_RESET(CD4020_DIP)
 {
-	NETLIB_NAME(4020)::reset();
+	NETLIB_NAME(CD4020)::reset();
 }
 
 NETLIB_NAMESPACE_DEVICES_END()
diff --git a/src/emu/netlist/devices/nld_4020.h b/src/emu/netlist/devices/nld_4020.h
index 28e1983d7c7..328594fd5c2 100644
--- a/src/emu/netlist/devices/nld_4020.h
+++ b/src/emu/netlist/devices/nld_4020.h
@@ -30,21 +30,25 @@
 #include "../nl_base.h"
 #include "nld_cmos.h"
 
-#define CD_4020(_name, _IP, _RESET, _VDD, _VSS)                                \
-		NET_REGISTER_DEV(4020, _name)                                          \
+/* FIXME: only used in mario.c */
+#define CD4020_WI(_name, _IP, _RESET, _VDD, _VSS)                              \
+		NET_REGISTER_DEV(CD4020, _name)                                        \
 		NET_CONNECT(_name, IP, _IP)                                            \
 		NET_CONNECT(_name, RESET,  _RESET)                                     \
 		NET_CONNECT(_name, VDD,  _VDD)                                         \
 		NET_CONNECT(_name, VSS,  _VSS)
 
-#define CD_4020_DIP(_name)                                                     \
-		NET_REGISTER_DEV(4020_dip, _name)
+#define CD4020(_name, _IP, _RESET, _VDD, _VSS)                                 \
+		NET_REGISTER_DEV(CD4020, _name)
+
+#define CD4020_DIP(_name)                                                      \
+		NET_REGISTER_DEV(CD4020_DIP, _name)
 
 NETLIB_NAMESPACE_DEVICES_START()
 
-NETLIB_SUBDEVICE(4020_sub,
+NETLIB_SUBDEVICE(CD4020_sub,
 
-	NETLIB_LOGIC_FAMILY(CD4000)
+	NETLIB_LOGIC_FAMILY(CD4XXX)
 	ATTR_HOT void update_outputs(const UINT16 cnt);
 
 	logic_input_t m_IP;
@@ -54,14 +58,14 @@ NETLIB_SUBDEVICE(4020_sub,
 	logic_output_t m_Q[14];
 );
 
-NETLIB_DEVICE(4020,
-	NETLIB_LOGIC_FAMILY(CD4000)
-	NETLIB_NAME(4020_sub) sub;
+NETLIB_DEVICE(CD4020,
+	NETLIB_LOGIC_FAMILY(CD4XXX)
+	NETLIB_NAME(CD4020_sub) sub;
 	NETLIB_NAME(vdd_vss) m_supply;
 	logic_input_t m_RESET;
 );
 
-NETLIB_DEVICE_DERIVED_PURE(4020_dip, 4020);
+NETLIB_DEVICE_DERIVED_PURE(CD4020_DIP, CD4020);
 
 NETLIB_NAMESPACE_DEVICES_END()
 
diff --git a/src/emu/netlist/devices/nld_4066.c b/src/emu/netlist/devices/nld_4066.c
index f0ba4f1c2b5..63746fddf0e 100644
--- a/src/emu/netlist/devices/nld_4066.c
+++ b/src/emu/netlist/devices/nld_4066.c
@@ -9,19 +9,19 @@
 
 NETLIB_NAMESPACE_DEVICES_START()
 
-NETLIB_START(4066)
+NETLIB_START(CD4066)
 {
 	register_input("CTL", m_control);
 	register_sub("R", m_R);
 	m_base_r = 270.0;
 }
 
-NETLIB_RESET(4066)
+NETLIB_RESET(CD4066)
 {
 	m_R.do_reset();
 }
 
-NETLIB_UPDATE(4066)
+NETLIB_UPDATE(CD4066)
 {
 	nl_double sup = (m_supply->vdd() - m_supply->vss());
 	nl_double low = NL_FCONST(0.45) * sup;
@@ -56,7 +56,7 @@ NETLIB_UPDATE(4066)
 }
 
 
-NETLIB_START(4066_dip)
+NETLIB_START(CD4066_DIP)
 {
 	register_sub("supply", m_supply);
 	m_A.m_supply = m_B.m_supply = m_C.m_supply = m_D.m_supply = &m_supply;
@@ -85,7 +85,7 @@ NETLIB_START(4066_dip)
 
 }
 
-NETLIB_RESET(4066_dip)
+NETLIB_RESET(CD4066_DIP)
 {
 	m_A.do_reset();
 	m_B.do_reset();
@@ -93,7 +93,7 @@ NETLIB_RESET(4066_dip)
 	m_D.do_reset();
 }
 
-NETLIB_UPDATE(4066_dip)
+NETLIB_UPDATE(CD4066_DIP)
 {
 	/* only called during startup */
 	m_A.update_dev();
@@ -102,22 +102,22 @@ NETLIB_UPDATE(4066_dip)
 	m_D.update_dev();
 }
 
-NETLIB_START(4016_dip)
+NETLIB_START(CD4016_DIP)
 {
-	NETLIB_NAME(4066_dip)::start();
+	NETLIB_NAME(CD4066_DIP)::start();
 
 	m_A.m_base_r = m_B.m_base_r = m_C.m_base_r = m_D.m_base_r = 1000.0;
 }
 
-NETLIB_RESET(4016_dip)
+NETLIB_RESET(CD4016_DIP)
 {
-	NETLIB_NAME(4066_dip)::reset();
+	NETLIB_NAME(CD4066_DIP)::reset();
 }
 
-NETLIB_UPDATE(4016_dip)
+NETLIB_UPDATE(CD4016_DIP)
 {
 	/* only called during startup */
-	NETLIB_NAME(4066_dip)::update();
+	NETLIB_NAME(CD4066_DIP)::update();
 }
 
 NETLIB_NAMESPACE_DEVICES_END()
diff --git a/src/emu/netlist/devices/nld_4066.h b/src/emu/netlist/devices/nld_4066.h
index 3e7c36ca531..b9a3ef5da06 100644
--- a/src/emu/netlist/devices/nld_4066.h
+++ b/src/emu/netlist/devices/nld_4066.h
@@ -27,16 +27,16 @@
 #include "../nl_base.h"
 #include "nld_cmos.h"
 
-#define CD_4066_DIP(_name)                                                         \
-		NET_REGISTER_DEV(4066_dip, _name)
+#define CD4066_DIP(_name)                                                      \
+		NET_REGISTER_DEV(CD4066_DIP, _name)
 
-#define CD_4016_DIP(_name)                                                         \
-		NET_REGISTER_DEV(4016_dip, _name)
+#define CD4016_DIP(_name)                                                      \
+		NET_REGISTER_DEV(CD4016_DIP, _name)
 
 NETLIB_NAMESPACE_DEVICES_START()
 
-NETLIB_SUBDEVICE(4066,
-	NETLIB_LOGIC_FAMILY(CD4000)
+NETLIB_SUBDEVICE(CD4066,
+	NETLIB_LOGIC_FAMILY(CD4XXX)
 public:
 
 	analog_input_t m_control;
@@ -46,17 +46,17 @@ public:
 	nl_double m_base_r;
 );
 
-NETLIB_DEVICE(4066_dip,
-	NETLIB_LOGIC_FAMILY(CD4000)
+NETLIB_DEVICE(CD4066_DIP,
+	NETLIB_LOGIC_FAMILY(CD4XXX)
 
-	NETLIB_NAME(4066) m_A;
-	NETLIB_NAME(4066) m_B;
-	NETLIB_NAME(4066) m_C;
-	NETLIB_NAME(4066) m_D;
+	NETLIB_NAME(CD4066) m_A;
+	NETLIB_NAME(CD4066) m_B;
+	NETLIB_NAME(CD4066) m_C;
+	NETLIB_NAME(CD4066) m_D;
 	NETLIB_NAME(vdd_vss) m_supply;
 );
 
-NETLIB_DEVICE_DERIVED_PURE(4016_dip, 4066_dip);
+NETLIB_DEVICE_DERIVED_PURE(CD4016_DIP, CD4066_DIP);
 
 NETLIB_NAMESPACE_DEVICES_END()
 
diff --git a/src/emu/netlist/devices/nld_74123.h b/src/emu/netlist/devices/nld_74123.h
index 5c511b2b2af..23498c4f662 100644
--- a/src/emu/netlist/devices/nld_74123.h
+++ b/src/emu/netlist/devices/nld_74123.h
@@ -116,7 +116,7 @@ NETLIB_DEVICE(9602_dip,
 		NET_REGISTER_DEV(4538_dip, _name)
 
 NETLIB_DEVICE(4538_dip,
-	NETLIB_LOGIC_FAMILY(CD4000)
+	NETLIB_LOGIC_FAMILY(CD4XXX)
 	NETLIB_NAME(74123) m_1;
 	NETLIB_NAME(74123) m_2;
 );
diff --git a/src/emu/netlist/devices/nld_74ls629.c b/src/emu/netlist/devices/nld_74ls629.c
index 7d8e270dd7a..5ee1e1679db 100644
--- a/src/emu/netlist/devices/nld_74ls629.c
+++ b/src/emu/netlist/devices/nld_74ls629.c
@@ -150,7 +150,7 @@ NETLIB_UPDATE(SN74LS629)
 		m_clock.m_inc = netlist_time::from_double(0.5 / (double) freq);
 		//m_clock.update();
 
-		NL_VERBOSE_OUT(("%s %f %f %f\n", name().cstr(), v_freq, v_rng, freq));
+		//NL_VERBOSE_OUT(("%s %f %f %f\n", name().cstr(), v_freq, v_rng, freq));
 	}
 
 	if (!m_clock.m_enableq && INPLOGIC(m_ENQ))
diff --git a/src/emu/netlist/macro/CD4XXX.c b/src/emu/netlist/macro/CD4XXX.c
index 9033ea32836..459d007cdab 100644
--- a/src/emu/netlist/macro/CD4XXX.c
+++ b/src/emu/netlist/macro/CD4XXX.c
@@ -46,7 +46,7 @@ NETLIST_START(CD4XXX_lib)
 		TT_LINE("0,0|1|85")
 		TT_LINE("X,1|0|120")
 		TT_LINE("1,X|0|120")
-		TT_FAMILY("CD4000")
+		TT_FAMILY("CD4XXX")
 	TRUTHTABLE_END()
 
 	LOCAL_LIB_ENTRY(CD4001_DIP)
diff --git a/src/emu/netlist/nl_base.c b/src/emu/netlist/nl_base.c
index d9dd4f10178..c63ddc61a00 100644
--- a/src/emu/netlist/nl_base.c
+++ b/src/emu/netlist/nl_base.c
@@ -64,10 +64,10 @@ public:
 };
 
 //FIXME: set to proper values
-class logic_family_cd4000_t : public logic_family_desc_t
+class logic_family_cd4xxx_t : public logic_family_desc_t
 {
 public:
-	logic_family_cd4000_t() : logic_family_desc_t()
+	logic_family_cd4xxx_t() : logic_family_desc_t()
 	{
 		m_low_thresh_V = 0.8;
 		m_high_thresh_V = 2.0;
@@ -85,7 +85,7 @@ public:
 };
 
 logic_family_desc_t *netlist_family_TTL = palloc(logic_family_ttl_t);
-logic_family_desc_t *netlist_family_CD4000 = palloc(logic_family_cd4000_t);
+logic_family_desc_t *netlist_family_CD4XXX = palloc(logic_family_cd4xxx_t);
 
 class logic_family_std_proxy_t : public logic_family_desc_t
 {
@@ -101,8 +101,8 @@ logic_family_desc_t *logic_family_desc_t::from_model(const pstring &model)
 {
 	if (setup_t::model_value_str(model, "TYPE", "") == "TTL")
 		return netlist_family_TTL;
-	if (setup_t::model_value_str(model, "TYPE", "") == "CD4000")
-		return netlist_family_CD4000;
+	if (setup_t::model_value_str(model, "TYPE", "") == "CD4XXX")
+		return netlist_family_CD4XXX;
 
 	logic_family_std_proxy_t *ret = palloc(logic_family_std_proxy_t);
 
diff --git a/src/emu/netlist/nl_base.h b/src/emu/netlist/nl_base.h
index ff852c7f6f4..bd8ef6b48be 100644
--- a/src/emu/netlist/nl_base.h
+++ b/src/emu/netlist/nl_base.h
@@ -351,7 +351,7 @@ namespace netlist
 
 
 	extern logic_family_desc_t *netlist_family_TTL;
-	extern logic_family_desc_t *netlist_family_CD4000;
+	extern logic_family_desc_t *netlist_family_CD4XXX;
 
 
 	// -----------------------------------------------------------------------------
diff --git a/src/mame/audio/mario.c b/src/mame/audio/mario.c
index a442b7bc1a1..3958aa8d743 100644
--- a/src/mame/audio/mario.c
+++ b/src/mame/audio/mario.c
@@ -125,7 +125,7 @@ static NETLIST_START(nl_mario_snd7)
 	NET_C(R65.2, 4K_A.FC, C44.1)
 	NET_C(C44.2, GND)
 
-	CD_4020(3H, 4K_B.Y, ttllow, V5, GND)
+	CD4020_WI(3H, 4K_B.Y, ttllow, V5, GND)
 	TTL_7404_INVERT(4J_B, 3H.Q12)
 
 	RES(R64, RES_K(20))
@@ -201,7 +201,7 @@ static NETLIST_START(nl_mario)
 	PARAM(Solver.ACCURACY, 1e-8)
 	PARAM(Solver.SOR_FACTOR, 1.0)
 	PARAM(Solver.GS_THRESHOLD, 5)
-	PARAM(Solver.GS_LOOPS, 4)
+	PARAM(Solver.GS_LOOPS, 1)
 	//PARAM(Solver.LTE,     5e-2) // Default is not enough for paddle control
 	PARAM(Solver.DYNAMIC_TS,  0)
 	ANALOG_INPUT(V5, 5)
@@ -231,14 +231,7 @@ static NETLIST_START(nl_mario)
 	NET_C(GND, R19.1) //FIXME
 	NET_C(2K_C.Q, R41.1)
 
-#if 1
-	RES(DUM, RES_K(22))
-	NET_C(R39.1, DUM.1)
-	NET_C(DUM.2, GND)
-	FRONTIER(front1, R39.1, R40.1)
-#else
 	NET_C(R39.1, R40.1)
-#endif
 
 	NET_C(R20.2, R19.2, R40.2, R41.2, C31.1)
 	NET_C(C31.2, GND)
@@ -285,6 +278,7 @@ static NETLIST_START(nl_mario)
 
 	NET_C(GND, ROUT.2)
 
+	OPTIMIZE_FRONTIER(R40.1, RES_K(22), 50)
 NETLIST_END()
 
 #else
diff --git a/src/mame/drivers/nl_breakout.c b/src/mame/drivers/nl_breakout.c
index 9766a98fcce..ddc3592513c 100644
--- a/src/mame/drivers/nl_breakout.c
+++ b/src/mame/drivers/nl_breakout.c
@@ -1619,7 +1619,7 @@ CIRCUIT_LAYOUT( breakout )
 
 	RES(R33, 47)
 
-	CD_4016_DIP(D9)
+	CD4016_DIP(D9)
 	NET_C(D9.7, GND)
 	NET_C(D9.14, V5)