Index: change.h
===================================================================
--- change.h	(revision 15868)
+++ change.h	(revision 15869)
@@ -38,35 +38,35 @@
 #include "unit.h"
 
 #define	PCB_CHANGENAME_TYPES        \
-	(PCB_TYPE_PSTK | PCB_TYPE_TEXT | PCB_TYPE_SUBC | PCB_TYPE_LINE | \
-	PCB_TYPE_ARC | PCB_TYPE_POLY | PCB_TYPE_SUBC_PART | PCB_TYPE_SUBC)
+	(PCB_OBJ_PSTK | PCB_OBJ_TEXT | PCB_OBJ_SUBC | PCB_OBJ_LINE | \
+	PCB_OBJ_ARC | PCB_OBJ_POLY | PCB_OBJ_SUBC_PART | PCB_OBJ_SUBC)
 
 #define	PCB_CHANGESIZE_TYPES        \
-	(PCB_TYPE_PSTK | PCB_TYPE_POLY | PCB_TYPE_LINE | PCB_TYPE_ARC | \
-	PCB_TYPE_TEXT | PCB_TYPE_SUBC | PCB_TYPE_SUBC_PART)
+	(PCB_OBJ_PSTK | PCB_OBJ_POLY | PCB_OBJ_LINE | PCB_OBJ_ARC | \
+	PCB_OBJ_TEXT | PCB_OBJ_SUBC | PCB_OBJ_SUBC_PART)
 
 #define	PCB_CHANGE2NDSIZE_TYPES     \
-	(PCB_TYPE_PSTK | PCB_TYPE_SUBC | PCB_TYPE_SUBC_PART)
+	(PCB_OBJ_PSTK | PCB_OBJ_SUBC | PCB_OBJ_SUBC_PART)
 
 /* We include polygons here only to inform the user not to do it that way.  */
 #define PCB_CHANGECLEARSIZE_TYPES \
-	(PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_POLY | PCB_TYPE_SUBC | \
-	PCB_TYPE_SUBC_PART)
+	(PCB_OBJ_LINE | PCB_OBJ_ARC | PCB_OBJ_POLY | PCB_OBJ_SUBC | \
+	PCB_OBJ_SUBC_PART)
 
 #define	PCB_CHANGENONETLIST_TYPES     \
-	(PCB_TYPE_SUBC)
+	(PCB_OBJ_SUBC)
 
 #define	PCB_CHANGESQUARE_TYPES     \
-	(PCB_TYPE_SUBC | PCB_TYPE_SUBC_PART)
+	(PCB_OBJ_SUBC | PCB_OBJ_SUBC_PART)
 
 #define	PCB_CHANGEOCTAGON_TYPES     \
-	(PCB_TYPE_SUBC | PCB_TYPE_SUBC_PART)
+	(PCB_OBJ_SUBC | PCB_OBJ_SUBC_PART)
 
 #define PCB_CHANGEJOIN_TYPES	\
-	(PCB_TYPE_ARC | PCB_TYPE_LINE | PCB_TYPE_TEXT | PCB_TYPE_POLY)
+	(PCB_OBJ_ARC | PCB_OBJ_LINE | PCB_OBJ_TEXT | PCB_OBJ_POLY)
 
 #define PCB_CHANGETHERMAL_TYPES	\
-	(PCB_TYPE_SUBC_PART)
+	(PCB_OBJ_SUBC_PART)
 
 pcb_bool pcb_chg_selected_size(int, pcb_coord_t, pcb_bool);
 pcb_bool pcb_chg_selected_clear_size(int, pcb_coord_t, pcb_bool);