Index: src/board.c
===================================================================
--- src/board.c	(revision 36992)
+++ src/board.c	(revision 36993)
@@ -390,8 +390,8 @@
 
 void pcb_board_replaced(int reverted)
 {
-	if ((rnd_gui != NULL) && (rnd_gui->set_hidlib != NULL))
-		rnd_gui->set_hidlib(rnd_gui, &PCB->hidlib);
+	if ((rnd_gui != NULL) && (rnd_gui->set_design != NULL))
+		rnd_gui->set_design(rnd_gui, &PCB->hidlib);
 	rnd_event(&PCB->hidlib, RND_EVENT_DESIGN_REPLACED, "i", reverted);
 }
 
Index: src/file_act.c
===================================================================
--- src/file_act.c	(revision 36992)
+++ src/file_act.c	(revision 36993)
@@ -160,8 +160,8 @@
 			pcb_save_in_tmp();
 
 		pcb_crosshair_move_absolute(pcb, RND_COORD_MAX, RND_COORD_MAX); /* make sure the crosshair is not above any object so ch* plugins release their highlights */
-		if (rnd_gui->set_hidlib != NULL)
-			rnd_gui->set_hidlib(rnd_gui, NULL);
+		if (rnd_gui->set_design != NULL)
+			rnd_gui->set_design(rnd_gui, NULL);
 
 		pcb_draw_inhibit_inc();
 		pcb_board_remove(pcb);
@@ -169,8 +169,8 @@
 		PCB = pcb = pcb_board_new(1);
 #define PCB do_not_use
 		pcb_board_new_postproc(pcb, 1);
-		if (rnd_gui->set_hidlib != NULL)
-			rnd_gui->set_hidlib(rnd_gui, &pcb->hidlib);
+		if (rnd_gui->set_design != NULL)
+			rnd_gui->set_design(rnd_gui, &pcb->hidlib);
 		pcb_draw_inhibit_dec();
 
 		pcb_set_design_dir(NULL);
