diff --git a/library/device.dcm b/library/device.dcm
index aa085f9e..f794c7b7 100644
--- a/library/device.dcm
+++ b/library/device.dcm
@@ -147,7 +147,7 @@ D Diode
 K diode
 $ENDCMP
 #
-$CMP DELAY_LINE
+$CMP Delay_Line
 D Delay line
 K delay propogation retard impedance
 $ENDCMP
@@ -425,7 +425,7 @@ $ENDCMP
 #
 $CMP Electromagnetic_Actor
 D electro-magnetic actor
-K electromagnet coil
+K electromagnet coil inductor
 $ENDCMP
 #
 $CMP Ferrite_Bead
@@ -488,32 +488,22 @@ D Heatsink with electrical connection
 K thermal heat temperature
 $ENDCMP
 #
-$CMP INDUCTOR
-D Inductor
-K inductor choke coil reactor magnetic
-$ENDCMP
-#
-$CMP INDUCTOR_Small
-D Inductor, small symbol
-K inductor choke coil reactor magnetic
-$ENDCMP
-#
-$CMP JUMPER
+$CMP Jumper
 D Jumper, generic, normally closed
 K jumper bridge link nc
 $ENDCMP
 #
-$CMP JUMPER_NC_Dual
+$CMP Jumper_NC_Dual
 D Dual Jumper, normally closed
 K jumper bridge link nc
 $ENDCMP
 #
-$CMP JUMPER_NC_Small
+$CMP Jumper_NC_Small
 D Jumper, normally closed
 K jumper link bridge
 $ENDCMP
 #
-$CMP JUMPER_NO_Small
+$CMP Jumper_NO_Small
 D Jumper, normally open
 K jumper link bridge
 $ENDCMP
@@ -523,31 +513,31 @@ D Inductor
 K inductor choke coil reactor magnetic
 $ENDCMP
 #
-$CMP LASERDIODE_1A3C
+$CMP Laserdiode_1A3C
 D Laser Diode in a 2-pin package
 K opto laserdiode
 F ~
 $ENDCMP
 #
-$CMP LASERDIODE_1C2A
+$CMP Laserdiode_1C2A
 D Laser Diode in a 2-pin package
 K opto laserdiode
 F ~
 $ENDCMP
 #
-$CMP LASERDIODE_M_TYPE
+$CMP Laserdiode_M_TYPE
 D Laser Diode in a 3-pin package with photodiode (1=LD-A, 2=LD-C/PD-C, 3=PD-A)
 K opto laserdiode photodiode
 F http://www.egismos.disonhu.com/laser/diode-package.htm
 $ENDCMP
 #
-$CMP LASERDIODE_N_TYPE
+$CMP Laserdiode_N_TYPE
 D Laser Diode in a 3-pin package with photodiode (1=LD-C, 2=LD-A/PD-C, 3=PD-A)
 K opto laserdiode photodiode
 F http://www.egismos.disonhu.com/laser/diode-package.htm
 $ENDCMP
 #
-$CMP LASERDIODE_P_TYPE
+$CMP Laserdiode_P_TYPE
 D Laser Diode in a 3-pin package with photodiode (1=LD-A, 2=LD-C/PD-A, 3=PD-C)
 K opto laserdiode photodiode
 F http://www.egismos.disonhu.com/laser/diode-package.htm
@@ -1160,11 +1150,6 @@ D variable Resistor
 K r res resistor variable potentiometer
 $ENDCMP
 #
-$CMP RVAR
-D Variable resistor
-K resistor var potentiometer
-$ENDCMP
-#
 $CMP R_NET10
 D 10 Resistor network, star topology, bussed resistors, small symbol
 K R Network star-topology
@@ -1803,51 +1788,51 @@ D Testpoint, connection for test equipment
 K tp testpoint
 $ENDCMP
 #
-$CMP THERMISTOR
-D Thermistor, temperature-dependent resistor
-K r res thermistor
-$ENDCMP
-#
 $CMP THYRISTOR
 D Solid-state thyristor, silicon-controlled rectifier, with gate pin
 K scr diode switch
 $ENDCMP
 #
