diff --git a/mlir/include/mlir/Dialect/LLVMIR/LLVMAttrDefs.td b/mlir/include/mlir/Dialect/LLVMIR/LLVMAttrDefs.td
--- a/mlir/include/mlir/Dialect/LLVMIR/LLVMAttrDefs.td
+++ b/mlir/include/mlir/Dialect/LLVMIR/LLVMAttrDefs.td
@@ -39,7 +39,7 @@
 def CConvAttr : LLVM_Attr<"CConv"> {
   let mnemonic = "cconv";
   let parameters = (ins
-    "CConv":$CConv
+    "CConv":$CallingConv
   );
   let hasCustomAssemblyFormat = 1;
 }
diff --git a/mlir/include/mlir/Dialect/LLVMIR/LLVMOps.td b/mlir/include/mlir/Dialect/LLVMIR/LLVMOps.td
--- a/mlir/include/mlir/Dialect/LLVMIR/LLVMOps.td
+++ b/mlir/include/mlir/Dialect/LLVMIR/LLVMOps.td
@@ -190,7 +190,7 @@
     "LLVM Calling Convention specification"> {
   let storageType = "::mlir::LLVM::CConvAttr";
   let returnType = "::mlir::LLVM::cconv::CConv";
-  let convertFromStorage = "$_self.getCConv()";
+  let convertFromStorage = "$_self.getCallingConv()";
   let constBuilderCall =
           "::mlir::LLVM::CConvAttr::get($_builder.getContext(), $0)";
 }
diff --git a/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp b/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp
--- a/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp
+++ b/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp
@@ -2958,10 +2958,10 @@
 
 void CConvAttr::print(AsmPrinter &printer) const {
   printer << "<";
-  if (static_cast<uint64_t>(getCConv()) <= cconv::getMaxEnumValForCConv())
-    printer << stringifyEnum(getCConv());
+  if (static_cast<uint64_t>(getCallingConv()) <= cconv::getMaxEnumValForCConv())
+    printer << stringifyEnum(getCallingConv());
   else
-    printer << "INVALID_cc_" << static_cast<uint64_t>(getCConv());
+    printer << "INVALID_cc_" << static_cast<uint64_t>(getCallingConv());
   printer << ">";
 }