diff --git a/library/microchip_pic18mcu.dcm b/library/microchip_pic18mcu.dcm
index 0a47d194..7cda4625 100644
--- a/library/microchip_pic18mcu.dcm
+++ b/library/microchip_pic18mcu.dcm
@@ -1,303 +1,603 @@
 EESchema-DOCLIB  Version 2.0
 #
-$CMP PIC18(L)F13K50-E/P
+$CMP PIC18F13K50-E/P
 D 8K Flash, 512 SRAM, 256 EEPROM, USB, nanoWatt XLP, DIP20
 K Flash-Based 8bit CMOS Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/41350c.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F13K50-E/SO
-D PIC18(L)F13K50, 8K Flash, 512 SRAM, 256 EEPROM, USB, nanoWatt XLP, SOIC20
+$CMP PIC18LF13K50-E/P
+D 8K Flash, 512 SRAM, 256 EEPROM, USB, nanoWatt XLP, DIP20
 K Flash-Based 8bit CMOS Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/41350c.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F13K50-E/SS
-D PIC18(L)F13K50, 8K Flash, 512 SRAM, 256 EEPROM, USB, nanoWatt XLP, SSOP20
+$CMP PIC18F13K50-E/SO
+D 8K Flash, 512 SRAM, 256 EEPROM, USB, nanoWatt XLP, SOIC20
 K Flash-Based 8bit CMOS Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/41350c.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F14K50-E/P
+$CMP PIC18LF13K50-E/SO
+D 8K Flash, 512 SRAM, 256 EEPROM, USB, nanoWatt XLP, SOIC20
+K Flash-Based 8bit CMOS Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/devicedoc/41350c.pdf
+$ENDCMP
+#
+$CMP PIC18F13K50-E/SS
+D 8K Flash, 512 SRAM, 256 EEPROM, USB, nanoWatt XLP, SSOP20
+K Flash-Based 8bit CMOS Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/devicedoc/41350c.pdf
+$ENDCMP
+#
+$CMP PIC18LF13K50-E/SS
+D 8K Flash, 512 SRAM, 256 EEPROM, USB, nanoWatt XLP, SSOP20
+K Flash-Based 8bit CMOS Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/devicedoc/41350c.pdf
+$ENDCMP
+#
+$CMP PIC18F14K50-E/P
 D 16K Flash, 768 SRAM, 256 EEPROM, USB, nanoWatt XLP, DIP20
 K Flash-Based 8bit CMOS Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/41350c.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F14K50-E/SO
-D PIC18(L)F14K50, 16K Flash, 768 SRAM, 256 EEPROM, USB, nanoWatt XLP, SOIC20
+$CMP PIC18LF14K50-E/P
+D 16K Flash, 768 SRAM, 256 EEPROM, USB, nanoWatt XLP, DIP20
 K Flash-Based 8bit CMOS Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/41350c.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F14K50-E/SS
-D PIC18(L)F14K50, 16K Flash, 768 SRAM, 256 EEPROM, USB, nanoWatt XLP, SSOP20
+$CMP PIC18F14K50-E/SO
+D 16K Flash, 768 SRAM, 256 EEPROM, USB, nanoWatt XLP, SOIC20
 K Flash-Based 8bit CMOS Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/41350c.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F2331-I/ML
-D PIC18(L)F2331, 8K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, QFN28
+$CMP PIC18LF14K50-E/SO
+D 16K Flash, 768 SRAM, 256 EEPROM, USB, nanoWatt XLP, SOIC20
+K Flash-Based 8bit CMOS Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/devicedoc/41350c.pdf
+$ENDCMP
+#
+$CMP PIC18F14K50-E/SS
+D 16K Flash, 768 SRAM, 256 EEPROM, USB, nanoWatt XLP, SSOP20
+K Flash-Based 8bit CMOS Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/devicedoc/41350c.pdf
+$ENDCMP
+#
+$CMP PIC18LF14K50-E/SS
+D 16K Flash, 768 SRAM, 256 EEPROM, USB, nanoWatt XLP, SSOP20
+K Flash-Based 8bit CMOS Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/devicedoc/41350c.pdf
+$ENDCMP
+#
+$CMP PIC18F2331-I/ML
+D 8K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, QFN28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39616d.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F2331-I/SO
-D PIC18(L)F2331, 8K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, SOIC28
+$CMP PIC18LF2331-I/ML
+D 8K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, QFN28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39616d.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F2331-I/SP
-D PIC18(L)F2331, 8K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, SPDIP28
+$CMP PIC18F2331-I/SO
+D 8K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, SOIC28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39616d.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F2431-I/ML
-D PIC18(L)F2431, 16K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, QFN28
+$CMP PIC18LF2331-I/SO
+D 8K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, SOIC28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39616d.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F2431-I/SO
-D PIC18(L)F2431, 16K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, SOIC28
+$CMP PIC18F2331-I/SP
+D 8K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, SPDIP28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39616d.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F2431-I/SP
-D PIC18(L)F2431, 16K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, SPDIP28
+$CMP PIC18LF2331-I/SP
+D 8K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, SPDIP28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39616d.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F2450-I/ML
-D PIC18(L)F2450, 16K Flash, 8K SRAM, USB, nanoWatt XLP, QFN28
+$CMP PIC18F2431-I/ML
+D 16K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, QFN28
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39616d.pdf
+$ENDCMP
+#
+$CMP PIC18LF2431-I/ML
+D 16K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, QFN28
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39616d.pdf
+$ENDCMP
+#
+$CMP PIC18F2431-I/SO
+D 16K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, SOIC28
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39616d.pdf
+$ENDCMP
+#
+$CMP PIC18LF2431-I/SO
+D 16K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, SOIC28
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39616d.pdf
+$ENDCMP
+#
+$CMP PIC18F2431-I/SP
+D 16K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, SPDIP28
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39616d.pdf
+$ENDCMP
+#
+$CMP PIC18LF2431-I/SP
+D 16K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, SPDIP28
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39616d.pdf
+$ENDCMP
+#
+$CMP PIC18F2450-I/ML
+D 16K Flash, 8K SRAM, USB, nanoWatt XLP, QFN28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F2450-I/SO
-D PIC18(L)F2450, 16K Flash, 8K SRAM, USB, nanoWatt XLP, SOIC28
+$CMP PIC18LF2450-I/ML
+D 16K Flash, 8K SRAM, USB, nanoWatt XLP, QFN28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F2450-I/SP
-D PIC18(L)F2450, 16K Flash, 8K SRAM, USB, nanoWatt XLP, SPDIP28
+$CMP PIC18F2450-I/SO
+D 16K Flash, 8K SRAM, USB, nanoWatt XLP, SOIC28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F2455-I/SO
-D PIC18(L)F2455, 24K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SOIC28
+$CMP PIC18LF2450-I/SO
+D 16K Flash, 8K SRAM, USB, nanoWatt XLP, SOIC28
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
+$ENDCMP
+#
+$CMP PIC18F2450-I/SP
+D 16K Flash, 8K SRAM, USB, nanoWatt XLP, SPDIP28
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
+$ENDCMP
+#
+$CMP PIC18LF2450-I/SP
+D 16K Flash, 8K SRAM, USB, nanoWatt XLP, SPDIP28
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
+$ENDCMP
+#
+$CMP PIC18F2455-I/SO
+D 24K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SOIC28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/39632c.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F2455-I/SP
-D PIC18(L)F2455, 24K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SPDIP28
+$CMP PIC18LF2455-I/SO
+D 24K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SOIC28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/39632c.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F2550-I/SO
-D PIC18(L)F2550, 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SOIC28
+$CMP PIC18F2455-I/SP
+D 24K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SPDIP28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/39632c.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F2550-I/SP
-D PIC18(L)F2550, 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SPDIP28
+$CMP PIC18LF2455-I/SP
+D 24K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SPDIP28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/39632c.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F4331-I/ML
-D PIC18(L)F4331, 8K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, QFN44
+$CMP PIC18F2550-I/SO
+D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SOIC28
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/devicedoc/39632c.pdf
+$ENDCMP
+#
+$CMP PIC18LF2550-I/SO
+D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SOIC28
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/devicedoc/39632c.pdf
+$ENDCMP
+#
+$CMP PIC18F2550-I/SP
+D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SPDIP28
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/devicedoc/39632c.pdf
+$ENDCMP
+#
+$CMP PIC18LF2550-I/SP
+D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SPDIP28
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/devicedoc/39632c.pdf
+$ENDCMP
+#
+$CMP PIC18F4331-I/ML
+D 8K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, QFN44
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39616d.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F4331-I/P
+$CMP PIC18LF4331-I/ML
+D 8K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, QFN44
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39616d.pdf
+$ENDCMP
+#
+$CMP PIC18F4331-I/P
 D 8K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, DIP40
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39616d.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F4331-I/PT
-D PIC18(L)F4331, 8K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, TQFP44
+$CMP PIC18LF4331-I/P
+D 8K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, DIP40
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39616d.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F442-I/P
+$CMP PIC18F4331-I/PT
+D 8K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, TQFP44
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39616d.pdf
+$ENDCMP
+#
+$CMP PIC18LF4331-I/PT
+D 8K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, TQFP44
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39616d.pdf
+$ENDCMP
+#
+$CMP PIC18F442-I/P
 D 16K Flash, 768B SRAM, 256 EEPROM, ADC, DIP40
 K Flash-Based 8-Bit Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39564c.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F442-I/PT
