Index: change.h
===================================================================
--- change.h	(revision 2502)
+++ change.h	(revision 2503)
@@ -35,36 +35,36 @@
  * some defines
  */
 #define	CHANGENAME_TYPES        \
-	(VIA_TYPE | PIN_TYPE | PAD_TYPE | TEXT_TYPE | ELEMENT_TYPE | ELEMENTNAME_TYPE | LINE_TYPE)
+	(PCB_TYPE_VIA | PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_TEXT | PCB_TYPE_ELEMENT | PCB_TYPE_ELEMENT_NAME | PCB_TYPE_LINE)
 
 #define	CHANGESIZE_TYPES        \
-	(POLYGON_TYPE | VIA_TYPE | PIN_TYPE | PAD_TYPE | LINE_TYPE | \
-	 ARC_TYPE | TEXT_TYPE | ELEMENTNAME_TYPE | ELEMENT_TYPE)
+	(PCB_TYPE_POLYGON | PCB_TYPE_VIA | PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_LINE | \
+	 PCB_TYPE_ARC | PCB_TYPE_TEXT | PCB_TYPE_ELEMENT_NAME | PCB_TYPE_ELEMENT)
 
 #define	CHANGE2NDSIZE_TYPES     \
-	(VIA_TYPE | PIN_TYPE | ELEMENT_TYPE)
+	(PCB_TYPE_VIA | PCB_TYPE_PIN | PCB_TYPE_ELEMENT)
 
 /* We include polygons here only to inform the user not to do it that way.  */
 #define CHANGECLEARSIZE_TYPES	\
-	(PIN_TYPE | PAD_TYPE | VIA_TYPE | LINE_TYPE | ARC_TYPE | POLYGON_TYPE)
+	(PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_VIA | PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_POLYGON)
 
 #define	CHANGENONETLIST_TYPES     \
-	(ELEMENT_TYPE)
+	(PCB_TYPE_ELEMENT)
 
 #define	CHANGESQUARE_TYPES     \
-	(ELEMENT_TYPE | PIN_TYPE | PAD_TYPE | VIA_TYPE)
+	(PCB_TYPE_ELEMENT | PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_VIA)
 
 #define	CHANGEOCTAGON_TYPES     \
-	(ELEMENT_TYPE | PIN_TYPE | VIA_TYPE)
+	(PCB_TYPE_ELEMENT | PCB_TYPE_PIN | PCB_TYPE_VIA)
 
 #define CHANGEJOIN_TYPES	\
-	(ARC_TYPE | LINE_TYPE | TEXT_TYPE)
+	(PCB_TYPE_ARC | PCB_TYPE_LINE | PCB_TYPE_TEXT)
 
 #define CHANGETHERMAL_TYPES	\
-	(PIN_TYPE | VIA_TYPE)
+	(PCB_TYPE_PIN | PCB_TYPE_VIA)
 
 #define CHANGEMASKSIZE_TYPES    \
-        (PIN_TYPE | VIA_TYPE | PAD_TYPE)
+        (PCB_TYPE_PIN | PCB_TYPE_VIA | PCB_TYPE_PAD)
 
 bool ChangeLayoutName(char *);
 bool ChangeLayerName(LayerTypePtr, char *);