Index: file.c
===================================================================
--- file.c	(revision 24883)
+++ file.c	(revision 24884)
@@ -288,7 +288,7 @@
 	fprintf(FP, "FileVersion[%i]\n", PCBFileVersionNeeded());
 
 	fputs("\nPCB[", FP);
-	pcb_print_quoted_string(FP, (char *) PCB_EMPTY(PCB->Name));
+	pcb_print_quoted_string(FP, (char *) PCB_EMPTY(PCB->hidlib.name));
 	pcb_fprintf(FP, " %[0] %[0]]\n\n", PCB->hidlib.size_x, PCB->hidlib.size_y);
 	pcb_fprintf(FP, "Grid[%[0] %[0] %[0] %d]\n", PCB->hidlib.grid, PCB->hidlib.grid_ox, PCB->hidlib.grid_oy, conf_core.editor.draw_grid);
 	pcb_fprintf(FP, "Cursor[%[0] %[0] 1000]\n", pcb_crosshair.X, pcb_crosshair.Y);
Index: parse_y.c
===================================================================
--- parse_y.c	(revision 24883)
+++ parse_y.c	(revision 24884)
@@ -1965,7 +1965,7 @@
   case 18:
 #line 305 "parse_y.y" /* yacc.c:1652  */
     {
-				yyPCB->Name = (yyvsp[-1].string);
+				yyPCB->hidlib.name = (yyvsp[-1].string);
 				yyPCB->hidlib.size_x = PCB_MAX_COORD;
 				yyPCB->hidlib.size_y = PCB_MAX_COORD;
 				old_fmt = 1;
@@ -1976,7 +1976,7 @@
   case 19:
 #line 312 "parse_y.y" /* yacc.c:1652  */
     {
-				yyPCB->Name = (yyvsp[-3].string);
+				yyPCB->hidlib.name = (yyvsp[-3].string);
 				yyPCB->hidlib.size_x = OU ((yyvsp[-2].measure));
 				yyPCB->hidlib.size_y = OU ((yyvsp[-1].measure));
 				old_fmt = 1;
@@ -1987,7 +1987,7 @@
   case 20:
 #line 319 "parse_y.y" /* yacc.c:1652  */
     {
-				yyPCB->Name = (yyvsp[-3].string);
+				yyPCB->hidlib.name = (yyvsp[-3].string);
 				yyPCB->hidlib.size_x = NU ((yyvsp[-2].measure));
 				yyPCB->hidlib.size_y = NU ((yyvsp[-1].measure));
 				old_fmt = 0;
Index: parse_y.y
===================================================================
--- parse_y.y	(revision 24883)
+++ parse_y.y	(revision 24884)
@@ -303,7 +303,7 @@
 pcbname
 		: T_PCB '(' STRING ')'
 			{
-				yyPCB->Name = $3;
+				yyPCB->hidlib.name = $3;
 				yyPCB->hidlib.size_x = PCB_MAX_COORD;
 				yyPCB->hidlib.size_y = PCB_MAX_COORD;
 				old_fmt = 1;
@@ -310,7 +310,7 @@
 			}
 		| T_PCB '(' STRING measure measure ')'
 			{
-				yyPCB->Name = $3;
+				yyPCB->hidlib.name = $3;
 				yyPCB->hidlib.size_x = OU ($4);
 				yyPCB->hidlib.size_y = OU ($5);
 				old_fmt = 1;
@@ -317,7 +317,7 @@
 			}
 		| T_PCB '[' STRING measure measure ']'
 			{
-				yyPCB->Name = $3;
+				yyPCB->hidlib.name = $3;
 				yyPCB->hidlib.size_x = NU ($4);
 				yyPCB->hidlib.size_y = NU ($5);
 				old_fmt = 0;