Index: obj_padstack_draw.h
===================================================================
--- obj_padstack_draw.h	(.../obj_padstack_draw.h)	(revision 12594)
+++ obj_padstack_draw.h	(.../obj_pstk_draw.h)	(revision 12595)
@@ -20,7 +20,7 @@
  *
  */
 
-#include "obj_padstack.h"
+#include "obj_pstk.h"
 
 #ifndef PCB_OBJ_PADSTACK_DRAW_H
 #define PCB_OBJ_PADSTACK_DRAW_H
@@ -36,17 +36,17 @@
 	pcb_layergrp_id_t gid;
 	int is_current;
 	pcb_layer_combining_t comb;
-} pcb_padstack_draw_t;
+} pcb_pstk_draw_t;
 
-pcb_r_dir_t pcb_padstack_draw_callback(const pcb_box_t *b, void *cl);
-pcb_r_dir_t pcb_padstack_clear_callback(const pcb_box_t *b, void *cl);
+pcb_r_dir_t pcb_pstk_draw_callback(const pcb_box_t *b, void *cl);
+pcb_r_dir_t pcb_pstk_clear_callback(const pcb_box_t *b, void *cl);
 #endif
 
-void pcb_padstack_draw(pcb_pin_t *pin, pcb_bool draw_hole);
-void pcb_padstack_invalidate_erase(pcb_padstack_t *ps);
-void pcb_padstack_invalidate_draw(pcb_padstack_t *ps);
+void pcb_pstk_draw(pcb_pin_t *pin, pcb_bool draw_hole);
+void pcb_pstk_invalidate_erase(pcb_pstk_t *ps);
+void pcb_pstk_invalidate_draw(pcb_pstk_t *ps);
 
-void pcb_padstack_thindraw(pcb_hid_gc_t gc, pcb_padstack_t *ps);
+void pcb_pstk_thindraw(pcb_hid_gc_t gc, pcb_pstk_t *ps);
 
 
 #endif