Index: elem_rot.c
===================================================================
--- elem_rot.c	(revision 30904)
+++ elem_rot.c	(revision 30905)
@@ -155,7 +155,7 @@
 		centroidx = sumx / (double) pin_cnt;
 		centroidy = sumy / (double) pin_cnt;
 
-		if (!autodetect && (PCB_NSTRCMP(pcb_attribute_get(&subc->Attributes, "xy-centre"), "origin") == 0)) {
+		if (!autodetect && (PCB_NSTRCMP(rnd_attribute_get(&subc->Attributes, "xy-centre"), "origin") == 0)) {
 			*cx = ox;
 			*cy = oy;
 		}
@@ -164,7 +164,7 @@
 			*cy = centroidy;
 		}
 
-		fixed_rotation = pcb_attribute_get(&subc->Attributes, "xy-fixed-rotation");
+		fixed_rotation = rnd_attribute_get(&subc->Attributes, "xy-fixed-rotation");
 		if (fixed_rotation != NULL) {
 			/* The user specified a fixed rotation */
 			*theta = atof(fixed_rotation);
@@ -236,9 +236,9 @@
 	pcb_subc_xy_rot(subc, &cx, &cy, &rot, &tmp, 1);
 
 	/* unless xy-centre or pnp-centre is set to origin, place a pnp origin mark */
-	cent = pcb_attribute_get(&subc->Attributes, "xy-centre");
+	cent = rnd_attribute_get(&subc->Attributes, "xy-centre");
 	if (cent == NULL)
-		cent = pcb_attribute_get(&subc->Attributes, "pnp-centre");
+		cent = rnd_attribute_get(&subc->Attributes, "pnp-centre");
 	if ((cent == NULL) || (strcmp(cent, "origin") != 0))
 		pcb_subc_create_aux_point(subc, cx, cy, "pnp-origin");
 
Index: pstk_compat.c
===================================================================
--- pstk_compat.c	(revision 30904)
+++ pstk_compat.c	(revision 30905)
@@ -778,7 +778,7 @@
 	}
 
 	if (Name != NULL)
-		pcb_attribute_put(&p->Attributes, "name", Name);
+		rnd_attribute_put(&p->Attributes, "name", Name);
 
 	return p;
 }
Index: pstk_help.c
===================================================================
--- pstk_help.c	(revision 30904)
+++ pstk_help.c	(revision 30905)
@@ -81,7 +81,7 @@
 		if (num_cand[l] == 1) {
 			vtp0_append(&tmp, cand[l]);
 			if (term == NULL)
-				term = pcb_attribute_get(&cand[l]->Attributes, "term");
+				term = rnd_attribute_get(&cand[l]->Attributes, "term");
 		}
 	}
 
@@ -97,7 +97,7 @@
 			pcb_pstk_t *ps = pcb_pstk_new(data, -1, pid, cx, cy, 0, pcb_flag_make(PCB_FLAG_CLEARLINE | PCB_FLAG_FOUND));
 			vtp0_append(objs, ps);
 			if (term != NULL)
-				pcb_attribute_put(&ps->Attributes, "term", term);
+				rnd_attribute_put(&ps->Attributes, "term", term);
 			/* got our new proto - remove the objects we used */
 			for(ci = 0; ci < tmp.used; ci++) {
 				int i;