diff --git a/src/misc-dir_arc-plus-w-30mm-and-sega-2p-plus-one-decorative-plate.scad b/src/misc-decorative-plate-dir_arc-plus-w-30mm-and-sega-2p-plus-one.scad
similarity index 100%
rename from src/misc-dir_arc-plus-w-30mm-and-sega-2p-plus-one-decorative-plate.scad
rename to src/misc-decorative-plate-dir_arc-plus-w-30mm-and-sega-2p-plus-one.scad
diff --git a/src/misc-dir_arc-plus-w-30mm-decorative-plate.scad b/src/misc-decorative-plate-dir_arc-plus-w-30mm.scad
similarity index 100%
rename from src/misc-dir_arc-plus-w-30mm-decorative-plate.scad
rename to src/misc-decorative-plate-dir_arc-plus-w-30mm.scad
diff --git a/src/misc-sega-2p-plus-one-decorative-plate.scad b/src/misc-decorative-plate-sega-2p-plus-one.scad
similarity index 100%
rename from src/misc-sega-2p-plus-one-decorative-plate.scad
rename to src/misc-decorative-plate-sega-2p-plus-one.scad
diff --git a/src/misc-20mm-hole-neutrik-d-plate.scad b/src/misc-neutrik-d-plate-20mm-hole.scad
similarity index 94%
rename from src/misc-20mm-hole-neutrik-d-plate.scad
rename to src/misc-neutrik-d-plate-20mm-hole.scad
index 6a537da..28cb50f 100644
--- a/src/misc-20mm-hole-neutrik-d-plate.scad
+++ b/src/misc-neutrik-d-plate-20mm-hole.scad
@@ -18,7 +18,7 @@
 
 include <components.scad>
 
-module spdt_neutrik_d_plate() {
+module neutrik_d_plate_20mm() {
 	difference() {
 		cube([30, 35, 2], center=true);
 		translate([9.5, 12, 0]) neutrik_d_screw_hole();
@@ -28,4 +28,4 @@ module spdt_neutrik_d_plate() {
 	}
 }
 
-spdt_neutrik_d_plate();
+neutrik_d_plate_20mm();
diff --git a/src/misc-24mm-hole-neutrik-d-plate.scad b/src/misc-neutrik-d-plate-24mm-hole.scad
similarity index 94%
rename from src/misc-24mm-hole-neutrik-d-plate.scad
rename to src/misc-neutrik-d-plate-24mm-hole.scad
index 26ad96d..9a8146f 100644
--- a/src/misc-24mm-hole-neutrik-d-plate.scad
+++ b/src/misc-neutrik-d-plate-24mm-hole.scad
@@ -18,7 +18,7 @@
 
 include <components.scad>
 
-module spdt_neutrik_d_plate() {
+module neutrik_d_plate_24mm() {
 	difference() {
 		cube([30, 35, 2], center=true);
 		translate([9.5, 12, 0]) neutrik_d_screw_hole();
@@ -27,4 +27,4 @@ module spdt_neutrik_d_plate() {
 	}
 }
 
-spdt_neutrik_d_plate();
+neutrik_d_plate_24mm();