-$CMP TRANSFORMER_1P_1S
+$CMP Transformer_1P_1S
 D Transformer, single primary, single secondary
 K transformer coil magnet
 $ENDCMP
 #
-$CMP TRANSFORMER_1P_1S_SO8
+$CMP Transformer_1P_1S_SO8
 D Transformer, single primary, single secondary, SO-8 package
 K transformer coil magnet
 $ENDCMP
 #
-$CMP TRANSFORMER_1P_2S
+$CMP Transformer_1P_2S
 D Transformer, single primary, dual secondary
 K transformer coil magnet
 $ENDCMP
 #
-$CMP TRANSFORMER_1P_SS
+$CMP Transformer_1P_SS
 D Transformer, single primary, split secondary
 K transformer coil magnet
 $ENDCMP
 #
-$CMP TRANSFORMER_AUDIO
+$CMP Transformer_AUDIO
 D Audio transformer
 K transformer coil magnet sound
 $ENDCMP
 #
-$CMP TRANSFORMER_SP_1S
+$CMP Transformer_SP_1S
 D Transformer, split primary, single secondary
 K transformer coil magnet
 $ENDCMP
 #
-$CMP TRANSFORMER_SP_2S
+$CMP Transformer_SP_2S
 D Transformer, split primary, dual secondary
 K transformer coil magnet
 $ENDCMP
 #
+$CMP Thermistor
+D Thermistor, temperature-dependent resistor
+K r res thermistor
+$ENDCMP
+#
 $CMP Thermistor_NTC
 D temperature dependent resistor, positive temperature coefficient (PTC)
 K thermistor PTC resistor sensor RTD
@@ -1887,12 +1872,7 @@ K thermocouple temperature sensor cold junction
 F https://en.wikipedia.org/wiki/Thermocouple
 $ENDCMP
 #
-$CMP VARICAP
-D variable capacitance diode (varicap, varactor)
-K capacitance diode varicap varactor
-$ENDCMP
-#
-$CMP VARISTOR
+$CMP Varistor
 D Voltage dependent resistor
 K vdr resistance
 $ENDCMP
@@ -1907,14 +1887,4 @@ D DC Voltmeter
 K Voltmeter DC
 $ENDCMP
 #
-$CMP ZENER
-D Diode zener
-K diode
-$ENDCMP
-#
-$CMP ZENER_Small
-D Zener diode, small symbol
-K diode zener
-$ENDCMP
-#
 #End Doc Library
diff --git a/library/device.lib b/library/device.lib
index 2f637c6e..5e949b05 100644
--- a/library/device.lib
+++ b/library/device.lib
@@ -614,11 +614,11 @@ X A 2 150 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# DELAY_LINE
+# Delay_Line
 #
-DEF DELAY_LINE L 0 40 Y N 1 F N
+DEF Delay_Line L 0 40 Y N 1 F N
 F0 "L" 100 50 50 H V L CNN
-F1 "DELAY_LINE" 100 -50 50 H V L CNN
+F1 "Delay_Line" 100 -50 50 H V L CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 DRAW
@@ -808,7 +808,6 @@ F0 "D" 0 100 50 H V C CNN
 F1 "D_Capacitance" 0 -100 50 H V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
-ALIAS VARICAP
 $FPLIST
  Diode_*
  D-Pak_TO252AA
@@ -2099,55 +2098,11 @@ X ~ 1 0 -100 50 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# INDUCTOR
+# Jumper
 #
