diff --git a/library/adc-dac.dcm b/library/adc-dac.dcm
index f02670f0..9986f78f 100644
--- a/library/adc-dac.dcm
+++ b/library/adc-dac.dcm
@@ -44,13 +44,13 @@ $ENDCMP
 #
 $CMP AD5687BCPZ
 D Dual, 12-Bit nanoDAC+ with SPI Interface, LFCSP-16
-K dac 2nch 12bit spi 
+K dac 2nch 12bit spi
 F http://www.analog.com/media/en/technical-documentation/data-sheets/AD5689_5687.pdf
 $ENDCMP
 #
 $CMP AD5687BRUZ
 D Dual, 12-Bit nanoDAC+ with SPI Interface, TSSOP-16
-K dac 2nch 12bit spi 
+K dac 2nch 12bit spi
 F http://www.analog.com/media/en/technical-documentation/data-sheets/AD5689_5687.pdf
 $ENDCMP
 #
@@ -462,7 +462,7 @@ K Single-supply, 12bit, 4 ch, touch screen driver, 2.2 - 5.25 VDD, -40 to +85 C,
 F http://www.ti.com/lit/ds/symlink/ads7843.pdf
 $ENDCMP
 #
-$CMP ADS7843E/2K5
+$CMP ADS7843E-2K5
 D Single-supply, 12bit, 4 ch, touch screen driver, 2.2 - 5.25 VDD, -40 to +85 C, QSPI, SPI, 3-wire serial interface, SSOP-16
 K Single-supply, 12bit, 4 ch, touch screen driver, 2.2 - 5.25 VDD, -40 to +85 C, QSPI, SPI, 3-wire serial interface, SSOP-16
 F http://www.ti.com/lit/ds/symlink/ads7843.pdf
@@ -773,7 +773,7 @@ K 13-Bit Differential ADC SPI  1ch
 F http://ww1.microchip.com/downloads/en/DeviceDoc/21700D.pdf
 $ENDCMP
 #
-$CMP MCP3421A0T-E/CH
+$CMP MCP3421A0T-ECH
 D Single Delta-Sigma 18bit Analog to Digital Converter, I2C Interface, SOT-23-6
 K Sigma-Delta ADC Converter 18bit I2C 1ch
 F http://ww1.microchip.com/downloads/en/DeviceDoc/22003e.pdf
@@ -797,25 +797,25 @@ K 18-Bit ADC I2C IIC I²C Delta-Sigma-ADC Delta-Sigma-ADC Reference 4ch
 F http://ww1.microchip.com/downloads/en/DeviceDoc/22088c.pdf
 $ENDCMP
 #
-$CMP MCP3425A0T-E/CH
+$CMP MCP3425A0T-ECH
 D Single Delta-Sigma 16bit Analog to Digital Converter, I2C Interface, SOT-23-6
 K Sigma-Delta ADC Converter 16bit I2C  1ch
 F http://ww1.microchip.com/downloads/en/DeviceDoc/22072b.pdf
 $ENDCMP
 #
-$CMP MCP3425A1T-E/CH
+$CMP MCP3425A1T-ECH
 D Single Delta-Sigma 16bit Analog to Digital Converter, I2C Interface, SOT-23-6
 K Sigma-Delta ADC Converter 16bit I2C 1ch
 F http://ww1.microchip.com/downloads/en/DeviceDoc/22072b.pdf
 $ENDCMP
 #
-$CMP MCP3425A2T-E/CH
+$CMP MCP3425A2T-ECH
 D Single Delta-Sigma 16bit Analog to Digital Converter, I2C Interface, SOT-23-6
 K Sigma-Delta ADC Converter 16bit I2C 1ch
 F http://ww1.microchip.com/downloads/en/DeviceDoc/22072b.pdf
 $ENDCMP
 #
-$CMP MCP3425A3T-E/CH
+$CMP MCP3425A3T-ECH
 D Single Delta-Sigma 16bit Analog to Digital Converter, I2C Interface, SOT-23-6
 K Sigma-Delta ADC Converter 16bit I2C 1ch
 F http://ww1.microchip.com/downloads/en/DeviceDoc/22072b.pdf
@@ -857,25 +857,25 @@ K adc 4ch 16bit i2c
 F http://ww1.microchip.com/downloads/en/DeviceDoc/22226a.pdf
 $ENDCMP
 #
