Index: attrib.h
===================================================================
--- attrib.h	(revision 4838)
+++ attrib.h	(revision 4839)
@@ -49,13 +49,13 @@
    REPLACE.  Returns non-zero if an existing attribute was replaced.  */
 int pcb_attribute_put(pcb_attribute_list_t * list, const char *name, const char *value, int replace);
 /* Simplistic version: Takes a pointer to an object, looks up attributes in it.  */
-#define AttributeGet(OBJ,name) pcb_attribute_get(&(OBJ->Attributes), name)
+#define pcb_attrib_get(OBJ,name) pcb_attribute_get(&(OBJ->Attributes), name)
 /* Simplistic version: Takes a pointer to an object, sets attributes in it.  */
-#define AttributePut(OBJ,name,value) pcb_attribute_put(&(OBJ->Attributes), name, value, 1)
+#define pcb_attrib_put(OBJ,name,value) pcb_attribute_put(&(OBJ->Attributes), name, value, 1)
 /* Remove an attribute by name; returns number of items removed  */
 int pcb_attribute_remove(pcb_attribute_list_t * list, const char *name);
 /* Simplistic version of Remove.  */
-#define AttributeRemove(OBJ, name) pcb_attribute_remove(&(OBJ->Attributes), name)
+#define pcb_attrib_remove(OBJ, name) pcb_attribute_remove(&(OBJ->Attributes), name)
 
 /* Frees memory used by an attribute list */
 void pcb_attribute_free(pcb_attribute_list_t *list);