-D PIC18(L)F442, 16K Flash, 768B SRAM, 256 EEPROM, ADC, TQFP-44
+$CMP PIC18LF442-I/P
+D 16K Flash, 768B SRAM, 256 EEPROM, ADC, DIP40
 K Flash-Based 8-Bit Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39564c.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F4431-I/ML
-D PIC18(L)F4431, 16K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, QFN44
+$CMP PIC18F442-I/PT
+D 16K Flash, 768B SRAM, 256 EEPROM, ADC, TQFP-44
+K Flash-Based 8-Bit Microcontroller
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39564c.pdf
+$ENDCMP
+#
+$CMP PIC18LF442-I/PT
+D 16K Flash, 768B SRAM, 256 EEPROM, ADC, TQFP-44
+K Flash-Based 8-Bit Microcontroller
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39564c.pdf
+$ENDCMP
+#
+$CMP PIC18F4431-I/ML
+D 16K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, QFN44
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39616d.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F4431-I/P
+$CMP PIC18LF4431-I/ML
+D 16K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, QFN44
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39616d.pdf
+$ENDCMP
+#
+$CMP PIC18F4431-I/P
 D 16K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, DIP40
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39616d.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F4431-I/PT
-D PIC18(L)F4431, 16K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, TQFP44
+$CMP PIC18LF4431-I/P
+D 16K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, DIP40
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39616d.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F4450-I/ML
-D PIC18(L)F4450, 16K Flash, 8K SRAM, USB, nanoWatt XLP, QFN44
+$CMP PIC18F4431-I/PT
+D 16K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, TQFP44
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39616d.pdf
+$ENDCMP
+#
+$CMP PIC18LF4431-I/PT
+D 16K Flash, 768B SRAM, 256B EEPROM, nanoWatt XLP, ADC, PWM, TQFP44
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39616d.pdf
+$ENDCMP
+#
+$CMP PIC18F4450-I/ML
+D 16K Flash, 8K SRAM, USB, nanoWatt XLP, QFN44
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F4450-I/P
+$CMP PIC18LF4450-I/ML
+D 16K Flash, 8K SRAM, USB, nanoWatt XLP, QFN44
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
+$ENDCMP
+#
+$CMP PIC18F4450-I/P
 D 16K Flash, 8K SRAM, USB, nanoWatt XLP, PDIP40
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F4450-I/PT
-D PIC18(L)F4450, 16K Flash, 8K SRAM, USB, nanoWatt XLP, TQFP44
+$CMP PIC18LF4450-I/P
+D 16K Flash, 8K SRAM, USB, nanoWatt XLP, PDIP40
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F4455-I/ML
-D PIC18(L)F4455, 24K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, QFN44
+$CMP PIC18F4450-I/PT
+D 16K Flash, 8K SRAM, USB, nanoWatt XLP, TQFP44
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F4455-I/P
+$CMP PIC18LF4450-I/PT
+D 16K Flash, 8K SRAM, USB, nanoWatt XLP, TQFP44
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
+$ENDCMP
+#
+$CMP PIC18F4455-I/ML
+D 24K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, QFN44
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
+$ENDCMP
+#
+$CMP PIC18LF4455-I/ML
+D 24K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, QFN44
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
+$ENDCMP
+#
+$CMP PIC18F4455-I/P
 D 24K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, DIP40
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F4455-I/PT
-D PIC18(L)F4455, 24K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, TQFP44
+$CMP PIC18LF4455-I/P
+D 24K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, DIP40
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F4458-I/ML
-D 24K Flash, 2K SRAM, 256 EEPROM, USB, 12-Bit A/D, nanoWatt XLP, QFN44
+$CMP PIC18F4455-I/PT
+D 24K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, TQFP44
 K Flash-Based 8-Bit Microcontroller XLP
-F http://ww1.microchip.com/downloads/en/DeviceDoc/39887c.pdf
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F4458-I/P
-D 24K Flash, 2K SRAM, 256 EEPROM, USB, 12-Bit A/D, nanoWatt XLP, DIP40
+$CMP PIC18LF4455-I/PT
+D 24K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, TQFP44
 K Flash-Based 8-Bit Microcontroller XLP
