diff --git a/library/microchip_pic18mcu.dcm b/library/microchip_pic18mcu.dcm
index 834b3c1d..900246ac 100755
--- a/library/microchip_pic18mcu.dcm
+++ b/library/microchip_pic18mcu.dcm
@@ -126,49 +126,49 @@ K microcontroller PIC18F flash XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/40001303H.pdf
 $ENDCMP
 #
-$CMP PIC18F24K50-E/ML
+$CMP PIC18F24K50-EML
 D 16K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, QFN28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18F24K50-E/SO
+$CMP PIC18F24K50-ESO
 D 16K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SOIC28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18F24K50-E/SP
+$CMP PIC18F24K50-ESP
 D 16K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SPDIP28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18F24K50-E/SS
+$CMP PIC18F24K50-ESS
 D 16K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SSOP28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18F24K50-I/ML
+$CMP PIC18F24K50-IML
 D 16K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, QFN28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18F24K50-I/SO
+$CMP PIC18F24K50-ISO
 D 16K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SOIC28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18F24K50-I/SP
+$CMP PIC18F24K50-ISP
 D 16K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SPDIP28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18F24K50-I/SS
+$CMP PIC18F24K50-ISS
 D 16K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SSOP28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
@@ -192,49 +192,49 @@ K microcontroller PIC18F flash XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/40001303H.pdf
 $ENDCMP
 #
-$CMP PIC18F25K50-E/ML
+$CMP PIC18F25K50-EML
 D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, QFN28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18F25K50-E/SO
+$CMP PIC18F25K50-ESO
 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/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18F25K50-E/SP
+$CMP PIC18F25K50-ESP
 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/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18F25K50-E/SS
+$CMP PIC18F25K50-ESS
 D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SSOP28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18F25K50-I/ML
+$CMP PIC18F25K50-IML
 D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, QFN28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18F25K50-I/SO
+$CMP PIC18F25K50-ISO
 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/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18F25K50-I/SP
+$CMP PIC18F25K50-ISP
 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/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18F25K50-I/SS
+$CMP PIC18F25K50-ISS
 D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SSOP28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
@@ -654,49 +654,49 @@ K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/39632c.pdf
 $ENDCMP
 #
-$CMP PIC18LF24K50-E/ML
+$CMP PIC18LF24K50-EML
 D 16K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, QFN28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18LF24K50-E/SO
+$CMP PIC18LF24K50-ESO
 D 16K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SOIC28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18LF24K50-E/SP
+$CMP PIC18LF24K50-ESP
 D 16K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SPDIP28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18LF24K50-E/SS
+$CMP PIC18LF24K50-ESS
 D 16K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SSOP28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18LF24K50-I/ML
+$CMP PIC18LF24K50-IML
 D 16K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, QFN28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18LF24K50-I/SO
+$CMP PIC18LF24K50-ISO
 D 16K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SOIC28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18LF24K50-I/SP
+$CMP PIC18LF24K50-ISP
 D 16K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SPDIP28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18LF24K50-I/SS
+$CMP PIC18LF24K50-ISS
 D 16K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SSOP28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
@@ -714,49 +714,49 @@ K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/39632c.pdf
 $ENDCMP
 #
-$CMP PIC18LF25K50-E/ML
+$CMP PIC18LF25K50-EML
 D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, QFN28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18LF25K50-E/SO
+$CMP PIC18LF25K50-ESO
 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/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18LF25K50-E/SP
+$CMP PIC18LF25K50-ESP
 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/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18LF25K50-E/SS
+$CMP PIC18LF25K50-ESS
 D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SSOP28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18LF25K50-I/ML
+$CMP PIC18LF25K50-IML
 D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, QFN28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18LF25K50-I/SO
+$CMP PIC18LF25K50-ISO
 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/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18LF25K50-I/SP
+$CMP PIC18LF25K50-ISP
 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/30000684B.pdf
 $ENDCMP
 #
-$CMP PIC18LF25K50-I/SS
+$CMP PIC18LF25K50-ISS
 D 32K Flash, 2K SRAM, 256 EEPROM, USB, nanoWatt XLP, SSOP28
 K Flash-Based 8-Bit Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/devicedoc/30000684B.pdf
diff --git a/library/microchip_pic18mcu.lib b/library/microchip_pic18mcu.lib
index 6454600c..1c19ac45 100755
--- a/library/microchip_pic18mcu.lib
+++ b/library/microchip_pic18mcu.lib
@@ -545,14 +545,14 @@ X VSS 19 0 -1200 150 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# PIC18F24K50-I/ML
+# PIC18F24K50-IML
 #
-DEF PIC18F24K50-I/ML U 0 50 Y Y 1 F N
+DEF PIC18F24K50-IML U 0 50 Y Y 1 F N
 F0 "U" -800 1800 50 H V C CNN
