Index: gsch2pcb-rnd/gsch2pcb.c
===================================================================
--- gsch2pcb-rnd/gsch2pcb.c	(revision 31016)
+++ gsch2pcb-rnd/gsch2pcb.c	(revision 31017)
@@ -23,7 +23,7 @@
   - use getenv() instead of g_getenv(): on windows this won't do recursive variable expansion
   - use rnd-specific .scm
   - use pcb-rnd's conf system
-  - use pcb_popen() instead of glib's spawn (stderr is always printed to stderr)
+  - use rnd_popen() instead of glib's spawn (stderr is always printed to stderr)
  */
 
 #include "config.h"
@@ -215,7 +215,7 @@
 	char *s, buf[1024], config[32], arg[768];
 	int n;
 
-	f = pcb_fopen(NULL, path, "r");
+	f = rnd_fopen(NULL, path, "r");
 	if (!f)
 		return;
 
Index: gsch2pcb-rnd/help.c
===================================================================
--- gsch2pcb-rnd/help.c	(revision 31016)
+++ gsch2pcb-rnd/help.c	(revision 31017)
@@ -22,7 +22,7 @@
  Behavior different from the original:
   - use getenv() instead of g_getenv(): on windows this won't do recursive variable expansion
   - use rnd-specific .scm
-  - use pcb_popen() instead of glib's spawn (stderr is always printed to stderr)
+  - use rnd_popen() instead of glib's spawn (stderr is always printed to stderr)
  */
 #include "config.h"
 #include "method.h"
Index: gsch2pcb-rnd/run.c
===================================================================
--- gsch2pcb-rnd/run.c	(revision 31016)
+++ gsch2pcb-rnd/run.c	(revision 31017)
@@ -112,13 +112,13 @@
 			printf("%s", SEP_STRING);
 		}
 
-		f = pcb_popen(NULL, cmd, "r");
+		f = rnd_popen(NULL, cmd, "r");
 		while(fgets(line, sizeof(line), f) != NULL) {
 			if (conf_g2pr.utils.gsch2pcb_rnd.verbose)
 				fputs(line, stdout);
 		}
 
-		if (pcb_pclose(f) == 0)
+		if (rnd_pclose(f) == 0)
 			result = TRUE;
 		else
 			fprintf(stderr, "Failed to execute external program\n");