Index: attribs.c
===================================================================
--- attribs.c	(revision 26976)
+++ attribs.c	(revision 26977)
@@ -74,13 +74,13 @@
 			continue;
 		}
 		if (n->type == LHT_TEXT) {
-			conf_native_t *nv = conf_get_field(path);
+			conf_native_t *nv = pcb_conf_get_field(path);
 			if ((nv != NULL) && (!nv->random_flags.io_pcb_no_attrib))
 				pcb_attribute_put(&pcb->Attributes, apath, n->data.text.value);
 		}
 		else if (n->type == LHT_LIST) {
 			lht_node_t *i;
-			conf_native_t *nv = conf_get_field(path);
+			conf_native_t *nv = pcb_conf_get_field(path);
 			if ((nv != NULL) && (!nv->random_flags.io_pcb_no_attrib)) {
 				gds_t conc;
 				gds_init(&conc);
@@ -100,7 +100,7 @@
 
 void io_pcb_attrib_c2a(pcb_board_t *pcb)
 {
-	lht_node_t *nmain = conf_lht_get_first(CFR_DESIGN, 0);
+	lht_node_t *nmain = pcb_conf_lht_get_first(CFR_DESIGN, 0);
 
 	c2a(pcb, nmain, "");
 }
@@ -111,7 +111,7 @@
 
 	for (n = 0; n < pcb->Attributes.Number; n++) {
 		if (path_ok(pcb->Attributes.List[n].name)) {
-			conf_native_t *nv = conf_get_field(pcb->Attributes.List[n].name + conf_attr_prefix_len);
+			conf_native_t *nv = pcb_conf_get_field(pcb->Attributes.List[n].name + conf_attr_prefix_len);
 			if (nv == NULL)
 				continue;
 			if (nv->type == CFN_LIST) {
@@ -123,12 +123,12 @@
 						*next = '\0';
 						next += strlen(LISTSEP);
 					}
-					conf_set(CFR_DESIGN, pcb->Attributes.List[n].name + conf_attr_prefix_len, -1, curr, POL_APPEND);
+					pcb_conf_set(CFR_DESIGN, pcb->Attributes.List[n].name + conf_attr_prefix_len, -1, curr, POL_APPEND);
 				}
 				free(tmp);
 			}
 			else /* assume plain string */
-				conf_set(CFR_DESIGN, pcb->Attributes.List[n].name + conf_attr_prefix_len, -1, pcb->Attributes.List[n].value, POL_OVERWRITE);
+				pcb_conf_set(CFR_DESIGN, pcb->Attributes.List[n].name + conf_attr_prefix_len, -1, pcb->Attributes.List[n].value, POL_OVERWRITE);
 		}
 	}
 }