-F http://ww1.microchip.com/downloads/en/DeviceDoc/39887c.pdf
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F4458-I/PT
-D 24K Flash, 2K SRAM, 256 EEPROM, USB, 12-Bit A/D, nanoWatt XLP, TQFP44
-K Flash-Based 8-Bit Microcontroller XLP
-F http://ww1.microchip.com/downloads/en/DeviceDoc/39887c.pdf
-$ENDCMP
-#
-$CMP PIC18(L)F448-I/P
+$CMP PIC18F448-I/P
 D 16K Flash, 768B SRAM, 256 EEPROM, CAN, DIP40
 K Flash-Based 8-Bit Microcontroller CAN
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41159e.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F44J10-I/P
+$CMP PIC18LF448-I/P
+D 16K Flash, 768B SRAM, 256 EEPROM, CAN, DIP40
+K Flash-Based 8-Bit Microcontroller CAN
+F http://ww1.microchip.com/downloads/en/DeviceDoc/41159e.pdf
+$ENDCMP
+#
+$CMP PIC18F4458-I/ML
+D 24K Flash, 2K SRAM, 256 EEPROM, USB, 12-Bit A/D, nanoWatt XLP, QFN44
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39887c.pdf
+$ENDCMP
+#
+$CMP PIC18LF4458-I/ML
+D 24K Flash, 2K SRAM, 256 EEPROM, USB, 12-Bit A/D, nanoWatt XLP, QFN44
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39887c.pdf
+$ENDCMP
+#
+$CMP PIC18F4458-I/P
+D 24K Flash, 2K SRAM, 256 EEPROM, USB, 12-Bit A/D, nanoWatt XLP, DIP40
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39887c.pdf
+$ENDCMP
+#
+$CMP PIC18LF4458-I/P
+D 24K Flash, 2K SRAM, 256 EEPROM, USB, 12-Bit A/D, nanoWatt XLP, DIP40
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39887c.pdf
+$ENDCMP
+#
+$CMP PIC18F4458-I/PT
+D 24K Flash, 2K SRAM, 256 EEPROM, USB, 12-Bit A/D, nanoWatt XLP, TQFP44
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39887c.pdf
+$ENDCMP
+#
+$CMP PIC18LF4458-I/PT
+D 24K Flash, 2K SRAM, 256 EEPROM, USB, 12-Bit A/D, nanoWatt XLP, TQFP44
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39887c.pdf
+$ENDCMP
+#
+$CMP PIC18F44J10-I/P
 D 16K Flash, 1K SRAM, ADC, DIP40
 K Flash-Based 8-Bit Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39682E.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F452-I/P
+$CMP PIC18LF44J10-I/P
+D 16K Flash, 1K SRAM, ADC, DIP40
+K Flash-Based 8-Bit Microcontroller
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39682E.pdf
+$ENDCMP
+#
+$CMP PIC18F452-I/P
 D 32K Flash, 1536B SRAM, 256 EEPROM, ADC, DIP40
 K Flash-Based 8-Bit Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39564c.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F452-I/PT
-D PIC18(L)F452, 32K Flash, 1536B SRAM, 256 EEPROM, ADC, TQFP-44
+$CMP PIC18LF452-I/P
+D 32K Flash, 1536B SRAM, 256 EEPROM, ADC, DIP40
 K Flash-Based 8-Bit Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39564c.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F4550-I/ML
-D PIC18(L)F4550, 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, QFN44
+$CMP PIC18F452-I/PT
+D 32K Flash, 1536B SRAM, 256 EEPROM, ADC, TQFP-44
+K Flash-Based 8-Bit Microcontroller
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39564c.pdf
+$ENDCMP
+#
+$CMP PIC18LF452-I/PT
+D 32K Flash, 1536B SRAM, 256 EEPROM, ADC, TQFP-44
+K Flash-Based 8-Bit Microcontroller
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39564c.pdf
+$ENDCMP
+#
+$CMP PIC18F4550-I/ML
+D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, QFN44
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F4550-I/P
+$CMP PIC18LF4550-I/ML
+D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, QFN44
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
+$ENDCMP
+#
+$CMP PIC18F4550-I/P
 D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, DIP40
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F4550-I/PT
-D PIC18(L)F4550, 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, TQFP44
+$CMP PIC18LF4550-I/P
+D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, DIP40
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F4553-I/ML
+$CMP PIC18F4550-I/PT
+D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, TQFP44
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
+$ENDCMP
+#
+$CMP PIC18LF4550-I/PT
+D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, TQFP44
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39760d.pdf
+$ENDCMP
+#
+$CMP PIC18F4553-I/ML
 D 32K Flash, 2K SRAM, 256 EEPROM, USB, 12-Bit A/D, nanoWatt XLP, QFN44
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39887c.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F4553-I/P
+$CMP PIC18LF4553-I/ML
+D 32K Flash, 2K SRAM, 256 EEPROM, USB, 12-Bit A/D, nanoWatt XLP, QFN44
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39887c.pdf
+$ENDCMP
+#
+$CMP PIC18F4553-I/P
 D 32K Flash, 2K SRAM, 256 EEPROM, USB, 12-Bit A/D, nanoWatt XLP, DIP40
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39887c.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F4553-I/PT
+$CMP PIC18LF4553-I/P
+D 32K Flash, 2K SRAM, 256 EEPROM, USB, 12-Bit A/D, nanoWatt XLP, DIP40
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39887c.pdf
+$ENDCMP
+#
+$CMP PIC18F4553-I/PT
 D 32K Flash, 2K SRAM, 256 EEPROM, USB, 12-Bit A/D, nanoWatt XLP, TQFP44
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39887c.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F458-I/P
+$CMP PIC18LF4553-I/PT
+D 32K Flash, 2K SRAM, 256 EEPROM, USB, 12-Bit A/D, nanoWatt XLP, TQFP44
+K Flash-Based 8-Bit Microcontroller XLP
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39887c.pdf
+$ENDCMP
+#
+$CMP PIC18F458-I/P
 D 32K Flash, 1536B SRAM, 256 EEPROM, CAN, DIP40
 K Flash-Based 8-Bit Microcontroller CAN
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41159e.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F45J10-I/P
+$CMP PIC18LF458-I/P
+D 32K Flash, 1536B SRAM, 256 EEPROM, CAN, DIP40
+K Flash-Based 8-Bit Microcontroller CAN
+F http://ww1.microchip.com/downloads/en/DeviceDoc/41159e.pdf
+$ENDCMP
+#
+$CMP PIC18F4580-I/P
+D 32K Flash, 1536B SRAM, 256 EEPROM, ECAN, DIP40
+K Flash-Based 8-Bit Microcontroller CAN
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39637d.pdf
+$ENDCMP
+#
+$CMP PIC18LF4580-I/P
+D 32K Flash, 1536B SRAM, 256 EEPROM, ECAN, DIP40
+K Flash-Based 8-Bit Microcontroller CAN
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39637d.pdf
+$ENDCMP
+#
+$CMP PIC18F4480-I/P
+D 32K Flash, 768B SRAM, 256 EEPROM, ECAN, DIP40
+K Flash-Based 8-Bit Microcontroller CAN
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39637d.pdf
+$ENDCMP
+#
+$CMP PIC18LF4480-I/P
+D 32K Flash, 768B SRAM, 256 EEPROM, ECAN, DIP40
+K Flash-Based 8-Bit Microcontroller CAN
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39637d.pdf
+$ENDCMP
+#
+$CMP PIC18F45J10-I/P
 D 32K Flash, 1K SRAM, ADC, DIP40
 K Flash-Based 8-Bit Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39682E.pdf
 $ENDCMP
 #
-$CMP PIC18(L)F45K80-I/PT
-D Enhanced Flash Microcontrollers with ECAN and nanoWatt XLP 
-K Flash Based 8-Bit Microcontroller ECAN
-F http://ww1.microchip.com/downloads/en/DeviceDoc/39762f.pdf
-$ENDCMP
-#
-$CMP PIC18(L)F46K80-I/PT
-D Enhanced Flash Microcontrollers with ECAN and nanoWatt XLP 
-K Flash Based 8-Bit Microcontroller ECAN
-F http://ww1.microchip.com/downloads/en/DeviceDoc/39762f.pdf
+$CMP PIC18LF45J10-I/P
+D 32K Flash, 1K SRAM, ADC, DIP40
+K Flash-Based 8-Bit Microcontroller
+F http://ww1.microchip.com/downloads/en/DeviceDoc/39682E.pdf
 $ENDCMP
 #
 $CMP PIC18F1220-SO
