Index: trunk/src/const.h
===================================================================
--- trunk/src/const.h	(revision 12595)
+++ trunk/src/const.h	(revision 12596)
@@ -80,10 +80,10 @@
 	PCB_TYPE_NET           = 0x40000, /* used to select whole net. */
 
 	PCB_TYPE_ARC_POINT     = 0x80000,
-	PCB_TYPE_PADSTACK      = 0x100000,
+	PCB_TYPE_PSTK          = 0x100000,
 
 	/* groups/properties */
-	PCB_TYPEMASK_PIN       = (PCB_TYPE_VIA | PCB_TYPE_PIN | PCB_TYPE_PADSTACK | PCB_TYPE_SUBC_PART),
+	PCB_TYPEMASK_PIN       = (PCB_TYPE_VIA | PCB_TYPE_PIN | PCB_TYPE_PSTK | PCB_TYPE_SUBC_PART),
 	PCB_TYPEMASK_TERM      = (PCB_TYPEMASK_PIN | PCB_TYPE_SUBC_PART | PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_POLYGON | PCB_TYPE_TEXT),
 	PCB_TYPEMASK_LOCK      = (PCB_TYPE_VIA | PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_POLYGON | PCB_TYPE_ELEMENT | PCB_TYPE_SUBC | PCB_TYPE_TEXT | PCB_TYPE_ELEMENT_NAME | PCB_TYPE_LOCKED),
 
Index: trunk/src/copy.h
===================================================================
--- trunk/src/copy.h	(revision 12595)
+++ trunk/src/copy.h	(revision 12596)
@@ -35,7 +35,7 @@
  * some defines
  */
 #define	PCB_COPY_TYPES              \
-	(PCB_TYPE_VIA | PCB_TYPE_PADSTACK | PCB_TYPE_LINE | PCB_TYPE_TEXT | PCB_TYPE_ELEMENT | \
+	(PCB_TYPE_VIA | PCB_TYPE_PSTK | PCB_TYPE_LINE | PCB_TYPE_TEXT | PCB_TYPE_ELEMENT | \
 	PCB_TYPE_SUBC | PCB_TYPE_ELEMENT_NAME | PCB_TYPE_POLYGON | PCB_TYPE_ARC)
 
 void *pcb_copy_obj(int, void *, void *, void *, pcb_coord_t, pcb_coord_t);
Index: trunk/src/crosshair.c
===================================================================
--- trunk/src/crosshair.c	(revision 12595)
+++ trunk/src/crosshair.c	(revision 12596)
@@ -349,7 +349,7 @@
 			break;
 		}
 
-	case PCB_TYPE_PADSTACK:
+	case PCB_TYPE_PSTK:
 		{
 			pcb_pstk_t *ps = (pcb_pstk_t *) pcb_crosshair.AttachedObject.Ptr1;
 			thindraw_moved_ps(ps, dx, dy);
Index: trunk/src/data.c
===================================================================
--- trunk/src/data.c	(revision 12595)
+++ trunk/src/data.c	(revision 12596)
@@ -576,7 +576,7 @@
 	if (types & PCB_OBJ_RAT)  rsearch(data->rat_tree);
 	if (types & PCB_OBJ_PIN)  rsearch(data->pin_tree);
 	if (types & PCB_OBJ_PAD)  rsearch(data->pad_tree);
-	if (types & PCB_OBJ_PADSTACK)  rsearch(data->padstack_tree);
+	if (types & PCB_OBJ_PSTK)  rsearch(data->padstack_tree);
 	if (types & PCB_OBJ_SUBC) rsearch(data->subc_tree);
 
 
Index: trunk/src/draw.c
===================================================================
--- trunk/src/draw.c	(revision 12595)
+++ trunk/src/draw.c	(revision 12596)
@@ -672,7 +672,7 @@
 		if (PCB->ViaOn)
 			pcb_via_invalidate_draw((pcb_pin_t *)obj);
 		break;
-	case PCB_OBJ_PADSTACK:
+	case PCB_OBJ_PSTK:
 		if (PCB->ViaOn)
 			pcb_pstk_invalidate_draw((pcb_pstk_t *)obj);
 		break;
Index: trunk/src/find.h
===================================================================
--- trunk/src/find.h	(revision 12595)
+++ trunk/src/find.h	(revision 12596)
@@ -55,7 +55,7 @@
  * some local defines
  */
 #define PCB_LOOKUP_FIRST	\
-	(PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_PADSTACK)
+	(PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_PSTK)
 #define PCB_LOOKUP_MORE	\
 	(PCB_TYPE_VIA | PCB_TYPE_LINE | PCB_TYPE_RATLINE | PCB_TYPE_POLYGON | PCB_TYPE_ARC | PCB_TYPE_SUBC_PART)
 #define PCB_SILK_TYPE	\
Index: trunk/src/find_drc.c
===================================================================
--- trunk/src/find_drc.c	(revision 12595)
+++ trunk/src/find_drc.c	(revision 12596)
@@ -108,7 +108,7 @@
 	case PCB_TYPE_POLYGON:
 	case PCB_TYPE_PIN:
 	case PCB_TYPE_VIA:
-	case PCB_TYPE_PADSTACK:
+	case PCB_TYPE_PSTK:
 	case PCB_TYPE_PAD:
 	case PCB_TYPE_ELEMENT:
 	case PCB_TYPE_RATLINE:
@@ -161,7 +161,7 @@
 			*y = pin->Y;
 			break;
 		}
