diff --git a/fab.lib b/fab.lib
index 26cf1f708d78d0d21cc0b4989b924757dca8f834..d57bdcd7fa8477bd477011b45cbf9092c22fd8f0 100644
--- a/fab.lib
+++ b/fab.lib
@@ -664,6 +664,9 @@ F0 "SW" 50 100 50 H V L CNN
 F1 "BUTTON_B3SN" 0 -60 50 H V C CNN
 F2 "fab:Button_Omron_B3SN_6x6mm" 0 200 50 H I C CNN
 F3 "" 0 200 50 H I C CNN
+$FPLIST
+ Button_*
+$ENDFPLIST
 DRAW
 C -80 0 20 0 1 0 N
 C 80 0 20 0 1 0 N
@@ -681,6 +684,9 @@ F0 "SW" 50 100 50 H V L CNN
 F1 "BUTTON_PTS636" 0 -60 50 H V C CNN
 F2 "fab:Button_C&K_PTS636_6x3.5mm" 0 200 50 H I C CNN
 F3 "" 0 200 50 H I C CNN
+$FPLIST
+ Button_*
+$ENDFPLIST
 DRAW
 C -80 0 20 0 1 0 N
 C 80 0 20 0 1 0 N
@@ -2754,8 +2760,11 @@ ENDDEF
 DEF SWITCH_AYZ0102AGRLC SW 0 0 Y N 1 F N
 F0 "SW" 0 170 50 H V C CNN
 F1 "SWITCH_AYZ0102AGRLC" 0 -200 50 H V C CNN
-F2 "fab:Switch_C&K_AYZ0102AGRLC_7.2x3mm_P2.5mm" 0 0 50 H I C CNN
+F2 "fab:Switch_SPDT_C&K_AYZ0102AGRLC_7.2x3mm_P2.5mm" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Switch_*
+$ENDFPLIST
 DRAW
 C -80 0 20 0 0 0 N
 C 80 -100 20 0 0 0 N
@@ -2772,8 +2781,11 @@ ENDDEF
 DEF SWITCH_JS102011JCQN SW 0 0 Y N 1 F N
 F0 "SW" 0 170 50 H V C CNN
 F1 "SWITCH_JS102011JCQN" 0 -200 50 H V C CNN
-F2 "fab:Switch_C&K_JS102011JCQN_9x3.6mm_P2.5mm" 0 0 50 H I C CNN
+F2 "fab:Switch_SPDT_C&K_JS102011JCQN_9x3.6mm_P2.5mm" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
+$FPLIST
+ Switch_SPDT_*
+$ENDFPLIST
 DRAW
 C -80 0 20 0 0 0 N
 C 80 -100 20 0 0 0 N
diff --git a/fab.pretty/Switch_C&K_AYZ0102AGRLC_7.2x3mm_P2.5mm.kicad_mod b/fab.pretty/Switch_SPDT_C&K_AYZ0102AGRLC_7.2x3mm_P2.5mm.kicad_mod
similarity index 100%
rename from fab.pretty/Switch_C&K_AYZ0102AGRLC_7.2x3mm_P2.5mm.kicad_mod
rename to fab.pretty/Switch_SPDT_C&K_AYZ0102AGRLC_7.2x3mm_P2.5mm.kicad_mod
diff --git a/fab.pretty/Switch_C&K_JS102011JCQN_9x3.6mm_P2.5mm.kicad_mod b/fab.pretty/Switch_SPDT_C&K_JS102011JCQN_9x3.6mm_P2.5mm.kicad_mod
similarity index 100%
rename from fab.pretty/Switch_C&K_JS102011JCQN_9x3.6mm_P2.5mm.kicad_mod
rename to fab.pretty/Switch_SPDT_C&K_JS102011JCQN_9x3.6mm_P2.5mm.kicad_mod