diff --git a/library/microchip_pic12mcu.dcm b/library/microchip_pic12mcu.dcm
index d9c50c31..c9177966 100644
--- a/library/microchip_pic12mcu.dcm
+++ b/library/microchip_pic12mcu.dcm
@@ -1,601 +1,601 @@
 EESchema-DOCLIB  Version 2.0  Date: 2012-03-18 17:56:26
 #
 $CMP PIC12(L)F1501-I/MC
-D PIC12(L)F1501-I/MC, 1024W FLASH, 64B SRAM, DFN-8
+D PIC12(L)F1501, 1024W FLASH, 64B SRAM, DFN8
 K FLASH-Based 8-Bit CMOS Microcontroller Low Power
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41615A.pdf
 $ENDCMP
 #
 $CMP PIC12(L)F1501-I/MS
-D PIC12(L)F1501-I/MS, 1024W FLASH, 64B SRAM, MSOP-8
+D PIC12(L)F1501, 1024W FLASH, 64B SRAM, MSOP8
 K FLASH-Based 8-Bit CMOS Microcontroller Low Power
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41615A.pdf
 $ENDCMP
 #
 $CMP PIC12(L)F1501-I/P
-D PIC12(L)F1501-I/P, 1024W FLASH, 64B SRAM, PDIP-8
+D PIC12(L)F1501, 1024W FLASH, 64B SRAM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller Low Power
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41615A.pdf
 $ENDCMP
 #
 $CMP PIC12(L)F1501-I/SN
-D PIC12(L)F1501-I/SN, 1024W FLASH, 64B SRAM, SO-8
+D PIC12(L)F1501, 1024W FLASH, 64B SRAM, SO8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41615A.pdf
 $ENDCMP
 #
 $CMP PIC12(L)F1822-I/MC
-D PIC12(L)F1822-I/MC, 2kW FLASH, 128B SRAM, 256 EEPROM, DFN-8
+D PIC12(L)F1822, 2kW FLASH, 128B SRAM, 256 EEPROM, DFN8
 K FLASH-Based 8-Bit CMOS Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41413B.pdf
 $ENDCMP
 #
 $CMP PIC12(L)F1822-I/P
-D PIC12(L)F1822-I/P, 2kW FLASH, 128B SRAM, 256 EEPROM, PDIP-8
+D PIC12(L)F1822, 2kW FLASH, 128B SRAM, 256 EEPROM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41413B.pdf
 $ENDCMP
 #
 $CMP PIC12(L)F1822-I/SN
-D PIC12(L)F1822-I/SN, 2kW FLASH, 128B SRAM, 256 EEPROM, SO-8
+D PIC12(L)F1822, 2kW FLASH, 128B SRAM, 256 EEPROM, SO8
 K FLASH-Based 8-Bit CMOS Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41413B.pdf
 $ENDCMP
 #
 $CMP PIC12(L)F1840-I/MC
-D PIC12(L)F1840-I/MC, 4kW FLASH, 256B SRAM, 256B EEPROM, PDIP-8
+D PIC12(L)F1840, 4kW FLASH, 256B SRAM, 256B EEPROM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41441B.pdf
 $ENDCMP
 #
 $CMP PIC12(L)F1840-I/P
-D PIC12(L)F1840-I/SN, 4kW FLASH, 256B SRAM, 256B EEPROM, PDIP-8
+D PIC12(L)F1840, 4kW FLASH, 256B SRAM, 256B EEPROM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41441B.pdf
 $ENDCMP
 #
 $CMP PIC12(L)F1840-I/SN
-D PIC12(L)F1840-I/SN, 4kW FLASH, 256B SRAM, 256B EEPROM, SO-8
+D PIC12(L)F1840, 4kW FLASH, 256B SRAM, 256B EEPROM, SO8
 K FLASH-Based 8-Bit CMOS Microcontroller XLP
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41441B.pdf
 $ENDCMP
 #
 $CMP PIC12C508-I/JW
-D PIC12C508-I/JW, 512W EPROM, 25B SRAM, CERDIP-8 Windowed
+D PIC12C508, 512W EPROM, 25B SRAM, CERDIP8 Windowed
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
 #
 $CMP PIC12C508-I/P
-D PIC12C508-I/P, 512W EPROM, 25B SRAM, PDIP-8
+D PIC12C508, 512W EPROM, 25B SRAM, PDIP8
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
 #
 $CMP PIC12C508-I/SM
-D PIC12C508-I/SM, 512W EPROM, 25B SRAM, SO-8 Wide
+D PIC12C508, 512W EPROM, 25B SRAM, SO8 Wide
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
 #
 $CMP PIC12C508A-I/JW
-D PIC12C508A-I/JW, 512W EPROM, 25B SRAM, CERDIP-8 Windowed
+D PIC12C508A, 512W EPROM, 25B SRAM, CERDIP8 Windowed
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
 #
 $CMP PIC12C508A-I/P
-D PIC12C508A-I/P, 512W EPROM, 25B SRAM, PDIP-8
+D PIC12C508A, 512W EPROM, 25B SRAM, PDIP8
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
 #
 $CMP PIC12C508A-I/SM
-D PIC12C508A-I/SM, 512W EPROM, 25B SRAM, SO-8 Wide
+D PIC12C508A, 512W EPROM, 25B SRAM, SO8 Wide
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
 #
 $CMP PIC12C508A-I/SN
-D PIC12C508A-I/SN, 512W EPROM, 25B SRAM, SO-8
+D PIC12C508A, 512W EPROM, 25B SRAM, SO8
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
 #
 $CMP PIC12C509-I/JW
-D PIC12C509-I/JW, 1024W EPROM, 41B SRAM, CERDIP-8 Windowed
+D PIC12C509, 1024W EPROM, 41B SRAM, CERDIP8 Windowed
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
 #
 $CMP PIC12C509-I/P
-D PIC12C509-I/P, 1024W EPROM, 41B SRAM, PDIP-8
+D PIC12C509, 1024W EPROM, 41B SRAM, PDIP8
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
 #
 $CMP PIC12C509-I/SM
-D PIC12C509-I/SM, 1024W EPROM, 41B SRAM, SO-8 Wide
+D PIC12C509, 1024W EPROM, 41B SRAM, SO8 Wide
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
 #
 $CMP PIC12C509A-I/JW
-D PIC12C509A-I/JW, 1024W EPROM, 41B SRAM, CERDIP-8 Windowed
+D PIC12C509A, 1024W EPROM, 41B SRAM, CERDIP8 Windowed
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
 #
 $CMP PIC12C509A-I/P
-D PIC12C509-I/P, 1024W EPROM, 41B SRAM, PDIP-8
+D PIC12C509, 1024W EPROM, 41B SRAM, PDIP8
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
 #
 $CMP PIC12C509A-I/SM
-D PIC12C509A-I/SM, 1024W EPROM, 41B SRAM, SO-8 Wide
+D PIC12C509A, 1024W EPROM, 41B SRAM, SO8 Wide
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
 #
 $CMP PIC12C509A-I/SN
-D PIC12C509A-I/SN, 1024W EPROM, 41B SRAM, SO-8
+D PIC12C509A, 1024W EPROM, 41B SRAM, SO8
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
 #
 $CMP PIC12C671-I/JW
-D PIC12C671-I/JW, 1024W EPROM, 128B SRAM, CERDIP-8 Windowed
+D PIC12C671, 1024W EPROM, 128B SRAM, CERDIP8 Windowed
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/30561b.pdf
 $ENDCMP
 #
 $CMP PIC12C671-I/P
-D PIC12C671-I/P, 1024W EPROM, 128B SRAM, PDIP-8
+D PIC12C671, 1024W EPROM, 128B SRAM, PDIP8
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/30561b.pdf
 $ENDCMP
 #
 $CMP PIC12C671-I/SN
-D PIC12C671-I/SN, 1024W EPROM, 128B SRAM, SO-8
+D PIC12C671, 1024W EPROM, 128B SRAM, SO8
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/30561b.pdf
 $ENDCMP
 #
 $CMP PIC12C672-I/JW
-D PIC12C672-I/JW, 2048W EPROM, 128B SRAM, CERDIP-8 Windowed
+D PIC12C672, 2048W EPROM, 128B SRAM, CERDIP8 Windowed
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/30561b.pdf
 $ENDCMP
 #
 $CMP PIC12C672-I/P
-D PIC12C672-I/P, 2048W EPROM, 128B SRAM, PDIP-8
+D PIC12C672, 2048W EPROM, 128B SRAM, PDIP8
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/30561b.pdf
 $ENDCMP
 #
 $CMP PIC12C672-I/SN
-D PIC12C672-I/SN, 2048W EPROM, 128B SRAM, SO-8
+D PIC12C672, 2048W EPROM, 128B SRAM, SO8
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/30561b.pdf
 $ENDCMP
 #
 $CMP PIC12CE673-I/JW
-D PIC12CE673-I/JW, 1024W EPROM, 128B SRAM, 128B EEPROM, CERDIP-8 Windowed
+D PIC12CE673, 1024W EPROM, 128B SRAM, 128B EEPROM, CERDIP8 Windowed
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/30561b.pdf
 $ENDCMP
 #
 $CMP PIC12CE673-I/P