-DEF INDUCTOR L 0 40 N N 1 F N
-F0 "L" -50 0 50 V V C CNN
-F1 "INDUCTOR" 100 0 50 V V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-ALIAS L
-$FPLIST
- Choke_*
- *Coil*
-$ENDFPLIST
-DRAW
-A 0 -75 25 -899 899 0 1 0 N 0 -100 0 -50
-A 0 -25 25 -899 899 0 1 0 N 0 -50 0 0
-A 0 25 25 -899 899 0 1 0 N 0 0 0 50
-A 0 75 25 -899 899 0 1 0 N 0 50 0 100
-X 1 1 0 150 50 D 50 50 1 1 P
-X 2 2 0 -150 50 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# INDUCTOR_Small
-#
-DEF INDUCTOR_Small L 0 10 N N 1 F N
-F0 "L" 30 40 50 H V L CNN
-F1 "INDUCTOR_Small" 30 -40 50 H V L CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-ALIAS L_Small
-$FPLIST
- Choke_*
- *Coil*
-$ENDFPLIST
-DRAW
-A 0 -60 20 -899 899 0 1 0 N 0 -80 0 -40
-A 0 -20 20 -899 899 0 1 0 N 0 -40 0 0
-A 0 20 20 -899 899 0 1 0 N 0 0 0 40
-A 0 60 20 -899 899 0 1 0 N 0 40 0 80
-X ~ 1 0 100 20 D 50 50 1 1 P
-X ~ 2 0 -100 20 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# JUMPER
-#
-DEF JUMPER JP 0 30 Y N 1 F N
+DEF Jumper JP 0 30 Y N 1 F N
 F0 "JP" 0 150 50 H V C CNN
-F1 "JUMPER" 0 -80 50 H V C CNN
+F1 "Jumper" 0 -80 50 H V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 DRAW
@@ -2159,11 +2114,11 @@ X 2 2 300 0 165 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# JUMPER_NC_Dual
+# Jumper_NC_Dual
 #
-DEF JUMPER_NC_Dual JP 0 30 Y N 1 F N
+DEF Jumper_NC_Dual JP 0 30 Y N 1 F N
 F0 "JP" 50 -100 50 H V L CNN
-F1 "JUMPER_NC_Dual" 0 100 50 H V C BNN
+F1 "Jumper_NC_Dual" 0 100 50 H V C BNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 DRAW
@@ -2178,11 +2133,11 @@ X 3 3 250 0 95 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# JUMPER_NC_Small
+# Jumper_NC_Small
 #
-DEF JUMPER_NC_Small JP 0 30 N N 1 F N
+DEF Jumper_NC_Small JP 0 30 N N 1 F N
 F0 "JP" 0 80 50 H V C CNN
-F1 "JUMPER_NC_Small" 10 -60 50 H V C CNN
+F1 "Jumper_NC_Small" 10 -60 50 H V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 DRAW
@@ -2194,11 +2149,11 @@ X 2 2 100 0 40 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# JUMPER_NO_Small
+# Jumper_NO_Small
 #
-DEF JUMPER_NO_Small JP 0 30 N N 1 F N
+DEF Jumper_NO_Small JP 0 30 N N 1 F N
 F0 "JP" 0 80 50 H V C CNN
-F1 "JUMPER_NO_Small" 10 -60 50 H V C CNN
+F1 "Jumper_NO_Small" 10 -60 50 H V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 DRAW
@@ -2209,11 +2164,32 @@ X 2 2 100 0 40 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
-# LASERDIODE_1A3C
+# L
 #
-DEF LASERDIODE_1A3C LD 0 40 Y N 1 F N
+DEF L L 0 40 N N 1 F N
+F0 "L" -50 0 50 V V C CNN
+F1 "L" 75 0 50 V V C CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ Choke_*
+ *Coil*
+$ENDFPLIST
+DRAW
+A 0 -75 25 -899 899 0 1 0 N 0 -100 0 -50
+A 0 -25 25 -899 899 0 1 0 N 0 -50 0 0
+A 0 25 25 -899 899 0 1 0 N 0 0 0 50
+A 0 75 25 -899 899 0 1 0 N 0 50 0 100
+X 1 1 0 150 50 D 50 50 1 1 P
+X 2 2 0 -150 50 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+# Laserdiode_1A3C
+#
+DEF Laserdiode_1A3C LD 0 40 Y N 1 F N
 F0 "LD" -50 175 50 H V C CNN