-	case PCB_TYPE_PADSTACK:
+	case PCB_TYPE_PSTK:
 		{
 			pcb_pstk_t *ps = (pcb_pstk_t *) thing_ptr3;
 			*x = ps->x;
@@ -293,7 +293,7 @@
 			goto doIsBad;
 		}
 		break;
-	case PCB_TYPE_PADSTACK:
+	case PCB_TYPE_PSTK:
 		if (pcb_pstk_drc_check_clearance(ps, polygon, 2 * PCB->Bloat) != 0) {
 			pcb_undo_add_obj_to_flag(ptr2);
 			PCB_FLAG_SET(TheFlag, pin);
@@ -412,7 +412,7 @@
 	PCB_PADSTACK_LOOP(PCB->Data);
 	{
 		if (!PCB_FLAG_TEST(PCB_FLAG_DRC, padstack)
-				&& DRCFind(PCB_TYPE_PADSTACK, (void *) padstack, (void *) padstack, (void *) padstack)) {
+				&& DRCFind(PCB_TYPE_PSTK, (void *) padstack, (void *) padstack, (void *) padstack)) {
 			IsBad = pcb_true;
 			break;
 		}
Index: trunk/src/find_lookup.c
===================================================================
--- trunk/src/find_lookup.c	(revision 12595)
+++ trunk/src/find_lookup.c	(revision 12596)
@@ -70,7 +70,7 @@
 	if (User)
 		pcb_undo_add_obj_to_flag(ps);
 	PCB_FLAG_SET(TheFlag, ps);
-	make_callback(PCB_TYPE_PADSTACK, ps, from_type, from_ptr, type);
+	make_callback(PCB_TYPE_PSTK, ps, from_type, from_ptr, type);
 	PADSTACKLIST_ENTRY(PadstackList.Number) = ps;
 	PadstackList.Number++;
 #ifdef DEBUG
@@ -89,7 +89,7 @@
 	if (User)
 		pcb_undo_add_obj_to_flag(ps);
 	PCB_FLAG_SET(TheFlag, ps);
-	make_callback(PCB_TYPE_PADSTACK, ps, from_type, from_ptr, type);
+	make_callback(PCB_TYPE_PSTK, ps, from_type, from_ptr, type);
 	PADSTACKLIST_ENTRY(PVList.Number) = ps;
 	PadstackList.Number++;
 #ifdef DEBUG
@@ -97,7 +97,7 @@
 		printf("ADD_PADSTACK_TO_LIST overflow! num=%d size=%d\n", PVList.Number, PVList.Size);
 #endif
 	if (drc && !PCB_FLAG_TEST(PCB_FLAG_SELECTED, ps) && (ps->parent.data->parent_type == PCB_PARENT_SUBC))
-		return (SetThing(PCB_TYPE_PADSTACK, ps->parent.data->parent.subc, ps, ps));
+		return (SetThing(PCB_TYPE_PSTK, ps->parent.data->parent.subc, ps, ps));
 	return pcb_false;
 }
 
@@ -453,7 +453,7 @@
 	struct ps_info *i = (struct ps_info *) cl;
 
 	if (!PCB_FLAG_TEST(TheFlag, line) && pcb_pstk_intersect_line(&i->ps, line)) {
-		if (ADD_LINE_TO_LIST(i->layer, line, PCB_TYPE_PADSTACK, &i->ps, PCB_FCT_COPPER))
+		if (ADD_LINE_TO_LIST(i->layer, line, PCB_TYPE_PSTK, &i->ps, PCB_FCT_COPPER))
 			longjmp(i->env, 1);
 	}
 	return PCB_R_DIR_NOT_FOUND;
@@ -465,7 +465,7 @@
 	struct ps_info *i = (struct ps_info *) cl;
 
 	if (!PCB_FLAG_TEST(TheFlag, arc) && pcb_pstk_intersect_arc(&i->ps, arc)) {
-		if (ADD_ARC_TO_LIST(i->layer, arc, PCB_TYPE_PADSTACK, &i->ps, PCB_FCT_COPPER))
+		if (ADD_ARC_TO_LIST(i->layer, arc, PCB_TYPE_PSTK, &i->ps, PCB_FCT_COPPER))
 			longjmp(i->env, 1);
 	}
 	return PCB_R_DIR_NOT_FOUND;
@@ -487,7 +487,7 @@
 	struct ps_info *i = (struct ps_info *) cl;
 
 	if (!PCB_FLAG_TEST(TheFlag, polygon) && pcb_pstk_intersect_poly(&i->ps, polygon)) {
-		if (ADD_POLYGON_TO_LIST(i->layer, polygon, PCB_TYPE_PADSTACK, &i->ps, PCB_FCT_COPPER))
+		if (ADD_POLYGON_TO_LIST(i->layer, polygon, PCB_TYPE_PSTK, &i->ps, PCB_FCT_COPPER))
 			longjmp(i->env, 1);
 	}
 
@@ -576,7 +576,7 @@
 
 		/* subc intconn jumps */
 		if ((orig_ps->term != NULL) && (orig_ps->intconn > 0))
-			LOC_int_conn_subc(pcb_gobj_parent_subc(orig_ps->parent_type, &orig_ps->parent), orig_ps->intconn, PCB_TYPE_PADSTACK, orig_ps);
+			LOC_int_conn_subc(pcb_gobj_parent_subc(orig_ps->parent_type, &orig_ps->parent), orig_ps->intconn, PCB_TYPE_PSTK, orig_ps);
 
 		/* now all lines, arcs and polygons of the several layers */
 		for(layer = 0; layer < pcb_max_layer; layer++) {
Index: trunk/src/find_misc.c
===================================================================
--- trunk/src/find_misc.c	(revision 12595)
+++ trunk/src/find_misc.c	(revision 12596)
@@ -180,7 +180,7 @@
 			break;
 		}
 
-	case PCB_OBJ_PADSTACK:
+	case PCB_OBJ_PSTK:
 		{
 			if (ADD_PADSTACK_TO_LIST((pcb_pstk_t *)obj, 0, NULL, PCB_FCT_START))
 				return pcb_true;
@@ -308,7 +308,7 @@
 		case PCB_OBJ_PAD:     return PCB_TYPE_PAD;
 		case PCB_OBJ_PIN:     return PCB_TYPE_PIN;
 		case PCB_OBJ_VIA:     return PCB_TYPE_VIA;
-		case PCB_OBJ_PADSTACK:return PCB_TYPE_PADSTACK;
+		case PCB_OBJ_PSTK:return PCB_TYPE_PSTK;
 		case PCB_OBJ_ELEMENT: return PCB_TYPE_ELEMENT;
 		case PCB_OBJ_SUBC:    return PCB_TYPE_SUBC;
 
Index: trunk/src/flag_str.c
===================================================================
--- trunk/src/flag_str.c	(revision 12595)
+++ trunk/src/flag_str.c	(revision 12596)
@@ -62,7 +62,7 @@
 	{FN(PCB_FLAG_CLEARPOLY),     N("clearpoly"),     PCB_TYPE_POLYGON, "For polygons, this flag means that pins and vias will normally clear these polygons (thus, thermals are required for electrical connection).  When clear, polygons will solidly connect to pins and vias. " },
 	{FN(PCB_FLAG_HIDENAME),      N("hidename"),      PCB_TYPE_ELEMENT, "For elements, when set the name of the element is hidden." },
 	{FN(PCB_FLAG_DISPLAYNAME),   N("showname"),      PCB_TYPE_ELEMENT, "OBSOLETE: For elements, when set the names of pins are shown." },
-	{FN(PCB_FLAG_CLEARLINE),     N("clearline"),     PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_TEXT | PCB_TYPE_PADSTACK, "For lines and arcs, the line/arc will clear polygons instead of connecting to them." },
+	{FN(PCB_FLAG_CLEARLINE),     N("clearline"),     PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_TEXT | PCB_TYPE_PSTK, "For lines and arcs, the line/arc will clear polygons instead of connecting to them." },
 	{FN(PCB_FLAG_SELECTED),      N("selected"),      PCB_TYPEMASK_ALL, "Set when the object is selected."},
 	{FN(PCB_FLAG_ONSOLDER),      N("onsolder"),      PCB_TYPE_ELEMENT | PCB_TYPE_PAD | PCB_TYPE_TEXT, "For elements and pads, indicates that they are on the solder side."},
 	{FN(PCB_FLAG_AUTO),          N("auto"),          PCB_TYPEMASK_ALL, "For lines and vias, indicates that these were created by the autorouter."},
Index: trunk/src/move.h
===================================================================
--- trunk/src/move.h	(revision 12595)
+++ trunk/src/move.h	(revision 12596)
@@ -41,7 +41,7 @@
 	}
 
 #define	PCB_MOVE_TYPES	\
-	(PCB_TYPE_VIA | PCB_TYPE_PADSTACK | PCB_TYPE_LINE | PCB_TYPE_TEXT | PCB_TYPE_ELEMENT | PCB_TYPE_SUBC | PCB_TYPE_ELEMENT_NAME |	\
+	(PCB_TYPE_VIA | PCB_TYPE_PSTK | PCB_TYPE_LINE | PCB_TYPE_TEXT | PCB_TYPE_ELEMENT | PCB_TYPE_SUBC | PCB_TYPE_ELEMENT_NAME |	\
 	PCB_TYPE_POLYGON | PCB_TYPE_POLYGON_POINT | PCB_TYPE_LINE_POINT | PCB_TYPE_ARC | PCB_TYPE_ARC_POINT)
 #define	PCB_MOVETOLAYER_TYPES	\
 	(PCB_TYPE_LINE | PCB_TYPE_TEXT | PCB_TYPE_POLYGON | PCB_TYPE_RATLINE | PCB_TYPE_ARC)
Index: trunk/src/obj_common.c
===================================================================
--- trunk/src/obj_common.c	(revision 12595)
+++ trunk/src/obj_common.c	(revision 12596)
@@ -51,7 +51,7 @@
 		case PCB_OBJ_PAD:     return "pad";
 		case PCB_OBJ_PIN:     return "pin";
 		case PCB_OBJ_VIA:     return "via";
-		case PCB_OBJ_PADSTACK:return "padstack";
+		case PCB_OBJ_PSTK:return "padstack";
 		case PCB_OBJ_ELEMENT: return "element";
 		case PCB_OBJ_SUBC:    return "subcircuit";
 		case PCB_OBJ_NET:     return "net";
@@ -76,7 +76,7 @@
 	case PCB_TYPE_POLYGON:
 	case PCB_TYPE_PAD:
 	case PCB_TYPE_PIN:
-	case PCB_TYPE_PADSTACK:
+	case PCB_TYPE_PSTK:
 	case PCB_TYPE_ELEMENT_NAME:
 		*res = *(pcb_box_t *)Ptr2;
 		return 0;
Index: trunk/src/obj_common.h
===================================================================
--- trunk/src/obj_common.h	(revision 12595)
+++ trunk/src/obj_common.h	(revision 12596)
@@ -50,7 +50,7 @@
 	PCB_OBJ_VIA       = 0x000100,
 	PCB_OBJ_ELEMENT   = 0x000200,
 	PCB_OBJ_SUBC      = 0x000400,
-	PCB_OBJ_PADSTACK  = 0x000800,
+	PCB_OBJ_PSTK      = 0x000800,
 
 	/* more abstract objects */
 	PCB_OBJ_NET       = 0x100001,
Index: trunk/src/obj_pstk.c
===================================================================
--- trunk/src/obj_pstk.c	(revision 12595)
+++ trunk/src/obj_pstk.c	(revision 12596)
@@ -50,7 +50,7 @@
 
 	ps = calloc(sizeof(pcb_pstk_t), 1);
 	ps->protoi = -1;
-	ps->type = PCB_OBJ_PADSTACK;
+	ps->type = PCB_OBJ_PSTK;
 	ps->Attributes.post_change = pcb_obj_attrib_post_change;
 	PCB_SET_PARENT(ps, data, data);
 
@@ -456,7 +456,7 @@
 		return -1;
 	}
 
-	pcb_poly_restore_to_poly(ps->parent.data, PCB_TYPE_PADSTACK, NULL, ps);
+	pcb_poly_restore_to_poly(ps->parent.data, PCB_TYPE_PSTK, NULL, ps);
 	pcb_pstk_invalidate_erase(ps);
 
 	swap(ps->proto,      u->proto,     pcb_cardinal_t);
@@ -468,7 +468,7 @@
 	ps->protoi = -1;
 	pcb_pstk_get_tshape(ps);
 
-	pcb_poly_clear_from_poly(ps->parent.data, PCB_TYPE_PADSTACK, NULL, ps);
+	pcb_poly_clear_from_poly(ps->parent.data, PCB_TYPE_PSTK, NULL, ps);
 	pcb_pstk_invalidate_draw(ps);
 
 	return 0;
Index: trunk/src/obj_pstk.h
===================================================================
--- trunk/src/obj_pstk.h	(revision 12595)
+++ trunk/src/obj_pstk.h	(revision 12596)
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef PCB_OBJ_PADSTACK_STRUCT_DECLARED
-#define PCB_OBJ_PADSTACK_STRUCT_DECLARED
+#ifndef PCB_OBJ_PSTK_STRUCT_DECLARED
+#define PCB_OBJ_PSTK_STRUCT_DECLARED
 
 #include "obj_common.h"
 
@@ -45,8 +45,8 @@
 #endif
 
 #ifndef PCB_PADSTACK_STRUCT_ONLY
-#ifndef PCB_OBJ_PADSTACK_H
-#define PCB_OBJ_PADSTACK_H
+#ifndef PCB_OBJ_PSTK_H
+#define PCB_OBJ_PSTK_H
 
 #define PCB_PADSTACK_MAX_SHAPES 31
 
Index: trunk/src/obj_pstk_draw.h
===================================================================
--- trunk/src/obj_pstk_draw.h	(revision 12595)
+++ trunk/src/obj_pstk_draw.h	(revision 12596)
@@ -22,8 +22,8 @@
 
 #include "obj_pstk.h"
 
-#ifndef PCB_OBJ_PADSTACK_DRAW_H
-#define PCB_OBJ_PADSTACK_DRAW_H
+#ifndef PCB_OBJ_PSTK_DRAW_H
+#define PCB_OBJ_PSTK_DRAW_H
 
 /* Include rtree.h for these */
 #ifdef PCB_RTREE_H
Index: trunk/src/obj_pstk_inlines.h
===================================================================
--- trunk/src/obj_pstk_inlines.h	(revision 12595)
+++ trunk/src/obj_pstk_inlines.h	(revision 12596)
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef PCB_OBJ_PADSTACK_INLINES_H
-#define PCB_OBJ_PADSTACK_INLINES_H
+#ifndef PCB_OBJ_PSTK_INLINES_H
+#define PCB_OBJ_PSTK_INLINES_H
 
 #include "board.h"
 #include "data.h"
Index: trunk/src/obj_pstk_list.h
===================================================================
--- trunk/src/obj_pstk_list.h	(revision 12595)
+++ trunk/src/obj_pstk_list.h	(revision 12596)
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef PCB_OBJ_PADSTACK_LIST_H
-#define PCB_OBJ_PADSTACK_LIST_H
+#ifndef PCB_OBJ_PSTK_LIST_H
+#define PCB_OBJ_PSTK_LIST_H
 
 #define PCB_PADSTACK_STRUCT_ONLY
 #include "obj_pstk.h"
Index: trunk/src/obj_pstk_op.c
===================================================================
--- trunk/src/obj_pstk_op.c	(revision 12595)
+++ trunk/src/obj_pstk_op.c	(revision 12596)
@@ -44,7 +44,7 @@
 
 	npid = pcb_pstk_proto_insert_dup(ctx->buffer.dst, proto, 1);
 
-	pcb_poly_restore_to_poly(ctx->buffer.src, PCB_TYPE_PADSTACK, NULL, ps);
+	pcb_poly_restore_to_poly(ctx->buffer.src, PCB_TYPE_PSTK, NULL, ps);
 	pcb_r_delete_entry(ctx->buffer.src->padstack_tree, (pcb_box_t *)ps);
 
 	padstacklist_remove(ps);
@@ -57,7 +57,7 @@
 		ctx->buffer.dst->padstack_tree = pcb_r_create_tree(NULL, 0, 0);
 
 	pcb_r_insert_entry(ctx->buffer.dst->padstack_tree, (pcb_box_t *)ps, 0);
-	pcb_poly_clear_from_poly(ctx->buffer.dst, PCB_TYPE_PADSTACK, NULL, ps);
+	pcb_poly_clear_from_poly(ctx->buffer.dst, PCB_TYPE_PSTK, NULL, ps);
 
 	PCB_SET_PARENT(ps, data, ctx->buffer.dst);
 	return ps;
@@ -80,7 +80,7 @@
 
 	pcb_pstk_copy_meta(nps, ps);
 	pcb_pstk_invalidate_draw(nps);
-	pcb_undo_add_obj_to_create(PCB_TYPE_PADSTACK, data, nps, nps);
+	pcb_undo_add_obj_to_create(PCB_TYPE_PSTK, data, nps, nps);
 	return nps;
 }
 