-D PIC12CE673-I/P, 1024W EPROM, 128B SRAM, 128B EPROM, PDIP-8
+D PIC12CE673, 1024W EPROM, 128B SRAM, 128B EPROM, PDIP8
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/30561b.pdf
 $ENDCMP
 #
 $CMP PIC12CE674-I/JW
-D PIC12CE674-I/JW, 2048W EPROM, 128B SRAM, 128B EEPROM, CERDIP-8 Windowed
+D PIC12CE674, 2048W EPROM, 128B SRAM, 128B EEPROM, CERDIP8 Windowed
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/30561b.pdf
 $ENDCMP
 #
 $CMP PIC12CE674-I/P
-D PIC12CE674-I/P, 2048W EPROM, 128B SRAM, 128B EPROM, PDIP-8
+D PIC12CE674, 2048W EPROM, 128B SRAM, 128B EPROM, PDIP8
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/30561b.pdf
 $ENDCMP
 #
 $CMP PIC12CE518-I/JW
-D PIC12CE518-I/JW, 512W EPROM, 25B SRAM, CERDIP-8 Windowed
+D PIC12CE518, 512W EPROM, 25B SRAM, CERDIP8 Windowed
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
 #
 $CMP PIC12CE518-I/P
-D PIC12CE518-I/P, 512W EPROM, 25B SRAM, PDIP-8
+D PIC12CE518, 512W EPROM, 25B SRAM, PDIP8
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
 #
 $CMP PIC12CE518-I/SM
-D PIC12CE518-I/SM, 512W EPROM, 25B SRAM, SO-8 Wide
+D PIC12CE518, 512W EPROM, 25B SRAM, SO8 Wide
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
 #
 $CMP PIC12CE518-I/SN
-D PIC12CE518-I/SN, 512W EPROM, 25B SRAM, SO-8
+D PIC12CE518, 512W EPROM, 25B SRAM, SO8
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
 #
 $CMP PIC12CE519-I/JW
-D PIC12CE519-I/JW, 1024W EPROM, 41B SRAM, CERDIP-8 Windowed
+D PIC12CE519, 1024W EPROM, 41B SRAM, CERDIP8 Windowed
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
 #
 $CMP PIC12CE519-I/P
-D PIC12CE519-I/P, 1024W EPROM, 41B SRAM, PDIP-8
+D PIC12CE519, 1024W EPROM, 41B SRAM, PDIP8
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
 #
 $CMP PIC12CE519-I/SM
-D PIC12CE519-I/SM, 1024W EPROM, 41B SRAM, SO-8 Wide
+D PIC12CE519, 1024W EPROM, 41B SRAM, SO8 Wide
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
 #
 $CMP PIC12CE519-I/SN
-D PIC12CE519-I/SN, 1024W EPROM, 41B SRAM, SO-8
+D PIC12CE519, 1024W EPROM, 41B SRAM, SO8
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
 #
 $CMP PIC12CR509A-I/P
-D PIC12CR509A-I/P, 1024W ROM, 41B SRAM, PDIP-8
+D PIC12CR509A, 1024W ROM, 41B SRAM, PDIP8
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
 #
 $CMP PIC12CR509A-I/SM
-D PIC12CR509A-I/SM, 1024W ROM, 41B SRAM, SO-8 Wide
+D PIC12CR509A, 1024W ROM, 41B SRAM, SO8 Wide
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
 #
 $CMP PIC12CR509A-I/SN
-D PIC12CR509A-I/SN, 1024W ROM, 41B SRAM, SO-8
+D PIC12CR509A, 1024W ROM, 41B SRAM, SO8
 K 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/devicedoc/40139e.pdf
 $ENDCMP
 #
 $CMP PIC12F508-I/MC
-D PIC12F508-I/MC, 512W Flash, 25B SRAM, DFN-8
+D PIC12F508, 512W Flash, 25B SRAM, DFN8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41236E.pdf
 $ENDCMP
 #
 $CMP PIC12F508-I/MS
-D PIC12F508-I/MS, 512W Flash, 25B SRAM, MSOP-8
+D PIC12F508, 512W Flash, 25B SRAM, MSOP8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41236E.pdf
 $ENDCMP
 #
 $CMP PIC12F508-I/P
-D PIC12F508-I/P, 512W Flash, 25B SRAM, PDIP-8
+D PIC12F508, 512W Flash, 25B SRAM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41236E.pdf
 $ENDCMP
 #
 $CMP PIC12F508-I/SN
-D PIC12F508-I/SN, 512W Flash, 25B SRAM, SO-8
+D PIC12F508, 512W Flash, 25B SRAM, SO8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41236E.pdf
 $ENDCMP
 #
 $CMP PIC12F509-I/MC
-D PIC12F509-I/MC, 1024W Flash, 41B SRAM, DFN-8
+D PIC12F509, 1024W Flash, 41B SRAM, DFN8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41236E.pdf
 $ENDCMP
 #
 $CMP PIC12F509-I/MS
-D PIC12F509-I/MS, 1024W Flash, 41B SRAM, MSOP-8
+D PIC12F509, 1024W Flash, 41B SRAM, MSOP8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41236E.pdf
 $ENDCMP
 #
 $CMP PIC12F509-I/P
-D PIC12F509-I/P, 1024W Flash, 41B SRAM, PDIP-8
+D PIC12F509, 1024W Flash, 41B SRAM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41236E.pdf
 $ENDCMP
 #
 $CMP PIC12F509-I/SN
-D PIC12F509-I/SN, 1024W Flash, 41B SRAM, SO-8
+D PIC12F509, 1024W Flash, 41B SRAM, SO8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41236E.pdf
 $ENDCMP
 #
 $CMP PIC12F510-I/MC
-D PIC12F510-I/MC, 1024W FLASH, 38B SRAM, DFN-8
+D PIC12F510, 1024W FLASH, 38B SRAM, DFN8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41268D.pdf
 $ENDCMP
 #
 $CMP PIC12F510-I/MS
-D PIC12F510-I/MC, 1024W FLASH, 38B SRAM, MSOP-8
+D PIC12F510, 1024W FLASH, 38B SRAM, MSOP8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41268D.pdf
 $ENDCMP
 #
 $CMP PIC12F510-I/P
-D PIC12F510-I/P, 1024W FLASH, 38B SRAM, PDIP-8
+D PIC12F510, 1024W FLASH, 38B SRAM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41268D.pdf
 $ENDCMP
 #
 $CMP PIC12F510-I/SN
-D PIC12F510-I/SN, 1024W FLASH, 38B SRAM, SO-8
+D PIC12F510, 1024W FLASH, 38B SRAM, SO8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41268D.pdf
 $ENDCMP
 #
 $CMP PIC12F519-I/MC
-D PIC12F519-I/MC, 1024W Flash, 41B SRAM, 64B EEPROM, DFN-8
+D PIC12F519, 1024W Flash, 41B SRAM, 64B EEPROM, DFN8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41319B.pdf
 $ENDCMP
 #
 $CMP PIC12F519-I/MS
-D PIC12F519-I/MS, 1024W Flash, 41B SRAM, 64B EEPROM, MSOP-8
+D PIC12F519, 1024W Flash, 41B SRAM, 64B EEPROM, MSOP8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41319B.pdf
 $ENDCMP
 #
 $CMP PIC12F519-I/P
-D PIC12F519-I/P, 1024W Flash, 41B SRAM, 64B EEPROM, PDIP-8
+D PIC12F519, 1024W Flash, 41B SRAM, 64B EEPROM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41319B.pdf
 $ENDCMP
 #
 $CMP PIC12F519-I/SN
-D PIC12F519-I/SN, 1024W Flash, 41B SRAM, 64B EEPROM, SO-8
+D PIC12F519, 1024W Flash, 41B SRAM, 64B EEPROM, SO8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41319B.pdf
 $ENDCMP
 #
 $CMP PIC12F609-I/MC
-D PIC12F609-I/MC, 1024W Flash, 64B SRAM, DFN-8
+D PIC12F609, 1024W Flash, 64B SRAM, DFN8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41302D.pdf
 $ENDCMP
 #
 $CMP PIC12F609-I/MS
-D PIC12F609-I/MS, 1024W Flash, 64B SRAM, MSOP-8
+D PIC12F609, 1024W Flash, 64B SRAM, MSOP8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41302D.pdf
 $ENDCMP
 #
 $CMP PIC12F609-I/P
-D PIC12F609-I/P, 1024W Flash, 64B SRAM, PDIP-8
+D PIC12F609, 1024W Flash, 64B SRAM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41302D.pdf
 $ENDCMP
 #
 $CMP PIC12F609-I/SN
-D PIC12F609-I/SN, 1024W Flash, 64B SRAM, SO-8
+D PIC12F609, 1024W Flash, 64B SRAM, SO8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41302D.pdf
 $ENDCMP
 #
 $CMP PIC12F615-I/MC
-D PIC12F615-I/MC, 1024W Flash, 64B SRAM, DFN-8
+D PIC12F615, 1024W Flash, 64B SRAM, DFN8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41302D.pdf
 $ENDCMP
 #
 $CMP PIC12F615-I/MS
-D PIC12F615-I/MS, 1024W Flash, 64B SRAM, MSOP-8
+D PIC12F615, 1024W Flash, 64B SRAM, MSOP8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41302D.pdf
 $ENDCMP
 #
 $CMP PIC12F615-I/P
