diff --git a/library/Diode.lib b/library/Diode.lib
index e86f9c26..ca86bb71 100644
--- a/library/Diode.lib
+++ b/library/Diode.lib
@@ -204,9 +204,9 @@ F2 "TO_SOT_Packages_SMD:SOT-363" 0 -175 50 H I C CNN
 F3 "" 0 100 50 H I C CNN
 ALIAS BAS16VY MMBD4148TW MMBD4448HTW HN2D02FU Comchip_ACDSV6-4448TI-G Central_Semi_CMKD6001 Central_Semi_CMKD4448 Comchip_CDSV6-4148-G Comchip_CDSV6-4448TI-G
 $FPLIST
- *SC-70-6*
- *SC-88*
- *SOT-363*
+ *SC?70*
+ *SC?88*
+ *SOT?363*
 $ENDFPLIST
 DRAW
 P 2 0 1 6 -50 50 -50 -50 N
@@ -301,7 +301,7 @@ F1 "BAT54ADW" 0 -100 50 H V C CNN
 F2 "TO_SOT_Packages_SMD:SOT-363" 0 -175 50 H I C CNN
 F3 "" 0 100 50 H I C CNN
 $FPLIST
- *SC-70-6*
+ *SC?70*
  *SC-88*
  *SOT-363*
 $ENDFPLIST
@@ -568,7 +568,7 @@ F2 "TO_SOT_Packages_SMD:SOT-363" 0 -175 50 H I C CNN
 F3 "" 0 100 50 H I C CNN
 ALIAS BAW56DW BAW56S MMBD4448HADW Toshiba_HN1D01FU
 $FPLIST
- *SC-70-6*
+ *SC?70*
  *SC-88*
  *SOT-363*
 $ENDFPLIST
diff --git a/library/ESD_Protection.lib b/library/ESD_Protection.lib
index 7f6b3889..534af36d 100644
--- a/library/ESD_Protection.lib
+++ b/library/ESD_Protection.lib
@@ -208,7 +208,7 @@ ENDDEF
 DEF SP0502BAJT D 0 40 Y N 1 F N
 F0 "D" 225 100 50 H V L CNN
 F1 "SP0502BAJT" 225 25 50 H V L CNN
-F2 "TO_SOT_Packages_SMD:SC-70" 225 -50 50 H I L CNN
+F2 "TO_SOT_Packages_SMD:SOT-323_SC-70" 225 -50 50 H I L CNN
 F3 "" 125 125 50 H I C CNN
 $FPLIST
  SC?70*
@@ -303,7 +303,7 @@ ENDDEF
 DEF SP0504BAJT D 0 40 Y N 1 F N
 F0 "D" 300 100 50 H V L CNN
 F1 "SP0504BAJT" 300 25 50 H V L CNN
-F2 "TO_SOT_Packages_SMD:SC-70-5" 300 -50 50 H I L CNN
+F2 "TO_SOT_Packages_SMD:SOT-353_SC-70-5" 300 -50 50 H I L CNN
 F3 "" 125 125 50 H I C CNN
 $FPLIST
  SC?70*
@@ -382,7 +382,7 @@ ENDDEF
 DEF SP0505BAJT D 0 40 Y N 1 F N
 F0 "D" 300 100 50 H V L CNN
 F1 "SP0505BAJT" 300 25 50 H V L CNN
-F2 "TO_SOT_Packages_SMD:SC-70-6" 300 -50 50 H I L CNN
+F2 "TO_SOT_Packages_SMD:SOT-363_SC-70-6" 300 -50 50 H I L CNN
 F3 "" 125 125 50 H I C CNN
 $FPLIST
  SC?70*
diff --git a/library/Power_Management.lib b/library/Power_Management.lib
index 9f82e1b8..7c953604 100644
--- a/library/Power_Management.lib
+++ b/library/Power_Management.lib
@@ -350,7 +350,7 @@ F2 "" -300 250 50 H I C CNN
 F3 "" 0 100 50 H I C CNN
 ALIAS LTC4365TS8-1
 $FPLIST
- *SOT-23*
+ *SOT?23*
 $ENDFPLIST
 DRAW
 S -300 300 300 -300 0 1 10 f
@@ -440,7 +440,7 @@ F2 "TO_SOT_Packages_SMD:SOT-23-6" 0 -400 50 H I C CNN
 F3 "" -100 450 50 H I C CNN
 ALIAS LTC4440IS6
 $FPLIST
- SOT-23*
+ SOT?23*
 $ENDFPLIST
 DRAW
 S -300 300 300 -200 0 1 10 f
@@ -494,8 +494,8 @@ F2 "" -400 150 50 H I C CNN
 F3 "" -300 250 50 H I C CNN
 ALIAS MCP100-300D MCP100-315D MCP100-450D MCP100-460D MCP100-475D MCP100-485D
 $FPLIST
- SOT-23*
- TO-92*
+ SOT?23*
+ TO?92*
 $ENDFPLIST
 DRAW
 S -200 300 200 -300 1 1 10 f
@@ -514,8 +514,8 @@ F2 "" -400 150 50 H I C CNN
 F3 "" -300 250 50 H I C CNN
 ALIAS MCP101-300D MCP101-315D MCP101-450D MCP101-460D MCP101-475D MCP101-485D
 $FPLIST