@@ -385,55 +685,55 @@ F http://ww1.microchip.com/downloads/en/DeviceDoc/39977f.pdf
 $ENDCMP
 #
 $CMP PIC18F66J60-I/PT
-D PIC18F66J60, 64K Flash, 3.7K SRAM, Ethernet Controller with PHY, 8K Buffer, TQFP64
+D 64K Flash, 3.7K SRAM, Ethernet Controller with PHY, 8K Buffer, TQFP64
 K Flash Based 8-Bit Microcontroller Ethernet Controller PHY
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39762f.pdf
 $ENDCMP
 #
 $CMP PIC18F66J65-I/PT
-D PIC18F66J65, 96K Flash, 3.7K SRAM, Ethernet Controller with PHY, 8K Buffer, TQFP64
+D 96K Flash, 3.7K SRAM, Ethernet Controller with PHY, 8K Buffer, TQFP64
 K Flash Based 8-Bit Microcontroller Ethernet Controller PHY
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39762f.pdf
 $ENDCMP
 #
 $CMP PIC18F67J60-I/PT
-D PIC18F67J60, 128K Flash, 3.7K SRAM, Ethernet Controller with PHY, 8K Buffer, TQFP64
+D 128K Flash, 3.7K SRAM, Ethernet Controller with PHY, 8K Buffer, TQFP64
 K Flash Based 8-Bit Microcontroller Ethernet Controller PHY
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39762f.pdf
 $ENDCMP
 #
 $CMP PIC18F96J60-I/PF
-D PIC18F96J60, 64K Flash, 3.7K SRAM, Ethernet Controller with PHY, 8K Buffer, TQFP100 (14x14mm)
+D 64K Flash, 3.7K SRAM, Ethernet Controller with PHY, 8K Buffer, TQFP100 (14x14mm)
 K Flash Based 8-Bit Microcontroller Ethernet Controller PHY
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39762f.pdf
 $ENDCMP
 #
 $CMP PIC18F96J60-I/PT
-D PIC18F96J60, 64K Flash, 3.7K SRAM, Ethernet Controller with PHY, 8K Buffer, TQFP100
+D 64K Flash, 3.7K SRAM, Ethernet Controller with PHY, 8K Buffer, TQFP100
 K Flash Based 8-Bit Microcontroller Ethernet Controller PHY
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39762f.pdf
 $ENDCMP
 #
 $CMP PIC18F96J65-I/PF
-D PIC18F96J65, 96K Flash, 3.7K SRAM, Ethernet Controller with PHY, 8K Buffer, TQFP100 (14x14mm)
+D 96K Flash, 3.7K SRAM, Ethernet Controller with PHY, 8K Buffer, TQFP100 (14x14mm)
 K Flash Based 8-Bit Microcontroller Ethernet Controller PHY
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39762f.pdf
 $ENDCMP
 #
 $CMP PIC18F96J65-I/PT
-D PIC18F96J65, 96K Flash, 3.7K SRAM, Ethernet Controller with PHY, 8K Buffer, TQFP100
+D 96K Flash, 3.7K SRAM, Ethernet Controller with PHY, 8K Buffer, TQFP100
 K Flash Based 8-Bit Microcontroller Ethernet Controller PHY
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39762f.pdf
 $ENDCMP
 #
 $CMP PIC18F97J60-I/PF
-D PIC18F97J60, 128K Flash, 3.7K SRAM, Ethernet Controller with PHY, 8K Buffer, TQFP100 (14x14mm)
+D 128K Flash, 3.7K SRAM, Ethernet Controller with PHY, 8K Buffer, TQFP100 (14x14mm)
 K Flash Based 8-Bit Microcontroller Ethernet Controller PHY
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39762f.pdf
 $ENDCMP
 #
 $CMP PIC18F97J60-I/PT
-D PIC18F96J60, 128K Flash, 3.7K SRAM, Ethernet Controller with PHY, 8K Buffer, TQFP100
+D 128K Flash, 3.7K SRAM, Ethernet Controller with PHY, 8K Buffer, TQFP100
 K Flash Based 8-Bit Microcontroller Ethernet Controller PHY
 F http://ww1.microchip.com/downloads/en/DeviceDoc/39762f.pdf
 $ENDCMP
diff --git a/library/microchip_pic18mcu.lib b/library/microchip_pic18mcu.lib
index c4fe29bd..19e1cbce 100644
--- a/library/microchip_pic18mcu.lib
+++ b/library/microchip_pic18mcu.lib
@@ -1,14 +1,14 @@
 EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #
-# PIC18(L)F13K50-E/P
+# PIC18F13K50-E/P
 #
-DEF PIC18(L)F13K50-E/P U 0 50 Y Y 1 F N
+DEF PIC18F13K50-E/P U 0 50 Y Y 1 F N
 F0 "U" -1300 700 50 H V C CNN
-F1 "PIC18(L)F13K50-E/P" 950 -700 50 H V C CNN
+F1 "PIC18F13K50-E/P" 950 -700 50 H V C CNN
 F2 "DIP20" 0 0 50 H V C CIN
 F3 "" 0 100 50 H V C CNN
-ALIAS PIC18(L)F14K50-E/P
+ALIAS PIC18F14K50-E/P PIC18LF14K50-E/P PIC18LF13K50-E/P
 $FPLIST
  DIP*
  PDIP*
@@ -40,12 +40,12 @@ ENDDEF
 #
 # PIC18(L)F13K50-E/SO
 #
-DEF PIC18(L)F13K50-E/SO U 0 50 Y Y 1 F N
+DEF PIC18F13K50-E/SO U 0 50 Y Y 1 F N
 F0 "U" -1300 700 50 H V C CNN
-F1 "PIC18(L)F13K50-E/SO" 900 -700 50 H V C CNN
+F1 "PIC18F13K50-E/SO" 900 -700 50 H V C CNN
 F2 "SO20" 0 0 50 H V C CIN
 F3 "" 0 100 50 H V C CNN
-ALIAS PIC18(L)F14K50-E/SO
+ALIAS PIC18LF13K50-E/SO PIC18LF14K50-E/SO PIC18F14K50-E/SO
 $FPLIST
  SO*
 $ENDFPLIST
@@ -76,12 +76,12 @@ ENDDEF
 #
 # PIC18(L)F13K50-E/SS
 #
-DEF PIC18(L)F13K50-E/SS U 0 50 Y Y 1 F N
+DEF PIC18F13K50-E/SS U 0 50 Y Y 1 F N
 F0 "U" -1300 700 50 H V C CNN
-F1 "PIC18(L)F13K50-E/SS" 900 -700 50 H V C CNN
+F1 "PIC18F13K50-E/SS" 900 -700 50 H V C CNN
 F2 "SSOP20" 0 0 50 H V C CIN
 F3 "" 0 100 50 H V C CNN
-ALIAS PIC18(L)F14K50-E/SS
+ALIAS PIC18LF13K50-E/SS PIC18LF14K50-E/SS PIC18F14K50-E/SS
 $FPLIST
  SSOP*
 $ENDFPLIST
@@ -112,12 +112,12 @@ ENDDEF
 #
 # PIC18(L)F2331-I/ML
 #
-DEF PIC18(L)F2331-I/ML U 0 50 Y Y 1 F N
+DEF PIC18F2331-I/ML U 0 50 Y Y 1 F N
 F0 "U" -1000 1100 50 H V C CNN