@@ -99,10 +99,10 @@
 	assert(ps->parent_type = PCB_PARENT_DATA);
 
 	pcb_r_delete_entry(data->padstack_tree, (pcb_box_t *)ps);
-	pcb_poly_restore_to_poly(data, PCB_TYPE_PADSTACK, NULL, ps);
+	pcb_poly_restore_to_poly(data, PCB_TYPE_PSTK, NULL, ps);
 	pcb_pstkop_move_noclip(ctx, ps);
 	pcb_r_insert_entry(data->padstack_tree, (pcb_box_t *)ps, 0);
-	pcb_poly_clear_from_poly(data, PCB_TYPE_PADSTACK, NULL, ps);
+	pcb_poly_clear_from_poly(data, PCB_TYPE_PSTK, NULL, ps);
 	return ps;
 }
 
@@ -113,11 +113,11 @@
 
 	if (ctx->clip.restore) {
 		pcb_r_delete_entry(data->padstack_tree, (pcb_box_t *)ps);
-		pcb_poly_restore_to_poly(data, PCB_TYPE_PADSTACK, NULL, ps);
+		pcb_poly_restore_to_poly(data, PCB_TYPE_PSTK, NULL, ps);
 	}
 	if (ctx->clip.clear) {
 		pcb_r_insert_entry(data->padstack_tree, (pcb_box_t *)ps, 0);
-		pcb_poly_clear_from_poly(data, PCB_TYPE_PADSTACK, NULL, ps);
+		pcb_poly_clear_from_poly(data, PCB_TYPE_PSTK, NULL, ps);
 	}
 
 	return ps;