- SOT-23*
- TO-92*
+ SOT?23*
+ TO?92*
 $ENDFPLIST
 DRAW
 S -200 300 200 -300 1 1 10 f
@@ -605,7 +605,7 @@ F1 "RT9701" 200 -150 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- SOT-23-5*
+ SOT?23*
 $ENDFPLIST
 DRAW
 S -350 200 350 -100 0 1 0 N
@@ -653,8 +653,8 @@ F1 "TCM809" -50 -350 50 H V L CNN
 F2 "" -400 150 50 H I C CNN
 F3 "" -300 250 50 H I C CNN
 $FPLIST
- SOT-23*
- SC-70*
+ SOT?23*
+ *SC?70*
 $ENDFPLIST
 DRAW
 S -200 300 200 -300 1 1 10 f
@@ -672,8 +672,8 @@ F1 "TCM810" -50 -350 50 H V L CNN
 F2 "" -400 150 50 H I C CNN
 F3 "" -300 250 50 H I C CNN
 $FPLIST
- SOT-23*
- SC-70*
+ SOT?23*
+ *SC?70*
 $ENDFPLIST
 DRAW
 S -200 300 200 -300 1 1 10 f
diff --git a/library/Transistor.lib b/library/Transistor.lib
index f0959659..c9036bc1 100644
--- a/library/Transistor.lib
+++ b/library/Transistor.lib
@@ -205,7 +205,7 @@ F1 "2SB817" 200 0 50 H V L CNN
 F2 "TO_SOT_Packages_THT:TO-3PB_Vertical" 200 -75 50 H I L CIN
 F3 "" 0 0 50 H I L CNN
 $FPLIST
- TO-3PB*
+ TO?3PB*
 $ENDFPLIST
 DRAW
 C 50 0 111 0 1 12 N
@@ -304,7 +304,7 @@ F1 "2SD1047" 250 0 50 H V L CNN
 F2 "TO_SOT_Packages_THT:TO-3PB_Vertical" 250 -75 50 H I L CIN
 F3 "" 0 0 50 H I L CNN
 $FPLIST
- TO-3PB*
+ TO?3PB*
 $ENDFPLIST
 DRAW
 C 50 0 111 0 1 12 N
@@ -357,8 +357,7 @@ F1 "3SK263" 200 0 50 H V L CNN
 F2 "TO_SOT_Packages_SMD:SOT-143" 200 -75 50 H I L CIN
 F3 "" 0 0 50 H I L CNN
 $FPLIST
- SOT-143*
- SOT-343*
+ SOT?143*
 $ENDFPLIST
 DRAW
 C 50 0 111 0 1 10 N
@@ -384,10 +383,10 @@ ENDDEF
 DEF AUIR3315S U 0 30 Y Y 1 F N
 F0 "U" -100 325 50 H V R CNN
 F1 "AUIR3315S" -100 250 50 H V R CNN
-F2 "TO_SOT_Packages_SMD:TO-263-5Lead" 0 -250 50 H I C CNN
+F2 "TO_SOT_Packages_SMD:TO-263-5_TabPin3" 0 -250 50 H I C CNN
 F3 "" 100 150 50 H I C CNN
 $FPLIST
- TO-263*
+ TO?263*
 $ENDFPLIST
 DRAW
 S -200 200 200 -200 0 1 10 f
@@ -1447,7 +1446,7 @@ ENDDEF
 DEF BSP129 Q 0 0 Y N 1 F N
 F0 "Q" 200 75 50 H V L CNN
 F1 "BSP129" 200 0 50 H V L CNN
-F2 "TO_SOT_Packages_SMD:SOT-223-3Lead_TabPin2" 200 -75 50 H I L CIN
+F2 "TO_SOT_Packages_SMD:SOT-223-3_TabPin2" 200 -75 50 H I L CIN
 F3 "" 0 0 50 H I L CNN
 $FPLIST
  SOT?223*
@@ -4539,7 +4538,7 @@ F1 "FDG1024NZ" 200 0 50 H V L CNN
 F2 "TO_SOT_Packages_SMD:SOT-363_SC-70-6" 200 -75 50 H I L CIN
 F3 "" 0 0 50 H I L CNN
 $FPLIST
- *SC-70*
+ **SC?70*
 $ENDFPLIST
 DRAW
 C 50 0 111 0 1 10 N
@@ -4754,9 +4753,13 @@ ENDDEF
 DEF IPS6011RPBF Q 0 0 Y N 1 F N
 F0 "Q" 325 75 50 H V L CNN
 F1 "IPS6011RPBF" 325 0 50 H V L CNN
-F2 "DPAK-5" 325 -75 50 H I L CNN
+F2 "TO-252-5_TabPin3" 325 -75 50 H I L CNN
 F3 "" 0 0 50 H I L CNN
 ALIAS IPS6021RPBF IPS6031RPBF IPS6041RPBF
+$FPLIST
+ TO?252*
+ *DPAK*
+$ENDFPLIST
 DRAW
 C 200 100 5 0 0 0 N
 T 0 -65 0 45 0 0 0 CTRL Normal 0 C C