-F1 "PIC18(L)F2331-I/ML" 650 -1100 50 H V C CNN
+F1 "PIC18F2331-I/ML" 650 -1100 50 H V C CNN
 F2 "SOIC28" 0 0 50 H V C CIN
 F3 "" 0 -400 50 H V C CNN
-ALIAS PIC18(L)F2431-I/ML
+ALIAS PIC18LF2331-I/ML PIC18LF2431-I/ML PIC18F2431-I/ML
 $FPLIST
  QFN*
 $ENDFPLIST
@@ -156,12 +156,12 @@ ENDDEF
 #
 # PIC18(L)F2331-I/SO
 #
-DEF PIC18(L)F2331-I/SO U 0 50 Y Y 1 F N
+DEF PIC18F2331-I/SO U 0 50 Y Y 1 F N
 F0 "U" -1000 1100 50 H V C CNN
-F1 "PIC18(L)F2331-I/SO" 650 -1100 50 H V C CNN
+F1 "PIC18F2331-I/SO" 650 -1100 50 H V C CNN
 F2 "SOIC28" 0 0 50 H V C CIN
 F3 "" 0 -400 50 H V C CNN
-ALIAS PIC18(L)F2431-I/SO
+ALIAS PIC18LF2331-I/SO PIC18LF2431-I/SO PIC18F2431-I/SO
 $FPLIST
  SO*
 $ENDFPLIST
@@ -200,12 +200,12 @@ ENDDEF
 #
 # PIC18(L)F2331-I/SP
 #
-DEF PIC18(L)F2331-I/SP U 0 50 Y Y 1 F N
+DEF PIC18F2331-I/SP U 0 50 Y Y 1 F N
 F0 "U" -1000 1100 50 H V C CNN
-F1 "PIC18(L)F2331-I/SP" 650 -1100 50 H V C CNN
+F1 "PIC18F2331-I/SP" 650 -1100 50 H V C CNN
 F2 "SPDIP28" 0 0 50 H V C CIN
 F3 "" 0 -400 50 H V C CNN
-ALIAS PIC18(L)F2431-I/SP
+ALIAS PIC18LF2331-I/SP PIC18LF2431-I/SP PIC18F2431-I/SP
 $FPLIST
  DIP*
  PDIP*
@@ -245,9 +245,9 @@ ENDDEF
 #
 # PIC18(L)F2450-I/ML
 #
-DEF PIC18(L)F2450-I/ML U 0 50 Y Y 1 F N
+DEF PIC18F2450-I/ML U 0 50 Y Y 1 F N
 F0 "U" -800 1100 50 H V C CNN
-F1 "PIC18(L)F2450-I/ML" 450 -1100 50 H V C CNN
+F1 "PIC18F2450-I/ML" 450 -1100 50 H V C CNN
 F2 "QFN28" 0 0 50 H V C CIN
 F3 "" 0 -450 50 H V C CNN
 $FPLIST
@@ -288,9 +288,9 @@ ENDDEF
 #
 # PIC18(L)F2450-I/SO
 #
-DEF PIC18(L)F2450-I/SO U 0 50 Y Y 1 F N
+DEF PIC18F2450-I/SO U 0 50 Y Y 1 F N
 F0 "U" -800 1100 50 H V C CNN
-F1 "PIC18(L)F2450-I/SO" 450 -1100 50 H V C CNN
+F1 "PIC18F2450-I/SO" 450 -1100 50 H V C CNN
 F2 "SO28" 0 0 50 H V C CIN
 F3 "" 0 -300 50 H V C CNN
 $FPLIST
@@ -331,9 +331,9 @@ ENDDEF
 #
 # PIC18(L)F2450-I/SP
 #
-DEF PIC18(L)F2450-I/SP U 0 50 Y Y 1 F N
+DEF PIC18F2450-I/SP U 0 50 Y Y 1 F N
 F0 "U" -800 1100 50 H V C CNN
-F1 "PIC18(L)F2450-I/SP" 450 -1100 50 H V C CNN
+F1 "PIC18F2450-I/SP" 450 -1100 50 H V C CNN
 F2 "SPDIP28" 0 0 50 H V C CIN
 F3 "" 0 -450 50 H V C CNN
 $FPLIST
@@ -376,12 +376,12 @@ ENDDEF
 #
 # PIC18(L)F2455-I/SO
 #
-DEF PIC18(L)F2455-I/SO U 0 50 Y Y 1 F N
+DEF PIC18F2455-I/SO U 0 50 Y Y 1 F N
 F0 "U" -1000 1000 50 H V C CNN
-F1 "PIC18(L)F2455-I/SO" 650 -1000 50 H V C CNN
+F1 "PIC18F2455-I/SO" 650 -1000 50 H V C CNN
 F2 "SPDIP28" 0 0 50 H V C CIN
 F3 "" 0 -450 50 H V C CNN
-ALIAS PIC18(L)F2550-I/SO
+ALIAS PIC18LF2450-I/ML PIC18LF2450-I/SO PIC18LF2450-I/SP PIC18LF2455-I/SO PIC18LF2550-I/SO PIC18F2550-I/SO
 $FPLIST
  SO*
 $ENDFPLIST
@@ -420,12 +420,12 @@ ENDDEF
 #
 # PIC18(L)F2455-I/SP
 #
-DEF PIC18(L)F2455-I/SP U 0 50 Y Y 1 F N
+DEF PIC18F2455-I/SP U 0 50 Y Y 1 F N
 F0 "U" -1000 1100 50 H V C CNN
-F1 "PIC18(L)F2455-I/SP" 650 -1100 50 H V C CNN
+F1 "PIC18F2455-I/SP" 650 -1100 50 H V C CNN
 F2 "SPDIP28" 0 0 50 H V C CIN
 F3 "" 0 -450 50 H V C CNN
-ALIAS PIC18(L)F2550-I/SP
+ALIAS PIC18LF2455-I/SP PIC18LF2550-I/SP PIC18F2550-I/SP
 $FPLIST
  SPDIP*
  DIP*
@@ -466,12 +466,12 @@ ENDDEF
 #
 # PIC18(L)F4331-I/ML
 #
-DEF PIC18(L)F4331-I/ML U 0 50 Y Y 1 F N
+DEF PIC18F4331-I/ML U 0 50 Y Y 1 F N
 F0 "U" -1200 1200 50 H V C CNN
-F1 "PIC18(L)F4331-I/ML" 850 -1200 50 H V C CNN
+F1 "PIC18F4331-I/ML" 850 -1200 50 H V C CNN
 F2 "QFN44" 0 0 50 H V C CIN
 F3 "" 0 -250 50 H V C CNN
-ALIAS PIC18(L)F4431-I/ML
+ALIAS PIC18LF4331-I/ML PIC18LF4431-I/ML PIC18F4431-I/ML
 $FPLIST
  QFN*
 $ENDFPLIST
@@ -525,12 +525,12 @@ ENDDEF
 #
 # PIC18(L)F4331-I/P
 #
-DEF PIC18(L)F4331-I/P U 0 50 Y Y 1 F N
+DEF PIC18F4331-I/P U 0 50 Y Y 1 F N
 F0 "U" -1100 1200 50 H V C CNN
-F1 "PIC18(L)F4331-I/P" 750 -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
 F3 "" 0 -250 50 H V C CNN