-D PIC12F615-I/P, 1024W Flash, 64B SRAM, PDIP-8
+D PIC12F615, 1024W Flash, 64B SRAM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41302D.pdf
 $ENDCMP
 #
 $CMP PIC12F615-I/SN
-D PIC12F615-I/SN, 1024W Flash, 64B SRAM, SO-8
+D PIC12F615, 1024W Flash, 64B SRAM, SO8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41302D.pdf
 $ENDCMP
 #
 $CMP PIC12F617-I/MC
-D PIC12F617-I/MC, 2048W Flash, 128B SRAM, DFN-8
+D PIC12F617, 2048W Flash, 128B SRAM, DFN8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41302D.pdf
 $ENDCMP
 #
 $CMP PIC12F617-I/MS
-D PIC12F617-I/MS, 2048W Flash, 128B SRAM, MSOP-8
+D PIC12F617, 2048W Flash, 128B SRAM, MSOP8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41302D.pdf
 $ENDCMP
 #
 $CMP PIC12F617-I/P
-D PIC12F617-I/P, 2048W Flash, 128B SRAM, PDIP-8
+D PIC12F617, 2048W Flash, 128B SRAM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41302D.pdf
 $ENDCMP
 #
 $CMP PIC12F617-I/SN
-D PIC12F617-I/SN, 2048W Flash, 128B SRAM, SO-8
+D PIC12F617, 2048W Flash, 128B SRAM, SO8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41302D.pdf
 $ENDCMP
 #
 $CMP PIC12F629-I/MC
-D PIC12F629-I/MC, 1024W Flash, 64B SRAM, 128B EEPROM, DFN-8
+D PIC12F629, 1024W Flash, 64B SRAM, 128B EEPROM, DFN8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41190G.pdf
 $ENDCMP
 #
 $CMP PIC12F629-I/P
-D PIC12F629-I/P, 1024W Flash, 64B SRAM, 128B EEPROM, PDIP-8
+D PIC12F629, 1024W Flash, 64B SRAM, 128B EEPROM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41190G.pdf
 $ENDCMP
 #
 $CMP PIC12F629-I/SN
-D PIC12F629-I/SN, 1024W Flash, 64B SRAM, 128B EEPROM, SO-8
+D PIC12F629, 1024W Flash, 64B SRAM, 128B EEPROM, SO8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41190G.pdf
 $ENDCMP
 #
 $CMP PIC12F635-I/MC
-D PIC12F635-I/MC, 1024W Flash, 64B SRAM, 128B EEPROM, DFN-8
+D PIC12F635, 1024W Flash, 64B SRAM, 128B EEPROM, DFN8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41232D.pdf
 $ENDCMP
 #
 $CMP PIC12F635-I/P
-D PIC12F635-I/P, 1024W Flash, 64B SRAM, 128B EEPROM, DIP-8
+D PIC12F635, 1024W Flash, 64B SRAM, 128B EEPROM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41232D.pdf
 $ENDCMP
 #
 $CMP PIC12F635-I/SN
-D PIC12F635-I/SN, 1024W Flash, 64B SRAM, 128B EEPROM, SO-8
+D PIC12F635, 1024W Flash, 64B SRAM, 128B EEPROM, SO8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41232D.pdf
 $ENDCMP
 #
 $CMP PIC12F675-I/MC
-D PIC12F675-I/MC, 1024W Flash, 64B SRAM, 128B EEPROM, DFN-8
+D PIC12F675, 1024W Flash, 64B SRAM, 128B EEPROM, DFN8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41190G.pdf
 $ENDCMP
 #
 $CMP PIC12F675-I/P
-D PIC12F675-I/P, 1024W Flash, 64B SRAM, 128B EEPROM, DIP-8
+D PIC12F675, 1024W Flash, 64B SRAM, 128B EEPROM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41190G.pdf
 $ENDCMP
 #
 $CMP PIC12F675-I/SN
-D PIC12F675-I/SN, 1024W Flash, 64B SRAM, 128B EEPROM, SO-8
+D PIC12F675, 1024W Flash, 64B SRAM, 128B EEPROM, SO8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41190G.pdf
 $ENDCMP
 #
 $CMP PIC12F683-I/MC
-D PIC12F683-I/MC, 2048W Flash, 128B SRAM, 256B EEPROM, DFN-8
+D PIC12F683, 2048W Flash, 128B SRAM, 256B EEPROM, DFN8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41211D_.pdf
 $ENDCMP
 #
 $CMP PIC12F683-I/P
-D PIC12F683-I/P, 2048W Flash, 128B SRAM, 256B EEPROM, DIP-8
+D PIC12F683, 2048W Flash, 128B SRAM, 256B EEPROM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41232D.pdf
 $ENDCMP
 #
 $CMP PIC12F683-I/SN
-D PIC12F683-I/SN, 2048W Flash, 128B SRAM, 256B EEPROM, SO-8
+D PIC12F683, 2048W Flash, 128B SRAM, 256B EEPROM, SO8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41211D_.pdf
 $ENDCMP
 #
 $CMP PIC12F752-I/MC
-D PIC12F752-I/MC, 1024W Flash, 64B SRAM, DNF-8
+D PIC12F752, 1024W Flash, 64B SRAM, DFN8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41576B.pdf
 $ENDCMP
 #
 $CMP PIC12F752-I/P
-D PIC12F752-I/P, 1024W Flash, 64B SRAM, PDIP-8
+D PIC12F752, 1024W Flash, 64B SRAM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41576B.pdf
 $ENDCMP
 #
 $CMP PIC12F752-I/SN
-D PIC12F752-I/SN, 1024W Flash, 64B SRAM, SO-8
+D PIC12F752, 1024W Flash, 64B SRAM, SO8
 K FLASH-Based 8-Bit CMOS Microcontroller
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41576B.pdf
 $ENDCMP
 #
 $CMP PIC12HV609-I/MC
-D PIC12HV609-I/MC, 1024W Flash, 64B SRAM, DFN-8
+D PIC12HV609, 1024W Flash, 64B SRAM, DFN8
 K FLASH-Based 8-Bit CMOS Microcontroller High Voltage
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41302D.pdf
 $ENDCMP
 #
 $CMP PIC12HV609-I/MS
-D PIC12HV609-I/MS, 1024W Flash, 64B SRAM, MSOP-8
+D PIC12HV609, 1024W Flash, 64B SRAM, MSOP8
 K FLASH-Based 8-Bit CMOS Microcontroller High Voltage
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41302D.pdf
 $ENDCMP
 #
 $CMP PIC12HV609-I/P
-D PIC12HV609-I/P, 1024W Flash, 64B SRAM, PDIP-8
+D PIC12HV609, 1024W Flash, 64B SRAM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller High Voltage
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41302D.pdf
 $ENDCMP
 #
 $CMP PIC12HV609-I/SN
-D PIC12HV609-I/SN, 1024W Flash, 64B SRAM, SO-8
+D PIC12HV609, 1024W Flash, 64B SRAM, SO8
 K FLASH-Based 8-Bit CMOS Microcontroller High Voltage
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41302D.pdf
 $ENDCMP
 #
 $CMP PIC12HV615-I/MC
-D PIC12HV615-I/MC, 1024W Flash, 64B SRAM, DFN-8
+D PIC12HV615, 1024W Flash, 64B SRAM, DFN8
 K FLASH-Based 8-Bit CMOS Microcontroller High Voltage
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41302D.pdf
 $ENDCMP
 #
 $CMP PIC12HV615-I/MS
-D PIC12HV615-I/MS, 1024W Flash, 64B SRAM, MSOP-8
+D PIC12HV615, 1024W Flash, 64B SRAM, MSOP8
 K FLASH-Based 8-Bit CMOS Microcontroller High Voltage
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41302D.pdf
 $ENDCMP
 #
 $CMP PIC12HV615-I/P
-D PIC12HV615-I/P, 1024W Flash, 64B SRAM, PDIP-8
+D PIC12HV615, 1024W Flash, 64B SRAM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller High Voltage
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41302D.pdf
 $ENDCMP
 #
 $CMP PIC12HV615-I/SN
-D PIC12HV615-I/SN, 1024W Flash, 64B SRAM, SO-8
+D PIC12HV615, 1024W Flash, 64B SRAM, SO8
 K FLASH-Based 8-Bit CMOS Microcontroller High Voltage
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41302D.pdf
 $ENDCMP
 #
 $CMP PIC12HV752-I/MC
-D PIC12HV752-I/MC, 1024W Flash, 64B SRAM, DNF-8
+D PIC12HV752, 1024W Flash, 64B SRAM, DFN8
 K FLASH-Based 8-Bit CMOS Microcontroller High Voltage
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41576B.pdf
 $ENDCMP
 #
 $CMP PIC12HV752-I/P
-D PIC12HV752-I/P, 1024W Flash, 64B SRAM, PDIP-8
+D PIC12HV752, 1024W Flash, 64B SRAM, PDIP8
 K FLASH-Based 8-Bit CMOS Microcontroller High Voltage
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41576B.pdf
 $ENDCMP
 #
 $CMP PIC12HV752-I/SN
