Index: dlg_fontsel.c
===================================================================
--- dlg_fontsel.c	(revision 36988)
+++ dlg_fontsel.c	(revision 36989)
@@ -265,7 +265,7 @@
 	return 0;
 }
 
-static void fontsel_mchanged_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
+static void fontsel_mchanged_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
 {
 	fontsel_ctx_t *c;
 
@@ -276,7 +276,7 @@
 		fontsel_preview_update(c);
 }
 
-static void fontsel_bchanged_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
+static void fontsel_bchanged_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
 {
 	fontsel_ctx_t *c, *next;
 	rnd_dad_retovr_t retovr;
@@ -310,7 +310,7 @@
 	fontsel_timer = rnd_gui->add_timer(rnd_gui, fontsel_timer_cb, 500, fontsel_timer);
 }
 
-static void fontsel_gui_init_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
+static void fontsel_gui_init_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
 {
 	fontsel_timer_cb(fontsel_timer);
 	fontsel_timer_active = 1;
Index: dlg_library.c
===================================================================
--- dlg_library.c	(revision 36988)
+++ dlg_library.c	(revision 36989)
@@ -840,7 +840,7 @@
 	return 0;
 }
 
-static void library_changed_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
+static void library_changed_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
 {
 	if (library_ctx.active)
 		library_lib2dlg(&library_ctx);
Index: dlg_netlist.c
===================================================================
--- dlg_netlist.c	(revision 36988)
+++ dlg_netlist.c	(revision 36989)
@@ -610,7 +610,7 @@
 }
 
 /* update the dialog after a netlist change */
-static void pcb_dlg_netlist_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
+static void pcb_dlg_netlist_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
 {
 	netlist_ctx_t *ctx = user_data;
 	if (!ctx->active)
Index: dlg_pref_board.c
===================================================================
--- dlg_pref_board.c	(revision 36988)
+++ dlg_pref_board.c	(revision 36989)
@@ -47,7 +47,7 @@
 static void pref_board_brd2dlg(pref_ctx_t *ctx)
 {
 	TODO("should be coming from arg")
-	rnd_hidlib_t *hl = &PCB->hidlib;
+	rnd_design_t *hl = &PCB->hidlib;
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 	DEF_TABDATA;
 
@@ -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_hidlib_t *hl = rnd_gui->get_dad_hidlib(hid_ctx);
+	rnd_design_t *hl = rnd_gui->get_dad_hidlib(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_hidlib_t *hl = rnd_gui->get_dad_hidlib(hid_ctx);
+	rnd_design_t *hl = rnd_gui->get_dad_hidlib(hid_ctx);
 	rnd_actionva(hl, "Propedit", "board", NULL);
 }
 
@@ -99,7 +99,7 @@
 void pcb_dlg_pref_board_create(pref_ctx_t *ctx)
 {
 	TODO("should be coming from arg")
-	rnd_hidlib_t *hl = &PCB->hidlib;
+	rnd_design_t *hl = &PCB->hidlib;
 	pcb_board_t *pcb = (pcb_board_t *)hl;
 	DEF_TABDATA;
 
Index: dlg_pref_color.c
===================================================================
--- dlg_pref_color.c	(revision 36988)
+++ dlg_pref_color.c	(revision 36989)
@@ -81,7 +81,7 @@
 
 static void pref_color_gen_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr)
 {
-	rnd_hidlib_t *hl = rnd_gui->get_dad_hidlib(hid_ctx);
+	rnd_design_t *hl = rnd_gui->get_dad_hidlib(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_hidlib_t *hl = rnd_gui->get_dad_hidlib(hid_ctx);
+	rnd_design_t *hl = rnd_gui->get_dad_hidlib(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 36988)
+++ dlg_pref_general.c	(revision 36989)
@@ -47,7 +47,7 @@
 
 static void pref_general_dlg2conf(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr)
 {
-	rnd_hidlib_t *hl = rnd_gui->get_dad_hidlib(hid_ctx);
+	rnd_design_t *hl = rnd_gui->get_dad_hidlib(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 36988)
+++ dlg_pref_lib.c	(revision 36989)
@@ -57,7 +57,7 @@
 
 static void libhelp_btn(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr);
 
-static void pref_lib_update_buttons(rnd_hidlib_t *hl)
+static void pref_lib_update_buttons(rnd_design_t *hl)
 {
 	pref_ctx_t *ctx = rnd_pref_get_ctx(hl);
 	DEF_TABDATA;
@@ -124,7 +124,7 @@
 static void pref_lib_conf2dlg_post(rnd_conf_native_t *cfg, int arr_idx)
 {
 	pref_ctx_t *ctx = PREFCTX;
-	rnd_hidlib_t *hl;
+	rnd_design_t *hl;
 	DEF_TABDATA;
 	rnd_conf_listitem_t *i;
 	int idx;
@@ -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_hidlib_t *hl = rnd_gui->get_dad_hidlib(hid_ctx);
+	rnd_design_t *hl = rnd_gui->get_dad_hidlib(hid_ctx);
 	pref_ctx_t *ctx = caller_data;
 	DEF_TABDATA;
 	rnd_hid_tree_t *tree = attr->wdata;
@@ -282,7 +282,7 @@
 
 static void lib_cell_edit_update(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *btn_attr)
 {
-	rnd_hidlib_t *hl = rnd_gui->get_dad_hidlib(hid_ctx);
+	rnd_design_t *hl = rnd_gui->get_dad_hidlib(hid_ctx);
 	cell_edit_ctx_t *ctx = caller_data;
 	char *tmp;
 
Index: dlg_undo.c
===================================================================
--- dlg_undo.c	(revision 36988)
+++ dlg_undo.c	(revision 36989)
@@ -158,7 +158,7 @@
 }
 
 /* update the dialog after an undo operation */
-static void pcb_dlg_undo_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
+static void pcb_dlg_undo_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
 {
 	undo_ctx_t *ctx = user_data;
 	if (!ctx->active)
@@ -167,7 +167,7 @@
 }
 
 /* Check if the serial has changed and update the dialog if so */
-static void pcb_dlg_undo_ev_chk(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
+static void pcb_dlg_undo_ev_chk(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
 {
 	undo_ctx_t *ctx = user_data;
 	if (!ctx->active)
Index: dlg_view.c
===================================================================
--- dlg_view.c	(revision 36988)
+++ dlg_view.c	(revision 36989)
@@ -830,7 +830,7 @@
 	return 0;
 }
 
-static void view_preview_update_cb(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
+static void view_preview_update_cb(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
 {
 	if (drc_gui_ctx.active)
 		view_preview_update(&drc_gui_ctx);
Index: pcb_export.c
===================================================================
--- pcb_export.c	(revision 36988)
+++ pcb_export.c	(revision 36989)
@@ -43,7 +43,7 @@
 static int have_gui, currly;
 static int save_l_ons[PCB_MAX_LAYER], save_g_ons[PCB_MAX_LAYERGRP];
 
-static void pcb_export_begin_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
+static void pcb_export_begin_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
 {
 	currly = PCB_CURRLID(PCB);
 	have_gui = (rnd_gui != NULL) && rnd_gui->gui;
@@ -53,7 +53,7 @@
 	}
 }
 
-static void pcb_export_end_ev(rnd_hidlib_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
+static void pcb_export_end_ev(rnd_design_t *hidlib, void *user_data, int argc, rnd_event_arg_t argv[])
 {
 	if (have_gui) {
 		pcb_hid_restore_layer_ons(save_l_ons);