Index: polycombine.c
===================================================================
--- polycombine.c	(revision 4988)
+++ polycombine.c	(revision 4989)
@@ -48,7 +48,7 @@
 
 	*forward = pcb_true;
 
-	if ((np = poly_Create()) == NULL)
+	if ((np = pcb_polyarea_create()) == NULL)
 		return NULL;
 
 	/* first make initial polygon contour */
@@ -79,9 +79,9 @@
 				pcb_poly_contour_inv(contour);
 			assert(contour->Flags.orient == (hole ? PLF_INV : PLF_DIR));
 
-			pcb_poly_contour_include(np, contour);
+			pcb_polyarea_contour_include(np, contour);
 			contour = NULL;
-			assert(poly_Valid(np));
+			assert(pcb_poly_valid(np));
 
 			hole++;
 		}
@@ -131,11 +131,11 @@
 {
 /*  int contours_isect;*/
 	/* Should check outer contours don't intersect? */
-/*  contours_isect = pcb_poly_touching(outer, inner);*/
+/*  contours_isect = pcb_polyarea_touching(outer, inner);*/
 	/* Cheat and assume simple single contour polygons for now */
 /*  return contours_isect ?
-           0 : poly_ContourInContour (outer->contours, inner->contours);*/
-	return poly_ContourInContour(outer->contours, inner->contours);
+           0 : pcb_poly_contour_in_contour(outer->contours, inner->contours);*/
+	return pcb_poly_contour_in_contour(outer->contours, inner->contours);
 }