@@ -126,7 +126,7 @@
 void *pcb_pstkop_remove(pcb_opctx_t *ctx, pcb_pstk_t *ps)
 {
 	pcb_pstk_invalidate_erase(ps);
-	pcb_undo_move_obj_to_remove(PCB_TYPE_PADSTACK, ps, ps, ps);
+	pcb_undo_move_obj_to_remove(PCB_TYPE_PSTK, ps, ps, ps);
 	PCB_CLEAR_PARENT(ps);
 	return NULL;
 }
@@ -143,14 +143,14 @@
 	pcb_board_t *pcb = ctx->chgtherm.pcb;
 	pcb_layer_t *layer = pcb_get_layer(pcb->Data, ctx->chgtherm.lid);
 
-	pcb_undo_add_obj_to_clear_poly(PCB_TYPE_PADSTACK, ps, ps, ps, pcb_false);
-	pcb_poly_restore_to_poly(pcb->Data, PCB_TYPE_PADSTACK, layer, ps);
+	pcb_undo_add_obj_to_clear_poly(PCB_TYPE_PSTK, ps, ps, ps, pcb_false);
+	pcb_poly_restore_to_poly(pcb->Data, PCB_TYPE_PSTK, layer, ps);
 
 #warning TODO: undo
 	pcb_pstk_set_thermal(ps, ctx->chgtherm.lid, ctx->chgtherm.style);
 
