Index: attribs.c
===================================================================
--- attribs.c	(revision 30945)
+++ attribs.c	(revision 30946)
@@ -100,7 +100,7 @@
 
 void io_pcb_attrib_c2a(pcb_board_t *pcb)
 {
-	lht_node_t *nmain = pcb_conf_lht_get_first(CFR_DESIGN, 0);
+	lht_node_t *nmain = pcb_conf_lht_get_first(RND_CFR_DESIGN, 0);
 
 	c2a(pcb, nmain, "");
 }
@@ -123,12 +123,12 @@
 						*next = '\0';
 						next += strlen(LISTSEP);
 					}
-					pcb_conf_set(CFR_DESIGN, pcb->Attributes.List[n].name + conf_attr_prefix_len, -1, curr, RND_POL_APPEND);
+					pcb_conf_set(RND_CFR_DESIGN, pcb->Attributes.List[n].name + conf_attr_prefix_len, -1, curr, RND_POL_APPEND);
 				}
 				free(tmp);
 			}
 			else /* assume plain string */
-				pcb_conf_set(CFR_DESIGN, pcb->Attributes.List[n].name + conf_attr_prefix_len, -1, pcb->Attributes.List[n].value, RND_POL_OVERWRITE);
+				pcb_conf_set(RND_CFR_DESIGN, pcb->Attributes.List[n].name + conf_attr_prefix_len, -1, pcb->Attributes.List[n].value, RND_POL_OVERWRITE);
 		}
 	}
 }
Index: parse_l.c
===================================================================
--- parse_l.c	(revision 30945)
+++ parse_l.c	(revision 30946)
@@ -2703,7 +2703,7 @@
 	/* set up the yy globals only after the pcb_fp_fopen() because it can
 	   also call Parse */
 	yy_parse_tags = 0;
-	yy_settings_dest = CFR_invalid;
+	yy_settings_dest = RND_CFR_invalid;
 	yyPCB = NULL;
 	yyData = Ptr;
 	pcb_data_set_layer_parents(Ptr);
@@ -2763,7 +2763,7 @@
 	yysubc = NULL;
 	yy_settings_dest = settings_dest;
 
-	if (settings_dest != CFR_invalid)
+	if (settings_dest != RND_CFR_invalid)
 		pcb_conf_reset(settings_dest, Filename);
 
 	io_pcb_preproc_board(PCB);
@@ -2772,10 +2772,10 @@
 	fcmd = conf_core.rc.file_command;
 	retval = Parse(NULL, fcmd, conf_core.rc.file_path, Filename);
 
