Index: trunk/doc-rnd/hacking/renames
===================================================================
--- trunk/doc-rnd/hacking/renames	(revision 5066)
+++ trunk/doc-rnd/hacking/renames	(revision 5067)
@@ -1112,3 +1112,6 @@
 library -> pcb_library
 gui -> pcb_gui
 exporter -> pcb_exporter
+plug_fp_chain -> pcb_plug_fp_chain
+plug_import_chain -> pcb_plug_import_chain
+plug_io_chain -> pcb_plug_io_chain
Index: trunk/src/plug_footprint.c
===================================================================
--- trunk/src/plug_footprint.c	(revision 5066)
+++ trunk/src/plug_footprint.c	(revision 5067)
@@ -35,7 +35,7 @@
 #include "error.h"
 #include "compat_misc.h"
 
-pcb_plug_fp_t *plug_fp_chain = NULL;
+pcb_plug_fp_t *pcb_plug_fp_chain = NULL;
 pcb_fplibrary_t pcb_library;
 
 int pcb_fp_dupname(const char *name, char **basename, char **params)
@@ -105,7 +105,7 @@
 FILE *pcb_fp_fopen(const char *path, const char *name, pcb_fp_fopen_ctx_t *fctx)
 {
 	FILE *res = NULL;
-	PCB_HOOK_CALL(pcb_plug_fp_t, plug_fp_chain, fopen, res, != NULL, (self, path, name, fctx));
+	PCB_HOOK_CALL(pcb_plug_fp_t, pcb_plug_fp_chain, fopen, res, != NULL, (self, path, name, fctx));
 	return res;
 }
 
@@ -352,7 +352,7 @@
 
 		/* Next read in any footprints in the top level dir */
 		res = -1;
-		PCB_HOOK_CALL(pcb_plug_fp_t, plug_fp_chain, load_dir, res, >= 0, (self, toppath));
+		PCB_HOOK_CALL(pcb_plug_fp_t, pcb_plug_fp_chain, load_dir, res, >= 0, (self, toppath));
 		if (res >= 0)
 			n_footprints += res;
 		else
Index: trunk/src/plug_footprint.h
===================================================================
--- trunk/src/plug_footprint.h	(revision 5066)
+++ trunk/src/plug_footprint.h	(revision 5067)
@@ -57,7 +57,7 @@
 	void (*fclose)(pcb_plug_fp_t *ctx, FILE * f, pcb_fp_fopen_ctx_t *fctx);
 };
 
-extern pcb_plug_fp_t *plug_fp_chain;
+extern pcb_plug_fp_t *pcb_plug_fp_chain;
 
 
 /* Optional pcb-rnd-side glue for some implementations */
Index: trunk/src/plug_import.c
===================================================================
--- trunk/src/plug_import.c	(revision 5066)
+++ trunk/src/plug_import.c	(revision 5067)
@@ -41,7 +41,7 @@
 #include "error.h"
 
 
-pcb_plug_import_t *plug_import_chain = NULL;
+pcb_plug_import_t *pcb_plug_import_chain = NULL;
 
 typedef struct {
 	pcb_plug_import_t *plug;
@@ -64,7 +64,7 @@
 		} \
 	} while(0)
 
-	PCB_HOOK_CALL_ALL(pcb_plug_import_t, plug_import_chain, fmt_support_prio, cb_append,   (self, aspects, f, filename));
+	PCB_HOOK_CALL_ALL(pcb_plug_import_t, pcb_plug_import_chain, fmt_support_prio, cb_append,   (self, aspects, f, filename));
 	if (len == 0)
 		return NULL;
 
Index: trunk/src/plug_import.h
===================================================================
--- trunk/src/plug_import.h	(revision 5066)
+++ trunk/src/plug_import.h	(revision 5067)
@@ -52,7 +52,7 @@
 	int (*import)(pcb_plug_import_t *ctx, unsigned int aspects, const char *fn);
 };
 
-extern pcb_plug_import_t *plug_import_chain;
+extern pcb_plug_import_t *pcb_plug_import_chain;
 
 /********** hook wrappers **********/
 int pcb_import(char *filename, unsigned int aspect);