-	pcb_undo_add_obj_to_clear_poly(PCB_TYPE_PADSTACK, ps, ps, ps, pcb_true);
-	pcb_poly_clear_from_poly(pcb->Data, PCB_TYPE_PADSTACK, layer, ps);
+	pcb_undo_add_obj_to_clear_poly(PCB_TYPE_PSTK, ps, ps, ps, pcb_true);
+	pcb_poly_clear_from_poly(pcb->Data, PCB_TYPE_PSTK, layer, ps);
 	pcb_pstk_invalidate_draw(ps);
 	return ps;
 }
Index: trunk/src/obj_pstk_shape.h
===================================================================
--- trunk/src/obj_pstk_shape.h	(revision 12595)
+++ trunk/src/obj_pstk_shape.h	(revision 12596)
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef PCB_OBJ_PADSTACK_SHAPE_H
-#define PCB_OBJ_PADSTACK_SHAPE_H
+#ifndef PCB_OBJ_PSTK_SHAPE_H
+#define PCB_OBJ_PSTK_SHAPE_H
 
 #include "unit.h"
 #include "polygon.h"
Index: trunk/src/operation.c
===================================================================
--- trunk/src/operation.c	(revision 12595)
+++ trunk/src/operation.c	(revision 12596)
@@ -100,7 +100,7 @@
 			return (F->Pad(ctx, (pcb_element_t *) Ptr1, (pcb_pad_t *) Ptr2));
 		break;
 
