diff --git a/boxes/generators/swconsole.py b/boxes/generators/slatwallconsole.py
similarity index 100%
rename from boxes/generators/swconsole.py
rename to boxes/generators/slatwallconsole.py
diff --git a/boxes/generators/swpliersholder.py b/boxes/generators/slatwallpliersholder.py
similarity index 98%
rename from boxes/generators/swpliersholder.py
rename to boxes/generators/slatwallpliersholder.py
index db3efc7..d42db69 100644
--- a/boxes/generators/swpliersholder.py
+++ b/boxes/generators/slatwallpliersholder.py
@@ -16,7 +16,7 @@
 
 from boxes import *
 
-class SwPliersHolder(Boxes):
+class SlatwallPliersHolder(Boxes):
     """Bar to hang pliers on"""
 
     ui_group = "SlatWall"
diff --git a/boxes/generators/swslottedholder.py b/boxes/generators/slatwallslottedholder.py
similarity index 100%
rename from boxes/generators/swslottedholder.py
rename to boxes/generators/slatwallslottedholder.py
diff --git a/boxes/generators/swtypetray.py b/boxes/generators/slatwalltypetray.py
similarity index 99%
rename from boxes/generators/swtypetray.py
rename to boxes/generators/slatwalltypetray.py
index c11a042..c91b73d 100644
--- a/boxes/generators/swtypetray.py
+++ b/boxes/generators/slatwalltypetray.py
@@ -17,7 +17,7 @@
 from boxes import *
 from boxes.lids import _TopEdge
 
-class SwTypeTray(_TopEdge):
+class SlatwallTypeTray(_TopEdge):
     """Type tray - allows only continuous walls"""
 
     ui_group = "SlatWall"
diff --git a/boxes/generators/swwrenchholder.py b/boxes/generators/slatwallwrenchholder.py
similarity index 100%
rename from boxes/generators/swwrenchholder.py
rename to boxes/generators/slatwallwrenchholder.py