Index: dlg_infobar.c
===================================================================
--- dlg_infobar.c	(revision 37052)
+++ dlg_infobar.c	(revision 37053)
@@ -97,7 +97,7 @@
 		}
 
 		/* update labels */
-		hv.str = rnd_strdup_printf("The file %s has changed on disk", PCB->hidlib.filename);
+		hv.str = rnd_strdup_printf("The file %s has changed on disk", PCB->hidlib.loadname);
 		rnd_gui->attr_dlg_set_value(sub.dlg_hid_ctx, wlab[0], &hv);
 		free((char *)hv.str);
 
Index: dlg_loadsave.c
===================================================================
--- dlg_loadsave.c	(revision 37052)
+++ dlg_loadsave.c	(revision 37053)
@@ -421,7 +421,7 @@
 	memset(&save, 0, sizeof(save));
 
 	if (rnd_strcasecmp(function, "Layout") == 0)
-		if (PCB->hidlib.filename != NULL)
+		if (PCB->hidlib.loadname != NULL)
 			return rnd_actionva(RND_ACT_DESIGN, "SaveTo", "Layout", NULL);
 
 	if (is_dialog) {
@@ -548,10 +548,10 @@
 
 	/* construct the input file name and run a file selection dialog to get the final file name */
 	if (name_in == NULL) {
-		if (PCB->hidlib.filename == NULL)
+		if (PCB->hidlib.loadname == NULL)
 			name_in = rnd_concat("unnamed", extensions_param[fmt], NULL);
 		else
-			name_in = rnd_strdup(PCB->hidlib.filename);
+			name_in = rnd_strdup(PCB->hidlib.loadname);
 	}