-	case PCB_TYPE_PADSTACK:
+	case PCB_TYPE_PSTK:
 		if (F->padstack)
 			return (F->padstack(ctx, (pcb_pstk_t *)Ptr2));
 		break;
@@ -293,7 +293,7 @@
 		PCB_END_LOOP;
 	}
 
-	if (type & PCB_TYPE_PADSTACK && pcb->ViaOn && F->padstack) {
+	if (type & PCB_TYPE_PSTK && pcb->ViaOn && F->padstack) {
 		PCB_PADSTACK_LOOP(pcb->Data);
 		{
 			if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, padstack)) {
Index: trunk/src/polygon.c
===================================================================
--- trunk/src/polygon.c	(revision 12595)
+++ trunk/src/polygon.c	(revision 12596)
@@ -1753,7 +1753,7 @@
 		SubtractPin(Data, (pcb_pin_t *) ptr2, Layer, Polygon);
 		Polygon->NoHolesValid = 0;
 		return PCB_R_DIR_FOUND_CONTINUE;
-	case PCB_TYPE_PADSTACK:
+	case PCB_TYPE_PSTK:
 		SubtractPadstack(Data, (pcb_pstk_t *) ptr2, Layer, Polygon);
 		Polygon->NoHolesValid = 0;
 		return PCB_R_DIR_FOUND_CONTINUE;
@@ -1791,7 +1791,7 @@
 	case PCB_TYPE_VIA:
 		UnsubtractPin((pcb_pin_t *) ptr2, Layer, Polygon);
 		return PCB_R_DIR_FOUND_CONTINUE;
-	case PCB_TYPE_PADSTACK:
+	case PCB_TYPE_PSTK:
 		UnsubtractPadstack(Data, (pcb_pstk_t *) ptr2, Layer, Polygon);
 		return PCB_R_DIR_FOUND_CONTINUE;
 	case PCB_TYPE_LINE:
@@ -1880,7 +1880,7 @@
 			PCB_END_LOOP;
 		}
 		break;
-	case PCB_TYPE_PADSTACK:
+	case PCB_TYPE_PSTK:
 		if (Data->parent_type != PCB_PARENT_BOARD)
 			return 0;
 		if (ptr1 == NULL) { /* no layer specified: run on all layers */
Index: trunk/src/remove.h
===================================================================
--- trunk/src/remove.h	(revision 12595)
+++ trunk/src/remove.h	(revision 12596)
@@ -35,7 +35,7 @@
  * some constants
  */
 #define PCB_REMOVE_TYPES \
-	(PCB_TYPE_VIA | PCB_TYPE_PADSTACK | PCB_TYPE_LINE_POINT | PCB_TYPE_LINE | PCB_TYPE_TEXT | PCB_TYPE_ELEMENT | PCB_TYPE_SUBC | \
+	(PCB_TYPE_VIA | PCB_TYPE_PSTK | PCB_TYPE_LINE_POINT | PCB_TYPE_LINE | PCB_TYPE_TEXT | PCB_TYPE_ELEMENT | PCB_TYPE_SUBC | \
 	PCB_TYPE_POLYGON_POINT | PCB_TYPE_POLYGON | PCB_TYPE_RATLINE | PCB_TYPE_ARC | PCB_TYPE_ARC_POINT)
 
 pcb_bool pcb_remove_selected(void);
Index: trunk/src/search.c
===================================================================
--- trunk/src/search.c	(revision 12595)
+++ trunk/src/search.c	(revision 12596)
@@ -1187,8 +1187,8 @@
 	if (Type & PCB_TYPE_VIA && SearchViaByLocation(objst, req_flag, (pcb_pin_t **) Result1, (pcb_pin_t **) Result2, (pcb_pin_t **) Result3))
 		return (PCB_TYPE_VIA);
 
-	if (Type & PCB_TYPE_PADSTACK && SearchPadstackByLocation(objst, req_flag, (pcb_pstk_t **) Result1, (pcb_pstk_t **) Result2, (pcb_pstk_t **) Result3))
-		return (PCB_TYPE_PADSTACK);
+	if (Type & PCB_TYPE_PSTK && SearchPadstackByLocation(objst, req_flag, (pcb_pstk_t **) Result1, (pcb_pstk_t **) Result2, (pcb_pstk_t **) Result3))
+		return (PCB_TYPE_PSTK);
 
 	if (Type & PCB_TYPE_PIN && SearchPinByLocation(objst, req_flag, (pcb_element_t **) pr1, (pcb_pin_t **) pr2, (pcb_pin_t **) pr3))
 		HigherAvail = PCB_TYPE_PIN;
@@ -1451,12 +1451,12 @@
 		PCB_END_LOOP;
 	}
 
-	if (type == PCB_TYPE_PADSTACK) {
+	if (type == PCB_TYPE_PSTK) {
 		PCB_PADSTACK_LOOP(Base);
 		{
 			if (padstack->ID == ID) {
 				*Result1 = *Result2 = *Result3 = (void *)padstack;
-				return PCB_TYPE_PADSTACK;
+				return PCB_TYPE_PSTK;
 			}
 		}
 		PCB_END_LOOP;
Index: trunk/src/select.c
===================================================================
--- trunk/src/select.c	(revision 12595)
+++ trunk/src/select.c	(revision 12596)
@@ -127,7 +127,7 @@
 		pcb_via_invalidate_draw((pcb_pin_t *) ptr1);
 		break;
 
-	case PCB_TYPE_PADSTACK:
+	case PCB_TYPE_PSTK:
 		pcb_undo_add_obj_to_flag(ptr1);
 		PCB_FLAG_TOGGLE(PCB_FLAG_SELECTED, (pcb_pstk_t *) ptr1);
 		pcb_pstk_invalidate_draw((pcb_pstk_t *) ptr1);
@@ -495,7 +495,7 @@
 			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);
+				append(PCB_TYPE_PSTK, padstack, padstack);
 				if (pcb->ViaOn)
 					pcb_pstk_invalidate_draw(padstack);
 			}
@@ -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_pstk_near_box((pcb_pstk_t *)obj, box);
+		case PCB_OBJ_PSTK: 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);
Index: trunk/src/select.h
===================================================================
--- trunk/src/select.h	(revision 12595)
+++ trunk/src/select.h	(revision 12596)
@@ -34,7 +34,7 @@
 
 #define PCB_SELECT_TYPES	\
 	(PCB_TYPE_VIA | PCB_TYPE_LINE | PCB_TYPE_TEXT | PCB_TYPE_POLYGON | PCB_TYPE_ELEMENT | PCB_TYPE_SUBC | \
-	 PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_PADSTACK | PCB_TYPE_ELEMENT_NAME | PCB_TYPE_RATLINE | PCB_TYPE_ARC)
+	 PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_PSTK | PCB_TYPE_ELEMENT_NAME | PCB_TYPE_RATLINE | PCB_TYPE_ARC)
 
 pcb_bool pcb_select_object(pcb_board_t *pcb);
 pcb_bool pcb_select_block(pcb_board_t *pcb, pcb_box_t *, pcb_bool);
