diff --git a/bindings/xml/comment-xml-schema.rng b/bindings/xml/comment-xml-schema.rng
index 22af2efe614..df05cfc92d2 100644
--- a/bindings/xml/comment-xml-schema.rng
+++ b/bindings/xml/comment-xml-schema.rng
@@ -959,7 +959,7 @@
           <param name="pattern">.*\S.*</param>
         </data>
       </element>
-      <element name="Attribute">
+      <element name="InlineAttributes">
         <attribute name="attributes"/>
         <!-- Non-empty text content. -->
         <data type="string">
diff --git a/lib/IDE/CommentConversion.cpp b/lib/IDE/CommentConversion.cpp
index 2d89a27815a..db7a501bef1 100644
--- a/lib/IDE/CommentConversion.cpp
+++ b/lib/IDE/CommentConversion.cpp
@@ -73,7 +73,7 @@ struct CommentToXMLConverter {
   }
 
   void printInlineAttributes(const InlineAttributes *A) {
-    OS << "<Attribute attributes=\"";
+    OS << "<InlineAttributes attributes=\"";
     appendWithXMLEscaping(OS, A->getAttributes());
     OS << "\">";
 
@@ -81,7 +81,7 @@ struct CommentToXMLConverter {
       printASTNode(N);
     }
 
-    OS << "</Attribute>";
+    OS << "</InlineAttributes>";
   }
 
   void printBlockQuote(const BlockQuote *BQ) {
diff --git a/test/Inputs/comment_to_something_conversion.swift b/test/Inputs/comment_to_something_conversion.swift
index 52b6396686e..71bd6859238 100644
--- a/test/Inputs/comment_to_something_conversion.swift
+++ b/test/Inputs/comment_to_something_conversion.swift
@@ -68,7 +68,7 @@ public enum A012_AttachToEntities {
     ///
     /// ^[Attribute text](string: "attributed")
     @objc public func f0() {}
-    // CHECK: {{.*}}DocCommentAsXML=[<Function file="{{.*}}" line="{{.*}}" column="{{.*}}"><Name>f0()</Name><USR>c:@M@comment_to_xml@objc(cs)Attributes(im)f0</USR><Declaration>@objc public func f0()</Declaration><CommentParts><Abstract><Para>Here is an attribute:</Para></Abstract><Discussion><Para><Attribute attributes="string: &quot;attributed&quot;">Attribute text</Attribute></Para></Discussion></CommentParts></Function>]
+    // CHECK: {{.*}}DocCommentAsXML=[<Function file="{{.*}}" line="{{.*}}" column="{{.*}}"><Name>f0()</Name><USR>c:@M@comment_to_xml@objc(cs)Attributes(im)f0</USR><Declaration>@objc public func f0()</Declaration><CommentParts><Abstract><Para>Here is an attribute:</Para></Abstract><Discussion><Para><InlineAttributes attributes="string: &quot;attributed&quot;">Attribute text</InlineAttributes></Para></Discussion></CommentParts></Function>]
 }
 
 @objc public class AutomaticLink {