Index: parser_test/main.c
===================================================================
--- parser_test/main.c	(revision 36988)
+++ parser_test/main.c	(revision 36989)
@@ -3,12 +3,12 @@
 #include "pcbdoc_ascii.h"
 
 #undef fopen
-FILE *rnd_fopen(rnd_hidlib_t *hidlib, const char *fn, const char *mode)
+FILE *rnd_fopen(rnd_design_t *hidlib, const char *fn, const char *mode)
 {
 	return fopen(fn, mode);
 }
 
-long rnd_file_size(rnd_hidlib_t *hidlib, const char *path)
+long rnd_file_size(rnd_design_t *hidlib, const char *path)
 {
 	struct stat st;
 	if (stat(path, &st) != 0)
Index: pcbdoc_ascii.c
===================================================================
--- pcbdoc_ascii.c	(revision 36988)
+++ pcbdoc_ascii.c	(revision 36989)
@@ -253,7 +253,7 @@
 	return 0;
 }
 
-int pcbdoc_ascii_parse_file(rnd_hidlib_t *hidlib, altium_tree_t *tree, const char *fn)
+int pcbdoc_ascii_parse_file(rnd_design_t *hidlib, altium_tree_t *tree, const char *fn)
 {
 	FILE *f;
 	int res;
Index: pcbdoc_ascii.h
===================================================================
--- pcbdoc_ascii.h	(revision 36988)
+++ pcbdoc_ascii.h	(revision 36989)
@@ -35,7 +35,7 @@
 } altium_tree_t;
 
 int pcbdoc_ascii_test_parse(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, const char *file_name, FILE *f);
-int pcbdoc_ascii_parse_file(rnd_hidlib_t *hidlib, altium_tree_t *tree, const char *fn);
+int pcbdoc_ascii_parse_file(rnd_design_t *hidlib, altium_tree_t *tree, const char *fn);
 
 #define altium_kw_AUTO (-2)
 altium_record_t *pcbdoc_ascii_new_rec(altium_tree_t *tree, const char *type_s, int type);
Index: pcbdoc_bin.c
===================================================================
--- pcbdoc_bin.c	(revision 36988)
+++ pcbdoc_bin.c	(revision 36989)
@@ -207,7 +207,7 @@
 	return make_blk_(tree, str, len, &dummy);
 }
 
-static int pcbdoc_bin_parse_ascii(rnd_hidlib_t *hidlib, altium_tree_t *tree, const char *record, int kw, altium_buf_t *tmp, long len, altium_record_t **rec_out)
+static int pcbdoc_bin_parse_ascii(rnd_design_t *hidlib, altium_tree_t *tree, const char *record, int kw, altium_buf_t *tmp, long len, altium_record_t **rec_out)
 {
 	altium_record_t *rec;
 	char *curr, *end;
@@ -240,7 +240,7 @@
 	return res;
 }
 
