diff --git a/passes/opt/opt_clean/CMakeLists.txt b/passes/opt/clean/CMakeLists.txt
similarity index 100%
rename from passes/opt/opt_clean/CMakeLists.txt
rename to passes/opt/clean/CMakeLists.txt
diff --git a/passes/opt/opt_clean/cells_all.cc b/passes/opt/clean/cells_all.cc
similarity index 99%
rename from passes/opt/opt_clean/cells_all.cc
rename to passes/opt/clean/cells_all.cc
index aa97851e3..0c4eccf59 100644
--- a/passes/opt/opt_clean/cells_all.cc
+++ b/passes/opt/clean/cells_all.cc
@@ -19,7 +19,7 @@
 
 #include "kernel/ffinit.h"
 #include "kernel/yosys_common.h"
-#include "passes/opt/opt_clean/opt_clean.h"
+#include "passes/opt/clean/opt_clean.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
diff --git a/passes/opt/opt_clean/cells_temp.cc b/passes/opt/clean/cells_temp.cc
similarity index 98%
rename from passes/opt/opt_clean/cells_temp.cc
rename to passes/opt/clean/cells_temp.cc
index b325b68d9..2b9ff6db9 100644
--- a/passes/opt/opt_clean/cells_temp.cc
+++ b/passes/opt/clean/cells_temp.cc
@@ -17,7 +17,7 @@
  *
  */
 
-#include "passes/opt/opt_clean/opt_clean.h"
+#include "passes/opt/clean/opt_clean.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
diff --git a/passes/opt/opt_clean/inits.cc b/passes/opt/clean/inits.cc
similarity index 98%
rename from passes/opt/opt_clean/inits.cc
rename to passes/opt/clean/inits.cc
index 0618e739a..962164b37 100644
--- a/passes/opt/opt_clean/inits.cc
+++ b/passes/opt/clean/inits.cc
@@ -17,7 +17,7 @@
  *
  */
 
-#include "passes/opt/opt_clean/opt_clean.h"
+#include "passes/opt/clean/opt_clean.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
diff --git a/passes/opt/opt_clean/keep_cache.h b/passes/opt/clean/keep_cache.h
similarity index 100%
rename from passes/opt/opt_clean/keep_cache.h
rename to passes/opt/clean/keep_cache.h
diff --git a/passes/opt/opt_clean/opt_clean.cc b/passes/opt/clean/opt_clean.cc
similarity index 99%
rename from passes/opt/opt_clean/opt_clean.cc
rename to passes/opt/clean/opt_clean.cc
index 24085c34e..7bc5f0a34 100644
--- a/passes/opt/opt_clean/opt_clean.cc
+++ b/passes/opt/clean/opt_clean.cc
@@ -20,7 +20,7 @@
 #include "kernel/register.h"
 #include "kernel/log.h"
 #include "kernel/log_help.h"
-#include "passes/opt/opt_clean/opt_clean.h"
+#include "passes/opt/clean/opt_clean.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
diff --git a/passes/opt/opt_clean/opt_clean.h b/passes/opt/clean/opt_clean.h
similarity index 98%
rename from passes/opt/opt_clean/opt_clean.h
rename to passes/opt/clean/opt_clean.h
index c48a8188a..7086fdbc9 100644
--- a/passes/opt/opt_clean/opt_clean.h
+++ b/passes/opt/clean/opt_clean.h
@@ -19,7 +19,7 @@
 
 #include "kernel/rtlil.h"
 #include "kernel/threading.h"
-#include "passes/opt/opt_clean/keep_cache.h"
+#include "passes/opt/clean/keep_cache.h"
 
 #ifndef OPT_CLEAN_SHARED_H
 #define OPT_CLEAN_SHARED_H
diff --git a/passes/opt/opt_clean/wires.cc b/passes/opt/clean/wires.cc
similarity index 99%
rename from passes/opt/opt_clean/wires.cc
rename to passes/opt/clean/wires.cc
index e250bdadd..616426f9d 100644
--- a/passes/opt/opt_clean/wires.cc
+++ b/passes/opt/clean/wires.cc
@@ -17,7 +17,7 @@
  *
  */
 
-#include "passes/opt/opt_clean/opt_clean.h"
+#include "passes/opt/clean/opt_clean.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN