Index: trunk/doc-rnd/hacking/renames
===================================================================
--- trunk/doc-rnd/hacking/renames	(revision 4918)
+++ trunk/doc-rnd/hacking/renames	(revision 4919)
@@ -475,3 +475,5 @@
 FreeNetListListMemory -> pcb_netlist_list_free
 FreeNetListMemory -> pcb_netlist_free
 FreeNetMemory -> pcb_net_free
+NETLIST_LOOP -> PCB_NETLIST_LOOP
+NET_LOOP -> PCB_NET_LOOP
Index: trunk/src/netlist.c
===================================================================
--- trunk/src/netlist.c	(revision 4918)
+++ trunk/src/netlist.c	(revision 4919)
@@ -292,7 +292,7 @@
 void pcb_netlist_free(pcb_netlist_t *Netlist)
 {
 	if (Netlist) {
-		NET_LOOP(Netlist);
+		PCB_NET_LOOP(Netlist);
 		{
 			pcb_net_free(net);
 		}
@@ -308,7 +308,7 @@
 void pcb_netlist_list_free(pcb_netlist_list_t *Netlistlist)
 {
 	if (Netlistlist) {
-		NETLIST_LOOP(Netlistlist);
+		PCB_NETLIST_LOOP(Netlistlist);
 		{
 			pcb_netlist_free(netlist);
 		}
Index: trunk/src/netlist.h
===================================================================
--- trunk/src/netlist.h	(revision 4918)
+++ trunk/src/netlist.h	(revision 4919)
@@ -93,15 +93,15 @@
 void pcb_netlist_free(pcb_netlist_t *);
 void pcb_net_free(pcb_net_t *);
 
-#define NETLIST_LOOP(top) do   {                         \
-        pcb_cardinal_t        n;                                      \
+#define PCB_NETLIST_LOOP(top) do   {                            \
+        pcb_cardinal_t        n;                                \
         pcb_netlist_t *  netlist;                               \
         for (n = (top)->NetListN-1; n != -1; n--)               \
         {                                                       \
                 netlist = &(top)->NetList[n]
 
-#define NET_LOOP(top) do   {                             \
-        pcb_cardinal_t        n;                                      \
+#define PCB_NET_LOOP(top) do   {                                \
+        pcb_cardinal_t        n;                                \
         pcb_net_t *  net;                                       \
         for (n = (top)->NetN-1; n != -1; n--)                   \
         {                                                       \
Index: trunk/src/rats.c
===================================================================
--- trunk/src/rats.c	(revision 4918)
+++ trunk/src/rats.c	(revision 4919)
@@ -679,7 +679,7 @@
 	 * from Nets, so *Nets is empty after the
 	 * DrawShortestRats call
 	 */
-	NET_LOOP(Wantlist);
+	PCB_NET_LOOP(Wantlist);
 	{
 		CONNECTION_LOOP(net);
 		{
@@ -763,7 +763,7 @@
 	 * from Nets, so *Nets is empty after the
 	 * DrawShortestRats call
 	 */
-	NET_LOOP(Wantlist);
+	PCB_NET_LOOP(Wantlist);
 	{
 		Nets = pcb_netlist_new(&result);
 		CONNECTION_LOOP(net);
Index: trunk/src_plugins/autoroute/autoroute.c
===================================================================
--- trunk/src_plugins/autoroute/autoroute.c	(revision 4918)
+++ trunk/src_plugins/autoroute/autoroute.c	(revision 4919)
@@ -939,10 +939,10 @@
 	Nets = CollectSubnets(pcb_false);
 	{
 		routebox_t *last_net = NULL;
-		NETLIST_LOOP(&Nets);
+		PCB_NETLIST_LOOP(&Nets);
 		{
 			routebox_t *last_in_net = NULL;
-			NET_LOOP(netlist);
+			PCB_NET_LOOP(netlist);
 			{
 				routebox_t *last_in_subnet = NULL;
 				int j;
Index: trunk/src_plugins/smartdisperse/smartdisperse.c
===================================================================
--- trunk/src_plugins/smartdisperse/smartdisperse.c	(revision 4918)
+++ trunk/src_plugins/smartdisperse/smartdisperse.c	(revision 4919)
@@ -188,7 +188,7 @@
 	 * elaborate algorithm to walk serial nets, but the datastructures
 	 * are too gross so I'm going with the 80% solution.
 	 */
-	NET_LOOP(Nets);
+	PCB_NET_LOOP(Nets);
 	{
 		pcb_connection_t *conna, *connb;
 		pcb_element_t *ea, *eb;
@@ -224,7 +224,7 @@
 	END_LOOP;
 
 	/* Place larger nets, still grouping by net */
-	NET_LOOP(Nets);
+	PCB_NET_LOOP(Nets);
 	{
 		CONNECTION_LOOP(net);
 		{
Index: trunk/src_plugins/toporouter/toporouter.c
===================================================================
--- trunk/src_plugins/toporouter/toporouter.c	(revision 4918)
+++ trunk/src_plugins/toporouter/toporouter.c	(revision 4919)
@@ -2700,12 +2700,12 @@
 	pcb_netlist_list_t nets;
 	pcb_reset_conns(pcb_false);
 	nets = CollectSubnets(pcb_false);
-	NETLIST_LOOP(&nets);
+	PCB_NETLIST_LOOP(&nets);
 	{
 		if (netlist->NetN > 0) {
 			toporouter_netlist_t *nl = netlist_create(r, netlist->Net->Connection->menu->Name, netlist->Net->Connection->menu->Style);
 
-			NET_LOOP(netlist);
+			PCB_NET_LOOP(netlist);
 			{
 
 				toporouter_cluster_t *cluster = cluster_create(r, nl);