Index: bus.c
===================================================================
--- bus.c	(revision 32114)
+++ bus.c	(revision 32115)
@@ -321,13 +321,13 @@
 	subc = pcb_exto_create(dst, "bus", layers, l->Point1.X, l->Point1.Y, 0, copy_from);
 	if (copy_from == NULL) {
 		char tmp[32];
-		rnd_attribute_put(&subc->Attributes, "extobj::width", "2");
+		pcb_attribute_put(&subc->Attributes, "extobj::width", "2");
 		rnd_sprintf(tmp, "%$$mH", conf_core.design.line_thickness + conf_core.design.clearance/2);
-		rnd_attribute_put(&subc->Attributes, "extobj::pitch", tmp);
+		pcb_attribute_put(&subc->Attributes, "extobj::pitch", tmp);
 		rnd_sprintf(tmp, "%$$mH", conf_core.design.line_thickness);
-		rnd_attribute_put(&subc->Attributes, "extobj::thickness", tmp);
+		pcb_attribute_put(&subc->Attributes, "extobj::thickness", tmp);
 		rnd_sprintf(tmp, "%$$mH", conf_core.design.clearance);
-		rnd_attribute_put(&subc->Attributes, "extobj::clearance", tmp);
+		pcb_attribute_put(&subc->Attributes, "extobj::clearance", tmp);
 	}
 
 	if (layers[1].lyt & PCB_LYT_INTERN) {
@@ -343,7 +343,7 @@
 		l = pcb_line_dup(ly, objs->array[n]);
 		PCB_FLAG_SET(PCB_FLAG_FLOATER, l);
 		PCB_FLAG_CLEAR(PCB_FLAG_SELECTED, l);
-		rnd_attribute_put(&l->Attributes, "extobj::role", "edit");
+		pcb_attribute_put(&l->Attributes, "extobj::role", "edit");
 rnd_trace(" subc=%p l=%p\n", subc, ly);
 	}
 
Index: cord.c
===================================================================
--- cord.c	(revision 32114)
+++ cord.c	(revision 32115)
@@ -41,7 +41,7 @@
 
 static const char *group_of(pcb_any_obj_t *floater)
 {
-	const char *grp = rnd_attribute_get(&floater->Attributes, "cord::group");
+	const char *grp = pcb_attribute_get(&floater->Attributes, "cord::group");
 	if ((grp == NULL) || (*grp == '\0')) return NULL;
 	return grp;
 }
@@ -48,7 +48,7 @@
 
 static void set_grp(pcb_any_obj_t *obj, const char *grp)
 {
-	rnd_attribute_put(&obj->Attributes, "cord::group", grp);
+	pcb_attribute_put(&obj->Attributes, "cord::group", grp);
 }
 
 static void cord_clear_ly(pcb_subc_t *subc, pcb_layer_t *ly, const char *group)