-F1 "LASERDIODE_1A3C" -50 -100 50 H V C CNN
+F1 "Laserdiode_1A3C" -50 -100 50 H V C CNN
 F2 "" -100 -25 50 H I C CNN
 F3 "" 30 -200 50 H V C CNN
 $FPLIST
@@ -2240,11 +2216,11 @@ X C 3 -300 0 100 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LASERDIODE_1C2A
+# Laserdiode_1C2A
 #
-DEF LASERDIODE_1C2A LD 0 40 Y N 1 F N
+DEF Laserdiode_1C2A LD 0 40 Y N 1 F N
 F0 "LD" -50 175 50 H V C CNN
-F1 "LASERDIODE_1C2A" -50 -100 50 H V C CNN
+F1 "Laserdiode_1C2A" -50 -100 50 H V C CNN
 F2 "" -100 -25 50 H I C CNN
 F3 "" 30 -200 50 H V C CNN
 $FPLIST
@@ -2271,11 +2247,11 @@ X A 2 200 0 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LASERDIODE_M_TYPE
+# Laserdiode_M_TYPE
 #
-DEF LASERDIODE_M_TYPE LD 0 40 Y N 1 F N
+DEF Laserdiode_M_TYPE LD 0 40 Y N 1 F N
 F0 "LD" 40 280 50 H V C CNN
-F1 "LASERDIODE_M_TYPE" 40 -220 50 H V C CNN
+F1 "Laserdiode_M_TYPE" 40 -220 50 H V C CNN
 F2 "" 40 75 50 H I C CNN
 F3 "" 90 -100 50 H V C CNN
 $FPLIST
@@ -2318,11 +2294,11 @@ X ~ 3 300 -100 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LASERDIODE_N_TYPE
+# Laserdiode_N_TYPE
 #
-DEF LASERDIODE_N_TYPE LD 0 40 Y N 1 F N
+DEF Laserdiode_N_TYPE LD 0 40 Y N 1 F N
 F0 "LD" 40 280 50 H V C CNN
-F1 "LASERDIODE_N_TYPE" 40 -220 50 H V C CNN
+F1 "Laserdiode_N_TYPE" 40 -220 50 H V C CNN
 F2 "" 0 75 50 H I C CNN
 F3 "" 50 -100 50 H V C CNN
 $FPLIST
@@ -2365,11 +2341,11 @@ X ~ 3 300 -100 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# LASERDIODE_P_TYPE
+# Laserdiode_P_TYPE
 #
-DEF LASERDIODE_P_TYPE LD 0 40 Y N 1 F N
+DEF Laserdiode_P_TYPE LD 0 40 Y N 1 F N
 F0 "LD" 40 280 50 H V C CNN
-F1 "LASERDIODE_P_TYPE" 40 -220 50 H V C CNN
+F1 "Laserdiode_P_TYPE" 40 -220 50 H V C CNN
 F2 "" 0 75 50 H I C CNN
 F3 "" 130 -100 50 H V C CNN
 $FPLIST
@@ -3108,6 +3084,27 @@ X ~ 2 0 -100 20 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# L_Small
+#
+DEF L_Small L 0 10 N N 1 F N
+F0 "L" 30 40 50 H V L CNN
+F1 "L_Small" 30 -40 50 H V L CNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ Choke_*
+ *Coil*
+$ENDFPLIST
+DRAW
+A 0 -60 20 -899 899 0 1 0 N 0 -80 0 -40
+A 0 -20 20 -899 899 0 1 0 N 0 -40 0 0
+A 0 20 20 -899 899 0 1 0 N 0 0 0 40
+A 0 60 20 -899 899 0 1 0 N 0 40 0 80
+X ~ 1 0 100 20 D 50 50 1 1 P
+X ~ 2 0 -100 20 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # Lamp
 #
 DEF Lamp L 0 1 N N 1 F N
@@ -5242,22 +5239,6 @@ X ~ 2 0 -150 50 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# RVAR
-#
-DEF RVAR R 0 0 N Y 1 F N
-F0 "R" 150 -50 50 H V C CNN
-F1 "RVAR" 200 50 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-DRAW
-S -40 150 40 -150 0 1 0 N
-P 2 0 1 0 -70 -120 80 120 N
-P 3 0 1 0 80 90 80 120 50 110 F
-X ~ 1 0 250 100 D 50 50 1 1 P
-X ~ 2 0 -250 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
 # R_NET10
 #
 DEF R_NET10 RN 0 0 N N 1 F N
