diff --git a/mlir/lib/Dialect/GPU/CMakeLists.txt b/mlir/lib/Dialect/GPU/CMakeLists.txt
index 8e4cef5af7e37..a59645480aba2 100644
--- a/mlir/lib/Dialect/GPU/CMakeLists.txt
+++ b/mlir/lib/Dialect/GPU/CMakeLists.txt
@@ -28,7 +28,7 @@ add_mlir_dialect_library(MLIRGPUTransforms
   Transforms/AllReduceLowering.cpp
   Transforms/AsyncRegionRewriter.cpp
   Transforms/BufferDeallocationOpInterfaceImpl.cpp
-  Transforms/DecomposeMemrefs.cpp
+  Transforms/DecomposeMemRefs.cpp
   Transforms/EliminateBarriers.cpp
   Transforms/GlobalIdRewriter.cpp
   Transforms/KernelOutlining.cpp
diff --git a/mlir/lib/Dialect/GPU/Transforms/DecomposeMemrefs.cpp b/mlir/lib/Dialect/GPU/Transforms/DecomposeMemRefs.cpp
similarity index 99%
rename from mlir/lib/Dialect/GPU/Transforms/DecomposeMemrefs.cpp
rename to mlir/lib/Dialect/GPU/Transforms/DecomposeMemRefs.cpp
index 1e4c1fbc58948..2b2d10a7733ec 100644
--- a/mlir/lib/Dialect/GPU/Transforms/DecomposeMemrefs.cpp
+++ b/mlir/lib/Dialect/GPU/Transforms/DecomposeMemRefs.cpp
@@ -1,4 +1,4 @@
-//===- DecomposeMemrefs.cpp - Decompose memrefs pass implementation -------===//
+//===- DecomposeMemRefs.cpp - Decompose memrefs pass implementation -------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/mlir/test/Integration/Dialect/Memref/cast-runtime-verification.mlir b/mlir/test/Integration/Dialect/MemRef/cast-runtime-verification.mlir
similarity index 100%
rename from mlir/test/Integration/Dialect/Memref/cast-runtime-verification.mlir
rename to mlir/test/Integration/Dialect/MemRef/cast-runtime-verification.mlir
diff --git a/mlir/test/Integration/Dialect/Memref/load-runtime-verification.mlir b/mlir/test/Integration/Dialect/MemRef/load-runtime-verification.mlir
similarity index 100%
rename from mlir/test/Integration/Dialect/Memref/load-runtime-verification.mlir
rename to mlir/test/Integration/Dialect/MemRef/load-runtime-verification.mlir
diff --git a/mlir/test/Integration/Dialect/Memref/memref_abi.c b/mlir/test/Integration/Dialect/MemRef/memref_abi.c
similarity index 100%
rename from mlir/test/Integration/Dialect/Memref/memref_abi.c
rename to mlir/test/Integration/Dialect/MemRef/memref_abi.c
diff --git a/mlir/test/Integration/Dialect/Memref/print-memref.mlir b/mlir/test/Integration/Dialect/MemRef/print-memref.mlir
similarity index 100%
rename from mlir/test/Integration/Dialect/Memref/print-memref.mlir
rename to mlir/test/Integration/Dialect/MemRef/print-memref.mlir
diff --git a/mlir/test/Integration/Dialect/Memref/reinterpret-cast-runtime-verification.mlir b/mlir/test/Integration/Dialect/MemRef/reinterpret-cast-runtime-verification.mlir
similarity index 100%
rename from mlir/test/Integration/Dialect/Memref/reinterpret-cast-runtime-verification.mlir
rename to mlir/test/Integration/Dialect/MemRef/reinterpret-cast-runtime-verification.mlir
diff --git a/mlir/test/Integration/Dialect/Memref/subview-runtime-verification.mlir b/mlir/test/Integration/Dialect/MemRef/subview-runtime-verification.mlir
similarity index 100%
rename from mlir/test/Integration/Dialect/Memref/subview-runtime-verification.mlir
rename to mlir/test/Integration/Dialect/MemRef/subview-runtime-verification.mlir
diff --git a/mlir/test/Integration/Dialect/Memref/verify-memref.mlir b/mlir/test/Integration/Dialect/MemRef/verify-memref.mlir
similarity index 100%
rename from mlir/test/Integration/Dialect/Memref/verify-memref.mlir
rename to mlir/test/Integration/Dialect/MemRef/verify-memref.mlir