Index: trunk/doc-rnd/hacking/renames
===================================================================
--- trunk/doc-rnd/hacking/renames	(revision 4965)
+++ trunk/doc-rnd/hacking/renames	(revision 4966)
@@ -575,3 +575,8 @@
 SILKARC_LOOP -> PCB_ARC_SILK_LOOP
 VISIBLEARC_LOOP -> PCB_ARC_VISIBLE_LOOP
 ARC_LOOP -> PCB_ARC_LOOP
+ELEMENTTEXT_LOOP -> PCB_ELEMENT_TEXT_LOOP
+ELEMENTNAME_LOOP -> PCB_ELEMENT_NAME_LOOP
+ELEMENTLINE_LOOP -> PCB_ELEMENT_LINE_LOOP
+ELEMENTPCB_ARC_LOOP -> PCB_ELEMENT_ARC_LOOP
+ELEMENT_LOOP -> PCB_ELEMENT_LOOP
Index: trunk/src/buffer.c
===================================================================
--- trunk/src/buffer.c	(revision 4965)
+++ trunk/src/buffer.c	(revision 4966)
@@ -235,7 +235,7 @@
 	END_LOOP;
 
 	/* elements */
-	ELEMENT_LOOP(Buffer->Data);
+	PCB_ELEMENT_LOOP(Buffer->Data);
 	{
 		pcb_element_rotate90(Buffer->Data, element, Buffer->X, Buffer->Y, Number);
 	}
@@ -295,7 +295,7 @@
 	END_LOOP;
 
 	/* elements */
-	ELEMENT_LOOP(Buffer->Data);
+	PCB_ELEMENT_LOOP(Buffer->Data);
 	{
 		pcb_element_rotate(Buffer->Data, element, Buffer->X, Buffer->Y, cosa, sina, angle);
 	}
@@ -465,7 +465,7 @@
 	pcb_cardinal_t sgroup, cgroup;
 	pcb_layer_t swap;
 
