Index: trunk/doc-rnd/hacking/renames
===================================================================
--- trunk/doc-rnd/hacking/renames	(revision 4970)
+++ trunk/doc-rnd/hacking/renames	(revision 4971)
@@ -596,3 +596,6 @@
 SILKPOLYGON_LOOP -> PCB_POLY_SILK_LOOP
 VISIBLEPOLYGON_LOOP -> PCB_POLY_VISIBLE_LOOP
 POLYGON_LOOP -> PCB_POLY_LOOP
+ALLTEXT_LOOP -> PCB_TEXT_ALL_LOOP
+VISIBLETEXT_LOOP -> PCB_TEXT_VISIBLE_LOOP
+TEXT_LOOP -> PCB_TEXT_LOOP
Index: trunk/src/buffer.c
===================================================================
--- trunk/src/buffer.c	(revision 4970)
+++ trunk/src/buffer.c	(revision 4971)
@@ -256,7 +256,7 @@
 		r_insert_entry(layer->arc_tree, (pcb_box_t *) arc, 0);
 	}
 	ENDALL_LOOP;
-	ALLTEXT_LOOP(Buffer->Data);
+	PCB_TEXT_ALL_LOOP(Buffer->Data);
 	{
 		r_delete_entry(layer->text_tree, (pcb_box_t *) text);
 		pcb_text_rotate90(text, Buffer->X, Buffer->Y, Number);
@@ -519,7 +519,7 @@
 		/* hmmm, how to handle clip */
 	}
 	ENDALL_LOOP;
-	ALLTEXT_LOOP(Buffer->Data);
+	PCB_TEXT_ALL_LOOP(Buffer->Data);
 	{
 		r_delete_entry(layer->text_tree, (pcb_box_t *) text);
 		text->X = PCB_SWAP_X(text->X);
@@ -648,7 +648,7 @@
 				CopyArc(&ctx, destlayer, arc);
 			}
 			END_LOOP;
-			TEXT_LOOP(sourcelayer);
+			PCB_TEXT_LOOP(sourcelayer);
 			{
 				CopyText(&ctx, destlayer, text);
 			}
Index: trunk/src/crosshair.c
===================================================================
--- trunk/src/crosshair.c	(revision 4970)
+++ trunk/src/crosshair.c	(revision 4971)
@@ -303,7 +303,7 @@
 				gui->draw_arc(Crosshair.GC, x + arc->X, y + arc->Y, arc->Width, arc->Height, arc->StartAngle, arc->Delta);
 			}
 			END_LOOP;
