Index: obj_pstk_op.c
===================================================================
--- obj_pstk_op.c	(revision 12595)
+++ 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;
 }