Index: trunk/doc-rnd/hacking/renames
===================================================================
--- trunk/doc-rnd/hacking/renames	(revision 4838)
+++ trunk/doc-rnd/hacking/renames	(revision 4839)
@@ -129,3 +129,6 @@
 AttributePutToList -> pcb_attribute_put
 AttributeRemoveFromList -> pcb_attribute_remove
 FreeAttributeListMemory -> pcb_attribute_free
+AttributeGet -> pcb_attrib_get
+AttributePut -> pcb_attrib_put
+AttributeRemove -> pcb_attrib_remove
Index: trunk/src/attrib.h
===================================================================
--- trunk/src/attrib.h	(revision 4838)
+++ trunk/src/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);
Index: trunk/src/find_misc.c
===================================================================
--- trunk/src/find_misc.c	(revision 4838)
+++ trunk/src/find_misc.c	(revision 4839)
@@ -50,7 +50,7 @@
 
 	for (layer = 0; layer < max_copper_layer; layer++) {
 		pcb_layer_t *l = LAYER_PTR(layer);
-		l->no_drc = AttributeGet(l, "PCB::skip-drc") != NULL;
+		l->no_drc = pcb_attrib_get(l, "PCB::skip-drc") != NULL;
 	}
 }
 
Index: trunk/src/object_act.c
===================================================================
--- trunk/src/object_act.c	(revision 4838)
+++ trunk/src/object_act.c	(revision 4839)
@@ -472,7 +472,7 @@
 
 static int parse_layout_attribute_units(const char *name, int def)
 {
-	const char *as = AttributeGet(PCB, name);
+	const char *as = pcb_attrib_get(PCB, name);
 	if (!as)
 		return def;
 	return GetValue(as, NULL, NULL, NULL);
Index: trunk/src/plug_io.c
===================================================================
--- trunk/src/plug_io.c	(revision 4838)
+++ trunk/src/plug_io.c	(revision 4839)
@@ -343,13 +343,13 @@
 		/* just in case a bad file saved file is loaded */
 
 		/* Use attribute PCB::grid::unit as unit, if we can */
-		unit_suffix = AttributeGet(PCB, "PCB::grid::unit");
+		unit_suffix = pcb_attrib_get(PCB, "PCB::grid::unit");
 		if (unit_suffix && *unit_suffix) {
 			const pcb_unit_t *new_unit = get_unit_struct(unit_suffix);
 			if (new_unit)
 				conf_set(settings_dest, "editor/grid_unit", -1, unit_suffix, POL_OVERWRITE);
 		}
-		AttributePut(PCB, "PCB::grid::unit", conf_core.editor.grid_unit->suffix);
+		pcb_attrib_put(PCB, "PCB::grid::unit", conf_core.editor.grid_unit->suffix);
 
 		pcb_sort_netlist();
 		rats_patch_make_edited(PCB);
Index: trunk/src_plugins/hid_gtk/gtkhid-main.c
===================================================================
--- trunk/src_plugins/hid_gtk/gtkhid-main.c	(revision 4838)
+++ trunk/src_plugins/hid_gtk/gtkhid-main.c	(revision 4839)
@@ -1716,7 +1716,7 @@
 	new_unit = get_unit_struct(argv[0]);
 	if (new_unit != NULL && new_unit->allow != NO_PRINT) {
 		conf_set(CFR_DESIGN, "editor/grid_unit", -1, argv[0], POL_OVERWRITE);
-		AttributePut(PCB, "PCB::grid::unit", argv[0]);
+		pcb_attrib_put(PCB, "PCB::grid::unit", argv[0]);
 	}
 
 	ghid_config_handle_units_changed();
@@ -1886,7 +1886,7 @@
 	printf("File selected = %s\n", name);
 #endif
 
-	AttributePut(PCB, "import::src0", name);
+	pcb_attrib_put(PCB, "import::src0", name);
 	free(name);
 
 	I_am_recursing = 1;
Index: trunk/src_plugins/hid_lesstif/dialogs.c
===================================================================
--- trunk/src_plugins/hid_lesstif/dialogs.c	(revision 4838)
+++ trunk/src_plugins/hid_lesstif/dialogs.c	(revision 4839)
@@ -1890,7 +1890,7 @@
 			bname = last_slash + 1;
 	}
 
