Index: layer_menu.c
===================================================================
--- layer_menu.c	(revision 31006)
+++ layer_menu.c	(revision 31007)
@@ -82,12 +82,12 @@
 			sprintf(act, "ToggleView(ui:%d)", idx);
 			sprintf(chk, "ChkView(ui:%d)", idx);
 
-			pcb_snprintf(end, len_avail, "  %s", ly->name);
+			rnd_snprintf(end, len_avail, "  %s", ly->name);
 			rnd_gui->create_menu(rnd_gui, path, &props);
 		}
 
 		props.checked = NULL;
-		pcb_snprintf(end, len_avail, "[UI]");
+		rnd_snprintf(end, len_avail, "[UI]");
 		rnd_gui->create_menu(rnd_gui, path, &props);
 	}
 
@@ -106,12 +106,12 @@
 			sprintf(act, "SelectLayer(%s)", ml->abbrev);
 			sprintf(chk, "ChkLayer(%s)", ml->abbrev);
 		}
-		pcb_snprintf(end, len_avail, "  %s", ml->name);
+		rnd_snprintf(end, len_avail, "  %s", ml->name);
 		rnd_gui->create_menu(rnd_gui, path, &props);
 	}
 
 	props.checked = NULL;
-	pcb_snprintf(end, len_avail, "[virtual]");
+	rnd_snprintf(end, len_avail, "[virtual]");
 	rnd_gui->create_menu(rnd_gui, path, &props);
 
 
@@ -118,7 +118,7 @@
 	/* have to go reverse to keep order because this will insert items */
 	for(sect = 0; sect < 2; sect++) {
 
-		pcb_snprintf(end, len_avail, "-");
+		rnd_snprintf(end, len_avail, "-");
 		props.foreground = NULL;
 		props.background = NULL;
 		props.checked = NULL;
@@ -152,7 +152,7 @@
 					sprintf(act, "SelectLayer(%ld)", lid+1);
 					sprintf(chk, "ChkLayer(%ld)", lid+1);
 				}
-				pcb_snprintf(end, len_avail, "  %s", l->name);
+				rnd_snprintf(end, len_avail, "  %s", l->name);
 				rnd_gui->create_menu(rnd_gui, path, &props);
 			}
 
@@ -159,7 +159,7 @@
 			props.foreground = NULL;
 			props.background = NULL;
 			props.checked = NULL;
-			pcb_snprintf(end, len_avail, "[%s]", g->name);
+			rnd_snprintf(end, len_avail, "[%s]", g->name);
 			rnd_gui->create_menu(rnd_gui, path, &props);
 		}
 	}
@@ -174,7 +174,7 @@
 	char *key = rnd_attribute_get(&l->Attributes, attrname);
 	if (key != NULL) {
 		keyprops->accel = key;
-		pcb_snprintf(end, len_avail, "%s %ld:%s", menu_prefix, lid+1, l->name);
+		rnd_snprintf(end, len_avail, "%s %ld:%s", menu_prefix, lid+1, l->name);
 		sprintf((char *)keyprops->action, "%s(%ld)", action_prefix, lid+1);
 		rnd_gui->create_menu(rnd_gui, path, keyprops);
 	}
Index: layersel.c
===================================================================
--- layersel.c	(revision 31006)
+++ layersel.c	(revision 31007)
@@ -459,11 +459,11 @@
 	char *p;
 	unsigned int w, line = 0, n;
 
-	pcb_snprintf(dst->buf[line++], 20, "%d %d 4 1", width, height);
+	rnd_snprintf(dst->buf[line++], 20, "%d %d 4 1", width, height);
 	strcpy(dst->buf[line++], ".	c None");
 	strcpy(dst->buf[line++], "u	c None");
 	strcpy(dst->buf[line++], "b	c #000000");
