Index: mlir/include/mlir/Dialect/Affine/IR/AffineMemoryOpInterfaces.td
===================================================================
--- mlir/include/mlir/Dialect/Affine/IR/AffineMemoryOpInterfaces.td
+++ mlir/include/mlir/Dialect/Affine/IR/AffineMemoryOpInterfaces.td
@@ -148,7 +148,7 @@
   ];
 }
 
-def MemRefDereferencingInterface : OpInterface<"MemRefDereferencingInterface"> {
+def AffineMapAccessInterface : OpInterface<"AffineMapAccessInterface"> {
   let description = [{
       Interface to query characteristics of MemRef Dereferencing ops.
   }];
Index: mlir/include/mlir/Dialect/Affine/IR/AffineOps.h
===================================================================
--- mlir/include/mlir/Dialect/Affine/IR/AffineOps.h
+++ mlir/include/mlir/Dialect/Affine/IR/AffineOps.h
@@ -83,7 +83,7 @@
 class AffineDmaStartOp
     : public Op<AffineDmaStartOp, OpTrait::MemRefsNormalizable,
                 OpTrait::VariadicOperands, OpTrait::ZeroResult,
-                MemRefDereferencingInterface::Trait> {
+                AffineMapAccessInterface::Trait> {
 public:
   using Op::Op;
 
@@ -273,7 +273,7 @@
 class AffineDmaWaitOp
     : public Op<AffineDmaWaitOp, OpTrait::MemRefsNormalizable,
                 OpTrait::VariadicOperands, OpTrait::ZeroResult,
-                MemRefDereferencingInterface::Trait> {
+                AffineMapAccessInterface::Trait> {
 public:
   using Op::Op;
 
Index: mlir/include/mlir/Dialect/Affine/IR/AffineOps.td
===================================================================
--- mlir/include/mlir/Dialect/Affine/IR/AffineOps.td
+++ mlir/include/mlir/Dialect/Affine/IR/AffineOps.td
@@ -458,7 +458,7 @@
 class AffineLoadOpBase<string mnemonic, list<OpTrait> traits = []> :
     Affine_Op<mnemonic, !listconcat(traits,
         [DeclareOpInterfaceMethods<AffineReadOpInterface>,
-        DeclareOpInterfaceMethods<MemRefDereferencingInterface>,
+        DeclareOpInterfaceMethods<AffineMapAccessInterface>,
         MemRefsNormalizable])> {
   let arguments = (ins Arg<AnyMemRef, "the reference to load from",
       [MemRead]>:$memref,
@@ -700,7 +700,7 @@
 }
 
 def AffinePrefetchOp : Affine_Op<"prefetch",
-  [DeclareOpInterfaceMethods<MemRefDereferencingInterface>]> {
+  [DeclareOpInterfaceMethods<AffineMapAccessInterface>]> {
   let summary = "affine prefetch operation";
   let description = [{
     The "affine.prefetch" op prefetches data from a memref location described
@@ -779,7 +779,7 @@
 class AffineStoreOpBase<string mnemonic, list<OpTrait> traits = []> :
     Affine_Op<mnemonic, !listconcat(traits,
     [DeclareOpInterfaceMethods<AffineWriteOpInterface>,
-    DeclareOpInterfaceMethods<MemRefDereferencingInterface>,
+    DeclareOpInterfaceMethods<AffineMapAccessInterface>,
     MemRefsNormalizable])> {
   code extraClassDeclarationBase = [{
     /// Returns the operand index of the value to be stored.
Index: mlir/lib/Transforms/Utils/Utils.cpp
===================================================================
--- mlir/lib/Transforms/Utils/Utils.cpp
+++ mlir/lib/Transforms/Utils/Utils.cpp
@@ -72,7 +72,8 @@
   OpBuilder builder(op);
   // The following checks if op is dereferencing memref and performs the access
   // index rewrites.
-  if (!isa<MemRefDereferencingInterface>(*op)) {
+  auto affMapAcc = dyn_cast<AffineMapAccessInterface>(op);
+  if (!affMapAcc) {
     if (!allowNonDereferencingOps)
       // Failure: memref used in a non-dereferencing context (potentially
       // escapes); no replacement in these cases unless allowNonDereferencingOps
@@ -83,8 +84,7 @@
   }
   // Perform index rewrites for the dereferencing op and then replace the op
   NamedAttribute oldMapAttrPair =
-      dyn_cast<MemRefDereferencingInterface>(op).getAffineMapAttrForMemRef(
-          oldMemRef);
+      affMapAcc.getAffineMapAttrForMemRef(oldMemRef);
   AffineMap oldMap = oldMapAttrPair.second.cast<AffineMapAttr>().getValue();
   unsigned oldMapNumInputs = oldMap.getNumInputs();
   SmallVector<Value, 4> oldMapOperands(
@@ -258,7 +258,7 @@
     // Check if the memref was used in a non-dereferencing context. It is fine
     // for the memref to be used in a non-dereferencing way outside of the
     // region where this replacement is happening.
-    if (!isa<MemRefDereferencingInterface>(*op)) {
+    if (!isa<AffineMapAccessInterface>(*op)) {
       if (!allowNonDereferencingOps)
         return failure();
       // Currently we support the following non-dereferencing ops to be a