@@ -9380,26 +9361,6 @@ X ~ 1 0 0 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# THERMISTOR
-#
-DEF THERMISTOR TH 0 0 N Y 1 F N
-F0 "TH" 100 50 50 V V C CNN
-F1 "THERMISTOR" -100 0 50 V V C BNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- R?
- SM0603
- SM0805
-$ENDFPLIST
-DRAW
-S -40 100 40 -100 0 1 8 N
-P 5 0 1 10 -75 125 -75 75 75 -75 75 -125 75 -125 N
-X ~ 1 0 200 100 D 50 50 1 1 P
-X ~ 2 0 -200 100 U 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
 # THYRISTOR
 #
 DEF THYRISTOR D 0 40 Y N 1 F N
@@ -9417,11 +9378,11 @@ X G 3 -100 200 150 D 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# TRANSFORMER_1P_1S
+# Transformer_1P_1S
 #
-DEF TRANSFORMER_1P_1S T 0 40 Y N 1 F N
+DEF Transformer_1P_1S T 0 40 Y N 1 F N
 F0 "T" 0 250 50 H V C CNN
-F1 "TRANSFORMER_1P_1S" 0 -300 50 H V C CNN
+F1 "Transformer_1P_1S" 0 -300 50 H V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 DRAW
@@ -9450,11 +9411,11 @@ X SB 4 400 200 300 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# TRANSFORMER_1P_1S_SO8
+# Transformer_1P_1S_SO8
 #
-DEF TRANSFORMER_1P_1S_SO8 T 0 40 Y N 1 F N
+DEF Transformer_1P_1S_SO8 T 0 40 Y N 1 F N
 F0 "T" 0 250 50 H V C CNN
-F1 "TRANSFORMER_1P_1S_SO8" 0 -300 50 H V C CNN
+F1 "Transformer_1P_1S_SO8" 0 -300 50 H V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 DRAW
@@ -9483,11 +9444,11 @@ X SB 8 300 200 200 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# TRANSFORMER_1P_2S
+# Transformer_1P_2S
 #
-DEF TRANSFORMER_1P_2S T 0 40 Y N 1 F N
+DEF Transformer_1P_2S T 0 40 Y N 1 F N
 F0 "T" 0 500 50 H V C CNN
-F1 "TRANSFORMER_1P_2S" 0 -500 50 H V C CNN
+F1 "Transformer_1P_2S" 0 -500 50 H V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 DRAW
@@ -9522,11 +9483,11 @@ X SD 6 400 -400 300 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# TRANSFORMER_1P_SS
+# Transformer_1P_SS
 #
-DEF TRANSFORMER_1P_SS T 0 40 Y N 1 F N
+DEF Transformer_1P_SS T 0 40 Y N 1 F N
 F0 "T" 0 250 50 H V C CNN
-F1 "TRANSFORMER_1P_SS" 0 -300 50 H V C CNN
+F1 "Transformer_1P_SS" 0 -300 50 H V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 DRAW
@@ -9556,11 +9517,11 @@ X SB 5 400 200 300 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# TRANSFORMER_AUDIO
+# Transformer_AUDIO
 #
-DEF TRANSFORMER_AUDIO T 0 40 Y N 1 F N
+DEF Transformer_AUDIO T 0 40 Y N 1 F N
 F0 "T" 0 460 50 H V C CNN
-F1 "TRANSFORMER_AUDIO" 10 370 50 H V C CNN
+F1 "Transformer_AUDIO" 10 370 50 H V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 DRAW
@@ -9591,11 +9552,11 @@ X SB 4 400 200 300 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# TRANSFORMER_SP_1S
+# Transformer_SP_1S
 #
