Index: gsch2pcb-rnd/gsch2pcb.c
===================================================================
--- gsch2pcb-rnd/gsch2pcb.c	(revision 31004)
+++ gsch2pcb-rnd/gsch2pcb.c	(revision 31005)
@@ -270,7 +270,7 @@
 	load_project("/etc/gsch2pcb");
 	load_project("/usr/local/etc/gsch2pcb");
 
-	path = pcb_concat(rnd_conf.rc.path.home, RND_DIR_SEPARATOR_S, ".gEDA", RND_DIR_SEPARATOR_S, "gsch2pcb", NULL);
+	path = rnd_concat(rnd_conf.rc.path.home, RND_DIR_SEPARATOR_S, ".gEDA", RND_DIR_SEPARATOR_S, "gsch2pcb", NULL);
 	load_project(path);
 	free(path);
 
@@ -390,12 +390,12 @@
 	method_import_register();
 
 	rnd_conf_userdir_path = CONF_USER_DIR;
-	rnd_pcphl_conf_user_path = pcb_concat(CONF_USER_DIR, "/pcb-conf.lht", NULL);
+	rnd_pcphl_conf_user_path = rnd_concat(CONF_USER_DIR, "/pcb-conf.lht", NULL);
 	rnd_conf_sysdir_path = PCBCONFDIR;
-	rnd_conf_sys_path = pcb_concat(PCBCONFDIR, "/pcb-conf.lht", NULL);
+	rnd_conf_sys_path = rnd_concat(PCBCONFDIR, "/pcb-conf.lht", NULL);
 	rnd_menu_file_paths[0] = "./";
 	rnd_menu_file_paths[1] = "~/.pcb-rnd/";
-	rnd_menu_file_paths[2] = pcb_concat(PCBCONFDIR, "/", NULL);
+	rnd_menu_file_paths[2] = rnd_concat(PCBCONFDIR, "/", NULL);
 	rnd_menu_file_paths[3] = NULL;
 
 	rnd_file_loaded_init();
Index: gsch2pcb-rnd/method_import.c
===================================================================
--- gsch2pcb-rnd/method_import.c	(revision 31004)
+++ gsch2pcb-rnd/method_import.c	(revision 31005)
@@ -41,9 +41,9 @@
 
 static void method_import_init(void)
 {
-	pcb_file_name = pcb_concat(conf_g2pr.utils.gsch2pcb_rnd.sch_basename, ".pcb", NULL);
-	cmd_file_name = pcb_concat(conf_g2pr.utils.gsch2pcb_rnd.sch_basename, ".cmd", NULL);
-	net_file_name = pcb_concat(conf_g2pr.utils.gsch2pcb_rnd.sch_basename, ".net", NULL);
+	pcb_file_name = rnd_concat(conf_g2pr.utils.gsch2pcb_rnd.sch_basename, ".pcb", NULL);
+	cmd_file_name = rnd_concat(conf_g2pr.utils.gsch2pcb_rnd.sch_basename, ".cmd", NULL);
+	net_file_name = rnd_concat(conf_g2pr.utils.gsch2pcb_rnd.sch_basename, ".net", NULL);
 	local_project_pcb_name = pcb_file_name;
 }
 
@@ -104,11 +104,11 @@
 	int res;
 	char *name;
 	
-	name = pcb_concat(conf_g2pr.utils.gsch2pcb_rnd.sch_basename, ".lht", NULL);
+	name = rnd_concat(conf_g2pr.utils.gsch2pcb_rnd.sch_basename, ".lht", NULL);
 	res = rnd_file_readable(name);
 	free(name);
 	if (!res) {
-		name = pcb_concat(conf_g2pr.utils.gsch2pcb_rnd.sch_basename, ".pcb.lht", NULL);
+		name = rnd_concat(conf_g2pr.utils.gsch2pcb_rnd.sch_basename, ".pcb.lht", NULL);
 		res = rnd_file_readable(name);
 		free(name);
 	}
Index: gsch2pcb-rnd/netlister.c
===================================================================
--- gsch2pcb-rnd/netlister.c	(revision 31004)
+++ gsch2pcb-rnd/netlister.c	(revision 31005)
@@ -92,7 +92,7 @@
 		char *out_file;
 		char *backend;
 		if (!s2) {
-			out_file = pcb_concat(basename, ".", s, NULL);
+			out_file = rnd_concat(basename, ".", s, NULL);
 			backend = rnd_strdup(s);
 		}
 		else {