Index: dialogs/dlg_fontsel.c
===================================================================
--- dialogs/dlg_fontsel.c	(revision 36973)
+++ dialogs/dlg_fontsel.c	(revision 36974)
@@ -325,8 +325,8 @@
 
 void pcb_dlg_fontsel_init(void)
 {
-	rnd_event_bind(RND_EVENT_BOARD_REPLACED, fontsel_bchanged_ev, NULL, fontsel_cookie);
-	rnd_event_bind(RND_EVENT_BOARD_META_CHANGED, fontsel_mchanged_ev, NULL, fontsel_cookie);
+	rnd_event_bind(RND_EVENT_DESIGN_REPLACED, fontsel_bchanged_ev, NULL, fontsel_cookie);
+	rnd_event_bind(RND_EVENT_DESIGN_META_CHANGED, fontsel_mchanged_ev, NULL, fontsel_cookie);
 	rnd_event_bind(PCB_EVENT_FONT_CHANGED, fontsel_mchanged_ev, NULL, fontsel_cookie);
 	rnd_event_bind(RND_EVENT_GUI_INIT, fontsel_gui_init_ev, NULL, fontsel_cookie);
 }
Index: dialogs/dlg_pref_board.c
===================================================================
--- dialogs/dlg_pref_board.c	(revision 36973)
+++ dialogs/dlg_pref_board.c	(revision 36974)
@@ -73,7 +73,7 @@
 		free(hl->name);
 		hl->name = rnd_strdup(newname);
 		changed = 1;
-		rnd_event(hl, RND_EVENT_BOARD_FN_CHANGED, NULL); /* forces title update even if board ->Changed doesn't change */
+		rnd_event(hl, RND_EVENT_DESIGN_FN_CHANGED, NULL); /* forces title update even if board ->Changed doesn't change */
 
 	}
 
@@ -86,7 +86,7 @@
 
 	if (changed) {
 		pcb->Changed = 1;
-		rnd_event(hl, RND_EVENT_BOARD_META_CHANGED, NULL); /* always generate the event to make sure visible changes are flushed */
+		rnd_event(hl, RND_EVENT_DESIGN_META_CHANGED, NULL); /* always generate the event to make sure visible changes are flushed */
 	}
 }
 
Index: export_openems/excitation.c
===================================================================
--- export_openems/excitation.c	(revision 36973)
+++ export_openems/excitation.c	(revision 36974)
@@ -564,7 +564,7 @@
 
 static void pcb_openems_excitation_init(void)
 {
-	rnd_event_bind(RND_EVENT_BOARD_REPLACED, exc_ev_board_changed, NULL, openems_cookie);
+	rnd_event_bind(RND_EVENT_DESIGN_REPLACED, exc_ev_board_changed, NULL, openems_cookie);
 }
 
 static void pcb_openems_excitation_uninit(void)
Index: fontmode/fontmode.c
===================================================================
--- fontmode/fontmode.c	(revision 36973)
+++ fontmode/fontmode.c	(revision 36974)
@@ -353,7 +353,7 @@
 	pcb_layergrp_inhibit_dec();
 
 	/* Inform the rest about the board change (layer stack, size) */
-	rnd_event(&pcb->hidlib, RND_EVENT_BOARD_REPLACED, NULL);
+	rnd_event(&pcb->hidlib, RND_EVENT_DESIGN_REPLACED, NULL);
 	rnd_event(&pcb->hidlib, PCB_EVENT_LAYERS_CHANGED, NULL);
 
 	font2editor_new(pcb, font, lfont, lorig, lwidth, lsilk);
Index: io_hyp/io_hyp.c
===================================================================
--- io_hyp/io_hyp.c	(revision 36973)
+++ io_hyp/io_hyp.c	(revision 36974)
@@ -115,7 +115,7 @@
 
 	/* notify GUI */
 	rnd_event(&PCB->hidlib, PCB_EVENT_LAYERS_CHANGED, NULL);