Index: trunk/src/plug_io.c
===================================================================
--- trunk/src/plug_io.c	(revision 5066)
+++ trunk/src/plug_io.c	(revision 5067)
@@ -67,7 +67,7 @@
 /* for opendir */
 #include "compat_inc.h"
 
-pcb_plug_io_t *plug_io_chain = NULL;
+pcb_plug_io_t *pcb_plug_io_chain = NULL;
 int pcb_io_err_inhibit = 0;
 
 static void plug_io_err(int res, const char *what, const char *filename)
@@ -76,7 +76,7 @@
 		return;
 	if (res != 0) {
 		const char *reason = "", *comment = "";
-		if (plug_io_chain != NULL) {
+		if (pcb_plug_io_chain != NULL) {
 			if (filename == NULL) {
 				reason = "none of io plugins could successfully write the file";
 				filename = "";
@@ -130,7 +130,7 @@
 		}
 	}
 	else /* try all parsers until we find one that works */
-		PCB_HOOK_CALL_DO(pcb_plug_io_t, plug_io_chain, parse_pcb, res, == 0, (self, Ptr, Filename, load_settings), if (Ptr->Data->loader == NULL) Ptr->Data->loader = self);
+		PCB_HOOK_CALL_DO(pcb_plug_io_t, pcb_plug_io_chain, parse_pcb, res, == 0, (self, Ptr, Filename, load_settings), if (Ptr->Data->loader == NULL) Ptr->Data->loader = self);
 
 	if ((res == 0) && (load_settings))
 		conf_load_project(NULL, Filename);
@@ -147,7 +147,7 @@
 	int res = -1;
 
 	Ptr->loader = NULL;
-	PCB_HOOK_CALL_DO(pcb_plug_io_t, plug_io_chain, parse_element, res, == 0, (self, Ptr, name), Ptr->loader = self);
+	PCB_HOOK_CALL_DO(pcb_plug_io_t, pcb_plug_io_chain, parse_element, res, == 0, (self, Ptr, name), Ptr->loader = self);
 
 	plug_io_err(res, "load element", name);
 	return res;
@@ -156,7 +156,7 @@
 int pcb_parse_font(pcb_font_t *Ptr, char *Filename)
 {
 	int res = -1;
-	PCB_HOOK_CALL(pcb_plug_io_t, plug_io_chain, parse_font, res, == 0, (self, Ptr, Filename));
+	PCB_HOOK_CALL(pcb_plug_io_t, pcb_plug_io_chain, parse_font, res, == 0, (self, Ptr, Filename));
 
 	plug_io_err(res, "load font", Filename);
 	return res;
@@ -187,7 +187,7 @@
 		} \
 	} while(0)
 
-	PCB_HOOK_CALL_ALL(pcb_plug_io_t, plug_io_chain, fmt_support_prio, cb_append, (self, typ, is_wr, (fmt == NULL ? self->default_fmt : fmt)));
+	PCB_HOOK_CALL_ALL(pcb_plug_io_t, pcb_plug_io_chain, fmt_support_prio, cb_append, (self, typ, is_wr, (fmt == NULL ? self->default_fmt : fmt)));
 
 	if (len > 0)
 		qsort(available, len, sizeof(available[0]), find_prio_cmp);
Index: trunk/src/plug_io.h
===================================================================
--- trunk/src/plug_io.h	(revision 5066)
+++ trunk/src/plug_io.h	(revision 5067)
@@ -87,7 +87,7 @@
 
 	int save_preference_prio; /* all available save plugins are sorted by this before presenting them to the user to choose one */
 };
-extern pcb_plug_io_t *plug_io_chain;
+extern pcb_plug_io_t *pcb_plug_io_chain;
 
 
 /********** hook wrappers **********/
Index: trunk/src_plugins/fp_fs/fp_fs.c
===================================================================
--- trunk/src_plugins/fp_fs/fp_fs.c	(revision 5066)
+++ trunk/src_plugins/fp_fs/fp_fs.c	(revision 5067)
@@ -500,7 +500,7 @@
 
 void hid_fp_fs_uninit(void)
 {
-	PCB_HOOK_UNREGISTER(pcb_plug_fp_t, plug_fp_chain, &fp_fs);
+	PCB_HOOK_UNREGISTER(pcb_plug_fp_t, pcb_plug_fp_chain, &fp_fs);
 }
 
 pcb_uninit_t hid_fp_fs_init(void)
