Index: read.c
===================================================================
--- read.c	(revision 32114)
+++ read.c	(revision 32115)
@@ -183,10 +183,10 @@
 	return res;
 }
 
-static void parse_attribute(dsn_read_t *ctx, rnd_attribute_list_t *attr, gsxl_node_t *kv)
+static void parse_attribute(dsn_read_t *ctx, pcb_attribute_list_t *attr, gsxl_node_t *kv)
 {
 	for(;kv != NULL; kv = kv->next)
-		rnd_attribute_put(attr, STRE(kv), STRE(kv->children));
+		pcb_attribute_put(attr, STRE(kv), STRE(kv->children));
 }
 
 static int dsn_parse_rect(dsn_read_t *ctx, rnd_box_t *dst, gsxl_node_t *src, int no_y_flip)
@@ -348,7 +348,7 @@
 	if ((rnd_strcasecmp(ty, "signal") == 0) || (rnd_strcasecmp(ty, "jumper") == 0))
 		return 0; /* nothig special to do */
 	if ((rnd_strcasecmp(ty, "power") == 0) || (rnd_strcasecmp(ty, "mixed") == 0)) {
-		rnd_attribute_put(&grp->Attributes, "plane", ty);
+		pcb_attribute_put(&grp->Attributes, "plane", ty);
 		return 0;
 	}
 
@@ -496,7 +496,7 @@
 
 	/* place polygons on planes */
 	for(gid = 0, grp = ctx->pcb->LayerGroups.grp; gid < ctx->pcb->LayerGroups.len; gid++,grp++) {
-		if (rnd_attribute_get(&grp->Attributes, "plane") != NULL) {
+		if (pcb_attribute_get(&grp->Attributes, "plane") != NULL) {
 			pcb_layer_t *ly;
 			if (!ctx->has_pcb_boundary) {
 				rnd_message(RND_MSG_ERROR, "Because of the missing pcb boundary power planes are not filled with polygons.\n");
@@ -903,7 +903,7 @@
 			ps->rot = rotang;
 			pcb_pstk_bbox(ps);
 		}
-		rnd_attribute_put(&ps->Attributes, "term", term);
+		pcb_attribute_put(&ps->Attributes, "term", term);
 	}
 	else
 		rnd_message(RND_MSG_ERROR, "Failed to create via - expect missing vias (at %ld:%ld)\n", (long)pn->line, (long)pn->col);
@@ -1038,8 +1038,8 @@
 		}
 	}
 
-	rnd_attribute_put(&subc->Attributes, "footprint", id);
-	id = rnd_attribute_get(&subc->Attributes, "footprint");
+	pcb_attribute_put(&subc->Attributes, "footprint", id);
+	id = pcb_attribute_get(&subc->Attributes, "footprint");
 	htsp_set(&ctx->subcs, id, subc);
 
 	if (old_unit != NULL)
@@ -1565,7 +1565,7 @@
 		}
 
 		nsc = pcb_subc_dup_at(ctx->pcb, ctx->pcb->Data, subc, crd[0], crd[1], 0, rnd_false);
-		rnd_attribute_put(&nsc->Attributes, "refdes", refdes);
+		pcb_attribute_put(&nsc->Attributes, "refdes", refdes);
 
 		if (mirror_first) {
 			if (need_mirror)