Index: dlg.c
===================================================================
--- dlg.c	(revision 30944)
+++ dlg.c	(revision 30945)
@@ -41,7 +41,7 @@
 
 typedef struct{
 	PCB_DAD_DECL_NOINIT(dlg)
-	conf_role_t role;
+	rnd_conf_role_t role;
 	char *rule, *path;
 	int wtype, wtitle, wdisable, wdesc, wquery, wsave, wsaveroles;
 	gdl_elem_t link;
@@ -48,7 +48,7 @@
 } rule_edit_ctx_t;
 
 static const char *save_roles[] = {"user", "project", "design", "cli", NULL};
-static conf_role_t save_rolee[] = { CFR_USER, CFR_PROJECT, CFR_DESIGN, CFR_CLI};
+static rnd_conf_role_t save_rolee[] = { CFR_USER, CFR_PROJECT, CFR_DESIGN, CFR_CLI};
 #define save_role_defaulti 2
 
 gdl_list_t rule_edit_dialogs;
@@ -173,7 +173,7 @@
 	rule_edit_ctx_t *ctx = caller_data;
 	int ri = ctx->dlg[ctx->wsaveroles].val.lng;
 	lht_node_t *nd;
-	conf_role_t role;
+	rnd_conf_role_t role;
 	pcb_hid_attribute_t *atxt = &ctx->dlg[ctx->wquery];
 	pcb_hid_text_t *txt = atxt->wdata;
 
@@ -219,7 +219,7 @@
 
 #undef MKDIR_ND
 