-D PIC12HV752-I/SN, 1024W Flash, 64B SRAM, SO-8
+D PIC12HV752, 1024W Flash, 64B SRAM, SO8
 K FLASH-Based 8-Bit CMOS Microcontroller High Voltage
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41576B.pdf
 $ENDCMP
 #
 $CMP PIC12LF1840T48-I/ST
-D PIC12LF1840T48-I/ST, 4kW FLASH, 256B SRAM, 256B EEPROM, TSSOP-14
+D PIC12LF1840T48, 4kW FLASH, 256B SRAM, 256B EEPROM, RF, TSSOP14
 K FLASH-Based 8-Bit CMOS Microcontroller XLP RF Transmitter
 F http://ww1.microchip.com/downloads/en/DeviceDoc/41594B.pdf
 $ENDCMP
diff --git a/library/microchip_pic12mcu.lib b/library/microchip_pic12mcu.lib
index 7f1094ff..f912c11f 100644
--- a/library/microchip_pic12mcu.lib
+++ b/library/microchip_pic12mcu.lib
@@ -12,10 +12,10 @@ S 450 -350 -450 350 0 1 10 f
 X VDD 1 -600 250 150 R 40 40 1 1 W
 X RA5 2 600 -250 150 L 40 40 1 1 B
 X RA4 3 600 -150 150 L 40 40 1 1 B
-X RA3/~MCLR~/Vpp 4 600 -50 150 L 40 40 1 1 I
+X Vpp/~MCLR~/RA3 4 600 -50 150 L 40 40 1 1 I
 X RA2 5 600 50 150 L 40 40 1 1 B
-X RA1/ICSPCLK 6 600 150 150 L 40 40 1 1 B
-X RA0/ICSPDAT 7 600 250 150 L 40 40 1 1 B
+X ICSPCLK/RA1 6 600 150 150 L 40 40 1 1 B
+X ICSPDAT/RA0 7 600 250 150 L 40 40 1 1 B
 X VSS 8 -600 -250 150 R 40 40 1 1 W
 ENDDRAW
 ENDDEF
@@ -33,7 +33,7 @@ X SRNQ/T1CKI/T1OSI/OSC1/CLKIN/RA5 2 1200 -250 150 L 40 40 1 1 B
 X CLKR/C1IN1-/T1OSO/CLKOUT/OSC2/CPS3/AN3/RA4 3 1200 -150 150 L 40 40 1 1 B
 X ~MCLR~/Vpp/RA3 4 1200 -50 150 L 40 40 1 1 I
 X AN2/CPS2/C1OUT/SRQ/T0CKI/FLT0/SDA/SDI/INT/MDCIN1/RA2 5 1200 50 150 L 40 40 1 1 B
-X AN1/CPS1/VREF/C1IN0-/SRI/SCL/SCK/MDMIN/ICSPCLK/RA1 6 1200 150 150 L 40 40 1 1 B
+X AN1/CPS1/Vref/C1IN0-/SRI/SCL/SCK/MDMIN/ICSPCLK/RA1 6 1200 150 150 L 40 40 1 1 B
 X AN0/CPS0/C1IN+/DACOUT/MDOUT/ICSPDAT/RA0 7 1200 250 150 L 40 40 1 1 B
 X VSS 8 -1200 -250 150 R 40 40 1 1 W
 ENDDRAW
@@ -52,7 +52,7 @@ X SRNQ/T1CKI/T1OSI/OSC1/CLKIN/RA5 2 1200 -250 150 L 40 40 1 1 B
 X MDCIN2/CLKR/C1IN1-/T1OSO/CLKOUT/OSC2/CPS3/AN3/RA4 3 1200 -150 150 L 40 40 1 1 B
 X ~MCLR~/Vpp/RA3 4 1200 -50 150 L 40 40 1 1 I
 X AN2/CPS2/C1OUT/SRQ/T0CKI/FLT0/SDA/SDI/INT/MDCIN1/RA2 5 1200 50 150 L 40 40 1 1 B
-X AN1/CPS1/VREF/C1IN0-/SRI/SCL/SCK/MDMIN/ICSPCLK/RA1 6 1200 150 150 L 40 40 1 1 B
+X AN1/CPS1/Vref/C1IN0-/SRI/SCL/SCK/MDMIN/ICSPCLK/RA1 6 1200 150 150 L 40 40 1 1 B
 X AN0/CPS0/C1IN+/DACOUT/MDOUT/ICSPDAT/RA0 7 1200 250 150 L 40 40 1 1 B
 X VSS 8 -1200 -250 150 R 40 40 1 1 W
 ENDDRAW
@@ -67,12 +67,12 @@ ALIAS PIC12C508-I/SM PIC12C508-I/JW
 DRAW
 S 500 -350 -500 350 0 1 10 f
 X VDD 1 -650 250 150 R 40 40 1 1 W
-X GP5/OSC1/CLKIN 2 650 -250 150 L 40 40 1 1 B
-X GP4/OSC2 3 650 -150 150 L 40 40 1 1 B
-X GP3/~MCLR~/Vpp 4 650 -50 150 L 40 40 1 1 I
-X GP2/T0CKI 5 650 50 150 L 40 40 1 1 B
-X GP1/ICSPCLK 6 650 150 150 L 40 40 1 1 B
-X GP0/ICSPDAT 7 650 250 150 L 40 40 1 1 B
+X CLKIN/OSC1/GP5 2 650 -250 150 L 40 40 1 1 B
+X OSC2/GP4 3 650 -150 150 L 40 40 1 1 B
+X Vpp/~MCLR~/GP3 4 650 -50 150 L 40 40 1 1 I
+X T0CKI/GP2 5 650 50 150 L 40 40 1 1 B
+X ICSPCLK/GP1 6 650 150 150 L 40 40 1 1 B
+X ICSPDAT/GP0 7 650 250 150 L 40 40 1 1 B
 X VSS 8 -650 -250 150 R 40 40 1 1 W
 ENDDRAW
 ENDDEF
@@ -86,12 +86,12 @@ ALIAS PIC12C508A-I/SN PIC12C508A-I/SM PIC12C508A-I/JW
 DRAW
 S 500 -350 -500 350 0 1 10 f
 X VDD 1 -650 250 150 R 40 40 1 1 W
-X GP5/OSC1/CLKIN 2 650 -250 150 L 40 40 1 1 B
-X GP4/OSC2 3 650 -150 150 L 40 40 1 1 B
-X GP3/~MCLR~/Vpp 4 650 -50 150 L 40 40 1 1 I
-X GP2/T0CKI 5 650 50 150 L 40 40 1 1 B
-X GP1/ICSPCLK 6 650 150 150 L 40 40 1 1 B
-X GP0/ICSPDAT 7 650 250 150 L 40 40 1 1 B
+X CLKIN/OSC1/GP5 2 650 -250 150 L 40 40 1 1 B
+X OSC2/GP4 3 650 -150 150 L 40 40 1 1 B
+X Vpp/~MCLR~/GP3 4 650 -50 150 L 40 40 1 1 I
+X T0CKI/GP2 5 650 50 150 L 40 40 1 1 B
+X ICSPCLK/GP1 6 650 150 150 L 40 40 1 1 B
+X ICSPDAT/GP0 7 650 250 150 L 40 40 1 1 B
 X VSS 8 -650 -250 150 R 40 40 1 1 W
 ENDDRAW
 ENDDEF
@@ -105,12 +105,12 @@ ALIAS PIC12C509-I/SM PIC12C509-I/JW
 DRAW
 S 500 -350 -500 350 0 1 10 f
 X VDD 1 -650 250 150 R 40 40 1 1 W
-X GP5/OSC1/CLKIN 2 650 -250 150 L 40 40 1 1 B
-X GP4/OSC2 3 650 -150 150 L 40 40 1 1 B
-X GP3/~MCLR~/Vpp 4 650 -50 150 L 40 40 1 1 I
-X GP2/T0CKI 5 650 50 150 L 40 40 1 1 B
-X GP1/ICSPCLK 6 650 150 150 L 40 40 1 1 B
-X GP0/ICSPDAT 7 650 250 150 L 40 40 1 1 B
+X CLKIN/OSC1/GP5 2 650 -250 150 L 40 40 1 1 B
+X OSC2/GP4 3 650 -150 150 L 40 40 1 1 B
+X Vpp/~MCLR~/GP3 4 650 -50 150 L 40 40 1 1 I
+X T0CKI/GP2 5 650 50 150 L 40 40 1 1 B
+X ICSPCLK/GP1 6 650 150 150 L 40 40 1 1 B
+X ICSPDAT/GP0 7 650 250 150 L 40 40 1 1 B
 X VSS 8 -650 -250 150 R 40 40 1 1 W
 ENDDRAW
 ENDDEF
@@ -124,12 +124,12 @@ ALIAS PIC12C509A-I/SN PIC12C509A-I/SM PIC12C509A-I/JW
 DRAW
 S 500 -350 -500 350 0 1 10 f
 X VDD 1 -650 250 150 R 40 40 1 1 W
