Index: obj_pstk_op.c
===================================================================
--- obj_pstk_op.c	(revision 37866)
+++ obj_pstk_op.c	(revision 37867)
@@ -52,7 +52,7 @@
 	npid = pcb_pstk_proto_insert_dup(ctx->buffer.dst, proto, 1, 0);
 
 	pcb_poly_restore_to_poly(ctx->buffer.src, PCB_OBJ_PSTK, NULL, ps);
-	rnd_r_delete_entry(ctx->buffer.src->padstack_tree, (rnd_box_t *)ps);
+	rnd_rtree_delete(ctx->buffer.src->padstack_tree, ps, (rnd_rtree_box_t *)ps);
 
 	pcb_pstk_unreg(ps);
 	ps->proto = npid;
@@ -64,7 +64,7 @@
 	if (!ctx->buffer.dst->padstack_tree)
 		ctx->buffer.dst->padstack_tree = rnd_r_create_tree();
 
-	rnd_r_insert_entry(ctx->buffer.dst->padstack_tree, (rnd_box_t *)ps);
+	rnd_rtree_insert(ctx->buffer.dst->padstack_tree, ps, (rnd_rtree_box_t *)ps);
 	pcb_poly_clear_from_poly(ctx->buffer.dst, PCB_OBJ_PSTK, NULL, ps);
 
 	return ps;
@@ -106,10 +106,10 @@
 	pcb_data_t *data = ps->parent.data;
 	assert(ps->parent_type = PCB_PARENT_DATA);
 
-	rnd_r_delete_entry(data->padstack_tree, (rnd_box_t *)ps);
+	rnd_rtree_delete(data->padstack_tree, ps, (rnd_rtree_box_t *)ps);
 	pcb_poly_restore_to_poly(data, PCB_OBJ_PSTK, NULL, ps);
 	pcb_pstkop_move_noclip(ctx, ps);
-	rnd_r_insert_entry(data->padstack_tree, (rnd_box_t *)ps);
+	rnd_rtree_insert(data->padstack_tree, ps, (rnd_rtree_box_t *)ps);
 	pcb_poly_clear_from_poly(data, PCB_OBJ_PSTK, NULL, ps);
 	pcb_subc_part_changed(ps);
 	return ps;
@@ -122,12 +122,12 @@
 
 	if (ctx->clip.restore) {
 		if (data->padstack_tree != NULL)
-			rnd_r_delete_entry(data->padstack_tree, (rnd_box_t *)ps);
+			rnd_rtree_delete(data->padstack_tree, ps, (rnd_rtree_box_t *)ps);
 		pcb_poly_restore_to_poly(data, PCB_OBJ_PSTK, NULL, ps);
 	}
 	if (ctx->clip.clear) {
 		if (data->padstack_tree != NULL)
-			rnd_r_insert_entry(data->padstack_tree, (rnd_box_t *)ps);
+			rnd_rtree_insert(data->padstack_tree, ps, (rnd_rtree_box_t *)ps);
 		pcb_poly_clear_from_poly(data, PCB_OBJ_PSTK, NULL, ps);
 	}
 
@@ -144,7 +144,7 @@
 
 void *pcb_pstkop_destroy(pcb_opctx_t *ctx, pcb_pstk_t *ps)
 {
-	rnd_r_delete_entry(ctx->remove.destroy_target->padstack_tree, (rnd_box_t *)ps);
+	rnd_rtree_delete(ctx->remove.destroy_target->padstack_tree, ps, (rnd_rtree_box_t *)ps);
 	pcb_pstk_free(ps);
 	return NULL;
 }
@@ -203,7 +203,7 @@
 		pcb_poly_restore_to_poly(ps->parent.data, PCB_OBJ_PSTK, NULL, ps);
 		pcb_pstk_invalidate_erase(ps);
 		if (ps->parent.data->padstack_tree != NULL)
-			rnd_r_delete_entry(ps->parent.data->padstack_tree, (rnd_box_t *)ps);
+			rnd_rtree_delete(ps->parent.data->padstack_tree, ps, (rnd_rtree_box_t *)ps);
 
 
 		rnd_rotate(&nx, &ny, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.cosa, ctx->rotate.sina);
@@ -217,7 +217,7 @@
 
 		pcb_pstk_bbox(ps);
 		if (ps->parent.data->padstack_tree != NULL)
-			rnd_r_insert_entry(ps->parent.data->padstack_tree, (rnd_box_t *)ps);
+			rnd_rtree_insert(ps->parent.data->padstack_tree, ps, (rnd_rtree_box_t *)ps);
 		pcb_poly_clear_from_poly(ps->parent.data, PCB_OBJ_PSTK, NULL, ps);
 		pcb_pstk_invalidate_draw(ps);