Index: trunk/doc-rnd/hacking/renames
===================================================================
--- trunk/doc-rnd/hacking/renames	(revision 4962)
+++ trunk/doc-rnd/hacking/renames	(revision 4963)
@@ -568,3 +568,5 @@
 MOVE_ARC_LOWLEVEL -> pcb_arc_move
 MOVE_LINE_LOWLEVEL -> pcb_line_move
 MOVE_PAD_LOWLEVEL -> pcb_pad_move
+MOVE_PIN_LOWLEVEL -> pcb_pin_move
+MOVE_VIA_LOWLEVEL -> pcb_via_move
Index: trunk/src/obj_elem.c
===================================================================
--- trunk/src/obj_elem.c	(revision 4962)
+++ trunk/src/obj_elem.c	(revision 4963)
@@ -1006,7 +1006,7 @@
 			r_delete_entry(Data->pin_tree, (pcb_box_t *) pin);
 			RestoreToPolygon(Data, PCB_TYPE_PIN, Element, pin);
 		}
-		MOVE_PIN_LOWLEVEL(pin, DX, DY);
+		pcb_pin_move(pin, DX, DY);
 		if (Data) {
 			r_insert_entry(Data->pin_tree, (pcb_box_t *) pin, 0);
 			ClearFromPolygon(Data, PCB_TYPE_PIN, Element, pin);
Index: trunk/src/obj_pinvia.c
===================================================================
--- trunk/src/obj_pinvia.c	(revision 4962)
+++ trunk/src/obj_pinvia.c	(revision 4963)
@@ -718,7 +718,7 @@
 {
 	r_delete_entry(PCB->Data->via_tree, (pcb_box_t *) Via);
 	RestoreToPolygon(PCB->Data, PCB_TYPE_VIA, Via, Via);
-	MOVE_VIA_LOWLEVEL(Via, ctx->move.dx, ctx->move.dy);
+	pcb_via_move(Via, ctx->move.dx, ctx->move.dy);
 	if (PCB->ViaOn)
 		EraseVia(Via);
 	r_insert_entry(PCB->Data->via_tree, (pcb_box_t *) Via, 0);
Index: trunk/src/obj_pinvia.h
===================================================================
--- trunk/src/obj_pinvia.h	(revision 4962)
+++ trunk/src/obj_pinvia.h	(revision 4963)
@@ -62,7 +62,7 @@
 	: (pinptr)->Thickness)
 
 
-#define	MOVE_VIA_LOWLEVEL(v,dx,dy) \
+#define pcb_via_move(v,dx,dy) \
 	{ \
 		pcb_coord_t __dx__ = (dx), __dy__ = (dy); \
 		pcb_pin_t *__v__ = (v); \
@@ -70,7 +70,7 @@
 		PCB_BOX_MOVE_LOWLEVEL(&((__v__)->BoundingBox),(__dx__),(__dy__)); \
 	}
 
-#define	MOVE_PIN_LOWLEVEL(p,dx,dy) MOVE_VIA_LOWLEVEL(p, dx, dy)
+#define pcb_pin_move(p,dx,dy) pcb_via_move(p, dx, dy)
 
 #define VIA_LOOP(top) do {                                          \
   pcb_pin_t *via;                                                     \
Index: trunk/src_plugins/autocrop/autocrop.c
===================================================================
--- trunk/src_plugins/autocrop/autocrop.c	(revision 4962)
+++ trunk/src_plugins/autocrop/autocrop.c	(revision 4963)
@@ -67,7 +67,7 @@
 		RestoreToPolygon(Data, PCB_TYPE_VIA, Via, Via);
 		r_delete_entry(Data->via_tree, (pcb_box_t *) Via);
 	}
-	MOVE_VIA_LOWLEVEL(Via, dx, dy);
+	pcb_via_move(Via, dx, dy);
 	if (Data) {
 		r_insert_entry(Data->via_tree, (pcb_box_t *) Via, 0);
 		ClearFromPolygon(Data, PCB_TYPE_VIA, Via, Via);