Index: trunk/src/librnd/core/conf.c
===================================================================
--- trunk/src/librnd/core/conf.c	(revision 30952)
+++ trunk/src/librnd/core/conf.c	(revision 30953)
@@ -687,7 +687,7 @@
 {
 	lht_node_t *s, *prev;
 	int res = 0;
-	pcb_conf_listitem_t *i;
+	rnd_conf_listitem_t *i;
 
 	switch(pol) {
 		case RND_POL_DISABLE:
@@ -703,7 +703,7 @@
 					prev = NULL;
 
 				if ((s->type == LHT_TEXT) || ((s->type == LHT_HASH) && (dest->type == RND_CFN_HLIST))) {
-					i = calloc(sizeof(pcb_conf_listitem_t), 1);
+					i = calloc(sizeof(rnd_conf_listitem_t), 1);
 					i->name = s->name;
 					i->val.string = &i->payload;
 					i->prop.prio = prio;
@@ -715,12 +715,12 @@
 						free(i);
 						continue;
 					}
-					pcb_conflist_insert(dest->val.list, i);
+					rnd_conflist_insert(dest->val.list, i);
 					dest->used |= 1;
 				}
 				else if ((s->type == LHT_HASH) && (dest->type == RND_CFN_HLIST)) {
 					i->val.any = NULL;
-					pcb_conflist_insert(dest->val.list, i);
+					rnd_conflist_insert(dest->val.list, i);
 					dest->used |= 1;
 					if ((dest->type == RND_CFN_HLIST) || (s->user_data == NULL)) {
 						conf_hid_global_cb_ptr(dest, i, new_hlist_item_post);
@@ -735,8 +735,8 @@
 			break;
 		case RND_POL_OVERWRITE:
 			/* overwrite the whole list: make it empty then append new elements */
-			while((i = pcb_conflist_first(dest->val.list)) != NULL) {
-				pcb_conflist_remove(i);
+			while((i = rnd_conflist_first(dest->val.list)) != NULL) {
+				rnd_conflist_remove(i);
 				free(i);
 			}
 			/* fall through */
@@ -743,7 +743,7 @@
 		case RND_POL_APPEND:
 			for(s = src_lst->data.list.first; s != NULL; s = s->next) {
 				if ((s->type == LHT_TEXT) || ((s->type == LHT_HASH) && (dest->type == RND_CFN_HLIST))) {
-					i = calloc(sizeof(pcb_conf_listitem_t), 1);
+					i = calloc(sizeof(rnd_conf_listitem_t), 1);
 					i->name = s->name;
 					i->val.string = &i->payload;
 					i->prop.prio = prio;
@@ -754,11 +754,11 @@
 						free(i);
 						continue;
 					}
-					pcb_conflist_append(dest->val.list, i);
+					rnd_conflist_append(dest->val.list, i);
 					dest->used |= 1;
 				}
 				else if ((s->type == LHT_HASH) && (dest->type == RND_CFN_HLIST)) {
-					pcb_conflist_append(dest->val.list, i);
+					rnd_conflist_append(dest->val.list, i);
 					i->val.any = NULL;
 					dest->used |= 1;
 					if ((dest->type == RND_CFN_HLIST) && (s->user_data == NULL)) {
@@ -1044,9 +1044,9 @@
 			case RND_CFN_COLOR:       clr(color); break;
 			case RND_CFN_LIST:
 			case RND_CFN_HLIST:
-				while(pcb_conflist_first(f->val.list)) { /* need to free all items of a list before clearing the main struct */
-					pcb_conf_listitem_t *i = pcb_conflist_first(f->val.list);
-					pcb_conflist_remove(i);
+				while(rnd_conflist_first(f->val.list)) { /* need to free all items of a list before clearing the main struct */
+					rnd_conf_listitem_t *i = rnd_conflist_first(f->val.list);
+					rnd_conflist_remove(i);
 					free(i);
 				}
 				clr(list);
@@ -1346,9 +1346,9 @@
 void pcb_conf_free_native(rnd_conf_native_t *node)
 {
 	if ((node->type == RND_CFN_LIST) || (node->type == RND_CFN_HLIST)) {
-		while(pcb_conflist_first(node->val.list) != NULL) {
-			pcb_conf_listitem_t *first = pcb_conflist_first(node->val.list);
-			pcb_conflist_remove(first);
+		while(rnd_conflist_first(node->val.list) != NULL) {
+			rnd_conf_listitem_t *first = rnd_conflist_first(node->val.list);
+			rnd_conflist_remove(first);
 			free(first);
 		}
 	}
@@ -1821,9 +1821,9 @@
 
 			gds_init(&s);
 			if ((n->type == RND_CFN_LIST) || (n->type == RND_CFN_HLIST)) {
-				pcb_conf_listitem_t *it;
+				rnd_conf_listitem_t *it;
 				ch = lht_dom_node_alloc(LHT_LIST, name+1);
-				for(it = pcb_conflist_first(n->val.list); it != NULL; it = pcb_conflist_next(it)) {
+				for(it = rnd_conflist_first(n->val.list); it != NULL; it = rnd_conflist_next(it)) {
 					lht_node_t *txt;
 					txt = lht_dom_node_alloc(LHT_TEXT, "");
 					txt->data.text.value = rnd_strdup(it->payload);
@@ -1972,10 +1972,10 @@
 }
 
 
-pcb_conf_listitem_t *rnd_conf_list_first_str(pcb_conflist_t *list, const char **item_str, int *idx)
+rnd_conf_listitem_t *rnd_conf_list_first_str(rnd_conflist_t *list, const char **item_str, int *idx)
 {
-	pcb_conf_listitem_t *item_li;
-	item_li = pcb_conflist_first(list);
+	rnd_conf_listitem_t *item_li;
+	item_li = rnd_conflist_first(list);
 	if (item_li == NULL)
 		return NULL;
 	if (item_li->type == RND_CFN_STRING) {
@@ -1985,9 +1985,9 @@
 	return rnd_conf_list_next_str(item_li, item_str, idx);
 }
 
-pcb_conf_listitem_t *rnd_conf_list_next_str(pcb_conf_listitem_t *item_li, const char **item_str, int *idx)
+rnd_conf_listitem_t *rnd_conf_list_next_str(rnd_conf_listitem_t *item_li, const char **item_str, int *idx)
 {
-	while((item_li = pcb_conflist_next(item_li)) != NULL) {
+	while((item_li = rnd_conflist_next(item_li)) != NULL) {
 		(*idx)++;
 		if (item_li->type != RND_CFN_STRING)
 			continue;
@@ -2001,10 +2001,10 @@
 	return item_li;
 }
 
-const char *rnd_conf_concat_strlist(const pcb_conflist_t *lst, gds_t *buff, int *inited, char sep)
+const char *rnd_conf_concat_strlist(const rnd_conflist_t *lst, gds_t *buff, int *inited, char sep)
 {
 	int n;
-	pcb_conf_listitem_t *ci;
+	rnd_conf_listitem_t *ci;
 
 	if ((inited == NULL) || (!*inited)) {
 		gds_init(buff);
@@ -2014,7 +2014,7 @@
 	else
 		gds_truncate(buff, 0);
 
-	for (n = 0, ci = pcb_conflist_first((pcb_conflist_t *)lst); ci != NULL; ci = pcb_conflist_next(ci), n++) {
+	for (n = 0, ci = rnd_conflist_first((rnd_conflist_t *)lst); ci != NULL; ci = rnd_conflist_next(ci), n++) {
 		const char *p = ci->val.string[0];
 		if (ci->type != RND_CFN_STRING)
 			continue;
@@ -2117,10 +2117,10 @@
 		case RND_CFN_LIST:
 		case RND_CFN_HLIST:
 			{
-				pcb_conf_listitem_t *n;
-				if (pcb_conflist_length(val->list) > 0) {
+				rnd_conf_listitem_t *n;
+				if (rnd_conflist_length(val->list) > 0) {
 					ret += pfn(ctx, "{");
-					for(n = pcb_conflist_first(val->list); n != NULL; n = pcb_conflist_next(n)) {
+					for(n = rnd_conflist_first(val->list); n != NULL; n = rnd_conflist_next(n)) {
 						rnd_conf_print_native_field(pfn, ctx, verbose, &n->val, n->type, &n->prop, 0);
 						ret += pfn(ctx, ";");
 					}
Index: trunk/src/librnd/core/conf.h
===================================================================
--- trunk/src/librnd/core/conf.h	(revision 30952)
+++ trunk/src/librnd/core/conf.h	(revision 30953)
@@ -35,7 +35,7 @@
 #include <librnd/core/unit.h>
 
 typedef union rnd_confitem_u rnd_confitem_t ;
-typedef struct conf_listitem_s pcb_conf_listitem_t;
+typedef struct conf_listitem_s rnd_conf_listitem_t;
 
 #include <librnd/core/list_conf.h>
 
@@ -61,8 +61,8 @@
 typedef rnd_coord_t       RND_CFT_COORD;
 typedef pcb_unit_t *      RND_CFT_UNIT;
 typedef rnd_color_t       RND_CFT_COLOR;
-typedef pcb_conflist_t    RND_CFT_LIST;
-typedef pcb_conflist_t    RND_CFT_HLIST;
+typedef rnd_conflist_t    RND_CFT_LIST;
+typedef rnd_conflist_t    RND_CFT_HLIST;
 
 typedef enum {
 	RND_CFN_STRING,
@@ -85,7 +85,7 @@
 	rnd_coord_t *coord;
 	const pcb_unit_t **unit;
 	rnd_color_t *color;
-	pcb_conflist_t *list;
+	rnd_conflist_t *list;
 	void *any;
 };
 
@@ -307,11 +307,11 @@
 
 #define rnd_conf_list_foreach_path_first(hidlib, res, conf_list, call) \
 do { \
-	pcb_conf_listitem_t *__n__; \
-	const pcb_conflist_t *__lst1__ = (conf_list); \
-	pcb_conflist_t *__lst__ = (pcb_conflist_t *)(__lst1__); \
+	rnd_conf_listitem_t *__n__; \
+	const rnd_conflist_t *__lst1__ = (conf_list); \
+	rnd_conflist_t *__lst__ = (rnd_conflist_t *)(__lst1__); \
 	if (__lst__ != NULL) { \
-		for(__n__ = pcb_conflist_first(__lst__); __n__ != NULL; __n__ = pcb_conflist_next(__n__)) { \
+		for(__n__ = rnd_conflist_first(__lst__); __n__ != NULL; __n__ = rnd_conflist_next(__n__)) { \
 			char *__path__; \
 			const char **__in__ = __n__->val.string; \
 			if (__in__ == NULL) \
@@ -363,20 +363,20 @@
 lht_node_t *rnd_conf_lht_get_first(rnd_conf_role_t target, int create);
 
 /* loop helper */
-pcb_conf_listitem_t *rnd_conf_list_first_str(pcb_conflist_t *list, const char **item_str, int *idx);
-pcb_conf_listitem_t *rnd_conf_list_next_str(pcb_conf_listitem_t *item_li, const char **item_str, int *idx);
+rnd_conf_listitem_t *rnd_conf_list_first_str(rnd_conflist_t *list, const char **item_str, int *idx);
+rnd_conf_listitem_t *rnd_conf_list_next_str(rnd_conf_listitem_t *item_li, const char **item_str, int *idx);
 
-/*pcb_conf_listitem_t *item;*/
+/*rnd_conf_listitem_t *item;*/
 #define rnd_conf_loop_list(list, item, idx) \
-	for (idx = 0, item = pcb_conflist_first((pcb_conflist_t *)list); item != NULL; item = pcb_conflist_next(item), idx++)
+	for (idx = 0, item = rnd_conflist_first((rnd_conflist_t *)list); item != NULL; item = rnd_conflist_next(item), idx++)
 
-/*pcb_conf_listitem_t *item; const char *item_str; */
+/*rnd_conf_listitem_t *item; const char *item_str; */
 #define rnd_conf_loop_list_str(list, item_li, item_str, idx) \
-	for (idx = 0, item_li = rnd_conf_list_first_str((pcb_conflist_t *)list, &item_str, &idx); \
+	for (idx = 0, item_li = rnd_conf_list_first_str((rnd_conflist_t *)list, &item_str, &idx); \
 		item_li != NULL;\
 		item_li = rnd_conf_list_next_str(item_li, &item_str, &idx))
 
-const char *rnd_conf_concat_strlist(const pcb_conflist_t *lst, gds_t *buff, int *inited, char sep);
+const char *rnd_conf_concat_strlist(const rnd_conflist_t *lst, gds_t *buff, int *inited, char sep);
 
 /* Print usage help for all nodes that have the RND_CFF_USAGE flag and whose
    path starts with prefix (if prefix != NULL) */
@@ -405,8 +405,8 @@
 /* Returns the user configuration file name */
 const char *rnd_conf_get_user_conf_name();
 
-/* Determine the file name of the project file - project_fn and pcb_fn can be NULL */
-const char *rnd_conf_get_project_conf_name(const char *project_fn, const char *pcb_fn, const char **out_project_fn);
+/* Determine the file name of the project file - project_fn and design_fn can be NULL */
+const char *rnd_conf_get_project_conf_name(const char *project_fn, const char *design_fn, const char **out_project_fn);
 
 /* Get the first subtree that matches pol within target; allocate new
    subtree if needed */
Index: trunk/src/librnd/core/conf_hid.h
===================================================================
--- trunk/src/librnd/core/conf_hid.h	(revision 30952)
+++ trunk/src/librnd/core/conf_hid.h	(revision 30953)
@@ -11,7 +11,7 @@
 
 	/* Called when a new config item is added to the database; global-only */
 	void (*new_item_post)(rnd_conf_native_t *cfg, int arr_idx);
-	void (*new_hlist_item_post)(rnd_conf_native_t *cfg, pcb_conf_listitem_t *i);
+	void (*new_hlist_item_post)(rnd_conf_native_t *cfg, rnd_conf_listitem_t *i);
 
 	/* Called during pcb_conf_hid_unreg to get hid-data cleaned up */
 	void (*unreg_item)(rnd_conf_native_t *cfg, int arr_idx);
Index: trunk/src/librnd/core/grid.c
===================================================================
--- trunk/src/librnd/core/grid.c	(revision 30952)
+++ trunk/src/librnd/core/grid.c	(revision 30953)
@@ -180,9 +180,9 @@
 
 pcb_bool_t pcb_grid_list_jump(rnd_hidlib_t *hidlib, int dst)
 {
-	const pcb_conf_listitem_t *li;
+	const rnd_conf_listitem_t *li;
 	pcb_grid_t g;
-	int max = pcb_conflist_length((pcb_conflist_t *)&pcbhl_conf.editor.grids);
+	int max = rnd_conflist_length((rnd_conflist_t *)&pcbhl_conf.editor.grids);
 
 	if (dst < 0)
 		dst = 0;
@@ -193,7 +193,7 @@
 
 	rnd_conf_setf(RND_CFR_DESIGN, "editor/grids_idx", -1, "%d", dst);
 
-	li = pcb_conflist_nth((pcb_conflist_t *)&pcbhl_conf.editor.grids, dst);
+	li = rnd_conflist_nth((rnd_conflist_t *)&pcbhl_conf.editor.grids, dst);
 	/* clamp */
 	if (li == NULL)
 		return pcb_false;
Index: trunk/src/librnd/core/hid_init.c
===================================================================
--- trunk/src/librnd/core/hid_init.c	(revision 30952)
+++ trunk/src/librnd/core/hid_init.c	(revision 30953)
@@ -397,7 +397,7 @@
 /* parse arguments using the gui; if fails and fallback is enabled, try the next gui */
 int pcb_gui_parse_arguments(int autopick_gui, int *hid_argc, char **hid_argv[])
 {
-	pcb_conf_listitem_t *apg = NULL;
+	rnd_conf_listitem_t *apg = NULL;
 
 	if ((autopick_gui >= 0) && (pcbhl_conf.rc.hid_fallback)) { /* start from the GUI we are initializing first */
 		int n;
@@ -630,7 +630,7 @@
 			break;
 		default: {
 			const char *g;
-			pcb_conf_listitem_t *i;
+			rnd_conf_listitem_t *i;
 
 			pcb_render = pcb_gui = NULL;
 			rnd_conf_loop_list_str(&pcbhl_conf.rc.preferred_gui, i, g, ga->autopick_gui) {
Index: trunk/src/librnd/core/list_conf.h
===================================================================
--- trunk/src/librnd/core/list_conf.h	(revision 30952)
+++ trunk/src/librnd/core/list_conf.h	(revision 30953)
@@ -35,15 +35,15 @@
 #define TDL_DONT_UNDEF
 #endif
 
-#define TDL(x)      pcb_conflist_ ## x
-#define TDL_LIST_T  pcb_conflist_t
-#define TDL_LIST_U  pcb_conflist_u
-#define TDL_ITEM_T  pcb_conf_listitem_t
+#define TDL(x)      rnd_conflist_ ## x
+#define TDL_LIST_T  rnd_conflist_t
+#define TDL_LIST_U  rnd_conflist_u
+#define TDL_ITEM_T  rnd_conf_listitem_t
 #define TDL_FIELD   link
 #define TDL_SIZE_T  size_t
 #define TDL_FUNC
 
-#define pcb_conflist_foreach(list, iterator, loop_elem) \
+#define rnd_conflist_foreach(list, iterator, loop_elem) \
 	gdl_foreach_((&((list)->lst)), (iterator), (loop_elem))
 
 
Index: trunk/src/librnd/core/safe_fs.c
===================================================================
--- trunk/src/librnd/core/safe_fs.c	(revision 30952)
+++ trunk/src/librnd/core/safe_fs.c	(revision 30953)
@@ -328,11 +328,11 @@
 	return pcb_fopen_at_(hidlib, dir, fn, mode, full_path, recursive);
 }
 
-FILE *pcb_fopen_first(rnd_hidlib_t *hidlib, const pcb_conflist_t *paths, const char *fn, const char *mode, char **full_path, int recursive)
+FILE *pcb_fopen_first(rnd_hidlib_t *hidlib, const rnd_conflist_t *paths, const char *fn, const char *mode, char **full_path, int recursive)
 {
 	FILE *res;
 	char *real_fn = pcb_build_fn(hidlib, fn);
-	pcb_conf_listitem_t *ci;
+	rnd_conf_listitem_t *ci;
 
 	if (full_path != NULL)
 		*full_path = NULL;
@@ -351,7 +351,7 @@
 
 	/* have to search paths */
 	{
-		for (ci = pcb_conflist_first((pcb_conflist_t *)paths); ci != NULL; ci = pcb_conflist_next(ci)) {
+		for (ci = rnd_conflist_first((rnd_conflist_t *)paths); ci != NULL; ci = rnd_conflist_next(ci)) {
 			const char *p = ci->val.string[0];
 			char *real_p;
 			size_t pl;
Index: trunk/src/librnd/core/safe_fs.h
===================================================================
--- trunk/src/librnd/core/safe_fs.h	(revision 30952)
+++ trunk/src/librnd/core/safe_fs.h	(revision 30953)
@@ -89,6 +89,6 @@
    (or NULL on failure); the caller needs to call free() on it.
    If recursive is set, all subcirectories under each path is also searched for the file.
    */
-FILE *pcb_fopen_first(rnd_hidlib_t *hidlib, const pcb_conflist_t *paths, const char *fn, const char *mode, char **full_path, int recursive);
+FILE *pcb_fopen_first(rnd_hidlib_t *hidlib, const rnd_conflist_t *paths, const char *fn, const char *mode, char **full_path, int recursive);
 
 #endif
Index: trunk/src/librnd/pcb_compat.h
===================================================================
--- trunk/src/librnd/pcb_compat.h	(revision 30952)
+++ trunk/src/librnd/pcb_compat.h	(revision 30953)
@@ -341,3 +341,16 @@
 #define pcb_conf_resolve_t rnd_conf_resolve_t
 #define pcb_conf_resolve_all rnd_conf_resolve_all
 #define pcb_conf_resolve rnd_conf_resolve
+#define pcb_conflist_t rnd_conflist_t
+#define pcb_conflist_u rnd_conflist_u
+#define pcb_conf_listitem_t rnd_conf_listitem_t
+#define pcb_conflist_foreach rnd_conflist_foreach
+#define pcb_conflist_first rnd_conflist_first
+#define pcb_conflist_next rnd_conflist_next
+#define pcb_conflist_last rnd_conflist_last
+#define pcb_conflist_prev rnd_conflist_prev
+#define pcb_conflist_length rnd_conflist_length
+#define pcb_conflist_append rnd_conflist_append
+#define pcb_conflist_nth rnd_conflist_nth
+#define pcb_conflist_insert rnd_conflist_insert
+#define pcb_conflist_remove rnd_conflist_remove
Index: trunk/src/main_act.c
===================================================================
--- trunk/src/main_act.c	(revision 30952)
+++ trunk/src/main_act.c	(revision 30953)
@@ -215,10 +215,10 @@
 
 static const char pcb_acts_PrintPaths[] = "PrintPaths()";
 static const char pcb_acth_PrintPaths[] = "Print full paths and search paths.";
-static void print_list(const pcb_conflist_t *cl)
+static void print_list(const rnd_conflist_t *cl)
 {
 	int n;
-	pcb_conf_listitem_t *ci;
+	rnd_conf_listitem_t *ci;
 	const char *p;
 
 	printf(" ");
Index: trunk/src/plug_footprint.c
===================================================================
--- trunk/src/plug_footprint.c	(revision 30952)
+++ trunk/src/plug_footprint.c	(revision 30953)
@@ -114,9 +114,9 @@
 	return (char *) tagid;
 }
 
-FILE *pcb_fp_fopen(const pcb_conflist_t *path, const char *name, pcb_fp_fopen_ctx_t *fctx, pcb_data_t *dst)
+FILE *pcb_fp_fopen(const rnd_conflist_t *path, const char *name, pcb_fp_fopen_ctx_t *fctx, pcb_data_t *dst)
 {
-	pcb_conf_listitem_t *ci;
+	rnd_conf_listitem_t *ci;
 	FILE *res = NULL;
 	char *sep = strstr(name, "::");
 
@@ -135,7 +135,7 @@
 		fctx->free_filename = 0;
 	}
 
-	for(ci = pcb_conflist_first((pcb_conflist_t *)path); ci != NULL; ci = pcb_conflist_next(ci)) {
+	for(ci = rnd_conflist_first((rnd_conflist_t *)path); ci != NULL; ci = rnd_conflist_next(ci)) {
 		const char *curr = ci->val.string[0];
 		PCB_HOOK_CALL(pcb_plug_fp_t, pcb_plug_fp_chain, fp_fopen, res, != NULL, (self, curr, fctx->filename, fctx, dst));
 		if (res != NULL)
@@ -383,14 +383,14 @@
  * fp_fs_load_dir to put the footprints into PCB's internal
  * datastructures.
  */
-static int fp_read_lib_all_(const pcb_conflist_t *searchpath)
+static int fp_read_lib_all_(const rnd_conflist_t *searchpath)
 {
-	pcb_conf_listitem_t *ci;
+	rnd_conf_listitem_t *ci;
 	char *toppath, toppath_[PCB_PATH_MAX + 1];  /* String holding abs path to top level library dir */
 	int n_footprints = 0;  /* Running count of footprints found */
 	int res;
 
-	for(ci = pcb_conflist_first((pcb_conflist_t *)searchpath); ci != NULL; ci = pcb_conflist_next(ci)) {
+	for(ci = rnd_conflist_first((rnd_conflist_t *)searchpath); ci != NULL; ci = rnd_conflist_next(ci)) {
 		const char *p = ci->val.string[0];
 		int silent_fail = 0;
 
Index: trunk/src/plug_footprint.h
===================================================================
--- trunk/src/plug_footprint.h	(revision 30952)
+++ trunk/src/plug_footprint.h	(revision 30953)
@@ -21,7 +21,7 @@
 } pcb_fp_fopen_ctx_t;
 
 /* hook bindings, see below;  pcb_fp_fclose() must be called even if pcb_fp_fopen() returned NULL! */
-FILE *pcb_fp_fopen(const pcb_conflist_t *path, const char *name, pcb_fp_fopen_ctx_t *fctx, pcb_data_t *dst);
+FILE *pcb_fp_fopen(const rnd_conflist_t *path, const char *name, pcb_fp_fopen_ctx_t *fctx, pcb_data_t *dst);
 void pcb_fp_fclose(FILE * f, pcb_fp_fopen_ctx_t *fctx);
 
 /* duplicates the name and splits it into a basename and params;
Index: trunk/src_plugins/cam/cam.c
===================================================================
--- trunk/src_plugins/cam/cam.c	(revision 30952)
+++ trunk/src_plugins/cam/cam.c	(revision 30953)
@@ -85,7 +85,7 @@
 /* look up a job by name in the config */
 static const char *cam_find_job(const char *job)
 {
-	pcb_conf_listitem_t *j;
+	rnd_conf_listitem_t *j;
 	int idx;
 
 	rnd_conf_loop_list(&conf_cam.plugins.cam.jobs, j, idx)
Index: trunk/src_plugins/cam/cam_gui.c
===================================================================
--- trunk/src_plugins/cam/cam_gui.c	(revision 30952)
+++ trunk/src_plugins/cam/cam_gui.c	(revision 30953)
@@ -61,7 +61,7 @@
 	/* add all new items */
 	cn = rnd_conf_get_field("plugins/cam/jobs");
 	if (cn != NULL) {
-		pcb_conf_listitem_t *item;
+		rnd_conf_listitem_t *item;
 		int idx;
 
 		cell[1] = NULL;
Index: trunk/src_plugins/dialogs/dlg_pref_conf.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_pref_conf.c	(revision 30952)
+++ trunk/src_plugins/dialogs/dlg_pref_conf.c	(revision 30953)
@@ -234,11 +234,11 @@
 		/* non-default: lists are manually loaded */
 		pcb_hid_attribute_t *attr = &ctx->dlg[ctx->conf.wnatval[nat->type]];
 		pcb_hid_tree_t *tree = attr->wdata;
-		pcb_conf_listitem_t *n;
+		rnd_conf_listitem_t *n;
 		char *cell[4];
 
 		pcb_dad_tree_clear(tree);
-		for (n = pcb_conflist_first(&nat->val.list[idx]); n != NULL; n = pcb_conflist_next(n)) {
+		for (n = rnd_conflist_first(&nat->val.list[idx]); n != NULL; n = rnd_conflist_next(n)) {
 			const char *strval;
 			rolename = rnd_conf_role_name(rnd_conf_lookup_role(n->prop.src));
 			if (nat->type == RND_CFN_HLIST)
Index: trunk/src_plugins/dialogs/dlg_pref_confedit.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_pref_confedit.c	(revision 30952)
+++ trunk/src_plugins/dialogs/dlg_pref_confedit.c	(revision 30953)
@@ -359,11 +359,11 @@
 			case RND_CFN_HLIST:
 				{
 					gdl_iterator_t it;
-					pcb_conf_listitem_t *i;
+					rnd_conf_listitem_t *i;
 
 					PCB_DAD_BEGIN_VBOX(ctx->dlg);
 						PCB_DAD_COMPFLAG(ctx->dlg, PCB_HATF_EXPFILL | PCB_HATF_SCROLL);
-						pcb_conflist_foreach(pctx->conf.selected_nat->val.list, &it, i) {
+						rnd_conflist_foreach(pctx->conf.selected_nat->val.list, &it, i) {
 							lht_node_t *rule = i->prop.src;
 							PCB_DAD_BUTTON(ctx->dlg, rule->name);
 								PCB_DAD_CHANGE_CB(ctx->dlg, pref_conf_editval_hlist_cb);
Index: trunk/src_plugins/dialogs/dlg_pref_lib.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_pref_lib.c	(revision 30952)
+++ trunk/src_plugins/dialogs/dlg_pref_lib.c	(revision 30953)
@@ -98,7 +98,7 @@
    in all widget rows from the conf */
 static void pref_lib_conf2dlg_post(rnd_conf_native_t *cfg, int arr_idx)
 {
-	pcb_conf_listitem_t *i;
+	rnd_conf_listitem_t *i;
 	int idx;
 	const char *s;
 	char *cell[4];
Index: trunk/src_plugins/drc_query/dlg.c
===================================================================
--- trunk/src_plugins/drc_query/dlg.c	(revision 30952)
+++ trunk/src_plugins/drc_query/dlg.c	(revision 30953)
@@ -195,10 +195,10 @@
 		MKDIR_ND(nd, nd, LHT_LIST, "rules");
 		if ((nd->data.list.first == NULL) && (role != RND_CFR_USER)) {
 			gdl_iterator_t it;
-			pcb_conf_listitem_t *i;
+			rnd_conf_listitem_t *i;
 
 			/* need to copy all rules! */
-			pcb_conflist_foreach(&conf_drc_query.plugins.drc_query.rules, &it, i) {
+			rnd_conflist_foreach(&conf_drc_query.plugins.drc_query.rules, &it, i) {
 				lht_node_t *nnew = lht_dom_duptree(i->prop.src);
 				lht_dom_list_append(nd, nnew);
 			}
@@ -369,7 +369,7 @@
 	pcb_hid_row_t *r;
 	char *cell[5], *cursor_path = NULL;
 	gdl_iterator_t it;
-	pcb_conf_listitem_t *i;
+	rnd_conf_listitem_t *i;
 	pcb_drcq_stat_t *st;
 
 	if (!ctx->active)
@@ -388,7 +388,7 @@
 
 	cell[4] = NULL;
 
-	pcb_conflist_foreach(&conf_drc_query.plugins.drc_query.rules, &it, i) {
+	rnd_conflist_foreach(&conf_drc_query.plugins.drc_query.rules, &it, i) {
 		int *dis, dis_ = 0;
 		rnd_conf_role_t role;
 		lht_node_t *rule = i->prop.src;
Index: trunk/src_plugins/drc_query/drc_query.c
===================================================================
--- trunk/src_plugins/drc_query/drc_query.c	(revision 30952)
+++ trunk/src_plugins/drc_query/drc_query.c	(revision 30953)
@@ -178,7 +178,7 @@
 	return 0;
 }
 
-static const char *load_str(lht_node_t *rule, pcb_conf_listitem_t *i, const char *name)
+static const char *load_str(lht_node_t *rule, rnd_conf_listitem_t *i, const char *name)
 {
 	lht_node_t *n = lht_dom_hash_get(rule, name);
 	if (n == NULL)
@@ -204,7 +204,7 @@
 {
 	pcb_board_t *pcb = (pcb_board_t *)hidlib;
 	gdl_iterator_t it;
-	pcb_conf_listitem_t *i;
+	rnd_conf_listitem_t *i;
 	long cnt = 0;
 	int bufno = -1;
 	pcb_qry_exec_t ec;
@@ -215,7 +215,7 @@
 
 	pcb_qry_init(&ec, pcb, NULL, bufno);
 
-	pcb_conflist_foreach(&conf_drc_query.plugins.drc_query.rules, &it, i) {
+	rnd_conflist_foreach(&conf_drc_query.plugins.drc_query.rules, &it, i) {
 		lht_node_t *rule = i->prop.src;
 		int *dis;
 		if (rule->type != LHT_HASH) {
@@ -240,7 +240,7 @@
 static vtp0_t free_drc_conf_nodes;
 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)
+static void drc_query_newconf(rnd_conf_native_t *cfg, rnd_conf_listitem_t *i)
 {
 	if (nat_rules == NULL) {
 		if (strncmp(cfg->hash_path, DRC_CONF_PATH_RULES, strlen(DRC_CONF_PATH_RULES)-1) == 0) {
Index: trunk/src_plugins/export_xy/xy.c
===================================================================
--- trunk/src_plugins/export_xy/xy.c	(revision 30952)
+++ trunk/src_plugins/export_xy/xy.c	(revision 30953)
@@ -100,7 +100,7 @@
 static pcb_export_opt_t *xy_get_export_options(pcb_hid_t *hid, int *n)
 {
 	static int last_unit_value = -1;
-	pcb_conf_listitem_t *li;
+	rnd_conf_listitem_t *li;
 	int idx;
 
 	/* load all formats from the config */
@@ -752,7 +752,7 @@
 
 static void gather_templates(void)
 {
-	pcb_conf_listitem_t *i;
+	rnd_conf_listitem_t *i;
 	int n;
 
 	rnd_conf_loop_list(&conf_xy.plugins.export_xy.templates, i, n) {
@@ -777,7 +777,7 @@
 static const char *get_templ(const char *tid, const char *type)
 {
 	char path[MAX_TEMP_NAME_LEN + 16];
-	pcb_conf_listitem_t *li;
+	rnd_conf_listitem_t *li;
 	int idx;
 
 	sprintf(path, "%s.%s", tid, type); /* safe: tid's length is checked before it was put in the vector, type is hardwired in code and is never longer than a few chars */
Index: trunk/src_plugins/import_mentor_sch/mentor_sch.c
===================================================================
--- trunk/src_plugins/import_mentor_sch/mentor_sch.c	(revision 30952)
+++ trunk/src_plugins/import_mentor_sch/mentor_sch.c	(revision 30953)
@@ -135,7 +135,7 @@
 	gsxl_node_t *contents, *n;
 	nethlp_ctx_t nhctx;
 	int idx, res = 0, cnt = 0;
-	pcb_conf_listitem_t *item;
+	rnd_conf_listitem_t *item;
 	const char *item_str;
 
 	nethlp_new(&nhctx);
Index: trunk/src_plugins/import_sch2/import_sch.c
===================================================================
--- trunk/src_plugins/import_sch2/import_sch.c	(revision 30952)
+++ trunk/src_plugins/import_sch2/import_sch.c	(revision 30953)
@@ -110,7 +110,7 @@
 {
 	const char **a = NULL;
 	int len, n, res;
-	pcb_conf_listitem_t *ci;
+	rnd_conf_listitem_t *ci;
 	const char *imp_name = conf_import_sch.plugins.import_sch.import_fmt;
 	pcb_plug_import_t *p;
 
@@ -135,11 +135,11 @@
 		return 1;
 	}
 
-	len = pcb_conflist_length((pcb_conflist_t *)&conf_import_sch.plugins.import_sch.args);
+	len = rnd_conflist_length((rnd_conflist_t *)&conf_import_sch.plugins.import_sch.args);
 	if ((p->single_arg) && (len > 1))
 		len = 1;
 	a = malloc((len+1) * sizeof(char *));
-	for(n = 0, ci = pcb_conflist_first((pcb_conflist_t *)&conf_import_sch.plugins.import_sch.args); ci != NULL; ci = pcb_conflist_next(ci), n++)
+	for(n = 0, ci = rnd_conflist_first((rnd_conflist_t *)&conf_import_sch.plugins.import_sch.args); ci != NULL; ci = rnd_conflist_next(ci), n++)
 		a[n] = ci->val.string[0];
 	rnd_message(PCB_MSG_DEBUG, "import_sch2: reimport with %s -> %p\n", imp_name, p);
 	res = p->import(p, IMPORT_ASPECT_NETLIST, a, len);
Index: trunk/src_plugins/import_sch2/import_sch_dlg.c
===================================================================
--- trunk/src_plugins/import_sch2/import_sch_dlg.c	(revision 30952)
+++ trunk/src_plugins/import_sch2/import_sch_dlg.c	(revision 30953)
@@ -43,11 +43,11 @@
 static void isch_arg2pcb(void)
 {
 	int n;
-	pcb_conf_listitem_t *ci;
+	rnd_conf_listitem_t *ci;
 
 	isch_conf_lock++;
 	restart:;
-	for(n = 0, ci = pcb_conflist_first((pcb_conflist_t *)&conf_import_sch.plugins.import_sch.args); ci != NULL; ci = pcb_conflist_next(ci), n++) {
+	for(n = 0, ci = rnd_conflist_first((rnd_conflist_t *)&conf_import_sch.plugins.import_sch.args); ci != NULL; ci = rnd_conflist_next(ci), n++) {
 		const char *newval = isch_ctx.dlg[isch_ctx.warg[n]].val.str;
 		if (newval == NULL)
 			newval = "";
@@ -113,7 +113,7 @@
 		controllable = 0;
 	}
 	else if (p->single_arg) {
-		len = pcb_conflist_length((pcb_conflist_t *)&conf_import_sch.plugins.import_sch.args);
+		len = rnd_conflist_length((rnd_conflist_t *)&conf_import_sch.plugins.import_sch.args);
 		if (len < 1) {
 			rnd_conf_grow("plugins/import_sch/args", 1);
 			rnd_conf_set(RND_CFR_DESIGN, "plugins/import_sch/args", 0, "", RND_POL_OVERWRITE);
@@ -122,7 +122,7 @@
 		controllable = 0;
 	}
 	else {
-		len = pcb_conflist_length((pcb_conflist_t *)&conf_import_sch.plugins.import_sch.args);
+		len = rnd_conflist_length((rnd_conflist_t *)&conf_import_sch.plugins.import_sch.args);
 		controllable = 1;
 	}
 
@@ -140,7 +140,7 @@
 static void isch_pcb2dlg(void)
 {
 	int n, tab = 0;
-	pcb_conf_listitem_t *ci;
+	rnd_conf_listitem_t *ci;
 	const char *tname = conf_import_sch.plugins.import_sch.import_fmt;
 
 	isch_flush_timer();
@@ -154,7 +154,7 @@
 		}
 	}
 
-	for(n = 0, ci = pcb_conflist_first((pcb_conflist_t *)&conf_import_sch.plugins.import_sch.args); ci != NULL; ci = pcb_conflist_next(ci), n++)
+	for(n = 0, ci = rnd_conflist_first((rnd_conflist_t *)&conf_import_sch.plugins.import_sch.args); ci != NULL; ci = rnd_conflist_next(ci), n++)
 		PCB_DAD_SET_VALUE(isch_ctx.dlg_hid_ctx, isch_ctx.warg[n], str, ci->val.string[0]);
 
 	PCB_DAD_SET_VALUE(isch_ctx.dlg_hid_ctx, isch_ctx.wfmt, lng, tab);
@@ -169,7 +169,7 @@
 
 static void isch_arg_del_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
 {
-	int len = pcb_conflist_length((pcb_conflist_t *)&conf_import_sch.plugins.import_sch.args);
+	int len = rnd_conflist_length((rnd_conflist_t *)&conf_import_sch.plugins.import_sch.args);
 	if (len > 0) {
 		rnd_conf_del(RND_CFR_DESIGN, "plugins/import_sch/args", len-1);
 		isch_pcb2dlg();
@@ -178,7 +178,7 @@
 
 static void isch_arg_add_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr)
 {
-	int len = pcb_conflist_length((pcb_conflist_t *)&conf_import_sch.plugins.import_sch.args);
+	int len = rnd_conflist_length((rnd_conflist_t *)&conf_import_sch.plugins.import_sch.args);
 	if (len < MAX_ARGS+1) {
 		isch_conf_lock++;
 		rnd_conf_grow("plugins/import_sch/args", len+1);
Index: trunk/src_plugins/lib_hid_common/grid_menu.c
===================================================================
--- trunk/src_plugins/lib_hid_common/grid_menu.c	(revision 30952)
+++ trunk/src_plugins/lib_hid_common/grid_menu.c	(revision 30953)
@@ -42,8 +42,8 @@
 static void grid_install_menu(void *ctx, pcb_hid_cfg_t *cfg, lht_node_t *node, char *path)
 {
 	rnd_conf_native_t *nat;
-	pcb_conflist_t *lst;
-	pcb_conf_listitem_t *li;
+	rnd_conflist_t *lst;
+	rnd_conf_listitem_t *li;
 	char *end = path + strlen(path);
 	pcb_menu_prop_t props;
 	char act[256], chk[256];
@@ -75,8 +75,8 @@
 	end++;
 
 	/* have to go reverse to keep order because this will insert items */
-	idx = pcb_conflist_length(lst)-1;
-	for(li = pcb_conflist_last(lst); li != NULL; li = pcb_conflist_prev(li),idx--) {
+	idx = rnd_conflist_length(lst)-1;
+	for(li = rnd_conflist_last(lst); li != NULL; li = rnd_conflist_prev(li),idx--) {
 		sprintf(act, "grid(#%d)", idx);
 		sprintf(chk, "conf(iseq, editor/grids_idx, %d)", idx);
 		strcpy(end, li->val.string[0]);
Index: trunk/src_plugins/stroke/stroke.c
===================================================================
--- trunk/src_plugins/stroke/stroke.c	(revision 30952)
+++ trunk/src_plugins/stroke/stroke.c	(revision 30953)
@@ -58,7 +58,7 @@
 
 static int pcb_stroke_exec(rnd_hidlib_t *hl, const char *seq)
 {
-	pcb_conf_listitem_t *item;
+	rnd_conf_listitem_t *item;
 	int idx;
 
 	rnd_conf_loop_list(&conf_stroke.plugins.stroke.gestures, item, idx) {
Index: trunk/util/gsch2pcb-rnd/gsch2pcb.c
===================================================================
--- trunk/util/gsch2pcb-rnd/gsch2pcb.c	(revision 30952)
+++ trunk/util/gsch2pcb-rnd/gsch2pcb.c	(revision 30953)
@@ -436,8 +436,8 @@
 	if (!have_cli_schematics) {  /* load all schematics from the project file unless we have schematics from the cli */
 		rnd_conf_native_t *nat = rnd_conf_get_field("utils/gsch2pcb_rnd/schematics");
 		if (nat != NULL) {
-			pcb_conf_listitem_t *ci;
-			for (ci = pcb_conflist_first(nat->val.list); ci != NULL; ci = pcb_conflist_next(ci)) {
+			rnd_conf_listitem_t *ci;
+			for (ci = rnd_conflist_first(nat->val.list); ci != NULL; ci = rnd_conflist_next(ci)) {
 				const char *p = ci->val.string[0];
 				if (ci->type != RND_CFN_STRING)
 					continue;