Index: dlg.c
===================================================================
--- dlg.c	(revision 30950)
+++ dlg.c	(revision 30951)
@@ -78,7 +78,7 @@
 static void drc_rule_pcb2dlg(rule_edit_ctx_t *ctx)
 {
 	pcb_dad_retovr_t retovr;
-	lht_node_t *nd = pcb_conf_lht_get_at_mainplug(ctx->role, ctx->path, 1, 0);
+	lht_node_t *nd = rnd_conf_lht_get_at_mainplug(ctx->role, ctx->path, 1, 0);
 	if (nd != NULL) {
 		pcb_hid_attribute_t *atxt = &ctx->dlg[ctx->wquery];
 		pcb_hid_text_t *txt = atxt->wdata;
@@ -183,9 +183,9 @@
 	}
 
 	role = save_rolee[ri];
-	nd = pcb_conf_lht_get_at_mainplug(role, ctx->path, 1, 0);
+	nd = rnd_conf_lht_get_at_mainplug(role, ctx->path, 1, 0);
 	if (nd == NULL) {
-		nd = pcb_conf_lht_get_first(role, 1);
+		nd = rnd_conf_lht_get_first(role, 1);
 		if (nd == NULL) {
 			rnd_message(PCB_MSG_ERROR, "Internal error: failed to create role root, rule is NOT saved\n");
 			return;
@@ -236,7 +236,7 @@
 	}
 
 	path = pcb_concat(DRC_CONF_PATH_RULES, rule, ":0", NULL);
-	nd = pcb_conf_lht_get_at_mainplug(role, path, 1, 0);
+	nd = rnd_conf_lht_get_at_mainplug(role, path, 1, 0);
 	if (nd == NULL) {
 		rnd_message(PCB_MSG_ERROR, "Rule %s not found on this role.\n", rule);
 		return -1;
@@ -401,7 +401,7 @@
 		if (dis == NULL)
 			dis = &dis_;
 
-		role = pcb_conf_lookup_role(rule);
+		role = rnd_conf_lookup_role(rule);
 		cell[0] = rule->name;
 		cell[1] = rnd_strdup(rnd_conf_role_name(role));
 		cell[2] = *dis ? "YES" : "no";
@@ -461,7 +461,7 @@
 #define rlist_fetch_nd() \
 do { \
 	char *path = pcb_concat(DRC_CONF_PATH_RULES, row->cell[0], ":0", NULL); \
-	nd = pcb_conf_lht_get_at_mainplug(role, path, 1, 0); \
+	nd = rnd_conf_lht_get_at_mainplug(role, path, 1, 0); \
 	if (nd == NULL) { \
 		rnd_message(PCB_MSG_ERROR, "internal error: rule not found at %s\n", path); \
 		return; \
Index: drc_query.c
===================================================================
--- drc_query.c	(revision 30950)
+++ drc_query.c	(revision 30951)
@@ -362,7 +362,7 @@
 
 	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);
+	rnd_conf_unreg_file(DRC_QUERY_CONF_FN, drc_query_conf_internal);
 	rnd_conf_unreg_fields(DRC_CONF_PATH_PLUGIN);
 	pcb_conf_hid_unreg(drc_query_cookie);
 
@@ -388,7 +388,7 @@
 	cbs.new_hlist_item_post = drc_query_newconf;
 	pcb_conf_hid_reg(drc_query_cookie, &cbs);
 
-	pcb_conf_reg_file(DRC_QUERY_CONF_FN, drc_query_conf_internal);
+	rnd_conf_reg_file(DRC_QUERY_CONF_FN, drc_query_conf_internal);
 #define conf_reg(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"