Index: file.c
===================================================================
--- file.c	(revision 26976)
+++ file.c	(revision 26977)
@@ -239,7 +239,7 @@
 
 static void conf_update_pcb_flag(pcb_flag_t *dest, const char *hash_path, int binflag)
 {
-	conf_native_t *n = conf_get_field(hash_path);
+	conf_native_t *n = pcb_conf_get_field(hash_path);
 	struct {
 		pcb_flag_t Flags;
 	} *tmp = (void *)dest;
Index: parse_l.c
===================================================================
--- parse_l.c	(revision 26976)
+++ parse_l.c	(revision 26977)
@@ -2499,7 +2499,7 @@
    have hardwired flags again in a "don't save these in attributes" list. */
 #define CONF_NO_ATTRIB(path) \
 do { \
-	conf_native_t *n = conf_get_field(path); \
+	conf_native_t *n = pcb_conf_get_field(path); \
 	if (n != NULL) \
 		n->random_flags.io_pcb_no_attrib = 1; \
 } while(0) \
@@ -2507,7 +2507,7 @@
 #define CONF_SET(target, path, arr_idx, new_val, pol) \
 do { \
 	CONF_NO_ATTRIB(path); \
-	conf_set(target, path, arr_idx, new_val, pol); \
+	pcb_conf_set(target, path, arr_idx, new_val, pol); \
 } while(0) \
 
 int io_pcb_ParsePCB(pcb_plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, conf_role_t settings_dest)
@@ -2524,7 +2524,7 @@
 	yy_settings_dest = settings_dest;
 
 	if (settings_dest != CFR_invalid)
-		conf_reset(settings_dest, Filename);
+		pcb_conf_reset(settings_dest, Filename);
 
 	io_pcb_preproc_board(PCB);
 
@@ -2569,7 +2569,7 @@
 		/* load config nodes not disabled above, from optional attributes */
 		io_pcb_attrib_a2c(Ptr);
 
-		conf_update(NULL, -1);
+		pcb_conf_update(NULL, -1);
 	}
 	if (retval == 0) {
 		/* restore loader so the next save will use the same units */
Index: parse_l.l
===================================================================
--- parse_l.l	(revision 26976)
+++ parse_l.l	(revision 26977)
@@ -356,7 +356,7 @@
    have hardwired flags again in a "don't save these in attributes" list. */
 #define CONF_NO_ATTRIB(path) \
 do { \
-	conf_native_t *n = conf_get_field(path); \
+	conf_native_t *n = pcb_conf_get_field(path); \
 	if (n != NULL) \
 		n->random_flags.io_pcb_no_attrib = 1; \
 } while(0) \
@@ -364,7 +364,7 @@
 #define CONF_SET(target, path, arr_idx, new_val, pol) \
 do { \
 	CONF_NO_ATTRIB(path); \
-	conf_set(target, path, arr_idx, new_val, pol); \
+	pcb_conf_set(target, path, arr_idx, new_val, pol); \
 } while(0) \
 
 int io_pcb_ParsePCB(pcb_plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, conf_role_t settings_dest)
@@ -381,7 +381,7 @@
 	yy_settings_dest = settings_dest;
 
 	if (settings_dest != CFR_invalid)
-		conf_reset(settings_dest, Filename);
+		pcb_conf_reset(settings_dest, Filename);
 
 	io_pcb_preproc_board(PCB);
 
@@ -426,7 +426,7 @@
 		/* load config nodes not disabled above, from optional attributes */
 		io_pcb_attrib_a2c(Ptr);
 
-		conf_update(NULL, -1);
+		pcb_conf_update(NULL, -1);
 	}
 	if (retval == 0) {
 		/* restore loader so the next save will use the same units */
Index: parse_y.c
===================================================================
--- parse_y.c	(revision 26976)
+++ parse_y.c	(revision 26977)
@@ -1840,7 +1840,7 @@
     {
 			  pcb_board_t *pcb_save = PCB;
 			  if ((yy_settings_dest != CFR_invalid) && (layer_group_string != NULL))
-					conf_set(yy_settings_dest, "design/groups", -1, layer_group_string, POL_OVERWRITE);
+					pcb_conf_set(yy_settings_dest, "design/groups", -1, layer_group_string, POL_OVERWRITE);
 			  pcb_board_new_postproc(yyPCB, 0);
 			  if (layer_group_string == NULL) {
 			     if (pcb_layer_improvise(yyPCB, pcb_true) != 0) {
@@ -2013,9 +2013,9 @@
 				yyPCB->hidlib.grid_oy = OU ((yyvsp[-2].measure));
 				if (yy_settings_dest != CFR_invalid) {
 					if ((yyvsp[-1].integer))
-						conf_set(yy_settings_dest, "editor/draw_grid", -1, "true", POL_OVERWRITE);
+						pcb_conf_set(yy_settings_dest, "editor/draw_grid", -1, "true", POL_OVERWRITE);
 					else
-						conf_set(yy_settings_dest, "editor/draw_grid", -1, "false", POL_OVERWRITE);
+						pcb_conf_set(yy_settings_dest, "editor/draw_grid", -1, "false", POL_OVERWRITE);
 				}
 			}
 #line 2022 "parse_y.c" /* yacc.c:1652  */
@@ -2029,9 +2029,9 @@
 				yyPCB->hidlib.grid_oy = NU ((yyvsp[-2].measure));
 				if (yy_settings_dest != CFR_invalid) {
 					if ((yyvsp[-1].integer))
-						conf_set(yy_settings_dest, "editor/draw_grid", -1, "true", POL_OVERWRITE);
+						pcb_conf_set(yy_settings_dest, "editor/draw_grid", -1, "true", POL_OVERWRITE);
 					else
-						conf_set(yy_settings_dest, "editor/draw_grid", -1, "false", POL_OVERWRITE);
+						pcb_conf_set(yy_settings_dest, "editor/draw_grid", -1, "false", POL_OVERWRITE);
 				}
 			}
 #line 2038 "parse_y.c" /* yacc.c:1652  */
@@ -3347,7 +3347,7 @@
 {
 	char tmp[128];
 	pcb_sprintf(tmp, "%$mm", crd);
-	conf_set(CFR_DESIGN, path, -1, tmp, POL_OVERWRITE);
+	pcb_conf_set(CFR_DESIGN, path, -1, tmp, POL_OVERWRITE);
 }
 
 static void load_meta_float(const char *path, double val)
@@ -3354,5 +3354,5 @@
 {
 	char tmp[128];
 	pcb_sprintf(tmp, "%f", val);
-	conf_set(CFR_DESIGN, path, -1, tmp, POL_OVERWRITE);
+	pcb_conf_set(CFR_DESIGN, path, -1, tmp, POL_OVERWRITE);
 }
Index: parse_y.y
===================================================================
--- parse_y.y	(revision 26976)
+++ parse_y.y	(revision 26977)
@@ -188,7 +188,7 @@
 			{
 			  pcb_board_t *pcb_save = PCB;
 			  if ((yy_settings_dest != CFR_invalid) && (layer_group_string != NULL))
-					conf_set(yy_settings_dest, "design/groups", -1, layer_group_string, POL_OVERWRITE);
+					pcb_conf_set(yy_settings_dest, "design/groups", -1, layer_group_string, POL_OVERWRITE);
 			  pcb_board_new_postproc(yyPCB, 0);
 			  if (layer_group_string == NULL) {
 			     if (pcb_layer_improvise(yyPCB, pcb_true) != 0) {
@@ -345,9 +345,9 @@
 				yyPCB->hidlib.grid_oy = OU ($5);
 				if (yy_settings_dest != CFR_invalid) {
 					if ($6)
-						conf_set(yy_settings_dest, "editor/draw_grid", -1, "true", POL_OVERWRITE);
+						pcb_conf_set(yy_settings_dest, "editor/draw_grid", -1, "true", POL_OVERWRITE);
 					else
-						conf_set(yy_settings_dest, "editor/draw_grid", -1, "false", POL_OVERWRITE);
+						pcb_conf_set(yy_settings_dest, "editor/draw_grid", -1, "false", POL_OVERWRITE);
 				}
 			}
 		;
@@ -360,9 +360,9 @@
 				yyPCB->hidlib.grid_oy = NU ($5);
 				if (yy_settings_dest != CFR_invalid) {
 					if ($6)
-						conf_set(yy_settings_dest, "editor/draw_grid", -1, "true", POL_OVERWRITE);
+						pcb_conf_set(yy_settings_dest, "editor/draw_grid", -1, "true", POL_OVERWRITE);
 					else
-						conf_set(yy_settings_dest, "editor/draw_grid", -1, "false", POL_OVERWRITE);
+						pcb_conf_set(yy_settings_dest, "editor/draw_grid", -1, "false", POL_OVERWRITE);
 				}
 			}
 		;
@@ -1443,7 +1443,7 @@
 {
 	char tmp[128];
 	pcb_sprintf(tmp, "%$mm", crd);
-	conf_set(CFR_DESIGN, path, -1, tmp, POL_OVERWRITE);
+	pcb_conf_set(CFR_DESIGN, path, -1, tmp, POL_OVERWRITE);
 }
 
 static void load_meta_float(const char *path, double val)
@@ -1450,5 +1450,5 @@
 {
 	char tmp[128];
 	pcb_sprintf(tmp, "%f", val);
-	conf_set(CFR_DESIGN, path, -1, tmp, POL_OVERWRITE);
+	pcb_conf_set(CFR_DESIGN, path, -1, tmp, POL_OVERWRITE);
 }