-	AttributePut(PCB, "import::src0", bname);
+	pcb_attrib_put(PCB, "import::src0", bname);
 
 	XtFree(name);
 
Index: trunk/src_plugins/hid_lesstif/main.c
===================================================================
--- trunk/src_plugins/hid_lesstif/main.c	(revision 4838)
+++ trunk/src_plugins/hid_lesstif/main.c	(revision 4839)
@@ -400,7 +400,7 @@
 #if 0
 		Settings.increments = get_increments_struct(Settings.grid_unit->suffix);
 #endif
-		AttributePut(PCB, "PCB::grid::unit", argv[0]);
+		pcb_attrib_put(PCB, "PCB::grid::unit", argv[0]);
 	}
 	lesstif_sizes_reset();
 	lesstif_styles_update_values();
Index: trunk/src_plugins/import_sch/import_sch.c
===================================================================
--- trunk/src_plugins/import_sch/import_sch.c	(revision 4838)
+++ trunk/src_plugins/import_sch/import_sch.c	(revision 4839)
@@ -188,15 +188,15 @@
 		ds = PCB_ACTION_ARG(1);
 		units = PCB_ACTION_ARG(2);
 		if (!ds) {
-			const char *as = AttributeGet(PCB, "import::disperse");
+			const char *as = pcb_attrib_get(PCB, "import::disperse");
 			ds = gui->prompt_for(_("Enter dispersion:"), as ? as : "0");
 		}
 		if (units) {
 			sprintf(buf, "%s%s", ds, units);
-			AttributePut(PCB, "import::disperse", buf);
+			pcb_attrib_put(PCB, "import::disperse", buf);
 		}
 		else
-			AttributePut(PCB, "import::disperse", ds);
+			pcb_attrib_put(PCB, "import::disperse", ds);
 		if (PCB_ACTION_ARG(1) == NULL)
 			free((char*)ds);
 		return 0;
@@ -215,8 +215,8 @@
 			gui->get_coords(_("Click on a location"), &x, &y);
 		}
 		else if (strcasecmp(xs, "center") == 0) {
-			AttributeRemove(PCB, "import::newX");
-			AttributeRemove(PCB, "import::newY");
+			pcb_attrib_remove(PCB, "import::newX");
+			pcb_attrib_remove(PCB, "import::newY");
 			return 0;
 		}
 		else if (strcasecmp(xs, "mark") == 0) {
@@ -235,14 +235,14 @@
 		}
 
 		pcb_sprintf(buf, "%$ms", x);
-		AttributePut(PCB, "import::newX", buf);
+		pcb_attrib_put(PCB, "import::newX", buf);
 		pcb_sprintf(buf, "%$ms", y);
-		AttributePut(PCB, "import::newY", buf);
+		pcb_attrib_put(PCB, "import::newY", buf);
 		return 0;
 	}
 
 	if (!mode)
-		mode = AttributeGet(PCB, "import::mode");
+		mode = pcb_attrib_get(PCB, "import::mode");
 	if (!mode)
 		mode = "gnetlist";
 
@@ -259,7 +259,7 @@
 		do {
 			nsources++;
 			sprintf(sname, "import::src%d", nsources);
-			src = AttributeGet(PCB, sname);
+			src = pcb_attrib_get(PCB, sname);
 		} while (src);
 
 		if (nsources > 0) {
@@ -268,7 +268,7 @@
 			do {
 				nsources++;
 				sprintf(sname, "import::src%d", nsources);
-				src = AttributeGet(PCB, sname);
+				src = pcb_attrib_get(PCB, sname);
 				sources[nsources] = src;
 			} while (src);
 		}
@@ -364,9 +364,9 @@
 		char *user_target = NULL;
 
 
-		user_outfile = AttributeGet(PCB, "import::outfile");
-		user_makefile = AttributeGet(PCB, "import::makefile");
-		user_target = AttributeGet(PCB, "import::target");
+		user_outfile = pcb_attrib_get(PCB, "import::outfile");
+		user_makefile = pcb_attrib_get(PCB, "import::makefile");
+		user_target = pcb_attrib_get(PCB, "import::target");
 		if (user_outfile && !user_target)
 			user_target = user_outfile;