-$CMP MCP3550-50-E/MS
+$CMP MCP3550-50-EMS
 D Single Delta-Sigma 22bit Analog to Digital Converter, SPI Interface, 50Hz Rejection, MSOP-8
 K Sigma-Delta ADC Converter 22bit SPI 1ch
 F http://ww1.microchip.com/downloads/en/devicedoc/21950c.pdf
 $ENDCMP
 #
-$CMP MCP3550-60-E/SN
+$CMP MCP3550-60-ESN
 D Single Delta-Sigma 22bit Analog to Digital Converter, SPI Interface, 60Hz Rejection, MSOP-8
 K Sigma-Delta ADC Converter 22bit SPI 1ch
 F http://ww1.microchip.com/downloads/en/devicedoc/21950c.pdf
 $ENDCMP
 #
-$CMP MCP3551-E/MS
+$CMP MCP3551-EMS
 D Single Delta-Sigma 22bit Analog to Digital Converter, SPI Interface, MSOP-8
 K Sigma-Delta ADC Converter 22bit SPI 1ch
 F http://ww1.microchip.com/downloads/en/devicedoc/21950c.pdf
 $ENDCMP
 #
-$CMP MCP3553-E/SN
+$CMP MCP3553-ESN
 D Single Delta-Sigma 22bit Analog to Digital Converter, SPI Interface, MSOP-8
 K Sigma-Delta ADC Converter 22bit SPI 1ch
 F http://ww1.microchip.com/downloads/en/devicedoc/21950c.pdf
@@ -893,7 +893,7 @@ K 8-Bit DAC SPI Reference 1ch
 F http://ww1.microchip.com/downloads/en/DeviceDoc/22244B.pdf
 $ENDCMP
 #
-$CMP MCP4801-E/MC
+$CMP MCP4801-EMC
 D 8-Bit D/A Converters with SPI Interface, internal Reference (2.048V)
 K 8-Bit DAC SPI Reference 1ch
 F http://ww1.microchip.com/downloads/en/DeviceDoc/22244B.pdf
@@ -911,7 +911,7 @@ K 10-Bit DAC SPI Reference 1ch
 F http://ww1.microchip.com/downloads/en/DeviceDoc/22244B.pdf
 $ENDCMP
 #
-$CMP MCP4811-E/MC
+$CMP MCP4811-EMC
 D 10-Bit D/A Converters with SPI Interface, internal Reference (2.048V)
 K 10-Bit DAC SPI Reference 1ch
 F http://ww1.microchip.com/downloads/en/DeviceDoc/22244B.pdf
@@ -929,7 +929,7 @@ K 12-Bit DAC SPI Reference 1ch
 F http://ww1.microchip.com/downloads/en/DeviceDoc/22244B.pdf
 $ENDCMP
 #
-$CMP MCP4821-E/MC
+$CMP MCP4821-EMC
 D 12-Bit D/A Converters with SPI Interface, internal Reference (2.048V)
 K 12-Bit DAC SPI Reference 1ch
 F http://ww1.microchip.com/downloads/en/DeviceDoc/22244B.pdf
@@ -947,7 +947,7 @@ K 8-Bit DAC SPI  1ch
 F http://ww1.microchip.com/downloads/en/DeviceDoc/22248a.pdf
 $ENDCMP
 #
-$CMP MCP4901-E/MC
+$CMP MCP4901-EMC
 D 8-Bit D/A Converters with SPI Interface
 K 8-Bit DAC SPI  1ch
 F http://ww1.microchip.com/downloads/en/DeviceDoc/22248a.pdf
@@ -965,7 +965,7 @@ K 10-Bit DAC SPI 1ch
 F http://ww1.microchip.com/downloads/en/DeviceDoc/22248a.pdf
 $ENDCMP
 #
-$CMP MCP4911-E/MC
+$CMP MCP4911-EMC
 D 10-Bit D/A Converters with SPI Interface
 K 10-Bit DAC SPI  1ch
 F http://ww1.microchip.com/downloads/en/DeviceDoc/22248a.pdf
@@ -983,25 +983,25 @@ K 12-Bit DAC SPI 1ch
 F http://ww1.microchip.com/downloads/en/DeviceDoc/22248a.pdf
 $ENDCMP
 #
-$CMP MCP4921-E/MC
+$CMP MCP4921-EMC
 D 12-Bit D/A Converters with SPI Interface
 K 12-Bit DAC SPI  1ch
 F http://ww1.microchip.com/downloads/en/DeviceDoc/22248a.pdf
 $ENDCMP
 #
