Index: write.c
===================================================================
--- write.c	(revision 12013)
+++ write.c	(revision 12014)
@@ -565,10 +565,10 @@
 	pcb_cardinal_t currentLayer = number;
 
 	/* write information about non empty layers */
-	if (!pcb_layer_is_empty_(PCB, layer) || (layer->meta.real.name && *layer->meta.real.name)) {
+	if (!pcb_layer_is_empty_(PCB, layer) || (layer->name && *layer->name)) {
 		/*
 			fprintf(FP, "Layer(%i ", (int) Number + 1);
-			pcb_print_quoted_string(FP, (char *) PCB_EMPTY(layer->meta.real.name));
+			pcb_print_quoted_string(FP, (char *) PCB_EMPTY(layer->name));
 			fputs(")\n(\n", FP);
 			WriteAttributeList(FP, &layer->Attributes, "\t");
 		*/
@@ -609,10 +609,10 @@
 	int copperStartY; /* used for mapping geda copper arcs onto kicad copper lines */
 
 	/* write information about non empty layers */
-	if (!pcb_layer_is_empty_(PCB, layer) || (layer->meta.real.name && *layer->meta.real.name)) {
+	if (!pcb_layer_is_empty_(PCB, layer) || (layer->name && *layer->name)) {
 		/*
 			fprintf(FP, "Layer(%i ", (int) Number + 1);
-			pcb_print_quoted_string(FP, (char *) PCB_EMPTY(layer->meta.real.name));
+			pcb_print_quoted_string(FP, (char *) PCB_EMPTY(layer->name));
 			fputs(")\n(\n", FP);
 			WriteAttributeList(FP, &layer->Attributes, "\t");
 		*/
@@ -687,10 +687,10 @@
 	pcb_cardinal_t currentLayer = number;
 
 	/* write information about non empty layers */
-	if (!pcb_layer_is_empty_(PCB, layer) || (layer->meta.real.name && *layer->meta.real.name)) {
+	if (!pcb_layer_is_empty_(PCB, layer) || (layer->name && *layer->name)) {
 		/*
 			fprintf(FP, "Layer(%i ", (int) Number + 1);
-			pcb_print_quoted_string(FP, (char *) PCB_EMPTY(layer->meta.real.name));
+			pcb_print_quoted_string(FP, (char *) PCB_EMPTY(layer->name));
 			fputs(")\n(\n", FP);
 			WriteAttributeList(FP, &layer->Attributes, "\t");
 		*/
@@ -1218,7 +1218,7 @@
 	pcb_cardinal_t currentLayer = number;
 
 	/* write information about non empty layers */
-	if (!pcb_layer_is_empty_(PCB, layer) || (layer->meta.real.name && *layer->meta.real.name)) {
+	if (!pcb_layer_is_empty_(PCB, layer) || (layer->name && *layer->name)) {
 		int localFlag = 0;
 		polylist_foreach(&layer->Polygon, &it, polygon) {
 			if (polygon->HoleIndexN == 0) { /* no holes defined within polygon, which we implement support for first */