-X GP5/OSC1/CLKIN 2 650 -250 150 L 40 40 1 1 B
-X GP4/OSC2 3 650 -150 150 L 40 40 1 1 B
-X GP3/~MCLR~/Vpp 4 650 -50 150 L 40 40 1 1 I
-X GP2/T0CKI 5 650 50 150 L 40 40 1 1 B
-X GP1/ICSPCLK 6 650 150 150 L 40 40 1 1 B
-X GP0/ICSPDAT 7 650 250 150 L 40 40 1 1 B
+X CLKIN/OSC1/GP5 2 650 -250 150 L 40 40 1 1 B
+X OSC2/GP4 3 650 -150 150 L 40 40 1 1 B
+X Vpp/~MCLR~/GP3 4 650 -50 150 L 40 40 1 1 I
+X T0CKI/GP2 5 650 50 150 L 40 40 1 1 B
+X ICSPCLK/GP1 6 650 150 150 L 40 40 1 1 B
+X ICSPDAT/GP0 7 650 250 150 L 40 40 1 1 B
 X VSS 8 -650 -250 150 R 40 40 1 1 W
 ENDDRAW
 ENDDEF
@@ -143,11 +143,11 @@ ALIAS PIC12C671-I/SN PIC12C671-I/JW
 DRAW
 S 500 -350 -500 350 0 1 10 f
 X VDD 1 -650 250 150 R 40 40 1 1 W
-X OSC1/CLKIN/GP5 2 650 -250 150 L 40 40 1 1 B
-X AN3/OSC2/CLKOUT/GP4 3 650 -150 150 L 40 40 1 1 B
-X ~MCLR~/Vpp/GP3 4 650 -50 150 L 40 40 1 1 I
+X CLKIN/OSC1/GP5 2 650 -250 150 L 40 40 1 1 B
+X AN3/CLKOUT/OSC2/GP4 3 650 -150 150 L 40 40 1 1 B
+X Vpp/~MCLR~/GP3 4 650 -50 150 L 40 40 1 1 I
 X AN2/INT/T0CKI/GP2 5 650 50 150 L 40 40 1 1 B
-X AN1/VREF/GP1 6 650 150 150 L 40 40 1 1 B
+X AN1/Vref/GP1 6 650 150 150 L 40 40 1 1 B
 X AN0/GP0 7 650 250 150 L 40 40 1 1 B
 X VSS 8 -650 -250 150 R 40 40 1 1 W
 ENDDRAW
@@ -162,11 +162,11 @@ ALIAS PIC12C672-I/SN PIC12C672-I/JW
 DRAW
 S 500 -350 -500 350 0 1 10 f
 X VDD 1 -650 250 150 R 40 40 1 1 W
-X OSC1/CLKIN/GP5 2 650 -250 150 L 40 40 1 1 B
-X AN3/OSC2/CLKOUT/GP4 3 650 -150 150 L 40 40 1 1 B
-X ~MCLR~/Vpp/GP3 4 650 -50 150 L 40 40 1 1 I
+X CLKIN/OSC1/GP5 2 650 -250 150 L 40 40 1 1 B
+X AN3/CLKOUT/OSC2/GP4 3 650 -150 150 L 40 40 1 1 B
+X Vpp/~MCLR~/GP3 4 650 -50 150 L 40 40 1 1 I
 X AN2/INT/T0CKI/GP2 5 650 50 150 L 40 40 1 1 B
-X AN1/VREF/GP1 6 650 150 150 L 40 40 1 1 B
+X AN1/Vref/GP1 6 650 150 150 L 40 40 1 1 B
 X AN0/GP0 7 650 250 150 L 40 40 1 1 B
 X VSS 8 -650 -250 150 R 40 40 1 1 W
 ENDDRAW
@@ -181,11 +181,11 @@ ALIAS PIC12CE673-I/JW
 DRAW
 S 500 -350 -500 350 0 1 10 f
 X VDD 1 -650 250 150 R 40 40 1 1 W
-X OSC1/CLKIN/GP5 2 650 -250 150 L 40 40 1 1 B
-X AN3/OSC2/CLKOUT/GP4 3 650 -150 150 L 40 40 1 1 B
-X ~MCLR~/Vpp/GP3 4 650 -50 150 L 40 40 1 1 I
+X CLKIN/OSC1/GP5 2 650 -250 150 L 40 40 1 1 B
+X AN3/CLKOUT/OSC2/GP4 3 650 -150 150 L 40 40 1 1 B
+X Vpp/~MCLR~/GP3 4 650 -50 150 L 40 40 1 1 I
 X AN2/INT/T0CKI/GP2 5 650 50 150 L 40 40 1 1 B
-X AN1/VREF/GP1 6 650 150 150 L 40 40 1 1 B
+X AN1/Vref/GP1 6 650 150 150 L 40 40 1 1 B
 X AN0/GP0 7 650 250 150 L 40 40 1 1 B
 X VSS 8 -650 -250 150 R 40 40 1 1 W
 ENDDRAW
@@ -200,11 +200,11 @@ ALIAS PIC12CE674-I/JW
 DRAW
 S 500 -350 -500 350 0 1 10 f
 X VDD 1 -650 250 150 R 40 40 1 1 W
-X OSC1/CLKIN/GP5 2 650 -250 150 L 40 40 1 1 B
-X AN3/OSC2/CLKOUT/GP4 3 650 -150 150 L 40 40 1 1 B
-X ~MCLR~/Vpp/GP3 4 650 -50 150 L 40 40 1 1 I
+X CLKIN/OSC1/GP5 2 650 -250 150 L 40 40 1 1 B
+X AN3/CLKOUT/OSC2/GP4 3 650 -150 150 L 40 40 1 1 B
+X Vpp/~MCLR~/GP3 4 650 -50 150 L 40 40 1 1 I
 X AN2/INT/T0CKI/GP2 5 650 50 150 L 40 40 1 1 B
-X AN1/VREF/GP1 6 650 150 150 L 40 40 1 1 B
+X AN1/Vref/GP1 6 650 150 150 L 40 40 1 1 B
 X AN0/GP0 7 650 250 150 L 40 40 1 1 B
 X VSS 8 -650 -250 150 R 40 40 1 1 W
 ENDDRAW
@@ -219,12 +219,12 @@ ALIAS PIC12CE518-I/SN PIC12CE518-I/SM PIC12CE518-I/JW
 DRAW
 S 500 -350 -500 350 0 1 10 f
 X VDD 1 -650 250 150 R 40 40 1 1 W
-X GP5/OSC1/CLKIN 2 650 -250 150 L 40 40 1 1 B
-X GP4/OSC2 3 650 -150 150 L 40 40 1 1 B
-X GP3/~MCLR~/Vpp 4 650 -50 150 L 40 40 1 1 I
-X GP2/T0CKI 5 650 50 150 L 40 40 1 1 B
-X GP1/ICSPCLK 6 650 150 150 L 40 40 1 1 B
-X GP0/ICSPDAT 7 650 250 150 L 40 40 1 1 B
+X OSC1/CLKIN/GP5 2 650 -250 150 L 40 40 1 1 B
+X OSC2/GP4 3 650 -150 150 L 40 40 1 1 B
+X Vpp/~MCLR~/GP3 4 650 -50 150 L 40 40 1 1 I
+X T0CKI/GP2 5 650 50 150 L 40 40 1 1 B
+X ICSPCLK/GP1 6 650 150 150 L 40 40 1 1 B
+X ICSPDAT/GP0 7 650 250 150 L 40 40 1 1 B
 X VSS 8 -650 -250 150 R 40 40 1 1 W
 ENDDRAW
 ENDDEF
@@ -238,12 +238,12 @@ ALIAS PIC12CE519-I/SN PIC12CE519-I/SM PIC12CE519-I/JW
 DRAW
 S 500 -350 -500 350 0 1 10 f
 X VDD 1 -650 250 150 R 40 40 1 1 W
-X GP5/OSC1/CLKIN 2 650 -250 150 L 40 40 1 1 B
-X GP4/OSC2 3 650 -150 150 L 40 40 1 1 B
-X GP3/~MCLR~/Vpp 4 650 -50 150 L 40 40 1 1 I
-X GP2/T0CKI 5 650 50 150 L 40 40 1 1 B
-X GP1/ICSPCLK 6 650 150 150 L 40 40 1 1 B
-X GP0/ICSPDAT 7 650 250 150 L 40 40 1 1 B
+X CLKIN/OSC1/GP5 2 650 -250 150 L 40 40 1 1 B
+X OSC2/GP4 3 650 -150 150 L 40 40 1 1 B
+X Vpp/~MCLR~/GP3 4 650 -50 150 L 40 40 1 1 I
+X T0CKI/GP2 5 650 50 150 L 40 40 1 1 B
+X ICSPCLK/GP1 6 650 150 150 L 40 40 1 1 B
+X ICSPDAT/GP0 7 650 250 150 L 40 40 1 1 B
 X VSS 8 -650 -250 150 R 40 40 1 1 W
 ENDDRAW
 ENDDEF
@@ -257,12 +257,12 @@ ALIAS PIC12CR509A-I/SM PIC12CR509A-I/SN
 DRAW
 S 500 -350 -500 350 0 1 10 f
 X VDD 1 -650 250 150 R 40 40 1 1 W
