Index: attribs.c
===================================================================
--- attribs.c	(revision 30944)
+++ attribs.c	(revision 30945)
@@ -74,13 +74,13 @@
 			continue;
 		}
 		if (n->type == LHT_TEXT) {
-			conf_native_t *nv = pcb_conf_get_field(path);
+			rnd_conf_native_t *nv = pcb_conf_get_field(path);
 			if ((nv != NULL) && (!nv->random_flags.io_pcb_no_attrib))
 				rnd_attribute_put(&pcb->Attributes, apath, n->data.text.value);
 		}
 		else if (n->type == LHT_LIST) {
 			lht_node_t *i;
-			conf_native_t *nv = pcb_conf_get_field(path);
+			rnd_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);
@@ -111,10 +111,10 @@
 
 	for (n = 0; n < pcb->Attributes.Number; n++) {
 		if (path_ok(pcb->Attributes.List[n].name)) {
-			conf_native_t *nv = pcb_conf_get_field(pcb->Attributes.List[n].name + conf_attr_prefix_len);
+			rnd_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) {
+			if (nv->type == RND_CFN_LIST) {
 				char *tmp = rnd_strdup(pcb->Attributes.List[n].value);
 				char *next, *curr;
 				for(curr = tmp; curr != NULL; curr = next) {
Index: file.c
===================================================================
--- file.c	(revision 30944)
+++ file.c	(revision 30945)
@@ -239,12 +239,12 @@
 
 static void conf_update_pcb_flag(pcb_flag_t *dest, const char *hash_path, int binflag)
 {
-	conf_native_t *n = pcb_conf_get_field(hash_path);
+	rnd_conf_native_t *n = pcb_conf_get_field(hash_path);
 	struct {
 		pcb_flag_t Flags;
 	} *tmp = (void *)dest;
 
-	if ((n == NULL) || (n->type != CFN_BOOLEAN) || (n->used < 0) || (!n->val.boolean[0]))
+	if ((n == NULL) || (n->type != RND_CFN_BOOLEAN) || (n->used < 0) || (!n->val.boolean[0]))
 		PCB_FLAG_CLEAR(binflag, tmp);
 	else
 		PCB_FLAG_SET(binflag, tmp);
Index: parse_common.h
===================================================================
--- parse_common.h	(revision 30944)
+++ parse_common.h	(revision 30945)
@@ -36,7 +36,7 @@
 #include "config.h"
 #include "plug_io.h"
 
-int io_pcb_ParsePCB(pcb_plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, conf_role_t settings_dest);
+int io_pcb_ParsePCB(pcb_plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, rnd_conf_role_t settings_dest);
 int io_pcb_ParseElement(pcb_plug_io_t *ctx, pcb_data_t *, const char *, const char *);
 int io_pcb_ParseFont(pcb_plug_io_t *ctx, pcb_font_t *, const char *);
 
Index: parse_l.c
===================================================================
--- parse_l.c	(revision 30944)
+++ parse_l.c	(revision 30945)
@@ -943,7 +943,7 @@
 pcb_subc_t *yysubc;
 rnd_coord_t yysubc_ox, yysubc_oy;
 pcb_font_t *	yyFont;
-conf_role_t yy_settings_dest;
+rnd_conf_role_t yy_settings_dest;
 pcb_flag_t yy_pcb_flags;
 int *yyFontkitValid;
 int yy_parse_tags;
@@ -2739,7 +2739,7 @@
    have hardwired flags again in a "don't save these in attributes" list. */
 #define CONF_NO_ATTRIB(path) \
 do { \
-	conf_native_t *n = pcb_conf_get_field(path); \
+	rnd_conf_native_t *n = pcb_conf_get_field(path); \
 	if (n != NULL) \
 		n->random_flags.io_pcb_no_attrib = 1; \
 } while(0) \
@@ -2750,7 +2750,7 @@
 	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)
+int io_pcb_ParsePCB(pcb_plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, rnd_conf_role_t settings_dest)
 {
 	int retval;
 	const char *fcmd;
Index: parse_l.l
===================================================================
--- parse_l.l	(revision 30944)
+++ parse_l.l	(revision 30945)
@@ -74,7 +74,7 @@
 pcb_subc_t *yysubc;
 rnd_coord_t yysubc_ox, yysubc_oy;
 pcb_font_t *	yyFont;
-conf_role_t yy_settings_dest;
+rnd_conf_role_t yy_settings_dest;
 pcb_flag_t yy_pcb_flags;
 int *yyFontkitValid;
 int yy_parse_tags;
@@ -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 = pcb_conf_get_field(path); \
+	rnd_conf_native_t *n = pcb_conf_get_field(path); \
 	if (n != NULL) \
 		n->random_flags.io_pcb_no_attrib = 1; \
 } while(0) \
@@ -367,7 +367,7 @@
 	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)
+int io_pcb_ParsePCB(pcb_plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, rnd_conf_role_t settings_dest)
 {
 	int retval;
 	const char *fcmd;
Index: parse_y.c
===================================================================
--- parse_y.c	(revision 30944)
+++ parse_y.c	(revision 30945)
@@ -154,7 +154,7 @@
 extern	rnd_bool	yyFontReset;
 extern	int				pcb_lineno;		/* linenumber */
 extern	char			*yyfilename;	/* in this file */
-extern	conf_role_t yy_settings_dest;
+extern	rnd_conf_role_t yy_settings_dest;
 extern pcb_flag_t yy_pcb_flags;
 extern int *yyFontkitValid;
 extern int yyElemFixLayers;
Index: parse_y.y
===================================================================
--- parse_y.y	(revision 30944)
+++ parse_y.y	(revision 30945)
@@ -77,7 +77,7 @@
 extern	rnd_bool	yyFontReset;
 extern	int				pcb_lineno;		/* linenumber */
 extern	char			*yyfilename;	/* in this file */
-extern	conf_role_t yy_settings_dest;
+extern	rnd_conf_role_t yy_settings_dest;
 extern pcb_flag_t yy_pcb_flags;
 extern int *yyFontkitValid;
 extern int yyElemFixLayers;