diff --git a/library/microchip_pic18mcu.lib b/library/microchip_pic18mcu.lib
index 67cb3b81..be020804 100644
--- a/library/microchip_pic18mcu.lib
+++ b/library/microchip_pic18mcu.lib
@@ -476,7 +476,7 @@ F2 "Housings_DFN_QFN:QFN-44-1EP_8x8mm_Pitch0.65mm" 0 0 50 H I C CIN
 F3 "" 0 -250 50 H V C CNN
 ALIAS PIC18LF4331-I/ML PIC18LF4431-I/ML PIC18F4431-I/ML
 $FPLIST
- QFN*44
+ QFN*44*
 $ENDFPLIST
 DRAW
 S -1250 1150 1250 -1150 0 1 10 f
@@ -531,12 +531,12 @@ ENDDEF
 DEF PIC18F4331-I/P U 0 50 Y Y 1 F N
 F0 "U" -1100 1200 50 H V C CNN
 F1 "PIC18F4331-I/P" 750 -1200 50 H V C CNN
-F2 "DIP40" 0 0 50 H V C CIN
+F2 "Housings_DIP:DIP-40_W15.24mm" 0 0 50 H I C CIN
 F3 "" 0 -250 50 H V C CNN
 ALIAS PIC18LF4331-I/P PIC18LF4431-I/P PIC18F4431-I/P
 $FPLIST
- DIP*
- PDIP*
+ DIP*40*W15.24*
+ PDIP*40*W15.24*
 $ENDFPLIST
 DRAW
 S -1150 1150 1150 -1150 0 1 10 f
@@ -552,7 +552,7 @@ X AN7/RE1 9 1300 -900 150 L 50 50 1 1 B
 X AN8/RE2 10 1300 -1000 150 L 50 50 1 1 B
 X SDO/RD1 20 1300 0 150 L 50 50 1 1 B
 X PWM7/RD7 30 1300 -600 150 L 50 50 1 1 B
-X RB7/KBI3/PGD 50 -1300 -800 150 R 50 50 1 1 B
+X RB7/KBI3/PGD 40 -1300 -800 150 R 50 50 1 1 B
 X AVDD 11 -100 1300 150 D 50 50 1 1 W
 X SDA/SDI/RD2 21 1300 -100 150 L 50 50 1 1 B
 X VSS 31 100 -1300 150 U 50 50 1 1 W
@@ -588,11 +588,11 @@ ENDDEF
 DEF PIC18F4331-I/PT U 0 50 Y Y 1 F N
 F0 "U" -1000 1200 50 H V C CNN
 F1 "PIC18F4331-I/PT" 650 -1200 50 H V C CNN
-F2 "TQFP44" 0 0 50 H V C CIN
+F2 "Housings_QFP:TQFP-44_10x10mm_Pitch0.8mm" 0 0 50 H I C CIN
 F3 "" 0 -250 50 H V C CNN
 ALIAS PIC18LF4331-I/PT PIC18LF4431-I/PT PIC18F4431-I/PT
 $FPLIST
- TQFP*
+ TQFP*44_10x10*
 $ENDFPLIST
 DRAW
 S -1050 1150 1050 -1150 0 1 10 f