Index: bboard.c
===================================================================
--- bboard.c	(revision 5062)
+++ bboard.c	(revision 5063)
@@ -407,10 +407,10 @@
 			*s2 = 0;
 			offset_in_model = bboard_parse_offset(s2 + 1, &ox, &oy);
 		}
-		if (!PCB_EMPTY_STRING_P(VALUE_NAME(element))) {
-			fname = bboard_get_model_filename(s, VALUE_NAME(element), pcb_true);
+		if (!PCB_EMPTY_STRING_P(PCB_ELEM_NAME_VALUE(element))) {
+			fname = bboard_get_model_filename(s, PCB_ELEM_NAME_VALUE(element), pcb_true);
 			if (!fname)
-				fname = bboard_get_model_filename(s, VALUE_NAME(element), pcb_false);
+				fname = bboard_get_model_filename(s, PCB_ELEM_NAME_VALUE(element), pcb_false);
 		}
 		if (!fname)
 			fname = bboard_get_model_filename(s, NULL, pcb_false);
@@ -424,10 +424,10 @@
 
 		s = pcb_attribute_get(&(element->Attributes), "Footprint::File");
 		if (s) {
-			if (!PCB_EMPTY_STRING_P(VALUE_NAME(element))) {
-				fname = bboard_get_model_filename(s, VALUE_NAME(element), pcb_true);
+			if (!PCB_EMPTY_STRING_P(PCB_ELEM_NAME_VALUE(element))) {
+				fname = bboard_get_model_filename(s, PCB_ELEM_NAME_VALUE(element), pcb_true);
 				if (!fname)
-					fname = bboard_get_model_filename(s, VALUE_NAME(element), pcb_false);
+					fname = bboard_get_model_filename(s, PCB_ELEM_NAME_VALUE(element), pcb_false);
 			}
 			if (!fname)
 				fname = bboard_get_model_filename(s, NULL, pcb_false);
@@ -434,16 +434,16 @@
 		}
 	}
 	if (!fname) {
-		s = DESCRIPTION_NAME(element);
-		if (!PCB_EMPTY_STRING_P(DESCRIPTION_NAME(element))) {
-			if (!PCB_EMPTY_STRING_P(VALUE_NAME(element))) {
-				fname = bboard_get_model_filename(DESCRIPTION_NAME(element), VALUE_NAME(element), pcb_true);
+		s = PCB_ELEM_NAME_DESCRIPTION(element);
+		if (!PCB_EMPTY_STRING_P(PCB_ELEM_NAME_DESCRIPTION(element))) {
+			if (!PCB_EMPTY_STRING_P(PCB_ELEM_NAME_VALUE(element))) {
+				fname = bboard_get_model_filename(PCB_ELEM_NAME_DESCRIPTION(element), PCB_ELEM_NAME_VALUE(element), pcb_true);
 				if (!fname)
-					fname = bboard_get_model_filename(DESCRIPTION_NAME(element), VALUE_NAME(element), pcb_false);
+					fname = bboard_get_model_filename(PCB_ELEM_NAME_DESCRIPTION(element), PCB_ELEM_NAME_VALUE(element), pcb_false);
 
 			}
 			if (!fname)
-				fname = bboard_get_model_filename(DESCRIPTION_NAME(element), NULL, pcb_false);
+				fname = bboard_get_model_filename(PCB_ELEM_NAME_DESCRIPTION(element), NULL, pcb_false);
 		}
 	}