Index: io_kicad.c
===================================================================
--- io_kicad.c	(revision 31014)
+++ io_kicad.c	(revision 31015)
@@ -60,13 +60,13 @@
 {
 	/* Runs once when the plugin is unloaded. TODO: free plugin-globals here. */
 	rnd_remove_actions_by_cookie(kicad_cookie);
-	PCB_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_kicad);
+	RND_HOOK_UNREGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_kicad);
 	pcb_eeschema_uninit();
 }
 
 int pplg_init_io_kicad(void)
 {
-	PCB_API_CHK_VER;
+	RND_API_CHK_VER;
 
 	/* register the IO hook */
 	io_kicad.plugin_data = NULL;
@@ -89,7 +89,7 @@
 	io_kicad.mime_type = "application/x-kicad-pcb";
 
 
-	PCB_HOOK_REGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_kicad);
+	RND_HOOK_REGISTER(pcb_plug_io_t, pcb_plug_io_chain, &io_kicad);
 
 	RND_REGISTER_ACTIONS(eeschema_action_list, kicad_cookie);
 
Index: read_net.c
===================================================================
--- read_net.c	(revision 31014)
+++ read_net.c	(revision 31015)
@@ -286,7 +286,7 @@
 
 void pcb_eeschema_uninit(void)
 {
-	PCB_HOOK_UNREGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_eeschema);
+	RND_HOOK_UNREGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_eeschema);
 }
 
 void pcb_eeschema_init(void)
@@ -303,5 +303,5 @@
 	import_eeschema.all_filenames    = 1;
 	import_eeschema.ext_exec         = 0;
 
-	PCB_HOOK_REGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_eeschema);
+	RND_HOOK_REGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_eeschema);
 }