Index: trunk/doc/developer/renames
===================================================================
--- trunk/doc/developer/renames	(revision 12228)
+++ trunk/doc/developer/renames	(revision 12229)
@@ -1747,3 +1747,5 @@
 DrawElementName -> pcb_elem_name_invalidate_draw
 DrawElement -> pcb_elem_invalidate_draw
 pcb_polygon_t -> pcb_poly_t
+pcb_polygon_s -> pcb_poly_s
+pcb_add_polygon_on_layer -> pcb_add_poly_on_layer
Index: trunk/src/global_typedefs.h
===================================================================
--- trunk/src/global_typedefs.h	(revision 12228)
+++ trunk/src/global_typedefs.h	(revision 12229)
@@ -40,7 +40,7 @@
 typedef struct pcb_point_s pcb_point_t;
 typedef struct pcb_rat_line_s pcb_rat_t;
 
-typedef struct pcb_polygon_s pcb_poly_t;
+typedef struct pcb_poly_s pcb_poly_t;
 typedef struct pcb_pad_s pcb_pad_t;
 typedef struct pcb_padstack_s pcb_padstack_t;
 typedef struct pcb_pin_s pcb_pin_t;
Index: trunk/src/obj_poly.c
===================================================================
--- trunk/src/obj_poly.c	(revision 12228)
+++ trunk/src/obj_poly.c	(revision 12229)
@@ -206,7 +206,7 @@
 	pcb_poly_point_new(polygon, X2, Y2);
 	pcb_poly_point_new(polygon, X1, Y2);
 
-	pcb_add_polygon_on_layer(Layer, polygon);
+	pcb_add_poly_on_layer(Layer, polygon);
 	return (polygon);
 }
 
@@ -230,13 +230,13 @@
 
 	pcb_poly_contours_free(&it.cntr);
 
-	pcb_add_polygon_on_layer(Layer, polygon);
+	pcb_add_poly_on_layer(Layer, polygon);
 	return (polygon);
 }
 
 
 
-void pcb_add_polygon_on_layer(pcb_layer_t *Layer, pcb_poly_t *polygon)
+void pcb_add_poly_on_layer(pcb_layer_t *Layer, pcb_poly_t *polygon)
 {
 	pcb_poly_bbox(polygon);
 	if (!Layer->polygon_tree)
@@ -274,7 +274,7 @@
 	pcb_board_t *pcb;
 	pcb_poly_t *p = pcb_poly_new(dst, src->Clearance, src->Flags);
 	pcb_poly_copy(p, src, 0, 0);
-	pcb_add_polygon_on_layer(dst, p);
+	pcb_add_poly_on_layer(dst, p);
 	pcb_poly_copy_meta(p, src);
 
 	pcb = pcb_data_get_top(dst->parent);
@@ -288,7 +288,7 @@
 	pcb_board_t *pcb;
 	pcb_poly_t *p = pcb_poly_new(dst, src->Clearance, src->Flags);
 	pcb_poly_copy(p, src, dx, dy);
-	pcb_add_polygon_on_layer(dst, p);
+	pcb_add_poly_on_layer(dst, p);
 	pcb_poly_copy_meta(p, src);
 
 	pcb = pcb_data_get_top(dst->parent);
@@ -646,7 +646,7 @@
 	pcb_r_search(PCB->Data->pin_tree, &Polygon->BoundingBox, NULL, mptl_pin_callback, &d, NULL);
 	d.type = PCB_TYPE_VIA;
 	pcb_r_search(PCB->Data->via_tree, &Polygon->BoundingBox, NULL, mptl_pin_callback, &d, NULL);
-	newone = (struct pcb_polygon_s *) pcb_polyop_move_to_layer_low(ctx, Layer, Polygon, ctx->move.dst_layer);
+	newone = (struct pcb_poly_s *) pcb_polyop_move_to_layer_low(ctx, Layer, Polygon, ctx->move.dst_layer);
 	pcb_poly_init_clip(PCB->Data, ctx->move.dst_layer, newone);
 	if (ctx->move.dst_layer->meta.real.vis) {
 		pcb_poly_invalidate_draw(ctx->move.dst_layer, newone);
Index: trunk/src/obj_poly.h
===================================================================
--- trunk/src/obj_poly.h	(revision 12228)
+++ trunk/src/obj_poly.h	(revision 12229)
@@ -32,7 +32,7 @@
 #include "obj_common.h"
 #include "polyarea.h"
 
-struct pcb_polygon_s  {           /* holds information about a polygon */
+struct pcb_poly_s  {           /* holds information about a polygon */
 	PCB_ANYOBJECTFIELDS;
 	pcb_coord_t Clearance;
 	pcb_cardinal_t PointN;       /* number of points in polygon */
@@ -74,7 +74,7 @@
 pcb_poly_t *pcb_poly_copy(pcb_poly_t *Dest, pcb_poly_t *Src, pcb_coord_t dx, pcb_coord_t dy);
 
 /* Add objects without creating them or making any "sanity modifications" to them */
-void pcb_add_polygon_on_layer(pcb_layer_t *Layer, pcb_poly_t *polygon);
+void pcb_add_poly_on_layer(pcb_layer_t *Layer, pcb_poly_t *polygon);
 
 double pcb_poly_area(const pcb_poly_t *poly);
 
Index: trunk/src/obj_subc.c
===================================================================
--- trunk/src/obj_subc.c	(revision 12228)
+++ trunk/src/obj_subc.c	(revision 12229)
@@ -197,7 +197,7 @@
 	pcb_attribute_copy_all(&poly->Attributes, &line->Attributes);
 
 	pcb_poly_init_clip(dst->parent, dst, poly);
-	pcb_add_polygon_on_layer(dst, poly);
+	pcb_add_poly_on_layer(dst, poly);
 
 	return poly;
 }
Index: trunk/src/polygon.c
===================================================================
--- trunk/src/polygon.c	(revision 12228)
+++ trunk/src/polygon.c	(revision 12229)
@@ -1539,7 +1539,7 @@
 
 	memset(&pcb_crosshair.AttachedPolygon, 0, sizeof(pcb_poly_t));
 
-	pcb_add_polygon_on_layer(CURRENT, polygon);
+	pcb_add_poly_on_layer(CURRENT, polygon);
 
 	pcb_poly_init_clip(PCB->Data, CURRENT, polygon);
 	pcb_poly_invalidate_draw(CURRENT, polygon);
Index: trunk/src_plugins/autoroute/autoroute.c
===================================================================
--- trunk/src_plugins/autoroute/autoroute.c	(revision 12228)
+++ trunk/src_plugins/autoroute/autoroute.c	(revision 12229)
@@ -1011,7 +1011,7 @@
 							rb =
 								AddPolygon(layergroupboxes,
 													 pcb_layer_id(PCB->Data, (pcb_layer_t *) connection->ptr1),
-													 (struct pcb_polygon_s *) connection->obj, rd->styles[j]);
+													 (struct pcb_poly_s *) connection->obj, rd->styles[j]);
 							break;
 						}
 					assert(rb);
Index: trunk/src_plugins/fontmode/fontmode.c
===================================================================
--- trunk/src_plugins/fontmode/fontmode.c	(revision 12228)
+++ trunk/src_plugins/fontmode/fontmode.c	(revision 12229)
@@ -88,7 +88,7 @@
 	pcb_poly_copy(np, poly, ox, oy);
 
 	/* add */
-	pcb_add_polygon_on_layer(layer, np);
+	pcb_add_poly_on_layer(layer, np);
 	pcb_poly_init_clip(PCB->Data, layer, np);
 	pcb_poly_invalidate_draw(layer, np);
 }