@@ -509,6 +509,6 @@
 	fp_fs.load_dir = fp_fs_load_dir;
 	fp_fs.fopen = fp_fs_fopen;
 	fp_fs.fclose = fp_fs_fclose;
-	PCB_HOOK_REGISTER(pcb_plug_fp_t, plug_fp_chain, &fp_fs);
+	PCB_HOOK_REGISTER(pcb_plug_fp_t, pcb_plug_fp_chain, &fp_fs);
 	return hid_fp_fs_uninit;
 }
Index: trunk/src_plugins/fp_wget/gedasymbols.c
===================================================================
--- trunk/src_plugins/fp_wget/gedasymbols.c	(revision 5066)
+++ trunk/src_plugins/fp_wget/gedasymbols.c	(revision 5067)
@@ -183,7 +183,7 @@
 
 void fp_gedasymbols_uninit(void)
 {
-	PCB_HOOK_UNREGISTER(pcb_plug_fp_t, plug_fp_chain, &fp_gedasymbols);
+	PCB_HOOK_UNREGISTER(pcb_plug_fp_t, pcb_plug_fp_chain, &fp_gedasymbols);
 }
 
 void fp_gedasymbols_init(void)
@@ -193,5 +193,5 @@
 	fp_gedasymbols.fopen = fp_gedasymbols_fopen;
 	fp_gedasymbols.fclose = fp_gedasymbols_fclose;
 
-	PCB_HOOK_REGISTER(pcb_plug_fp_t, plug_fp_chain, &fp_gedasymbols);
+	PCB_HOOK_REGISTER(pcb_plug_fp_t, pcb_plug_fp_chain, &fp_gedasymbols);
 }
Index: trunk/src_plugins/fp_wget/tester.c
===================================================================
--- trunk/src_plugins/fp_wget/tester.c	(revision 5066)
+++ trunk/src_plugins/fp_wget/tester.c	(revision 5067)
@@ -6,7 +6,7 @@
 #undef strdup
 char *pcb_strdup(const char *s) { return strdup(s); }
 
-pcb_plug_fp_t *plug_fp_chain = NULL;
+pcb_plug_fp_t *pcb_plug_fp_chain = NULL;
 
 library_t ltmp;
 library_t *pcb_fp_mkdir_p(const char *path)
Index: trunk/src_plugins/import_edif/import_edif.c
===================================================================
--- trunk/src_plugins/import_edif/import_edif.c	(revision 5066)
+++ trunk/src_plugins/import_edif/import_edif.c	(revision 5067)
@@ -86,7 +86,7 @@
 	import_edif.fmt_support_prio = edif_support_prio;
 	import_edif.import           = edif_import;
 
-	PCB_HOOK_REGISTER(pcb_plug_import_t, plug_import_chain, &import_edif);
+	PCB_HOOK_REGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_edif);
 
 	return hid_import_edif_uninit;
 }
Index: trunk/src_plugins/import_netlist/import_netlist.c
===================================================================
--- trunk/src_plugins/import_netlist/import_netlist.c	(revision 5066)
+++ trunk/src_plugins/import_netlist/import_netlist.c	(revision 5067)
@@ -186,7 +186,7 @@
 	import_netlist.fmt_support_prio = netlist_support_prio;
 	import_netlist.import           = netlist_import;
 
-	PCB_HOOK_REGISTER(pcb_plug_import_t, plug_import_chain, &import_netlist);
+	PCB_HOOK_REGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_netlist);
 
 	return hid_import_netlist_uninit;
 }
Index: trunk/src_plugins/io_kicad/io_kicad.c
===================================================================
--- trunk/src_plugins/io_kicad/io_kicad.c	(revision 5066)
+++ trunk/src_plugins/io_kicad/io_kicad.c	(revision 5067)
@@ -64,7 +64,7 @@
 	io_kicad.description = "Kicad, s-expression";
 	io_kicad.save_preference_prio = 92;
 
