Index: act.c
===================================================================
--- act.c	(revision 32114)
+++ act.c	(revision 32115)
@@ -230,7 +230,7 @@
 						switch(type) {
 							case 0: tn = "none"; break;
 							case PCB_OBJ_SUBC:
-								if (rnd_attribute_get(&((pcb_any_obj_t *)o2)->Attributes, "extobj") != 0) {
+								if (pcb_attribute_get(&((pcb_any_obj_t *)o2)->Attributes, "extobj") != 0) {
 									tn = "extobj-subcircuit";
 									break;
 								}
@@ -291,7 +291,7 @@
 		"{l shift-t} is written as:\n"
 		"<Key>l; Shift<Key>t\n";
 
-	val = rnd_attribute_get(&ly->Attributes, key);
+	val = pcb_attribute_get(&ly->Attributes, key);
 	args[1].type = FGW_STR; args[1].val.cstr = msg;
 	args[2].type = FGW_STR; args[2].val.cstr = val;
 	args[3].type = FGW_STR; args[3].val.cstr = title;
@@ -303,7 +303,7 @@
 		return 0;
 	}
 	
-	rnd_attribute_put(&ly->Attributes, key, r.val.str);
+	pcb_attribute_put(&ly->Attributes, key, r.val.str);
 	fgw_arg_free(&rnd_fgw, &r);
 
 	RND_ACT_IRES(0);
Index: layer_menu.c
===================================================================
--- layer_menu.c	(revision 32114)
+++ layer_menu.c	(revision 32115)
@@ -171,7 +171,7 @@
 
 static void custom_layer_attr_key(pcb_layer_t *l, rnd_layer_id_t lid, const char *attrname, const char *menu_prefix, const char *action_prefix, rnd_menu_prop_t *keyprops, char *path, char *end, int len_avail)
 {
-	char *key = rnd_attribute_get(&l->Attributes, attrname);
+	char *key = pcb_attribute_get(&l->Attributes, attrname);
 	if (key != NULL) {
 		keyprops->accel = key;
 		rnd_snprintf(end, len_avail, "%s %ld:%s", menu_prefix, lid+1, l->name);
Index: routest_dlg.c
===================================================================
--- routest_dlg.c	(revision 32114)
+++ routest_dlg.c	(revision 32115)
@@ -60,7 +60,7 @@
 	pcb_route_style_t *rst;
 	rnd_hid_attribute_t *attr;
 	rnd_hid_tree_t *tree;
-	rnd_attribute_t *a;
+	pcb_attribute_t *a;
 
 	if (!rstdlg_ctx.active)
 		return;
@@ -203,7 +203,7 @@
 	char *key = NULL, *val = NULL;
 
 	if (rst_edit_attr(&key, &val) == 0) {
-		rnd_attribute_put(&rst->attr, key, val);
+		pcb_attribute_put(&rst->attr, key, val);
 		rst_updated(rst);
 	}
 }
@@ -222,8 +222,8 @@
 	val = row->cell[1];
 
 	if (rst_edit_attr(&key, &val) == 0) {
-		rnd_attribute_remove(&rst->attr, row->cell[0]);
-		rnd_attribute_put(&rst->attr, key, val);
+		pcb_attribute_remove(&rst->attr, row->cell[0]);
+		pcb_attribute_put(&rst->attr, key, val);
 		rst_updated(rst);
 	}
 }
@@ -237,7 +237,7 @@
 	if (row == NULL)
 		return;
 
-	rnd_attribute_remove(&rst->attr, row->cell[0]);
+	pcb_attribute_remove(&rst->attr, row->cell[0]);
 	rst_updated(rst);
 }
 
Index: status.c
===================================================================
--- status.c	(revision 32114)
+++ status.c	(revision 32115)
@@ -498,7 +498,7 @@
 	gds_append_str(&desc, "Subc. refdes:\t"); gds_append_str(&desc, subc->refdes == NULL ? "--" : subc->refdes);
 	gds_append_str(&desc, "\nTerminal:  \t"); gds_append_str(&desc, obj->term == NULL ? "--" : obj->term);
 	if (obj->term != NULL) { /* print terminal name if not empty and not the same as term */
-		const char *name = rnd_attribute_get(&obj->Attributes, "name");
+		const char *name = pcb_attribute_get(&obj->Attributes, "name");
 		if ((name != NULL) && (strcmp(name, obj->term) != 0)) {
 			gds_append_str(&desc, " (");
 			gds_append_str(&desc, name);