diff --git a/mlir/include/mlir/Dialect/Affine/Passes.td b/mlir/include/mlir/Dialect/Affine/Passes.td
index bc7ffe23e7f52..6ad45b828f657 100644
--- a/mlir/include/mlir/Dialect/Affine/Passes.td
+++ b/mlir/include/mlir/Dialect/Affine/Passes.td
@@ -414,7 +414,7 @@ def SimplifyAffineStructures : Pass<"affine-simplify-structures", "func::FuncOp"
   let constructor = "mlir::affine::createSimplifyAffineStructuresPass()";
 }
 
-def SimplifyAffineMinMax : InterfacePass<"affine-simplify-min-max", "FunctionOpInterface"> {
+def SimplifyAffineMinMaxPass : InterfacePass<"affine-simplify-min-max", "FunctionOpInterface"> {
   let summary = "Simplify affine min/max/apply";
   let description = [{
     Apply the SimplifyAffineMaxOp, SimplifyAffineMinOp and SimplifyAffineApplyOp
diff --git a/mlir/lib/Dialect/Affine/Transforms/SimplifyAffineMinMax.cpp b/mlir/lib/Dialect/Affine/Transforms/SimplifyAffineMinMax.cpp
index 21443a55a35ad..2cb78d2b94c63 100644
--- a/mlir/lib/Dialect/Affine/Transforms/SimplifyAffineMinMax.cpp
+++ b/mlir/lib/Dialect/Affine/Transforms/SimplifyAffineMinMax.cpp
@@ -240,14 +240,15 @@ struct SimplifyAffineApplyOp : public OpRewritePattern<AffineApplyOp> {
 
 namespace mlir {
 namespace affine {
-#define GEN_PASS_DEF_SIMPLIFYAFFINEMINMAX
+#define GEN_PASS_DEF_SIMPLIFYAFFINEMINMAXPASS
 #include "mlir/Dialect/Affine/Passes.h.inc"
 } // namespace affine
 } // namespace mlir
 
 /// Creates a simplification pass for affine min/max/apply.
 struct SimplifyAffineMinMaxPass
-    : public affine::impl::SimplifyAffineMinMaxBase<SimplifyAffineMinMaxPass> {
+    : public affine::impl::SimplifyAffineMinMaxPassBase<
+          SimplifyAffineMinMaxPass> {
   void runOnOperation() override;
 };