diff --git a/src/emu/luaengine.cpp b/src/emu/luaengine.cpp
index b8f1d0772ec..32eccb8a85b 100644
--- a/src/emu/luaengine.cpp
+++ b/src/emu/luaengine.cpp
@@ -136,23 +136,19 @@ lua_engine::hook::hook()
 	cb = -1;
 }
 
-#if (defined(__sun__) && defined(__svr4__)) || defined(__ANDROID__) || defined(__OpenBSD__)
-#undef _L
-#endif
-
-void lua_engine::hook::set(lua_State *_L, int idx)
+void lua_engine::hook::set(lua_State *lua, int idx)
 {
 	if (L)
 		luaL_unref(L, LUA_REGISTRYINDEX, cb);
 
-	if (lua_isnil(_L, idx)) {
+	if (lua_isnil(lua, idx)) {
 		L = nullptr;
 		cb = -1;
 
 	} else {
-		L = _L;
-		lua_pushvalue(_L, idx);
-		cb = luaL_ref(_L, LUA_REGISTRYINDEX);
+		L = lua;
+		lua_pushvalue(lua, idx);
+		cb = luaL_ref(lua, LUA_REGISTRYINDEX);
 	}
 }
 
@@ -197,9 +193,9 @@ void lua_engine::resume(lua_State *L, int nparam, lua_State *root)
 	}
 }
 
-void lua_engine::resume(void *_L, INT32 param)
+void lua_engine::resume(void *lua, INT32 param)
 {
-	resume(static_cast<lua_State *>(_L));
+	resume(static_cast<lua_State *>(lua));
 }
 
 int lua_engine::l_ioport_write(lua_State *L)
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h
index a47ca7c6fc5..5289a3171e0 100644
--- a/src/lib/netlist/nl_base.h
+++ b/src/lib/netlist/nl_base.h
@@ -1185,38 +1185,38 @@ namespace netlist
 
 		ATTR_COLD net_t *find_net(const pstring &name);
 
-		template<class _C>
-		ATTR_COLD plist_t<_C *> get_device_list()
+		template<class _device_class>
+		ATTR_COLD plist_t<_device_class *> get_device_list()
 		{
-			plist_t<_C *> tmp;
+			plist_t<_device_class *> tmp;
 			for (std::size_t i = 0; i < m_devices.size(); i++)
 			{
-				_C *dev = dynamic_cast<_C *>(m_devices[i]);
+				_device_class *dev = dynamic_cast<_device_class *>(m_devices[i]);
 				if (dev != NULL)
 					tmp.add(dev);
 			}
 			return tmp;
 		}
 
-		template<class _C>
-		ATTR_COLD _C *get_first_device()
+		template<class _device_class>
+		ATTR_COLD _device_class *get_first_device()
 		{
 			for (std::size_t i = 0; i < m_devices.size(); i++)
 			{
-				_C *dev = dynamic_cast<_C *>(m_devices[i]);
+				_device_class *dev = dynamic_cast<_device_class *>(m_devices[i]);
 				if (dev != NULL)
 					return dev;
 			}
 			return NULL;
 		}
 
-		template<class _C>
-		ATTR_COLD _C *get_single_device(const char *classname)
+		template<class _device_class>
+		ATTR_COLD _device_class *get_single_device(const char *classname)
 		{
-			_C *ret = NULL;
+			_device_class *ret = NULL;
 			for (std::size_t i = 0; i < m_devices.size(); i++)
 			{
-				_C *dev = dynamic_cast<_C *>(m_devices[i]);
+				_device_class *dev = dynamic_cast<_device_class *>(m_devices[i]);
 				if (dev != NULL)
 				{
 					if (ret != NULL)
diff --git a/src/lib/netlist/nl_factory.h b/src/lib/netlist/nl_factory.h
index cc007960c6e..971912a0d2d 100644
--- a/src/lib/netlist/nl_factory.h
+++ b/src/lib/netlist/nl_factory.h
@@ -45,7 +45,7 @@ namespace netlist
 		pstring m_def_param;                        /* default parameter */
 	};
 
-	template <class C>
+	template <class _device_class>
 	class factory_t : public base_factory_t
 	{
 		P_PREVENT_COPYING(factory_t)
@@ -56,7 +56,7 @@ namespace netlist
 
 		ATTR_COLD device_t *Create() override
 		{
-			device_t *r = palloc(C);
+			device_t *r = palloc(_device_class);
 			//r->init(setup, name);
 			return r;
 		}
@@ -68,11 +68,11 @@ namespace netlist
 		factory_list_t(setup_t &m_setup);
 		~factory_list_t();
 
-		template<class _C>
+		template<class _device_class>
 		ATTR_COLD void register_device(const pstring &name, const pstring &classname,
 				const pstring &def_param)
 		{
-			if (!add(name, palloc(factory_t< _C >(name, classname, def_param))))
+			if (!add(name, palloc(factory_t< _device_class >(name, classname, def_param))))
 				error("factory already contains " + name);
 		}