-	if ((settings_dest != CFR_invalid) && (retval == 0)) {
+	if ((settings_dest != RND_CFR_invalid) && (retval == 0)) {
 		/* overwrite settings from the flags, mark them not-to-save */
 		pcb_conf_reset(settings_dest, "<io_pcb_ParsePCB>");
-		pcb_conf_main_root_replace_cnt[settings_dest]++;
+		rnd_conf_main_root_replace_cnt[settings_dest]++;
 		CONF_SET(settings_dest, "plugins/mincut/enable", -1, CONF_BOOL_FLAG(PCB_ENABLEPCB_FLAG_MINCUT, yy_pcb_flags), RND_POL_OVERWRITE);
 		CONF_SET(settings_dest, "editor/show_number", -1, CONF_BOOL_FLAG(PCB_SHOWNUMBERFLAG, yy_pcb_flags), RND_POL_OVERWRITE);
 		CONF_SET(settings_dest, "editor/show_drc", -1, CONF_BOOL_FLAG(PCB_SHOWPCB_FLAG_DRC, yy_pcb_flags), RND_POL_OVERWRITE);
@@ -2869,7 +2869,7 @@
 	yysubc = NULL;
 	yyFontReset = pcb_false;
 
-	yy_settings_dest = CFR_invalid;
+	yy_settings_dest = RND_CFR_invalid;
 	fcmd = conf_core.rc.font_command;
 	r = Parse(NULL, fcmd, NULL, Filename);
 	if (r == 0) {
Index: parse_l.l
===================================================================
--- parse_l.l	(revision 30945)
+++ parse_l.l	(revision 30946)
@@ -320,7 +320,7 @@
 	/* set up the yy globals only after the pcb_fp_fopen() because it can
 	   also call Parse */
 	yy_parse_tags = 0;
-	yy_settings_dest = CFR_invalid;
+	yy_settings_dest = RND_CFR_invalid;
 	yyPCB = NULL;
 	yyData = Ptr;
 	pcb_data_set_layer_parents(Ptr);
@@ -380,7 +380,7 @@
 	yysubc = NULL;
 	yy_settings_dest = settings_dest;
 
-	if (settings_dest != CFR_invalid)
+	if (settings_dest != RND_CFR_invalid)
 		pcb_conf_reset(settings_dest, Filename);
 
 	io_pcb_preproc_board(PCB);
@@ -389,10 +389,10 @@
 	fcmd = conf_core.rc.file_command;
 	retval = Parse(NULL, fcmd, conf_core.rc.file_path, Filename);
 
-	if ((settings_dest != CFR_invalid) && (retval == 0)) {
+	if ((settings_dest != RND_CFR_invalid) && (retval == 0)) {
 		/* overwrite settings from the flags, mark them not-to-save */
 		pcb_conf_reset(settings_dest, "<io_pcb_ParsePCB>");
-		pcb_conf_main_root_replace_cnt[settings_dest]++;
+		rnd_conf_main_root_replace_cnt[settings_dest]++;
 		CONF_SET(settings_dest, "plugins/mincut/enable", -1, CONF_BOOL_FLAG(PCB_ENABLEPCB_FLAG_MINCUT, yy_pcb_flags), RND_POL_OVERWRITE);
 		CONF_SET(settings_dest, "editor/show_number", -1, CONF_BOOL_FLAG(PCB_SHOWNUMBERFLAG, yy_pcb_flags), RND_POL_OVERWRITE);
 		CONF_SET(settings_dest, "editor/show_drc", -1, CONF_BOOL_FLAG(PCB_SHOWPCB_FLAG_DRC, yy_pcb_flags), RND_POL_OVERWRITE);
@@ -486,7 +486,7 @@
 	yysubc = NULL;
 	yyFontReset = pcb_false;
 
-	yy_settings_dest = CFR_invalid;
+	yy_settings_dest = RND_CFR_invalid;
 	fcmd = conf_core.rc.font_command;
 	r = Parse(NULL, fcmd, NULL, Filename);
 	if (r == 0) {
Index: parse_y.c
===================================================================
--- parse_y.c	(revision 30945)
+++ parse_y.c	(revision 30946)
@@ -1842,7 +1842,7 @@
 #line 191 "parse_y.y" /* yacc.c:1652  */
     {
 			  pcb_board_t *pcb_save = PCB;
-			  if ((yy_settings_dest != CFR_invalid) && (layer_group_string != NULL))
+			  if ((yy_settings_dest != RND_CFR_invalid) && (layer_group_string != NULL))
 					pcb_conf_set(yy_settings_dest, "design/groups", -1, layer_group_string, RND_POL_OVERWRITE);
 			  pcb_board_new_postproc(yyPCB, 0);
 			  if (layer_group_string == NULL) {
@@ -2018,7 +2018,7 @@
 				yyPCB->hidlib.grid = OU ((yyvsp[-4].measure));
 				yyPCB->hidlib.grid_ox = OU ((yyvsp[-3].measure));
 				yyPCB->hidlib.grid_oy = OU ((yyvsp[-2].measure));
-				if (yy_settings_dest != CFR_invalid) {
+				if (yy_settings_dest != RND_CFR_invalid) {
 					if ((yyvsp[-1].integer))
 						pcb_conf_set(yy_settings_dest, "editor/draw_grid", -1, "true", RND_POL_OVERWRITE);
 					else
@@ -2034,7 +2034,7 @@
 				yyPCB->hidlib.grid = NU ((yyvsp[-4].measure));
 				yyPCB->hidlib.grid_ox = NU ((yyvsp[-3].measure));
 				yyPCB->hidlib.grid_oy = NU ((yyvsp[-2].measure));
-				if (yy_settings_dest != CFR_invalid) {
+				if (yy_settings_dest != RND_CFR_invalid) {
 					if ((yyvsp[-1].integer))
 						pcb_conf_set(yy_settings_dest, "editor/draw_grid", -1, "true", RND_POL_OVERWRITE);
 					else
@@ -3354,7 +3354,7 @@
 {
 	char tmp[128];
 	pcb_sprintf(tmp, "%$mm", crd);
-	pcb_conf_set(CFR_DESIGN, path, -1, tmp, RND_POL_OVERWRITE);
+	pcb_conf_set(RND_CFR_DESIGN, path, -1, tmp, RND_POL_OVERWRITE);
 }
 
 static void load_meta_float(const char *path, double val)
@@ -3361,5 +3361,5 @@
 {
 	char tmp[128];
 	pcb_sprintf(tmp, "%f", val);
-	pcb_conf_set(CFR_DESIGN, path, -1, tmp, RND_POL_OVERWRITE);
+	pcb_conf_set(RND_CFR_DESIGN, path, -1, tmp, RND_POL_OVERWRITE);
 }
Index: parse_y.y
===================================================================
--- parse_y.y	(revision 30945)
+++ parse_y.y	(revision 30946)
@@ -190,7 +190,7 @@
 		  pcbnetlistpatch
 			{
 			  pcb_board_t *pcb_save = PCB;
-			  if ((yy_settings_dest != CFR_invalid) && (layer_group_string != NULL))
+			  if ((yy_settings_dest != RND_CFR_invalid) && (layer_group_string != NULL))
 					pcb_conf_set(yy_settings_dest, "design/groups", -1, layer_group_string, RND_POL_OVERWRITE);
 			  pcb_board_new_postproc(yyPCB, 0);
 			  if (layer_group_string == NULL) {
@@ -350,7 +350,7 @@
 				yyPCB->hidlib.grid = OU ($3);
 				yyPCB->hidlib.grid_ox = OU ($4);
 				yyPCB->hidlib.grid_oy = OU ($5);
-				if (yy_settings_dest != CFR_invalid) {
+				if (yy_settings_dest != RND_CFR_invalid) {
 					if ($6)
 						pcb_conf_set(yy_settings_dest, "editor/draw_grid", -1, "true", RND_POL_OVERWRITE);
 					else
@@ -365,7 +365,7 @@
 				yyPCB->hidlib.grid = NU ($3);
 				yyPCB->hidlib.grid_ox = NU ($4);
 				yyPCB->hidlib.grid_oy = NU ($5);
-				if (yy_settings_dest != CFR_invalid) {
+				if (yy_settings_dest != RND_CFR_invalid) {
 					if ($6)
 						pcb_conf_set(yy_settings_dest, "editor/draw_grid", -1, "true", RND_POL_OVERWRITE);
 					else
@@ -1450,7 +1450,7 @@
 {
 	char tmp[128];
 	pcb_sprintf(tmp, "%$mm", crd);
-	pcb_conf_set(CFR_DESIGN, path, -1, tmp, RND_POL_OVERWRITE);
+	pcb_conf_set(RND_CFR_DESIGN, path, -1, tmp, RND_POL_OVERWRITE);
 }
 
 static void load_meta_float(const char *path, double val)
@@ -1457,5 +1457,5 @@
 {
 	char tmp[128];
 	pcb_sprintf(tmp, "%f", val);
-	pcb_conf_set(CFR_DESIGN, path, -1, tmp, RND_POL_OVERWRITE);
+	pcb_conf_set(RND_CFR_DESIGN, path, -1, tmp, RND_POL_OVERWRITE);
 }