diff --git a/library/diode.dcm b/library/diode.dcm
index d30bff87..0049e8b4 100644
--- a/library/diode.dcm
+++ b/library/diode.dcm
@@ -1,14 +1,14 @@
 EESchema-DOCLIB  Version 2.0
 #
-$CMP NXP_BAV99
+$CMP BAV99
 D BAV99 High-speed switching diodes
-K Diode
+K diode
 F www.nxp.com/documents/data_sheet/BAV99_SER.pdf
 $ENDCMP
 #
-$CMP NXP_BAV99W
+$CMP BAV99W
 D BAV99 High-speed switching diodes
-K Diode
+K diode
 F www.nxp.com/documents/data_sheet/BAV99_SER.pdf
 $ENDCMP
 #
diff --git a/library/diode.lib b/library/diode.lib
index 551529cf..bb0fd4a2 100644
--- a/library/diode.lib
+++ b/library/diode.lib
@@ -1,30 +1,24 @@
 EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #
-# NXP_BAV99
+# BAV99
 #
-DEF NXP_BAV99 D 0 10 N N 1 F N
-F0 "D" 100 50 50 H V L CNN
-F1 "NXP_BAV99" 100 -50 50 H V L CNN
-F2 "" 50 0 60 H V C CNN
-F3 "" 50 0 60 H V C CNN
-ALIAS NXP_BAV99W
+DEF BAV99 D 0 40 N N 2 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "BAV99" 0 -100 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+ALIAS BAV99W
 $FPLIST
- Housings_SOT-23_SOT-143_TSOT-6:SOT-23
+ Housings_SOT-23*
 $ENDFPLIST
 DRAW
-S -100 100 100 -100 0 1 0 N
-P 2 0 1 0  -50 -100  -50 -25 N
-P 2 0 1 0  -10 30  -90 30 N
-P 2 0 1 0  50 -25  50 -100 N
-P 2 0 1 0  90 -30  10 -30 N
-P 3 0 1 0  0 75  50 75  50 25 N
-P 4 0 1 0  -50 25  -50 75  0 75  0 100 N
-P 4 0 1 0  -10 -30  -50 30  -90 -30  -10 -30 F
-P 4 0 1 0  90 30  50 -30  10 30  90 30 F
-X A 1 -50 -200 100 U 50 50 1 1 P
-X K 2 50 -200 100 U 50 50 1 1 P
-X C 3 0 200 100 D 50 50 1 1 P
+P 2 0 1 6  -50 50  -50 -50 N
+P 3 0 1 0  50 50  -50 0  50 -50 F
+X A 1 150 0 100 L 50 50 1 1 P
+X K 3 -150 0 100 R 50 50 1 1 P
+X K 2 -150 0 100 R 50 50 2 1 P
+X A 3 150 0 100 L 50 50 2 1 P
 ENDDRAW
 ENDDEF
 #