@@ -85,7 +85,7 @@
 	*ctrl1 = *ctrl2 = NULL;
 
 	for(p = padstacklist_first(&subc->data->padstack); p != NULL; p = padstacklist_next(p)) {
-		const char *lg = group_of((pcb_any_obj_t *)p), *idxs = rnd_attribute_get(&p->Attributes, "extobj::idx");
+		const char *lg = group_of((pcb_any_obj_t *)p), *idxs = pcb_attribute_get(&p->Attributes, "extobj::idx");
 		if ((lg == NULL) || (strcmp(lg, group) != 0) || (idxs == NULL)) continue;
 		if (idxs[0] == '0') *end1 = p;
 		else if (idxs[0] == '1') *end2 = p;
@@ -92,7 +92,7 @@
 	}
 
 	for(a = arclist_first(&ely->Arc); a != NULL; a = arclist_next(a)) {
-		const char *lg = group_of((pcb_any_obj_t *)a), *idxs = rnd_attribute_get(&a->Attributes, "extobj::idx");
+		const char *lg = group_of((pcb_any_obj_t *)a), *idxs = pcb_attribute_get(&a->Attributes, "extobj::idx");
 		if ((lg == NULL) || (strcmp(lg, group) != 0) || (idxs == NULL)) continue;
 		if (idxs[0] == '0') *ctrl1 = a;
 		else if (idxs[0] == '1') *ctrl2 = a;
@@ -120,7 +120,7 @@
 	if (a1 != NULL) {
 		l = pcb_line_new(elyr, e1->x, e1->y, a1->X, a1->Y,
 			1, 0, pcb_flag_make(0));
-		rnd_attribute_put(&l->Attributes, "extobj::role", "gfx");
+		pcb_attribute_put(&l->Attributes, "extobj::role", "gfx");
 		set_grp((pcb_any_obj_t *)l, group);
 	}
 
@@ -127,7 +127,7 @@
 	if (a2 != NULL) {
 		l = pcb_line_new(elyr, e2->x, e2->y, a2->X, a2->Y,
 			1, 0, pcb_flag_make(0));
-		rnd_attribute_put(&l->Attributes, "extobj::role", "gfx");
+		pcb_attribute_put(&l->Attributes, "extobj::role", "gfx");
 		set_grp((pcb_any_obj_t *)l, group);
 	}
 
@@ -152,7 +152,7 @@
 
 			l = pcb_line_new(lyr, lx, ly, x, y,
 				RND_MM_TO_COORD(0.25), 0, pcb_flag_make(0));
-			rnd_attribute_put(&l->Attributes, "extobj::role", "gfx");
+			pcb_attribute_put(&l->Attributes, "extobj::role", "gfx");
 			set_grp((pcb_any_obj_t *)l, group);
 
 			lx = x; ly = y;
@@ -162,7 +162,7 @@
 	else {
 		l = pcb_line_new(lyr, e1->x, e1->y, e2->x, e2->y,
 			RND_MM_TO_COORD(0.25), 0, pcb_flag_make(0));
-		rnd_attribute_put(&l->Attributes, "extobj::role", "gfx");
+		pcb_attribute_put(&l->Attributes, "extobj::role", "gfx");
 		set_grp((pcb_any_obj_t *)l, group);
 	}
 
@@ -207,7 +207,7 @@
 
 	cord_gen(subc, grp);
 
-	if ((floater->type == PCB_OBJ_LINE) && (rnd_attribute_get(&subc->Attributes, "extobj::fixed_origin") == NULL)) {
+	if ((floater->type == PCB_OBJ_LINE) && (pcb_attribute_get(&subc->Attributes, "extobj::fixed_origin") == NULL)) {
 		pcb_pstk_t *ps = (pcb_pstk_t *)floater;
 		pcb_subc_move_origin_to(subc, ps->x + RND_MM_TO_COORD(0.3), ps->y + RND_MM_TO_COORD(0.3), 0);
 	}
@@ -282,11 +282,11 @@
 
 	ps = pcb_pstk_new(subc->data, -1, pid, x, y, 0, pcb_flag_make(0));
 	set_grp((pcb_any_obj_t *)ps, grp);
-	rnd_attribute_put(&ps->Attributes, "extobj::role", "endpt");
-	rnd_attribute_put(&ps->Attributes, "extobj::idx", ptidx);
-	rnd_attribute_put(&ps->Attributes, "intconn", grp);
+	pcb_attribute_put(&ps->Attributes, "extobj::role", "endpt");
+	pcb_attribute_put(&ps->Attributes, "extobj::idx", ptidx);
+	pcb_attribute_put(&ps->Attributes, "intconn", grp);
 	if (term != NULL)
-		rnd_attribute_put(&ps->Attributes, "term", term);
+		pcb_attribute_put(&ps->Attributes, "term", term);
 
 
 #ifdef BEZIER
@@ -294,8 +294,8 @@
 	pcb_arc_t *a;
 	a = pcb_arc_new(ely, cpx, cpy, 0, 0, 0, 360, cpr, cpr*2, pcb_flag_make(0), 0);
 	set_grp((pcb_any_obj_t *)a, grp);
-	rnd_attribute_put(&a->Attributes, "extobj::role", "control");
-	rnd_attribute_put(&a->Attributes, "extobj::idx", ptidx);
+	pcb_attribute_put(&a->Attributes, "extobj::role", "control");
+	pcb_attribute_put(&a->Attributes, "extobj::idx", ptidx);
 	PCB_FLAG_SET(PCB_FLAG_FLOATER, a);
 	}
 #endif
@@ -417,7 +417,7 @@
 		pcb_subc_t *s = objs->array[n];
 		if (s->type != PCB_OBJ_SUBC) continue;
 
-		rnd_attribute_copy_all(&subc->Attributes, &s->Attributes);
+		pcb_attribute_copy_all(&subc->Attributes, &s->Attributes);
 
 		for(lid = 0; lid < s->data->LayerN; lid++) {
 			gdl_iterator_t it;
@@ -467,7 +467,7 @@
 
 
 	if (has_subc) {
-		rnd_attribute_put(&subc->Attributes, "extobj::fixed_origin", "(yes)");
+		pcb_attribute_put(&subc->Attributes, "extobj::fixed_origin", "(yes)");
 
 		pcb_subc_unreg(subc);
 		pcb_subc_bbox(subc);
Index: dimension.c
===================================================================
--- dimension.c	(revision 32114)
+++ dimension.c	(revision 32115)
@@ -102,7 +102,7 @@
 	dim = obj->extobj_data;
 
 	pcb_extobj_unpack_coord(obj, &dim->displace, "extobj::displace");
-	dim->fmt = rnd_attribute_get(&obj->Attributes, "extobj::format");
+	dim->fmt = pcb_attribute_get(&obj->Attributes, "extobj::format");
 	if (dim->fmt == NULL)
 		dim->fmt = "%.03$mm";
 
@@ -191,7 +191,7 @@
 			x1 + arrx * dim->dx, y1 + arrx * dim->dy,
 			x2 - arrx * dim->dx, y2 - arrx * dim->dy,
 			RND_MM_TO_COORD(0.25), 0, pcb_flag_make(PCB_FLAG_FLOATER));
-		rnd_attribute_put(&flt->Attributes, "extobj::role", "dimline");
+		pcb_attribute_put(&flt->Attributes, "extobj::role", "dimline");
 	}
 	else { /* modify the floater if it exists */
 		if (ly->line_tree != NULL)
@@ -298,7 +298,7 @@
 	dimension_clear(subc);
 	dim->displace = d;
 	rnd_snprintf(tmp, sizeof(tmp), "%.08$mH", (rnd_coord_t)d);
-	rnd_attribute_put(&subc->Attributes, "extobj::displace", tmp);
+	pcb_attribute_put(&subc->Attributes, "extobj::displace", tmp);
 	dimension_gen(subc);
 }
 
@@ -376,7 +376,7 @@
 
 	subc = pcb_exto_create(dst, "dimension", layers, l->Point1.X, l->Point1.Y, 0, copy_from);
 	if (copy_from == NULL)
-		rnd_attribute_put(&subc->Attributes, "extobj::displace", "4mm");
+		pcb_attribute_put(&subc->Attributes, "extobj::displace", "4mm");
 
 	/* create edit-objects */
 	ly = &subc->data->Layer[LID_EDIT];
@@ -383,7 +383,7 @@
 	l = pcb_line_dup(ly, objs->array[0]);
 	PCB_FLAG_SET(PCB_FLAG_FLOATER, l);
 	PCB_FLAG_CLEAR(PCB_FLAG_SELECTED, l);
-	rnd_attribute_put(&l->Attributes, "extobj::role", "edit");
+	pcb_attribute_put(&l->Attributes, "extobj::role", "edit");
 
 	dimension_unpack(subc);
 	dimension_gen(subc);
Index: line_of_vias.c
===================================================================
--- line_of_vias.c	(revision 32114)
+++ line_of_vias.c	(revision 32115)
@@ -267,7 +267,7 @@
 
 	subc = pcb_exto_create(dst, "line-of-vias", layers, l->Point1.X, l->Point1.Y, 0, copy_from);
 	if (copy_from == NULL)
-		rnd_attribute_put(&subc->Attributes, "extobj::pitch", "4mm");
+		pcb_attribute_put(&subc->Attributes, "extobj::pitch", "4mm");
 
 	/* create edit-objects */
 	ly = &subc->data->Layer[LID_EDIT];
@@ -275,7 +275,7 @@
 		l = pcb_line_dup(ly, objs->array[n]);
 		PCB_FLAG_SET(PCB_FLAG_FLOATER, l);
 		PCB_FLAG_CLEAR(PCB_FLAG_SELECTED, l);
-		rnd_attribute_put(&l->Attributes, "extobj::role", "edit");
+		pcb_attribute_put(&l->Attributes, "extobj::role", "edit");
 	}
 
 	/* create the padstack prototype */