@@ -4795,7 +4798,7 @@ ENDDEF
 DEF IPS6011SPBF Q 0 0 Y N 1 F N
 F0 "Q" 325 100 50 H V L CNN
 F1 "IPS6011SPBF" 325 0 50 H V L CNN
-F2 "TO_SOT_Packages_SMD:TO-263-5Lead" 325 -100 50 H I L CNN
+F2 "TO_SOT_Packages_SMD:TO-263-5_TabPin3" 325 -100 50 H I L CNN
 F3 "" 0 0 50 H I L CNN
 ALIAS IPS6021SPBF IPS6031SPBF IPS6041SPBF
 DRAW
@@ -4984,7 +4987,7 @@ ENDDEF
 DEF IPS7091SPBF Q 0 0 Y N 1 F N
 F0 "Q" 325 100 50 H V L CNN
 F1 "IPS7091SPBF" 325 0 50 H V L CNN
-F2 "TO_SOT_Packages_SMD:TO-263-5Lead" 325 -100 50 H I L CNN
+F2 "TO_SOT_Packages_SMD:TO-263-5_TabPin3" 325 -100 50 H I L CNN
 F3 "" 0 0 50 H I L CNN
 DRAW
 C 200 100 5 0 0 0 N
@@ -5462,7 +5465,7 @@ F1 "IRLB8721PBF" 250 0 50 H V L CNN
 F2 "TO_SOT_Packages_THT:TO-220_Vertical" 250 -75 50 H I L CIN
 F3 "" 0 0 50 H I L CNN
 $FPLIST
- TO-220*
+ TO?220*
 $ENDFPLIST
 DRAW
 C 50 0 111 0 1 10 N
diff --git a/library/ac-dc.lib b/library/ac-dc.lib
index 1e4babd4..a4997ee0 100644
--- a/library/ac-dc.lib
+++ b/library/ac-dc.lib
@@ -87,10 +87,10 @@ ENDDEF
 DEF FSL136MRT U 0 40 Y Y 1 F N
 F0 "U" 450 250 50 H V L CNN
 F1 "FSL136MRT" 450 150 50 H V L CNN
-F2 "TO-220F-6L" 450 50 50 H I L CIN
+F2 "TO_SOT_Packages_THT:Fairchild_TO-220F-6L" 450 50 50 H I L CIN
 F3 "" 75 0 50 H I C CNN
 $FPLIST
- TO-220-6L
+ Fairchild*TO*220F*6L*
 $ENDFPLIST
 DRAW
 C 300 -50 5 0 0 0 N
@@ -121,11 +121,11 @@ ENDDEF
 DEF FSQ0565RSWDTU U 0 40 Y Y 1 F N
 F0 "U" 450 250 50 H V L CNN
 F1 "FSQ0565RSWDTU" 450 150 50 H V L CNN
-F2 "TO-220F-6L" 450 50 50 H I L CIN
+F2 "TO_SOT_Packages_THT:Fairchild_TO-220F-6L" 450 50 50 H I L CIN
 F3 "" 75 0 50 H I C CNN
 ALIAS FSQ0565RQWDTU FSQ0565RSLDTU FSQ0565RQLDTU
 $FPLIST
- TO-220-6L
+ Fairchild*TO*220F*6L*
 $ENDFPLIST
 DRAW
 C 300 -50 5 0 0 0 N
@@ -270,11 +270,11 @@ ENDDEF
 DEF KA5H0265RCTU U 0 40 Y Y 1 F N
 F0 "U" 450 250 50 H V L CNN
 F1 "KA5H0265RCTU" 450 150 50 H V L CNN
-F2 "TO_SOT_Packages_THT:TO-220-4_Vertical" 450 50 50 H I L CIN
+F2 "TO-220-5L" 450 50 50 H I L CIN
 F3 "" 50 0 50 H I C CNN
 ALIAS KA5H0265RCYDTU
 $FPLIST
- TO-220-5L
+ *TO?220*5L*
 $ENDFPLIST
 DRAW
 C 300 -50 5 0 0 0 N
@@ -306,11 +306,11 @@ ENDDEF
 DEF KA5M0265RTU U 0 40 Y Y 1 F N
 F0 "U" 450 250 50 H V L CNN
 F1 "KA5M0265RTU" 450 150 50 H V L CNN
-F2 "TO_SOT_Packages_THT:TO-220-4_Vertical" 450 50 50 H I L CIN
+F2 "TO-220F-4L" 450 50 50 H I L CIN
 F3 "" 50 0 50 H I C CNN
 ALIAS KA5M0265RYDTU KA5L0265RTU KA5L0265RYDTU KA5H0280RTU KA5H0280RYDTU KA5M0280RTU KA5M0280RYDTU
 $FPLIST
- TO-220F-4L
+ *TO*220F*4L*
 $ENDFPLIST
 DRAW
 C 300 -50 5 0 0 0 N
diff --git a/library/adc-dac.lib b/library/adc-dac.lib
index 2d860ca9..8b1f6fdd 100644
--- a/library/adc-dac.lib
+++ b/library/adc-dac.lib
@@ -1396,7 +1396,7 @@ F1 "ADS1110" 50 350 50 H V L CNN
 F2 "TO_SOT_Packages_SMD:SOT-23-6" 450 350 50 H I L CNN
 F3 "" -300 350 50 H I C CNN
 $FPLIST