-DEF TRANSFORMER_SP_1S T 0 40 Y N 1 F N
+DEF Transformer_SP_1S T 0 40 Y N 1 F N
 F0 "T" 0 250 50 H V C CNN
-F1 "TRANSFORMER_SP_1S" 0 -300 50 H V C CNN
+F1 "Transformer_SP_1S" 0 -300 50 H V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 DRAW
@@ -9625,11 +9586,11 @@ X S2 5 400 200 300 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# TRANSFORMER_SP_2S
+# Transformer_SP_2S
 #
-DEF TRANSFORMER_SP_2S T 0 40 Y N 1 F N
+DEF Transformer_SP_2S T 0 40 Y N 1 F N
 F0 "T" 0 500 50 H V C CNN
-F1 "TRANSFORMER_SP_2S" 0 -500 50 H V C CNN
+F1 "Transformer_SP_2S" 0 -500 50 H V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 DRAW
@@ -9684,6 +9645,26 @@ X ~ 3 -500 -200 200 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
+# Thermistor
+#
+DEF Thermistor TH 0 0 N Y 1 F N
+F0 "TH" 100 50 50 V V C CNN
+F1 "Thermistor" -100 0 50 V V C BNN
+F2 "" 0 0 50 H V C CNN
+F3 "" 0 0 50 H V C CNN
+$FPLIST
+ R?
+ SM0603
+ SM0805
+$ENDFPLIST
+DRAW
+S -40 100 40 -100 0 1 8 N
+P 5 0 1 10 -75 125 -75 75 75 -75 75 -125 75 -125 N
+X ~ 1 0 200 100 D 50 50 1 1 P
+X ~ 2 0 -200 100 U 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # Thermistor_NTC
 #
 DEF Thermistor_NTC TH 0 0 N Y 1 F N
@@ -10024,18 +10005,22 @@ X - 2 100 -100 100 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# VARISTOR
+# Varistor
 #
-DEF VARISTOR VR 0 0 N Y 1 F N
-F0 "VR" 100 150 50 H V L TNN
-F1 "VARISTOR" 100 50 50 H V L CNN
-F2 "" 0 0 50 H V C CNN
+DEF Varistor R 0 0 N Y 1 F N
+F0 "R" 125 0 50 V V C CNN
+F1 "Varistor" -125 0 50 V V C CNN
+F2 "" -70 0 50 V V C CNN
 F3 "" 0 0 50 H V C CNN
+$FPLIST
+ R_*
+ Resistor_*
+$ENDFPLIST
 DRAW
-S -40 150 40 -150 0 1 10 N
-P 4 0 1 10 -60 -60 60 60 60 100 60 100 N
-X ~ 1 0 250 100 D 50 50 1 1 P
-X ~ 2 0 -250 100 U 50 50 1 1 P
+S -40 -100 40 100 0 1 10 N
+P 3 0 1 0 -75 -100 -75 -50 75 50 N
+X ~ 1 0 150 50 D 50 50 1 1 P
+X ~ 2 0 -150 50 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
@@ -10079,44 +10064,4 @@ X + 2 0 200 100 D 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# ZENER
-#
-DEF ZENER D 0 40 N N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "ZENER" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- D?
- SO*
- SM*
-$ENDFPLIST
-DRAW
-P 5 0 1 8 -70 50 -50 30 -50 -30 -30 -50 -30 -50 N
-P 5 0 1 0 -50 0 50 50 50 -50 -50 0 -50 0 F
-X C 1 -200 0 150 R 50 50 1 1 P
-X A 2 200 0 150 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
-# ZENER_Small
-#
-DEF ZENER_Small D 0 40 N N 1 F N
-F0 "D" 0 100 50 H V C CNN
-F1 "ZENER_Small" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
-$FPLIST
- D?
- SO*
- SM*
-$ENDFPLIST
-DRAW
-P 4 0 1 8 -60 40 -40 20 -40 -20 -20 -40 N
-P 4 0 1 0 40 40 -40 0 40 -40 40 40 F
-X C 1 -100 0 100 R 50 50 1 1 P
-X A 2 100 0 100 L 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
 #End Library