Index: trunk/doc-rnd/hacking/renames
===================================================================
--- trunk/doc-rnd/hacking/renames	(revision 4953)
+++ trunk/doc-rnd/hacking/renames	(revision 4954)
@@ -563,3 +563,5 @@
 MirrorElementCoordinates -> pcb_element_mirror
 MovePolygonLowLevel -> pcb_poly_move
 CopyPolygonLowLevel -> pcb_poly_copy
+MOVE_TEXT_LOWLEVEL -> pcb_text_move
+TEXT_IS_VISIBLE -> pcb_text_is_visible
Index: trunk/src/obj_elem.c
===================================================================
--- trunk/src/obj_elem.c	(revision 4953)
+++ trunk/src/obj_elem.c	(revision 4954)
@@ -1035,7 +1035,7 @@
 	{
 		if (Data && Data->name_tree[n])
 			r_delete_entry(PCB->Data->name_tree[n], (pcb_box_t *) text);
-		MOVE_TEXT_LOWLEVEL(text, DX, DY);
+		pcb_text_move(text, DX, DY);
 		if (Data && Data->name_tree[n])
 			r_insert_entry(PCB->Data->name_tree[n], (pcb_box_t *) text, 0);
 	}
@@ -1536,7 +1536,7 @@
 		{
 			if (PCB->Data->name_tree[n])
 				r_delete_entry(PCB->Data->name_tree[n], (pcb_box_t *) text);
-			MOVE_TEXT_LOWLEVEL(text, ctx->move.dx, ctx->move.dy);
+			pcb_text_move(text, ctx->move.dx, ctx->move.dy);
 			if (PCB->Data->name_tree[n])
 				r_insert_entry(PCB->Data->name_tree[n], (pcb_box_t *) text, 0);
 		}
@@ -1549,7 +1549,7 @@
 		{
 			if (PCB->Data->name_tree[n])
 				r_delete_entry(PCB->Data->name_tree[n], (pcb_box_t *) text);
-			MOVE_TEXT_LOWLEVEL(text, ctx->move.dx, ctx->move.dy);
+			pcb_text_move(text, ctx->move.dx, ctx->move.dy);
 			if (PCB->Data->name_tree[n])
 				r_insert_entry(PCB->Data->name_tree[n], (pcb_box_t *) text, 0);
 		}
Index: trunk/src/obj_text.c
===================================================================
--- trunk/src/obj_text.c	(revision 4953)
+++ trunk/src/obj_text.c	(revision 4954)
@@ -341,12 +341,12 @@
 	r_delete_entry(Layer->text_tree, (pcb_box_t *) Text);
 	if (Layer->On) {
 		EraseText(Layer, Text);
-		MOVE_TEXT_LOWLEVEL(Text, ctx->move.dx, ctx->move.dy);
+		pcb_text_move(Text, ctx->move.dx, ctx->move.dy);
 		DrawText(Layer, Text);
 		pcb_draw();
 	}
 	else
-		MOVE_TEXT_LOWLEVEL(Text, ctx->move.dx, ctx->move.dy);
+		pcb_text_move(Text, ctx->move.dx, ctx->move.dy);
 	r_insert_entry(Layer->text_tree, (pcb_box_t *) Text, 0);
 	ClearFromPolygon(PCB->Data, PCB_TYPE_TEXT, Layer, Text);
 	return (Text);
Index: trunk/src/obj_text.h
===================================================================
--- trunk/src/obj_text.h	(revision 4953)
+++ trunk/src/obj_text.h	(revision 4954)
@@ -54,7 +54,7 @@
 void pcb_text_bbox(pcb_font_t *FontPtr, pcb_text_t *Text);
 void pcb_text_rotate90(pcb_text_t *Text, pcb_coord_t X, pcb_coord_t Y, unsigned Number);
 
-#define	MOVE_TEXT_LOWLEVEL(t,dx,dy)                                  \
+#define	pcb_text_move(t,dx,dy)                                  \
 	{                                                                  \
 		pcb_coord_t __dx__ = (dx), __dy__ = (dy);                        \
 		pcb_text_t *__t__ = (t);                                         \
@@ -63,7 +63,7 @@
 	}
 
 /* Determines if text is actually visible */