-	rnd_event(&PCB->hidlib, RND_EVENT_BOARD_REPLACED, NULL);
+	rnd_event(&PCB->hidlib, RND_EVENT_DESIGN_REPLACED, NULL);
 
 	RND_ACT_IRES(retval);
 	return 0;
Index: lib_hid_pcbui/lib_hid_pcbui.c
===================================================================
--- lib_hid_pcbui/lib_hid_pcbui.c	(revision 36973)
+++ lib_hid_pcbui/lib_hid_pcbui.c	(revision 36974)
@@ -129,7 +129,7 @@
 	RND_REGISTER_ACTIONS(status_action_list, status_cookie);
 	RND_REGISTER_ACTIONS(act_action_list, act_cookie);
 
-	rnd_event_bind(RND_EVENT_BOARD_REPLACED, pcb_layer_menu_update_ev, NULL, layer_cookie);
+	rnd_event_bind(RND_EVENT_DESIGN_REPLACED, pcb_layer_menu_update_ev, NULL, layer_cookie);
 	rnd_event_bind(PCB_EVENT_LAYERS_CHANGED, pcb_layer_menu_update_ev, NULL, layer_cookie);
 	rnd_event_bind(PCB_EVENT_LAYERS_CHANGED, pcb_layersel_stack_chg_ev, NULL, layersel_cookie);
 	rnd_event_bind(PCB_EVENT_LAYERVIS_CHANGED, pcb_layer_menu_vis_update_ev, NULL, layer_cookie);
@@ -136,7 +136,7 @@
 	rnd_event_bind(PCB_EVENT_LAYERVIS_CHANGED, pcb_layersel_vis_chg_ev, NULL, layersel_cookie);
 	rnd_event_bind(PCB_EVENT_LAYER_KEY_CHANGE, pcb_layer_menu_key_update_ev, NULL, layer_cookie);
 	rnd_event_bind(PCB_EVENT_ROUTE_STYLES_CHANGED, pcb_rst_update_ev, NULL, rst_cookie);
-	rnd_event_bind(RND_EVENT_BOARD_REPLACED, pcb_rst_update_ev, NULL, rst_cookie);
+	rnd_event_bind(RND_EVENT_DESIGN_REPLACED, pcb_rst_update_ev, NULL, rst_cookie);
 	rnd_event_bind(RND_EVENT_GUI_INIT, pcb_rst_gui_init_ev, NULL, rst_cookie);
 	rnd_event_bind(RND_EVENT_GUI_INIT, pcb_layersel_gui_init_ev, NULL, layersel_cookie);
 	rnd_event_bind(RND_EVENT_GUI_INIT, pcb_status_gui_init_ev, NULL, status_cookie);
@@ -143,13 +143,13 @@
 	rnd_event_bind(RND_EVENT_GUI_INIT, pcb_rendering_gui_init_ev, NULL, rendering_cookie);
 	rnd_event_bind(RND_EVENT_USER_INPUT_KEY, pcb_status_st_update_ev, NULL, status_cookie);
 	rnd_event_bind(RND_EVENT_CROSSHAIR_MOVE, pcb_status_rd_update_ev, NULL, status_cookie);
-	rnd_event_bind(RND_EVENT_BOARD_REPLACED, pcb_infobar_brdchg_ev, NULL, infobar_cookie);
-	rnd_event_bind(RND_EVENT_BOARD_FN_CHANGED, pcb_infobar_fn_chg_ev, NULL, infobar_cookie);
+	rnd_event_bind(RND_EVENT_DESIGN_REPLACED, pcb_infobar_brdchg_ev, NULL, infobar_cookie);
+	rnd_event_bind(RND_EVENT_DESIGN_FN_CHANGED, pcb_infobar_fn_chg_ev, NULL, infobar_cookie);
 	rnd_event_bind(RND_EVENT_GUI_INIT, pcb_infobar_gui_init_ev, NULL, infobar_cookie);
 	rnd_event_bind(RND_EVENT_GUI_INIT, pcb_title_gui_init_ev, NULL, title_cookie);
