Index: trunk/src/draw.c
===================================================================
--- trunk/src/draw.c	(revision 8418)
+++ trunk/src/draw.c	(revision 8419)
@@ -435,15 +435,15 @@
 	grp = pcb_get_layergrp(PCB, gid);
 
 	if ((grp == NULL) || (grp->len == 0)) { /* fallback: no layers -> original code: draw a single auto-sub */
-		mask_init(thin, screen, 1);
-		mask_start_sub(thin, screen);
+		comp_init(thin, screen, 1);
+		comp_start_sub(thin, screen);
 		pcb_draw_mask_auto(side, screen);
-		mask_start_add(thin, screen);
+		comp_start_add(thin, screen);
 	}
 	else { /* generic multi-layer rendering */
 		int n, adding = -1;
 		pcb_layer_t *l = pcb_get_layer(grp->lid[0]);
-		mask_init(thin, screen, (l->comb & PCB_LYC_SUB));
+		comp_init(thin, screen, (l->comb & PCB_LYC_SUB));
 
 		for(n = 0; n < grp->len; n++) {
 			int want_add;
@@ -452,9 +452,9 @@
 			want_add = !(l->comb & PCB_LYC_SUB);
 			if (want_add != adding) {
 				if (want_add)
-					mask_start_add(thin, screen);
+					comp_start_add(thin, screen);
 				else
-					mask_start_sub(thin, screen);
+					comp_start_sub(thin, screen);
 				adding = want_add;
 			}
 
@@ -474,9 +474,9 @@
 				pcb_draw_mask_auto(side, screen);
 		}
 		if (!adding)
-			mask_start_add(thin, screen);
+			comp_start_add(thin, screen);
 	}
-	mask_finish(thin, screen);
+	comp_finish(thin, screen);
 }
 
 static void DrawRats(const pcb_box_t * drawn_area)
Index: trunk/src/draw_composite.c
===================================================================
--- trunk/src/draw_composite.c	(revision 8418)
+++ trunk/src/draw_composite.c	(revision 8419)
@@ -27,7 +27,7 @@
 /* Local functions to draw a layer group as a composite of logical layers
    using positive and negative draw operations. Included from draw.c. */
 
-static void mask_start_sub_(int thin, const pcb_box_t *screen)
+static void comp_start_sub_(int thin, const pcb_box_t *screen)
 {
 	if (thin)
 		pcb_gui->set_color(Output.pmGC, conf_core.appearance.color.mask);
@@ -35,7 +35,7 @@
 		pcb_gui->use_mask(HID_MASK_CLEAR);
 }
 
-static void mask_start_add_(int thin, const pcb_box_t *screen)
+static void comp_start_add_(int thin, const pcb_box_t *screen)
 {
 	if (thin)
 		pcb_gui->set_color(Output.pmGC, "erase");
@@ -43,23 +43,23 @@
 		pcb_gui->use_mask(HID_MASK_SET);
 }
 
-static void mask_start_sub(int thin, const pcb_box_t *screen)
+static void comp_start_sub(int thin, const pcb_box_t *screen)
 {
 	if (pcb_gui->mask_invert)
-		mask_start_add_(thin, screen);
+		comp_start_add_(thin, screen);
 	else
-		mask_start_sub_(thin, screen);
+		comp_start_sub_(thin, screen);
 }
 
-static void mask_start_add(int thin, const pcb_box_t *screen)
+static void comp_start_add(int thin, const pcb_box_t *screen)
 {
 	if (pcb_gui->mask_invert)
-		mask_start_sub_(thin, screen);
+		comp_start_sub_(thin, screen);
 	else
-		mask_start_add_(thin, screen);
+		comp_start_add_(thin, screen);
 }
 
-static void mask_finish(int thin, const pcb_box_t *screen)
+static void comp_finish(int thin, const pcb_box_t *screen)
 {
 	if (!thin) {
 		pcb_gui->use_mask(HID_MASK_AFTER);
@@ -68,7 +68,7 @@
 	}
 }
 
-static void mask_init(int thin, const pcb_box_t *screen, int negative)
+static void comp_init(int thin, const pcb_box_t *screen, int negative)
 {
 	pcb_gui->use_mask(HID_MASK_INIT);