Index: trunk/src_plugins/ar_cpcb/ar_cpcb.c
===================================================================
--- trunk/src_plugins/ar_cpcb/ar_cpcb.c	(revision 23366)
+++ trunk/src_plugins/ar_cpcb/ar_cpcb.c	(revision 23367)
@@ -53,7 +53,7 @@
 	pcb_netmap_t netmap;
 
 	/* int -> net conversion */
-	pcb_lib_menu_t **i2n;
+	pcb_net_t **i2n;
 	int maxnets;
 
 	/* net->int conversion */
@@ -89,12 +89,12 @@
 	if (dst->maxnets == 0)
 		return -1;
 
-	dst->i2n = malloc(sizeof(pcb_lib_menu_t *) * dst->maxnets);
+	dst->i2n = malloc(sizeof(pcb_net_t *) * dst->maxnets);
 	htpi_init(&dst->n2i, ptrhash, ptrkeyeq);
 
 	id = 0;
 	for(e = htpp_first(&dst->netmap.n2o); e != NULL; e = htpp_next(&dst->netmap.n2o, e)) {
-		dst->i2n[id] = (pcb_lib_menu_t *)e->key;
+		dst->i2n[id] = (pcb_net_t *)e->key;
 		htpi_set(&dst->n2i, e->key, id);
 		id++;
 	}
@@ -259,7 +259,7 @@
 
 	/* print tracks */
 	for(e = htpp_first(&nmap->netmap.n2o); e != NULL; e = htpp_next(&nmap->netmap.n2o, e)) {
-		pcb_lib_menu_t *net = e->key;
+		pcb_net_t *net = e->key;
 		dyn_obj_t *o, *olist = e->value;
 		long id = htpi_get(&nmap->n2i, net);
 
Index: trunk/src_plugins/io_dsn/write.c
===================================================================
--- trunk/src_plugins/io_dsn/write.c	(revision 23366)
+++ trunk/src_plugins/io_dsn/write.c	(revision 23367)
@@ -96,7 +96,7 @@
 		char gname[GNAME_MAX];
 		pcb_layergrp_id_t gid = pcb_layer_get_group_(ly);
 		pcb_layergrp_t *lg = pcb_get_layergrp(wctx->pcb, gid);
-		pcb_lib_menu_t *net;
+		pcb_net_t *net;
 
 		if ((lg == NULL) || !(lg->ltype & PCB_LYT_COPPER))
 			continue;
@@ -110,7 +110,7 @@
 				COORDX(line->Point1.X), COORDY(line->Point1.Y),
 				COORDX(line->Point2.X), COORDY(line->Point2.Y));
 			if (net != NULL)
-				fprintf(wctx->f, "(net \"%s\")", net->Name+2);
+				fprintf(wctx->f, "(net \"%s\")", net->name);
 			fprintf(wctx->f, "(type protect))\n");
 		}
 		PCB_END_LOOP;
Index: trunk/src_plugins/io_hyp/write.c
===================================================================
--- trunk/src_plugins/io_hyp/write.c	(revision 23366)
+++ trunk/src_plugins/io_hyp/write.c	(revision 23367)
@@ -508,8 +508,8 @@
 	pcb_netmap_init(&map, wr->pcb);
 	for (e = htpp_first(&map.n2o); e != NULL; e = htpp_next(&map.n2o, e)) {
 		dyn_obj_t *o;
-		pcb_lib_menu_t *net = e->key;
-		pcb_fprintf(wr->f, "{NET=%[4]\n", net->Name + 2);
+		pcb_net_t *net = e->key;
+		pcb_fprintf(wr->f, "{NET=%[4]\n", net->name);
 		for (o = e->value; o != NULL; o = o->next) {
 			switch (o->obj->type) {
 			case PCB_OBJ_LINE: