Index: read.c
===================================================================
--- read.c	(revision 37052)
+++ read.c	(revision 37053)
@@ -2444,7 +2444,7 @@
 	if (rctx->cfg_dest == RND_CFR_invalid)
 		return;
 	if (rnd_conf_insert_tree_as(rctx->cfg_dest, sub) != 0)
-		rnd_message(RND_MSG_ERROR, "Failed to insert the config subtree '%s' found in %s\n", sub->name, pcb->hidlib.filename);
+		rnd_message(RND_MSG_ERROR, "Failed to insert the config subtree '%s' found in %s\n", sub->name, pcb->hidlib.loadname);
 	else
 		rnd_conf_update(NULL, -1);
 }
Index: write.c
===================================================================
--- write.c	(revision 37052)
+++ write.c	(revision 37053)
@@ -1850,8 +1850,8 @@
 			char *orig_fn, *end;
 			char *pcb_fn = rnd_strdup_subst(fnpat, rnd_build_fn_cb, &PCB->hidlib, RND_SUBST_ALL);
 			
-			orig_fn = PCB->hidlib.filename;
-			PCB->hidlib.filename = NULL;
+			orig_fn = PCB->hidlib.loadname;
+			PCB->hidlib.loadname = NULL;
 
 			/* avoid .lht.lht.pcb */
 			end = pcb_fn + strlen(pcb_fn) - 1;
@@ -1862,8 +1862,8 @@
 			free(pcb_fn);
 			
 			/* restore these because SaveTo() has changed them */
-			free(PCB->hidlib.filename);
-			PCB->hidlib.filename = orig_fn;
+			free(PCB->hidlib.loadname);
+			PCB->hidlib.loadname = orig_fn;
 			PCB->Data->loader = ctx;
 		}
 	}