-	rnd_event_bind(RND_EVENT_BOARD_REPLACED, pcb_title_board_changed_ev, NULL, title_cookie);
-	rnd_event_bind(RND_EVENT_BOARD_FN_CHANGED, pcb_title_board_changed_ev, NULL, title_cookie);
-	rnd_event_bind(RND_EVENT_BOARD_META_CHANGED, pcb_title_meta_changed_ev, NULL, title_cookie);
+	rnd_event_bind(RND_EVENT_DESIGN_REPLACED, pcb_title_board_changed_ev, NULL, title_cookie);
+	rnd_event_bind(RND_EVENT_DESIGN_FN_CHANGED, pcb_title_board_changed_ev, NULL, title_cookie);
+	rnd_event_bind(RND_EVENT_DESIGN_META_CHANGED, pcb_title_meta_changed_ev, NULL, title_cookie);
 	rnd_event_bind(RND_EVENT_GUI_BATCH_TIMER, pcb_layer_menu_batch_timer_ev, NULL, layer_cookie);
 	rnd_event_bind(RND_EVENT_GUI_BATCH_TIMER, pcb_rst_menu_batch_timer_ev, NULL, rst_cookie);
 
Index: propedit/propdlg.c
===================================================================
--- propedit/propdlg.c	(revision 36973)
+++ propedit/propdlg.c	(revision 36974)
@@ -878,7 +878,7 @@
 	}
 
 	rnd_event_bind(PCB_EVENT_BOARD_EDITED, propedit_brd_chg, NULL, pcb_propedit_cookie);
-	rnd_event_bind(RND_EVENT_BOARD_REPLACED, propedit_brd_unload, NULL, pcb_propedit_cookie);
+	rnd_event_bind(RND_EVENT_DESIGN_REPLACED, propedit_brd_unload, NULL, pcb_propedit_cookie);
 }
 
 void pcb_propdlg_uninit(void)
Index: shand_cmd/command.c
===================================================================
--- shand_cmd/command.c	(revision 36973)
+++ shand_cmd/command.c	(revision 36974)
@@ -177,7 +177,7 @@
 			pcb_board_set_changed_flag(PCB, rnd_false);
 			free(PCB->hidlib.filename);
 			PCB->hidlib.filename = rnd_strdup(filename);
-			rnd_event(&PCB->hidlib, RND_EVENT_BOARD_FN_CHANGED, NULL);
+			rnd_event(&PCB->hidlib, RND_EVENT_DESIGN_FN_CHANGED, NULL);
 		}
 	}
 
Index: show_netnames/show_netnames.c
===================================================================
--- show_netnames/show_netnames.c	(revision 36973)
+++ show_netnames/show_netnames.c	(revision 36974)
@@ -299,7 +299,7 @@
 #include "show_netnames_conf_fields.h"
 
 	rnd_event_bind(PCB_EVENT_BOARD_EDITED, show_netnames_brd_chg, NULL, pcb_show_netnames_cookie);
-	rnd_event_bind(RND_EVENT_BOARD_REPLACED, show_netnames_brd_chg, NULL, pcb_show_netnames_cookie);
+	rnd_event_bind(RND_EVENT_DESIGN_REPLACED, show_netnames_brd_chg, NULL, pcb_show_netnames_cookie);
 	rnd_event_bind(RND_EVENT_GUI_DRAW_OVERLAY_XOR, show_netnames_render, NULL, pcb_show_netnames_cookie);
 	rnd_event_bind(PCB_EVENT_NETLIST_CHANGED, show_netnames_inv_cache, NULL, pcb_show_netnames_cookie);
 	rnd_event_bind(PCB_EVENT_FONT_CHANGED, show_netnames_inv_cache, NULL, pcb_show_netnames_cookie);