diff --git a/slic/devices/xoptics/slits/slits_old-SlitBlades_old.py b/slic/devices/xoptics/slits/slits_old-SlitBlades.py
similarity index 98%
rename from slic/devices/xoptics/slits/slits_old-SlitBlades_old.py
rename to slic/devices/xoptics/slits/slits_old-SlitBlades.py
index 221e8f2c..e29e3106 100644
--- a/slic/devices/xoptics/slits/slits_old-SlitBlades_old.py
+++ b/slic/devices/xoptics/slits/slits_old-SlitBlades.py
@@ -1,7 +1,7 @@
 from slic.devices.general.motor import Motor
 
 
-class SlitBlades_old:
+class SlitBlades:
 
     def __init__(self, ID, name=None, elog=None, z_undulator=None, description=None):
         self.ID = ID
diff --git a/slic/devices/xoptics/slits/slits_new-SlitBladesJJ_old.py b/slic/devices/xoptics/slits/slits_old-SlitBlades_JJ.py
similarity index 98%
rename from slic/devices/xoptics/slits/slits_new-SlitBladesJJ_old.py
rename to slic/devices/xoptics/slits/slits_old-SlitBlades_JJ.py
index 76e2fe63..802b09c8 100644
--- a/slic/devices/xoptics/slits/slits_new-SlitBladesJJ_old.py
+++ b/slic/devices/xoptics/slits/slits_old-SlitBlades_JJ.py
@@ -1,7 +1,7 @@
 from slic.devices.general.motor import Motor
 
 
-class SlitBladesJJ_old:
+class SlitBlades_JJ:
 
     def __init__(self, ID, name=None, elog=None):
         self.ID = ID
diff --git a/slic/devices/xoptics/slits/slits_old-SlitFourBlades_old.py b/slic/devices/xoptics/slits/slits_old-SlitFourBlades.py
similarity index 98%
rename from slic/devices/xoptics/slits/slits_old-SlitFourBlades_old.py
rename to slic/devices/xoptics/slits/slits_old-SlitFourBlades.py
index 19933255..01deeb38 100644
--- a/slic/devices/xoptics/slits/slits_old-SlitFourBlades_old.py
+++ b/slic/devices/xoptics/slits/slits_old-SlitFourBlades.py
@@ -1,7 +1,7 @@
 from slic.devices.general.motor import Motor
 
 
-class SlitFourBlades_old:
+class SlitFourBlades:
 
     def __init__(self, ID, name=None, elog=None, z_undulator=None, description=None):
         self.ID = ID
diff --git a/slic/devices/xoptics/slits/slits_old-SlitPosWidth_old.py b/slic/devices/xoptics/slits/slits_old-SlitPosWidth.py
similarity index 98%
rename from slic/devices/xoptics/slits/slits_old-SlitPosWidth_old.py
rename to slic/devices/xoptics/slits/slits_old-SlitPosWidth.py
index f8b95f7a..63d1fe88 100644
--- a/slic/devices/xoptics/slits/slits_old-SlitPosWidth_old.py
+++ b/slic/devices/xoptics/slits/slits_old-SlitPosWidth.py
@@ -1,7 +1,7 @@
 from slic.devices.general.motor import Motor
 
 
-class SlitPosWidth_old:
+class SlitPosWidth:
 
     def __init__(self, ID, name=None, elog=None, z_undulator=None, description=None):
         self.ID = ID