Index: work/alien_formats/eagle/eagle_bin/test_parser/eagle_bin.c
===================================================================
--- work/alien_formats/eagle/eagle_bin/test_parser/eagle_bin.c	(revision 9549)
+++ work/alien_formats/eagle/eagle_bin/test_parser/eagle_bin.c	(revision 9550)
@@ -121,7 +121,7 @@
 			TERM
 		},
 	},
-	{ LAYERS, 0xFFFF, "layers",
+	{ PCB_EGKW_LAYERS, 0xFFFF, "layers",
 		{ /* field match */
 			TERM
 		},
@@ -140,7 +140,7 @@
 			TERM
 		},
 	},
-	{ ALT_LAYERS, 0xFFFF, "alt_layers",
+	{ PCB_EGKW_ALT_LAYERS, 0xFFFF, "alt_layers",
 		{ /* field match */
 			TERM
 		},
@@ -174,7 +174,7 @@
 			TERM
 		},
 	},
-	{ LIBRARY, 0xFFFF, "library",
+	{ PCB_EGKW_LIBRARY, 0xFFFF, "library",
 		{ /* field match */
 			TERM
 		},
@@ -218,7 +218,7 @@
 			TERM
 		},
 	},
-	{ PACKAGES, 0xFFFF, "packages",
+	{ PCB_EGKW_PACKAGES, 0xFFFF, "packages",
 		{ /* field match */
 			TERM
 		},
@@ -234,7 +234,7 @@
 			TERM
 		},
 	},
-	{ ALT_PACKAGES, 0xFFFF, "alt_packages",
+	{ PCB_EGKW_ALT_PACKAGES, 0xFFFF, "alt_packages",
 		{ /* field match */
 			TERM
 		},
@@ -250,7 +250,7 @@
 			TERM
 		},
 	},
-	{ ALT_ALT_PACKAGES, 0xFFFF, "alt_alt_packages",
+	{ PCB_EGKW_ALT_ALT_PACKAGES, 0xFFFF, "alt_alt_packages",
 		{ /* field match */
 			TERM
 		},
@@ -285,7 +285,7 @@
 			TERM
 		},
 	},
-	{ BOARD, 0xFFFF, "board",
+	{ PCB_EGKW_BOARD, 0xFFFF, "board",
 		{ /* field match */
 			TERM
 		},
@@ -307,7 +307,7 @@
 			TERM
 		},
 	},
-	{ ALT_BOARD, 0xFFFF, "alt_board",
+	{ PCB_EGKW_ALT_BOARD, 0xFFFF, "alt_board",
 		{ /* field match */
 			TERM
 		},
@@ -329,7 +329,7 @@
 			TERM
 		},
 	},
-	{ ALT_ALT_BOARD, 0xFFFF, "alt_alt_board",
+	{ PCB_EGKW_ALT_ALT_BOARD, 0xFFFF, "alt_alt_board",
 		{ /* field match */
 			TERM
 		},
@@ -351,7 +351,7 @@
 			TERM
 		},
 	},
-	{ ALT_ALT_ALT_BOARD, 0xFFFF, "alt_alt_alt_board",
+	{ PCB_EGKW_ALT_ALT_ALT_BOARD, 0xFFFF, "alt_alt_alt_board",
 		{ /* field match */
 			TERM
 		},
@@ -373,7 +373,7 @@
 			TERM
 		},
 	},
-	{ PCB_EGKW_SECT_BOARDNET, 0xFFFF, "boardnet",
+	{ PCB_EGKW_SIGNAL, 0xFFFF, "signal",
 		{ /* field match */
 			TERM
 		},
@@ -392,7 +392,7 @@
 			TERM
 		},
 	},
-	{ PCB_EGKW_SECT_ALT_BOARDNET, 0xFFFF, "alt_boardnet",
+	{ PCB_EGKW_ALT_SIGNAL, 0xFFFF, "alt_signal",
 		{ /* field match */
 			TERM
 		},
@@ -411,7 +411,7 @@
 			TERM
 		},
 	},
-	{ PCB_EGKW_SECT_ALT_ALT_BOARDNET, 0xFFFF, "alt_alt_boardnet",
+	{ PCB_EGKW_ALT_ALT_SIGNAL, 0xFFFF, "alt_alt_signal",
 		{ /* field match */
 			TERM
 		},
@@ -430,7 +430,7 @@
 			TERM
 		},
 	},
-	{ PCB_EGKW_SECT_ALT_ALT_ALT_BOARDNET, 0xFFFF, "alt_alt_alt_boardnet",
+	{ PCB_EGKW_ALT_ALT_ALT_SIGNAL, 0xFFFF, "alt_alt_alt_signal",
 		{ /* field match */
 			TERM
 		},
@@ -449,7 +449,7 @@
 			TERM
 		},
 	},
-	{ PCB_EGKW_SECT_ALT_ALT_ALT_ALT_BOARDNET, 0xFFFF, "alt_alt_alt_alt_boardnet",
+	{ PCB_EGKW_ALT_ALT_ALT_ALT_SIGNAL, 0xFFFF, "alt_alt_alt_alt_signal",
 		{ /* field match */
 			TERM
 		},
@@ -485,7 +485,7 @@
 			TERM
 		},
 	},
-	{ PACKAGE, 0xFFFF, "package",
+	{ PCB_EGKW_PACKAGE, 0xFFFF, "package",
 		{ /* field match */
 			TERM
 		},
@@ -503,7 +503,7 @@
 			TERM
 		},
 	},
-	{ ALT_PACKAGE, 0xFFFF, "alt_package",
+	{ PCB_EGKW_ALT_PACKAGE, 0xFFFF, "alt_package",
 		{ /* field match */
 			TERM
 		},
@@ -555,7 +555,7 @@
 			TERM
 		},
 	},
-	{ POLYGON, 0xFFFF, "polygon",
+	{ PCB_EGKW_POLYGON, 0xFFFF, "polygon",
 		{ /* field match */
 			TERM
 		},
@@ -579,7 +579,7 @@
 			TERM
 		},
 	},
-	{ ALT_POLYGON, 0xFFFF, "alt_polygon",
+	{ PCB_EGKW_ALT_POLYGON, 0xFFFF, "alt_polygon",
 		{ /* field match */
 			TERM
 		},
@@ -846,7 +846,7 @@
 			TERM
 		},
 	},
-	{ CIRCLE, 0xFFFF, "circle",
+	{ PCB_EGKW_CIRCLE, 0xFFFF, "circle",
 		{ /* field match */
 			TERM
 		},
@@ -862,7 +862,7 @@
 			TERM
 		},
 	},
-	{ ALT_CIRCLE, 0xFFFF, "alt_circle",
+	{ PCB_EGKW_ALT_CIRCLE, 0xFFFF, "alt_circle",
 		{ /* field match */
 			TERM
 		},