-F1 "PIC18F24K50-I/ML" 500 -1700 50 H V C CNN
+F1 "PIC18F24K50-IML" 500 -1700 50 H V C CNN
 F2 "Housings_DFN_QFN:QFN-28-1EP_6x6mm_Pitch0.65mm" 0 0 50 H I C CIN
 F3 "" -2900 -1350 50 H I C CNN
-ALIAS PIC18LF24K50-I/ML PIC18F25K50-I/ML PIC18LF25K50-I/ML PIC18F24K50-E/ML PIC18LF24K50-E/ML PIC18F25K50-E/ML PIC18LF25K50-E/ML
+ALIAS PIC18LF24K50-IML PIC18F25K50-IML PIC18LF25K50-IML PIC18F24K50-EML PIC18LF24K50-EML PIC18F25K50-EML PIC18LF25K50-EML
 $FPLIST
  QFN*1EP*6x6mm*Pitch0.65mm*
 $ENDFPLIST
@@ -589,14 +589,14 @@ X RB1/AN10/C12IN3-/P1C/SCK/SCL/INT1 19 -1000 300 150 R 50 50 1 1 B
 ENDDRAW
 ENDDEF
 #
-# PIC18F24K50-I/SO
+# PIC18F24K50-ISO
 #
-DEF PIC18F24K50-I/SO U 0 50 Y Y 1 F N
+DEF PIC18F24K50-ISO U 0 50 Y Y 1 F N
 F0 "U" -800 1800 50 H V C CNN
-F1 "PIC18F24K50-I/SO" 500 -1700 50 H V C CNN
+F1 "PIC18F24K50-ISO" 500 -1700 50 H V C CNN
 F2 "Housings_SOIC:SOIC-28W_7.5x17.9mm_Pitch1.27mm" 0 0 50 H I C CIN
 F3 "" -2900 -1350 50 H I C CNN
-ALIAS PIC18LF24K50-I/SO PIC18F25K50-I/SO PIC18LF25K50-I/SO PIC18F24K50-E/SO PIC18LF24K50-E/SO PIC18F25K50-E/SO PIC18LF25K50-E/SO
+ALIAS PIC18LF24K50-ISO PIC18F25K50-ISO PIC18LF25K50-ISO PIC18F24K50-ESO PIC18LF24K50-ESO PIC18F25K50-ESO PIC18LF25K50-ESO
 $FPLIST
  SO*W*7.5x17.9mm*Pitch1.27mm*
 $ENDFPLIST
@@ -633,14 +633,14 @@ X VSS 19 0 -1800 150 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# PIC18F24K50-I/SP
+# PIC18F24K50-ISP
 #
-DEF PIC18F24K50-I/SP U 0 50 Y Y 1 F N
+DEF PIC18F24K50-ISP U 0 50 Y Y 1 F N
 F0 "U" -800 1750 50 H V C CNN
-F1 "PIC18F24K50-I/SP" 500 -1700 50 H V C CNN
+F1 "PIC18F24K50-ISP" 500 -1700 50 H V C CNN
 F2 "Housings_DIP:DIP-28_W7.62mm" 0 0 50 H I C CIN
 F3 "" -2900 -1350 50 H I C CNN
-ALIAS PIC18LF24K50-I/SP PIC18F25K50-I/SP PIC18LF25K50-I/SP PIC18F24K50-E/SP PIC18LF24K50-E/SP PIC18F25K50-E/SP PIC18LF25K50-E/SP
+ALIAS PIC18LF24K50-ISP PIC18F25K50-ISP PIC18LF25K50-ISP PIC18F24K50-ESP PIC18LF24K50-ESP PIC18F25K50-ESP PIC18LF25K50-ESP
 $FPLIST
  SPDIP*W7.62mm*
  DIP*W7.62mm*
@@ -679,14 +679,14 @@ X VSS 19 0 -1800 150 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# PIC18F24K50-I/SS
+# PIC18F24K50-ISS
 #
-DEF PIC18F24K50-I/SS U 0 50 Y Y 1 F N
+DEF PIC18F24K50-ISS U 0 50 Y Y 1 F N
 F0 "U" -800 1750 50 H V C CNN
-F1 "PIC18F24K50-I/SS" 500 -1700 50 H V C CNN
+F1 "PIC18F24K50-ISS" 500 -1700 50 H V C CNN
 F2 "Housings_SSOP:SSOP-28_5.3x10.2mm_Pitch0.65mm" -500 -500 50 H I C CNN
 F3 "" -2900 -1350 50 H I C CNN
-ALIAS PIC18LF24K50-I/SS PIC18F25K50-I/SS PIC18LF25K50-I/SS PIC18F24K50-E/SS PIC18LF24K50-E/SS PIC18F25K50-E/SS PIC18LF25K50-E/SS
+ALIAS PIC18LF24K50-ISS PIC18F25K50-ISS PIC18LF25K50-ISS PIC18F24K50-ESS PIC18LF24K50-ESS PIC18F25K50-ESS PIC18LF25K50-ESS
 $FPLIST
  SSOP*5.3x10.2mm*Pitch0.65mm*
 $ENDFPLIST