-	pcb_snprintf(dst->buf[line++], 20, "c	c #%02X%02X%02X", color->r, color->g, color->b);
+	rnd_snprintf(dst->buf[line++], 20, "c	c #%02X%02X%02X", color->r, color->g, color->b);
 
 	while (height--) {
 		w = width;
Index: status.c
===================================================================
--- status.c	(revision 31006)
+++ status.c	(revision 31007)
@@ -77,7 +77,7 @@
 		*kbd = '\0';
 
 
-	pcb_append_printf(&status.buf,
+	rnd_append_printf(&status.buf,
 	"%m+view=%s  "
 	"grid=%$mS  "
 	"line=%mS (%s%s) "
@@ -90,7 +90,7 @@
 
 static void build_st_line2(void)
 {
-	pcb_append_printf(&status.buf,
+	rnd_append_printf(&status.buf,
 		"via=%mS (%mS)  "
 		"clr=%mS  "
 		"text=%d%% %$mS "
@@ -116,7 +116,7 @@
 	else
 		unit_inv = unit_mm;
 
-	pcb_append_printf(&status.buf,
+	rnd_append_printf(&status.buf,
 		"%m+"
 		"grid=%$mS  "
 		"line=%mS "
@@ -173,12 +173,12 @@
 	/* coordinate readout (right side box) */
 	if (conf_core.appearance.compact) {
 		status.buf.used = 0;
-		pcb_append_printf(&status.buf, "%m+%-mS", rnd_conf.editor.grid_unit->allow, pcb_crosshair.X);
+		rnd_append_printf(&status.buf, "%m+%-mS", rnd_conf.editor.grid_unit->allow, pcb_crosshair.X);
 		hv.str = status.buf.array;
 		rnd_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd2[0], &hv);
 
 		status.buf.used = 0;
-		pcb_append_printf(&status.buf, "%m+%-mS", rnd_conf.editor.grid_unit->allow, pcb_crosshair.Y);
+		rnd_append_printf(&status.buf, "%m+%-mS", rnd_conf.editor.grid_unit->allow, pcb_crosshair.Y);
 		hv.str = status.buf.array;
 		rnd_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd2[1], &hv);
 		rnd_gui->attr_dlg_widget_hide(status.rdsub.dlg_hid_ctx, status.wrd2[1], 0);
@@ -185,7 +185,7 @@
 	}
 	else {
 		status.buf.used = 0;
-		pcb_append_printf(&status.buf, "%m+%-mS %-mS", rnd_conf.editor.grid_unit->allow, pcb_crosshair.X, pcb_crosshair.Y);
+		rnd_append_printf(&status.buf, "%m+%-mS %-mS", rnd_conf.editor.grid_unit->allow, pcb_crosshair.X, pcb_crosshair.Y);
 		hv.str = status.buf.array;
 		rnd_gui->attr_dlg_set_value(status.rdsub.dlg_hid_ctx, status.wrd2[0], &hv);
 		rnd_gui->attr_dlg_widget_hide(status.rdsub.dlg_hid_ctx, status.wrd2[1], 1);
@@ -202,14 +202,14 @@
 		double a = atan2(dy, dx) * RND_RAD_TO_DEG;
 
 		s1 = status.buf.array;
-		pcb_append_printf(&status.buf, "%m+r %-mS%c", rnd_conf.editor.grid_unit->allow, r, sep);
+		rnd_append_printf(&status.buf, "%m+r %-mS%c", rnd_conf.editor.grid_unit->allow, r, sep);
 		s2 = status.buf.array + status.buf.used;
-		pcb_append_printf(&status.buf, "phi %-.1f%c", a, sep);
+		rnd_append_printf(&status.buf, "phi %-.1f%c", a, sep);
 		s3 = status.buf.array + status.buf.used;
-		pcb_append_printf(&status.buf, "%m+ %-mS %-mS", rnd_conf.editor.grid_unit->allow, dx, dy);
+		rnd_append_printf(&status.buf, "%m+ %-mS %-mS", rnd_conf.editor.grid_unit->allow, dx, dy);
 	}
 	else {
-		pcb_append_printf(&status.buf, "r __.__%cphi __._%c__.__ __.__", sep, sep, sep);
+		rnd_append_printf(&status.buf, "r __.__%cphi __._%c__.__ __.__", sep, sep, sep);
 		s1 = status.buf.array;
 		s2 = status.buf.array + 8;
 		s3 = status.buf.array + 17;
Index: title.c
===================================================================
--- title.c	(revision 31006)
+++ title.c	(revision 31007)
@@ -52,7 +52,7 @@
 		filename = PCB->hidlib.filename;
 
 	title_buf.used = 0;
-	pcb_append_printf(&title_buf, "%s%s (%s) - %s - pcb-rnd", PCB->Changed ? "*" : "", name, filename, PCB->is_footprint ? "footprint" : "board");
+	rnd_append_printf(&title_buf, "%s%s (%s) - %s - pcb-rnd", PCB->Changed ? "*" : "", name, filename, PCB->is_footprint ? "footprint" : "board");
 	rnd_gui->set_top_title(rnd_gui, title_buf.array);
 }