Index: trunk/doc-rnd/hacking/renames
===================================================================
--- trunk/doc-rnd/hacking/renames	(revision 4986)
+++ trunk/doc-rnd/hacking/renames	(revision 4987)
@@ -654,3 +654,11 @@
 WritePipe -> pcb_write_pipe
 SaveTMPData -> pcb_tmp_data_save
 RemoveTMPData -> pcb_tmp_data_remove
+plugins_init -> pcb_plugins_init
+plugins_uninit -> pcb_plugins_uninit
+plugin_register -> pcb_plugin_register
+HOOK_CALL_DO -> PCB_HOOK_CALL_DO
+HOOK_CALL_ALL -> PCB_HOOK_CALL_ALL
+HOOK_UNREGISTER -> PCB_HOOK_UNREGISTER
+HOOK_CALL -> PCB_HOOK_CALL
+HOOK_REGISTER -> PCB_HOOK_REGISTER
Index: trunk/src_plugins/fp_fs/fp_fs.c
===================================================================
--- trunk/src_plugins/fp_fs/fp_fs.c	(revision 4986)
+++ trunk/src_plugins/fp_fs/fp_fs.c	(revision 4987)
@@ -500,7 +500,7 @@
 
 void hid_fp_fs_uninit(void)
 {
-	HOOK_UNREGISTER(pcb_plug_fp_t, plug_fp_chain, &fp_fs);
+	PCB_HOOK_UNREGISTER(pcb_plug_fp_t, 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;
-	HOOK_REGISTER(pcb_plug_fp_t, plug_fp_chain, &fp_fs);
+	PCB_HOOK_REGISTER(pcb_plug_fp_t, 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 4986)
+++ trunk/src_plugins/fp_wget/gedasymbols.c	(revision 4987)
@@ -183,7 +183,7 @@
 
 void fp_gedasymbols_uninit(void)
 {
-	HOOK_UNREGISTER(pcb_plug_fp_t, plug_fp_chain, &fp_gedasymbols);
+	PCB_HOOK_UNREGISTER(pcb_plug_fp_t, 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;
 
-	HOOK_REGISTER(pcb_plug_fp_t, plug_fp_chain, &fp_gedasymbols);
+	PCB_HOOK_REGISTER(pcb_plug_fp_t, plug_fp_chain, &fp_gedasymbols);
 }
Index: trunk/src_plugins/import_edif/import_edif.c
===================================================================
--- trunk/src_plugins/import_edif/import_edif.c	(revision 4986)
+++ trunk/src_plugins/import_edif/import_edif.c	(revision 4987)
@@ -86,7 +86,7 @@
 	import_edif.fmt_support_prio = edif_support_prio;
 	import_edif.import           = edif_import;
 
-	HOOK_REGISTER(pcb_plug_import_t, plug_import_chain, &import_edif);
+	PCB_HOOK_REGISTER(pcb_plug_import_t, 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 4986)
+++ trunk/src_plugins/import_netlist/import_netlist.c	(revision 4987)
@@ -186,7 +186,7 @@
 	import_netlist.fmt_support_prio = netlist_support_prio;
 	import_netlist.import           = netlist_import;
 
-	HOOK_REGISTER(pcb_plug_import_t, plug_import_chain, &import_netlist);
+	PCB_HOOK_REGISTER(pcb_plug_import_t, 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 4986)
+++ trunk/src_plugins/io_kicad/io_kicad.c	(revision 4987)
@@ -64,7 +64,7 @@
 	io_kicad.description = "Kicad, s-expression";
 	io_kicad.save_preference_prio = 92;
 
-	HOOK_REGISTER(pcb_plug_io_t, plug_io_chain, &io_kicad);
+	PCB_HOOK_REGISTER(pcb_plug_io_t, 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 4986)
+++ trunk/src_plugins/io_kicad_legacy/io_kicad_legacy.c	(revision 4987)
@@ -64,7 +64,7 @@
 	io_kicad_legacy.description = "Kicad, legacy format";
 	io_kicad_legacy.save_preference_prio = 90;
 
-	HOOK_REGISTER(pcb_plug_io_t, plug_io_chain, &io_kicad_legacy);
+	PCB_HOOK_REGISTER(pcb_plug_io_t, 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 4986)
+++ trunk/src_plugins/io_lihata/io_lihata.c	(revision 4987)
@@ -63,7 +63,7 @@
 	io_lihata.description = "lihata board";
 	io_lihata.save_preference_prio = 20;
 
-	HOOK_REGISTER(pcb_plug_io_t, plug_io_chain, &io_lihata);
+	PCB_HOOK_REGISTER(pcb_plug_io_t, 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 4986)
+++ trunk/src_plugins/io_pcb/io_pcb.c	(revision 4987)
@@ -49,7 +49,7 @@
 	pcb_lex_destroy();
 
 	for(n = 0; n < 3; n++)
-		HOOK_UNREGISTER(pcb_plug_io_t, plug_io_chain, &(io_pcb[n]));
+		PCB_HOOK_UNREGISTER(pcb_plug_io_t, 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;
-	HOOK_REGISTER(pcb_plug_io_t, plug_io_chain, &(io_pcb[0]));
+	PCB_HOOK_REGISTER(pcb_plug_io_t, 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;
-	HOOK_REGISTER(pcb_plug_io_t, plug_io_chain, &(io_pcb[1]));
+	PCB_HOOK_REGISTER(pcb_plug_io_t, 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;
-	HOOK_REGISTER(pcb_plug_io_t, plug_io_chain, &(io_pcb[2]));
+	PCB_HOOK_REGISTER(pcb_plug_io_t, plug_io_chain, &(io_pcb[2]));
 
 	return hid_io_pcb_uninit;
 }
Index: trunk/util/gsch2pcb-rnd/gsch2pcb.c
===================================================================
--- trunk/util/gsch2pcb-rnd/gsch2pcb.c	(revision 4986)
+++ trunk/util/gsch2pcb-rnd/gsch2pcb.c	(revision 4987)
@@ -1170,7 +1170,7 @@
 	}
 }
 
-void plugin_register(const char *name, const char *path, void *handle, int dynamic_loaded, void (*uninit)(void))
+void pcb_plugin_register(const char *name, const char *path, void *handle, int dynamic_loaded, void (*uninit)(void))
 {
 	if (conf_g2pr.utils.gsch2pcb_rnd.verbose)
 		printf("Plugin loaded: %s (%s)\n", name, path);