-X GP5/OSC1/CLKIN 2 650 -250 150 L 40 40 1 1 B
-X GP4/OSC2 3 650 -150 150 L 40 40 1 1 B
-X GP3/~MCLR~/Vpp 4 650 -50 150 L 40 40 1 1 I
-X GP2/T0CKI 5 650 50 150 L 40 40 1 1 B
-X GP1/ICSPCLK 6 650 150 150 L 40 40 1 1 B
-X GP0/ICSPDAT 7 650 250 150 L 40 40 1 1 B
+X CLKIN/OSC1/GP5 2 650 -250 150 L 40 40 1 1 B
+X OSC2/GP4 3 650 -150 150 L 40 40 1 1 B
+X Vpp/~MCLR~/GP3 4 650 -50 150 L 40 40 1 1 I
+X T0CKI/GP2 5 650 50 150 L 40 40 1 1 B
+X ICSPCLK/GP1 6 650 150 150 L 40 40 1 1 B
+X ICSPDAT/GP0 7 650 250 150 L 40 40 1 1 B
 X VSS 8 -650 -250 150 R 40 40 1 1 W
 ENDDRAW
 ENDDEF
@@ -276,12 +276,12 @@ ALIAS PIC12F508-I/SN PIC12F508-I/MS PIC12F508-I/MC
 DRAW
 S 500 -350 -500 350 0 1 10 f
 X VDD 1 -650 250 150 R 40 40 1 1 W
-X GP5/OSC1/CLKIN 2 650 -250 150 L 40 40 1 1 B
-X GP4/OSC2 3 650 -150 150 L 40 40 1 1 B
-X GP3/~MCLR~/Vpp 4 650 -50 150 L 40 40 1 1 I
-X GP2/T0CKI 5 650 50 150 L 40 40 1 1 B
-X GP1/ICSPCLK 6 650 150 150 L 40 40 1 1 B
-X GP0/ICSPDAT 7 650 250 150 L 40 40 1 1 B
+X CLKIN/OSC1/GP5 2 650 -250 150 L 40 40 1 1 B
+X OSC2/GP4 3 650 -150 150 L 40 40 1 1 B
+X Vpp/~MCLR~/GP3 4 650 -50 150 L 40 40 1 1 I
+X T0CKI/GP2 5 650 50 150 L 40 40 1 1 B
+X ICSPCLK/GP1 6 650 150 150 L 40 40 1 1 B
+X ICSPDAT/GP0 7 650 250 150 L 40 40 1 1 B
 X VSS 8 -650 -250 150 R 40 40 1 1 W
 ENDDRAW
 ENDDEF
@@ -295,12 +295,12 @@ ALIAS PIC12F509-I/SN PIC12F509-I/MS PIC12F509-I/MC
 DRAW
 S 500 -350 -500 350 0 1 10 f
 X VDD 1 -650 250 150 R 40 40 1 1 W
-X GP5/OSC1/CLKIN 2 650 -250 150 L 40 40 1 1 B
-X GP4/OSC2 3 650 -150 150 L 40 40 1 1 B
-X GP3/~MCLR~/Vpp 4 650 -50 150 L 40 40 1 1 I
-X GP2/T0CKI 5 650 50 150 L 40 40 1 1 B
-X GP1/ICSPCLK 6 650 150 150 L 40 40 1 1 B
-X GP0/ICSPDAT 7 650 250 150 L 40 40 1 1 B
+X CLKIN/OSC1/GP5 2 650 -250 150 L 40 40 1 1 B
+X OSC2/GP4 3 650 -150 150 L 40 40 1 1 B
+X Vpp/~MCLR~/GP3 4 650 -50 150 L 40 40 1 1 I
+X T0CKI/GP2 5 650 50 150 L 40 40 1 1 B
+X ICSPCLK/GP1 6 650 150 150 L 40 40 1 1 B
+X ICSPDAT/GP0 7 650 250 150 L 40 40 1 1 B
 X VSS 8 -650 -250 150 R 40 40 1 1 W
 ENDDRAW
 ENDDEF
@@ -314,12 +314,12 @@ ALIAS PIC12F510-I/SN PIC12F510-I/MS PIC12F510-I/MC
 DRAW
 S 550 -350 -550 350 0 1 10 f
 X VDD 1 -700 250 150 R 40 40 1 1 W
-X GP5/OSC1/CLKIN 2 700 -250 150 L 40 40 1 1 B
-X GP4/OSC2 3 700 -150 150 L 40 40 1 1 B
-X GP3/~MCLR~/Vpp 4 700 -50 150 L 40 40 1 1 I
-X GP2/AN2/T0CKI/C1OUTI 5 700 50 150 L 40 40 1 1 B
-X GP1/AN1/C1IN-/ICSPCLK 6 700 150 150 L 40 40 1 1 B
-X GP0/AN0/C1IN+/ICSPDAT 7 700 250 150 L 40 40 1 1 B
+X CLKIN/OSC1/GP5 2 700 -250 150 L 40 40 1 1 B
+X OSC2/GP4 3 700 -150 150 L 40 40 1 1 B
+X Vpp/~MCLR~/GP3 4 700 -50 150 L 40 40 1 1 I
+X AN2/T0CKI/C1OUTI/GP2 5 700 50 150 L 40 40 1 1 B
+X AN1/C1IN-/ICSPCLK/GP1 6 700 150 150 L 40 40 1 1 B
+X AN0/C1IN+/ICSPDAT/GP0 7 700 250 150 L 40 40 1 1 B
 X VSS 8 -700 -250 150 R 40 40 1 1 W
 ENDDRAW
 ENDDEF
@@ -333,12 +333,12 @@ ALIAS PIC12F519-I/SN PIC12F519-I/MS PIC12F519-I/MC
 DRAW
 S 500 -350 -500 350 0 1 10 f
 X VDD 1 -650 250 150 R 40 40 1 1 W
-X GP5/OSC1/CLKIN 2 650 -250 150 L 40 40 1 1 B
-X GP4/OSC2 3 650 -150 150 L 40 40 1 1 B
-X GP3/~MCLR~/Vpp 4 650 -50 150 L 40 40 1 1 I
-X GP2/T0CKI 5 650 50 150 L 40 40 1 1 B
-X GP1/ICSPCLK 6 650 150 150 L 40 40 1 1 B
-X GP0/ICSPDAT 7 650 250 150 L 40 40 1 1 B
+X CLKIN/OSC1/GP5 2 650 -250 150 L 40 40 1 1 B
+X OSC2/GP4 3 650 -150 150 L 40 40 1 1 B
+X Vpp/~MCLR~/GP3 4 650 -50 150 L 40 40 1 1 I
+X T0CKI/GP2 5 650 50 150 L 40 40 1 1 B
+X ICSPCLK/GP1 6 650 150 150 L 40 40 1 1 B
+X ICSPDAT/GP0 7 650 250 150 L 40 40 1 1 B
 X VSS 8 -650 -250 150 R 40 40 1 1 W
 ENDDRAW
 ENDDEF
@@ -352,12 +352,12 @@ ALIAS PIC12F609-I/SN PIC12F609-I/MS PIC12F609-I/MC
 DRAW
 S 600 -350 -600 350 0 1 10 f
 X VDD 1 -750 250 150 R 40 40 1 1 W
-X GP5/T1CKI/OSC1/CLKIN 2 750 -250 150 L 40 40 1 1 B
-X GP4/CIN1-/~T1G~/OSC2/CLKOUT 3 750 -150 150 L 40 40 1 1 B
-X GP3/~MCLR~/Vpp 4 750 -50 150 L 40 40 1 1 I
-X GP2/T0CKI/INT/COUT 5 750 50 150 L 40 40 1 1 B
-X GP1/CIN0-/ICSPCLK 6 750 150 150 L 40 40 1 1 B
-X GP0/CIN+/ICSPDAT 7 750 250 150 L 40 40 1 1 B
+X T1CKI/CLKIN/OSC1/GP5 2 750 -250 150 L 40 40 1 1 B
+X CIN1-/~T1G~/CLKOUT/OSC2/GP4 3 750 -150 150 L 40 40 1 1 B
+X Vpp/~MCLR~/GP3 4 750 -50 150 L 40 40 1 1 I
+X T0CKI/INT/COUT/GP2 5 750 50 150 L 40 40 1 1 B
+X CIN0-/ICSPCLK/GP1 6 750 150 150 L 40 40 1 1 B
+X CIN+/ICSPDAT/GP0 7 750 250 150 L 40 40 1 1 B
 X VSS 8 -750 -250 150 R 40 40 1 1 W
 ENDDRAW
 ENDDEF
@@ -371,12 +371,12 @@ ALIAS PIC12F615-I/SN PIC12F615-I/MS PIC12F615-I/MC
 DRAW
 S 700 -350 -700 350 0 1 10 f
 X VDD 1 -850 250 150 R 40 40 1 1 W