- SOT-23*
+ SOT?23*
 $ENDFPLIST
 DRAW
 S -300 300 300 -300 0 1 10 f
@@ -1905,10 +1905,10 @@ ENDDEF
 DEF DAC7513_DCN U 0 40 Y Y 1 F N
 F0 "U" -100 475 50 H V R CNN
 F1 "DAC7513_DCN" -100 400 50 H V R CNN
-F2 "" 50 -400 50 H I L CNN
+F2 "TO_SOT_Packages_SMD:SOT-23-8" 50 -400 50 H I L CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- SOT-23-*
+ SOT?23*
 $ENDFPLIST
 DRAW
 S -450 350 450 -350 0 1 10 f
@@ -2914,8 +2914,8 @@ F2 "" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 ALIAS MCP3425A1T-E/CH MCP3425A2T-E/CH MCP3425A3T-E/CH MCP3421A0T-E/CH
 $FPLIST
- SOT-23*
- SOT-23*
+ SOT?23*
+ SOT?23*
 $ENDFPLIST
 DRAW
 P 7 0 1 10 -200 250 350 250 350 0 350 -250 -200 -250 -450 0 -200 250 f
diff --git a/library/atmel.lib b/library/atmel.lib
index 9a26c520..bfcd2e88 100644
--- a/library/atmel.lib
+++ b/library/atmel.lib
@@ -10,7 +10,7 @@ F2 "TO_SOT_Packages_SMD:SOT-23-6" 50 -250 50 H I L CNN
 F3 "" 270 550 50 H I C CNN
 ALIAS AT42QT1011-TSHR
 $FPLIST
- SOT-23*
+ SOT?23*
 $ENDFPLIST
 DRAW
 S -300 200 300 -200 0 1 10 f
diff --git a/library/driver_gate.lib b/library/driver_gate.lib
index 6fa7e56c..68840eb8 100644
--- a/library/driver_gate.lib
+++ b/library/driver_gate.lib
@@ -9,7 +9,7 @@ F1 "MCP1415" 50 250 50 H V L CNN
 F2 "TO_SOT_Packages_SMD:SOT-23-5" 0 -400 50 H I C CIN
 F3 "" -200 250 50 H I C CNN
 $FPLIST
- SOT-23*
+ SOT?23*
 $ENDFPLIST
 DRAW
 S -200 200 300 -200 0 1 10 f
@@ -29,7 +29,7 @@ F1 "MCP1415R" 50 250 50 H V L CNN
 F2 "TO_SOT_Packages_SMD:SOT-23-5" 0 -400 50 H I C CIN
 F3 "" -200 250 50 H I C CNN
 $FPLIST
- SOT-23*
+ SOT?23*
 $ENDFPLIST
 DRAW
 S -200 200 300 -200 0 1 10 f
@@ -49,7 +49,7 @@ F1 "MCP1416" 50 250 50 H V L CNN
 F2 "TO_SOT_Packages_SMD:SOT-23-5" 0 -400 50 H I C CIN
 F3 "" -200 250 50 H I C CNN
 $FPLIST
- SOT-23*
+ SOT?23*
 $ENDFPLIST
 DRAW
 S -200 200 300 -200 0 1 10 f
@@ -69,7 +69,7 @@ F1 "MCP1416R" 50 250 50 H V L CNN
 F2 "TO_SOT_Packages_SMD:SOT-23-5" 0 -400 50 H I C CIN
 F3 "" -200 250 50 H I C CNN
 $FPLIST
- SOT-23*
+ SOT?23*
 $ENDFPLIST
 DRAW
 S -200 200 300 -200 0 1 10 f
diff --git a/library/infineon.lib b/library/infineon.lib
index 2bdbb8a0..1311f977 100644
--- a/library/infineon.lib
+++ b/library/infineon.lib
@@ -31,11 +31,11 @@ ENDDEF
 DEF BTS50055-1TMA U 0 40 Y Y 1 F N
 F0 "U" -300 350 50 H V C CNN
 F1 "BTS50055-1TMA" 350 350 50 H V C CNN
-F2 "TO_SOT_Packages_SMD:TO-220-7Lead_TabPin8" 0 -400 50 H I C CNN
+F2 "TO_SOT_Packages_SMD:Infineon_PG-TO-220-7Lead_TabPin8" 0 -400 50 H I C CNN
 F3 "" 0 -400 50 H I C CNN
 ALIAS BTS50055-1TMC BTS50080-1TMA BTS50080-1TMC BTS50085-1TMA
 $FPLIST
- *TO*220*
+ Infineon*PG*TO?220*TabPin8*
 $ENDFPLIST
 DRAW
 S -300 300 300 -300 0 1 10 f
diff --git a/library/ir.lib b/library/ir.lib
index c163bdb1..53d164ff 100644
--- a/library/ir.lib
+++ b/library/ir.lib
@@ -49,7 +49,7 @@ ENDDEF
 DEF AUIPS1051L U 0 20 Y Y 1 F N
 F0 "U" 150 50 50 H V L CNN
 F1 "AUIPS1051L" 150 -50 50 H V L CNN