Index: trunk/src_plugins/io_autotrax/read.c
===================================================================
--- trunk/src_plugins/io_autotrax/read.c	(revision 12228)
+++ trunk/src_plugins/io_autotrax/read.c	(revision 12229)
@@ -700,7 +700,7 @@
 		pcb_poly_point_new(polygon, X2, Y1);
 		pcb_poly_point_new(polygon, X2, Y2);
 		pcb_poly_point_new(polygon, X1, Y2);
-		pcb_add_polygon_on_layer(&st->pcb->Data->Layer[PCB_layer], polygon);
+		pcb_add_poly_on_layer(&st->pcb->Data->Layer[PCB_layer], polygon);
 		pcb_poly_init_clip(st->pcb->Data, &st->pcb->Data->Layer[PCB_layer], polygon);
 		return 1;
 	} else if (polygon == NULL && el != NULL && st != NULL && PCB_layer == 1 ) { /* in an element, top layer copper */
Index: trunk/src_plugins/io_eagle/read.c
===================================================================
--- trunk/src_plugins/io_eagle/read.c	(revision 12228)
+++ trunk/src_plugins/io_eagle/read.c	(revision 12229)
@@ -1096,7 +1096,7 @@
 		}
 	}
 
-	pcb_add_polygon_on_layer(&st->pcb->Data->Layer[ly->ly], poly);
+	pcb_add_poly_on_layer(&st->pcb->Data->Layer[ly->ly], poly);
 	pcb_poly_init_clip(st->pcb->Data, &st->pcb->Data->Layer[ly->ly], poly);
 
 	return 0;
Index: trunk/src_plugins/io_kicad/read.c
===================================================================
--- trunk/src_plugins/io_kicad/read.c	(revision 12228)
+++ trunk/src_plugins/io_kicad/read.c	(revision 12229)
@@ -2234,7 +2234,7 @@
 	required = BV(10);
 	if ((tally & required) == required) {  /* has location, layer, size and stroke thickness at a minimum */
 		if (polygon != NULL) {
-			pcb_add_polygon_on_layer(&st->pcb->Data->Layer[PCBLayer], polygon);
+			pcb_add_poly_on_layer(&st->pcb->Data->Layer[PCBLayer], polygon);
 			pcb_poly_init_clip(st->pcb->Data, &st->pcb->Data->Layer[PCBLayer], polygon);
 		}
 		return 0;
Index: trunk/src_plugins/io_lihata/read.c
===================================================================
--- trunk/src_plugins/io_lihata/read.c	(revision 12228)
+++ trunk/src_plugins/io_lihata/read.c	(revision 12229)
@@ -556,7 +556,7 @@
 		}
 	}
 
-	pcb_add_polygon_on_layer(ly, poly);
+	pcb_add_poly_on_layer(ly, poly);
 	pcb_poly_init_clip(ly->parent, ly, poly);
 
 	return 0;
Index: trunk/src_plugins/lib_polyhelp/topoly.c
===================================================================
--- trunk/src_plugins/lib_polyhelp/topoly.c	(revision 12228)
+++ trunk/src_plugins/lib_polyhelp/topoly.c	(revision 12229)
@@ -228,7 +228,7 @@
 	}
 
 	if (!(how & PCB_TOPOLY_FLOATING)) {
-		pcb_add_polygon_on_layer(layer, poly);
+		pcb_add_poly_on_layer(layer, poly);
 		pcb_poly_init_clip(pcb->Data, layer, poly);
 		pcb_poly_invalidate_draw(layer, poly);
 #warning TODO: use pcb_board_set_changed_flag(), but decouple that from PCB