diff --git a/clang/include/clang/AST/Comment.h b/clang/include/clang/AST/Comment.h
index 8710f45bf011..a397703513c5 100644
--- a/clang/include/clang/AST/Comment.h
+++ b/clang/include/clang/AST/Comment.h
@@ -242,7 +242,7 @@ public:
                        getLocEnd());
   }
 
-  unsigned getArgCount() const {
+  unsigned getNumArgs() const {
     return Args.size();
   }
 
@@ -354,7 +354,7 @@ public:
 
   child_iterator child_end() const { return NULL; }
 
-  unsigned getAttrCount() const {
+  unsigned getNumAttrs() const {
     return Attributes.size();
   }
 
@@ -532,7 +532,7 @@ public:
                        getLocStart().getLocWithOffset(1 + Name.size()));
   }
 
-  unsigned getArgCount() const {
+  unsigned getNumArgs() const {
     return Args.size();
   }
 
@@ -611,7 +611,7 @@ public:
   }
 
   bool hasParamName() const {
-    return getArgCount() > 0;
+    return getNumArgs() > 0;
   }
 
   StringRef getParamName() const {
@@ -708,7 +708,7 @@ public:
     return CloseName;
   }
 
-  unsigned getLineCount() const {
+  unsigned getNumLines() const {
     return Lines.size();
   }
 
diff --git a/clang/lib/AST/CommentDumper.cpp b/clang/lib/AST/CommentDumper.cpp
index 7ff61e0a27f1..7a075a67488d 100644
--- a/clang/lib/AST/CommentDumper.cpp
+++ b/clang/lib/AST/CommentDumper.cpp
@@ -106,7 +106,7 @@ void CommentDumper::visitTextComment(const TextComment *C) {
 void CommentDumper::visitInlineCommandComment(const InlineCommandComment *C) {
   dumpComment(C);
 
-  for (unsigned i = 0, e = C->getArgCount(); i != e; ++i)
+  for (unsigned i = 0, e = C->getNumArgs(); i != e; ++i)
     OS << " Arg[" << i << "]=\"" << C->getArgText(i) << "\"";
 }
 
@@ -114,9 +114,9 @@ void CommentDumper::visitHTMLStartTagComment(const HTMLStartTagComment *C) {
   dumpComment(C);
 
   OS << " Name=\"" << C->getTagName() << "\"";
-  if (C->getAttrCount() != 0) {
+  if (C->getNumAttrs() != 0) {
     OS << " Attrs: ";
-    for (unsigned i = 0, e = C->getAttrCount(); i != e; ++i) {
+    for (unsigned i = 0, e = C->getNumAttrs(); i != e; ++i) {
       const HTMLStartTagComment::Attribute &Attr = C->getAttr(i);
       OS << " \"" << Attr.Name << "=\"" << Attr.Value << "\"";
     }
diff --git a/clang/lib/AST/CommentSema.cpp b/clang/lib/AST/CommentSema.cpp
index 955629c65828..6a8b32cee30d 100644
--- a/clang/lib/AST/CommentSema.cpp
+++ b/clang/lib/AST/CommentSema.cpp
@@ -130,7 +130,7 @@ ParamCommandComment *Sema::actOnParamCommandParamNameArg(
                                                 SourceLocation ArgLocEnd,
                                                 StringRef Arg) {
   // Parser will not feed us more arguments than needed.
-  assert(Command->getArgCount() == 0);
+  assert(Command->getNumArgs() == 0);
 
   if (!Command->isDirectionExplicit()) {
     // User didn't provide a direction argument.
@@ -362,8 +362,8 @@ void Sema::checkBlockCommandEmptyParagraph(BlockCommandComment *Command) {
   ParagraphComment *Paragraph = Command->getParagraph();
   if (Paragraph->isWhitespace()) {
     SourceLocation DiagLoc;
-    if (Command->getArgCount() > 0)
-      DiagLoc = Command->getArgRange(Command->getArgCount() - 1).getEnd();
+    if (Command->getNumArgs() > 0)
+      DiagLoc = Command->getArgRange(Command->getNumArgs() - 1).getEnd();
     if (!DiagLoc.isValid())
       DiagLoc = Command->getCommandNameRange().getEnd();
     Diag(DiagLoc, diag::warn_doc_block_command_empty_paragraph)
diff --git a/clang/unittests/AST/CommentParser.cpp b/clang/unittests/AST/CommentParser.cpp
index d2f87488ded2..cc9ed9c4cc43 100644
--- a/clang/unittests/AST/CommentParser.cpp
+++ b/clang/unittests/AST/CommentParser.cpp
@@ -244,9 +244,9 @@ struct NoArgs {};
   if (!AR)
     return AR;
 
-  if (ICC->getArgCount() != 0)
+  if (ICC->getNumArgs() != 0)
     return ::testing::AssertionFailure()
-        << "InlineCommandComment has " << ICC->getArgCount() << " arg(s), "
+        << "InlineCommandComment has " << ICC->getNumArgs() << " arg(s), "
            "expected 0";
 
   return ::testing::AssertionSuccess();
@@ -261,9 +261,9 @@ struct NoArgs {};
   if (!AR)
     return AR;
 
-  if (ICC->getArgCount() != 1)
+  if (ICC->getNumArgs() != 1)
     return ::testing::AssertionFailure()
-        << "InlineCommandComment has " << ICC->getArgCount() << " arg(s), "
+        << "InlineCommandComment has " << ICC->getNumArgs() << " arg(s), "
            "expected 1";
 
   StringRef ActualArg = ICC->getArgText(0);
@@ -326,9 +326,9 @@ struct NoAttrs {};
     return ::testing::AssertionFailure()
         << "HTMLStartTagComment is self-closing";
 
-  if (HST->getAttrCount() != 0)
+  if (HST->getNumAttrs() != 0)
     return ::testing::AssertionFailure()
-        << "HTMLStartTagComment has " << HST->getAttrCount() << " attr(s), "
+        << "HTMLStartTagComment has " << HST->getNumAttrs() << " attr(s), "
            "expected 0";
 
   return ::testing::AssertionSuccess();
@@ -348,9 +348,9 @@ struct NoAttrs {};
     return ::testing::AssertionFailure()
         << "HTMLStartTagComment is self-closing";
 
-  if (HST->getAttrCount() != 1)
+  if (HST->getNumAttrs() != 1)
     return ::testing::AssertionFailure()
-        << "HTMLStartTagComment has " << HST->getAttrCount() << " attr(s), "
+        << "HTMLStartTagComment has " << HST->getNumAttrs() << " attr(s), "
            "expected 1";
 
   StringRef ActualName = HST->getAttr(0).Name;
@@ -413,9 +413,9 @@ struct NoLines {};
   if (!AR)
     return AR;
 
-  if (VBC->getLineCount() != 0)
+  if (VBC->getNumLines() != 0)
     return ::testing::AssertionFailure()
-        << "VerbatimBlockComment has " << VBC->getLineCount() << " lines(s), "
+        << "VerbatimBlockComment has " << VBC->getNumLines() << " lines(s), "
            "expected 0";
 
   return ::testing::AssertionSuccess();
@@ -430,9 +430,9 @@ struct NoLines {};
   if (!AR)
     return AR;
 
-  if (VBC->getLineCount() != 1)
+  if (VBC->getNumLines() != 1)
     return ::testing::AssertionFailure()
-        << "VerbatimBlockComment has " << VBC->getLineCount() << " lines(s), "
+        << "VerbatimBlockComment has " << VBC->getNumLines() << " lines(s), "
            "expected 1";
 
   StringRef ActualLine0 = VBC->getText(0);
@@ -454,9 +454,9 @@ struct NoLines {};
   if (!AR)
     return AR;
 
-  if (VBC->getLineCount() != 2)
+  if (VBC->getNumLines() != 2)
     return ::testing::AssertionFailure()
-        << "VerbatimBlockComment has " << VBC->getLineCount() << " lines(s), "
+        << "VerbatimBlockComment has " << VBC->getNumLines() << " lines(s), "
            "expected 2";
 
   StringRef ActualLine0 = VBC->getText(0);
@@ -1110,7 +1110,7 @@ TEST_F(CommentParserTest, VerbatimBlock6) {
   {
     VerbatimBlockComment *VBC;
     ASSERT_TRUE(HasVerbatimBlockAt(FC, 1, VBC, "verbatim"));
-    ASSERT_EQ(4U, VBC->getLineCount());
+    ASSERT_EQ(4U, VBC->getNumLines());
     ASSERT_EQ(" Aaa", VBC->getText(0));
     ASSERT_EQ("",     VBC->getText(1));
     ASSERT_EQ(" Bbb", VBC->getText(2));