-F2 "TO_SOT_Packages_SMD:SOT-223-3Lead_TabPin2" 0 0 50 H I C CIN
+F2 "TO_SOT_Packages_SMD:SOT-223-3_TabPin2" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 ALIAS AUIPS2041L AUIPS2051L
 $FPLIST
diff --git a/library/linear.lib b/library/linear.lib
index f57ca916..503c6aa0 100644
--- a/library/linear.lib
+++ b/library/linear.lib
@@ -1625,7 +1625,7 @@ ENDDEF
 DEF LMV601 U 0 10 Y Y 1 F N
 F0 "U" 0 150 50 H V L CNN
 F1 "LMV601" 0 -150 50 H V L CNN
-F2 "TO_SOT_Packages_SMD:SC-70-6" 0 0 50 H I L CNN
+F2 "TO_SOT_Packages_SMD:SOT-363_SC-70-6" 0 0 50 H I L CNN
 F3 "" 0 -350 50 H I L CNN
 $FPLIST
  *SC*70*
@@ -2159,7 +2159,7 @@ ENDDEF
 DEF MCP6001x-LT U 0 20 Y Y 1 F N
 F0 "U" -50 250 50 H V L CNN
 F1 "MCP6001x-LT" -50 150 50 H V L CNN
-F2 "TO_SOT_Packages_SMD:SC-70-5" -100 -200 50 H I L CNN
+F2 "TO_SOT_Packages_SMD:SOT-353_SC-70-5" -100 -200 50 H I L CNN
 F3 "" 0 0 50 H I C CNN
 ALIAS TS881xCx MCP6561x-LT
 $FPLIST
@@ -2484,7 +2484,7 @@ ENDDEF
 DEF NCS210 U 0 20 Y Y 1 F N
 F0 "U" -300 350 50 H V L CNN
 F1 "NCS210" 100 350 50 H V L CNN
-F2 "TO_SOT_Packages_SMD:SC-70-6" 0 0 50 H I C CNN
+F2 "TO_SOT_Packages_SMD:SOT-363_SC-70-6" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 ALIAS NCV210 NCS211
 $FPLIST
diff --git a/library/maxim.lib b/library/maxim.lib
index 389ec434..ae2e2e81 100644
--- a/library/maxim.lib
+++ b/library/maxim.lib
@@ -289,8 +289,7 @@ F1 "DS2401Z" 0 -250 50 H V C CNN
 F2 "" -150 250 50 H I C CNN
 F3 "" -150 250 50 H I C CNN
 $FPLIST
- SOT-223
- SOT-223*
+ SOT?223*
 $ENDFPLIST
 DRAW
 S -200 200 200 -200 0 1 0 N
diff --git a/library/memory.lib b/library/memory.lib
index 5acfe4f9..e6091f4b 100644
--- a/library/memory.lib
+++ b/library/memory.lib
@@ -69,7 +69,7 @@ F1 "24AA02" 200 250 50 H V C CNN
 F2 "TO_SOT_Packages_SMD:SOT-23-5" 400 250 50 H I L CNN
 F3 "" 0 -100 50 H V C CNN
 $FPLIST
- SOT-23*
+ SOT?23*
 $ENDFPLIST
 DRAW
 X GND 2 0 -300 100 U 50 50 0 0 W
@@ -1242,8 +1242,8 @@ F2 "TO_SOT_Packages_SMD:SOT-23-5" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 ALIAS AT24CS02-STUM
 $FPLIST
- SOT-23*
- SOT-23*
+ SOT?23*
+ SOT?23*
 $ENDFPLIST
 DRAW
 S -250 200 250 -250 0 1 10 f
@@ -1331,8 +1331,8 @@ F1 "AT24CS04-STUM" 300 -300 50 H V C CNN
 F2 "TO_SOT_Packages_SMD:SOT-23-5" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- SOT-23*
- SOT-23*
+ SOT?23*
+ SOT?23*
 $ENDFPLIST
 DRAW
 S -250 200 250 -250 0 1 10 f
@@ -1416,8 +1416,8 @@ F1 "AT24CS08-STUM" 300 -300 50 H V C CNN
 F2 "TO_SOT_Packages_SMD:SOT-23-5" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- SOT-23*
- SOT-23*
+ SOT?23*
+ SOT?23*
 $ENDFPLIST
 DRAW
 S -250 200 250 -250 0 1 10 f
@@ -1498,8 +1498,8 @@ F1 "AT24CS16-STUM" 300 -300 50 H V C CNN
 F2 "TO_SOT_Packages_SMD:SOT-23-5" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- SOT-23*
- SOT-23*
+ SOT?23*
+ SOT?23*
 $ENDFPLIST
 DRAW
 S -250 200 250 -250 0 1 10 f
@@ -1585,8 +1585,8 @@ F1 "AT24CS32-STUM" 300 -300 50 H V C CNN
 F2 "TO_SOT_Packages_SMD:SOT-23-5" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- SOT-23*
- SOT-23*
+ SOT?23*
+ SOT?23*
 $ENDFPLIST
 DRAW
 S -250 200 250 -250 0 1 10 f
