Index: trunk/doc-rnd/hacking/renames
===================================================================
--- trunk/doc-rnd/hacking/renames	(revision 4845)
+++ trunk/doc-rnd/hacking/renames	(revision 4846)
@@ -181,3 +181,5 @@
 PASTEBUFFER -> PCB_PASTEBUFFER
 QuitApplication -> pcb_quit_app
 GetInfoString -> pcb_get_infostr
+ChangeLayoutName -> pcb_board_change_name
+ChangeLayerName -> pcb_layer_change_name
Index: trunk/src/change.c
===================================================================
--- trunk/src/change.c	(revision 4845)
+++ trunk/src/change.c	(revision 4846)
@@ -351,7 +351,7 @@
 /* ---------------------------------------------------------------------------
  * changes the name of a layout; memory has to be already allocated
  */
-pcb_bool ChangeLayoutName(char *Name)
+pcb_bool pcb_board_change_name(char *Name)
 {
 	free(PCB->Name);
 	PCB->Name = Name;
@@ -363,7 +363,7 @@
 /* ---------------------------------------------------------------------------
  * changes the name of a layer; memory has to be already allocated
  */
-pcb_bool ChangeLayerName(pcb_layer_t *Layer, char *Name)
+pcb_bool pcb_layer_change_name(pcb_layer_t *Layer, char *Name)
 {
 	free((char*)CURRENT->Name);
 	CURRENT->Name = Name;
Index: trunk/src/change.h
===================================================================
--- trunk/src/change.h	(revision 4845)
+++ trunk/src/change.h	(revision 4846)
@@ -66,8 +66,8 @@
 #define CHANGEMASKSIZE_TYPES    \
         (PCB_TYPE_PIN | PCB_TYPE_VIA | PCB_TYPE_PAD)
 
-pcb_bool ChangeLayoutName(char *);
-pcb_bool ChangeLayerName(pcb_layer_t *, char *);
+pcb_bool pcb_board_change_name(char *);
+pcb_bool pcb_layer_change_name(pcb_layer_t *, char *);
 pcb_bool ChangeSelectedSize(int, pcb_coord_t, pcb_bool);
 pcb_bool ChangeSelectedClearSize(int, pcb_coord_t, pcb_bool);
 pcb_bool ChangeSelected2ndSize(int, pcb_coord_t, pcb_bool);
Index: trunk/src/change_act.c
===================================================================
--- trunk/src/change_act.c	(revision 4845)
+++ trunk/src/change_act.c	(revision 4846)
@@ -692,7 +692,7 @@
 		case F_Layout:
 			name = gui->prompt_for(_("Enter the layout name:"), EMPTY(PCB->Name));
 			/* NB: ChangeLayoutName takes ownership of the passed memory */
-			if (name && ChangeLayoutName(name))
+			if (name && pcb_board_change_name(name))
 				SetChangedFlag(pcb_true);
 			break;
 
@@ -700,7 +700,7 @@
 		case F_Layer:
 			name = gui->prompt_for(_("Enter the layer name:"), EMPTY(CURRENT->Name));
 			/* NB: ChangeLayerName takes ownership of the passed memory */
-			if (name && ChangeLayerName(CURRENT, name))
+			if (name && pcb_layer_change_name(CURRENT, name))
 				SetChangedFlag(pcb_true);
 			break;
 		}