diff --git a/library/device.dcm b/library/device.dcm
index 5de91891..5135910c 100644
--- a/library/device.dcm
+++ b/library/device.dcm
@@ -1129,22 +1129,28 @@ D Resistor
 K r res resistor
 $ENDCMP
 #
-$CMP RF_SHIELD_ONE_PIECE
+$CMP RF_Shield_One_Piece
 D One-Piece EMI RF Shielding Cabinet
 K RF EMI Shielding Cabinet
 $ENDCMP
 #
-$CMP RF_SHIELD_TWO_PIECES
+$CMP RF_Shield_Two_Pieces
 D Two-Piece EMI RF Shielding Cabinet
 K RF EMI Shielding Cabinet
 $ENDCMP
 #
-$CMP ROTARY_ENCODER
+$CMP Rotary_Encoder
 D Rotary encoder, dual channel, incremental quadrate outputs
 K rotary switch encoder
 F ~
 $ENDCMP
 #
+$CMP Rotary_Encoder_Switch
+D Rotary encoder, dual channel, incremental quadrate outputs, with switch
+K rotary switch encoder switch push button
+F ~
+$ENDCMP
+#
 $CMP RTRIM
 D variable Resistor
 K r res resistor variable potentiometer
@@ -1453,7 +1459,7 @@ K Ceramic Resonator
 $ENDCMP
 #
 $CMP SCHDPAK
-D Diode schottky - cms
+D Scottky Diode 
 K diode SCHOTTKY CMS
 $ENDCMP
 #
diff --git a/library/device.lib b/library/device.lib
index 7164514b..f7536d31 100644
--- a/library/device.lib
+++ b/library/device.lib
@@ -100,7 +100,7 @@ P 2 0 1 0 30 -75 100 -75 N
 P 2 0 1 0 100 -100 100 -75 N
 P 3 0 1 10 50 200 0 0 -50 200 N
 X A 1 0 -200 100 U 50 50 1 1 I
-X SHIELD 2 100 -200 100 U 50 50 1 1 I
+X Shield 2 100 -200 100 U 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
@@ -5109,11 +5109,11 @@ X ~ 2 0 -150 50 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# RF_SHIELD_ONE_PIECE
+# RF_Shield_One_Piece
 #
-DEF RF_SHIELD_ONE_PIECE J 0 40 Y Y 1 F N
+DEF RF_Shield_One_Piece J 0 40 Y Y 1 F N
 F0 "J" 0 200 50 H V C CNN
-F1 "RF_SHIELD_ONE_PIECE" 0 100 50 H V C CNN
+F1 "RF_Shield_One_Piece" 0 100 50 H V C CNN
 F2 "" 0 -100 50 H V C CNN
 F3 "" 0 -100 50 H V C CNN
 DRAW
@@ -5141,15 +5141,15 @@ P 3 0 1 10 -600 250 -600 300 -550 300 N
 P 3 0 1 10 -550 -300 -600 -300 -600 -250 N
 P 3 0 1 10 550 -300 600 -300 600 -250 N
 P 3 0 1 10 600 250 600 300 550 300 N
-X SHIELD 1 0 -400 100 U 50 50 1 1 P
+X Shield 1 0 -400 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# RF_SHIELD_TWO_PIECES
+# RF_Shield_Two_Pieces
 #
-DEF RF_SHIELD_TWO_PIECES J 0 40 Y Y 1 F N
+DEF RF_Shield_Two_Pieces J 0 40 Y Y 1 F N
 F0 "J" 0 200 50 H V C CNN
-F1 "RF_SHIELD_TWO_PIECES" 0 100 50 H V C CNN
+F1 "RF_Shield_Two_Pieces" 0 100 50 H V C CNN
 F2 "" 0 -100 50 H V C CNN
 F3 "" 0 -100 50 H V C CNN
 DRAW
@@ -5178,15 +5178,15 @@ P 3 0 1 10 -550 -300 -600 -300 -600 -250 N
 P 3 0 1 10 550 -300 600 -300 600 -250 N
 P 3 0 1 10 600 250 600 300 550 300 N
 P 4 0 1 10 -700 200 -700 450 700 450 700 200 N
-X SHIELD 1 0 -400 100 U 50 50 1 1 P
+X Shield 1 0 -400 100 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# ROTARY_ENCODER
+# Rotary_Encoder
 #
-DEF ROTARY_ENCODER SW 0 40 Y Y 1 F N
+DEF Rotary_Encoder SW 0 40 Y Y 1 F N
 F0 "SW" 0 260 50 H V C CNN
-F1 "ROTARY_ENCODER" 0 -260 50 H V C CNN
+F1 "Rotary_Encoder" 0 -260 50 H V C CNN
 F2 "" -100 160 50 H I C CNN
 F3 "" 0 260 50 H I C CNN
 DRAW
@@ -5206,11 +5206,11 @@ X B 3 -300 -100 100 R 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
-# ROTARY_ENCODER_Switch
+# Rotary_Encoder_Switch
 #
-DEF ROTARY_ENCODER_Switch SW 0 40 Y Y 1 F N
+DEF Rotary_Encoder_Switch SW 0 40 Y Y 1 F N
 F0 "SW" 0 260 50 H V C CNN
-F1 "ROTARY_ENCODER_Switch" 0 -260 50 H V C CNN
+F1 "Rotary_Encoder_Switch" 0 -260 50 H V C CNN
 F2 "" -100 160 50 H I C CNN
 F3 "" 0 260 50 H I C CNN
 DRAW