Index: trunk/src/thermal.c
===================================================================
--- trunk/src/thermal.c	(revision 12595)
+++ trunk/src/thermal.c	(revision 12596)
@@ -617,7 +617,7 @@
 		case PCB_OBJ_POLYGON:
 			return pcb_thermal_area_poly(pcb, (pcb_poly_t *)obj, lid);
 
-		case PCB_OBJ_PADSTACK:
+		case PCB_OBJ_PSTK:
 			return pcb_thermal_area_pstk(pcb, (pcb_pstk_t *)obj, lid);
 
 		case PCB_OBJ_ARC:
Index: trunk/src/tool_thermal.c
===================================================================
--- trunk/src/tool_thermal.c	(revision 12595)
+++ trunk/src/tool_thermal.c	(revision 12596)
@@ -94,7 +94,7 @@
 			newth = cycle[0]; /* new thermal, use default */
 	}
 
-	pcb_chg_obj_thermal(PCB_TYPE_PADSTACK, ps, ps, ps, newth, lid);
+	pcb_chg_obj_thermal(PCB_TYPE_PSTK, ps, ps, ps, newth, lid);
 }
 
 
@@ -105,7 +105,7 @@
 
 	if (((type = pcb_search_screen(Note.X, Note.Y, PCB_TYPEMASK_PIN, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE)
 			&& !PCB_FLAG_TEST(PCB_FLAG_HOLE, (pcb_pin_t *) ptr3)) {
-		if (type == PCB_TYPE_PADSTACK)
+		if (type == PCB_TYPE_PSTK)
 			tool_thermal_on_pstk((pcb_pstk_t *)ptr2, INDEXOFCURRENT);
 		else
 			tool_thermal_on_pinvia(type, ptr1, ptr2, ptr3);
Index: trunk/src_plugins/autoroute/autoroute.c
===================================================================
--- trunk/src_plugins/autoroute/autoroute.c	(revision 12595)
+++ trunk/src_plugins/autoroute/autoroute.c	(revision 12596)
@@ -999,7 +999,7 @@
 					else
 						switch (connection->obj->type) {
 						case PCB_OBJ_VOID: break;
-						case PCB_OBJ_PADSTACK:
+						case PCB_OBJ_PSTK:
 #warning padstack TODO
 							break;
 						case PCB_OBJ_PAD:
Index: trunk/src_plugins/dialogs/dlg_padstack.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_padstack.c	(revision 12595)
+++ trunk/src_plugins/dialogs/dlg_padstack.c	(revision 12596)
@@ -251,8 +251,8 @@
 		void *ptr1, *ptr2 = NULL, *ptr3;
 		long type;
 		pcb_gui->get_coords("Click on a padstack to edit", &x, &y);
-		type = pcb_search_screen(x, y, PCB_TYPE_PADSTACK, &ptr1, &ptr2, &ptr3);
-		if (type != PCB_TYPE_PADSTACK) {
+		type = pcb_search_screen(x, y, PCB_TYPE_PSTK, &ptr1, &ptr2, &ptr3);
+		if (type != PCB_TYPE_PSTK) {
 			pcb_message(PCB_MSG_ERROR, "Need a padstack.\n");
 			return 1;
 		}
Index: trunk/src_plugins/io_hyp/write.c
===================================================================
--- trunk/src_plugins/io_hyp/write.c	(revision 12595)
+++ trunk/src_plugins/io_hyp/write.c	(revision 12596)
@@ -405,7 +405,7 @@
 				write_poly(wr, (pcb_poly_t *) o->obj);
 				break;
 
-			case PCB_OBJ_PADSTACK:
+			case PCB_OBJ_PSTK:
 #warning padstack TODO
 			case PCB_OBJ_RAT:
 				break;									/* not yet done */
Index: trunk/src_plugins/io_lihata/read.c
===================================================================
--- trunk/src_plugins/io_lihata/read.c	(revision 12595)
+++ trunk/src_plugins/io_lihata/read.c	(revision 12596)
@@ -767,7 +767,7 @@
 	ps = pcb_pstk_alloc(dt);
 
 	parse_id(&ps->ID, obj, 13);
-	parse_flags(&ps->Flags, lht_dom_hash_get(obj, "flags"), PCB_TYPE_PADSTACK, &intconn);
+	parse_flags(&ps->Flags, lht_dom_hash_get(obj, "flags"), PCB_TYPE_PSTK, &intconn);
 	pcb_attrib_compat_set_intconn(&ps->Attributes, intconn);
 	parse_attributes(&ps->Attributes, lht_dom_hash_get(obj, "attributes"));
 
Index: trunk/src_plugins/io_lihata/write.c
===================================================================
--- trunk/src_plugins/io_lihata/write.c	(revision 12595)
+++ trunk/src_plugins/io_lihata/write.c	(revision 12596)
@@ -603,7 +603,7 @@
 	obj = lht_dom_node_alloc(LHT_HASH, buff);
 
 	lht_dom_hash_put(obj, build_attributes(&ps->Attributes));
-	lht_dom_hash_put(obj, build_flags(&ps->Flags, PCB_TYPE_PADSTACK, ps->intconn));
+	lht_dom_hash_put(obj, build_flags(&ps->Flags, PCB_TYPE_PSTK, ps->intconn));
 
 	lht_dom_hash_put(obj, build_textf("proto", "%ld", (long int)ps->proto));
 	lht_dom_hash_put(obj, build_textf("x", CFMT, ps->x));