diff --git a/mlir/include/mlir/IR/FunctionSupport.h b/mlir/include/mlir/IR/FunctionSupport.h
index 215aec452bf9..6ce03f0b8cd7 100644
--- a/mlir/include/mlir/IR/FunctionSupport.h
+++ b/mlir/include/mlir/IR/FunctionSupport.h
@@ -159,12 +159,12 @@ public:
   }
 
   /// This is the list of blocks in the function.
-  using RegionType = Region::RegionType;
-  RegionType &getBlocks() { return getBody().getBlocks(); }
+  using BlockListType = Region::BlockListType;
+  BlockListType &getBlocks() { return getBody().getBlocks(); }
 
   // Iteration over the block in the function.
-  using iterator = RegionType::iterator;
-  using reverse_iterator = RegionType::reverse_iterator;
+  using iterator = BlockListType::iterator;
+  using reverse_iterator = BlockListType::reverse_iterator;
 
   iterator begin() { return getBody().begin(); }
   iterator end() { return getBody().end(); }
diff --git a/mlir/include/mlir/IR/Region.h b/mlir/include/mlir/IR/Region.h
index 96aeafbceb68..e051ebcfbe7d 100644
--- a/mlir/include/mlir/IR/Region.h
+++ b/mlir/include/mlir/IR/Region.h
@@ -43,12 +43,12 @@ public:
   /// parent container. The region must have a valid parent container.
   Location getLoc();
 
-  using RegionType = llvm::iplist<Block>;
-  RegionType &getBlocks() { return blocks; }
+  using BlockListType = llvm::iplist<Block>;
+  BlockListType &getBlocks() { return blocks; }
 
   // Iteration over the block in the function.
-  using iterator = RegionType::iterator;
-  using reverse_iterator = RegionType::reverse_iterator;
+  using iterator = BlockListType::iterator;
+  using reverse_iterator = BlockListType::reverse_iterator;
 
   iterator begin() { return blocks.begin(); }
   iterator end() { return blocks.end(); }
@@ -63,7 +63,7 @@ public:
   Block &front() { return blocks.front(); }
 
   /// getSublistAccess() - Returns pointer to member of region.
-  static RegionType Region::*getSublistAccess(Block *) {
+  static BlockListType Region::*getSublistAccess(Block *) {
     return &Region::blocks;
   }
 
@@ -154,7 +154,7 @@ public:
   void viewGraph();
 
 private:
-  RegionType blocks;
+  BlockListType blocks;
 
   /// This is the object we are part of.
   Operation *container;