diff --git a/library/motor_drivers.lib b/library/motor_drivers.lib
index 22dc1366..d59f35f1 100644
--- a/library/motor_drivers.lib
+++ b/library/motor_drivers.lib
@@ -355,7 +355,7 @@ F1 "L298(H)N" -75 650 50 H V R CNN
 F2 "TO_SOT_Packages_THT:TO-220-15_Vertical" 50 -650 50 H I L CNN
 F3 "" 150 250 50 H I C CNN
 $FPLIST
- TO-220*
+ TO?220*
 $ENDFPLIST
 DRAW
 S -500 600 500 -600 0 1 10 f
diff --git a/library/regul.lib b/library/regul.lib
index d83f54b8..5b9e348b 100644
--- a/library/regul.lib
+++ b/library/regul.lib
@@ -46,7 +46,7 @@ ENDDEF
 DEF AP1117-15 U 0 10 Y Y 1 F N
 F0 "U" -150 125 50 H V C CNN
 F1 "AP1117-15" 0 125 50 H V L CNN
-F2 "TO_SOT_Packages_SMD:SOT-223-3Lead_TabPin2" 0 200 50 H I C CNN
+F2 "TO_SOT_Packages_SMD:SOT-223-3_TabPin2" 0 200 50 H I C CNN
 F3 "" 100 -250 50 H I C CNN
 ALIAS AP1117-18 AP1117-25 AP1117-33 AP1117-50 LD1117S33TR_SOT223 LD1117S12TR_SOT223 LD1117S18TR_SOT223 LD1117S25TR_SOT223 LD1117S50TR_SOT223 NCP1117-12_SOT223 NCP1117-1.5_SOT223 NCP1117-1.8_SOT223 NCP1117-2.0_SOT223 NCP1117-2.5_SOT223 NCP1117-2.85_SOT223 NCP1117-3.3_SOT223 NCP1117-5.0_SOT223
 $FPLIST
@@ -65,7 +65,7 @@ ENDDEF
 DEF AP1117-ADJ U 0 30 Y Y 1 F N
 F0 "U" -150 125 50 H V C CNN
 F1 "AP1117-ADJ" 0 125 50 H V L CNN
-F2 "TO_SOT_Packages_SMD:SOT-223-3Lead_TabPin2" 0 200 50 H I C CNN
+F2 "TO_SOT_Packages_SMD:SOT-223-3_TabPin2" 0 200 50 H I C CNN
 F3 "" 100 -250 50 H I C CNN
 ALIAS NCP1117-ADJ_SOT223
 $FPLIST
@@ -1036,7 +1036,7 @@ ENDDEF
 DEF LM337_SOT223 U 0 10 Y Y 1 F N
 F0 "U" -150 -125 50 H V C CNN
 F1 "LM337_SOT223" 0 -125 50 H V L CNN
-F2 "TO_SOT_Packages_SMD:SOT-223-3Lead_TabPin2" 0 -200 50 H I C CIN
+F2 "TO_SOT_Packages_SMD:SOT-223-3_TabPin2" 0 -200 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
  SOT?223*
@@ -1654,7 +1654,7 @@ ENDDEF
 DEF LT1175-5_SOT223 U 0 10 Y Y 1 F N
 F0 "U" -150 -125 50 H V C CNN
 F1 "LT1175-5_SOT223" 0 -125 50 H V L CNN
-F2 "TO_SOT_Packages_SMD:SOT-223-3Lead_TabPin2" 0 -200 50 H I C CNN
+F2 "TO_SOT_Packages_SMD:SOT-223-3_TabPin2" 0 -200 50 H I C CNN
 F3 "" 25 0 50 H I C CNN
 ALIAS LT1175-ADJ_SOT223
 $FPLIST
@@ -2360,7 +2360,7 @@ ENDDEF
 DEF MCP1703A-3302_SOT223 U 0 10 Y Y 1 F N
 F0 "U" -150 125 50 H V C CNN
 F1 "MCP1703A-3302_SOT223" 0 125 50 H V L CNN
-F2 "TO_SOT_Packages_SMD:SOT-223-3Lead_TabPin2" 0 200 50 H I C CNN
+F2 "TO_SOT_Packages_SMD:SOT-223-3_TabPin2" 0 200 50 H I C CNN
 F3 "" 0 -50 50 H I C CNN
 ALIAS MCP1703A-1202_SOT223 MCP1703A-1502_SOT223 MCP1703A-1802_SOT223 MCP1703A-2502_SOT223 MCP1703A-2802_SOT223 MCP1703A-3002_SOT223 MCP1703A-4002_SOT223 MCP1703A-5002_SOT223
 $FPLIST
@@ -2535,7 +2535,7 @@ ENDDEF
 DEF SPX2920M3-3.3_SOT223 U 0 10 Y Y 1 F N
 F0 "U" -150 125 50 H V C CNN
 F1 "SPX2920M3-3.3_SOT223" 0 125 50 H V L CNN
-F2 "TO_SOT_Packages_SMD:SOT-223-3Lead_TabPin2" 0 225 50 H I C CIN
+F2 "TO_SOT_Packages_SMD:SOT-223-3_TabPin2" 0 225 50 H I C CIN
 F3 "" 0 -50 50 H I C CNN
 ALIAS SPX2920M3-5.0_SOT223 LT1129-3.3_SOT223 LT1129-5.0_SOT223 LM2937xMP
 $FPLIST
