Index: eagle_bin/test_parser/eagle_bin.h
===================================================================
--- eagle_bin/test_parser/eagle_bin.h	(revision 9552)
+++ eagle_bin/test_parser/eagle_bin.h	(revision 9553)
@@ -4,21 +4,21 @@
 	PCB_EGKW_SECT_START = 0x1000,
 	PCB_EGKW_SECT_ALT_START = 0x1080,
 	PCB_EGKW_SECT_UKNOWN11 = 0x1100,
-	GRID = 0x1200,
-	LAYERS = 0x1300,
-	ALT_LAYERS = 0x1380,
+	PCB_EGKW_SECT_GRID = 0x1200,
+	PCB_EGKW_SECT_LAYERS = 0x1300,
+	PCB_EGKW_SECT_ALT_LAYERS = 0x1380,
 	PCB_EGKW_SECT_SCHEMA = 0x1400,
-	LIBRARY = 0x1500,
+	PCB_EGKW_SECT_LIBRARY = 0x1500,
 	PCB_EGKW_SECT_DEVICES = 0x1700,
 	PCB_EGKW_SECT_SYMBOLS = 0x1800,
-	PACKAGES = 0x1900,
-	ALT_PACKAGES = 0x1980,
-	ALT_ALT_PACKAGES = 0x19a0,
+	PCB_EGKW_SECT_PACKAGES = 0x1900,
+	PCB_EGKW_SECT_ALT_PACKAGES = 0x1980,
+	PCB_EGKW_SECT_ALT_ALT_PACKAGES = 0x19a0,
 	PCB_EGKW_SECT_SCHEMASHEET = 0x1a00,
-	BOARD = 0x1b00,
-	ALT_BOARD = 0x1b40,
-	ALT_ALT_BOARD = 0x1b80,
-	ALT_ALT_ALT_BOARD = 0x1b08,
+	PCB_EGKW_SECT_BOARD = 0x1b00,
+	PCB_EGKW_SECT_ALT_BOARD = 0x1b40,
+	PCB_EGKW_SECT_ALT_ALT_BOARD = 0x1b80,
+	PCB_EGKW_SECT_ALT_ALT_ALT_BOARD = 0x1b08,
 	PCB_EGKW_SECT_BOARDNET = 0x1c00,
 	PCB_EGKW_SECT_ALT_BOARDNET = 0x1c04,
 	PCB_EGKW_SECT_ALT_ALT_BOARDNET = 0x1c40,
@@ -29,8 +29,8 @@
 	PCB_EGKW_SECT_ALT_PACKAGE = 0x1e20,
 	PCB_EGKW_SECT_SCHEMANET = 0x1f00,
 	PCB_EGKW_SECT_PATH = 0x2000,
-	POLYGON = 0x2100,
-	ALT_POLYGON = 0x2108,
+	PCB_EGKW_SECT_POLYGON = 0x2100,
+	PCB_EGKW_SECT_ALT_POLYGON = 0x2108,
 	PCB_EGKW_SECT_LINE = 0x2200,
 	PCB_EGKW_SECT_ALT_LINE = 0x2280,
 	PCB_EGKW_SECT_ALT_ALT_LINE = 0x2290,
@@ -40,38 +40,38 @@
 	PCB_EGKW_SECT_ALT_ALT_ALT_ALT_ALT_ALT_LINE = 0x228c,
 	PCB_EGKW_SECT_ALT_ALT_ALT_ALT_ALT_ALT_ALT_LINE = 0x2288,
 	PCB_EGKW_SECT_ARC = 0x2400,
-	CIRCLE = 0x2500,
-	ALT_CIRCLE = 0x2580,
-	ALT_ALT_CIRCLE = 0x25a0,
-	RECTANGLE = 0x2600,
-	ALT_RECTANGLE = 0x2680,
-	ALT_ALT_RECTANGLE = 0x26a0,
+	PCB_EGKW_SECT_CIRCLE = 0x2500,
+	PCB_EGKW_SECT_ALT_CIRCLE = 0x2580,
+	PCB_EGKW_SECT_ALT_ALT_CIRCLE = 0x25a0,
+	PCB_EGKW_SECT_RECTANGLE = 0x2600,
+	PCB_EGKW_SECT_ALT_RECTANGLE = 0x2680,
+	PCB_EGKW_SECT_ALT_ALT_RECTANGLE = 0x26a0,
 	PCB_EGKW_SECT_JUNCTION = 0x2700,