-ALIAS PIC18(L)F4431-I/P
+ALIAS PIC18LF4331-I/P PIC18LF4431-I/P PIC18F4431-I/P
 $FPLIST
  DIP*
  PDIP*
@@ -582,12 +582,12 @@ ENDDEF
 #
 # PIC18(L)F4331-I/PT
 #
-DEF PIC18(L)F4331-I/PT U 0 50 Y Y 1 F N
+DEF PIC18F4331-I/PT U 0 50 Y Y 1 F N
 F0 "U" -1000 1200 50 H V C CNN
-F1 "PIC18(L)F4331-I/PT" 650 -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
 F3 "" 0 -250 50 H V C CNN
-ALIAS PIC18(L)F4431-I/PT
+ALIAS PIC18LF4331-I/PT PIC18LF4431-I/PT PIC18F4431-I/PT
 $FPLIST
  TQFP*
 $ENDFPLIST
@@ -638,12 +638,12 @@ ENDDEF
 #
 # PIC18(L)F442-I/P
 #
-DEF PIC18(L)F442-I/P U 0 50 Y Y 1 F N
+DEF PIC18F442-I/P U 0 50 Y Y 1 F N
 F0 "U" -800 1200 50 H V C CNN
-F1 "PIC18(L)F442-I/P" 500 -1200 50 H V C CNN
+F1 "PIC18F442-I/P" 500 -1200 50 H V C CNN
 F2 "DIP40" 0 0 50 H V C CIN
 F3 "" 0 -350 50 H V C CNN
-ALIAS PIC18(L)F452-I/P
+ALIAS PIC18LF442-I/P PIC18LF452-I/P PIC18F452-I/P
 $FPLIST
  DIP*
  PDIP*
@@ -695,12 +695,12 @@ ENDDEF
 #
 # PIC18(L)F442-I/PT
 #
-DEF PIC18(L)F442-I/PT IC 0 40 Y Y 1 F N
+DEF PIC18F442-I/PT IC 0 40 Y Y 1 F N
 F0 "IC" -850 1200 50 H V L CNN
-F1 "PIC18(L)F442-I/PT" 200 -1200 50 H V L CNN
+F1 "PIC18F442-I/PT" 200 -1200 50 H V L CNN
 F2 "TQFP-44" 0 0 50 H V C CIN
 F3 "" 0 0 50 H V C CNN
-ALIAS PIC18(L)F452-I/PT
+ALIAS PIC18LF442-I/PT PIC18LF452-I/PT PIC18F452-I/PT
 $FPLIST
  TQFP*
 $ENDFPLIST
@@ -751,9 +751,9 @@ ENDDEF
 #
 # PIC18(L)F4450-I/ML
 #
-DEF PIC18(L)F4450-I/ML U 0 50 Y Y 1 F N
+DEF PIC18F4450-I/ML U 0 50 Y Y 1 F N
 F0 "U" -900 1300 50 H V C CNN
-F1 "PIC18(L)F4450-I/ML" 550 -1300 50 H V C CNN
+F1 "PIC18F4450-I/ML" 550 -1300 50 H V C CNN
 F2 "QFN44" 0 0 50 H V C CIN
 F3 "" 0 -250 50 H V C CNN
 $FPLIST
@@ -809,9 +809,9 @@ ENDDEF
 #
 # PIC18(L)F4450-I/P
 #
-DEF PIC18(L)F4450-I/P U 0 50 Y Y 1 F N
+DEF PIC18F4450-I/P U 0 50 Y Y 1 F N
 F0 "U" -900 1300 50 H V C CNN
-F1 "PIC18(L)F4450-I/P" 550 -1300 50 H V C CNN
+F1 "PIC18F4450-I/P" 550 -1300 50 H V C CNN
 F2 "DIP40" 0 0 50 H V C CIN
 F3 "" 0 -250 50 H V C CNN
 $FPLIST
@@ -865,9 +865,9 @@ ENDDEF
 #
 # PIC18(L)F4450-I/PT
 #
-DEF PIC18(L)F4450-I/PT U 0 50 Y Y 1 F N
+DEF PIC18F4450-I/PT U 0 50 Y Y 1 F N
 F0 "U" -900 1300 50 H V C CNN
-F1 "PIC18(L)F4450-I/PT" 550 -1300 50 H V C CNN
+F1 "PIC18F4450-I/PT" 550 -1300 50 H V C CNN
 F2 "TQFP44" 0 0 50 H V C CIN
 F3 "" 0 -250 50 H V C CNN
 $FPLIST
@@ -924,12 +924,12 @@ ENDDEF
 #
 # PIC18(L)F4455-I/ML
 #
-DEF PIC18(L)F4455-I/ML U 0 50 Y Y 1 F N
+DEF PIC18F4455-I/ML U 0 50 Y Y 1 F N
 F0 "U" -1000 1300 50 H V C CNN
-F1 "PIC18(L)F4455-I/ML" 650 -1300 50 H V C CNN
+F1 "PIC18F4455-I/ML" 650 -1300 50 H V C CNN
 F2 "QFN44" 0 200 50 H V C CIN
 F3 "" 0 -250 50 H V C CNN
-ALIAS PIC18(L)F4550-I/ML
+ALIAS PIC18LF4450-I/ML PIC18LF4450-I/P PIC18LF4450-I/PT PIC18LF4455-I/ML PIC18LF4550-I/ML PIC18F4550-I/ML
 $FPLIST
  QFN*
 $ENDFPLIST
@@ -983,12 +983,12 @@ ENDDEF
 #
 # PIC18(L)F4455-I/P
 #
-DEF PIC18(L)F4455-I/P U 0 50 Y Y 1 F N
+DEF PIC18F4455-I/P U 0 50 Y Y 1 F N
 F0 "U" -900 1300 50 H V C CNN
-F1 "PIC18(L)F4455-I/P" 550 -1300 50 H V C CNN
+F1 "PIC18F4455-I/P" 550 -1300 50 H V C CNN
 F2 "DIP40" 0 200 50 H V C CIN
 F3 "" 0 -250 50 H V C CNN
-ALIAS PIC18(L)F4550-I/P
+ALIAS PIC18LF4455-I/P PIC18LF4550-I/P PIC18F4550-I/P
 $FPLIST
  DIP*
  PDIP*
@@ -1040,12 +1040,12 @@ ENDDEF
 #
 # PIC18(L)F4455-I/PT
 #
-DEF PIC18(L)F4455-I/PT U 0 50 Y Y 1 F N
+DEF PIC18F4455-I/PT U 0 50 Y Y 1 F N
 F0 "U" -1000 1300 50 H V C CNN
-F1 "PIC18(L)F4455-I/PT" 650 -1300 50 H V C CNN
+F1 "PIC18F4455-I/PT" 650 -1300 50 H V C CNN
 F2 "TQFP44" 0 200 50 H V C CIN
 F3 "" 0 -250 50 H V C CNN
-ALIAS PIC18(L)F4550-I/PT
+ALIAS PIC18LF4455-I/PT PIC18LF4550-I/PT PIC18F4550-I/PT
 $FPLIST
  TQFP*
 $ENDFPLIST
@@ -1100,12 +1100,12 @@ ENDDEF
 #
 # PIC18(L)F4458-I/ML
 #
-DEF PIC18(L)F4458-I/ML U 0 50 Y Y 1 F N
+DEF PIC18F4458-I/ML U 0 50 Y Y 1 F N
 F0 "U" -1000 1300 50 H V C CNN
