Index: footprint.c
===================================================================
--- footprint.c	(revision 32114)
+++ footprint.c	(revision 32115)
@@ -281,11 +281,11 @@
 
 int tedax_fp_fsave_subc(pcb_subc_t *subc, FILE *f)
 {
-	const char *fpname = rnd_attribute_get(&subc->Attributes, "tedax::footprint");
+	const char *fpname = pcb_attribute_get(&subc->Attributes, "tedax::footprint");
 	if (fpname == NULL)
-		fpname = rnd_attribute_get(&subc->Attributes, "visible_footprint");
+		fpname = pcb_attribute_get(&subc->Attributes, "visible_footprint");
 	if (fpname == NULL)
-		fpname = rnd_attribute_get(&subc->Attributes, "footprint");
+		fpname = pcb_attribute_get(&subc->Attributes, "footprint");
 	if ((fpname == NULL) && (subc->refdes != NULL))
 		fpname = subc->refdes;
 	if (fpname == NULL)
@@ -398,7 +398,7 @@
 		rnd_message(RND_MSG_ERROR, "undefined terminal %s - skipping footprint\n", src); \
 		return -1; \
 	} \
-	rnd_attribute_put(&obj->Attributes, "term", term->name); \
+	pcb_attribute_put(&obj->Attributes, "term", term->name); \
 	vtp0_append(&term->objs, obj); \
 } while(0)
 
@@ -601,7 +601,7 @@
 	}
 	htip_uninit(&terms);
 
-	rnd_attribute_put(&subc->Attributes, "refdes", "X1");
+	pcb_attribute_put(&subc->Attributes, "refdes", "X1");
 	pcb_subc_add_refdes_text(subc, 0, 0, 0, 100, rnd_false);
 	pcb_subc_create_aux(subc, 0, 0, 0.0, rnd_false);
 
Index: stackup.c
===================================================================
--- stackup.c	(revision 32114)
+++ stackup.c	(revision 32115)
@@ -120,7 +120,7 @@
 static void save_user_props(pcb_board_t *pcb, FILE *f, pcb_layergrp_t *grp, const char *name)
 {
 	int n;
-	rnd_attribute_t *a;
+	pcb_attribute_t *a;
 	char *mat = NULL, *thermk = NULL, *thick = NULL, *fab_color = NULL, *dielect = NULL;
 
 	for(n = 0, a = grp->Attributes.List; n < grp->Attributes.Number; n++,a++) {
@@ -386,7 +386,7 @@
 				}
 			}
 			else
-				rnd_attribute_put(&grp->Attributes, argv[2], argv[3]);
+				pcb_attribute_put(&grp->Attributes, argv[2], argv[3]);
 		}
 		else if ((argc == 2) && (strcmp(argv[0], "end") == 0) && (strcmp(argv[1], "stackup") == 0))
 			break;
Index: tboard.c
===================================================================
--- tboard.c	(revision 32114)
+++ tboard.c	(revision 32115)
@@ -108,7 +108,7 @@
 	htsi_entry_t *re;
 	rnd_layergrp_id_t gid;
 	int n;
-	rnd_attribute_t *a;
+	pcb_attribute_t *a;
 	tedax_stackup_t ctx;
 	pcb_placement_t plc;
 	static const char *stackupid = "board_stackup";
@@ -169,7 +169,7 @@
 	PCB_END_LOOP;
 
 	PCB_SUBC_LOOP(pcb->Data) {
-		rnd_attribute_t *a;
+		pcb_attribute_t *a;
 		pcb_host_trans_t tr;
 		char fpname[256], refdes[256];
 		pcb_subc_t *proto = htscp_get(&plc.subcs, subc);
@@ -389,7 +389,7 @@
 		}
 		else if (strcmp(argv[0], "attr") == 0) {
 			reqarg("attr", 3);
-			rnd_attribute_put(&PCB->Attributes, argv[1], argv[2]);
+			pcb_attribute_put(&PCB->Attributes, argv[1], argv[2]);
 		}
 		else if (strcmp(argv[0], "stackup") == 0) {
 			remember(stackup);
Index: tnetlist.c
===================================================================
--- tnetlist.c	(revision 32114)
+++ tnetlist.c	(revision 32115)
@@ -189,7 +189,7 @@
 	}
 
 	PCB_SUBC_LOOP(pcb->Data) {
-		rnd_attribute_t *a;
+		pcb_attribute_t *a;
 
 		if ((subc->refdes == NULL) || (*subc->refdes == '\0') || PCB_FLAG_TEST(PCB_FLAG_NONETLIST, subc))
 			continue;