diff --git a/library/sensors.lib b/library/sensors.lib
index e1fae56b..9432e3a4 100644
--- a/library/sensors.lib
+++ b/library/sensors.lib
@@ -33,7 +33,7 @@ F2 "TO_SOT_Packages_SMD:SOT-23" 0 -350 50 H I L CIN
 F3 "" 0 650 50 H I C CNN
 ALIAS A1101LLHL A1102ELHL A1102LLHL A1103ELHL A1103LLHL A1104LLHL A1106LLHL
 $FPLIST
- SOT-23*
+ SOT?23*
 $ENDFPLIST
 DRAW
 S -200 300 200 -300 0 1 10 f
@@ -678,7 +678,7 @@ F1 "KTY82" 125 0 50 V V C CNN
 F2 "TO_SOT_Packages_SMD:SOT-23" 200 0 50 V I C CNN
 F3 "" 0 -50 50 H I C CNN
 $FPLIST
- SOT-23*
+ SOT?23*
 $ENDFPLIST
 DRAW
 A -126 88 7 -265 818 0 1 0 N -120 85 -125 95
@@ -977,7 +977,7 @@ F1 "LM35-LP" 50 250 50 H V L CNN
 F2 "" 50 -250 50 H I L CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- TO-92*
+ TO?92*
 $ENDFPLIST
 DRAW
 A -175 125 25 1 1799 0 1 10 N -150 125 -200 125
@@ -1005,7 +1005,7 @@ F1 "LM35-NEB" 50 250 50 H V L CNN
 F2 "" 50 -250 50 H I L CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- TO-220*
+ TO?220*
 $ENDFPLIST
 DRAW
 A -175 125 25 1 1799 0 1 10 N -150 125 -200 125
@@ -1034,7 +1034,7 @@ F2 "TO_SOT_Packages_SMD:SOT-23-6" 450 350 50 H I L CNN
 F3 "" -400 450 50 H I C CNN
 ALIAS LM73-1
 $FPLIST
- SOT-23*
+ SOT?23*
 $ENDFPLIST
 DRAW
 A 145 125 25 1 1799 0 1 10 N 170 125 120 125
@@ -1062,7 +1062,7 @@ ENDDEF
 DEF LMT84DCK U 0 30 Y Y 1 F N
 F0 "U" -250 250 50 H V C CNN
 F1 "LMT84DCK" 200 250 50 H V L CNN
-F2 "TO_SOT_Packages_SMD:SC-70-5" 0 -400 50 H I C CNN
+F2 "TO_SOT_Packages_SMD:SOT-353_SC-70-5" 0 -400 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
  SC-70-*
@@ -1092,7 +1092,7 @@ ENDDEF
 DEF LMT85DCK U 0 30 Y Y 1 F N
 F0 "U" -250 250 50 H V C CNN
 F1 "LMT85DCK" 200 250 50 H V L CNN
-F2 "TO_SOT_Packages_SMD:SC-70-5" 0 -400 50 H I C CNN
+F2 "TO_SOT_Packages_SMD:SOT-353_SC-70-5" 0 -400 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
  SC-70-*
@@ -1122,7 +1122,7 @@ ENDDEF
 DEF LMT86DCK U 0 30 Y Y 1 F N
 F0 "U" -250 250 50 H V C CNN
 F1 "LMT86DCK" 200 250 50 H V L CNN
-F2 "TO_SOT_Packages_SMD:SC-70-5" 0 -400 50 H I C CNN
+F2 "TO_SOT_Packages_SMD:SOT-353_SC-70-5" 0 -400 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
  SC-70-*
@@ -1152,7 +1152,7 @@ ENDDEF
 DEF LMT87DCK U 0 30 Y Y 1 F N
 F0 "U" -250 250 50 H V C CNN
 F1 "LMT87DCK" 200 250 50 H V L CNN
-F2 "TO_SOT_Packages_SMD:SC-70-5" 0 -400 50 H I C CNN
+F2 "TO_SOT_Packages_SMD:SOT-353_SC-70-5" 0 -400 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
  SC-70-*
@@ -1523,7 +1523,7 @@ ENDDEF
 DEF MCP9700AT-E/LT U 0 40 Y Y 1 F N
 F0 "U" -250 250 50 H V C CNN
 F1 "MCP9700AT-E/LT" 50 250 50 H V L CNN
-F2 "TO_SOT_Packages_SMD:SC-70-5" 0 -400 50 H I C CNN
+F2 "TO_SOT_Packages_SMD:SOT-353_SC-70-5" 0 -400 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 ALIAS MCP9700AT-H/LT MCP9700T-E/LT MCP9700T-H/LT
 $FPLIST
@@ -1558,7 +1558,7 @@ F2 "TO_SOT_Packages_SMD:SOT-23" 0 -400 50 H I C CNN
 F3 "" -150 250 50 H I C CNN
 ALIAS MCP9700T-E/TT MCP9700AT-H/TT MCP9700AT-E/TT
 $FPLIST
- SOT-23-3*
+ SOT?23*
 $ENDFPLIST
 DRAW
 A -175 125 25 1 1799 0 1 10 N -150 125 -200 125
