diff --git a/BelFuse_1210.kicad_mod b/BelFuse_1210.kicad_mod
index bc409f1..7bd9870 100644
--- a/BelFuse_1210.kicad_mod
+++ b/BelFuse_1210.kicad_mod
@@ -1,4 +1,4 @@
-(module primarypoints:BelFuse_1210 (layer F.Cu) (tedit 5A149C36)
+(module stdpads:BelFuse_1210 (layer F.Cu) (tedit 5A149C36)
   (fp_text reference REF** (at 0 -1.95) (layer F.SilkS)
     (effects (font (size 0.508 0.508) (thickness 0.127)))
   )
diff --git a/Diodes_SOT-363_SC-88.kicad_mod b/Diodes_SOT363.kicad_mod
similarity index 94%
rename from Diodes_SOT-363_SC-88.kicad_mod
rename to Diodes_SOT363.kicad_mod
index 6bdfd1e..17cc438 100644
--- a/Diodes_SOT-363_SC-88.kicad_mod
+++ b/Diodes_SOT363.kicad_mod
@@ -1,6 +1,4 @@
-(module stdpads:Diodes_SOT-363_SC-88_419B (layer F.Cu) (tedit 59E78FAD)
-  (descr SOT-363)
-  (tags SOT-363)
+(module stdpads:Diodes_SOT363 (layer F.Cu) (tedit 59E78FAD)
   (attr smd)
   (fp_text reference REF** (at 0 -1.75) (layer F.SilkS)
     (effects (font (size 0.508 0.508) (thickness 0.127)))
diff --git a/ESP32-WROOM-ThermalVias.kicad_mod b/Espressif_ESP32-WROOM.kicad_mod
similarity index 100%
rename from ESP32-WROOM-ThermalVias.kicad_mod
rename to Espressif_ESP32-WROOM.kicad_mod
diff --git a/Maxim_QFN-32-1EP_5x5mm_Pitch0.5mm_ThermalVias_RearPad.kicad_mod b/Maxim_QFN-32-1EP_5x5mm.kicad_mod
similarity index 100%
rename from Maxim_QFN-32-1EP_5x5mm_Pitch0.5mm_ThermalVias_RearPad.kicad_mod
rename to Maxim_QFN-32-1EP_5x5mm.kicad_mod
diff --git a/Micrel_SOT-353_SC-70-5.kicad_mod b/Micrel_SOT-353_SC-70-5_C5.kicad_mod
similarity index 100%
rename from Micrel_SOT-353_SC-70-5.kicad_mod
rename to Micrel_SOT-353_SC-70-5_C5.kicad_mod
diff --git a/Micrel_TMLF-6_1.6x1.6mm_ThermalVias_RearPad.kicad_mod b/Micrel_TMLF-6_1.6x1.6mm_MT.kicad_mod
similarity index 100%
rename from Micrel_TMLF-6_1.6x1.6mm_ThermalVias_RearPad.kicad_mod
rename to Micrel_TMLF-6_1.6x1.6mm_MT.kicad_mod
diff --git a/NXP_GW_SC-88_SOT-363.kicad_mod b/NXP_SOT-363_GW.kicad_mod
similarity index 100%
rename from NXP_GW_SC-88_SOT-363.kicad_mod
rename to NXP_SOT-363_GW.kicad_mod
diff --git a/NXP_VSSOP-8-1EP_2x2.3mm_SOT765-1.kicad_mod b/NXP_VSSOP-8_SOT765-1_DC.kicad_mod
similarity index 100%
rename from NXP_VSSOP-8-1EP_2x2.3mm_SOT765-1.kicad_mod
rename to NXP_VSSOP-8_SOT765-1_DC.kicad_mod
diff --git a/ONSemi_SOD-323_477.kicad_mod b/ONSemi_SOD-323_477-02.kicad_mod
similarity index 100%
rename from ONSemi_SOD-323_477.kicad_mod
rename to ONSemi_SOD-323_477-02.kicad_mod
diff --git a/ONSemi_SOT-363_SC-88_419B.kicad_mod b/ONSemi_SOT-363_SC-88_419B-02.kicad_mod
similarity index 100%
rename from ONSemi_SOT-363_SC-88_419B.kicad_mod
rename to ONSemi_SOT-363_SC-88_419B-02.kicad_mod
diff --git a/ONSemi_UFDFN-10_2.5x1mm_Pitch0.5mm_517BB.kicad_mod b/ONSemi_UFDFN-10_517BB.kicad_mod
similarity index 100%
rename from ONSemi_UFDFN-10_2.5x1mm_Pitch0.5mm_517BB.kicad_mod
rename to ONSemi_UFDFN-10_517BB.kicad_mod
diff --git a/ONSemi_VFDFN-8-1EP_2x2mm_Pitch0.5mm_506AA_ThermalVias_RearPad.kicad_mod b/ONSemi_VFDFN-8-1EP_506AA.kicad_mod
similarity index 100%
rename from ONSemi_VFDFN-8-1EP_2x2mm_Pitch0.5mm_506AA_ThermalVias_RearPad.kicad_mod
rename to ONSemi_VFDFN-8-1EP_506AA.kicad_mod
diff --git a/Semtech_QFN-16-1EP_3x3mm_Pitch0.5mm_ThermalVias_RearPad.kicad_mod b/Semtech_QFN-16-1EP_3x3mm.kicad_mod
similarity index 91%
rename from Semtech_QFN-16-1EP_3x3mm_Pitch0.5mm_ThermalVias_RearPad.kicad_mod
rename to Semtech_QFN-16-1EP_3x3mm.kicad_mod
index 4441d62..8b19596 100644
--- a/Semtech_QFN-16-1EP_3x3mm_Pitch0.5mm_ThermalVias_RearPad.kicad_mod
+++ b/Semtech_QFN-16-1EP_3x3mm.kicad_mod
@@ -1,11 +1,9 @@
-(module stdpads:Semtech_QFN-16-1EP_3x3mm_Pitch0.5mm_ThermalVias_RearPad (layer F.Cu) (tedit 5B05C773)
-  (descr "16-Lead Plastic Quad Flat, No Lead Package (NG) - 3x3x0.9 mm Body [QFN]; (see Microchip Packaging Specification 00000049BS.pdf)")
-  (tags "QFN 0.5")
+(module stdpads:Semtech_QFN-16-1EP_3x3mm (layer F.Cu) (tedit 5B05C773)
   (attr smd)
   (fp_text reference REF** (at 0 -2.45) (layer F.SilkS)
     (effects (font (size 0.508 0.508) (thickness 0.127)))
   )
-  (fp_text value Semtech_QFN-16-1EP_3x3mm_Pitch0.5mm_ThermalVias_RearPad (at 0 2.5) (layer F.SilkS)
+  (fp_text value Semtech_QFN-16-1EP_3x3mm (at 0 2.5) (layer F.SilkS)
     (effects (font (size 0.508 0.508) (thickness 0.127)))
   )
   (fp_line (start -2.1 -2.1) (end -2.1 2.1) (layer F.CrtYd) (width 0.05))
diff --git a/TI_SOT-23-5_DBV_R-PDSO-G5.kicad_mod b/TI_SOT-23-5_DBV.kicad_mod
similarity index 100%
rename from TI_SOT-23-5_DBV_R-PDSO-G5.kicad_mod
rename to TI_SOT-23-5_DBV.kicad_mod
diff --git a/TaiyoYuden_NRS6028T4R7MMGKV.kicad_mod b/TaiyoYuden_NRS6028.kicad_mod
similarity index 100%
rename from TaiyoYuden_NRS6028T4R7MMGKV.kicad_mod
rename to TaiyoYuden_NRS6028.kicad_mod