Index: cam.c
===================================================================
--- cam.c	(revision 24883)
+++ cam.c	(revision 24884)
@@ -53,8 +53,8 @@
 
 static void cam_init_inst_fn(cam_ctx_t *ctx)
 {
-	if ((PCB != NULL) && (PCB->Filename != NULL)) {
-		char *fn = pcb_derive_default_filename_(PCB->Filename, "");
+	if ((PCB != NULL) && (PCB->hidlib.filename != NULL)) {
+		char *fn = pcb_derive_default_filename_(PCB->hidlib.filename, "");
 		char *val, *end = strrchr(fn, PCB_DIR_SEPARATOR_C);
 		if (end != NULL)
 			val = pcb_strdup(end+1);
Index: cam_gui.c
===================================================================
--- cam_gui.c	(revision 24883)
+++ cam_gui.c	(revision 24884)
@@ -338,7 +338,7 @@
 
 	{ /* set default outfile */
 		pcb_hid_attr_val_t hv;
-		hv.str_value = pcb_derive_default_filename_(PCB->Filename, "");
+		hv.str_value = pcb_derive_default_filename_(PCB->hidlib.filename, "");
 		pcb_gui->attr_dlg_set_value(ctx->dlg_hid_ctx, ctx->woutfile, &hv);
 		free((char *)hv.str_value);
 		cam_gui_opts2dlg(ctx);