-X GP5/T1CKI/P1A/OSC1/CLKIN 2 850 -250 150 L 40 40 1 1 B
-X GP4/AN3/CIN1-/~T1G~/P1B/OSC2/CLKOUT 3 850 -150 150 L 40 40 1 1 B
-X GP3/~T1G~/~MCLR~/Vpp 4 850 -50 150 L 40 40 1 1 I
-X GP2/AN2/T0CKI/INT/COUT/CCP1/P1A 5 850 50 150 L 40 40 1 1 B
-X GP1/AN1/CIN0-/VREF/ICSPCLK 6 850 150 150 L 40 40 1 1 B
-X GP0/AN0/CIN+/P1B/ICSPDAT 7 850 250 150 L 40 40 1 1 B
+X T1CKI/P1A/CLKIN/OSC1/GP5 2 850 -250 150 L 40 40 1 1 B
+X AN3/CIN1-/~T1G~/P1B/CLKOUT/OSC2/GP4 3 850 -150 150 L 40 40 1 1 B
+X Vpp/~MCLR~/~T1G~/GP3 4 850 -50 150 L 40 40 1 1 I
+X AN2/T0CKI/INT/COUT/CCP1/P1A/GP2 5 850 50 150 L 40 40 1 1 B
+X AN1/CIN0-/Vref/ICSPCLK/GP1 6 850 150 150 L 40 40 1 1 B
+X AN0/CIN+/P1B/ICSPDAT/GP0 7 850 250 150 L 40 40 1 1 B
 X VSS 8 -850 -250 150 R 40 40 1 1 W
 ENDDRAW
 ENDDEF
@@ -390,12 +390,12 @@ ALIAS PIC12F617-I/SN PIC12F617-I/MS PIC12F617-I/MC
 DRAW
 S 700 -350 -700 350 0 1 10 f
 X VDD 1 -850 250 150 R 40 40 1 1 W
-X GP5/T1CKI/P1A/OSC1/CLKIN 2 850 -250 150 L 40 40 1 1 B
-X GP4/AN3/CIN1-/~T1G~/P1B/OSC2/CLKOUT 3 850 -150 150 L 40 40 1 1 B
-X GP3/~T1G~/~MCLR~/Vpp 4 850 -50 150 L 40 40 1 1 I
-X GP2/AN2/T0CKI/INT/COUT/CCP1/P1A 5 850 50 150 L 40 40 1 1 B
-X GP1/AN1/CIN0-/VREF/ICSPCLK 6 850 150 150 L 40 40 1 1 B
-X GP0/AN0/CIN+/P1B/ICSPDAT 7 850 250 150 L 40 40 1 1 B
+X T1CKI/P1A/CLKIN/OSC1/GP5 2 850 -250 150 L 40 40 1 1 B
+X AN3/CIN1-/~T1G~/P1B/CLKOUT/OSC2/GP4 3 850 -150 150 L 40 40 1 1 B
+X Vpp/~MCLR~/~T1G~/GP3 4 850 -50 150 L 40 40 1 1 I
+X AN2/T0CKI/INT/COUT/CCP1/P1A/GP2 5 850 50 150 L 40 40 1 1 B
+X AN1/CIN0-/Vref/ICSPCLK/GP1 6 850 150 150 L 40 40 1 1 B
+X AN0/CIN+/P1B/ICSPDAT/GP0 7 850 250 150 L 40 40 1 1 B
 X VSS 8 -850 -250 150 R 40 40 1 1 W
 ENDDRAW
 ENDDEF
@@ -409,12 +409,12 @@ ALIAS PIC12F629-I/SN PIC12F629-I/MS PIC12F629-I/MC
 DRAW
 S 500 -350 -500 350 0 1 10 f
 X VDD 1 -650 250 150 R 40 40 1 1 W
-X GP5/T1CKI/OSC1/CLKIN 2 650 -250 150 L 40 40 1 1 B
-X GP4/~T1G~/OSC2/CLKOUT 3 650 -150 150 L 40 40 1 1 B
-X GP3/~MCLR~/Vpp 4 650 -50 150 L 40 40 1 1 I
-X GP2/T0CKI/INT/COUT 5 650 50 150 L 40 40 1 1 B
-X GP1/CIN-/ICSPCLK 6 650 150 150 L 40 40 1 1 B
-X GP0/CIN+/ICSPDAT 7 650 250 150 L 40 40 1 1 B
+X T1CKI/CLKIN/OSC1/GP5 2 650 -250 150 L 40 40 1 1 B
+X ~T1G~/CLKOUT/OSC2/GP4 3 650 -150 150 L 40 40 1 1 B
+X Vpp/~MCLR~/GP3 4 650 -50 150 L 40 40 1 1 I
+X T0CKI/INT/COUT/GP2 5 650 50 150 L 40 40 1 1 B
+X CIN-/ICSPCLK/GP1 6 650 150 150 L 40 40 1 1 B
+X CIN+/ICSPDAT/GP0 7 650 250 150 L 40 40 1 1 B
 X VSS 8 -650 -250 150 R 40 40 1 1 W
 ENDDRAW
 ENDDEF
@@ -428,12 +428,12 @@ ALIAS PIC12F635-I/SN PIC12F635-I/MS PIC12F635-I/MC
 DRAW
 S 600 -350 -600 350 0 1 10 f
 X VDD 1 -750 250 150 R 40 40 1 1 W
-X GP5/T1CKI/OSC1/CLKIN 2 750 -250 150 L 40 40 1 1 B
-X GP4/AN3/~T1G~/OSC2/CLKOUT 3 750 -150 150 L 40 40 1 1 B
-X GP3/~MCLR~/Vpp 4 750 -50 150 L 40 40 1 1 I
-X GP2/AN2/T0CKI/INT/COUT 5 750 50 150 L 40 40 1 1 B
-X GP1/AN1/CIN-/VREF/ICSPCLK 6 750 150 150 L 40 40 1 1 B
-X GP0/AN0/CIN+/ICSPDAT 7 750 250 150 L 40 40 1 1 B
+X T1CKI/CLKIN/OSC1/GP5 2 750 -250 150 L 40 40 1 1 B
+X AN3/~T1G~/CLKOUT/OSC2/GP4 3 750 -150 150 L 40 40 1 1 B
+X Vpp/~MCLR~/GP3 4 750 -50 150 L 40 40 1 1 I
+X AN2/T0CKI/INT/COUT/GP2 5 750 50 150 L 40 40 1 1 B
+X AN1/CIN-/Vref/ICSPCLK/GP1 6 750 150 150 L 40 40 1 1 B
+X AN0/CIN+/ICSPDAT/GP0 7 750 250 150 L 40 40 1 1 B
 X VSS 8 -750 -250 150 R 40 40 1 1 W
 ENDDRAW
 ENDDEF
@@ -447,12 +447,12 @@ ALIAS PIC12F675-I/SN PIC12F675-I/MS PIC12F675-I/MC
 DRAW
 S 600 -350 -600 350 0 1 10 f
 X VDD 1 -750 250 150 R 40 40 1 1 W
-X GP5/T1CKI/OSC1/CLKIN 2 750 -250 150 L 40 40 1 1 B
-X GP4/AN3/~T1G~/OSC2/CLKOUT 3 750 -150 150 L 40 40 1 1 B
-X GP3/~MCLR~/Vpp 4 750 -50 150 L 40 40 1 1 I
-X GP2/AN2/T0CKI/INT/COUT 5 750 50 150 L 40 40 1 1 B
-X GP1/AN1/CIN-/VREF/ICSPCLK 6 750 150 150 L 40 40 1 1 B
-X GP0/AN0/CIN+/ICSPDAT 7 750 250 150 L 40 40 1 1 B
+X T1CKI/CLKIN/OSC1/GP5 2 750 -250 150 L 40 40 1 1 B
+X AN3/~T1G~/CLKOUT/OSC2/GP4 3 750 -150 150 L 40 40 1 1 B
+X Vpp/~MCLR~/GP3 4 750 -50 150 L 40 40 1 1 I
+X AN2/T0CKI/INT/COUT/GP2 5 750 50 150 L 40 40 1 1 B
+X AN1/CIN-/Vref/ICSPCLK/GP1 6 750 150 150 L 40 40 1 1 B
+X AN0/CIN+/ICSPDAT/GP0 7 750 250 150 L 40 40 1 1 B
 X VSS 8 -750 -250 150 R 40 40 1 1 W
 ENDDRAW
 ENDDEF
@@ -466,12 +466,12 @@ ALIAS PIC12F683-I/SN PIC12F683-I/MS PIC12F683-I/MC
 DRAW
 S 650 -350 -650 350 0 1 10 f
 X VDD 1 -800 250 150 R 40 40 1 1 W
-X GP5/T1CKI/OSC1/CLKIN 2 800 -250 150 L 40 40 1 1 B
-X GP4/AN3/~T1G~/OSC2/CLKOUT 3 800 -150 150 L 40 40 1 1 B
-X GP3/~MCLR~/Vpp 4 800 -50 150 L 40 40 1 1 I
-X GP2/AN2/T0CKI/INT/COUT/CCCP1 5 800 50 150 L 40 40 1 1 B
-X GP1/AN1/CIN-/VREF/ICSPCLK 6 800 150 150 L 40 40 1 1 B
-X GP0/AN0/CIN+/ICSPDAT/ULPWU 7 800 250 150 L 40 40 1 1 B
+X T1CKI/CLKIN/OSC1/GP5 2 800 -250 150 L 40 40 1 1 B
+X AN3/~T1G~/CLKOUT/OSC2/GP4 3 800 -150 150 L 40 40 1 1 B
+X Vpp/~MCLR~/GP3 4 800 -50 150 L 40 40 1 1 I
+X AN2/T0CKI/INT/COUT/CCCP1/GP2 5 800 50 150 L 40 40 1 1 B
+X AN1/CIN-/Vref/ICSPCLK/GP1 6 800 150 150 L 40 40 1 1 B
+X AN0/CIN+/ICSPDAT/ULPWU/GP0 7 800 250 150 L 40 40 1 1 B
 X VSS 8 -800 -250 150 R 40 40 1 1 W
 ENDDRAW
 ENDDEF
