Index: pcb-printf/Makefile
===================================================================
--- pcb-printf/Makefile	(revision 31008)
+++ pcb-printf/Makefile	(revision 31009)
@@ -19,11 +19,11 @@
 	@echo "pcb-printf:          *** QC PASS ***"
 	@rm tester.stdout ; true
 
-prcli: prcli.o $(LIBRND)/core/pcb-printf.o $(LIBRND)/core/misc_util.o $(LIBPCB_BASE) $(GDS)
-	$(CC) $(LDFLAGS) -o prcli prcli.o $(LIBRND)/core/pcb-printf.o $(LIBRND)/core/misc_util.o $(LIBPCB_BASE) $(GDS) $(LDLIBS)
+prcli: prcli.o $(LIBRND)/core/rnd_printf.o $(LIBRND)/core/misc_util.o $(LIBPCB_BASE) $(GDS)
+	$(CC) $(LDFLAGS) -o prcli prcli.o $(LIBRND)/core/rnd_printf.o $(LIBRND)/core/misc_util.o $(LIBPCB_BASE) $(GDS) $(LDLIBS)
 
-prclimq: prclimq.o $(LIBRND)/core/pcb-printf.o $(LIBRND)/core/misc_util.o $(LIBPCB_BASE) $(GDS)
-	$(CC) $(LDFLAGS) -o prclimq prclimq.o $(LIBRND)/core/pcb-printf.o $(LIBRND)/core/misc_util.o $(LIBPCB_BASE) $(GDS) $(LDLIBS)
+prclimq: prclimq.o $(LIBRND)/core/rnd_printf.o $(LIBRND)/core/misc_util.o $(LIBPCB_BASE) $(GDS)
+	$(CC) $(LDFLAGS) -o prclimq prclimq.o $(LIBRND)/core/rnd_printf.o $(LIBRND)/core/misc_util.o $(LIBPCB_BASE) $(GDS) $(LDLIBS)
 
 prcli.o: prcli.c
 	$(CC) -c $(CFLAGS) prcli.c -o prcli.o
@@ -31,11 +31,11 @@
 prclimq.o: prclimq.c
 	$(CC) -c $(CFLAGS) prclimq.c -o prclimq.o
 
-tester: tester.o $(LIBRND)/core/pcb-printf.o $(LIBPCB_BASE)  $(GDS)
-	$(CC) $(LDFLAGS) -o tester tester.o $(LIBRND)/core/pcb-printf.o $(LIBPCB_BASE)  $(GDS) $(LDLIBS)
+tester: tester.o $(LIBRND)/core/rnd_printf.o $(LIBPCB_BASE)  $(GDS)
+	$(CC) $(LDFLAGS) -o tester tester.o $(LIBRND)/core/rnd_printf.o $(LIBPCB_BASE)  $(GDS) $(LDLIBS)
 
-tester_spd: tester_spd.o $(LIBRND)/core/pcb-printf_spd.o $(LIBPCB_BASE) $(GDS)
-	$(CC) $(LDFLAGS) -o tester_spd tester_spd.o $(LIBRND)/core/pcb-printf_spd.o $(LIBPCB_BASE) $(GDS) $(LDLIBS)
+tester_spd: tester_spd.o $(LIBRND)/core/rnd_printf_spd.o $(LIBPCB_BASE) $(GDS)
+	$(CC) $(LDFLAGS) -o tester_spd tester_spd.o $(LIBRND)/core/rnd_printf_spd.o $(LIBPCB_BASE) $(GDS) $(LDLIBS)
 
 tester.o: tester.c
 	$(CC) -c $(CFLAGS) -o $@ tester.c
@@ -49,13 +49,13 @@
 tester.diff: tester.stdout
 	diff -u tester.ref tester.stdout
 
-$(LIBRND)/core/pcb-printf.o: $(LIBRND)/core/pcb-printf.c $(LIBRND)/core/pcb-printf.h
+$(LIBRND)/core/rnd_printf.o: $(LIBRND)/core/rnd_printf.c $(LIBRND)/core/rnd_printf.h
 
 $(LIBRND)/core/unit.o: $(LIBRND)/core/unit.c $(LIBRND)/core/unit.h
 
-$(LIBRND)/core/pcb-printf_spd.o: $(LIBRND)/core/pcb-printf.c $(LIBRND)/core/pcb-printf.h
-	$(CC) -c $(CFLAGS_OP) -DSPEED $(CFLAGS) -o $@ $(LIBRND)/core/pcb-printf.c
+$(LIBRND)/core/rnd_printf_spd.o: $(LIBRND)/core/rnd_printf.c $(LIBRND)/core/rnd_printf.h
+	$(CC) -c $(CFLAGS_OP) -DSPEED $(CFLAGS) -o $@ $(LIBRND)/core/rnd_printf.c
 
 clean:
-	-$(SCCBOX) rm -f tester tester.o prcli prcli.o tester_spd tester_spd.o prclimq prclimq.o $(LIBRND)/core/pcb-printf_spd.o
+	-$(SCCBOX) rm -f tester tester.o prcli prcli.o tester_spd tester_spd.o prclimq prclimq.o $(LIBRND)/core/rnd_printf_spd.o
 
Index: pcb-printf/tester.c
===================================================================
--- pcb-printf/tester.c	(revision 31008)
+++ pcb-printf/tester.c	(revision 31009)
@@ -14,7 +14,7 @@
 	} while(0)
 #else
 #	define NUMREP 1
-#	define PCB_PRINTF pcb_printf
+#	define PCB_PRINTF rnd_printf
 #endif
 
 int main()
@@ -63,7 +63,7 @@
 #ifdef SPEED
 	{
 		double spent = (double)clock() / (double)CLOCKS_PER_SEC;
-		printf("total number of pcb_printf calls:  %d\n", pc);
+		printf("total number of rnd_printf calls:  %d\n", pc);
 		printf("total number of CPU seconds spent: %.4f\n", spent);
 		printf("Average prints per second: %.4f\n", (double)pc/spent);
 	}