-$CMP MCP4921-E/MS
+$CMP MCP4921-EMS
 D Single 12-bit Digital to Analog Converter, SPI Interface, MSOP-8
 K Single DAC 1ch 12bit SPI
 F http://ww1.microchip.com/downloads/en/devicedoc/21897a.pdf
 $ENDCMP
 #
-$CMP MCP4921-E/P
+$CMP MCP4921-EP
 D Single 12-bit Digital to Analog Converter, SPI Interface, PDIP-8
 K Single DAC 1ch 12bit SPI
 F http://ww1.microchip.com/downloads/en/devicedoc/21897a.pdf
 $ENDCMP
 #
-$CMP MCP4921-E/SN
+$CMP MCP4921-ESN
 D Single 12-bit Digital to Analog Converter, SPI Interface, SOIC-8
 K Single DAC 1ch 12bit SPI
 F http://ww1.microchip.com/downloads/en/devicedoc/21897a.pdf
@@ -1013,19 +1013,19 @@ K 12-Bit DAC SPI 2CH
 F http://ww1.microchip.com/downloads/en/DeviceDoc/22250A.pdf
 $ENDCMP
 #
-$CMP MCP4922-E/P
+$CMP MCP4922-EP
 D Dual 12-bit Digital to Analog Converter, SPI Interface, PDIP-14
 K Dual DAC 1ch 12bit SPI
 F http://ww1.microchip.com/downloads/en/devicedoc/21897a.pdf
 $ENDCMP
 #
-$CMP MCP4922-E/SL
+$CMP MCP4922-ESL
 D Dual 12-bit Digital to Analog Converter, SPI Interface, SOIC-14
 K Dual DAC 1ch 12bit SPI
 F http://ww1.microchip.com/downloads/en/devicedoc/21897a.pdf
 $ENDCMP
 #
-$CMP MCP4922-E/ST
+$CMP MCP4922-EST
 D Dual 12-bit Digital to Analog Converter, SPI Interface, TSSOP-14
 K Dual DAC 1ch 12bit SPI
 F http://ww1.microchip.com/downloads/en/devicedoc/21897a.pdf
diff --git a/library/adc-dac.lib b/library/adc-dac.lib
index 8b1f6fdd..03e95281 100644
--- a/library/adc-dac.lib
+++ b/library/adc-dac.lib
@@ -1817,7 +1817,7 @@ F0 "U" -400 440 50 H V L CNN
 F1 "ADS7843E" 140 450 50 H V L CNN
 F2 "Housings_SSOP:SSOP-16_3.9x4.9mm_Pitch0.635mm" 0 -600 50 H I C CIN
 F3 "" 200 -550 50 H I C CNN
-ALIAS ADS7843EG4 ADS7843E/2K5 ADS7843IDBQRQ1
+ALIAS ADS7843EG4 ADS7843E-2K5 ADS7843IDBQRQ1
 $FPLIST
  *SSOP*3.9x4.9mm*Pitch0.635mm*
 $ENDFPLIST
@@ -2905,14 +2905,14 @@ X CH4- 14 -600 -800 100 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# MCP3425A0T-E/CH
+# MCP3425A0T-ECH
 #
-DEF MCP3425A0T-E/CH U 0 40 Y Y 1 F N
+DEF MCP3425A0T-ECH U 0 40 Y Y 1 F N
 F0 "U" -400 300 50 H V L CNN
-F1 "MCP3425A0T-E/CH" 100 300 50 H V L CNN
+F1 "MCP3425A0T-ECH" 100 300 50 H V L CNN
 F2 "" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS MCP3425A1T-E/CH MCP3425A2T-E/CH MCP3425A3T-E/CH MCP3421A0T-E/CH
+ALIAS MCP3425A1T-ECH MCP3425A2T-ECH MCP3425A3T-ECH MCP3421A0T-ECH
 $FPLIST
  SOT?23*
  SOT?23*
@@ -3058,14 +3058,14 @@ X CH4- 14 -400 -400 100 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# MCP3550-50-E/MS
+# MCP3550-50-EMS
 #
-DEF MCP3550-50-E/MS U 0 40 Y Y 1 F N
+DEF MCP3550-50-EMS U 0 40 Y Y 1 F N
 F0 "U" -450 300 50 H V L CNN
-F1 "MCP3550-50-E/MS" 200 300 50 H V L CNN
+F1 "MCP3550-50-EMS" 200 300 50 H V L CNN
 F2 "" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS MCP3551-E/MS