@@ -485,12 +485,12 @@ ALIAS PIC12F752-I/SN PIC12F752-I/MC
 DRAW
 S 500 -350 -500 350 0 1 10 f
 X VDD 1 -650 250 150 R 40 40 1 1 W
-X GP5/OSC1/CLKIN 2 650 -250 150 L 40 40 1 1 B
-X GP4/OSC2 3 650 -150 150 L 40 40 1 1 B
-X GP3/~MCLR~/Vpp 4 650 -50 150 L 40 40 1 1 I
-X GP2/T0CKI 5 650 50 150 L 40 40 1 1 B
-X GP1/ICSPCLK 6 650 150 150 L 40 40 1 1 B
-X GP0/ICSPDAT 7 650 250 150 L 40 40 1 1 B
+X CLKIN/OSC1/GP5 2 650 -250 150 L 40 40 1 1 B
+X OSC2/GP4 3 650 -150 150 L 40 40 1 1 B
+X Vpp/~MCLR~/GP3 4 650 -50 150 L 40 40 1 1 I
+X T0CKI/GP2 5 650 50 150 L 40 40 1 1 B
+X ICSPCLK/GP1 6 650 150 150 L 40 40 1 1 B
+X ICSPDAT/GP0 7 650 250 150 L 40 40 1 1 B
 X VSS 8 -650 -250 150 R 40 40 1 1 W
 ENDDRAW
 ENDDEF
@@ -504,12 +504,12 @@ ALIAS PIC12HV609-I/SN PIC12HV609-I/MS PIC12HV609-I/MC
 DRAW
 S 600 -350 -600 350 0 1 10 f
 X VDD 1 -750 250 150 R 40 40 1 1 W
-X GP5/T1CKI/OSC1/CLKIN 2 750 -250 150 L 40 40 1 1 B
-X GP4/CIN1-/~T1G~/OSC2/CLKOUT 3 750 -150 150 L 40 40 1 1 B
-X GP3/~MCLR~/Vpp 4 750 -50 150 L 40 40 1 1 I
-X GP2/T0CKI/INT/COUT 5 750 50 150 L 40 40 1 1 B
-X GP1/CIN0-/ICSPCLK 6 750 150 150 L 40 40 1 1 B
-X GP0/CIN+/ICSPDAT 7 750 250 150 L 40 40 1 1 B
+X T1CKI/CLKIN/OSC1/GP5 2 750 -250 150 L 40 40 1 1 B
+X CIN1-/~T1G~/CLKOUT/OSC2/GP4 3 750 -150 150 L 40 40 1 1 B
+X Vpp/~MCLR~/GP3 4 750 -50 150 L 40 40 1 1 I
+X T0CKI/INT/COUT/GP2 5 750 50 150 L 40 40 1 1 B
+X CIN0-/ICSPCLK/GP1 6 750 150 150 L 40 40 1 1 B
+X CIN+/ICSPDAT/GP0 7 750 250 150 L 40 40 1 1 B
 X VSS 8 -750 -250 150 R 40 40 1 1 W
 ENDDRAW
 ENDDEF
@@ -523,12 +523,12 @@ ALIAS PIC12HV615-I/SN PIC12HV615-I/MS PIC12HV615-I/MC
 DRAW
 S 700 -350 -700 350 0 1 10 f
 X VDD 1 -850 250 150 R 40 40 1 1 W
-X GP5/T1CKI/P1A/OSC1/CLKIN 2 850 -250 150 L 40 40 1 1 B
-X GP4/AN3/CIN1-/~T1G~/P1B/OSC2/CLKOUT 3 850 -150 150 L 40 40 1 1 B
-X GP3/~T1G~/~MCLR~/Vpp 4 850 -50 150 L 40 40 1 1 I
-X GP2/AN2/T0CKI/INT/COUT/CCP1/P1A 5 850 50 150 L 40 40 1 1 B
-X GP1/AN1/CIN0-/VREF/ICSPCLK 6 850 150 150 L 40 40 1 1 B
-X GP0/AN0/CIN+/P1B/ICSPDAT 7 850 250 150 L 40 40 1 1 B
+X T1CKI/P1A/CLKIN/OSC1/GP5 2 850 -250 150 L 40 40 1 1 B
+X AN3/CIN1-/~T1G~/P1B/CLKOUT/OSC2/GP4 3 850 -150 150 L 40 40 1 1 B
+X Vpp/~MCLR~/~T1G~/GP3 4 850 -50 150 L 40 40 1 1 I
+X AN2/T0CKI/INT/COUT/CCP1/P1A/GP2 5 850 50 150 L 40 40 1 1 B
+X AN1/CIN0-/Vref/ICSPCLK/GP1 6 850 150 150 L 40 40 1 1 B
+X AN0/CIN+/P1B/ICSPDAT/GP0 7 850 250 150 L 40 40 1 1 B
 X VSS 8 -850 -250 150 R 40 40 1 1 W
 ENDDRAW
 ENDDEF
@@ -542,12 +542,12 @@ ALIAS PIC12HV752-I/SN PIC12HV752-I/MC
 DRAW
 S 500 -350 -500 350 0 1 10 f
 X VDD 1 -650 250 150 R 40 40 1 1 W
-X GP5/OSC1/CLKIN 2 650 -250 150 L 40 40 1 1 B
-X GP4/OSC2 3 650 -150 150 L 40 40 1 1 B
-X GP3/~MCLR~/Vpp 4 650 -50 150 L 40 40 1 1 I
-X GP2/T0CKI 5 650 50 150 L 40 40 1 1 B
-X GP1/ICSPCLK 6 650 150 150 L 40 40 1 1 B
-X GP0/ICSPDAT 7 650 250 150 L 40 40 1 1 B
+X CLKIN/OSC1/GP5 2 650 -250 150 L 40 40 1 1 B
+X OSC2/GP4 3 650 -150 150 L 40 40 1 1 B
+X Vpp/~MCLR~/GP3 4 650 -50 150 L 40 40 1 1 I
+X T0CKI/GP2 5 650 50 150 L 40 40 1 1 B
+X ICSPCLK/GP1 6 650 150 150 L 40 40 1 1 B
+X ICSPDAT/GP0 7 650 250 150 L 40 40 1 1 B
 X VSS 8 -650 -250 150 R 40 40 1 1 W
 ENDDRAW
 ENDDEF
@@ -560,9 +560,9 @@ F1 "PIC12LF1840T48-I/ST" 1050 -550 50 H V C CNN
 DRAW
 S 1500 -500 -1500 500 0 1 10 f
 X VDD 1 0 650 150 D 40 40 1 1 W
-X RX/DT/CCP1/P1A/SRNQ/T1CKI/T1OSI/OSC1/CLKIN/RA5 2 1650 -250 150 L 40 40 1 1 B
-X MDCIN2/T1G/P1B/TX/CK/SDO/CLKR/C1IN1-/T1OSO/CLKOUT/OSC2/CPS3/AN3/RA4 3 1650 -150 150 L 40 40 1 1 B
-X ~MCLR~/VPP/T1G/~SS~/RA3 4 1650 -50 150 L 40 40 1 1 I
+X RX/DT/CCP1/P1A/SRNQ/T1CKI/T1OSI/CLKIN/OSC1/RA5 2 1650 -250 150 L 40 40 1 1 B
+X MDCIN2/T1G/P1B/TX/CK/SDO/CLKR/C1IN1-/T1OSO/CPS3/AN3/CLKOUT/OSC2/RA4 3 1650 -150 150 L 40 40 1 1 B
+X Vpp/~MCLR~/T1G/~SS~/RA3 4 1650 -50 150 L 40 40 1 1 I
 X VDDRF 5 -1650 350 150 R 40 40 1 1 W
 X CTRL 6 -1650 200 150 R 40 40 1 1 I
 X RFOUT 7 -1650 -150 150 R 40 40 1 1 I
@@ -570,7 +570,7 @@ X VSSRF 8 -1650 -300 150 R 40 40 1 1 W
 X DATA 9 -1650 100 150 R 40 40 1 1 I
 X XTAL 10 -1650 0 150 R 40 40 1 1 I
 X AN2/CPS2/C1OUT/SRQ/T0CKI/CCP1/P1A/FLT0/SDA/SDI/INT/MDCIN1/RA2 11 1650 50 150 L 40 40 1 1 B
-X AN1/CPS1/VREF/C1IN0-/SRI/RX/DT/SCL/SCK/MDMIN/ICSPCLK/RA1 12 1650 150 150 L 40 40 1 1 B
+X AN1/CPS1/Vref/C1IN0-/SRI/RX/DT/SCL/SCK/MDMIN/ICSPCLK/RA1 12 1650 150 150 L 40 40 1 1 B
 X AN0/CPS0/C1IN+/DACOUT/TX/CK/SDO/~SS~/P1B/MDOUT/ICSPDAT/RA0 13 1650 250 150 L 40 40 1 1 B
 X VSS 14 0 -650 150 U 40 40 1 1 W
 ENDDRAW