-	HOLE = 0x2800,
-	ALT_HOLE = 0x2880,
-	ALT_ALT_HOLE = 0x28a0,
-	VIA = 0x2900,
-	ALT_VIA = 0x2980,
-	PAD = 0x2a00,
-	ALT_PAD = 0x2a80,
-	ALT_ALT_PAD = 0x2aa0,
-	SMD = 0x2b00,
-	ALT_SMD = 0x2b80,
+	PCB_EGKW_SECT_HOLE = 0x2800,
+	PCB_EGKW_SECT_ALT_HOLE = 0x2880,
+	PCB_EGKW_SECT_ALT_ALT_HOLE = 0x28a0,
+	PCB_EGKW_SECT_VIA = 0x2900,
+	PCB_EGKW_SECT_ALT_VIA = 0x2980,
+	PCB_EGKW_SECT_PAD = 0x2a00,
+	PCB_EGKW_SECT_ALT_PAD = 0x2a80,
+	PCB_EGKW_SECT_ALT_ALT_PAD = 0x2aa0,
+	PCB_EGKW_SECT_SMD = 0x2b00,
+	PCB_EGKW_SECT_ALT_SMD = 0x2b80,
 	PCB_EGKW_SECT_PIN = 0x2c00,
 	PCB_EGKW_SECT_GATE = 0x2d00,
-	PACKAGE = 0x2e00,
-	ALT_PACKAGE = 0x2e20,
-	ALT_ALT_PACKAGE = 0x2e80,
-	ALT_ALT_ALT_PACKAGE = 0x2e0c,
-	ALT_ALT_ALT_ALT_PACKAGE = 0x2e28,
-	PACKAGE2 = 0x2f00,
-	ALT_PACKAGE2 = 0x2f80,
-	ALT_ALT_PACKAGE2 = 0x2fa0,
+	PCB_EGKW_SECT_PACKAGE = 0x2e00,
+	PCB_EGKW_SECT_ALT_PACKAGE = 0x2e20,
+	PCB_EGKW_SECT_ALT_ALT_PACKAGE = 0x2e80,
+	PCB_EGKW_SECT_ALT_ALT_ALT_PACKAGE = 0x2e0c,
+	PCB_EGKW_SECT_ALT_ALT_ALT_ALT_PACKAGE = 0x2e28,
+	PCB_EGKW_SECT_PACKAGE2 = 0x2f00,
+	PCB_EGKW_SECT_ALT_PACKAGE2 = 0x2f80,
+	PCB_EGKW_SECT_ALT_ALT_PACKAGE2 = 0x2fa0,
 	PCB_EGKW_SECT_INSTANCE = 0x3000,
-	TEXT = 0x3100,
-	ALT_TEXT = 0x3180,
-	ALT_ALT_TEXT = 0x31a0,
-	ALT_ALT_ALT_TEXT = 0x318c,
+	PCB_EGKW_SECT_TEXT = 0x3100,
+	PCB_EGKW_SECT_ALT_TEXT = 0x3180,
+	PCB_EGKW_SECT_ALT_ALT_TEXT = 0x31a0,
+	PCB_EGKW_SECT_ALT_ALT_ALT_TEXT = 0x318c,
 	PCB_EGKW_SECT_NETBUSLABEL = 0x3300,
 	PCB_EGKW_SECT_SMASHEDNAME = 0x3400,
 	PCB_EGKW_SECT_ALT_SMASHEDNAME = 0x3480,
@@ -94,8 +94,8 @@
 	PCB_EGKW_SECT_ALT_ALT_ALT_ALT_BOARDCONNECTION = 0x3e20,	
 	PCB_EGKW_SECT_SMASHEDPART = 0x3f00,
 	PCB_EGKW_SECT_SMASHEDGATE = 0x4000,
-	ATTRIBUTE = 0x4100,
-	ALT_ATTRIBUTE = 0x4180,
+	PCB_EGKW_SECT_ATTRIBUTE = 0x4100,
+	PCB_EGKW_SECT_ALT_ATTRIBUTE = 0x4180,
 	PCB_EGKW_SECT_ATTRIBUTEVALUE = 0x4200,
 	PCB_EGKW_SECT_FRAME = 0x4300,
 	PCB_EGKW_SECT_SMASHEDXREF = 0x4400,