Index: trunk/src_plugins/diag/diag.c
===================================================================
--- trunk/src_plugins/diag/diag.c	(revision 34783)
+++ trunk/src_plugins/diag/diag.c	(revision 34784)
@@ -57,8 +57,8 @@
 	;
 static const char pcb_acth_DumpConf[] = "Perform various operations on the configuration tree.";
 
-extern lht_doc_t *pcb_conf_main_root[];
-extern lht_doc_t *pcb_conf_plug_root[];
+extern lht_doc_t *rnd_conf_main_root[];
+extern lht_doc_t *rnd_conf_plug_root[];
 static fgw_error_t pcb_act_DumpConf(fgw_arg_t *res, int argc, fgw_arg_t *argv)
 {
 	int op;
@@ -87,13 +87,13 @@
 			RND_ACT_IRES(1);
 			return 0;
 		}
-		if (pcb_conf_main_root[role] != NULL) {
+		if (rnd_conf_main_root[role] != NULL) {
 			printf("%s### main\n", prefix);
-			if (pcb_conf_main_root[role] != NULL)
-				lht_dom_export(pcb_conf_main_root[role]->root, stdout, prefix);
+			if (rnd_conf_main_root[role] != NULL)
+				lht_dom_export(rnd_conf_main_root[role]->root, stdout, prefix);
 			printf("%s### plugin\n", prefix);
-			if (pcb_conf_plug_root[role] != NULL)
-				lht_dom_export(pcb_conf_plug_root[role]->root, stdout, prefix);
+			if (rnd_conf_plug_root[role] != NULL)
+				lht_dom_export(rnd_conf_plug_root[role]->root, stdout, prefix);
 		}
 		else
 			printf("%s <empty>\n", prefix);
@@ -162,7 +162,7 @@
 static const char pcb_acts_DumpLayers[] = "dumplayers([all])\n";
 static const char pcb_acth_DumpLayers[] = "Print info about each layer";
 
-extern lht_doc_t *pcb_conf_main_root[];
+extern lht_doc_t *rnd_conf_main_root[];
 static fgw_error_t pcb_act_DumpLayers(fgw_arg_t *res, int argc, fgw_arg_t *argv)
 {
 	int op = -2, g, n, used;
Index: trunk/src_plugins/io_lihata/write.c
===================================================================
--- trunk/src_plugins/io_lihata/write.c	(revision 34783)
+++ trunk/src_plugins/io_lihata/write.c	(revision 34784)
@@ -1678,7 +1678,7 @@
 	return nls;
 }
 
-extern lht_doc_t *pcb_conf_main_root[RND_CFR_max_alloc];
+extern lht_doc_t *rnd_conf_main_root[RND_CFR_max_alloc];
 static lht_node_t *build_conf()
 {
 	const char **s, *del_paths[] = { "editor/mode", NULL };
@@ -1687,10 +1687,10 @@
 	if (conf_io_lihata.plugins.io_lihata.omit_config)
 		return dummy_node("pcb-rnd-conf-v1");
 
-	if ((pcb_conf_main_root[RND_CFR_DESIGN] == NULL) || (pcb_conf_main_root[RND_CFR_DESIGN]->root == NULL) || (pcb_conf_main_root[RND_CFR_DESIGN]->root->type != LHT_LIST))
+	if ((rnd_conf_main_root[RND_CFR_DESIGN] == NULL) || (rnd_conf_main_root[RND_CFR_DESIGN]->root == NULL) || (rnd_conf_main_root[RND_CFR_DESIGN]->root->type != LHT_LIST))
 		return lht_dom_node_alloc(LHT_LIST, "pcb-rnd-conf-v1");
 
-	res = lht_dom_duptree(pcb_conf_main_root[RND_CFR_DESIGN]->root);
+	res = lht_dom_duptree(rnd_conf_main_root[RND_CFR_DESIGN]->root);
 
 	for(n = res->data.list.first; n != NULL; n = n->next) {
 		for(s = del_paths; *s != NULL; s++) {
Index: trunk/tests/conf/conftest.c
===================================================================
--- trunk/tests/conf/conftest.c	(revision 34783)
+++ trunk/tests/conf/conftest.c	(revision 34784)
@@ -52,7 +52,7 @@
 rnd_conf_hid_callbacks_t global_cbs = {notify_pre, notify_post, NULL, NULL};
 
 
-extern lht_doc_t *pcb_conf_main_root[];
+extern lht_doc_t *rnd_conf_main_root[];
 void cmd_dump(char *arg)
 {
 	if (arg == NULL) {
@@ -73,8 +73,8 @@
 			rnd_message(RND_MSG_ERROR, "Invalid role: '%s'", arg);
 			return;
 		}
-		if (pcb_conf_main_root[role] != NULL)
-			lht_dom_export(pcb_conf_main_root[role]->root, stdout, "");
+		if (rnd_conf_main_root[role] != NULL)
+			lht_dom_export(rnd_conf_main_root[role]->root, stdout, "");
 		else
 			printf("<empty>\n");
 	}