-#define TEXT_IS_VISIBLE(b, l, t)      ((l)->On)
+#define pcb_text_is_visible(b, l, t)      ((l)->On)
 
 #define TEXT_LOOP(layer) do {                                       \
   pcb_text_t *text;                                                   \
@@ -83,6 +83,6 @@
 	for (l = 0; l < max_copper_layer + 2; l++, layer++)      \
 	{                                                        \
 		TEXT_LOOP(layer);                                      \
-		if (TEXT_IS_VISIBLE((board), layer, text))
+		if (pcb_text_is_visible((board), layer, text))
 
 #endif
Index: trunk/src/select.c
===================================================================
--- trunk/src/select.c	(revision 4953)
+++ trunk/src/select.c	(revision 4954)
@@ -333,12 +333,12 @@
 		END_LOOP;
 		TEXT_LOOP(layer);
 		{
-			if (!Flag || TEXT_IS_VISIBLE(PCB, layer, text)) {
+			if (!Flag || pcb_text_is_visible(PCB, layer, text)) {
 				if (TEXT_NEAR_BOX(text, Box)
 						&& !PCB_FLAG_TEST(PCB_FLAG_LOCK, text)
 						&& PCB_FLAG_TEST(PCB_FLAG_SELECTED, text) != Flag) {
 					append(PCB_TYPE_TEXT, layer, text);
-					if (TEXT_IS_VISIBLE(PCB, layer, text))
+					if (pcb_text_is_visible(PCB, layer, text))
 						DrawText(layer, text);
 				}
 			}
@@ -594,7 +594,7 @@
 	if (type & PCB_TYPE_TEXT && F->Text)
 		ALLTEXT_LOOP(PCB->Data);
 	{
-		if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, text) && TEXT_IS_VISIBLE(PCB, layer, text)) {
+		if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, text) && pcb_text_is_visible(PCB, layer, text)) {
 			if (Reset) {
 				AddObjectToFlagUndoList(PCB_TYPE_TEXT, layer, text, text);
 				PCB_FLAG_CLEAR(PCB_FLAG_SELECTED, text);
@@ -889,7 +889,7 @@
 		ALLTEXT_LOOP(PCB->Data);
 	{
 		if (!PCB_FLAG_TEST(PCB_FLAG_LOCK, text)
-				&& TEXT_IS_VISIBLE(PCB, layer, text)
+				&& pcb_text_is_visible(PCB, layer, text)
 				&& text->TextString && REGEXEC(text->TextString)
 				&& PCB_FLAG_TEST(PCB_FLAG_SELECTED, text) != Flag) {
 			AddObjectToFlagUndoList(PCB_TYPE_TEXT, layer, text, text);
Index: trunk/src_plugins/autocrop/autocrop.c
===================================================================
--- trunk/src_plugins/autocrop/autocrop.c	(revision 4953)
+++ trunk/src_plugins/autocrop/autocrop.c	(revision 4954)
@@ -121,7 +121,7 @@
 {
 	if (Layer)
 		r_delete_entry(Layer->text_tree, (pcb_box_t *) Text);
-	MOVE_TEXT_LOWLEVEL(Text, dx, dy);
+	pcb_text_move(Text, dx, dy);
 	if (Layer)
 		r_insert_entry(Layer->text_tree, (pcb_box_t *) Text, 0);
 	return Text;
Index: trunk/src_plugins/distaligntext/distaligntext.c
===================================================================
--- trunk/src_plugins/distaligntext/distaligntext.c	(revision 4953)
+++ trunk/src_plugins/distaligntext/distaligntext.c	(revision 4954)
@@ -592,7 +592,7 @@
 			 * pcb_move_obj() is better as in aligntext(), but we
 			 * didn't keep the element reference when sorting.
 			 */
-			MOVE_TEXT_LOWLEVEL(text, dx, dy);
+			pcb_text_move(text, dx, dy);
 			AddObjectToMoveUndoList(type, NULL, NULL, text, dx, dy);
 			changed = 1;
 		}