Index: mlir/include/mlir/Dialect/Func/Transforms/Passes.h
===================================================================
--- mlir/include/mlir/Dialect/Func/Transforms/Passes.h
+++ mlir/include/mlir/Dialect/Func/Transforms/Passes.h
@@ -24,7 +24,6 @@
 
 class RewritePatternSet;
 
-namespace func {
 
 #define GEN_PASS_DECL
 #include "mlir/Dialect/Func/Transforms/Passes.h.inc"
@@ -43,7 +42,6 @@
 #define GEN_PASS_REGISTRATION
 #include "mlir/Dialect/Func/Transforms/Passes.h.inc"
 
-} // namespace func
 } // namespace mlir
 
 #endif // MLIR_DIALECT_FUNC_TRANSFORMS_PASSES_H
Index: mlir/include/mlir/Dialect/Func/Transforms/Passes.td
===================================================================
--- mlir/include/mlir/Dialect/Func/Transforms/Passes.td
+++ mlir/include/mlir/Dialect/Func/Transforms/Passes.td
@@ -35,7 +35,7 @@
     Finally, this pass fails for unknown terminators, as we cannot decide
     whether they need rewriting.
   }];
-  let constructor = "mlir::func::createFuncBufferizePass()";
+  let constructor = "mlir::createFuncBufferizePass()";
   let dependentDialects = ["bufferization::BufferizationDialect",
                            "memref::MemRefDialect"];
 }
@@ -48,7 +48,7 @@
     name. The pass chooses one representative per equivalence class, erases
     the remainder, and updates function calls accordingly.
   }];
-  let constructor = "mlir::func::createDuplicateFunctionEliminationPass()";
+  let constructor = "mlir::createDuplicateFunctionEliminationPass()";
 }
 
 #endif // MLIR_DIALECT_FUNC_TRANSFORMS_PASSES_TD
Index: mlir/include/mlir/InitAllPasses.h
===================================================================
--- mlir/include/mlir/InitAllPasses.h
+++ mlir/include/mlir/InitAllPasses.h
@@ -61,7 +61,7 @@
   registerAsyncPasses();
   arith::registerArithPasses();
   bufferization::registerBufferizationPasses();
-  func::registerFuncPasses();
+  registerFuncPasses();
   registerGPUPasses();
   registerGpuSerializeToCubinPass();
   registerGpuSerializeToHsacoPass();
Index: mlir/lib/Dialect/Func/Transforms/DuplicateFunctionElimination.cpp
===================================================================
--- mlir/lib/Dialect/Func/Transforms/DuplicateFunctionElimination.cpp
+++ mlir/lib/Dialect/Func/Transforms/DuplicateFunctionElimination.cpp
@@ -10,11 +10,14 @@
 #include "mlir/Dialect/Func/Transforms/Passes.h"
 
 namespace mlir {
-namespace {
-
 #define GEN_PASS_DEF_DUPLICATEFUNCTIONELIMINATIONPASS
 #include "mlir/Dialect/Func/Transforms/Passes.h.inc"
+} // namespace mlir
+
+using namespace mlir;
+using namespace mlir::func;
 
+namespace {
 // Define a notion of function equivalence that allows for reuse. Ignore the
 // symbol name for this purpose.
 struct DuplicateFuncOpEquivalenceInfo
@@ -112,8 +115,6 @@
 
 } // namespace
 
-std::unique_ptr<Pass> mlir::func::createDuplicateFunctionEliminationPass() {
+std::unique_ptr<Pass> mlir::createDuplicateFunctionEliminationPass() {
   return std::make_unique<DuplicateFunctionEliminationPass>();
 }
-
-} // namespace mlir
Index: mlir/lib/Dialect/Func/Transforms/FuncBufferize.cpp
===================================================================
--- mlir/lib/Dialect/Func/Transforms/FuncBufferize.cpp
+++ mlir/lib/Dialect/Func/Transforms/FuncBufferize.cpp
@@ -66,6 +66,6 @@
 };
 } // namespace
 
-std::unique_ptr<Pass> mlir::func::createFuncBufferizePass() {
+std::unique_ptr<Pass> mlir::createFuncBufferizePass() {
   return std::make_unique<FuncBufferizePass>();
 }