Index: src_plugins/ar_extern/dlg_extroute.c
===================================================================
--- src_plugins/ar_extern/dlg_extroute.c	(revision 36992)
+++ src_plugins/ar_extern/dlg_extroute.c	(revision 36993)
@@ -192,7 +192,7 @@
 {
 	FILE *f;
 	char *fname;
-	rnd_design_t *hl = rnd_gui->get_dad_hidlib(hid_ctx);
+	rnd_design_t *hl = rnd_gui->get_dad_design(hid_ctx);
 
 	fname = rnd_hid_fileselect(rnd_gui, "Save autoroute settings to...",
 		"Pick a file for saving autoroute settings to.\n",
@@ -216,7 +216,7 @@
 {
 	FILE *f;
 	char *fname;
-	rnd_design_t *hl = rnd_gui->get_dad_hidlib(hid_ctx);
+	rnd_design_t *hl = rnd_gui->get_dad_design(hid_ctx);
 
 	fname = rnd_hid_fileselect(rnd_gui, "Load autoroute settings from...",
 		"Pick a file for loading autoroute settings from.\n",
Index: src_plugins/dialogs/dlg_pref_board.c
===================================================================
--- src_plugins/dialogs/dlg_pref_board.c	(revision 36992)
+++ src_plugins/dialogs/dlg_pref_board.c	(revision 36993)
@@ -59,7 +59,7 @@
 /* Dialog box to actual board meta */
 static void pref_board_dlg2brd(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr)
 {
-	rnd_design_t *hl = rnd_gui->get_dad_hidlib(hid_ctx);
+	rnd_design_t *hl = rnd_gui->get_dad_design(hid_ctx);
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 	int changed = 0;
 	const char *newname, *oldname;
@@ -92,7 +92,7 @@
 
 static void pref_board_edit_attr(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr)
 {
-	rnd_design_t *hl = rnd_gui->get_dad_hidlib(hid_ctx);
+	rnd_design_t *hl = rnd_gui->get_dad_design(hid_ctx);
 	rnd_actionva(hl, "Propedit", "board", NULL);
 }
 
Index: src_plugins/dialogs/dlg_pref_color.c
===================================================================
--- src_plugins/dialogs/dlg_pref_color.c	(revision 36992)
+++ src_plugins/dialogs/dlg_pref_color.c	(revision 36993)
@@ -81,7 +81,7 @@
 
 static void pref_color_gen_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr)
 {
-	rnd_design_t *hl = rnd_gui->get_dad_hidlib(hid_ctx);
+	rnd_design_t *hl = rnd_gui->get_dad_design(hid_ctx);
 	pref_ctx_t *ctx = caller_data;
 	const char *path = attr->user_data;
 
@@ -97,7 +97,7 @@
 
 static void pref_color_layer_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr)
 {
-	rnd_design_t *hl = rnd_gui->get_dad_hidlib(hid_ctx);
+	rnd_design_t *hl = rnd_gui->get_dad_design(hid_ctx);
 	pref_ctx_t *ctx = caller_data;
 	DEF_TABDATA;
 	int idx = (int *)attr->user_data - tabdata->wlayer;
Index: src_plugins/dialogs/dlg_pref_general.c
===================================================================
--- src_plugins/dialogs/dlg_pref_general.c	(revision 36992)
+++ src_plugins/dialogs/dlg_pref_general.c	(revision 36993)
@@ -47,7 +47,7 @@
 
 static void pref_general_dlg2conf(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr)
 {
-	rnd_design_t *hl = rnd_gui->get_dad_hidlib(hid_ctx);
+	rnd_design_t *hl = rnd_gui->get_dad_design(hid_ctx);
 	pref_ctx_t *ctx = caller_data;
 
 	if (rnd_pref_dlg2conf_pre(hl, ctx) == NULL)
Index: src_plugins/dialogs/dlg_pref_lib.c
===================================================================
--- src_plugins/dialogs/dlg_pref_lib.c	(revision 36992)
+++ src_plugins/dialogs/dlg_pref_lib.c	(revision 36993)
@@ -73,7 +73,7 @@
 
 static void pref_lib_select_cb(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_hid_row_t *row)
 {
-	pref_lib_update_buttons(rnd_gui->get_dad_hidlib(hid_ctx));
+	pref_lib_update_buttons(rnd_gui->get_dad_design(hid_ctx));
 }
 
 static void pref_lib_row_free(rnd_hid_attribute_t *attrib, void *hid_ctx, rnd_hid_row_t *row)
@@ -136,7 +136,7 @@
 	if ((tabdata->lock) || (!ctx->active))
 		return;
 
-	hl = rnd_gui->get_dad_hidlib(ctx->dlg_hid_ctx);
+	hl = rnd_gui->get_dad_design(ctx->dlg_hid_ctx);
 	attr = &ctx->dlg[tabdata->wlist];
 
 	/* copy everything from the config tree to the dialog */
@@ -161,7 +161,7 @@
 /* Dialog box to current libraries in config */
 static void pref_lib_dlg2conf(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr)
 {
-	rnd_design_t *hl = rnd_gui->get_dad_hidlib(hid_ctx);
+	rnd_design_t *hl = rnd_gui->get_dad_design(hid_ctx);
 	pref_ctx_t *ctx = caller_data;
 	DEF_TABDATA;
 	rnd_hid_tree_t *tree = attr->wdata;
@@ -212,7 +212,7 @@
 
 	if (rnd_dad_tree_remove(attr, r) == 0) {
 		pref_lib_dlg2conf(hid_ctx, caller_data, attr);
-		pref_lib_update_buttons(rnd_gui->get_dad_hidlib(hid_ctx));
+		pref_lib_update_buttons(rnd_gui->get_dad_design(hid_ctx));
 	}
 }
 
@@ -282,7 +282,7 @@
 
 static void lib_cell_edit_update(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *btn_attr)
 {
-	rnd_design_t *hl = rnd_gui->get_dad_hidlib(hid_ctx);
+	rnd_design_t *hl = rnd_gui->get_dad_design(hid_ctx);
 	cell_edit_ctx_t *ctx = caller_data;
 	char *tmp;
 
Index: src_plugins/drc_query/dlg.c
===================================================================
--- src_plugins/drc_query/dlg.c	(revision 36992)
+++ src_plugins/drc_query/dlg.c	(revision 36993)
@@ -226,7 +226,7 @@
 	rnd_hid_text_t *txt = atxt->wdata;
 	char *script = txt->hid_get_text(atxt, hid_ctx);
 	pcb_view_list_t *view = calloc(sizeof(pcb_view_list_t), 1);
-	pcb_board_t *pcb = (pcb_board_t *)rnd_gui->get_dad_hidlib(hid_ctx);
+	pcb_board_t *pcb = (pcb_board_t *)rnd_gui->get_dad_design(hid_ctx);
 	pcb_qry_exec_t ec;
 
 	pcb_qry_init(&ec, pcb, NULL, -1);
@@ -541,7 +541,7 @@
 {
 	drc_rlist_ctx_t *ctx = caller_data;
 	rnd_hid_row_t *row = rnd_dad_tree_get_selected(&(ctx->dlg[ctx->wrlist]));
-	pcb_board_t *pcb = (pcb_board_t *)rnd_gui->get_dad_hidlib(hid_ctx);
+	pcb_board_t *pcb = (pcb_board_t *)rnd_gui->get_dad_design(hid_ctx);
 	rnd_conf_role_t role;
 
 	if (row == NULL) {
@@ -635,7 +635,7 @@
 	const char *script;
 	rnd_conf_role_t role;
 	pcb_view_list_t *view;
-	pcb_board_t *pcb = (pcb_board_t *)rnd_gui->get_dad_hidlib(hid_ctx);
+	pcb_board_t *pcb = (pcb_board_t *)rnd_gui->get_dad_design(hid_ctx);
 	pcb_qry_exec_t ec;
 
 	rlist_fetch();
@@ -659,7 +659,7 @@
 {
 	drc_rlist_ctx_t *ctx = caller_data;
 	rnd_hid_row_t *row = rnd_dad_tree_get_selected(&(ctx->dlg[ctx->wrlist]));
-	pcb_board_t *pcb = (pcb_board_t *)rnd_gui->get_dad_hidlib(hid_ctx);
+	pcb_board_t *pcb = (pcb_board_t *)rnd_gui->get_dad_design(hid_ctx);
 
 	if (row == NULL) {
 		rnd_message(RND_MSG_ERROR, "Select a rule first\n");
@@ -671,7 +671,7 @@
 
 static void rlist_btn_import_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr_inp)
 {
-	pcb_board_t *pcb = (pcb_board_t *)rnd_gui->get_dad_hidlib(hid_ctx);
+	pcb_board_t *pcb = (pcb_board_t *)rnd_gui->get_dad_design(hid_ctx);
 
 	rnd_actionva(&pcb->hidlib, "DrcQueryImport", NULL);
 	drc_rlist_pcb2dlg();
@@ -811,7 +811,7 @@
 {
 	drc_rlist_ctx_t *ctx = caller_data;
 	rnd_hid_row_t *row = rnd_dad_tree_get_selected(&(ctx->dlg[ctx->wdlist]));
-	rnd_design_t *hl = rnd_gui->get_dad_hidlib(hid_ctx);
+	rnd_design_t *hl = rnd_gui->get_dad_design(hid_ctx);
 	lht_node_t *nd;
 	char *path;
 
Index: src_plugins/lib_hid_pcbui/layersel.c
===================================================================
--- src_plugins/lib_hid_pcbui/layersel.c	(revision 36992)
+++ src_plugins/lib_hid_pcbui/layersel.c	(revision 36993)
@@ -349,12 +349,12 @@
 
 static void all_vis_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr)
 {
-	rnd_actionva(rnd_gui->get_dad_hidlib(hid_ctx), "ToggleView", "all", "vis", "set", NULL);
+	rnd_actionva(rnd_gui->get_dad_design(hid_ctx), "ToggleView", "all", "vis", "set", NULL);
 }
 
 static void all_invis_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr)
 {
-	rnd_actionva(rnd_gui->get_dad_hidlib(hid_ctx), "ToggleView", "all", "vis", "clear", NULL);
+	rnd_actionva(rnd_gui->get_dad_design(hid_ctx), "ToggleView", "all", "vis", "clear", NULL);
 }
 
 /* Select the first visible layer (physically) below the one turned off or