-	ELEMENT_LOOP(Buffer->Data);
+	PCB_ELEMENT_LOOP(Buffer->Data);
 	{
 		r_delete_element(Buffer->Data, element);
 		pcb_element_mirror(Buffer->Data, element, 0);
@@ -663,7 +663,7 @@
 
 	/* paste elements */
 	if (PCB->PinOn && PCB->ElementOn) {
-		ELEMENT_LOOP(PCB_PASTEBUFFER->Data);
+		PCB_ELEMENT_LOOP(PCB_PASTEBUFFER->Data);
 		{
 #ifdef DEBUG
 			printf("In CopyPastebufferToLayout, pasting element %s\n", element->Name[1].TextString);
Index: trunk/src/change_act.c
===================================================================
--- trunk/src/change_act.c	(revision 4965)
+++ trunk/src/change_act.c	(revision 4966)
@@ -569,7 +569,7 @@
 	pinnum = argv[1];
 	pinname = argv[2];
 
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		if (PCB_NSTRCMP(refdes, NAMEONPCB_NAME(element)) == 0) {
 			PIN_LOOP(element);
Index: trunk/src/crosshair.c
===================================================================
--- trunk/src/crosshair.c	(revision 4965)
+++ trunk/src/crosshair.c	(revision 4966)
@@ -225,7 +225,7 @@
 									 DY + Element->BoundingBox.Y1, DX + Element->BoundingBox.X1, DY + Element->BoundingBox.Y1);
 	}
 	else {
-		ELEMENTLINE_LOOP(Element);
+		PCB_ELEMENT_LINE_LOOP(Element);
 		{
 			gui->draw_line(Crosshair.GC, DX + line->Point1.X, DY + line->Point1.Y, DX + line->Point2.X, DY + line->Point2.Y);
 		}
@@ -321,7 +321,7 @@
 
 	/* draw elements if visible */
 	if (PCB->PinOn && PCB->ElementOn)
-		ELEMENT_LOOP(Buffer->Data);
+		PCB_ELEMENT_LOOP(Buffer->Data);
 	{
 		if (PCB_FRONT(element) || PCB->InvisibleObjectsOn)
 			XORDrawElement(element, x, y);
Index: trunk/src/data.c
===================================================================
--- trunk/src/data.c	(revision 4965)
+++ trunk/src/data.c	(revision 4966)
@@ -99,7 +99,7 @@
 void pcb_loop_elements(void *ctx, pcb_element_cb_t ecb, pcb_eline_cb_t elcb, pcb_earc_cb_t eacb, pcb_etext_cb_t etcb, pcb_epin_cb_t epicb, pcb_epad_cb_t epacb)
 {
 	if ((ecb != NULL) || (elcb != NULL) || (eacb != NULL)  || (etcb != NULL) || (epicb != NULL) || (epacb != NULL)) {
-		ELEMENT_LOOP(PCB->Data);
+		PCB_ELEMENT_LOOP(PCB->Data);
 		{
 			if (ecb != NULL)
 				if (ecb(ctx, PCB, element, 1))
@@ -106,7 +106,7 @@
 					continue;
 
 			if (elcb != NULL) {
-				ELEMENTLINE_LOOP(element);
+				PCB_ELEMENT_LINE_LOOP(element);
 				{
 					elcb(ctx, PCB, element, line);
 				}
@@ -114,7 +114,7 @@
 			}
 
 			if (eacb != NULL) {
-				ELEMENTPCB_ARC_LOOP(element);
+				PCB_ELEMENT_ARC_LOOP(element);
 				{
 					eacb(ctx, PCB, element, arc);
 				}
@@ -122,7 +122,7 @@
 			}
 
 			if (etcb != NULL) {
-				ELEMENTTEXT_LOOP(element);
+				PCB_ELEMENT_TEXT_LOOP(element);
 				{
 					etcb(ctx, PCB, element, text);
 				}
@@ -192,7 +192,7 @@
 	}
 	END_LOOP;
 	list_map0(&data->Via, pcb_pin_t, pcb_via_free);
-	ELEMENT_LOOP(data);
+	PCB_ELEMENT_LOOP(data);
 	{
 		pcb_element_destroy(element);
 	}
@@ -289,7 +289,7 @@
 		box.Y2 = MAX(box.Y2, via->Y + via->Thickness / 2);
 	}
 	END_LOOP;
-	ELEMENT_LOOP(Data);
+	PCB_ELEMENT_LOOP(Data);
 	{
 		box.X1 = MIN(box.X1, element->BoundingBox.X1);
 		box.Y1 = MIN(box.Y1, element->BoundingBox.Y1);
Index: trunk/src/find_clear.c
===================================================================
--- trunk/src/find_clear.c	(revision 4965)
+++ trunk/src/find_clear.c	(revision 4966)
@@ -42,7 +42,7 @@
 		}
 	}
 	END_LOOP;
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		PIN_LOOP(element);
 		{
Index: trunk/src/find_drc.c
===================================================================
--- trunk/src/find_drc.c	(revision 4965)
+++ trunk/src/find_drc.c	(revision 4966)
@@ -347,7 +347,7 @@
 
 	User = pcb_false;
 
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		PIN_LOOP(element);
 		{
@@ -633,10 +633,10 @@
 	/* XXX - need to check text and polygons too! */
 	TheFlag = PCB_FLAG_SELECTED;
 	if (!IsBad) {
-		ELEMENT_LOOP(PCB->Data);
+		PCB_ELEMENT_LOOP(PCB->Data);
 		{
 			tmpcnt = 0;
-			ELEMENTLINE_LOOP(element);
+			PCB_ELEMENT_LINE_LOOP(element);
 			{
 				if (line->Thickness < PCB->minSlk)
 					tmpcnt++;
Index: trunk/src/find_misc.c
===================================================================
--- trunk/src/find_misc.c	(revision 4965)
+++ trunk/src/find_misc.c	(revision 4966)
@@ -308,7 +308,7 @@
 		}
 	}
 	END_LOOP;
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		PIN_LOOP(element);
 		{
Index: trunk/src/find_print.c
===================================================================
--- trunk/src/find_print.c	(revision 4965)
+++ trunk/src/find_print.c	(revision 4966)
@@ -220,7 +220,7 @@
 	pcb_reset_conns(pcb_true);
 	pcb_conn_lookup_init();
 
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		/* break if abort dialog returned pcb_true;
 		 * passing NULL as filedescriptor discards the normal output
@@ -270,7 +270,7 @@
 	pcb_reset_conns(pcb_false);
 	pcb_conn_lookup_init();
 
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		/* break if abort dialog returned pcb_true */
 		if (PrintElementConnections(element, FP, pcb_false))
Index: trunk/src/gui_act.c
===================================================================
--- trunk/src/gui_act.c	(revision 4965)
+++ trunk/src/gui_act.c	(revision 4966)
@@ -233,7 +233,7 @@
 		case F_Value:
 		case F_NameOnPCB:
 		case F_Description:
-			ELEMENT_LOOP(PCB->Data);
+			PCB_ELEMENT_LOOP(PCB->Data);
 			{
 				EraseElementName(element);
 			}
@@ -264,7 +264,7 @@
 					conf_set_editor(name_on_pcb, 0); /* need to write once so the event is triggered */
 				break;
 			}
-			ELEMENT_LOOP(PCB->Data);
+			PCB_ELEMENT_LOOP(PCB->Data);
 			{
 				DrawElementName(element);
 			}
@@ -931,7 +931,7 @@
 		case F_Selected:
 			{
 				pcb_bool changed = pcb_false;
-				ELEMENT_LOOP(PCB->Data);
+				PCB_ELEMENT_LOOP(PCB->Data);
 				{
 					if ((PCB_FLAG_TEST(PCB_FLAG_SELECTED, element) || PCB_FLAG_TEST(PCB_FLAG_SELECTED, &NAMEONPCB_TEXT(element)))
 							&& (PCB_FRONT(element) || PCB->InvisibleObjectsOn)) {
Index: trunk/src/netlist_act.c
===================================================================
--- trunk/src/netlist_act.c	(revision 4965)
+++ trunk/src/netlist_act.c	(revision 4966)
@@ -50,7 +50,7 @@
 	int ret = -1;
 	pcb_lib_menu_t *nets[2];
 
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		PIN_LOOP(element);
 		{
Index: trunk/src/obj_elem.c
===================================================================
--- trunk/src/obj_elem.c	(revision 4965)
+++ trunk/src/obj_elem.c	(revision 4966)
@@ -81,7 +81,7 @@
 	if (element == NULL)
 		return;
 
-	ELEMENTNAME_LOOP(element);
+	PCB_ELEMENT_NAME_LOOP(element);
 	{
 		free(textstring);
 	}
@@ -180,7 +180,7 @@
 	element = elementlist_first(&Buffer->Data->Element);
 	elementlist_remove(element);
 	pcb_buffer_clear(Buffer);
-	ELEMENTLINE_LOOP(element);
+	PCB_ELEMENT_LINE_LOOP(element);
 	{
 		pcb_line_new(&Buffer->Data->SILKLAYER,
 												 line->Point1.X, line->Point1.Y, line->Point2.X, line->Point2.Y, line->Thickness, 0, pcb_no_flags());
@@ -399,7 +399,7 @@
 	 * is to be corrected
 	 */
 #if 0
-	ELEMENTTEXT_LOOP(Element);
+	PCB_ELEMENT_TEXT_LOOP(Element);
 	{
 		if (Data && Data->name_tree[n])
 			r_delete_entry(Data->name_tree[n], (pcb_box_t *) text);
@@ -407,7 +407,7 @@
 	}
 	END_LOOP;
 #endif
-	ELEMENTLINE_LOOP(Element);
+	PCB_ELEMENT_LINE_LOOP(Element);
 	{
 		free_rotate(&line->Point1.X, &line->Point1.Y, X, Y, cosa, sina);
 		free_rotate(&line->Point2.X, &line->Point2.Y, X, Y, cosa, sina);
@@ -466,7 +466,7 @@
 	pcb_bool change = pcb_false;
 
 	if (PCB->PinOn && PCB->ElementOn)
-		ELEMENT_LOOP(PCB->Data);
+		PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, element)) {
 			change |= pcb_element_change_side(element, 0);
@@ -526,7 +526,7 @@
 	if (!Dest)
 		return (Dest);
 
-	ELEMENTLINE_LOOP(Src);
+	PCB_ELEMENT_LINE_LOOP(Src);
 	{
 		pcb_element_line_new(Dest, line->Point1.X + dx,
 													 line->Point1.Y + dy, line->Point2.X + dx, line->Point2.Y + dy, line->Thickness);
@@ -665,7 +665,7 @@
 void pcb_element_mirror(pcb_data_t *Data, pcb_element_t *Element, pcb_coord_t yoff)
 {
 	r_delete_element(Data, Element);
-	ELEMENTLINE_LOOP(Element);
+	PCB_ELEMENT_LINE_LOOP(Element);
 	{
 		line->Point1.X = PCB_SWAP_X(line->Point1.X);
 		line->Point1.Y = PCB_SWAP_Y(line->Point1.Y) + yoff;
@@ -698,7 +698,7 @@
 		arc->Delta = SWAP_DELTA(arc->Delta);
 	}
 	END_LOOP;
-	ELEMENTTEXT_LOOP(Element);
+	PCB_ELEMENT_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 */
-	ELEMENTTEXT_LOOP(Element);
+	PCB_ELEMENT_TEXT_LOOP(Element);
 	{
 		if (Data && Data->name_tree[n])
 			r_delete_entry(Data->name_tree[n], (pcb_box_t *) text);
@@ -742,7 +742,7 @@
 	vbox = &Element->VBox;
 	box->X1 = box->Y1 = MAX_COORD;
 	box->X2 = box->Y2 = 0;
-	ELEMENTLINE_LOOP(Element);
+	PCB_ELEMENT_LINE_LOOP(Element);
 	{
 		pcb_line_bbox(line);
 		PCB_MAKE_MIN(box->X1, line->Point1.X - (line->Thickness + 1) / 2);
@@ -887,7 +887,7 @@
 		return (Name);
 
 	for (;;) {
-		ELEMENT_LOOP(Data);
+		PCB_ELEMENT_LOOP(Data);
 		{
 			if (NAMEONPCB_NAME(element) && PCB_NSTRCMP(NAMEONPCB_NAME(element), Name) == 0) {
 				Name = BumpName(Name);
@@ -915,7 +915,7 @@
 		r_delete_entry(data->pad_tree, (pcb_box_t *) pad);
 	}
 	END_LOOP;
-	ELEMENTTEXT_LOOP(element);
+	PCB_ELEMENT_TEXT_LOOP(element);
 	{
 		r_delete_entry(data->name_tree[n], (pcb_box_t *) text);
 	}
@@ -995,7 +995,7 @@
 {
 	if (Data)
 		r_delete_entry(Data->element_tree, (pcb_box_t *) Element);
-	ELEMENTLINE_LOOP(Element);
+	PCB_ELEMENT_LINE_LOOP(Element);
 	{
 		pcb_line_move(line, DX, DY);
 	}
@@ -1031,7 +1031,7 @@
 		pcb_arc_move(arc, DX, DY);
 	}
 	END_LOOP;
-	ELEMENTTEXT_LOOP(Element);
+	PCB_ELEMENT_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
 	 */
-	ELEMENTTEXT_LOOP(Element);
+	PCB_ELEMENT_TEXT_LOOP(Element);
 	{
 		if (Data && Data->name_tree[n])
 			r_delete_entry(Data->name_tree[n], (pcb_box_t *) text);
@@ -1073,7 +1073,7 @@
 		pcb_text_rotate90(text, X, Y, Number);
 	}
 	END_LOOP;
-	ELEMENTLINE_LOOP(Element);
+	PCB_ELEMENT_LINE_LOOP(Element);
 	{
 		pcb_line_rotate90(line, X, Y, Number);
 	}
@@ -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) {
-		ELEMENTTEXT_LOOP(element);
+		PCB_ELEMENT_TEXT_LOOP(element);
 		{
 			PCB_FLAG_CLEAR(ctx->buffer.extraflg, text);
 		}
@@ -1314,7 +1314,7 @@
 		return (NULL);
 	if (PCB->ElementOn)
 		EraseElement(Element);
-	ELEMENTLINE_LOOP(Element);
+	PCB_ELEMENT_LINE_LOOP(Element);
 	{
 		value = (ctx->chgsize.absolute) ? ctx->chgsize.absolute : line->Thickness + ctx->chgsize.delta;
 		if (value <= MAX_LINESIZE && value >= MIN_LINESIZE && value != line->Thickness) {
@@ -1352,7 +1352,7 @@
 		return (NULL);
 	if (value <= MAX_TEXTSCALE && value >= MIN_TEXTSCALE) {
 		EraseElementName(Element);
-		ELEMENTTEXT_LOOP(Element);
+		PCB_ELEMENT_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);
-		ELEMENTTEXT_LOOP(Element);
+		PCB_ELEMENT_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 {
-		ELEMENTTEXT_LOOP(Element);
+		PCB_ELEMENT_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;
 	}
-	ELEMENTTEXT_LOOP(Element);
+	PCB_ELEMENT_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);
-	ELEMENTTEXT_LOOP(Element);
+	PCB_ELEMENT_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);
@@ -1723,7 +1723,7 @@
 		gui->set_color(Output.fgGC, PCB->InvisibleObjectsColor);
 
 	/* draw lines, arcs, text and pins */
-	ELEMENTLINE_LOOP(element);
+	PCB_ELEMENT_LINE_LOOP(element);
 	{
 		_draw_line(line);
 	}
@@ -1800,7 +1800,7 @@
 
 void EraseElement(pcb_element_t *Element)
 {
-	ELEMENTLINE_LOOP(Element);
+	PCB_ELEMENT_LINE_LOOP(Element);
 	{
 		EraseLine(line);
 	}
@@ -1853,7 +1853,7 @@
 
 void DrawElementPackage(pcb_element_t *Element)
 {
-	ELEMENTLINE_LOOP(Element);
+	PCB_ELEMENT_LINE_LOOP(Element);
 	{
 		DrawLine(NULL, line);
 	}
Index: trunk/src/obj_elem.h
===================================================================
--- trunk/src/obj_elem.h	(revision 4965)
+++ trunk/src/obj_elem.h	(revision 4966)
@@ -120,12 +120,12 @@
 
 /*** loops ***/
 
-#define ELEMENT_LOOP(top) do {                                      \
+#define PCB_ELEMENT_LOOP(top) do {                                      \
   pcb_element_t *element;                                             \
   gdl_iterator_t __it__;                                            \
   pinlist_foreach(&(top)->Element, &__it__, element) {
 
-#define	ELEMENTTEXT_LOOP(element) do { 	\
+#define	PCB_ELEMENT_TEXT_LOOP(element) do { 	\
 	pcb_cardinal_t	n;				\
 	pcb_text_t *text;				\
 	for (n = MAX_ELEMENTNAMES-1; n != -1; n--)	\
@@ -132,7 +132,7 @@
 	{						\
 		text = &(element)->Name[n]
 
-#define	ELEMENTNAME_LOOP(element) do	{ 			\
+#define	PCB_ELEMENT_NAME_LOOP(element) do	{ 			\
 	pcb_cardinal_t	n;					\
 	char		*textstring;				\
 	for (n = MAX_ELEMENTNAMES-1; n != -1; n--)		\
@@ -139,12 +139,12 @@
 	{							\
 		textstring = (element)->Name[n].TextString
 
-#define ELEMENTLINE_LOOP(element) do {                              \
+#define PCB_ELEMENT_LINE_LOOP(element) do {                              \
   pcb_line_t *line;                                                   \
   gdl_iterator_t __it__;                                            \
   linelist_foreach(&(element)->Line, &__it__, line) {
 
-#define ELEMENTPCB_ARC_LOOP(element) do {                               \
+#define PCB_ELEMENT_ARC_LOOP(element) do {                               \
   pcb_arc_t *arc;                                                     \
   gdl_iterator_t __it__;                                            \
   linelist_foreach(&(element)->Arc, &__it__, arc) {
Index: trunk/src/obj_pad.h
===================================================================
--- trunk/src/obj_pad.h	(revision 4965)
+++ trunk/src/obj_pad.h	(revision 4966)
@@ -68,7 +68,7 @@
 	padlist_foreach(&(element)->Pad, &__it__, pad) {
 
 #define	ALLPAD_LOOP(top)    \
-	ELEMENT_LOOP(top);        \
+	PCB_ELEMENT_LOOP(top);        \
 		PAD_LOOP(element)
 
 
Index: trunk/src/obj_pinvia.h
===================================================================
--- trunk/src/obj_pinvia.h	(revision 4965)
+++ trunk/src/obj_pinvia.h	(revision 4966)
@@ -83,7 +83,7 @@
   pinlist_foreach(&(element)->Pin, &__it__, pin) {
 
 #define ALLPIN_LOOP(top)   \
-        ELEMENT_LOOP(top); \
+        PCB_ELEMENT_LOOP(top); \
         PIN_LOOP(element)  \
 
 #endif
Index: trunk/src/object_act.c
===================================================================
--- trunk/src/object_act.c	(revision 4965)
+++ trunk/src/object_act.c	(revision 4966)
@@ -53,7 +53,7 @@
 			&& strcmp(NAMEONPCB_NAME(element_cache), refdes) == 0)
 		return element_cache;
 
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		if (NAMEONPCB_NAME(element)
 				&& strcmp(NAMEONPCB_NAME(element), refdes) == 0) {
@@ -147,7 +147,7 @@
 		{
 			int n_found = 0;
 			pcb_element_t *e = NULL;
-			ELEMENT_LOOP(PCB->Data);
+			PCB_ELEMENT_LOOP(PCB->Data);
 			{
 				if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, element)) {
 					e = element;
@@ -236,7 +236,7 @@
 	}
 
 
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		/*
 		 * If we want to disperse selected elements, maybe we need smarter
@@ -491,7 +491,7 @@
 #endif
 
 	if (strcasecmp(function, "start") == 0) {
-		ELEMENT_LOOP(PCB->Data);
+		PCB_ELEMENT_LOOP(PCB->Data);
 		{
 			PCB_FLAG_CLEAR(PCB_FLAG_FOUND, element);
 		}
@@ -502,7 +502,7 @@
 	}
 
 	if (strcasecmp(function, "done") == 0) {
-		ELEMENT_LOOP(PCB->Data);
+		PCB_ELEMENT_LOOP(PCB->Data);
 		{
 			if (PCB_FLAG_TEST(PCB_FLAG_FOUND, element)) {
 				PCB_FLAG_CLEAR(PCB_FLAG_FOUND, element);
@@ -668,7 +668,7 @@
 	name = argv[1];
 	value = PCB_ACTION_ARG(2);
 
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		if (PCB_NSTRCMP(refdes, NAMEONPCB_NAME(element)) == 0) {
 			e = element;
@@ -848,7 +848,7 @@
 	value = 2 * pcb_get_value(delta, units, &absolute, NULL);
 
 	SaveUndoSerialNumber();
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		PIN_LOOP(element);
 		{
@@ -922,7 +922,7 @@
 	value = 2 * pcb_get_value(delta, units, &absolute, NULL);
 
 	SaveUndoSerialNumber();
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		PIN_LOOP(element);
 		{
@@ -984,7 +984,7 @@
 /* ---------------------------------------------------------------------------  */
 int ActionListRotations(int argc, const char **argv, pcb_coord_t x, pcb_coord_t y)
 {
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		printf("%d %s\n", pcb_element_get_orientation(element), NAMEONPCB_NAME(element));
 	}
Index: trunk/src/rats_patch.c
===================================================================
--- trunk/src/rats_patch.c	(revision 4965)
+++ trunk/src/rats_patch.c	(revision 4966)
@@ -388,7 +388,7 @@
 	int found = 0;
 
 	/* check if we have elements selected and quit if not */
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, element)) {
 			found = 1;
@@ -423,7 +423,7 @@
 
 
 	/* action: replace selected elements */
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, element)) {
 			a[0] = fpname;
Index: trunk/src/search.c
===================================================================
--- trunk/src/search.c	(revision 4965)
+++ trunk/src/search.c	(revision 4966)
@@ -1236,7 +1236,7 @@
 	if (type == PCB_TYPE_ELEMENT || type == PCB_TYPE_PAD || type == PCB_TYPE_PIN
 			|| type == PCB_TYPE_ELEMENT_LINE || type == PCB_TYPE_ELEMENT_NAME || type == PCB_TYPE_ELEMENT_ARC)
 		/* check pins and elementnames too */
-		ELEMENT_LOOP(Base);
+		PCB_ELEMENT_LOOP(Base);
 	{
 		if (element->ID == ID) {
 			*Result1 = *Result2 = *Result3 = (void *) element;
@@ -1243,7 +1243,7 @@
 			return (PCB_TYPE_ELEMENT);
 		}
 		if (type == PCB_TYPE_ELEMENT_LINE)
-			ELEMENTLINE_LOOP(element);
+			PCB_ELEMENT_LINE_LOOP(element);
 		{
 			if (line->ID == ID) {
 				*Result1 = (void *) element;
@@ -1263,7 +1263,7 @@
 		}
 		END_LOOP;
 		if (type == PCB_TYPE_ELEMENT_NAME)
-			ELEMENTTEXT_LOOP(element);
+			PCB_ELEMENT_TEXT_LOOP(element);
 		{
 			if (text->ID == ID) {
 				*Result1 = (void *) element;
@@ -1307,7 +1307,7 @@
 {
 	pcb_element_t *result = NULL;
 
-	ELEMENT_LOOP(Base);
+	PCB_ELEMENT_LOOP(Base);
 	{
 		if (element->Name[1].TextString && PCB_NSTRCMP(element->Name[1].TextString, Name) == 0) {
 			result = element;
Index: trunk/src/select.c
===================================================================
--- trunk/src/select.c	(revision 4965)
+++ trunk/src/select.c	(revision 4966)
@@ -68,7 +68,7 @@
 		PCB_FLAG_CHANGE(how, PCB_FLAG_SELECTED, pad);
 	}
 	END_LOOP;
-	ELEMENTTEXT_LOOP(element);
+	PCB_ELEMENT_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 */
-	ELEMENTTEXT_LOOP(element);
+	PCB_ELEMENT_TEXT_LOOP(element);
 	{
 		AddObjectToFlagUndoList(PCB_TYPE_ELEMENT_NAME, element, text, text);
 		PCB_FLAG_CHANGE(how, PCB_FLAG_SELECTED, text);
@@ -359,7 +359,7 @@
 	END_LOOP;
 
 	/* elements */
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		{
 			pcb_bool gotElement = pcb_false;
@@ -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 */
-					ELEMENTTEXT_LOOP(element);
+					PCB_ELEMENT_TEXT_LOOP(element);
 					{
 						append(PCB_TYPE_ELEMENT_NAME, element, text);
 					}
@@ -622,7 +622,7 @@
 
 	/* elements silkscreen */
 	if (type & PCB_TYPE_ELEMENT && PCB->ElementOn && F->Element)
-		ELEMENT_LOOP(PCB->Data);
+		PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, element)) {
 			if (Reset) {
@@ -635,7 +635,7 @@
 	}
 	END_LOOP;
 	if (type & PCB_TYPE_ELEMENT_NAME && PCB->ElementOn && F->ElementName)
-		ELEMENT_LOOP(PCB->Data);
+		PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, &ELEMENT_TEXT(PCB, element))) {
 			if (Reset) {
@@ -649,7 +649,7 @@
 	END_LOOP;
 
 	if (type & PCB_TYPE_PIN && PCB->PinOn && F->Pin)
-		ELEMENT_LOOP(PCB->Data);
+		PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		PIN_LOOP(element);
 		{
@@ -667,7 +667,7 @@
 	END_LOOP;
 
 	if (type & PCB_TYPE_PAD && PCB->PinOn && F->Pad)
-		ELEMENT_LOOP(PCB->Data);
+		PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		PAD_LOOP(element);
 		{
@@ -901,7 +901,7 @@
 	ENDALL_LOOP;
 
 	if (PCB->ElementOn && (Type & PCB_TYPE_ELEMENT))
-		ELEMENT_LOOP(PCB->Data);
+		PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		if (!PCB_FLAG_TEST(PCB_FLAG_LOCK, element)
 				&& ((PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, element) != 0) == SWAP_IDENT || PCB->InvisibleObjectsOn)
@@ -922,7 +922,7 @@
 					PCB_FLAG_ASSIGN(PCB_FLAG_SELECTED, Flag, pad);
 				}
 				END_LOOP;
-				ELEMENTTEXT_LOOP(element);
+				PCB_ELEMENT_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 4965)
+++ trunk/src_plugins/autocrop/autocrop.c	(revision 4966)
@@ -137,7 +137,7 @@
  */
 static void MoveAll(pcb_coord_t dx, pcb_coord_t dy)
 {
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		pcb_element_move(PCB->Data, element, dx, dy);
 		AddObjectToMoveUndoList(PCB_TYPE_ELEMENT, NULL, NULL, element, dx, dy);
Index: trunk/src_plugins/autoplace/autoplace.c
===================================================================
--- trunk/src_plugins/autoplace/autoplace.c	(revision 4965)
+++ trunk/src_plugins/autoplace/autoplace.c	(revision 4966)
@@ -177,7 +177,7 @@
 static PointerListType collectSelectedElements()
 {
 	PointerListType list = { 0, 0, NULL };
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, element)) {
 			pcb_element_t **epp = (pcb_element_t **) GetPointerMemory(&list);
@@ -356,7 +356,7 @@
 	/* now collect module areas (bounding rect of pins/pads) */
 	/* two lists for solder side / component side. */
 
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		pcb_box_list_t *thisside;
 		pcb_box_list_t *otherside;
@@ -466,7 +466,7 @@
 		struct ebox **boxpp, *boxp;
 		pcb_rtree_t *rt_s, *rt_c;
 		int factor;
-		ELEMENT_LOOP(PCB->Data);
+		PCB_ELEMENT_LOOP(PCB->Data);
 		{
 			boxpp = (struct ebox **)
 				GetPointerMemory(PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, element) ? &seboxes : &ceboxes);
@@ -487,7 +487,7 @@
 		/* now, for each element, find its neighbor on all four sides */
 		delta4 = 0;
 		for (i = 0; i < 4; i++)
-			ELEMENT_LOOP(PCB->Data);
+			PCB_ELEMENT_LOOP(PCB->Data);
 		{
 			boxp = (struct ebox *)
 				r_find_neighbor(PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, element) ? rt_s : rt_c, &element->VBox, dir[i]);
@@ -520,7 +520,7 @@
 	{
 		pcb_coord_t minX = MAX_COORD, minY = MAX_COORD;
 		pcb_coord_t maxX = -MAX_COORD, maxY = -MAX_COORD;
-		ELEMENT_LOOP(PCB->Data);
+		PCB_ELEMENT_LOOP(PCB->Data);
 		{
 			PCB_MAKE_MIN(minX, element->VBox.X1);
 			PCB_MAKE_MIN(minY, element->VBox.Y1);
Index: trunk/src_plugins/boardflip/boardflip.c
===================================================================
--- trunk/src_plugins/boardflip/boardflip.c	(revision 4965)
+++ trunk/src_plugins/boardflip/boardflip.c	(revision 4966)
@@ -114,24 +114,24 @@
 		FLIP(via->Y);
 	}
 	END_LOOP;
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		FLIP(element->MarkY);
 		if (sides)
 			PCB_FLAG_TOGGLE(PCB_FLAG_ONSOLDER, element);
-		ELEMENTTEXT_LOOP(element);
+		PCB_ELEMENT_TEXT_LOOP(element);
 		{
 			FLIP(text->Y);
 			PCB_FLAG_TOGGLE(PCB_FLAG_ONSOLDER, text);
 		}
 		END_LOOP;
-		ELEMENTLINE_LOOP(element);
+		PCB_ELEMENT_LINE_LOOP(element);
 		{
 			FLIP(line->Point1.Y);
 			FLIP(line->Point2.Y);
 		}
 		END_LOOP;
-		ELEMENTPCB_ARC_LOOP(element);
+		PCB_ELEMENT_ARC_LOOP(element);
 		{
 			FLIP(arc->Y);
 			NEG(arc->StartAngle);
Index: trunk/src_plugins/distalign/distalign.c
===================================================================
--- trunk/src_plugins/distalign/distalign.c	(revision 4965)
+++ trunk/src_plugins/distalign/distalign.c	(revision 4966)
@@ -244,7 +244,7 @@
 		return nelements_by_pos;
 	if (op == K_align)
 		dir = dir == K_X ? K_Y : K_X;	/* see above */
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, element))
 			continue;
@@ -256,7 +256,7 @@
 	elements_by_pos = malloc(nsel * sizeof(*elements_by_pos));
 	nelements_by_pos = nsel;
 	nsel = 0;
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, element))
 			continue;
@@ -297,7 +297,7 @@
 	case K_Average:							/* the average among selected elements */
 		nsel = 0;
 		q = 0;
-		ELEMENT_LOOP(PCB->Data);
+		PCB_ELEMENT_LOOP(PCB->Data);
 		{
 			if (!PCB_FLAG_TEST(PCB_FLAG_SELECTED, element))
 				continue;
@@ -411,7 +411,7 @@
 	/* find the final alignment coordinate using the above options */
 	q = reference_coord(K_align, Crosshair.X, Crosshair.Y, dir, point, reference);
 	/* move all selected elements to the new coordinate */
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		pcb_coord_t p, dp, dx, dy;
 
Index: trunk/src_plugins/distaligntext/distaligntext.c
===================================================================
--- trunk/src_plugins/distaligntext/distaligntext.c	(revision 4965)
+++ trunk/src_plugins/distaligntext/distaligntext.c	(revision 4966)
@@ -167,7 +167,7 @@
 		return ntexts_by_pos;
 	if (op == K_aligntext)
 		dir = dir == K_X ? K_Y : K_X;	/* see above */
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		pcb_text_t *text;
 		text = &(element)->Name[NAME_INDEX()];
@@ -188,7 +188,7 @@
 	texts_by_pos = malloc(nsel * sizeof(*texts_by_pos));
 	ntexts_by_pos = nsel;
 	nsel = 0;
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		pcb_text_t *text;
 		text = &(element)->Name[NAME_INDEX()];
@@ -359,7 +359,7 @@
 	q = reference_coord(K_aligntext, Crosshair.X, Crosshair.Y, dir, point, reference);
 	/* move all selected elements to the new coordinate */
 	/* selected text part of an element */
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		pcb_text_t *text;
 		text = &(element)->Name[NAME_INDEX()];
Index: trunk/src_plugins/djopt/djopt.c
===================================================================
--- trunk/src_plugins/djopt/djopt.c	(revision 4965)
+++ trunk/src_plugins/djopt/djopt.c	(revision 4966)
@@ -119,7 +119,7 @@
 
 static const char *element_name_for(corner_s * c)
 {
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		PIN_LOOP(element);
 		{
@@ -2563,7 +2563,7 @@
 
 	grok_layer_groups();
 
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	PIN_LOOP(element);
 	{
 		c = find_corner(pin->X, pin->Y, -1);
Index: trunk/src_plugins/export_bboard/bboard.c
===================================================================
--- trunk/src_plugins/export_bboard/bboard.c	(revision 4965)
+++ trunk/src_plugins/export_bboard/bboard.c	(revision 4966)
@@ -532,7 +532,7 @@
 	bboard_init_board_cairo(PCB->MaxWidth, PCB->MaxHeight, bboard_bgcolor, options[HA_antialias].int_value);
 
 	/* write out components on solder side */
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	if (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (element))) {
 		bboard_export_element_cairo(element, 1);
 	}
@@ -539,7 +539,7 @@
 	END_LOOP;
 
 	/* write out components on component side */
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	if (!PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, (element))) {
 		bboard_export_element_cairo(element, 0);
 	}
Index: trunk/src_plugins/export_bom/bom.c
===================================================================
--- trunk/src_plugins/export_bom/bom.c	(revision 4965)
+++ trunk/src_plugins/export_bom/bom.c	(revision 4966)
@@ -237,7 +237,7 @@
 	}
 
 
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		/* insert this component into the bill of materials list */
 		bom = bom_insert((char *) PCB_UNKNOWN(NAMEONPCB_NAME(element)),
Index: trunk/src_plugins/export_dsn/dsn.c
===================================================================
--- trunk/src_plugins/export_dsn/dsn.c	(revision 4965)
+++ trunk/src_plugins/export_dsn/dsn.c	(revision 4966)
@@ -251,7 +251,7 @@
 static void print_placement(FILE * fp)
 {
 	fprintf(fp, "  (placement\n");
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		char *ename;
 		pcb_point_t ecentroid = get_centroid(element);
@@ -283,7 +283,7 @@
 	GList *pads = NULL, *iter; /* contain unique pad names */
 	gchar *padstack;
 	fprintf(fp, "  (library\n");
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		int partside = PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, element) ? g_list_length(layerlist) - 1 : 0;
 		int partsidesign = PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, element) ? -1 : 1;
Index: trunk/src_plugins/export_dxf/dxf.c
===================================================================
--- trunk/src_plugins/export_dxf/dxf.c	(revision 4965)
+++ trunk/src_plugins/export_dxf/dxf.c	(revision 4966)
@@ -3958,7 +3958,7 @@
 	/*
 	 * lookup all elements on pcb and insert element in the list of elements.
 	 */
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		/*
 		 * insert the elements into the dxf list.
@@ -4001,7 +4001,7 @@
 	 * for each element we calculate the centroid of the footprint.
 	 * in addition, we need to extract some notion of rotation.
 	 */
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		/*
 		 * initialize our pin count and our totals for finding the
Index: trunk/src_plugins/export_ipcd356/ipcd356.c
===================================================================
--- trunk/src_plugins/export_ipcd356/ipcd356.c	(revision 4965)
+++ trunk/src_plugins/export_ipcd356/ipcd356.c	(revision 4966)
@@ -175,7 +175,7 @@
 {
 	int padx, pady, tmp;
 
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	PAD_LOOP(element);
 	if (PCB_FLAG_TEST(PCB_FLAG_FOUND, pad)) {
 		fprintf(fd, "327%-17.14s", net);	/* Net Name. */
@@ -425,7 +425,7 @@
 	}
 
 
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	PIN_LOOP(element);
 	if (!PCB_FLAG_TEST(PCB_FLAG_VISIT, pin)) {
 		pcb_clear_flag_on_lines_polys(pcb_true, PCB_FLAG_FOUND);
@@ -494,7 +494,7 @@
 	VIA_LOOP(PCB->Data);
 	PCB_FLAG_CLEAR(PCB_FLAG_VISIT, via);
 	END_LOOP;											/* Via. */
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	PIN_LOOP(element);
 	PCB_FLAG_CLEAR(PCB_FLAG_VISIT, pin);
 	END_LOOP;											/* Pin. */
@@ -567,7 +567,7 @@
 
 int IPCD356_SanityCheck()
 {
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	if (element->Name[1].TextString == '\0') {
 		pcb_message(PCB_MSG_ERROR, "Error: Found unnamed element. All elements need to be named to create an IPC-D-356 netlist.\n");
 		return (1);
Index: trunk/src_plugins/export_openscad/scadcomp.c
===================================================================
--- trunk/src_plugins/export_openscad/scadcomp.c	(revision 4965)
+++ trunk/src_plugins/export_openscad/scadcomp.c	(revision 4966)
@@ -533,7 +533,7 @@
 	fprintf(scad_output, "module all_components() {\n");
 
 
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		if ((mode == SCAD_COMPONENT_SIMPLE) || (mode == SCAD_COMPONENT_REALISTIC)) {
 			scad_export_element(element, (mode == SCAD_COMPONENT_SIMPLE) ? 1 : 0);
Index: trunk/src_plugins/export_test/export_test.c
===================================================================
--- trunk/src_plugins/export_test/export_test.c	(revision 4965)
+++ trunk/src_plugins/export_test/export_test.c	(revision 4966)
@@ -141,7 +141,7 @@
 	 * While here generate the export_test list
 	 */
 
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 
 		/* initialize our pin count and our totals for finding the
Index: trunk/src_plugins/export_xy/xy.c
===================================================================
--- trunk/src_plugins/export_xy/xy.c	(revision 4965)
+++ trunk/src_plugins/export_xy/xy.c	(revision 4966)
@@ -184,7 +184,7 @@
 	 * For each element we calculate the centroid of the footprint.
 	 */
 
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		/* initialize our pin count and our totals for finding the
 		   centriod */
Index: trunk/src_plugins/hid_gtk/gui-drc-window.c
===================================================================
--- trunk/src_plugins/hid_gtk/gui-drc-window.c	(revision 4965)
+++ trunk/src_plugins/hid_gtk/gui-drc-window.c	(revision 4966)
@@ -101,7 +101,7 @@
 		}
 	}
 	END_LOOP;
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		PIN_LOOP(element);
 		{
Index: trunk/src_plugins/hid_gtk/gui-pinout-preview.c
===================================================================
--- trunk/src_plugins/hid_gtk/gui-pinout-preview.c	(revision 4965)
+++ trunk/src_plugins/hid_gtk/gui-pinout-preview.c	(revision 4966)
@@ -88,7 +88,7 @@
 
 	pinout_set_view(pinout);
 
-	ELEMENTLINE_LOOP(&pinout->element);
+	PCB_ELEMENT_LINE_LOOP(&pinout->element);
 	{
 		line->Thickness = 0;
 	}
Index: trunk/src_plugins/hid_lesstif/netlist.c
===================================================================
--- trunk/src_plugins/hid_lesstif/netlist.c	(revision 4965)
+++ trunk/src_plugins/hid_lesstif/netlist.c	(revision 4966)
@@ -210,7 +210,7 @@
 	}
 	*pname++ = 0;
 
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		char *es = element->Name[NAMEONPCB_INDEX].TextString;
 		if (es && strcmp(es, ename) == 0) {
Index: trunk/src_plugins/renumber/renumber.c
===================================================================
--- trunk/src_plugins/renumber/renumber.c	(revision 4965)
+++ trunk/src_plugins/renumber/renumber.c	(revision 4966)
@@ -142,7 +142,7 @@
 
 	cnt = 0;
 	lock_cnt = 0;
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		if (PCB_FLAG_TEST(PCB_FLAG_LOCK, element->Name) || PCB_FLAG_TEST(PCB_FLAG_LOCK, element)) {
 			/*
Index: trunk/src_plugins/renumber/renumberblock.c
===================================================================
--- trunk/src_plugins/renumber/renumberblock.c	(revision 4965)
+++ trunk/src_plugins/renumber/renumberblock.c	(revision 4966)
@@ -49,7 +49,7 @@
 
 	conf_set_editor(name_on_pcb, 1);
 
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		char *refdes_split, *cp;
 		char *old_ref, *new_ref;
@@ -94,7 +94,7 @@
 
 	conf_set_editor(name_on_pcb, 1);
 
-	ELEMENT_LOOP(PCB_PASTEBUFFER->Data);
+	PCB_ELEMENT_LOOP(PCB_PASTEBUFFER->Data);
 	{
 		char *refdes_split, *cp;
 		char *old_ref, *new_ref;
Index: trunk/src_plugins/report/report.c
===================================================================
--- trunk/src_plugins/report/report.c	(revision 4965)
+++ trunk/src_plugins/report/report.c	(revision 4966)
@@ -479,7 +479,7 @@
 
 	gds_init(&list);
 	gds_append_str(&list, "The following pins/pads are FOUND:\n");
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		PIN_LOOP(element);
 		{
@@ -577,7 +577,7 @@
 		}
 		*pname++ = 0;
 
-		ELEMENT_LOOP(PCB->Data);
+		PCB_ELEMENT_LOOP(PCB->Data);
 		{
 			char *es = element->Name[NAMEONPCB_INDEX].TextString;
 			if (es && strcmp(es, ename) == 0) {
@@ -656,7 +656,7 @@
 		return 1;
 	}
 
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		PIN_LOOP(element);
 		{
Index: trunk/src_plugins/smartdisperse/smartdisperse.c
===================================================================
--- trunk/src_plugins/smartdisperse/smartdisperse.c	(revision 4965)
+++ trunk/src_plugins/smartdisperse/smartdisperse.c	(revision 4966)
@@ -169,7 +169,7 @@
 	htpi_init(&visited, ptrhash, ptrkeyeq);
 
 	/* if we're not doing all, mark the unselected elements as "visited" */
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		if (!(all || PCB_FLAG_TEST(PCB_FLAG_SELECTED, element))) {
 			set_visited(element);
@@ -246,7 +246,7 @@
 	END_LOOP;
 
 	/* Place up anything else */
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		if (!is_visited(element)) {
 			place(element);
Index: trunk/src_plugins/toporouter/toporouter.c
===================================================================
--- trunk/src_plugins/toporouter/toporouter.c	(revision 4965)
+++ trunk/src_plugins/toporouter/toporouter.c	(revision 4966)
@@ -1814,7 +1814,7 @@
 	if (l - r->layers != front && l - r->layers != back)
 		return 0;
 
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		PAD_LOOP(element);
 		{
@@ -1977,7 +1977,7 @@
 	GList *vlist = NULL;
 	toporouter_bbox_t *bbox = NULL;
 
-	ELEMENT_LOOP(PCB->Data);
+	PCB_ELEMENT_LOOP(PCB->Data);
 	{
 		PIN_LOOP(element);
 		{
Index: trunk/src_plugins/vendordrill/vendor.c
===================================================================
--- trunk/src_plugins/vendordrill/vendor.c	(revision 4965)
+++ trunk/src_plugins/vendordrill/vendor.c	(revision 4966)
@@ -339,7 +339,7 @@
 		END_LOOP;
 
 		/* and now the pins */
-		ELEMENT_LOOP(PCB->Data);
+		PCB_ELEMENT_LOOP(PCB->Data);
 		{
 			/*
 			 * first figure out if this element should be skipped for some