Index: dlg_pref_board.c
===================================================================
--- dlg_pref_board.c	(revision 36992)
+++ 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: dlg_pref_color.c
===================================================================
--- dlg_pref_color.c	(revision 36992)
+++ 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: dlg_pref_general.c
===================================================================
--- dlg_pref_general.c	(revision 36992)
+++ 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: dlg_pref_lib.c
===================================================================
--- dlg_pref_lib.c	(revision 36992)
+++ 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;