@@ -1971,7 +1971,7 @@ F1 "TLV493D" 200 450 50 H V C CNN
 F2 "TO_SOT_Packages_SMD:SOT-23-6" -50 -500 50 H I C CNN
 F3 "" -150 500 50 H I C CNN
 $FPLIST
- SOT-23*
+ SOT?23*
 $ENDFPLIST
 DRAW
 S -300 400 250 -300 0 1 10 f
@@ -1989,7 +1989,7 @@ ENDDEF
 DEF TMP20AIDCK U 0 40 Y Y 1 F N
 F0 "U" -250 250 50 H V C CNN
 F1 "TMP20AIDCK" 50 250 50 H V L CNN
-F2 "TO_SOT_Packages_SMD:SC-70-5" 0 -400 50 H I C CNN
+F2 "TO_SOT_Packages_SMD:SOT-353_SC-70-5" 0 -400 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
  SC?70*
diff --git a/library/supertex.lib b/library/supertex.lib
index 01de3f15..6f603f78 100644
--- a/library/supertex.lib
+++ b/library/supertex.lib
@@ -6,11 +6,11 @@ EESchema-LIBRARY Version 2.3
 DEF CL220K4-G U 0 0 Y Y 1 F N
 F0 "U" 150 150 50 H V L CNN
 F1 "CL220K4-G" 150 50 50 H V L CNN
-F2 "TO_SOT_Packages_SMD:TO-252-2Lead" 150 -50 50 H I L CNN
+F2 "TO_SOT_Packages_SMD:TO-252-2" 150 -50 50 H I L CNN
 F3 "" 10 0 50 H I C CNN
 $FPLIST
- TO-252*
- DPAK*
+ TO?252*
+ *DPAK*
 $ENDFPLIST
 DRAW
 X VA 1 0 200 100 D 50 50 1 1 I
@@ -40,7 +40,7 @@ F1 "CL220N5-G" 150 50 50 H V L CNN
 F2 "TO_SOT_Packages_THT:TO-220_Vertical" 150 -50 50 H I L CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- TO-220*
+ TO?220*
 $ENDFPLIST
 DRAW
 X VA 1 0 200 100 D 50 50 1 1 I
@@ -71,7 +71,7 @@ F2 "TO_SOT_Packages_SMD:SOT-223" 0 -350 50 H I L CNN
 F3 "" 350 50 50 H I C CNN
 ALIAS HV101K5-G
 $FPLIST
- SOT-223*
+ SOT?223*
 $ENDFPLIST
 DRAW
 X VPP 1 -100 400 100 D 50 50 1 1 W
@@ -292,10 +292,10 @@ ENDDEF
 DEF LR8K4-G U 0 40 Y Y 1 F N
 F0 "U" -300 150 50 H V L CNN
 F1 "LR8K4-G" 0 150 50 H V L CNN
-F2 "TO_SOT_Packages_SMD:TO-252-2Lead" 0 50 50 H I C CNN
+F2 "TO_SOT_Packages_SMD:TO-252-2" 0 50 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- TO-252*
+ TO?252*
  DPAK*
 $ENDFPLIST
 DRAW
@@ -314,7 +314,7 @@ F1 "LR8N3-G" 0 150 50 H V L CNN
 F2 "TO_SOT_Packages_THT:TO-92_Molded_Narrow" 0 50 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- TO-92*
+ TO?92*
 $ENDFPLIST
 DRAW
 X IN 1 -400 0 100 R 50 50 1 1 I
diff --git a/library/texas.lib b/library/texas.lib
index 2140403c..f6b7c5f2 100644
--- a/library/texas.lib
+++ b/library/texas.lib
@@ -2006,7 +2006,7 @@ F1 "TPS2041B" 0 350 50 H V C CNN
 F2 "TO_SOT_Packages_SMD:SOT-23-5" 0 500 50 H I C CNN
 F3 "" -50 300 50 H I C CNN
 $FPLIST
- SOT-23-5*
+ SOT?23*
 $ENDFPLIST
 DRAW
 S -300 300 300 -400 0 1 10 f
@@ -2112,7 +2112,7 @@ F2 "TO_SOT_Packages_SMD:SOT-23-6" 0 -400 50 H I C CNN
 F3 "" 0 50 50 H I C CNN
 ALIAS TPS2513A
 $FPLIST
- SOT-23-6*
+ SOT?23*
 $ENDFPLIST
 DRAW
 S -200 250 200 -250 0 1 10 f
@@ -2134,7 +2134,7 @@ F2 "TO_SOT_Packages_SMD:SOT-23-6" 0 -400 50 H I C CNN
 F3 "" 0 50 50 H I C CNN
 ALIAS TPS2514A
 $FPLIST
- SOT-23-6*
+ SOT?23*
 $ENDFPLIST
 DRAW
 S -200 250 200 -250 0 1 10 f
@@ -2208,8 +2208,8 @@ F2 "" 50 -250 50 H I L CNN
 F3 "" 100 0 50 H I C CNN
 ALIAS TS5A3159
 $FPLIST
- SOT-23-6*
- *SC-70*
+ SOT?23*
+ **SC?70*
 $ENDFPLIST
 DRAW
 S -300 200 300 -200 0 1 10 f