-static int pcbdoc_bin_parse_any_ascii(rnd_hidlib_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp, const char *recname, int kw)
+static int pcbdoc_bin_parse_any_ascii(rnd_design_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp, const char *recname, int kw)
 {
 	for(;;) {
 		long len = read_rec_l4b(fp, tmp);
@@ -287,32 +287,32 @@
 
 /*** file/field parsers ***/
 
-int pcbdoc_bin_parse_board6(rnd_hidlib_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp)
+int pcbdoc_bin_parse_board6(rnd_design_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp)
 {
 	return pcbdoc_bin_parse_any_ascii(hidlib, tree, fp, tmp, "Board", altium_kw_record_board);
 }
 
-int pcbdoc_bin_parse_polygons6(rnd_hidlib_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp)
+int pcbdoc_bin_parse_polygons6(rnd_design_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp)
 {
 	return pcbdoc_bin_parse_any_ascii(hidlib, tree, fp, tmp, "Polygon", altium_kw_record_polygon);
 }
 
-int pcbdoc_bin_parse_classes6(rnd_hidlib_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp)
+int pcbdoc_bin_parse_classes6(rnd_design_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp)
 {
 	return pcbdoc_bin_parse_any_ascii(hidlib, tree, fp, tmp, "Class", altium_kw_record_class);
 }
 
-int pcbdoc_bin_parse_nets6(rnd_hidlib_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp)
+int pcbdoc_bin_parse_nets6(rnd_design_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp)
 {
 	return pcbdoc_bin_parse_any_ascii(hidlib, tree, fp, tmp, "Net", altium_kw_record_net);
 }
 
-int pcbdoc_bin_parse_components6(rnd_hidlib_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp)
+int pcbdoc_bin_parse_components6(rnd_design_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp)
 {
 	return pcbdoc_bin_parse_any_ascii(hidlib, tree, fp, tmp, "Component", altium_kw_record_component);
 }
 
-int pcbdoc_bin_parse_rules6(rnd_hidlib_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp)
+int pcbdoc_bin_parse_rules6(rnd_design_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp)
 {
 	for(;;) {
 		int id;
@@ -330,7 +330,7 @@
 }
 
 
-int pcbdoc_bin_parse_tracks6(rnd_hidlib_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp)
+int pcbdoc_bin_parse_tracks6(rnd_design_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp)
 {
 	for(;;) {
 		unsigned char *d;
@@ -375,7 +375,7 @@
 }
 
 
-int pcbdoc_bin_parse_arcs6(rnd_hidlib_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp)
+int pcbdoc_bin_parse_arcs6(rnd_design_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp)
 {
 	for(;;) {
 		unsigned char *d;
@@ -455,7 +455,7 @@
 	return 0;
 }
 
-int pcbdoc_bin_parse_texts6(rnd_hidlib_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp)
+int pcbdoc_bin_parse_texts6(rnd_design_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp)
 {
 	for(;;) {
 		unsigned char *d;
@@ -518,7 +518,7 @@
 }
 
 
-int pcbdoc_bin_parse_fills6(rnd_hidlib_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp)
+int pcbdoc_bin_parse_fills6(rnd_design_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp)
 {
 	for(;;) {
 		unsigned char *d;
@@ -559,7 +559,7 @@
 }
 
 
-int pcbdoc_bin_parse_vias6(rnd_hidlib_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp)
+int pcbdoc_bin_parse_vias6(rnd_design_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp)
 {
 	for(;;) {
 		unsigned char *d;
@@ -608,7 +608,7 @@
 }
 
 /* parse the fields of a pad (the 120 long block of pads6) */
-static int pcbdoc_bin_parse_pads6_fields(rnd_hidlib_t *hidlib, altium_tree_t *tree, altium_buf_t *tmp, const char *name)
+static int pcbdoc_bin_parse_pads6_fields(rnd_design_t *hidlib, altium_tree_t *tree, altium_buf_t *tmp, const char *name)
 {
 	unsigned char *d = tmp->data;
 	altium_record_t *rec;
@@ -656,7 +656,7 @@
 	return 0;
 }
 
-int pcbdoc_bin_parse_pads6(rnd_hidlib_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp)
+int pcbdoc_bin_parse_pads6(rnd_design_t *hidlib, altium_tree_t *tree, ucdf_file_t *fp, altium_buf_t *tmp)
 {
 	for(;;) {
 		char rtype;
@@ -764,7 +764,7 @@
 		} \
 	} while(0)
 
-int pcbdoc_bin_parse_file(rnd_hidlib_t *hidlib, altium_tree_t *tree, const char *fn)
+int pcbdoc_bin_parse_file(rnd_design_t *hidlib, altium_tree_t *tree, const char *fn)
 {
 	int res;
 	ucdf_ctx_t uctx = {0};
Index: pcbdoc_bin.h
===================================================================
--- pcbdoc_bin.h	(revision 36988)
+++ pcbdoc_bin.h	(revision 36989)
@@ -4,6 +4,6 @@
 } altium_buf_t;
 
 int pcbdoc_bin_test_parse(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, const char *file_name, FILE *f);
-int pcbdoc_bin_parse_file(rnd_hidlib_t *hidlib, altium_tree_t *tree, const char *fn);
+int pcbdoc_bin_parse_file(rnd_design_t *hidlib, altium_tree_t *tree, const char *fn);