Index: select.c
===================================================================
--- select.c	(revision 12594)
+++ select.c	(revision 12595)
@@ -51,7 +51,7 @@
 #include "obj_poly_draw.h"
 #include "obj_text_draw.h"
 #include "obj_rat_draw.h"
-#include "obj_padstack_draw.h"
+#include "obj_pstk_draw.h"
 
 #include <genregex/regex_sei.h>
 
@@ -129,8 +129,8 @@
 
 	case PCB_TYPE_PADSTACK:
 		pcb_undo_add_obj_to_flag(ptr1);
-		PCB_FLAG_TOGGLE(PCB_FLAG_SELECTED, (pcb_padstack_t *) ptr1);
-		pcb_padstack_invalidate_draw((pcb_padstack_t *) ptr1);
+		PCB_FLAG_TOGGLE(PCB_FLAG_SELECTED, (pcb_pstk_t *) ptr1);
+		pcb_pstk_invalidate_draw((pcb_pstk_t *) ptr1);
 		break;
 
 	case PCB_TYPE_LINE:
@@ -492,12 +492,12 @@
 
 		PCB_PADSTACK_LOOP(pcb->Data);
 		{
-			if (pcb_padstack_near_box(padstack, Box)
+			if (pcb_pstk_near_box(padstack, Box)
 					&& !PCB_FLAG_TEST(PCB_FLAG_LOCK, padstack)
 					&& PCB_FLAG_TEST(PCB_FLAG_SELECTED, padstack) != Flag) {
 				append(PCB_TYPE_PADSTACK, padstack, padstack);
 				if (pcb->ViaOn)
-					pcb_padstack_invalidate_draw(padstack);
+					pcb_pstk_invalidate_draw(padstack);
 			}
 		}
 		PCB_END_LOOP;
@@ -531,7 +531,7 @@
 		case PCB_OBJ_POLYGON: return PCB_POLYGON_NEAR_BOX((pcb_poly_t *)obj, box);
 		case PCB_OBJ_ARC:  return PCB_ARC_NEAR_BOX((pcb_arc_t *)obj, box);
 		case PCB_OBJ_PAD:  return PCB_PAD_NEAR_BOX((pcb_pad_t *)obj, box);
-		case PCB_OBJ_PADSTACK: return pcb_padstack_near_box((pcb_padstack_t *)obj, box);
+		case PCB_OBJ_PADSTACK: return pcb_pstk_near_box((pcb_pstk_t *)obj, box);
 		case PCB_OBJ_PIN:
 		case PCB_OBJ_VIA:  return PCB_VIA_OR_PIN_NEAR_BOX((pcb_pin_t *)obj, box);
 		case PCB_OBJ_ELEMENT: return PCB_ELEMENT_NEAR_BOX((pcb_element_t *)obj, box);