Index: trunk/doc-rnd/hacking/renames
===================================================================
--- trunk/doc-rnd/hacking/renames	(revision 5328)
+++ trunk/doc-rnd/hacking/renames	(revision 5329)
@@ -1494,3 +1494,5 @@
 h_coordox -> pcb_hash_element_ox
 h_coordoy -> pcb_hash_element_oy
 h_coord -> pcb_hash_coord
+pcb_buffer_swap -> pcb_buffer_flip_side
+pcb_swap_buffers -> pcb_buffers_flip_side
Index: trunk/src/buffer.c
===================================================================
--- trunk/src/buffer.c	(revision 5328)
+++ trunk/src/buffer.c	(revision 5329)
@@ -428,7 +428,7 @@
 /* ---------------------------------------------------------------------------
  * flip components/tracks from one side to the other
  */
-void pcb_buffer_swap(pcb_buffer_t *Buffer)
+void pcb_buffer_flip_side(pcb_buffer_t *Buffer)
 {
 	int j, k;
 	pcb_cardinal_t sgroup, cgroup;
@@ -545,12 +545,12 @@
 	pcb_set_buffer_bbox(Buffer);
 }
 
-void pcb_swap_buffers(void)
+void pcb_buffers_flip_side(void)
 {
 	int i;
 
 	for (i = 0; i < PCB_MAX_BUFFER; i++)
-		pcb_buffer_swap(&pcb_buffers[i]);
+		pcb_buffer_flip_side(&pcb_buffers[i]);
 	pcb_crosshair_range_to_buffer();
 }
 
Index: trunk/src/buffer.h
===================================================================
--- trunk/src/buffer.h	(revision 5328)
+++ trunk/src/buffer.h	(revision 5329)
@@ -41,7 +41,7 @@
 /* ---------------------------------------------------------------------------
  * prototypes
  */
-void pcb_buffer_swap(pcb_buffer_t *Buffer);
+void pcb_buffer_flip_side(pcb_buffer_t *Buffer);
 void pcb_set_buffer_bbox(pcb_buffer_t *);
 void pcb_buffer_clear(pcb_buffer_t *);
 void pcb_buffer_add_selected(pcb_buffer_t *, pcb_coord_t, pcb_coord_t, pcb_bool);
@@ -48,7 +48,7 @@
 pcb_bool pcb_buffer_load_layout(pcb_buffer_t *Buffer, const char *Filename, const char *fmt);
 void pcb_buffer_rotate(pcb_buffer_t *, pcb_uint8_t);
 void pcb_buffer_select_paste(int);
-void pcb_swap_buffers(void);
+void pcb_buffers_flip_side(void);
 void pcb_buffer_mirror(pcb_buffer_t *);
 void pcb_init_buffers(void);
 void pcb_uninit_buffers(void);
Index: trunk/src/obj_elem.c
===================================================================
--- trunk/src/obj_elem.c	(revision 5328)
+++ trunk/src/obj_elem.c	(revision 5329)
@@ -129,7 +129,7 @@
 	pcb_buffer_clear(Buffer);
 	if (!pcb_parse_element(Buffer->Data, Name)) {
 		if (conf_core.editor.show_solder_side)
-			pcb_buffer_swap(Buffer);
+			pcb_buffer_flip_side(Buffer);
 		pcb_set_buffer_bbox(Buffer);
 		if (elementlist_length(&Buffer->Data->Element)) {
 			element = elementlist_first(&Buffer->Data->Element);
Index: trunk/src/plug_io.c
===================================================================
--- trunk/src/plug_io.c	(revision 5328)
+++ trunk/src/plug_io.c	(revision 5329)
@@ -549,10 +549,10 @@
 	int result;
 
 	if (PCB_SWAP_IDENT)
-		pcb_swap_buffers();
+		pcb_buffers_flip_side();
 	result = pcb_write_pipe(Filename, pcb_false, fmt);
 	if (PCB_SWAP_IDENT)
-		pcb_swap_buffers();
+		pcb_buffers_flip_side();
 	return (result);
 }