Index: trunk/src/libcschem/abstract.c
===================================================================
--- trunk/src/libcschem/abstract.c	(revision 3378)
+++ trunk/src/libcschem/abstract.c	(revision 3379)
@@ -60,7 +60,7 @@
 void csch_anet_free_fields(csch_anet_t *net)
 {
 	vtp0_uninit(&net->conns);
-	free(net->netname);
+	free(net->name);
 	csch_ahdr_uninit(&net->hdr);
 }
 
@@ -147,9 +147,9 @@
 
 	net = calloc(sizeof(csch_anet_t), 1);
 	csch_aobj_init(abs, &net->hdr, CSCH_ATYPE_NET);
-	net->netname = rnd_strdup(netname);
+	net->name = rnd_strdup(netname);
 	net->no_uname = set_no_uname;
-	htsp_set(&abs->nets, net->netname, net);
+	htsp_set(&abs->nets, net->name, net);
 	return net;
 }
 
@@ -222,7 +222,7 @@
 		csch_anet_t *net = e->value;
 		long n;
 
-		fprintf(f, "%s %s\n", prefix, net->netname);
+		fprintf(f, "%s %s\n", prefix, net->name);
 		fprintf(f, "%s  ports:\n", prefix);
 		for(n = 0; n < net->conns.used; n++) {
 			csch_aport_t *port = net->conns.array[n];
Index: trunk/src/libcschem/abstract.h
===================================================================
--- trunk/src/libcschem/abstract.h	(revision 3378)
+++ trunk/src/libcschem/abstract.h	(revision 3379)
@@ -77,12 +77,11 @@
 typedef struct csch_anet_s {
 	csch_ahdr_t hdr;
 	vtp0_t conns; /* a list of (csch_ahdr_t *) connections, ports and bus-ports */
-	char *netname; /* unique name for the hash */
+	char *name;   /* unique name for the hash */
 
 	unsigned no_uname:1; /* 1 if there is no user assigned net name */
 
 	/* cached from attributes: */
-	const char *name;
 	const char *chan;
 } csch_anet_t;
 
Index: trunk/src/libcschem/compile.c
===================================================================
--- trunk/src/libcschem/compile.c	(revision 3378)
+++ trunk/src/libcschem/compile.c	(revision 3379)
@@ -195,7 +195,7 @@
 				return -1;
 			}
 			new_net = csch_cmp_merge_nets(*net, ap->conn.net);
-rnd_trace("NET: Merge %s and %s -> %s\n", (*net)->netname, ap->conn.net->netname, new_net->netname);
+rnd_trace("NET: Merge %s and %s -> %s\n", (*net)->name, ap->conn.net->name, new_net->name);
 			if (new_net == NULL) {
 				rnd_message(RND_MSG_ERROR, "csch_compile_connect_net_to(): failed to merge nets\n");
 				return -1;
@@ -206,7 +206,7 @@
 
 		{
 			csch_aport_t *ap = (csch_aport_t *)a;
-			rnd_trace("NET: conn %s to %s\n", ap->name, (*net)->netname);
+			rnd_trace("NET: conn %s to %s\n", ap->name, (*net)->name);
 		}
 
 		TODO("do the same for buses and bus ports? Or do we put nets in buses?");
Index: trunk/src/plugins/export_tedax/export_tedax.c
===================================================================
--- trunk/src/plugins/export_tedax/export_tedax.c	(revision 3378)
+++ trunk/src/plugins/export_tedax/export_tedax.c	(revision 3379)
@@ -91,7 +91,7 @@
 	const char *netname;
 	netname = csch_attrib_get_str(&net->hdr.attr, "pcb/name");
 	if (netname == NULL) netname = csch_attrib_get_str(&net->hdr.attr, "name");
-	if (netname == NULL) netname = net->netname;
+	if (netname == NULL) netname = net->name;
 	return netname;
 }
 
Index: trunk/src/plugins/sch_dialogs/abst_attr.c
===================================================================
--- trunk/src/plugins/sch_dialogs/abst_attr.c	(revision 3378)
+++ trunk/src/plugins/sch_dialogs/abst_attr.c	(revision 3379)
@@ -111,7 +111,7 @@
 		vtp0_uninit(&tmp);
 		hv.str = name_tmp;
 		switch(a->type) {
-			case CSCH_ATYPE_NET:     rnd_snprintf(name_tmp, sizeof(name_tmp), "%s (net)", ((csch_anet_t *)a)->netname); break;
+			case CSCH_ATYPE_NET:     rnd_snprintf(name_tmp, sizeof(name_tmp), "%s (net)", ((csch_anet_t *)a)->name); break;
 			case CSCH_ATYPE_PORT:    rnd_snprintf(name_tmp, sizeof(name_tmp), "%s (port)", ((csch_aport_t *)a)->name); break;
 			case CSCH_ATYPE_COMP:    rnd_snprintf(name_tmp, sizeof(name_tmp), "%s (component)", ((csch_acomp_t *)a)->name); break;
 			case CSCH_ATYPE_BUSNET:
Index: trunk/src/plugins/sch_dialogs/dlg_abstract.c
===================================================================
--- trunk/src/plugins/sch_dialogs/dlg_abstract.c	(revision 3378)
+++ trunk/src/plugins/sch_dialogs/dlg_abstract.c	(revision 3379)
@@ -78,7 +78,7 @@
 			{
 				static char tmp[] = "net";
 				*parent = rnd_dad_tree_mkdirp(tree, tmp, NULL);
-				return rnd_strdup(((csch_anet_t *)a)->netname);
+				return rnd_strdup(((csch_anet_t *)a)->name);
 			}
 		case CSCH_ATYPE_COMP:
 			{