Index: file.c
===================================================================
--- file.c	(revision 31005)
+++ file.c	(revision 31006)
@@ -1192,7 +1192,7 @@
  * the program.*/
 void pcb_tmp_data_save(void)
 {
-	char *fn = pcb_build_fn(&PCB->hidlib, conf_core.rc.emergency_name);
+	char *fn = rnd_build_fn(&PCB->hidlib, conf_core.rc.emergency_name);
 	pcb_write_pcb_file(fn, pcb_true, NULL, pcb_true, pcb_false, -1, 0);
 	if (TMPFilename != NULL)
 		free(TMPFilename);
Index: parse_l.c
===================================================================
--- parse_l.c	(revision 31005)
+++ parse_l.c	(revision 31006)
@@ -2629,13 +2629,13 @@
 			free(tmps);
 		}
 		else {
-			pcb_build_argfn_t p;
+			rnd_build_argfn_t p;
 			used_popen = 1;
 			memset(&p, 0, sizeof(p));
 			p.params['p' - 'a'] = Path;
 			p.params['f' - 'a'] = Filename;
 			p.hidlib = &PCB->hidlib;
-			command = pcb_build_argfn(Executable, &p);
+			command = rnd_build_argfn(Executable, &p);
 			/* open pipe to stdout of command */
 			if (*command == '\0' || (yyin = pcb_popen(NULL, command, "r")) == NULL) {
 				rnd_popen_error_message(command);
Index: parse_l.l
===================================================================
--- parse_l.l	(revision 31005)
+++ parse_l.l	(revision 31006)
@@ -246,13 +246,13 @@
 			free(tmps);
 		}
 		else {
-			pcb_build_argfn_t p;
+			rnd_build_argfn_t p;
 			used_popen = 1;
 			memset(&p, 0, sizeof(p));
 			p.params['p' - 'a'] = Path;
 			p.params['f' - 'a'] = Filename;
 			p.hidlib = &PCB->hidlib;
-			command = pcb_build_argfn(Executable, &p);
+			command = rnd_build_argfn(Executable, &p);
 			/* open pipe to stdout of command */
 			if (*command == '\0' || (yyin = pcb_popen(NULL, command, "r")) == NULL) {
 				rnd_popen_error_message(command);