Index: ar_extern.c
===================================================================
--- ar_extern.c	(revision 36988)
+++ ar_extern.c	(revision 36989)
@@ -58,8 +58,8 @@
 typedef struct {
 	const char *name;
 	int (*route)(pcb_board_t *pcb, ext_route_scope_t scope, const char *method, int argc, fgw_arg_t *argv);
-	int (*list_methods)(rnd_hidlib_t *hl, vts0_t *dst);
-	rnd_export_opt_t *(*list_conf)(rnd_hidlib_t *hl, const char *method);
+	int (*list_methods)(rnd_design_t *hl, vts0_t *dst);
+	rnd_export_opt_t *(*list_conf)(rnd_design_t *hl, const char *method);
 } ext_router_t;
 
 int pcb_ar_extern_progress(double p_total, double p1, double p2);
Index: dlg_extroute.c
===================================================================
--- dlg_extroute.c	(revision 36988)
+++ dlg_extroute.c	(revision 36989)
@@ -192,7 +192,7 @@
 {
 	FILE *f;
 	char *fname;
-	rnd_hidlib_t *hl = rnd_gui->get_dad_hidlib(hid_ctx);
+	rnd_design_t *hl = rnd_gui->get_dad_hidlib(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_hidlib_t *hl = rnd_gui->get_dad_hidlib(hid_ctx);
+	rnd_design_t *hl = rnd_gui->get_dad_hidlib(hid_ctx);
 
 	fname = rnd_hid_fileselect(rnd_gui, "Load autoroute settings from...",
 		"Pick a file for loading autoroute settings from.\n",
Index: e_freerouting.c
===================================================================
--- e_freerouting.c	(revision 36988)
+++ e_freerouting.c	(revision 36989)
@@ -113,7 +113,7 @@
 static int freert_route(pcb_board_t *pcb, ext_route_scope_t scope, const char *method, int argc, fgw_arg_t *argv)
 {
 	char *route_req, *route_res, *end;
-	rnd_hidlib_t *hl = &pcb->hidlib;
+	rnd_design_t *hl = &pcb->hidlib;
 	char *cmd;
 	int n, r, rv = 1, ap = 2, pp = 12, fo=0, test = 0, debug, rich;
 	const char *exe, *installation;
@@ -250,7 +250,7 @@
 	return rv;
 }
 
-static int freert_list_methods(rnd_hidlib_t *hl, vts0_t *dst)
+static int freert_list_methods(rnd_design_t *hl, vts0_t *dst)
 {
 	vts0_append(dst, rnd_strdup("freerouting_cli"));
 	vts0_append(dst, rnd_strdup("Erich's minimized CLI-only fork"));
@@ -261,7 +261,7 @@
 }
 
 
-static rnd_export_opt_t *freert_list_conf(rnd_hidlib_t *hl, const char *method)
+static rnd_export_opt_t *freert_list_conf(rnd_design_t *hl, const char *method)
 {
 	rnd_export_opt_t *rv = calloc(sizeof(rnd_export_opt_t), 4+1);
 
Index: e_route-rnd.c
===================================================================
--- e_route-rnd.c	(revision 36988)
+++ e_route-rnd.c	(revision 36989)
@@ -29,7 +29,7 @@
 static int rtrnd_route(pcb_board_t *pcb, ext_route_scope_t scope, const char *method, int argc, fgw_arg_t *argv)
 {
 	const char *route_req = "rtrnd.1.tdx", *route_res = "rtrnd.2.tdx";
-	rnd_hidlib_t *hl = &pcb->hidlib;
+	rnd_design_t *hl = &pcb->hidlib;
 	char *cmd;
 	int n, r, sargc, rv = 1;
 	fgw_arg_t sres = {0}, *sargv;
@@ -84,7 +84,7 @@
 	return rv;
 }
 
-static int rtrnd_list_methods(rnd_hidlib_t *hl, vts0_t *dst)
+static int rtrnd_list_methods(rnd_design_t *hl, vts0_t *dst)
 {
 	FILE *f;
 	char *cmd, line[1024];
@@ -116,7 +116,7 @@
 }
 
 
-static rnd_export_opt_t *rtrnd_list_conf(rnd_hidlib_t *hl, const char *method)
+static rnd_export_opt_t *rtrnd_list_conf(rnd_design_t *hl, const char *method)
 {
 	char *cmd;
 	const char *route_lst = "rtrnd.l.tdx";