diff --git a/library/microchip_pic18mcu.dcm b/library/microchip_pic18mcu.dcm
index 5d504491..88a8ea3b 100644
--- a/library/microchip_pic18mcu.dcm
+++ b/library/microchip_pic18mcu.dcm
@@ -258,18 +258,6 @@ 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
-$ENDCMP
-#
 $CMP PIC18F1220-SO
 D 18-Pin Flash Microcontroller 4K Flash 256byte RAM
 K RAM ADC UART PWM 
diff --git a/library/microchip_pic18mcu.lib b/library/microchip_pic18mcu.lib
index 2ec9ad68..c8c35cd2 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
 F0 "U" -1300 700 50 H V C CNN
 F1 "PIC18(L)F13K50-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*
@@ -1269,14 +1269,14 @@ X RB6/KBI2/PGC 39 -1100 -800 150 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# PIC18(L)F45K80-I/PT
+# PIC18F45K80-I/PT
 #
-DEF PIC18(L)F45K80-I/PT U 0 50 Y Y 1 F N
+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
 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
@@ -1538,59 +1538,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