-F1 "PIC18(L)F4458-I/ML" 650 -1300 50 H V C CNN
+F1 "PIC18F4458-I/ML" 650 -1300 50 H V C CNN
 F2 "Housings_DFN_QFN:QFN-44-1EP_8x8mm_Pitch0.65mm" 0 200 50 H I C CIN
 F3 "" 0 -250 50 H V C CNN
-ALIAS PIC18(L)F4553-I/ML
+ALIAS PIC18LF4458-I/ML PIC18F4553-I/ML PIC18LF4553-I/ML
 $FPLIST
  QFN*1EP*8x8mm*Pitch0.65mm*
 $ENDFPLIST
@@ -1161,12 +1161,12 @@ ENDDEF
 #
 # PIC18(L)F4458-I/P
 #
-DEF PIC18(L)F4458-I/P U 0 50 Y Y 1 F N
+DEF PIC18F4458-I/P U 0 50 Y Y 1 F N
 F0 "U" -900 1300 50 H V C CNN
-F1 "PIC18(L)F4458-I/P" 550 -1300 50 H V C CNN
+F1 "PIC18F4458-I/P" 550 -1300 50 H V C CNN
 F2 "Housings_DIP:DIP-40_W15.24mm" 0 200 50 H I C CIN
 F3 "" 0 -250 50 H V C CNN
-ALIAS PIC18(L)F4553-I/P
+ALIAS PIC18LF4458-I/P PIC18F4553-I/P PIC18LF4553-I/P
 $FPLIST
  DIP*W15.24mm*
  PDIP*W15.24mm*
@@ -1218,12 +1218,12 @@ ENDDEF
 #
 # PIC18(L)F4458-I/PT
 #
-DEF PIC18(L)F4458-I/PT U 0 50 Y Y 1 F N
+DEF PIC18F4458-I/PT U 0 50 Y Y 1 F N
 F0 "U" -1000 1300 50 H V C CNN
-F1 "PIC18(L)F4458-I/PT" 650 -1300 50 H V C CNN
+F1 "PIC18F4458-I/PT" 650 -1300 50 H V C CNN
 F2 "Housings_QFP:TQFP-44_10x10mm_Pitch0.8mm" 0 200 50 H I C CIN
 F3 "" 0 -250 50 H V C CNN
-ALIAS PIC18(L)F4553-I/PT
+ALIAS PIC18LF4458-I/PT PIC18F4553-I/PT PIC18LF4553-I/PT
 $FPLIST
  TQFP*10x10mm*Pitch0.8mm*
 $ENDFPLIST
@@ -1278,12 +1278,12 @@ ENDDEF
 #
 # PIC18(L)F448-I/P
 #
-DEF PIC18(L)F448-I/P U 0 50 Y Y 1 F N
+DEF PIC18F448-I/P U 0 50 Y Y 1 F N
 F0 "U" -900 1200 50 H V C CNN
-F1 "PIC18(L)F448-I/P" 600 -1200 50 H V C CNN
+F1 "PIC18F448-I/P" 600 -1200 50 H V C CNN
 F2 "DIP40" 0 0 50 H V C CIN
 F3 "" 0 -350 50 H V C CNN
-ALIAS PIC18(L)F458-I/P
+ALIAS PIC18LF448-I/P PIC18LF458-I/P PIC18F458-I/P
 $FPLIST
  DIP*
  PDIP*
@@ -1302,7 +1302,7 @@ X C1OUT/~WR~/AN6/RE1 9 1100 -900 150 L 50 50 1 1 B
 X C2OUT/~CS~/AN7/RE2 10 1100 -1000 150 L 50 50 1 1 B
 X C1IN-/PSP1/RD1 20 1100 0 150 L 50 50 1 1 B
 X P1D/PSP7/RD7 30 1100 -600 150 L 50 50 1 1 B
-X RB7/PGD 50 -1100 -900 150 R 50 50 1 1 B
+X RB7/PGD 40 -1100 -900 150 R 50 50 1 1 B
 X VDD 11 -100 1300 150 D 50 50 1 1 W
 X C2IN+/PSP2/RD2 21 1100 -100 150 L 50 50 1 1 B
 X VSS 31 0 -1300 150 U 50 50 1 1 W
@@ -1335,12 +1335,12 @@ ENDDEF
 #
 # PIC18(L)F44J10-I/P
 #
-DEF PIC18(L)F44J10-I/P U 0 50 Y Y 1 F N
+DEF PIC18F44J10-I/P U 0 50 Y Y 1 F N
 F0 "U" -1000 1200 50 H V C CNN
-F1 "PIC18(L)F44J10-I/P" 650 -1200 50 H V C CNN
+F1 "PIC18F44J10-I/P" 650 -1200 50 H V C CNN
 F2 "DIP40" 0 0 50 H V C CIN
 F3 "" -1150 1200 50 H V C CNN
-ALIAS PIC18(L)F45J10-I/P
+ALIAS PIC18LF44J10-I/P PIC18LF45J10-I/P PIC18F45J10-I/P
 $FPLIST
  DIP*
  PDIP*
@@ -1390,14 +1390,71 @@ X RB6/KBI2/PGC 39 -1200 -400 150 R 50 50 1 1 T
 ENDDRAW
 ENDDEF
 #
-# PIC18(L)F45K80-I/PT
+# PIC18(L)F4580-I/P
 #
