Index: trunk/doc-rnd/hacking/renames
===================================================================
--- trunk/doc-rnd/hacking/renames	(revision 4914)
+++ trunk/doc-rnd/hacking/renames	(revision 4915)
@@ -464,3 +464,4 @@
 GetNum -> pcb_get_num
 Concat -> pcb_concat
 StripWhiteSpaceAndDup -> pcb_strdup_strip_wspace
+MoveLayer -> pcb_layer_move
Index: trunk/src/layer.c
===================================================================
--- trunk/src/layer.c	(revision 4914)
+++ trunk/src/layer.c	(revision 4915)
@@ -922,7 +922,7 @@
 	return (pcb_true);
 }
 
-int MoveLayer(int old_index, int new_index)
+int pcb_layer_move(int old_index, int new_index)
 {
 	int groups[MAX_LAYER + 2], l, g;
 	pcb_layer_t saved_layer;
Index: trunk/src/layer.h
===================================================================
--- trunk/src/layer.h	(revision 4914)
+++ trunk/src/layer.h	(revision 4915)
@@ -228,6 +228,6 @@
 /* index is 0..MAX_LAYER-1.  If old_index is -1, a new layer is
    inserted at that index.  If new_index is -1, the specified layer is
    deleted.  Returns non-zero on error, zero if OK.  */
-int MoveLayer(int old_index, int new_index);
+int pcb_layer_move(int old_index, int new_index);
 
 #endif
Index: trunk/src/move.c
===================================================================
--- trunk/src/move.c	(revision 4914)
+++ trunk/src/move.c	(revision 4915)
@@ -246,7 +246,7 @@
 	else
 		new_index = atoi(argv[1]);
 
-	if (MoveLayer(old_index, new_index))
+	if (pcb_layer_move(old_index, new_index))
 		return 1;
 
 	if (new_index == -1) {
Index: trunk/src/undo.c
===================================================================
--- trunk/src/undo.c	(revision 4914)
+++ trunk/src/undo.c	(revision 4915)
@@ -819,7 +819,7 @@
 	l->new_index = l->old_index;
 	l->old_index = tmp;
 
-	if (MoveLayer(l->old_index, l->new_index))
+	if (pcb_layer_move(l->old_index, l->new_index))
 		return pcb_false;
 	else
 		return pcb_true;
Index: trunk/src_plugins/fontmode/fontmode.c
===================================================================
--- trunk/src_plugins/fontmode/fontmode.c	(revision 4914)
+++ trunk/src_plugins/fontmode/fontmode.c	(revision 4915)
@@ -87,7 +87,7 @@
 	MoveLayerToGroup(max_copper_layer + SOLDER_LAYER, 1);
 
 	while (PCB->Data->LayerN > 4)
-		MoveLayer(4, -1);
+		pcb_layer_move(4, -1);
 	for (l = 0; l < 4; l++) {
 		MoveLayerToGroup(l, l);
 	}