diff --git a/mlir/include/mlir/IR/Attributes.h b/mlir/include/mlir/IR/Attributes.h
--- a/mlir/include/mlir/IR/Attributes.h
+++ b/mlir/include/mlir/IR/Attributes.h
@@ -31,7 +31,7 @@
 
   using ImplType = AttributeStorage;
   using ValueType = void;
-  using AbstractType = AbstractAttribute;
+  using AbstractTy = AbstractAttribute;
 
   constexpr Attribute() : impl(nullptr) {}
   /* implicit */ Attribute(const ImplType *impl)
@@ -83,7 +83,7 @@
   friend ::llvm::hash_code hash_value(Attribute arg);
 
   /// Return the abstract descriptor for this attribute.
-  const AbstractAttribute &getAbstractAttribute() const {
+  const AbstractTy &getAbstractAttribute() const {
     return impl->getAbstractAttribute();
   }
 
diff --git a/mlir/include/mlir/IR/StorageUniquerSupport.h b/mlir/include/mlir/IR/StorageUniquerSupport.h
--- a/mlir/include/mlir/IR/StorageUniquerSupport.h
+++ b/mlir/include/mlir/IR/StorageUniquerSupport.h
@@ -93,9 +93,9 @@
   /// call will abort otherwise.
   template <typename... IfaceModels>
   static void attachInterface(MLIRContext &context) {
-    typename ConcreteT::AbstractType *abstract =
-        ConcreteT::AbstractType::lookupMutable(TypeID::get<ConcreteT>(),
-                                               &context);
+    typename ConcreteT::AbstractTy *abstract =
+        ConcreteT::AbstractTy::lookupMutable(TypeID::get<ConcreteT>(),
+                                             &context);
     if (!abstract)
       llvm::report_fatal_error("Registering an interface for an attribute/type "
                                "that is not itself registered.");
diff --git a/mlir/include/mlir/IR/Types.h b/mlir/include/mlir/IR/Types.h
--- a/mlir/include/mlir/IR/Types.h
+++ b/mlir/include/mlir/IR/Types.h
@@ -79,7 +79,7 @@
 
   using ImplType = TypeStorage;
 
-  using AbstractType = AbstractType;
+  using AbstractTy = AbstractType;
 
   constexpr Type() : impl(nullptr) {}
   /* implicit */ Type(const ImplType *impl)
@@ -170,7 +170,7 @@
   }
 
   /// Return the abstract type descriptor for this type.
-  const AbstractType &getAbstractType() { return impl->getAbstractType(); }
+  const AbstractTy &getAbstractType() { return impl->getAbstractType(); }
 
 protected:
   ImplType *impl;