diff --git a/fab.lib b/fab.lib
index 5010a87ab587cc06d1b3a67c7b7a1b82e14b1985..57f351aae1e304f2483231985954ef093c80fe03 100644
--- a/fab.lib
+++ b/fab.lib
@@ -590,7 +590,7 @@ F1 "Conn_01x01_Male" 0 -100 50 H V C CNN
 F2 "fab:Header_SMD_01x01_P2.54mm_Horizontal_Male" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- Connector*:*
+ fab:*Header_SMD_01x??_*
 $ENDFPLIST
 DRAW
 S 34 5 0 -5 1 1 6 F
@@ -607,7 +607,7 @@ F1 "Conn_01x02_Male" 0 -200 50 H V C CNN
 F2 "fab:Header_SMD_01x02_P2.54mm_Horizontal_Male" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- Connector*:*_1x??_*
+ fab:*Header_SMD_01x??_*
 $ENDFPLIST
 DRAW
 S 34 -95 0 -105 1 1 6 F
@@ -627,7 +627,7 @@ F1 "Conn_01x03_Male" 0 -200 50 H V C CNN
 F2 "fab:Header_SMD_01x03_P2.54mm_Horizontal_Male" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- Connector*:*_1x??_*
+ fab:*Header_SMD_01x??_*
 $ENDFPLIST
 DRAW
 S 34 -95 0 -105 1 1 6 F
@@ -650,7 +650,7 @@ F1 "Conn_01x04_Male" 0 -300 50 H V C CNN
 F2 "fab:Header_SMD_01x04_P2.54mm_Horizontal_Male" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- Connector*:*_1x??_*
+ fab:*Header_SMD_01x??_*
 $ENDFPLIST
 DRAW
 S 34 -195 0 -205 1 1 6 F
@@ -676,7 +676,7 @@ F1 "Conn_01x05_Male" 0 -300 50 H V C CNN
 F2 "fab:Header_SMD_01x05_P2.54mm_Horizontal_Male" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- Connector*:*_1x??_*
+ fab:*Header_SMD_01x??_*
 $ENDFPLIST
 DRAW
 S 34 -195 0 -205 1 1 6 F
@@ -705,7 +705,7 @@ F1 "Conn_01x06_Male" 0 -400 50 H V C CNN
 F2 "fab:Header_SMD_01x06_P2.54mm_Horizontal_Male" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- Connector*:*_1x??_*
+ fab:*Header_SMD_01x??_*
 $ENDFPLIST
 DRAW
 S 34 -295 0 -305 1 1 6 F
@@ -737,7 +737,7 @@ F1 "Conn_01x07_Male" 0 -400 50 H V C CNN
 F2 "fab:Header_SMD_01x07_P2.54mm_Horizontal_Male" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- Connector*:*_1x??_*
+ fab:*Header_SMD_01x??_*
 $ENDFPLIST
 DRAW
 S 34 -295 0 -305 1 1 6 F
@@ -772,7 +772,7 @@ F1 "Conn_01x08_Male" 0 -500 50 H V C CNN
 F2 "fab:Header_SMD_01x08_P2.54mm_Horizontal_Male" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- Connector*:*_1x??_*
+ fab:*Header_SMD_01x??_*
 $ENDFPLIST
 DRAW
 S 34 -395 0 -405 1 1 6 F
@@ -810,7 +810,7 @@ F1 "Conn_01x09_Male" 0 -500 50 H V C CNN
 F2 "fab:Header_SMD_01x09_P2.54mm_Horizontal_Male" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- Connector*:*_1x??_*
+ fab:*Header_SMD_01x??_*
 $ENDFPLIST
 DRAW
 S 34 -395 0 -405 1 1 6 F
@@ -851,7 +851,7 @@ F1 "Conn_01x10_Male" 0 -600 50 H V C CNN
 F2 "fab:Header_SMD_01x10_P2.54mm_Horizontal_Male" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- Connector*:*_1x??_*
+ fab:*Header_SMD_01x??_*
 $ENDFPLIST
 DRAW
 S 34 -495 0 -505 1 1 6 F
@@ -895,7 +895,7 @@ F1 "Conn_01x11_Male" 0 -600 50 H V C CNN
 F2 "fab:Header_SMD_01x11_P2.54mm_Horizontal_Male" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- Connector*:*_1x??_*
+ fab:*Header_SMD_01x??_*
 $ENDFPLIST
 DRAW
 S 34 -495 0 -505 1 1 6 F
@@ -942,7 +942,7 @@ F1 "Conn_01x12_Male" 0 -700 50 H V C CNN
 F2 "fab:Header_SMD_01x12_P2.54mm_Horizontal_Male" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- Connector*:*_1x??_*
+ fab:*Header_SMD_01x??_*
 $ENDFPLIST
 DRAW
 S 34 -595 0 -605 1 1 6 F
@@ -992,7 +992,7 @@ F1 "Conn_01x13_Male" 0 -700 50 H V C CNN
 F2 "fab:Header_SMD_01x13_P2.54mm_Horizontal_Male" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- Connector*:*_1x??_*
+ fab:*Header_SMD_01x??_*
 $ENDFPLIST
 DRAW
 S 34 -595 0 -605 1 1 6 F
@@ -1045,7 +1045,7 @@ F1 "Conn_01x14_Male" 0 -800 50 H V C CNN
 F2 "fab:Header_SMD_01x14_P2.54mm_Horizontal_Male" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- Connector*:*_1x??_*
+ fab:*Header_SMD_01x??_*
 $ENDFPLIST
 DRAW
 S 34 -695 0 -705 1 1 6 F
@@ -1101,7 +1101,7 @@ F1 "Conn_01x15_Male" 0 -800 50 H V C CNN
 F2 "fab:Header_SMD_01x15_P2.54mm_Horizontal_Male" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- Connector*:*_1x??_*
+ fab:*Header_SMD_01x??_*
 $ENDFPLIST
 DRAW
 S 34 -695 0 -705 1 1 6 F
@@ -1160,7 +1160,7 @@ F1 "Conn_01x16_Male" 0 -900 50 H V C CNN
 F2 "fab:Header_SMD_01x16_P2.54mm_Horizontal_Male" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- Connector*:*_1x??_*
+ fab:*Header_SMD_01x??_*
 $ENDFPLIST
 DRAW
 S 34 -795 0 -805 1 1 6 F
@@ -1222,7 +1222,7 @@ F1 "Conn_FTDI_01x06_Male" 0 -400 50 H V C CNN
 F2 "fab:Header_SMD_FTDI_01x06_P2.54mm_Horizontal_Male" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- Connector*:*_1x??_*
+ fab:*Header_SMD_01x??_*
 $ENDFPLIST
 DRAW
 P 2 1 1 6 50 -300 34 -300 N
@@ -1248,7 +1248,7 @@ F1 "Conn_UPDI_01x01_Male" 0 -200 50 H V C CNN
 F2 "fab:Header_SMD_UPDI_01x02_P2.54mm_Horizontal_Male" 0 0 50 H V C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- Connector*:*_1x??_*
+ fab:*Header_SMD_01x??_*
 $ENDFPLIST
 DRAW
 P 2 1 1 6 50 -100 34 -100 N