+ALIAS MCP3551-EMS
 $FPLIST
  MSOP*
 $ENDFPLIST
@@ -3082,14 +3082,14 @@ X Vdd 8 100 400 150 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# MCP3550-60-E/SN
+# MCP3550-60-ESN
 #
-DEF MCP3550-60-E/SN U 0 40 Y Y 1 F N
+DEF MCP3550-60-ESN U 0 40 Y Y 1 F N
 F0 "U" -200 300 50 H V L CNN
-F1 "MCP3550-60-E/SN" 200 300 50 H V L CNN
+F1 "MCP3550-60-ESN" 200 300 50 H V L CNN
 F2 "" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS MCP3553-E/SN
+ALIAS MCP3553-ESN
 $FPLIST
  SO*
 $ENDFPLIST
@@ -3157,14 +3157,14 @@ X Vout 8 600 0 100 L 50 50 1 1 O
 ENDDRAW
 ENDDEF
 #
-# MCP4801-E/MC
+# MCP4801-EMC
 #
-DEF MCP4801-E/MC U 0 40 Y Y 1 F N
+DEF MCP4801-EMC U 0 40 Y Y 1 F N
 F0 "U" 50 425 50 H V L CNN
-F1 "MCP4801-E/MC" 50 350 50 H V L CNN
+F1 "MCP4801-EMC" 50 350 50 H V L CNN
 F2 "Housings_DFN_QFN:DFN-8-1EP_3x2mm_Pitch0.5mm" 0 -470 50 H I C CNN
 F3 "" 900 -100 50 H I C CNN
-ALIAS MCP4811-E/MC MCP4821-E/MC
+ALIAS MCP4811-EMC MCP4821-EMC
 $FPLIST
  DFN*1EP*3x2mm*Pitch0.5mm*
 $ENDFPLIST
@@ -3251,14 +3251,14 @@ X Vout 8 700 0 100 L 50 50 1 1 O
 ENDDRAW
 ENDDEF
 #
-# MCP4901-E/MC
+# MCP4901-EMC
 #
-DEF MCP4901-E/MC U 0 40 Y Y 1 F N
+DEF MCP4901-EMC U 0 40 Y Y 1 F N
 F0 "U" 250 425 50 H V L CNN
-F1 "MCP4901-E/MC" 250 350 50 H V L CNN
+F1 "MCP4901-EMC" 250 350 50 H V L CNN
 F2 "Housings_DFN_QFN:DFN-8-1EP_3x2mm_Pitch0.5mm" 0 -480 50 H I C CNN
 F3 "" 1000 -100 50 H I C CNN
-ALIAS MCP4911-E/MC MCP4921-E/MC
+ALIAS MCP4911-EMC MCP4921-EMC
 $FPLIST
  DFN*1EP*3x2mm*Pitch0.5mm*
 $ENDFPLIST
@@ -3326,14 +3326,14 @@ X VA 14 500 100 100 L 50 50 1 1 O
 ENDDRAW
 ENDDEF
 #
-# MCP4921-E/MS
+# MCP4921-EMS
 #
-DEF MCP4921-E/MS U 0 40 Y Y 1 F N
+DEF MCP4921-EMS U 0 40 Y Y 1 F N
 F0 "U" -450 300 50 H V L CNN
-F1 "MCP4921-E/MS" 0 300 50 H V L CNN
+F1 "MCP4921-EMS" 0 300 50 H V L CNN
 F2 "" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS MCP4921-E/SN MCP4921-E/P
+ALIAS MCP4921-ESN MCP4921-EP
 $FPLIST
  MSOP*
  SOIC*
@@ -3353,14 +3353,14 @@ X VoutA 8 600 0 150 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# MCP4922-E/P
+# MCP4922-EP
 #
-DEF MCP4922-E/P U 0 40 Y Y 1 F N
+DEF MCP4922-EP U 0 40 Y Y 1 F N
 F0 "U" -400 400 50 H V L CNN
-F1 "MCP4922-E/P" 150 400 50 H V L CNN
+F1 "MCP4922-EP" 150 400 50 H V L CNN
 F2 "" 0 0 50 H I C CIN
 F3 "" 0 0 50 H I C CNN
-ALIAS MCP4922-E/SL MCP4922-E/ST
+ALIAS MCP4922-ESL MCP4922-EST
 $FPLIST
  DIP*
  PDIP*