-DEF PIC18(L)F45K80-I/PT U 0 50 Y Y 1 F N
+DEF PIC18F4580-I/P U 0 50 Y Y 1 F N
+F0 "U" -900 1200 50 H V C CNN
+F1 "PIC18F4580-I/P" 600 -1200 50 H V C CNN
+F2 "DIP40" 0 0 50 H V C CIN
+F3 "" 0 -350 50 H V C CNN
+ALIAS PIC18LF4580-I/P PIC18LF4480-I/P PIC18F4480-I/P
+$FPLIST
+ DIP*
+ PDIP*
+$ENDFPLIST
+DRAW
+S -950 -1150 950 1150 0 1 10 f
+X ~MCLR~/VPP/RE3 1 -1100 1000 150 R 50 50 1 1 I
+X RA0/AN0/CVref 2 -1100 800 150 R 50 50 1 1 B
+X RA1/AN1 3 -1100 700 150 R 50 50 1 1 B
+X RA2/AN2/Vref- 4 -1100 600 150 R 50 50 1 1 B
+X RA3/AN3/Vref+ 5 -1100 500 150 R 50 50 1 1 B
+X RA4/TOCKI 6 -1100 400 150 R 50 50 1 1 B
+X RA5/ANA4/~SS~/HLVDIN 7 -1100 300 150 R 50 50 1 1 B
+X AN5/~RD~/RE0 8 1100 -800 150 L 50 50 1 1 B
+X C1OUT/AN6/~WR~/RE1 9 1100 -900 150 L 50 50 1 1 B
+X C2OUT/AN7/~CS~/RE2 10 1100 -1000 150 L 50 50 1 1 B
+X C1IN-/PSP1/RD1 20 1100 0 150 L 50 50 1 1 B
+X P1D/PSP7/RD7 30 1100 -600 150 L 50 50 1 1 B
+X RB7/KBI3/PGD 40 -1100 -900 150 R 50 50 1 1 B
+X VDD 11 -100 1300 150 D 50 50 1 1 W
+X C2IN+/PSP2/RD2 21 1100 -100 150 L 50 50 1 1 B
+X VSS 31 0 -1300 150 U 50 50 1 1 W
+X VSS 12 -100 -1300 150 U 50 50 1 1 W
+X C2IN-/PSP3/RD3 22 1100 -200 150 L 50 50 1 1 B
+X VDD 32 0 1300 150 D 50 50 1 1 W
+X OSC1/CLKI/RA7 13 -1100 100 150 R 50 50 1 1 I
+X SDA/SDI/RC4 23 1100 600 150 L 50 50 1 1 B
+X RB0/INT0/FLT0/AN10 33 -1100 -200 150 R 50 50 1 1 B
+X OSC2/CLKO/RA6 14 -1100 0 150 R 50 50 1 1 O
+X SDO/RC5 24 1100 500 150 L 50 50 1 1 B
+X RB1/INT1/AN8 34 -1100 -300 150 R 50 50 1 1 B
+X T13CKI/T1OSO/RC0 15 1100 1000 150 L 50 50 1 1 B
+X CK/TX/RC6 25 1100 400 150 L 50 50 1 1 B
+X RB2/INT2/CANTX 35 -1100 -400 150 R 50 50 1 1 B
+X T1OSI/RC1 16 1100 900 150 L 50 50 1 1 B
+X DT/RX/RC7 26 1100 300 150 L 50 50 1 1 B
+X RB3/CANRX 36 -1100 -500 150 R 50 50 1 1 B
+X CCP1/RC2 17 1100 800 150 L 50 50 1 1 B
+X P1A/ECCP1/PSP4/RD4 27 1100 -300 150 L 50 50 1 1 B
+X RB4/KBI0/AN9 37 -1100 -600 150 R 50 50 1 1 B
+X SCL/SCK/RC3 18 1100 700 150 L 50 50 1 1 B
+X P1B/PSP5/RD5 28 1100 -400 150 L 50 50 1 1 B
+X RB5/KBI1/PGM 38 -1100 -700 150 R 50 50 1 1 B
+X C1IN+/PSP0/RD0 19 1100 100 150 L 50 50 1 1 B
+X P1C/PSP6/RD6 29 1100 -500 150 L 50 50 1 1 B
+X RB6/KBI2/PGC 39 -1100 -800 150 R 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
+# PIC18F45K80-I/PT
+#
+DEF PIC18F45K80-I/PT U 0 50 Y Y 1 F N
 F0 "U" -1200 1300 50 H V C CNN
-F1 "PIC18(L)F45K80-I/PT" 800 -1300 50 H V C CNN
+F1 "PIC18F45K80-I/PT" 800 -1300 50 H V C CNN
 F2 "TQFP44" 0 0 50 H V C CIN
 F3 "" 0 -300 50 H V C CNN
-ALIAS PIC18(L)F46K80-I/PT
+ALIAS PIC18LF45K80-I/PT PIC18LF46K80-I/PT PIC18F46K80-I/PT
 $FPLIST
  TQFP*
 $ENDFPLIST
@@ -1659,59 +1716,6 @@ X C1INB/PSP1/RD1 39 1000 0 100 L 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# PIC18F45K80-I/PT
-#
-DEF PIC18F45K80-I/PT U 0 40 Y Y 1 F N
-F0 "U" -900 1150 50 H V L CNN
-F1 "PIC18F45K80-I/PT" -900 -1150 50 H V L CNN
-F2 "TQFP44" 0 -800 50 H V C CNN
-F3 "" -650 -100 50 H V C CNN
-ALIAS PIC18F46K80-I/PT PIC18LF45K80-I/PT PIC18LF46K80-I/PT
-DRAW
-S -900 1100 900 -1100 0 1 10 f
-X CANRX/RX1/CCP4/RC7 1 1000 300 100 L 50 50 1 1 B
-X ECCP1/PSP4/RD4 2 1000 -300 100 L 50 50 1 1 B
-X PSP5/RD5 3 1000 -400 100 L 50 50 1 1 B
-X TX2/PSP6/RD6 4 1000 -500 100 L 50 50 1 1 B
-X RX2/PSP7/RD7 5 1000 -600 100 L 50 50 1 1 B
-X Vss 6 0 -1200 100 U 50 50 1 1 W
-X Vdd 7 100 1200 100 D 50 50 1 1 W
-X RB0/AN10/INT0 8 -1000 400 100 R 50 50 1 1 B
-X RB1/AN8/INT1 9 -1000 300 100 R 50 50 1 1 B
-X RB2/CANTX/INT2 10 -1000 200 100 R 50 50 1 1 B
-X RA1/AN1 20 -1000 900 100 R 50 50 1 1 B
-X OSC1/CLKIN/RA7 30 -1000 -500 100 R 50 50 1 1 I
-X C2INA/PSP2/RD2 40 1000 -100 100 L 50 50 1 1 B
-X RB3/CANRX/INT3 11 -1000 100 100 R 50 50 1 1 B
-X RA2/Vref-/AN2 21 -1000 800 100 R 50 50 1 1 B
-X OSC2/CLKOUT/RA6 31 -1000 -600 100 R 50 50 1 1 I
-X C2INB/PSP3/RD3 41 1000 -200 100 L 50 50 1 1 B
-X RA3/Vref+/AN3 22 -1000 700 100 R 50 50 1 1 B
-X RC0 32 1000 1000 100 L 50 50 1 1 B
-X SDA/SDI/RC4 42 1000 600 100 L 50 50 1 1 B
-X Vddcore/Vcap 23 -1000 -1000 100 R 50 50 1 1 W
-X SDO/RC5 43 1000 500 100 L 50 50 1 1 B
-X RB4/AN9 14 -1000 0 100 R 50 50 1 1 B
-X RA5/AN4 24 -1000 600 100 R 50 50 1 1 B
-X CANTX/TX1/CCP3/RC6 44 1000 400 100 L 50 50 1 1 B
-X RB5/CCP5 15 -1000 -100 100 R 50 50 1 1 B
-X RE0/AN5 25 1000 -1000 100 L 50 50 1 1 B
-X RC1 35 1000 900 100 L 50 50 1 1 B
-X RB6/PGC 16 -1000 -200 100 R 50 50 1 1 B
-X RE1/AN6 26 1000 -900 100 L 50 50 1 1 B
-X CCP2/RC2 36 1000 800 100 L 50 50 1 1 B
-X RB7/PGD 17 -1000 -300 100 R 50 50 1 1 B
-X RE2/AN7 27 1000 -800 100 L 50 50 1 1 B
-X SCL/SCK/RC3 37 1000 700 100 L 50 50 1 1 B
-X ~MLCR~/RE3 18 -1000 -800 100 R 50 50 1 1 B
-X Vdd 28 0 1200 100 D 50 50 1 1 W
-X C1INA/PSP0/RD0 38 1000 100 100 L 50 50 1 1 B
-X RA0/CVrefAN0 19 -1000 1000 100 R 50 50 1 1 B
-X Vss 29 100 -1200 100 U 50 50 1 1 W
-X C1INB/PSP1/RD1 39 1000 0 100 L 50 50 1 1 B
-ENDDRAW
-ENDDEF
-#
 # PIC18F66J60-I/PT
 #
 DEF PIC18F66J60-I/PT U 0 50 Y Y 1 F N