-static int pcb_dlg_rule_edit(conf_role_t role, const char *rule)
+static int pcb_dlg_rule_edit(rnd_conf_role_t role, const char *rule)
 {
 	pcb_hid_dad_buttons_t clbtn[] = {{"Close", 0}, {NULL, 0}};
 	char *info, *path;
@@ -327,7 +327,7 @@
 static fgw_error_t pcb_act_DrcQueryEditRule(fgw_arg_t *res, int argc, fgw_arg_t *argv)
 {
 	const char *srole, *spath, *srule = NULL;
-	conf_role_t role;
+	rnd_conf_role_t role;
 
 	RND_PCB_ACT_CONVARG(1, FGW_STR, DrcQueryEditRule, srole = argv[1].val.str);
 	RND_PCB_ACT_CONVARG(2, FGW_STR, DrcQueryEditRule, spath = argv[2].val.str);
@@ -390,7 +390,7 @@
 
 	pcb_conflist_foreach(&conf_drc_query.plugins.drc_query.rules, &it, i) {
 		int *dis, dis_ = 0;
-		conf_role_t role;
+		rnd_conf_role_t role;
 		lht_node_t *rule = i->prop.src;
 		st = pcb_drcq_stat_get(rule->name);
 
@@ -473,7 +473,7 @@
 {
 	drc_rlist_ctx_t *ctx = caller_data;
 	pcb_hid_row_t *row = pcb_dad_tree_get_selected(&(ctx->dlg[ctx->wlist]));
-	conf_role_t role;
+	rnd_conf_role_t role;
 
 	rlist_fetch();
 
@@ -486,7 +486,7 @@
 	pcb_hid_row_t *row = pcb_dad_tree_get_selected(&(ctx->dlg[ctx->wlist]));
 	lht_node_t *nd;
 	const char *script;
-	conf_role_t role;
+	rnd_conf_role_t role;
 	pcb_view_list_t *view;
 	pcb_board_t *pcb = (pcb_board_t *)pcb_gui->get_dad_hidlib(hid_ctx);
 
@@ -512,7 +512,7 @@
 	drc_rlist_ctx_t *ctx = tree->user_ctx;
 	lht_node_t *nd;
 	gds_t tmp;
-	conf_role_t role;
+	rnd_conf_role_t role;
 	pcb_drcq_stat_t *st;
 
 	rlist_fetch();
Index: drc_query.c
===================================================================
--- drc_query.c	(revision 30944)
+++ drc_query.c	(revision 30945)
@@ -193,9 +193,9 @@
 static int *drc_get_disable(const char *name)
 {
 	char *path = pcb_concat(DRC_CONF_PATH_DISABLE, name, NULL);
-	conf_native_t *nat = pcb_conf_get_field(path);
+	rnd_conf_native_t *nat = pcb_conf_get_field(path);
 	free(path);
-	if ((nat == NULL) || (nat->type != CFN_BOOLEAN))
+	if ((nat == NULL) || (nat->type != RND_CFN_BOOLEAN))
 		return NULL;
 	return nat->val.boolean;
 }
@@ -238,9 +238,9 @@
 }
 
 static vtp0_t free_drc_conf_nodes;
-static conf_native_t *nat_defs = NULL;
-static conf_native_t *nat_rules = NULL;
-static void drc_query_newconf(conf_native_t *cfg, pcb_conf_listitem_t *i)
+static rnd_conf_native_t *nat_defs = NULL;
+static rnd_conf_native_t *nat_rules = NULL;
+static void drc_query_newconf(rnd_conf_native_t *cfg, pcb_conf_listitem_t *i)
 {
 	if (nat_rules == NULL) {
 		if (strncmp(cfg->hash_path, DRC_CONF_PATH_RULES, strlen(DRC_CONF_PATH_RULES)-1) == 0) {
@@ -261,7 +261,7 @@
 
 		if (pcb_conf_get_field(path) == NULL) {
 			const char *sdesc;
-			conf_native_t *nat;
+			rnd_conf_native_t *nat;
 			pcb_bool_t *b;
 			lht_node_t *ndesc;
 
@@ -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, CFN_BOOLEAN, path, rnd_strdup(sdesc), 0);
+			nat = pcb_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);
@@ -297,13 +297,13 @@
 				void *ptr;
 				char *str;
 			} anyval;
-			conf_native_t *nat;
+			rnd_conf_native_t *nat;
 			lht_node_t *ndesc = lht_dom_hash_get(nd, "desc");
 			lht_node_t *ntype = lht_dom_hash_get(nd, "type");
 			lht_node_t *ndefault = lht_dom_hash_get(nd, "default");
 			lht_node_t *nlegacy = lht_dom_hash_get(nd, "legacy");
 			const char *sdesc = "n/a", *stype = NULL, *sdefault = NULL, *slegacy = NULL;
-			conf_native_type_t type;
+			rnd_conf_native_type_t type;
 			if ((ndesc != NULL) && (ndesc->type == LHT_TEXT)) sdesc = ndesc->data.text.value;
 			if ((ntype != NULL) && (ntype->type == LHT_TEXT)) stype = ntype->data.text.value;
 			if ((ndefault != NULL) && (ndefault->type == LHT_TEXT)) sdefault = ndefault->data.text.value;
@@ -316,7 +316,7 @@
 			}
 
 			type = pcb_conf_native_type_parse(stype);
-			if (type >= CFN_LIST) {
+			if (type >= RND_CFN_LIST) {
 				rnd_message(PCB_MSG_ERROR, "drc_query: invalid type '%s' for %s\n", stype, nd->name);
 				goto fail;
 			}
Index: drc_query_conf.h
===================================================================
--- drc_query_conf.h	(revision 30944)
+++ drc_query_conf.h	(revision 30945)
@@ -6,9 +6,9 @@
 typedef struct {
 	const struct {
 		const struct {
-			CFT_BOOLEAN disable;     /* disable the whole engine */
-			CFT_HLIST definitions;   /* DRC constant definitions */
-			CFT_HLIST rules;         /* inline rules */
+			RND_CFT_BOOLEAN disable;     /* disable the whole engine */
+			RND_CFT_HLIST definitions;   /* DRC constant definitions */
+			RND_CFT_HLIST rules;         /* inline rules */
 		} drc_query;
 	} plugins;
 } conf_drc_query_t;