-	PCB_HOOK_REGISTER(pcb_plug_io_t, plug_io_chain, &io_kicad);
+	PCB_HOOK_REGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_kicad);
 
 	/* TODO: Alloc plugin-globals here. */
 
Index: trunk/src_plugins/io_kicad_legacy/io_kicad_legacy.c
===================================================================
--- trunk/src_plugins/io_kicad_legacy/io_kicad_legacy.c	(revision 5066)
+++ trunk/src_plugins/io_kicad_legacy/io_kicad_legacy.c	(revision 5067)
@@ -64,7 +64,7 @@
 	io_kicad_legacy.description = "Kicad, legacy format";
 	io_kicad_legacy.save_preference_prio = 90;
 
-	PCB_HOOK_REGISTER(pcb_plug_io_t, plug_io_chain, &io_kicad_legacy);
+	PCB_HOOK_REGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_kicad_legacy);
 
 	/* TODO: Alloc plugin-globals here. */
 
Index: trunk/src_plugins/io_lihata/io_lihata.c
===================================================================
--- trunk/src_plugins/io_lihata/io_lihata.c	(revision 5066)
+++ trunk/src_plugins/io_lihata/io_lihata.c	(revision 5067)
@@ -63,7 +63,7 @@
 	io_lihata.description = "lihata board";
 	io_lihata.save_preference_prio = 20;
 
-	PCB_HOOK_REGISTER(pcb_plug_io_t, plug_io_chain, &io_lihata);
+	PCB_HOOK_REGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_lihata);
 
 #define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \
 	conf_reg_field(conf_io_lihata, field,isarray,type_name,cpath,cname,desc,flags);
Index: trunk/src_plugins/io_pcb/io_pcb.c
===================================================================
--- trunk/src_plugins/io_pcb/io_pcb.c	(revision 5066)
+++ trunk/src_plugins/io_pcb/io_pcb.c	(revision 5067)
@@ -49,7 +49,7 @@
 	pcb_lex_destroy();
 
 	for(n = 0; n < 3; n++)
-		PCB_HOOK_UNREGISTER(pcb_plug_io_t, plug_io_chain, &(io_pcb[n]));
+		PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &(io_pcb[n]));
 }
 
 pcb_uninit_t hid_io_pcb_init(void)
@@ -71,7 +71,7 @@
 	io_pcb[0].default_fmt = "pcb";
 	io_pcb[0].description = "geda/pcb - mainline (centimils)";
 	io_pcb[0].save_preference_prio = 100;
-	PCB_HOOK_REGISTER(pcb_plug_io_t, plug_io_chain, &(io_pcb[0]));
+	PCB_HOOK_REGISTER(pcb_plug_io_t, pcb_plug_io_chain, &(io_pcb[0]));
 
 	ctx[1].write_coord_fmt = pcb_printf_slot[9];
 	io_pcb[1].plugin_data = &ctx[1];
@@ -82,7 +82,7 @@
 	io_pcb[1].default_fmt = "pcb";
 	io_pcb[1].description = "geda/pcb - readable units";
 	io_pcb[1].save_preference_prio = 99;
-	PCB_HOOK_REGISTER(pcb_plug_io_t, plug_io_chain, &(io_pcb[1]));
+	PCB_HOOK_REGISTER(pcb_plug_io_t, pcb_plug_io_chain, &(io_pcb[1]));
 
 	ctx[2].write_coord_fmt = "%$$mn";
 	io_pcb[2].plugin_data = &ctx[2];
@@ -93,7 +93,7 @@
 	io_pcb[2].default_fmt = "pcb";
 	io_pcb[2].description = "geda/pcb - nanometer";
 	io_pcb[2].save_preference_prio = 98;
-	PCB_HOOK_REGISTER(pcb_plug_io_t, plug_io_chain, &(io_pcb[2]));
+	PCB_HOOK_REGISTER(pcb_plug_io_t, pcb_plug_io_chain, &(io_pcb[2]));
 
 	return hid_io_pcb_uninit;
 }