diff --git a/nl_examples/congoBongo.c b/nl_examples/congo_bongo.c
similarity index 100%
rename from nl_examples/congoBongo.c
rename to nl_examples/congo_bongo.c
diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua
index d1c7555aaf4..15361d5576a 100644
--- a/scripts/src/netlist.lua
+++ b/scripts/src/netlist.lua
@@ -152,8 +152,8 @@ project "netlist"
 		MAME_DIR .. "src/emu/netlist/devices/nld_signal.h",
 		MAME_DIR .. "src/emu/netlist/devices/nld_truthtable.c",
 		MAME_DIR .. "src/emu/netlist/devices/nld_truthtable.h",
-    MAME_DIR .. "src/emu/netlist/macro/TTL74XX.c",
-    MAME_DIR .. "src/emu/netlist/macro/TTL74XX.h",
-    MAME_DIR .. "src/emu/netlist/macro/CD4XXX.c",
-    MAME_DIR .. "src/emu/netlist/macro/CD4XXX.h",
+    MAME_DIR .. "src/emu/netlist/macro/nlm_ttl74xx.c",
+    MAME_DIR .. "src/emu/netlist/macro/nlm_ttl74xx.h",
+    MAME_DIR .. "src/emu/netlist/macro/nlm_cd4xxx.c",
+    MAME_DIR .. "src/emu/netlist/macro/nlm_cd4xxx.h",
 }
diff --git a/src/emu/netlist/devices/net_lib.h b/src/emu/netlist/devices/net_lib.h
index 403a70b9654..b7eb7d3c201 100644
--- a/src/emu/netlist/devices/net_lib.h
+++ b/src/emu/netlist/devices/net_lib.h
@@ -56,14 +56,13 @@
 
 #include "nld_log.h"
 
-#include "../macro/TTL74XX.h"
-#include "../macro/CD4XXX.h"
-
 #include "../analog/nld_bjt.h"
 #include "../analog/nld_fourterm.h"
 #include "../analog/nld_switches.h"
 #include "../analog/nld_twoterm.h"
 #include "../analog/nld_opamps.h"
+#include "../macro/nlm_cd4xxx.h"
+#include "../macro/nlm_ttl74xx.h"
 #include "../solver/nld_solver.h"
 
 #include "nld_legacy.h"
diff --git a/src/emu/netlist/macro/CD4XXX.c b/src/emu/netlist/macro/nlm_cd4xxx.c
similarity index 98%
rename from src/emu/netlist/macro/CD4XXX.c
rename to src/emu/netlist/macro/nlm_cd4xxx.c
index 3c9be24a633..bd9b9a14158 100644
--- a/src/emu/netlist/macro/CD4XXX.c
+++ b/src/emu/netlist/macro/nlm_cd4xxx.c
@@ -1,5 +1,6 @@
 
-#include "CD4XXX.h"
+#include "nlm_cd4xxx.h"
+
 #include "devices/nld_truthtable.h"
 #include "devices/nld_system.h"
 #include "devices/nld_4020.h"
diff --git a/src/emu/netlist/macro/CD4XXX.h b/src/emu/netlist/macro/nlm_cd4xxx.h
similarity index 100%
rename from src/emu/netlist/macro/CD4XXX.h
rename to src/emu/netlist/macro/nlm_cd4xxx.h
diff --git a/src/emu/netlist/macro/TTL74XX.c b/src/emu/netlist/macro/nlm_ttl74xx.c
similarity index 98%
rename from src/emu/netlist/macro/TTL74XX.c
rename to src/emu/netlist/macro/nlm_ttl74xx.c
index fb1952e2583..75e865b1fe1 100644
--- a/src/emu/netlist/macro/TTL74XX.c
+++ b/src/emu/netlist/macro/nlm_ttl74xx.c
@@ -1,5 +1,6 @@
 
-#include "TTL74XX.h"
+#include "nlm_ttl74xx.h"
+
 #include "devices/nld_truthtable.h"
 #include "devices/nld_system.h"
 
diff --git a/src/emu/netlist/macro/TTL74XX.h b/src/emu/netlist/macro/nlm_ttl74xx.h
similarity index 100%
rename from src/emu/netlist/macro/TTL74XX.h
rename to src/emu/netlist/macro/nlm_ttl74xx.h