Index: trunk/doc-rnd/hacking/renames
===================================================================
--- trunk/doc-rnd/hacking/renames	(revision 5065)
+++ trunk/doc-rnd/hacking/renames	(revision 5066)
@@ -1109,3 +1109,6 @@
 AdjustTwoLine -> pcb_line_adjust_attached_2lines
 FortyFiveLine -> pcb_line_45
 EnforceLineDRC -> pcb_line_enforce_drc
+library -> pcb_library
+gui -> pcb_gui
+exporter -> pcb_exporter
Index: trunk/src/main.c
===================================================================
--- trunk/src/main.c	(revision 5065)
+++ trunk/src/main.c	(revision 5066)
@@ -471,7 +471,7 @@
 
 	/* read the library file and display it if it's not empty
 	 */
-	if (!pcb_fp_read_lib_all() && library.data.dir.children.used)
+	if (!pcb_fp_read_lib_all() && pcb_library.data.dir.children.used)
 		pcb_hid_action("LibraryChanged");
 
 	if (conf_core.rc.script_filename) {
Index: trunk/src/plug_footprint.c
===================================================================
--- trunk/src/plug_footprint.c	(revision 5065)
+++ trunk/src/plug_footprint.c	(revision 5066)
@@ -36,7 +36,7 @@
 #include "compat_misc.h"
 
 pcb_plug_fp_t *plug_fp_chain = NULL;
-pcb_fplibrary_t library;
+pcb_fplibrary_t pcb_library;
 
 int pcb_fp_dupname(const char *name, char **basename, char **params)
 {
@@ -81,14 +81,14 @@
 
 void pcb_fp_init()
 {
-	library.type = LIB_DIR;
-	library.name = pcb_strdup("/");  /* All names are eventually free()'d */
+	pcb_library.type = LIB_DIR;
+	pcb_library.name = pcb_strdup("/");  /* All names are eventually free()'d */
 }
 
 void pcb_fp_uninit()
 {
 	htsp_entry_t *e;
-	pcb_fp_free_children(&library);
+	pcb_fp_free_children(&pcb_library);
 	if (fp_tags != NULL) {
 		for (e = htsp_first(fp_tags); e; e = htsp_next(fp_tags, e))
 			free(e->key);
@@ -196,7 +196,7 @@
 	/* search for the last existing dir in the path */
 
 	while(*path == '/') path++;
-	for(parent = l = &library; l != NULL; parent = l,path = next) {
+	for(parent = l = &pcb_library; l != NULL; parent = l,path = next) {
 		next = strchr(path, '/');
 		if (next == NULL)
 			l = pcb_fp_lib_search(l, path);
@@ -316,7 +316,7 @@
 
 void fp_dump()
 {
-	fp_dump_dir(&library, 0);
+	fp_dump_dir(&pcb_library, 0);
 }
 
 /* This function loads the newlib footprints into the Library.
@@ -390,7 +390,7 @@
 	 * library.
 	 */
 	if (fp_read_lib_all_(pcb_fp_default_search_path()) > 0 || resultFP != NULL) {
-		pcb_fp_sort_children(&library);
+		pcb_fp_sort_children(&pcb_library);
 		return 0;
 	}
 
@@ -399,6 +399,6 @@
 
 int pcb_fp_rehash(void)
 {
-	pcb_fp_free_children(&library);
+	pcb_fp_free_children(&pcb_library);
 	return pcb_fp_read_lib_all();
 }
Index: trunk/src/plug_footprint.h
===================================================================
--- trunk/src/plug_footprint.h	(revision 5065)
+++ trunk/src/plug_footprint.h	(revision 5066)
@@ -62,9 +62,9 @@
 
 /* Optional pcb-rnd-side glue for some implementations */
 
-extern pcb_fplibrary_t library; /* the footprint library */
+extern pcb_fplibrary_t pcb_library; /* the footprint library */
 
-#define pcb_get_library_memory(parent) vtlib_alloc_append(((parent) == NULL ? &library.data.dir.children : &(parent)->data.dir.children), 1);
+#define pcb_get_library_memory(parent) vtlib_alloc_append(((parent) == NULL ? &pcb_library.data.dir.children : &(parent)->data.dir.children), 1);
 
 void pcb_fp_free_children(pcb_fplibrary_t *parent);
 void pcb_fp_sort_children(pcb_fplibrary_t *parent);
Index: trunk/src_plugins/fp_fs/fp_fs.c
===================================================================
--- trunk/src_plugins/fp_fs/fp_fs.c	(revision 5065)
+++ trunk/src_plugins/fp_fs/fp_fs.c	(revision 5066)
@@ -260,7 +260,7 @@
 
 static int fp_fs_load_dir(pcb_plug_fp_t *ctx, const char *path)
 {
-	return fp_fs_load_dir_(&library, ".", path, 1);
+	return fp_fs_load_dir_(&pcb_library, ".", path, 1);
 }
 
 typedef struct {
@@ -314,7 +314,7 @@
 		pcb_path_resolve(path, &fpath, 0);
 /*		fprintf(stderr, " in '%s'\n", fpath);*/
 
-		fp_fs_list(&library, fpath, 1, fp_search_cb, &ctx, 1, 0);
+		fp_fs_list(&pcb_library, fpath, 1, fp_search_cb, &ctx, 1, 0);
 		if (ctx.path != NULL) {
 			sprintf(path, "%s%c%s", ctx.path, PCB_DIR_SEPARATOR_C, ctx.real_name);
 			free(ctx.path);
Index: trunk/src_plugins/hid_gtk/gui-library-window.c
===================================================================
--- trunk/src_plugins/hid_gtk/gui-library-window.c	(revision 5065)
+++ trunk/src_plugins/hid_gtk/gui-library-window.c	(revision 5066)
@@ -576,7 +576,7 @@
 static GtkTreeModel *create_lib_tree_model(GhidLibraryWindow *library_window)
 {
 	GtkTreeStore *tree = gtk_tree_store_new(N_MENU_COLUMNS, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER);
-	return create_lib_tree_model_recurse(tree, library_window, &library, NULL);
+	return create_lib_tree_model_recurse(tree, library_window, &pcb_library, NULL);
 }
 
 #if 0
Index: trunk/src_plugins/hid_lesstif/library.c
===================================================================
--- trunk/src_plugins/hid_lesstif/library.c	(revision 5065)
+++ trunk/src_plugins/hid_lesstif/library.c	(revision 5066)
@@ -126,7 +126,7 @@
 static int LibraryChanged(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y)
 {
 	int i;
-	if (library.data.dir.children.used == 0)
+	if (pcb_library.data.dir.children.used == 0)
 		return 0;
 	if (build_library_dialog())
 		return 0;
@@ -138,7 +138,7 @@
 	vtptr_truncate(&picks, 0);
 	vtptr_truncate(&pick_names, 0);
 
-	lib_dfs(&library, 0);
+	lib_dfs(&pcb_library, 0);
 
 
 	if (library_strings)
Index: trunk/src_plugins/oldactions/oldactions.c
===================================================================
--- trunk/src_plugins/oldactions/oldactions.c	(revision 5065)
+++ trunk/src_plugins/oldactions/oldactions.c	(revision 5066)
@@ -109,7 +109,7 @@
 
 static int ActionDumpLibrary(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y)
 {
-	dump_lib_any(0, &library);
+	dump_lib_any(0, &pcb_library);
 
 	return 0;
 }