Index: dlg.c
===================================================================
--- dlg.c	(revision 30948)
+++ dlg.c	(revision 30949)
@@ -257,7 +257,7 @@
 		}
 	}
 
-	info = pcb_strdup_printf("DRC rule edit: %s on role %s", rule, pcb_conf_role_name(role));
+	info = pcb_strdup_printf("DRC rule edit: %s on role %s", rule, rnd_conf_role_name(role));
 	PCB_DAD_BEGIN_VBOX(ctx->dlg);
 		PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL);
 		PCB_DAD_LABEL(ctx->dlg, info);
@@ -336,7 +336,7 @@
 	if (srule == NULL)
 		srule = spath;
 
-	role = pcb_conf_role_parse(srole);
+	role = rnd_conf_role_parse(srole);
 	if (role == RND_CFR_invalid)
 		RND_ACT_FAIL(DrcQueryEditRule);
 
@@ -403,7 +403,7 @@
 
 		role = pcb_conf_lookup_role(rule);
 		cell[0] = rule->name;
-		cell[1] = rnd_strdup(pcb_conf_role_name(role));
+		cell[1] = rnd_strdup(rnd_conf_role_name(role));
 		cell[2] = *dis ? "YES" : "no";
 		if (st->run_cnt > 0)
 			cell[3] = pcb_strdup_printf("%.3fs", st->last_run_time);
@@ -451,7 +451,7 @@
 		rnd_message(PCB_MSG_ERROR, "Select a rule first!\n"); \
 		return; \
 	} \
-	role = pcb_conf_role_parse(row->cell[1]); \
+	role = rnd_conf_role_parse(row->cell[1]); \
 	if (role == RND_CFR_invalid) { \
 		rnd_message(PCB_MSG_ERROR, "internal error: invalid role %s\n", row->cell[0]); \
 		return; \
Index: drc_query.c
===================================================================
--- drc_query.c	(revision 30948)
+++ drc_query.c	(revision 30949)
@@ -193,7 +193,7 @@
 static int *drc_get_disable(const char *name)
 {
 	char *path = pcb_concat(DRC_CONF_PATH_DISABLE, name, NULL);
-	rnd_conf_native_t *nat = pcb_conf_get_field(path);
+	rnd_conf_native_t *nat = rnd_conf_get_field(path);
 	free(path);
 	if ((nat == NULL) || (nat->type != RND_CFN_BOOLEAN))
 		return NULL;
@@ -259,7 +259,7 @@
 		lht_node_t *nd = i->prop.src;
 		char *path = pcb_concat(DRC_CONF_PATH_DISABLE, nd->name, NULL);
 
-		if (pcb_conf_get_field(path) == NULL) {
+		if (rnd_conf_get_field(path) == NULL) {
 			const char *sdesc;
 			rnd_conf_native_t *nat;
 			pcb_bool_t *b;
@@ -269,7 +269,7 @@
 			if ((ndesc != NULL) && (ndesc->type == LHT_TEXT)) sdesc = ndesc->data.text.value;
 
 			b = calloc(sizeof(pcb_bool_t), 1);
-			nat = pcb_conf_reg_field_(b, 1, RND_CFN_BOOLEAN, path, rnd_strdup(sdesc), 0);
+			nat = rnd_conf_reg_field_(b, 1, RND_CFN_BOOLEAN, path, rnd_strdup(sdesc), 0);
 			if (nat == NULL) {
 				free(b);
 				rnd_message(PCB_MSG_ERROR, "drc_query: failed to register conf node '%s'\n", path);
@@ -280,7 +280,7 @@
 			nat->random_flags.dyn_desc = 1;
 			nat->random_flags.dyn_val = 1;
 			vtp0_append(&free_drc_conf_nodes, nat);
-			pcb_conf_set(RND_CFR_INTERNAL, path, -1, "0", RND_POL_OVERWRITE);
+			rnd_conf_set(RND_CFR_INTERNAL, path, -1, "0", RND_POL_OVERWRITE);
 		}
 		else
 			free(path);
@@ -290,7 +290,7 @@
 		char *path = pcb_concat(DRC_CONF_PATH_CONST, nd->name, NULL);
 		rnd_coord_t *c;
 
-		if (pcb_conf_get_field(path) == NULL) {
+		if (rnd_conf_get_field(path) == NULL) {
 			union {
 				rnd_coord_t c;
 				double d;
@@ -315,7 +315,7 @@
 				goto fail;
 			}
 
-			type = pcb_conf_native_type_parse(stype);
+			type = rnd_conf_native_type_parse(stype);
 			if (type >= RND_CFN_LIST) {
 				rnd_message(PCB_MSG_ERROR, "drc_query: invalid type '%s' for %s\n", stype, nd->name);
 				goto fail;
@@ -322,7 +322,7 @@
 			}
 
 			c = calloc(sizeof(anyval), 1);
-			nat = pcb_conf_reg_field_(c, 1, type, path, rnd_strdup(sdesc), 0);
+			nat = rnd_conf_reg_field_(c, 1, type, path, rnd_strdup(sdesc), 0);
 			if (nat == NULL) {
 				free(c);
 				rnd_message(PCB_MSG_ERROR, "drc_query: failed to register conf node '%s'\n", path);
@@ -337,7 +337,7 @@
 			if (slegacy != NULL)
 				pcb_conf_legacy(path, slegacy);
 			else if (sdefault != NULL)
-				pcb_conf_set(RND_CFR_INTERNAL, path, -1, sdefault, RND_POL_OVERWRITE);
+				rnd_conf_set(RND_CFR_INTERNAL, path, -1, sdefault, RND_POL_OVERWRITE);
 			path = NULL; /* hash key shall not be free'd */
 		}
 		fail:;
@@ -363,11 +363,11 @@
 	pcb_drc_impl_unreg(&drc_query_impl);
 	pcb_event_unbind_allcookie(drc_query_cookie);
 	pcb_conf_unreg_file(DRC_QUERY_CONF_FN, drc_query_conf_internal);
-	pcb_conf_unreg_fields(DRC_CONF_PATH_PLUGIN);
+	rnd_conf_unreg_fields(DRC_CONF_PATH_PLUGIN);
 	pcb_conf_hid_unreg(drc_query_cookie);
 
 	for(n = 0; n < free_drc_conf_nodes.used; n++)
-		pcb_conf_unreg_field(free_drc_conf_nodes.array[n]);
+		rnd_conf_unreg_field(free_drc_conf_nodes.array[n]);
 	vtp0_uninit(&free_drc_conf_nodes);
 
 	rnd_remove_actions_by_cookie(drc_query_cookie);
@@ -390,7 +390,7 @@
 
 	pcb_conf_reg_file(DRC_QUERY_CONF_FN, drc_query_conf_internal);
 #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
-	pcb_conf_reg_field(conf_drc_query, field,isarray,type_name,cpath,cname,desc,flags);
+	rnd_conf_reg_field(conf_drc_query, field,isarray,type_name,cpath,cname,desc,flags);
 #include "drc_query_conf_fields.h"
 
 	RND_REGISTER_ACTIONS(drc_query_action_list, drc_query_cookie)