diff --git a/fab.kicad_sym b/fab.kicad_sym
index f456ea663e84fbbb32edb61507f330a3675670f4..2454a269d7ca964392a3a766a01e7eafd0722487 100644
--- a/fab.kicad_sym
+++ b/fab.kicad_sym
@@ -3512,7 +3512,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinHeader_1x01_P2.54mm_Horizontal_SMD"
+	(symbol "PinHeader_01x01_P2.54mm_Vertical_THT_D1.4mm"
 		(pin_names
 			(offset 1.016) hide)
 		(exclude_from_sim no)
@@ -3526,7 +3526,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinHeader_1x01_P2.54mm_Horizontal_SMD"
+		(property "Value" "PinHeader_01x01_P2.54mm_Vertical_THT_D1.4mm"
 			(at 0 -2.54 0)
 			(effects
 				(font
@@ -3534,106 +3534,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinHeader_1x01_P2.54mm_Horizontal_SMD"
-			(at 0 0 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Datasheet" "~"
-			(at 0 0 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "Description" "Connector pin header 2.54mm pitch horizontal SMD"
-			(at 0 0 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "ki_keywords" "Connector pin header 2.54mm pitch horizontal SMD GBC36SGSN-M89"
-			(at 0 0 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(property "ki_fp_filters" "*PinHeader*1x01*"
-			(at 0 0 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-				(hide yes)
-			)
-		)
-		(symbol "Conn_PinHeader_1x01_P2.54mm_Horizontal_SMD_1_1"
-			(rectangle
-				(start -1.27 0.635)
-				(end 1.27 -0.635)
-				(stroke
-					(width 0.1524)
-					(type default)
-				)
-				(fill
-					(type outline)
-				)
-			)
-			(pin passive line
-				(at 5.08 0 180)
-				(length 3.81)
-				(name "Pin_1"
-					(effects
-						(font
-							(size 1.27 1.27)
-						)
-					)
-				)
-				(number "1"
-					(effects
-						(font
-							(size 1.27 1.27)
-						)
-					)
-				)
-			)
-		)
-	)
-	(symbol "Conn_PinHeader_1x01_P2.54mm_Vertical_THT_D1.4mm"
-		(pin_names
-			(offset 1.016) hide)
-		(exclude_from_sim no)
-		(in_bom yes)
-		(on_board yes)
-		(property "Reference" "J"
-			(at 0 2.54 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-			)
-		)
-		(property "Value" "Conn_PinHeader_1x01_P2.54mm_Vertical_THT_D1.4mm"
-			(at 0 -2.54 0)
-			(effects
-				(font
-					(size 1.27 1.27)
-				)
-			)
-		)
-		(property "Footprint" "fab:PinHeader_1x01_P2.54mm_Vertical_THT_D1.4mm"
+		(property "Footprint" "fab:PinHeader_01x01_P2.54mm_Vertical_THT_D1.4mm"
 			(at 0 0 0)
 			(effects
 				(font
@@ -3678,7 +3579,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinHeader_1x01_P2.54mm_Vertical_THT_D1.4mm_1_1"
+		(symbol "PinHeader_01x01_P2.54mm_Vertical_THT_D1.4mm_1_1"
 			(rectangle
 				(start -1.27 0.635)
 				(end 1.27 -0.635)
@@ -3710,7 +3611,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinHeader_1x01_P2.54mm_Vertical_THT_D1mm"
+	(symbol "PinHeader_01x01_P2.54mm_Vertical_THT_D1mm"
 		(pin_names
 			(offset 1.016) hide)
 		(exclude_from_sim no)
@@ -3724,7 +3625,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinHeader_1x01_P2.54mm_Vertical_THT_D1mm"
+		(property "Value" "PinHeader_01x01_P2.54mm_Vertical_THT_D1mm"
 			(at 0 -2.54 0)
 			(effects
 				(font
@@ -3732,7 +3633,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinHeader_1x01_P2.54mm_Vertical_THT_D1mm"
+		(property "Footprint" "fab:PinHeader_01x01_P2.54mm_Vertical_THT_D1mm"
 			(at 0 0 0)
 			(effects
 				(font
@@ -3777,7 +3678,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinHeader_1x01_P2.54mm_Vertical_THT_D1mm_1_1"
+		(symbol "PinHeader_01x01_P2.54mm_Vertical_THT_D1mm_1_1"
 			(rectangle
 				(start -1.27 0.635)
 				(end 1.27 -0.635)
@@ -3809,7 +3710,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinHeader_1x02_P2.54mm_Horizontal_SMD"
+	(symbol "PinHeader_01x02_P2.54mm_Horizontal_SMD"
 		(pin_names hide)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -3822,7 +3723,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinHeader_1x02_P2.54mm_Horizontal_SMD"
+		(property "Value" "PinHeader_01x02_P2.54mm_Horizontal_SMD"
 			(at 0 -5.08 0)
 			(effects
 				(font
@@ -3830,7 +3731,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinHeader_1x02_P2.54mm_Horizontal_SMD"
+		(property "Footprint" "fab:PinHeader_01x02_P2.54mm_Horizontal_SMD"
 			(at 0 0 0)
 			(effects
 				(font
@@ -3875,7 +3776,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinHeader_1x02_P2.54mm_Horizontal_SMD_1_1"
+		(symbol "PinHeader_01x02_P2.54mm_Horizontal_SMD_1_1"
 			(rectangle
 				(start -1.27 -1.905)
 				(end 1.27 -3.175)
@@ -3936,7 +3837,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinHeader_1x02_P2.54mm_Vertical_THT_D1.4mm"
+	(symbol "PinHeader_01x02_P2.54mm_Vertical_THT_D1.4mm"
 		(pin_names hide)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -3949,7 +3850,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinHeader_1x02_P2.54mm_Vertical_THT_D1.4mm"
+		(property "Value" "PinHeader_01x02_P2.54mm_Vertical_THT_D1.4mm"
 			(at 0 -5.08 0)
 			(effects
 				(font
@@ -3957,7 +3858,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinHeader_1x02_P2.54mm_Vertical_THT_D1.4mm"
+		(property "Footprint" "fab:PinHeader_01x02_P2.54mm_Vertical_THT_D1.4mm"
 			(at 0 0 0)
 			(effects
 				(font
@@ -4002,7 +3903,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinHeader_1x02_P2.54mm_Vertical_THT_D1.4mm_1_1"
+		(symbol "PinHeader_01x02_P2.54mm_Vertical_THT_D1.4mm_1_1"
 			(rectangle
 				(start -1.27 -1.905)
 				(end 1.27 -3.175)
@@ -4063,7 +3964,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinHeader_1x02_P2.54mm_Vertical_THT_D1mm"
+	(symbol "PinHeader_01x02_P2.54mm_Vertical_THT_D1mm"
 		(pin_names hide)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -4076,7 +3977,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinHeader_1x02_P2.54mm_Vertical_THT_D1mm"
+		(property "Value" "PinHeader_01x02_P2.54mm_Vertical_THT_D1mm"
 			(at 0 -5.08 0)
 			(effects
 				(font
@@ -4084,7 +3985,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinHeader_1x02_P2.54mm_Vertical_THT_D1mm"
+		(property "Footprint" "fab:PinHeader_01x02_P2.54mm_Vertical_THT_D1mm"
 			(at 1.27 12.7 0)
 			(effects
 				(font
@@ -4129,7 +4030,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinHeader_1x02_P2.54mm_Vertical_THT_D1mm_1_1"
+		(symbol "PinHeader_01x02_P2.54mm_Vertical_THT_D1mm_1_1"
 			(rectangle
 				(start -1.27 -1.905)
 				(end 1.27 -3.175)
@@ -4190,7 +4091,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinHeader_1x03_P2.54mm_Horizontal_SMD"
+	(symbol "PinHeader_01x03_P2.54mm_Horizontal_SMD"
 		(pin_names hide)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -4203,7 +4104,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinHeader_1x03_P2.54mm_Horizontal_SMD"
+		(property "Value" "PinHeader_01x03_P2.54mm_Horizontal_SMD"
 			(at 0 -5.08 0)
 			(effects
 				(font
@@ -4211,7 +4112,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinHeader_1x03_P2.54mm_Horizontal_SMD"
+		(property "Footprint" "fab:PinHeader_01x03_P2.54mm_Horizontal_SMD"
 			(at 0 0 0)
 			(effects
 				(font
@@ -4256,7 +4157,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinHeader_1x03_P2.54mm_Horizontal_SMD_1_1"
+		(symbol "PinHeader_01x03_P2.54mm_Horizontal_SMD_1_1"
 			(rectangle
 				(start -1.27 -1.905)
 				(end 1.27 -3.175)
@@ -4346,7 +4247,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinHeader_1x03_P2.54mm_Vertical_THT_D1.4mm"
+	(symbol "PinHeader_01x03_P2.54mm_Vertical_THT_D1.4mm"
 		(pin_names hide)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -4359,7 +4260,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinHeader_1x03_P2.54mm_Vertical_THT_D1.4mm"
+		(property "Value" "PinHeader_01x03_P2.54mm_Vertical_THT_D1.4mm"
 			(at 0 -5.08 0)
 			(effects
 				(font
@@ -4367,7 +4268,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinHeader_1x03_P2.54mm_Vertical_THT_D1.4mm"
+		(property "Footprint" "fab:PinHeader_01x03_P2.54mm_Vertical_THT_D1.4mm"
 			(at 0 0 0)
 			(effects
 				(font
@@ -4412,7 +4313,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinHeader_1x03_P2.54mm_Vertical_THT_D1.4mm_1_1"
+		(symbol "PinHeader_01x03_P2.54mm_Vertical_THT_D1.4mm_1_1"
 			(rectangle
 				(start -1.27 -1.905)
 				(end 1.27 -3.175)
@@ -4502,7 +4403,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinHeader_1x03_P2.54mm_Vertical_THT_D1mm"
+	(symbol "PinHeader_01x03_P2.54mm_Vertical_THT_D1mm"
 		(pin_names hide)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -4515,7 +4416,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinHeader_1x03_P2.54mm_Vertical_THT_D1mm"
+		(property "Value" "PinHeader_01x03_P2.54mm_Vertical_THT_D1mm"
 			(at 0 -5.08 0)
 			(effects
 				(font
@@ -4523,7 +4424,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinHeader_1x03_P2.54mm_Vertical_THT_D1mm"
+		(property "Footprint" "fab:PinHeader_01x03_P2.54mm_Vertical_THT_D1mm"
 			(at 0 0 0)
 			(effects
 				(font
@@ -4568,7 +4469,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinHeader_1x03_P2.54mm_Vertical_THT_D1mm_1_1"
+		(symbol "PinHeader_01x03_P2.54mm_Vertical_THT_D1mm_1_1"
 			(rectangle
 				(start -1.27 -1.905)
 				(end 1.27 -3.175)
@@ -4658,7 +4559,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinHeader_1x04_P2.54mm_Horizontal_SMD"
+	(symbol "PinHeader_01x04_P2.54mm_Horizontal_SMD"
 		(pin_names hide)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -4671,7 +4572,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinHeader_1x04_P2.54mm_Horizontal_SMD"
+		(property "Value" "PinHeader_01x04_P2.54mm_Horizontal_SMD"
 			(at 0 -7.62 0)
 			(effects
 				(font
@@ -4679,7 +4580,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinHeader_1x04_P2.54mm_Horizontal_SMD"
+		(property "Footprint" "fab:PinHeader_01x04_P2.54mm_Horizontal_SMD"
 			(at 0 0 0)
 			(effects
 				(font
@@ -4724,7 +4625,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinHeader_1x04_P2.54mm_Horizontal_SMD_1_1"
+		(symbol "PinHeader_01x04_P2.54mm_Horizontal_SMD_1_1"
 			(rectangle
 				(start -1.27 -4.445)
 				(end 1.27 -5.715)
@@ -4843,7 +4744,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinHeader_1x04_P2.54mm_Vertical_THT_D1.4mm"
+	(symbol "PinHeader_01x04_P2.54mm_Vertical_THT_D1.4mm"
 		(pin_names hide)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -4856,7 +4757,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinHeader_1x04_P2.54mm_Vertical_THT_D1.4mm"
+		(property "Value" "PinHeader_01x04_P2.54mm_Vertical_THT_D1.4mm"
 			(at 0 -7.62 0)
 			(effects
 				(font
@@ -4864,7 +4765,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinHeader_1x04_P2.54mm_Vertical_THT_D1.4mm"
+		(property "Footprint" "fab:PinHeader_01x04_P2.54mm_Vertical_THT_D1.4mm"
 			(at 0 0 0)
 			(effects
 				(font
@@ -4909,7 +4810,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinHeader_1x04_P2.54mm_Vertical_THT_D1.4mm_1_1"
+		(symbol "PinHeader_01x04_P2.54mm_Vertical_THT_D1.4mm_1_1"
 			(rectangle
 				(start -1.27 -4.445)
 				(end 1.27 -5.715)
@@ -5028,7 +4929,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinHeader_1x04_P2.54mm_Vertical_THT_D1mm"
+	(symbol "PinHeader_01x04_P2.54mm_Vertical_THT_D1mm"
 		(pin_names hide)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -5041,7 +4942,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinHeader_1x04_P2.54mm_Vertical_THT_D1mm"
+		(property "Value" "PinHeader_01x04_P2.54mm_Vertical_THT_D1mm"
 			(at 0 -7.62 0)
 			(effects
 				(font
@@ -5049,7 +4950,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinHeader_1x04_P2.54mm_Vertical_THT_D1mm"
+		(property "Footprint" "fab:PinHeader_01x04_P2.54mm_Vertical_THT_D1mm"
 			(at 0 0 0)
 			(effects
 				(font
@@ -5094,7 +4995,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinHeader_1x04_P2.54mm_Vertical_THT_D1mm_1_1"
+		(symbol "PinHeader_01x04_P2.54mm_Vertical_THT_D1mm_1_1"
 			(rectangle
 				(start -1.27 -4.445)
 				(end 1.27 -5.715)
@@ -5213,7 +5114,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinHeader_1x05_P2.54mm_Horizontal_SMD"
+	(symbol "PinHeader_01x05_P2.54mm_Horizontal_SMD"
 		(pin_names hide)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -5226,7 +5127,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinHeader_1x05_P2.54mm_Horizontal_SMD"
+		(property "Value" "PinHeader_01x05_P2.54mm_Horizontal_SMD"
 			(at 0 -7.62 0)
 			(effects
 				(font
@@ -5234,7 +5135,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinHeader_1x05_P2.54mm_Horizontal_SMD"
+		(property "Footprint" "fab:PinHeader_01x05_P2.54mm_Horizontal_SMD"
 			(at 0 0 0)
 			(effects
 				(font
@@ -5279,7 +5180,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinHeader_1x05_P2.54mm_Horizontal_SMD_1_1"
+		(symbol "PinHeader_01x05_P2.54mm_Horizontal_SMD_1_1"
 			(rectangle
 				(start -1.27 -4.445)
 				(end 1.27 -5.715)
@@ -5427,7 +5328,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinHeader_1x05_P2.54mm_Vertical_THT_D1.4mm"
+	(symbol "PinHeader_01x05_P2.54mm_Vertical_THT_D1.4mm"
 		(pin_names hide)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -5440,7 +5341,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinHeader_1x05_P2.54mm_Vertical_THT_D1.4mm"
+		(property "Value" "PinHeader_01x05_P2.54mm_Vertical_THT_D1.4mm"
 			(at 0 -7.62 0)
 			(effects
 				(font
@@ -5448,7 +5349,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinHeader_1x05_P2.54mm_Vertical_THT_D1.4mm"
+		(property "Footprint" "fab:PinHeader_01x05_P2.54mm_Vertical_THT_D1.4mm"
 			(at 0 0 0)
 			(effects
 				(font
@@ -5493,7 +5394,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinHeader_1x05_P2.54mm_Vertical_THT_D1.4mm_1_1"
+		(symbol "PinHeader_01x05_P2.54mm_Vertical_THT_D1.4mm_1_1"
 			(rectangle
 				(start -1.27 -4.445)
 				(end 1.27 -5.715)
@@ -5641,7 +5542,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinHeader_1x05_P2.54mm_Vertical_THT_D1mm"
+	(symbol "PinHeader_01x05_P2.54mm_Vertical_THT_D1mm"
 		(pin_names hide)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -5654,7 +5555,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinHeader_1x05_P2.54mm_Vertical_THT_D1mm"
+		(property "Value" "PinHeader_01x05_P2.54mm_Vertical_THT_D1mm"
 			(at 0 -7.62 0)
 			(effects
 				(font
@@ -5662,7 +5563,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinHeader_1x05_P2.54mm_Vertical_THT_D1mm"
+		(property "Footprint" "fab:PinHeader_01x05_P2.54mm_Vertical_THT_D1mm"
 			(at 0 0 0)
 			(effects
 				(font
@@ -5707,7 +5608,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinHeader_1x05_P2.54mm_Vertical_THT_D1mm_1_1"
+		(symbol "PinHeader_01x05_P2.54mm_Vertical_THT_D1mm_1_1"
 			(rectangle
 				(start -1.27 -4.445)
 				(end 1.27 -5.715)
@@ -5855,7 +5756,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinHeader_1x06_P2.54mm_Horizontal_SMD"
+	(symbol "PinHeader_01x06_P2.54mm_Horizontal_SMD"
 		(pin_names hide)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -5868,7 +5769,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinHeader_1x06_P2.54mm_Horizontal_SMD"
+		(property "Value" "PinHeader_01x06_P2.54mm_Horizontal_SMD"
 			(at 0 -10.16 0)
 			(effects
 				(font
@@ -5876,7 +5777,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinHeader_1x06_P2.54mm_Horizontal_SMD"
+		(property "Footprint" "fab:PinHeader_01x06_P2.54mm_Horizontal_SMD"
 			(at 0 0 0)
 			(effects
 				(font
@@ -5921,7 +5822,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinHeader_1x06_P2.54mm_Horizontal_SMD_1_1"
+		(symbol "PinHeader_01x06_P2.54mm_Horizontal_SMD_1_1"
 			(rectangle
 				(start -1.27 -6.985)
 				(end 1.27 -8.255)
@@ -6098,7 +5999,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinHeader_1x06_P2.54mm_Vertical_THT_D1.4mm"
+	(symbol "PinHeader_01x06_P2.54mm_Vertical_THT_D1.4mm"
 		(pin_names hide)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -6111,7 +6012,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinHeader_1x06_P2.54mm_Vertical_THT_D1.4mm"
+		(property "Value" "PinHeader_01x06_P2.54mm_Vertical_THT_D1.4mm"
 			(at 0 -10.16 0)
 			(effects
 				(font
@@ -6119,7 +6020,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinHeader_1x06_P2.54mm_Vertical_THT_D1.4mm"
+		(property "Footprint" "fab:PinHeader_01x06_P2.54mm_Vertical_THT_D1.4mm"
 			(at 0 0 0)
 			(effects
 				(font
@@ -6164,7 +6065,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinHeader_1x06_P2.54mm_Vertical_THT_D1.4mm_1_1"
+		(symbol "PinHeader_01x06_P2.54mm_Vertical_THT_D1.4mm_1_1"
 			(rectangle
 				(start -1.27 -6.985)
 				(end 1.27 -8.255)
@@ -6341,7 +6242,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinHeader_1x06_P2.54mm_Vertical_THT_D1mm"
+	(symbol "PinHeader_01x06_P2.54mm_Vertical_THT_D1mm"
 		(pin_names hide)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -6354,7 +6255,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinHeader_1x06_P2.54mm_Vertical_THT_D1mm"
+		(property "Value" "PinHeader_01x06_P2.54mm_Vertical_THT_D1mm"
 			(at 0 -10.16 0)
 			(effects
 				(font
@@ -6362,7 +6263,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinHeader_1x06_P2.54mm_Vertical_THT_D1mm"
+		(property "Footprint" "fab:PinHeader_01x06_P2.54mm_Vertical_THT_D1mm"
 			(at 0 0 0)
 			(effects
 				(font
@@ -6407,7 +6308,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinHeader_1x06_P2.54mm_Vertical_THT_D1mm_1_1"
+		(symbol "PinHeader_01x06_P2.54mm_Vertical_THT_D1mm_1_1"
 			(rectangle
 				(start -1.27 -6.985)
 				(end 1.27 -8.255)
@@ -6584,7 +6485,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinHeader_1x07_P2.54mm_Horizontal_SMD"
+	(symbol "PinHeader_01x07_P2.54mm_Horizontal_SMD"
 		(pin_names hide)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -6597,7 +6498,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinHeader_1x07_P2.54mm_Horizontal_SMD"
+		(property "Value" "PinHeader_01x07_P2.54mm_Horizontal_SMD"
 			(at 0 -10.16 0)
 			(effects
 				(font
@@ -6605,7 +6506,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinHeader_1x07_P2.54mm_Horizontal_SMD"
+		(property "Footprint" "fab:PinHeader_01x07_P2.54mm_Horizontal_SMD"
 			(at 0 0 0)
 			(effects
 				(font
@@ -6650,7 +6551,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinHeader_1x07_P2.54mm_Horizontal_SMD_1_1"
+		(symbol "PinHeader_01x07_P2.54mm_Horizontal_SMD_1_1"
 			(rectangle
 				(start -1.27 -6.985)
 				(end 1.27 -8.255)
@@ -6856,7 +6757,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinHeader_1x07_P2.54mm_Vertical_THT_D1.4mm"
+	(symbol "PinHeader_01x07_P2.54mm_Vertical_THT_D1.4mm"
 		(pin_names hide)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -6869,7 +6770,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinHeader_1x07_P2.54mm_Vertical_THT_D1.4mm"
+		(property "Value" "PinHeader_01x07_P2.54mm_Vertical_THT_D1.4mm"
 			(at 0 -10.16 0)
 			(effects
 				(font
@@ -6877,7 +6778,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinHeader_1x07_P2.54mm_Vertical_THT_D1.4mm"
+		(property "Footprint" "fab:PinHeader_01x07_P2.54mm_Vertical_THT_D1.4mm"
 			(at 0 0 0)
 			(effects
 				(font
@@ -6922,7 +6823,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinHeader_1x07_P2.54mm_Vertical_THT_D1.4mm_1_1"
+		(symbol "PinHeader_01x07_P2.54mm_Vertical_THT_D1.4mm_1_1"
 			(rectangle
 				(start -1.27 -6.985)
 				(end 1.27 -8.255)
@@ -7128,7 +7029,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinHeader_1x07_P2.54mm_Vertical_THT_D1mm"
+	(symbol "PinHeader_01x07_P2.54mm_Vertical_THT_D1mm"
 		(pin_names hide)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -7141,7 +7042,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinHeader_1x07_P2.54mm_Vertical_THT_D1mm"
+		(property "Value" "PinHeader_01x07_P2.54mm_Vertical_THT_D1mm"
 			(at 0 -10.16 0)
 			(effects
 				(font
@@ -7149,7 +7050,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinHeader_1x07_P2.54mm_Vertical_THT_D1mm"
+		(property "Footprint" "fab:PinHeader_01x07_P2.54mm_Vertical_THT_D1mm"
 			(at 0 0 0)
 			(effects
 				(font
@@ -7194,7 +7095,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinHeader_1x07_P2.54mm_Vertical_THT_D1mm_1_1"
+		(symbol "PinHeader_01x07_P2.54mm_Vertical_THT_D1mm_1_1"
 			(rectangle
 				(start -1.27 -6.985)
 				(end 1.27 -8.255)
@@ -7400,7 +7301,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinHeader_1x08_P2.54mm_Horizontal_SMD"
+	(symbol "PinHeader_01x08_P2.54mm_Horizontal_SMD"
 		(pin_names hide)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -7413,7 +7314,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinHeader_1x08_P2.54mm_Horizontal_SMD"
+		(property "Value" "PinHeader_01x08_P2.54mm_Horizontal_SMD"
 			(at 0 -12.7 0)
 			(effects
 				(font
@@ -7421,7 +7322,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinHeader_1x08_P2.54mm_Horizontal_SMD"
+		(property "Footprint" "fab:PinHeader_01x08_P2.54mm_Horizontal_SMD"
 			(at 0 0 0)
 			(effects
 				(font
@@ -7466,7 +7367,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinHeader_1x08_P2.54mm_Horizontal_SMD_1_1"
+		(symbol "PinHeader_01x08_P2.54mm_Horizontal_SMD_1_1"
 			(rectangle
 				(start -1.27 -9.525)
 				(end 1.27 -10.795)
@@ -7701,7 +7602,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinHeader_1x08_P2.54mm_Vertical_THT_D1.4mm"
+	(symbol "PinHeader_01x08_P2.54mm_Vertical_THT_D1.4mm"
 		(pin_names hide)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -7714,7 +7615,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinHeader_1x08_P2.54mm_Vertical_THT_D1.4mm"
+		(property "Value" "PinHeader_01x08_P2.54mm_Vertical_THT_D1.4mm"
 			(at 0 -12.7 0)
 			(effects
 				(font
@@ -7722,7 +7623,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinHeader_1x08_P2.54mm_Vertical_THT_D1.4mm"
+		(property "Footprint" "fab:PinHeader_01x08_P2.54mm_Vertical_THT_D1.4mm"
 			(at 0 0 0)
 			(effects
 				(font
@@ -7767,7 +7668,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinHeader_1x08_P2.54mm_Vertical_THT_D1.4mm_1_1"
+		(symbol "PinHeader_01x08_P2.54mm_Vertical_THT_D1.4mm_1_1"
 			(rectangle
 				(start -1.27 -9.525)
 				(end 1.27 -10.795)
@@ -8002,7 +7903,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinHeader_1x08_P2.54mm_Vertical_THT_D1mm"
+	(symbol "PinHeader_01x08_P2.54mm_Vertical_THT_D1mm"
 		(pin_names hide)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -8015,7 +7916,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinHeader_1x08_P2.54mm_Vertical_THT_D1mm"
+		(property "Value" "PinHeader_01x08_P2.54mm_Vertical_THT_D1mm"
 			(at 0 -12.7 0)
 			(effects
 				(font
@@ -8023,7 +7924,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinHeader_1x08_P2.54mm_Vertical_THT_D1mm"
+		(property "Footprint" "fab:PinHeader_01x08_P2.54mm_Vertical_THT_D1mm"
 			(at 0 0 0)
 			(effects
 				(font
@@ -8068,7 +7969,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinHeader_1x08_P2.54mm_Vertical_THT_D1mm_1_1"
+		(symbol "PinHeader_01x08_P2.54mm_Vertical_THT_D1mm_1_1"
 			(rectangle
 				(start -1.27 -9.525)
 				(end 1.27 -10.795)
@@ -8303,7 +8204,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinHeader_2x02_P1.27mm_Vertical_SMD"
+	(symbol "PinHeader_02x02_P1.27mm_Vertical_SMD"
 		(pin_names hide)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -8316,7 +8217,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinHeader_2x02_P1.27mm_Vertical_SMD"
+		(property "Value" "PinHeader_02x02_P1.27mm_Vertical_SMD"
 			(at 1.27 -3.81 0)
 			(effects
 				(font
@@ -8324,7 +8225,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinHeader_2x02_P1.27mm_Vertical_SMD"
+		(property "Footprint" "fab:PinHeader_02x02_P1.27mm_Vertical_SMD"
 			(at 0 0 0)
 			(effects
 				(font
@@ -8369,7 +8270,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinHeader_2x02_P1.27mm_Vertical_SMD_0_1"
+		(symbol "PinHeader_02x02_P1.27mm_Vertical_SMD_0_1"
 			(polyline
 				(pts
 					(xy -5.08 -1.27) (xy -1.27 -1.27)
@@ -8467,7 +8368,7 @@
 				)
 			)
 		)
-		(symbol "Conn_PinHeader_2x02_P1.27mm_Vertical_SMD_1_1"
+		(symbol "PinHeader_02x02_P1.27mm_Vertical_SMD_1_1"
 			(rectangle
 				(start -5.08 2.54)
 				(end 5.08 -2.54)
@@ -8553,7 +8454,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinHeader_2x02_P2.54mm_Vertical_SMD"
+	(symbol "PinHeader_02x02_P2.54mm_Vertical_SMD"
 		(pin_names hide)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -8566,7 +8467,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinHeader_2x02_P2.54mm_Vertical_SMD"
+		(property "Value" "PinHeader_02x02_P2.54mm_Vertical_SMD"
 			(at 0 -3.81 0)
 			(effects
 				(font
@@ -8574,7 +8475,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinHeader_2x02_P2.54mm_Vertical_SMD"
+		(property "Footprint" "fab:PinHeader_02x02_P2.54mm_Vertical_SMD"
 			(at 0 0 0)
 			(effects
 				(font
@@ -8619,7 +8520,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinHeader_2x02_P2.54mm_Vertical_SMD_1_1"
+		(symbol "PinHeader_02x02_P2.54mm_Vertical_SMD_1_1"
 			(rectangle
 				(start -3.81 2.54)
 				(end 3.81 -2.54)
@@ -8705,7 +8606,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinHeader_2x03_P2.54mm_Vertical_SMD"
+	(symbol "PinHeader_02x03_P2.54mm_Vertical_SMD"
 		(pin_names hide)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -8718,7 +8619,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinHeader_2x03_P2.54mm_Vertical_SMD"
+		(property "Value" "PinHeader_02x03_P2.54mm_Vertical_SMD"
 			(at 0 -5.08 0)
 			(effects
 				(font
@@ -8726,7 +8627,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinHeader_2x03_P2.54mm_Vertical_SMD"
+		(property "Footprint" "fab:PinHeader_02x03_P2.54mm_Vertical_SMD"
 			(at 0 0 0)
 			(effects
 				(font
@@ -8771,7 +8672,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinHeader_2x03_P2.54mm_Vertical_SMD_1_1"
+		(symbol "PinHeader_02x03_P2.54mm_Vertical_SMD_1_1"
 			(rectangle
 				(start -3.81 3.81)
 				(end 3.81 -3.81)
@@ -8893,7 +8794,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinHeader_2x04_P2.54mm_Vertical_SMD"
+	(symbol "PinHeader_02x04_P2.54mm_Vertical_SMD"
 		(pin_names hide)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -8906,7 +8807,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinHeader_2x04_P2.54mm_Vertical_SMD"
+		(property "Value" "PinHeader_02x04_P2.54mm_Vertical_SMD"
 			(at 0 -7.62 0)
 			(effects
 				(font
@@ -8914,7 +8815,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinHeader_2x04_P2.54mm_Vertical_SMD"
+		(property "Footprint" "fab:PinHeader_02x04_P2.54mm_Vertical_SMD"
 			(at 0 0 0)
 			(effects
 				(font
@@ -8959,7 +8860,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinHeader_2x04_P2.54mm_Vertical_SMD_1_1"
+		(symbol "PinHeader_02x04_P2.54mm_Vertical_SMD_1_1"
 			(rectangle
 				(start -3.81 6.35)
 				(end 3.81 -6.35)
@@ -9117,7 +9018,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinHeader_2x05_P1.27mm_Vertical_SMD"
+	(symbol "PinHeader_02x05_P1.27mm_Vertical_SMD"
 		(pin_names hide)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -9130,7 +9031,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinHeader_2x05_P1.27mm_Vertical_SMD"
+		(property "Value" "PinHeader_02x05_P1.27mm_Vertical_SMD"
 			(at 0 -7.62 0)
 			(effects
 				(font
@@ -9138,7 +9039,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinHeader_2x05_P1.27mm_Vertical_SMD"
+		(property "Footprint" "fab:PinHeader_02x05_P1.27mm_Vertical_SMD"
 			(at 0 0 0)
 			(effects
 				(font
@@ -9183,7 +9084,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinHeader_2x05_P1.27mm_Vertical_SMD_1_1"
+		(symbol "PinHeader_02x05_P1.27mm_Vertical_SMD_1_1"
 			(rectangle
 				(start -3.81 6.35)
 				(end 3.81 -6.35)
@@ -9377,7 +9278,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinHeader_2x05_P2.54mm_Vertical_SMD"
+	(symbol "PinHeader_02x05_P2.54mm_Vertical_SMD"
 		(pin_names hide)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -9390,7 +9291,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinHeader_2x05_P2.54mm_Vertical_SMD"
+		(property "Value" "PinHeader_02x05_P2.54mm_Vertical_SMD"
 			(at 0 -7.62 0)
 			(effects
 				(font
@@ -9398,7 +9299,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinHeader_2x05_P2.54mm_Vertical_SMD"
+		(property "Footprint" "fab:PinHeader_02x05_P2.54mm_Vertical_SMD"
 			(at 0 0 0)
 			(effects
 				(font
@@ -9443,7 +9344,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinHeader_2x05_P2.54mm_Vertical_SMD_1_1"
+		(symbol "PinHeader_02x05_P2.54mm_Vertical_SMD_1_1"
 			(rectangle
 				(start -3.81 6.35)
 				(end 3.81 -6.35)
@@ -9657,7 +9558,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinHeader_1x06_P2.54mm_Horizontal_SMD"
+		(property "Footprint" "fab:PinHeader_01x06_P2.54mm_Horizontal_SMD"
 			(at 0 0 0)
 			(effects
 				(font
@@ -10046,7 +9947,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinHeader_2x02_P2.54mm_Vertical_SMD"
+		(property "Footprint" "fab:PinHeader_02x02_P2.54mm_Vertical_SMD"
 			(at 0 0 0)
 			(effects
 				(font
@@ -10285,7 +10186,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinHeader_1x02_P2.54mm_Horizontal_SMD"
+		(property "Footprint" "fab:PinHeader_01x02_P2.54mm_Horizontal_SMD"
 			(at 0 0 0)
 			(effects
 				(font
@@ -10468,7 +10369,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinHeader_2x03_P2.54mm_Vertical_SMD"
+		(property "Footprint" "fab:PinHeader_02x03_P2.54mm_Vertical_SMD"
 			(at 0 0 0)
 			(effects
 				(font
@@ -10763,7 +10664,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinSocket_1x02_P2.54mm_Horizontal_SMD"
+	(symbol "PinSocket_01x02_P2.54mm_Horizontal_SMD"
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
@@ -10775,7 +10676,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinSocket_1x02_P2.54mm_Horizontal_SMD"
+		(property "Value" "PinSocket_01x02_P2.54mm_Horizontal_SMD"
 			(at 0 -3.81 0)
 			(effects
 				(font
@@ -10783,7 +10684,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinSocket_1x02_P2.54mm_Horizontal_SMD"
+		(property "Footprint" "fab:PinSocket_01x02_P2.54mm_Horizontal_SMD"
 			(at 0 0 0)
 			(effects
 				(font
@@ -10828,7 +10729,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinSocket_1x02_P2.54mm_Horizontal_SMD_0_0"
+		(symbol "PinSocket_01x02_P2.54mm_Horizontal_SMD_0_0"
 			(polyline
 				(pts
 					(xy -2.286 -7.366) (xy -2.286 -7.366)
@@ -10842,7 +10743,7 @@
 				)
 			)
 		)
-		(symbol "Conn_PinSocket_1x02_P2.54mm_Horizontal_SMD_1_1"
+		(symbol "PinSocket_01x02_P2.54mm_Horizontal_SMD_1_1"
 			(pin passive line
 				(at -2.54 1.27 0)
 				(length 2.54)
@@ -10881,7 +10782,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinSocket_1x02_P2.54mm_Vertical_SMD"
+	(symbol "PinSocket_01x02_P2.54mm_Vertical_SMD"
 		(pin_names hide)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -10894,7 +10795,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinSocket_1x02_P2.54mm_Vertical_SMD"
+		(property "Value" "PinSocket_01x02_P2.54mm_Vertical_SMD"
 			(at 0 -3.81 0)
 			(effects
 				(font
@@ -10902,7 +10803,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinSocket_1x02_P2.54mm_Vertical_SMD"
+		(property "Footprint" "fab:PinSocket_01x02_P2.54mm_Vertical_SMD"
 			(at 0 0 0)
 			(effects
 				(font
@@ -10947,7 +10848,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinSocket_1x02_P2.54mm_Vertical_SMD_0_0"
+		(symbol "PinSocket_01x02_P2.54mm_Vertical_SMD_0_0"
 			(rectangle
 				(start -2.54 2.54)
 				(end 2.54 -2.54)
@@ -11008,7 +10909,7 @@
 				)
 			)
 		)
-		(symbol "Conn_PinSocket_1x02_P2.54mm_Vertical_SMD_1_1"
+		(symbol "PinSocket_01x02_P2.54mm_Vertical_SMD_1_1"
 			(pin passive line
 				(at 5.08 1.27 180)
 				(length 2.54)
@@ -11047,7 +10948,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinSocket_1x03_P2.54mm_Horizontal_SMD"
+	(symbol "PinSocket_01x03_P2.54mm_Horizontal_SMD"
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
@@ -11059,7 +10960,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinSocket_1x03_P2.54mm_Horizontal_SMD"
+		(property "Value" "PinSocket_01x03_P2.54mm_Horizontal_SMD"
 			(at 0 -5.08 0)
 			(effects
 				(font
@@ -11067,7 +10968,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinSocket_1x03_P2.54mm_Horizontal_SMD"
+		(property "Footprint" "fab:PinSocket_01x03_P2.54mm_Horizontal_SMD"
 			(at 0 0 0)
 			(effects
 				(font
@@ -11112,7 +11013,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinSocket_1x03_P2.54mm_Horizontal_SMD_0_0"
+		(symbol "PinSocket_01x03_P2.54mm_Horizontal_SMD_0_0"
 			(polyline
 				(pts
 					(xy -2.286 -7.366) (xy -2.286 -7.366)
@@ -11126,7 +11027,7 @@
 				)
 			)
 		)
-		(symbol "Conn_PinSocket_1x03_P2.54mm_Horizontal_SMD_1_1"
+		(symbol "PinSocket_01x03_P2.54mm_Horizontal_SMD_1_1"
 			(pin passive line
 				(at -2.54 2.54 0)
 				(length 2.54)
@@ -11183,7 +11084,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinSocket_1x03_P2.54mm_Vertical_SMD"
+	(symbol "PinSocket_01x03_P2.54mm_Vertical_SMD"
 		(pin_names hide)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -11196,7 +11097,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinSocket_1x03_P2.54mm_Vertical_SMD"
+		(property "Value" "PinSocket_01x03_P2.54mm_Vertical_SMD"
 			(at 0 -5.08 0)
 			(effects
 				(font
@@ -11204,7 +11105,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinSocket_1x03_P2.54mm_Vertical_SMD"
+		(property "Footprint" "fab:PinSocket_01x03_P2.54mm_Vertical_SMD"
 			(at 0 0 0)
 			(effects
 				(font
@@ -11249,7 +11150,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinSocket_1x03_P2.54mm_Vertical_SMD_0_0"
+		(symbol "PinSocket_01x03_P2.54mm_Vertical_SMD_0_0"
 			(polyline
 				(pts
 					(xy 0 0) (xy -2.54 0)
@@ -11323,7 +11224,7 @@
 				)
 			)
 		)
-		(symbol "Conn_PinSocket_1x03_P2.54mm_Vertical_SMD_1_0"
+		(symbol "PinSocket_01x03_P2.54mm_Vertical_SMD_1_0"
 			(rectangle
 				(start -2.54 3.81)
 				(end 2.54 -3.81)
@@ -11336,7 +11237,7 @@
 				)
 			)
 		)
-		(symbol "Conn_PinSocket_1x03_P2.54mm_Vertical_SMD_1_1"
+		(symbol "PinSocket_01x03_P2.54mm_Vertical_SMD_1_1"
 			(pin passive line
 				(at 5.08 2.54 180)
 				(length 2.54)
@@ -11393,7 +11294,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinSocket_1x04_P2.54mm_Horizontal_SMD"
+	(symbol "PinSocket_01x04_P2.54mm_Horizontal_SMD"
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
@@ -11405,7 +11306,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinSocket_1x04_P2.54mm_Horizontal_SMD"
+		(property "Value" "PinSocket_01x04_P2.54mm_Horizontal_SMD"
 			(at 0 -6.35 0)
 			(effects
 				(font
@@ -11413,7 +11314,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinSocket_1x04_P2.54mm_Horizontal_SMD"
+		(property "Footprint" "fab:PinSocket_01x04_P2.54mm_Horizontal_SMD"
 			(at 0 0 0)
 			(effects
 				(font
@@ -11458,7 +11359,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinSocket_1x04_P2.54mm_Horizontal_SMD_0_0"
+		(symbol "PinSocket_01x04_P2.54mm_Horizontal_SMD_0_0"
 			(polyline
 				(pts
 					(xy -2.286 -3.556) (xy -2.286 -3.556)
@@ -11472,7 +11373,7 @@
 				)
 			)
 		)
-		(symbol "Conn_PinSocket_1x04_P2.54mm_Horizontal_SMD_1_1"
+		(symbol "PinSocket_01x04_P2.54mm_Horizontal_SMD_1_1"
 			(pin passive line
 				(at -2.54 3.81 0)
 				(length 2.54)
@@ -11547,7 +11448,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinSocket_1x04_P2.54mm_Vertical_SMD"
+	(symbol "PinSocket_01x04_P2.54mm_Vertical_SMD"
 		(pin_names hide)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -11560,7 +11461,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinSocket_1x04_P2.54mm_Vertical_SMD"
+		(property "Value" "PinSocket_01x04_P2.54mm_Vertical_SMD"
 			(at 0 -7.62 0)
 			(effects
 				(font
@@ -11568,7 +11469,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinSocket_1x04_P2.54mm_Vertical_SMD"
+		(property "Footprint" "fab:PinSocket_01x04_P2.54mm_Vertical_SMD"
 			(at 0 0 0)
 			(effects
 				(font
@@ -11613,7 +11514,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinSocket_1x04_P2.54mm_Vertical_SMD_0_0"
+		(symbol "PinSocket_01x04_P2.54mm_Vertical_SMD_0_0"
 			(polyline
 				(pts
 					(xy 0 -5.08) (xy -2.54 -5.08)
@@ -11711,7 +11612,7 @@
 				)
 			)
 		)
-		(symbol "Conn_PinSocket_1x04_P2.54mm_Vertical_SMD_1_0"
+		(symbol "PinSocket_01x04_P2.54mm_Vertical_SMD_1_0"
 			(rectangle
 				(start -2.54 6.35)
 				(end 2.54 -6.35)
@@ -11724,7 +11625,7 @@
 				)
 			)
 		)
-		(symbol "Conn_PinSocket_1x04_P2.54mm_Vertical_SMD_1_1"
+		(symbol "PinSocket_01x04_P2.54mm_Vertical_SMD_1_1"
 			(pin passive line
 				(at 5.08 2.54 180)
 				(length 2.54)
@@ -11799,7 +11700,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinSocket_1x05_P2.54mm_Horizontal_SMD"
+	(symbol "PinSocket_01x05_P2.54mm_Horizontal_SMD"
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
@@ -11811,7 +11712,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinSocket_1x05_P2.54mm_Horizontal_SMD"
+		(property "Value" "PinSocket_01x05_P2.54mm_Horizontal_SMD"
 			(at 0 -7.62 0)
 			(effects
 				(font
@@ -11819,7 +11720,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinSocket_1x05_P2.54mm_Horizontal_SMD"
+		(property "Footprint" "fab:PinSocket_01x05_P2.54mm_Horizontal_SMD"
 			(at 0 0 0)
 			(effects
 				(font
@@ -11864,7 +11765,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinSocket_1x05_P2.54mm_Horizontal_SMD_0_0"
+		(symbol "PinSocket_01x05_P2.54mm_Horizontal_SMD_0_0"
 			(polyline
 				(pts
 					(xy -2.286 0.254) (xy -2.286 0.254)
@@ -11878,7 +11779,7 @@
 				)
 			)
 		)
-		(symbol "Conn_PinSocket_1x05_P2.54mm_Horizontal_SMD_1_1"
+		(symbol "PinSocket_01x05_P2.54mm_Horizontal_SMD_1_1"
 			(pin passive line
 				(at -2.54 5.08 0)
 				(length 2.54)
@@ -11971,7 +11872,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinSocket_1x05_P2.54mm_Vertical_SMD"
+	(symbol "PinSocket_01x05_P2.54mm_Vertical_SMD"
 		(pin_names hide)
 		(exclude_from_sim no)
 		(in_bom yes)
@@ -11984,7 +11885,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinSocket_1x05_P2.54mm_Vertical_SMD"
+		(property "Value" "PinSocket_01x05_P2.54mm_Vertical_SMD"
 			(at 0 -7.62 0)
 			(effects
 				(font
@@ -11992,7 +11893,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinSocket_1x05_P2.54mm_Vertical_SMD"
+		(property "Footprint" "fab:PinSocket_01x05_P2.54mm_Vertical_SMD"
 			(at 0 0 0)
 			(effects
 				(font
@@ -12037,7 +11938,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinSocket_1x05_P2.54mm_Vertical_SMD_0_0"
+		(symbol "PinSocket_01x05_P2.54mm_Vertical_SMD_0_0"
 			(polyline
 				(pts
 					(xy 0 -2.54) (xy -2.54 -2.54)
@@ -12159,7 +12060,7 @@
 				)
 			)
 		)
-		(symbol "Conn_PinSocket_1x05_P2.54mm_Vertical_SMD_1_0"
+		(symbol "PinSocket_01x05_P2.54mm_Vertical_SMD_1_0"
 			(rectangle
 				(start -2.54 6.35)
 				(end 2.54 -6.35)
@@ -12172,7 +12073,7 @@
 				)
 			)
 		)
-		(symbol "Conn_PinSocket_1x05_P2.54mm_Vertical_SMD_1_1"
+		(symbol "PinSocket_01x05_P2.54mm_Vertical_SMD_1_1"
 			(pin passive line
 				(at 5.08 5.08 180)
 				(length 2.54)
@@ -12265,7 +12166,7 @@
 			)
 		)
 	)
-	(symbol "Conn_PinSocket_1x06_P2.54mm_Horizontal_SMD"
+	(symbol "PinSocket_01x06_P2.54mm_Horizontal_SMD"
 		(exclude_from_sim no)
 		(in_bom yes)
 		(on_board yes)
@@ -12277,7 +12178,7 @@
 				)
 			)
 		)
-		(property "Value" "Conn_PinSocket_1x06_P2.54mm_Horizontal_SMD"
+		(property "Value" "PinSocket_01x06_P2.54mm_Horizontal_SMD"
 			(at 0 -8.89 0)
 			(effects
 				(font
@@ -12285,7 +12186,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinSocket_1x06_P2.54mm_Horizontal_SMD"
+		(property "Footprint" "fab:PinSocket_01x06_P2.54mm_Horizontal_SMD"
 			(at 0 0 0)
 			(effects
 				(font
@@ -12330,7 +12231,7 @@
 				(hide yes)
 			)
 		)
-		(symbol "Conn_PinSocket_1x06_P2.54mm_Horizontal_SMD_0_0"
+		(symbol "PinSocket_01x06_P2.54mm_Horizontal_SMD_0_0"
 			(polyline
 				(pts
 					(xy -2.286 1.524) (xy -2.286 1.524)
@@ -12344,7 +12245,7 @@
 				)
 			)
 		)
-		(symbol "Conn_PinSocket_1x06_P2.54mm_Horizontal_SMD_1_1"
+		(symbol "PinSocket_01x06_P2.54mm_Horizontal_SMD_1_1"
 			(pin passive line
 				(at -2.54 6.35 0)
 				(length 2.54)
@@ -12475,7 +12376,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinSocket_1x06_P2.54mm_Horizontal_SMD"
+		(property "Footprint" "fab:PinSocket_01x06_P2.54mm_Horizontal_SMD"
 			(at 0 0 0)
 			(effects
 				(font
@@ -12802,7 +12703,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinSocket_1x02_P2.54mm_Horizontal_SMD"
+		(property "Footprint" "fab:PinSocket_01x02_P2.54mm_Horizontal_SMD"
 			(at 0 0 0)
 			(effects
 				(font
@@ -20982,7 +20883,7 @@
 				)
 			)
 		)
-		(property "Footprint" "fab:PinHeader_1x02_P2.54mm_Horizontal_SMD"
+		(property "Footprint" "fab:PinHeader_01x02_P2.54mm_Horizontal_SMD"
 			(at 0 -2.54 0)
 			(effects
 				(font
@@ -40308,6 +40209,105 @@
 			)
 		)
 	)
+	(symbol "PinHeader_01x01_P2.54mm_Horizontal_SMD"
+		(pin_names
+			(offset 1.016) hide)
+		(exclude_from_sim no)
+		(in_bom yes)
+		(on_board yes)
+		(property "Reference" "J"
+			(at 0 2.54 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Value" "PinHeader_01x01_P2.54mm_Horizontal_SMD"
+			(at 0 -2.54 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+			)
+		)
+		(property "Footprint" "fab:PinHeader_01x01_P2.54mm_Horizontal_SMD"
+			(at 0 0 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Datasheet" "~"
+			(at 0 0 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "Description" "Connector pin header 2.54mm pitch horizontal SMD"
+			(at 0 0 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "ki_keywords" "Connector pin header 2.54mm pitch horizontal SMD GBC36SGSN-M89"
+			(at 0 0 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(property "ki_fp_filters" "*PinHeader*1x01*"
+			(at 0 0 0)
+			(effects
+				(font
+					(size 1.27 1.27)
+				)
+				(hide yes)
+			)
+		)
+		(symbol "PinHeader_01x01_P2.54mm_Horizontal_SMD_1_1"
+			(rectangle
+				(start -1.27 0.635)
+				(end 1.27 -0.635)
+				(stroke
+					(width 0.1524)
+					(type default)
+				)
+				(fill
+					(type outline)
+				)
+			)
+			(pin passive line
+				(at 5.08 0 180)
+				(length 3.81)
+				(name "Pin_1"
+					(effects
+						(font
+							(size 1.27 1.27)
+						)
+					)
+				)
+				(number "1"
+					(effects
+						(font
+							(size 1.27 1.27)
+						)
+					)
+				)
+			)
+		)
+	)
 	(symbol "R_0603"
 		(pin_numbers hide)
 		(pin_names
@@ -47390,7 +47390,7 @@
 				(justify right)
 			)
 		)
-		(property "Footprint" "fab:PinHeader_1x02_P2.54mm_Horizontal_SMD"
+		(property "Footprint" "fab:PinHeader_01x02_P2.54mm_Horizontal_SMD"
 			(at 0 0 0)
 			(effects
 				(font