Index: trunk/doc/developer/renames
===================================================================
--- trunk/doc/developer/renames	(revision 16247)
+++ trunk/doc/developer/renames	(revision 16248)
@@ -1757,3 +1757,10 @@
 PCB_OBJ_RATLINE -> PCB_OBJ_RAT
 PCB_OBJ_SUBC_FLOATER -> PCB_OBJ_FLOATER
 PCB_TYPEMASK_ -> PCB_OBJ_CLASS_
+XORDrawAttachedLine -> pcb_xordraw_attached_line
+XORPolygon -> pcb_xordraw_poly
+XORPolygon_subc -> pcb_xordraw_poly_subc
+XORDrawAttachedArc -> pcb_xordraw_attached_arc
+XORDrawBuffer -> pcb_xordraw_buffer
+XORDrawMoveOrCopy -> pcb_xordraw_movecopy
+XORDrawInsertPointObject -> pcb_xordraw_insert_pt_obj
Index: trunk/src/crosshair.c
===================================================================
--- trunk/src/crosshair.c	(revision 16247)
+++ trunk/src/crosshair.c	(revision 16248)
@@ -76,7 +76,7 @@
 /* ---------------------------------------------------------------------------
  * creates a tmp polygon with coordinates converted to screen system
  */
-void XORPolygon(pcb_poly_t *polygon, pcb_coord_t dx, pcb_coord_t dy, int dash_last)
+void pcb_xordraw_poly(pcb_poly_t *polygon, pcb_coord_t dx, pcb_coord_t dy, int dash_last)
 {
 	pcb_cardinal_t i;
 	for (i = 0; i < polygon->PointN; i++) {
@@ -105,7 +105,7 @@
  * creates a tmp polygon with coordinates converted to screen system, designed
  * for subc paste xor-draw
  */
-void XORPolygon_subc(pcb_poly_t *polygon, pcb_coord_t dx, pcb_coord_t dy, pcb_coord_t w, pcb_coord_t h, int mirr)
+void pcb_xordraw_poly_subc(pcb_poly_t *polygon, pcb_coord_t dx, pcb_coord_t dy, pcb_coord_t w, pcb_coord_t h, int mirr)
 {
 	pcb_cardinal_t i;
 	for (i = 0; i < polygon->PointN; i++) {
@@ -128,7 +128,7 @@
 /*-----------------------------------------------------------
  * Draws the outline of an attached arc
  */
-void XORDrawAttachedArc(pcb_coord_t thick)
+void pcb_xordraw_attached_arc(pcb_coord_t thick)
 {
 	pcb_arc_t arc;
 	pcb_coord_t wx, wy;
@@ -163,7 +163,7 @@
 /* ---------------------------------------------------------------------------
  * draws all visible and attached objects of the pastebuffer
  */
-void XORDrawBuffer(pcb_buffer_t *Buffer)
+void pcb_xordraw_buffer(pcb_buffer_t *Buffer)
 {
 	pcb_cardinal_t i;
 	pcb_coord_t x, y;
@@ -203,7 +203,7 @@
 			 */
 			PCB_POLY_LOOP(layer);
 			{
-				XORPolygon(polygon, x, y, 0);
+				pcb_xordraw_poly(polygon, x, y, 0);
 			}
 			PCB_END_LOOP;
 		}
@@ -227,7 +227,7 @@
 /* ---------------------------------------------------------------------------
  * draws the rubberband to insert points into polygons/lines/...
  */
-void XORDrawInsertPointObject(void)
+void pcb_xordraw_insert_pt_obj(void)
 {
 	pcb_line_t *line = (pcb_line_t *) pcb_crosshair.AttachedObject.Ptr2;
 	pcb_point_t *point = (pcb_point_t *) pcb_crosshair.AttachedObject.Ptr3;
@@ -241,7 +241,7 @@
 /* ---------------------------------------------------------------------------
  * draws the attached object while in PCB_MODE_MOVE or PCB_MODE_COPY
  */
-void XORDrawMoveOrCopy(void)
+void pcb_xordraw_movecopy(void)
 {
 	pcb_coord_t dx = pcb_crosshair.X - pcb_crosshair.AttachedObject.X;
 	pcb_coord_t dy = pcb_crosshair.Y - pcb_crosshair.AttachedObject.Y;
@@ -325,7 +325,7 @@
 			/* the tmp polygon has n+1 points because the first
 			 * and the last one are set to the same coordinates
 			 */
-			XORPolygon(polygon, dx, dy, 0);
+			pcb_xordraw_poly(polygon, dx, dy, 0);
 			break;
 		}
 
Index: trunk/src/crosshair.h
===================================================================
--- trunk/src/crosshair.h	(revision 16247)
+++ trunk/src/crosshair.h	(revision 16248)
@@ -125,13 +125,13 @@
 
 
 /*** utility for plugins ***/
-void XORDrawAttachedLine(pcb_coord_t, pcb_coord_t, pcb_coord_t, pcb_coord_t, pcb_coord_t);
-void XORPolygon(pcb_poly_t *polygon, pcb_coord_t dx, pcb_coord_t dy, int dash_last);
-void XORPolygon_subc(pcb_poly_t *polygon, pcb_coord_t dx, pcb_coord_t dy, pcb_coord_t w, pcb_coord_t h, int mirr);
-void XORDrawAttachedArc(pcb_coord_t thick);
-void XORDrawBuffer(pcb_buffer_t *Buffer);
-void XORDrawMoveOrCopy(void);
-void XORDrawInsertPointObject(void);
+void pcb_xordraw_attached_line(pcb_coord_t, pcb_coord_t, pcb_coord_t, pcb_coord_t, pcb_coord_t);
+void pcb_xordraw_poly(pcb_poly_t *polygon, pcb_coord_t dx, pcb_coord_t dy, int dash_last);
+void pcb_xordraw_poly_subc(pcb_poly_t *polygon, pcb_coord_t dx, pcb_coord_t dy, pcb_coord_t w, pcb_coord_t h, int mirr);
+void pcb_xordraw_attached_arc(pcb_coord_t thick);
+void pcb_xordraw_buffer(pcb_buffer_t *Buffer);
+void pcb_xordraw_movecopy(void);
+void pcb_xordraw_insert_pt_obj(void);
 
 
 
Index: trunk/src/obj_subc.c
===================================================================
--- trunk/src/obj_subc.c	(revision 16247)
+++ trunk/src/obj_subc.c	(revision 16248)
@@ -633,7 +633,7 @@
 		}
 
 		polylist_foreach(&ly->Polygon, &it, poly)
-			XORPolygon_subc(poly, DX, DY, w, h, mirr);
+			pcb_xordraw_poly_subc(poly, DX, DY, w, h, mirr);
 
 		textlist_foreach(&ly->Text, &it, text) {
 			if (mirr) {
Index: trunk/src/tool_arc.c
===================================================================
--- trunk/src/tool_arc.c	(revision 16247)
+++ trunk/src/tool_arc.c	(revision 16248)
@@ -112,10 +112,10 @@
 void pcb_tool_arc_draw_attached(void)
 {
 	if (pcb_crosshair.AttachedBox.State != PCB_CH_STATE_FIRST) {
-		XORDrawAttachedArc(conf_core.design.line_thickness);
+		pcb_xordraw_attached_arc(conf_core.design.line_thickness);
 		if (conf_core.editor.show_drc) {
 			pcb_gui->set_color(pcb_crosshair.GC, conf_core.appearance.color.cross);
-			XORDrawAttachedArc(conf_core.design.line_thickness + 2 * (conf_core.design.bloat + 1));
+			pcb_xordraw_attached_arc(conf_core.design.line_thickness + 2 * (conf_core.design.bloat + 1));
 			pcb_gui->set_color(pcb_crosshair.GC, conf_core.appearance.color.crosshair);
 		}
 	}
Index: trunk/src/tool_buffer.c
===================================================================
--- trunk/src/tool_buffer.c	(revision 16247)
+++ trunk/src/tool_buffer.c	(revision 16248)
@@ -87,7 +87,7 @@
 
 void pcb_tool_buffer_draw_attached(void)
 {
-	XORDrawBuffer(PCB_PASTEBUFFER);
+	pcb_xordraw_buffer(PCB_PASTEBUFFER);
 }
 
 pcb_tool_t pcb_tool_buffer = {
Index: trunk/src/tool_copy.c
===================================================================
--- trunk/src/tool_copy.c	(revision 16247)
+++ trunk/src/tool_copy.c	(revision 16248)
@@ -90,7 +90,7 @@
 
 void pcb_tool_copy_draw_attached(void)
 {
-	XORDrawMoveOrCopy();
+	pcb_xordraw_movecopy();
 }
 
 pcb_bool pcb_tool_copy_undo_act(void)
Index: trunk/src/tool_insert.c
===================================================================
--- trunk/src/tool_insert.c	(revision 16247)
+++ trunk/src/tool_insert.c	(revision 16248)
@@ -114,7 +114,7 @@
 
 void pcb_tool_insert_draw_attached(void)
 {
-	XORDrawInsertPointObject();
+	pcb_xordraw_insert_pt_obj();
 }
 
 pcb_bool pcb_tool_insert_undo_act(void)
Index: trunk/src/tool_move.c
===================================================================
--- trunk/src/tool_move.c	(revision 16247)
+++ trunk/src/tool_move.c	(revision 16248)
@@ -92,7 +92,7 @@
 
 void pcb_tool_move_draw_attached(void)
 {
-	XORDrawMoveOrCopy();
+	pcb_xordraw_movecopy();
 }
 
 pcb_bool pcb_tool_move_undo_act(void)
Index: trunk/src/tool_poly.c
===================================================================
--- trunk/src/tool_poly.c	(revision 16247)
+++ trunk/src/tool_poly.c	(revision 16248)
@@ -115,7 +115,7 @@
 
 	/* draw attached polygon only if in PCB_MODE_POLYGON or PCB_MODE_POLYGON_HOLE */
 	if (pcb_crosshair.AttachedPolygon.PointN > 1) {
-		XORPolygon(&pcb_crosshair.AttachedPolygon, 0, 0, 1);
+		pcb_xordraw_poly(&pcb_crosshair.AttachedPolygon, 0, 0, 1);
 	}
 }
 
Index: trunk/src/tool_polyhole.c
===================================================================
--- trunk/src/tool_polyhole.c	(revision 16247)
+++ trunk/src/tool_polyhole.c	(revision 16248)
@@ -146,7 +146,7 @@
 
 	/* draw attached polygon only if in PCB_MODE_POLYGON or PCB_MODE_POLYGON_HOLE */
 	if (pcb_crosshair.AttachedPolygon.PointN > 1) {
-		XORPolygon(&pcb_crosshair.AttachedPolygon, 0, 0, 1);
+		pcb_xordraw_poly(&pcb_crosshair.AttachedPolygon, 0, 0, 1);
 	}
 }