-			TEXT_LOOP(layer);
+			PCB_TEXT_LOOP(layer);
 			{
 				pcb_box_t *box = &text->BoundingBox;
 				gui->draw_rect(Crosshair.GC, x + box->X1, y + box->Y1, x + box->X2, y + box->Y2);
Index: trunk/src/data.c
===================================================================
--- trunk/src/data.c	(revision 4970)
+++ trunk/src/data.c	(revision 4971)
@@ -75,7 +75,7 @@
 			}
 
 			if (tcb != NULL) {
-				TEXT_LOOP(layer);
+				PCB_TEXT_LOOP(layer);
 				{
 					tcb(ctx, PCB, layer, text);
 				}
@@ -122,7 +122,7 @@
 			}
 
 			if (etcb != NULL) {
-				PCB_ELEMENT_TEXT_LOOP(element);
+				PCB_ELEMENT_PCB_TEXT_LOOP(element);
 				{
 					etcb(ctx, PCB, element, text);
 				}
@@ -202,7 +202,7 @@
 
 	for (layer = data->Layer, i = 0; i < MAX_LAYER + 2; layer++, i++) {
 		pcb_attribute_free(&layer->Attributes);
-		TEXT_LOOP(layer);
+		PCB_TEXT_LOOP(layer);
 		{
 			free(text->TextString);
 		}
@@ -324,7 +324,7 @@
 		box.Y2 = MAX(box.Y2, arc->BoundingBox.Y2);
 	}
 	ENDALL_LOOP;
-	ALLTEXT_LOOP(Data);
+	PCB_TEXT_ALL_LOOP(Data);
 	{
 		box.X1 = MIN(box.X1, text->BoundingBox.X1);
 		box.Y1 = MIN(box.Y1, text->BoundingBox.Y1);
Index: trunk/src/obj_elem.c
===================================================================
--- trunk/src/obj_elem.c	(revision 4970)
+++ trunk/src/obj_elem.c	(revision 4971)
@@ -399,7 +399,7 @@
 	 * is to be corrected
 	 */
 #if 0
-	PCB_ELEMENT_TEXT_LOOP(Element);
+	PCB_ELEMENT_PCB_TEXT_LOOP(Element);
 	{
 		if (Data && Data->name_tree[n])
 			r_delete_entry(Data->name_tree[n], (pcb_box_t *) text);
@@ -698,7 +698,7 @@
 		arc->Delta = SWAP_DELTA(arc->Delta);
 	}
 	END_LOOP;
-	PCB_ELEMENT_TEXT_LOOP(Element);
+	PCB_ELEMENT_PCB_TEXT_LOOP(Element);
 	{
 		text->X = PCB_SWAP_X(text->X);
 		text->Y = PCB_SWAP_Y(text->Y) + yoff;
@@ -723,7 +723,7 @@
 	if (Data && Data->element_tree)
 		r_delete_entry(Data->element_tree, (pcb_box_t *) Element);
 	/* first update the text objects */
-	PCB_ELEMENT_TEXT_LOOP(Element);
+	PCB_ELEMENT_PCB_TEXT_LOOP(Element);
 	{
 		if (Data && Data->name_tree[n])
 			r_delete_entry(Data->name_tree[n], (pcb_box_t *) text);
@@ -915,7 +915,7 @@
 		r_delete_entry(data->pad_tree, (pcb_box_t *) pad);
 	}
 	END_LOOP;
-	PCB_ELEMENT_TEXT_LOOP(element);
+	PCB_ELEMENT_PCB_TEXT_LOOP(element);
 	{
 		r_delete_entry(data->name_tree[n], (pcb_box_t *) text);
 	}
@@ -1031,7 +1031,7 @@
 		pcb_arc_move(arc, DX, DY);
 	}
 	END_LOOP;
-	PCB_ELEMENT_TEXT_LOOP(Element);
+	PCB_ELEMENT_PCB_TEXT_LOOP(Element);
 	{
 		if (Data && Data->name_tree[n])
 			r_delete_entry(PCB->Data->name_tree[n], (pcb_box_t *) text);
@@ -1066,7 +1066,7 @@
 	/* the text subroutine decides by itself if the direction
 	 * is to be corrected
 	 */
-	PCB_ELEMENT_TEXT_LOOP(Element);
+	PCB_ELEMENT_PCB_TEXT_LOOP(Element);
 	{
 		if (Data && Data->name_tree[n])
 			r_delete_entry(Data->name_tree[n], (pcb_box_t *) text);
@@ -1118,7 +1118,7 @@
 	CopyElementLowLevel(ctx->buffer.dst, element, Element, pcb_false, 0, 0);
 	PCB_FLAG_CLEAR(ctx->buffer.extraflg, element);
 	if (ctx->buffer.extraflg) {
-		PCB_ELEMENT_TEXT_LOOP(element);
+		PCB_ELEMENT_PCB_TEXT_LOOP(element);
 		{
 			PCB_FLAG_CLEAR(ctx->buffer.extraflg, text);
 		}
@@ -1352,7 +1352,7 @@
 		return (NULL);
 	if (value <= MAX_TEXTSCALE && value >= MIN_TEXTSCALE) {
 		EraseElementName(Element);
-		PCB_ELEMENT_TEXT_LOOP(Element);
+		PCB_ELEMENT_PCB_TEXT_LOOP(Element);
 		{
 			AddObjectToSizeUndoList(PCB_TYPE_ELEMENT_NAME, Element, text, text);
 			r_delete_entry(PCB->Data->name_tree[n], (pcb_box_t *) text);
@@ -1532,7 +1532,7 @@
 {
 	if (PCB->ElementOn && (PCB_FRONT(Element) || PCB->InvisibleObjectsOn)) {
 		EraseElementName(Element);
-		PCB_ELEMENT_TEXT_LOOP(Element);
+		PCB_ELEMENT_PCB_TEXT_LOOP(Element);
 		{
 			if (PCB->Data->name_tree[n])
 				r_delete_entry(PCB->Data->name_tree[n], (pcb_box_t *) text);
@@ -1545,7 +1545,7 @@
 		pcb_draw();
 	}
 	else {
-		PCB_ELEMENT_TEXT_LOOP(Element);
+		PCB_ELEMENT_PCB_TEXT_LOOP(Element);
 		{
 			if (PCB->Data->name_tree[n])
 				r_delete_entry(PCB->Data->name_tree[n], (pcb_box_t *) text);
@@ -1603,7 +1603,7 @@
 		}
 		END_LOOP;
 	}
-	PCB_ELEMENT_TEXT_LOOP(Element);
+	PCB_ELEMENT_PCB_TEXT_LOOP(Element);
 	{
 		if (ctx->remove.destroy_target->name_tree[n])
 			r_delete_entry(ctx->remove.destroy_target->name_tree[n], (pcb_box_t *) text);
@@ -1645,7 +1645,7 @@
 void *RotateElementName(pcb_opctx_t *ctx, pcb_element_t *Element)
 {
 	EraseElementName(Element);
-	PCB_ELEMENT_TEXT_LOOP(Element);
+	PCB_ELEMENT_PCB_TEXT_LOOP(Element);
 	{
 		r_delete_entry(PCB->Data->name_tree[n], (pcb_box_t *) text);
 		pcb_text_rotate90(text, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.number);
Index: trunk/src/obj_elem.h
===================================================================
--- trunk/src/obj_elem.h	(revision 4970)
+++ trunk/src/obj_elem.h	(revision 4971)
@@ -125,7 +125,7 @@
   gdl_iterator_t __it__;                                            \
   pinlist_foreach(&(top)->Element, &__it__, element) {
 
-#define	PCB_ELEMENT_TEXT_LOOP(element) do { 	\
+#define	PCB_ELEMENT_PCB_TEXT_LOOP(element) do { 	\
 	pcb_cardinal_t	n;				\
 	pcb_text_t *text;				\
 	for (n = MAX_ELEMENTNAMES-1; n != -1; n--)	\
Index: trunk/src/obj_text.h
===================================================================
--- trunk/src/obj_text.h	(revision 4970)
+++ trunk/src/obj_text.h	(revision 4971)
@@ -65,24 +65,24 @@
 /* Determines if text is actually visible */
 #define pcb_text_is_visible(b, l, t)      ((l)->On)
 
-#define TEXT_LOOP(layer) do {                                       \
+#define PCB_TEXT_LOOP(layer) do {                                       \
   pcb_text_t *text;                                                   \
   gdl_iterator_t __it__;                                            \
   linelist_foreach(&(layer)->Text, &__it__, text) {
 
-#define	ALLTEXT_LOOP(top) do {                        \
+#define	PCB_TEXT_ALL_LOOP(top) do {                        \
 	pcb_cardinal_t l;                                   \
 	pcb_layer_t *layer = (top)->Layer;                  \
 	for (l = 0; l < max_copper_layer + 2; l++, layer++) \
 	{                                                   \
-		TEXT_LOOP(layer)
+		PCB_TEXT_LOOP(layer)
 
-#define VISIBLETEXT_LOOP(board) do {                       \
+#define PCB_TEXT_VISIBLE_LOOP(board) do {                       \
 	pcb_cardinal_t l;                                        \
 	pcb_layer_t *layer = (board)->Data->Layer;               \
 	for (l = 0; l < max_copper_layer + 2; l++, layer++)      \
 	{                                                        \
-		TEXT_LOOP(layer);                                      \
+		PCB_TEXT_LOOP(layer);                                      \
 		if (pcb_text_is_visible((board), layer, text))
 
 #endif
Index: trunk/src/search.c
===================================================================
--- trunk/src/search.c	(revision 4970)
+++ trunk/src/search.c	(revision 4971)
@@ -1166,7 +1166,7 @@
 	}
 
 	if (type == PCB_TYPE_TEXT) {
-		ALLTEXT_LOOP(Base);
+		PCB_TEXT_ALL_LOOP(Base);
 		{
 			if (text->ID == ID) {
 				*Result1 = (void *) layer;
@@ -1263,7 +1263,7 @@
 		}
 		END_LOOP;
 		if (type == PCB_TYPE_ELEMENT_NAME)
-			PCB_ELEMENT_TEXT_LOOP(element);
+			PCB_ELEMENT_PCB_TEXT_LOOP(element);
 		{
 			if (text->ID == ID) {
 				*Result1 = (void *) element;
Index: trunk/src/select.c
===================================================================
--- trunk/src/select.c	(revision 4970)
+++ trunk/src/select.c	(revision 4971)
@@ -68,7 +68,7 @@
 		PCB_FLAG_CHANGE(how, PCB_FLAG_SELECTED, pad);
 	}
 	END_LOOP;
-	PCB_ELEMENT_TEXT_LOOP(element);
+	PCB_ELEMENT_PCB_TEXT_LOOP(element);
 	{
 		AddObjectToFlagUndoList(PCB_TYPE_ELEMENT_NAME, element, text, text);
 		PCB_FLAG_CHANGE(how, PCB_FLAG_SELECTED, text);
@@ -91,7 +91,7 @@
 void pcb_select_element_name(pcb_element_t *element, pcb_change_flag_t how, int redraw)
 {
 	/* select all names of the element */
-	PCB_ELEMENT_TEXT_LOOP(element);
+	PCB_ELEMENT_PCB_TEXT_LOOP(element);
 	{
 		AddObjectToFlagUndoList(PCB_TYPE_ELEMENT_NAME, element, text, text);
 		PCB_FLAG_CHANGE(how, PCB_FLAG_SELECTED, text);
@@ -331,7 +331,7 @@
 			}
 		}
 		END_LOOP;
-		TEXT_LOOP(layer);
+		PCB_TEXT_LOOP(layer);
 		{
 			if (!Flag || pcb_text_is_visible(PCB, layer, text)) {
 				if (TEXT_NEAR_BOX(text, Box)
@@ -370,7 +370,7 @@
 						&& !PCB_FLAG_TEST(PCB_FLAG_LOCK, &ELEMENT_TEXT(PCB, element))
 						&& PCB_FLAG_TEST(PCB_FLAG_SELECTED, &ELEMENT_TEXT(PCB, element)) != Flag) {
 					/* select all names of element */
-					PCB_ELEMENT_TEXT_LOOP(element);
+					PCB_ELEMENT_PCB_TEXT_LOOP(element);
 					{
 						append(PCB_TYPE_ELEMENT_NAME, element, text);
 					}
@@ -592,7 +592,7 @@
 
 	/* check text */
 	if (type & PCB_TYPE_TEXT && F->Text)
-		ALLTEXT_LOOP(PCB->Data);
+		PCB_TEXT_ALL_LOOP(PCB->Data);
 	{
 		if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, text) && pcb_text_is_visible(PCB, layer, text)) {
 			if (Reset) {
@@ -886,7 +886,7 @@
 
 	/* loop over all visible objects with names */
 	if (Type & PCB_TYPE_TEXT)
-		ALLTEXT_LOOP(PCB->Data);
+		PCB_TEXT_ALL_LOOP(PCB->Data);
 	{
 		if (!PCB_FLAG_TEST(PCB_FLAG_LOCK, text)
 				&& pcb_text_is_visible(PCB, layer, text)
@@ -922,7 +922,7 @@
 					PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, Flag, pad);
 				}
 				END_LOOP;
-				PCB_ELEMENT_TEXT_LOOP(element);
+				PCB_ELEMENT_PCB_TEXT_LOOP(element);
 				{
 					AddObjectToFlagUndoList(PCB_TYPE_ELEMENT_NAME, element, text, text);
 					PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, Flag, text);
Index: trunk/src_plugins/autocrop/autocrop.c
===================================================================
--- trunk/src_plugins/autocrop/autocrop.c	(revision 4970)
+++ trunk/src_plugins/autocrop/autocrop.c	(revision 4971)
@@ -161,7 +161,7 @@
 		AddObjectToMoveUndoList(PCB_TYPE_ARC, NULL, NULL, arc, dx, dy);
 	}
 	ENDALL_LOOP;
-	ALLTEXT_LOOP(PCB->Data);
+	PCB_TEXT_ALL_LOOP(PCB->Data);
 	{
 		MyMoveTextLowLevel(layer, text, dx, dy);
 		AddObjectToMoveUndoList(PCB_TYPE_TEXT, NULL, NULL, text, dx, dy);
Index: trunk/src_plugins/autoroute/autoroute.c
===================================================================
--- trunk/src_plugins/autoroute/autoroute.c	(revision 4970)
+++ trunk/src_plugins/autoroute/autoroute.c	(revision 4971)
@@ -1112,7 +1112,7 @@
 		}
 		END_LOOP;
 		/* add all copper text */
-		TEXT_LOOP(LAYER_PTR(i));
+		PCB_TEXT_LOOP(LAYER_PTR(i));
 		{
 			AddText(layergroupboxes, layergroup, text, rd->styles[rd->max_styles]);
 		}
Index: trunk/src_plugins/boardflip/boardflip.c
===================================================================
--- trunk/src_plugins/boardflip/boardflip.c	(revision 4970)
+++ trunk/src_plugins/boardflip/boardflip.c	(revision 4971)
@@ -74,7 +74,7 @@
 			FLIP(line->Point2.Y);
 		}
 		END_LOOP;
-		TEXT_LOOP(layer);
+		PCB_TEXT_LOOP(layer);
 		{
 			FLIP(text->Y);
 			PCB_FLAG_TOGGLE(PCB_FLAG_ONSOLDER, text);
@@ -119,7 +119,7 @@
 		FLIP(element->MarkY);
 		if (sides)
 			PCB_FLAG_TOGGLE(PCB_FLAG_ONSOLDER, element);
-		PCB_ELEMENT_TEXT_LOOP(element);
+		PCB_ELEMENT_PCB_TEXT_LOOP(element);
 		{
 			FLIP(text->Y);
 			PCB_FLAG_TOGGLE(PCB_FLAG_ONSOLDER, text);
Index: trunk/src_plugins/distaligntext/distaligntext.c
===================================================================
--- trunk/src_plugins/distaligntext/distaligntext.c	(revision 4970)
+++ trunk/src_plugins/distaligntext/distaligntext.c	(revision 4971)
@@ -176,7 +176,7 @@
 		nsel++;
 	}
 	END_LOOP;
-	ALLTEXT_LOOP(PCB->Data);
+	PCB_TEXT_ALL_LOOP(PCB->Data);
 	{
 		if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, text))
 			continue;
@@ -199,7 +199,7 @@
 		texts_by_pos[nsel++].pos = coord(text, dir, point);
 	}
 	END_LOOP;
-	ALLTEXT_LOOP(PCB->Data);
+	PCB_TEXT_ALL_LOOP(PCB->Data);
 	{
 		if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, text))
 			continue;
@@ -388,7 +388,7 @@
 	}
 	END_LOOP;
 	/* Selected bare text objects */
-	ALLTEXT_LOOP(PCB->Data);
+	PCB_TEXT_ALL_LOOP(PCB->Data);
 	{
 		if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, text)) {
 			/* find delta from reference point to reference point */
Index: trunk/src_plugins/draw_fab/draw_fab.c
===================================================================
--- trunk/src_plugins/draw_fab/draw_fab.c	(revision 4970)
+++ trunk/src_plugins/draw_fab/draw_fab.c	(revision 4971)
@@ -274,7 +274,7 @@
 			gui->draw_arc(gc, arc->X, arc->Y, arc->Width, arc->Height, arc->StartAngle, arc->Delta);
 		}
 		END_LOOP;
-		TEXT_LOOP(layer);
+		PCB_TEXT_LOOP(layer);
 		{
 			DrawTextLowLevel(text, 0);
 		}