Index: conf/conftest.c
===================================================================
--- conf/conftest.c	(revision 31006)
+++ conf/conftest.c	(revision 31007)
@@ -121,7 +121,7 @@
 		return;
 	}
 	gds_init(&s);
-	rnd_conf_print_native((rnd_conf_pfn)pcb_append_printf, &s, NULL, 0, node);
+	rnd_conf_print_native((rnd_conf_pfn)rnd_append_printf, &s, NULL, 0, node);
 	printf("%s='%s'\n", node->hash_path, s.array);
 	gds_uninit(&s);
 }
Index: pcb-printf/prcli.c
===================================================================
--- pcb-printf/prcli.c	(revision 31006)
+++ pcb-printf/prcli.c	(revision 31007)
@@ -12,7 +12,7 @@
 
 	setlocale(LC_ALL, "C");
 
-	pcb_printf_slot[0] = "%mr";
+	rnd_printf_slot[0] = "%mr";
 
 	for(n = 2; n < argc; n++) {
 		rnd_bool success;
@@ -24,7 +24,7 @@
 		crd = val;
 	}
 
-	pcb_fprintf(stdout, fmt, crd, 70000, 70000, 70000, 70000);
+	rnd_fprintf(stdout, fmt, crd, 70000, 70000, 70000, 70000);
 
 	printf("\n");
 
Index: pcb-printf/prclimq.c
===================================================================
--- pcb-printf/prclimq.c	(revision 31006)
+++ pcb-printf/prclimq.c	(revision 31007)
@@ -6,9 +6,9 @@
 
 int main(int argc, char *argv[])
 {
-	pcb_printf_slot[0] = "%{ ()}mq";
+	rnd_printf_slot[0] = "%{ ()}mq";
 	setlocale(LC_ALL, "C");
-	pcb_fprintf(stdout, argv[1], argv[2]);
+	rnd_fprintf(stdout, argv[1], argv[2]);
 	printf("\n");
 	return 0;
 }
Index: pcb-printf/tester.c
===================================================================
--- pcb-printf/tester.c	(revision 31006)
+++ pcb-printf/tester.c	(revision 31007)
@@ -10,7 +10,7 @@
 #	define PCB_PRINTF(fmt, ...) \
 	do { \
 		pc++; \
-		pcb_snprintf(buff, sizeof(buff), fmt, __VA_ARGS__); \
+		rnd_snprintf(buff, sizeof(buff), fmt, __VA_ARGS__); \
 	} while(0)
 #else
 #	define NUMREP 1