Index: prcli.c
===================================================================
--- prcli.c	(revision 30902)
+++ prcli.c	(revision 30903)
@@ -7,7 +7,7 @@
 int main(int argc, char *argv[])
 {
 	const char *fmt = argv[1];
-	pcb_coord_t crd;
+	rnd_coord_t crd;
 	int n;
 
 	setlocale(LC_ALL, "C");
@@ -15,10 +15,10 @@
 	pcb_printf_slot[0] = "%mr";
 
 	for(n = 2; n < argc; n++) {
-		pcb_bool success;
+		rnd_bool success;
 		double val = pcb_get_value_ex(argv[n], NULL, NULL, NULL, "", &success);
 		if (!success) {
-			fprintf(stderr, "Unable to convert '%s' to pcb_coord_t\n", argv[n]);
+			fprintf(stderr, "Unable to convert '%s' to rnd_coord_t\n", argv[n]);
 			return 1;
 		}
 		crd = val;
Index: tester.c
===================================================================
--- tester.c	(revision 30902)
+++ tester.c	(revision 30903)
@@ -19,7 +19,7 @@
 
 int main()
 {
-	pcb_coord_t c[] = {0, 1, 1024, 1024*1024, 1024*1024*1024};
+	rnd_coord_t c[] = {0, 1, 1024, 1024*1024, 1024*1024*1024};
 	char *fmt[] = {
 	"%mI",  "%mm",  "%mM",  "%ml",  "%mL",  "%ms",  "%mS",  "%md",  "%mD",  "%m3",  "%mr",
 	"%$mI", "%$mm", "%$mM", "%$ml", "%$mL", "%$ms", "%$mS", "%$md", "%$mD", "%$m3", "%$mr",