diff --git a/accname/index.html b/accname/index.html
index cb4b8090a..2ec7e6107 100644
--- a/accname/index.html
+++ b/accname/index.html
@@ -646,6 +646,10 @@ <h4>Computation steps</h4>
                     </p>
                   </div>
                 </li>
+                <li id="comp_name_from_heading">
+                  <em>Name From Heading:</em> Otherwise, if the <code>current node</code> has a role that supports <a class="specref" href="#namefromheading">nameFrom: heading</a>, 
+                  return the text alternative of the first descendant <a>element</a> node matching the role of <code>heading</code> in a <em>depth-first search.</em>
+                </li>
                 <li id="comp_name_from_content">
                   <span id="step2F"><!-- Don't link to this legacy numbered ID. --></span><em>Name From Content:</em> Otherwise, if the <code>current node's</code> <a class="termref">role</a> allows
                   <a class="specref" href="#namefromcontent">name from content</a>, or if the <code>current node</code> is referenced by <code>aria-labelledby</code>, <code>aria-describedby</code>, or
diff --git a/html-aam/index.html b/html-aam/index.html
index 5e1fe5c4e..dd6ac973c 100644
--- a/html-aam/index.html
+++ b/html-aam/index.html
@@ -16816,7 +16816,43 @@ <h4>`iframe` Element Accessible Name Computation</h4>
           </p>
         </section>
         <section>
-          <h4>Section and Grouping Element Accessible Name Computation</h4>
+          <h4>`dialog` Element Accessible Name Computation</h4>
+          <ol>
+            <li>
+              If the `dialog` element has an <a data-cite="wai-aria-1.2/#aria-label">`aria-label`</a> or an <a data-cite="wai-aria-1.2/#aria-labelledby">`aria-labelledby`</a> 
+              attribute the <a data-cite="accname-1.2/#dfn-accessible-name">accessible name</a> is to be calculated using the algorithm defined in
+              <a class="accname">Accessible Name and Description: Computation and API Mappings</a>.
+            </li>
+            <li>
+              If the <a data-cite="accname-1.2/#dfn-accessible-name">accessible name</a> is still empty, then: if the `dialog` element has a
+              <a href="https://dom.spec.whatwg.org/#concept-tree-descendant">descendant</a> element with a role of `heading`, then use the 
+              <a data-cite="accname-1.2/#mapping_additional_nd_te">text equivalent computation</a> of the element as defined in
+              <a data-cite="accname-1.2/#comp_name_from_heading">accname: Name from Heading</a>.
+            </li>
+            <li>Otherwise, use the `title` attribute.</li>
+            <li>If none of the above yield a usable text string there is no <a data-cite="accname-1.2/#dfn-accessible-name">accessible name</a>.</li>
+          </ol>
+        </section>
+        <section>
+          <h4>`article` Element Accessible Name Computation</h4>
+          <ol>
+            <li>
+              If the `article` element has an <a data-cite="wai-aria-1.2/#aria-label">`aria-label`</a> or an <a data-cite="wai-aria-1.2/#aria-labelledby">`aria-labelledby`</a> 
+              attribute the <a data-cite="accname-1.2/#dfn-accessible-name">accessible name</a> is to be calculated using the algorithm defined in
+              <a class="accname">Accessible Name and Description: Computation and API Mappings</a>.
+            </li>
+            <li>
+              If the <a data-cite="accname-1.2/#dfn-accessible-name">accessible name</a> is still empty, then: if the `article` element has a
+              <a href="https://dom.spec.whatwg.org/#concept-tree-descendant">descendant</a> element with a role of `heading`, then use the 
+              <a data-cite="accname-1.2/#mapping_additional_nd_te">text equivalent computation</a> of the element as defined in
+              <a data-cite="accname-1.2/#comp_name_from_heading">accname: Name from Heading</a>.
+            </li>
+            <li>Otherwise, use the `title` attribute.</li>
+            <li>If none of the above yield a usable text string there is no <a data-cite="accname-1.2/#dfn-accessible-name">accessible name</a>.</li>
+          </ol>
+        </section>
+        <section>
+          <h4>Other Section and Grouping Element Accessible Name Computation</h4>
           <ol>
             <li>
               If the element has an <a data-cite="wai-aria-1.2/#aria-label">`aria-label`</a> or an <a data-cite="wai-aria-1.2/#aria-labelledby">`aria-labelledby`</a> attribute the
diff --git a/index.html b/index.html
index 0d588ae06..84fdd9b04 100644
--- a/index.html
+++ b/index.html
@@ -1265,15 +1265,27 @@ <h3>Name From</h3>
               having the lowest precedence for specifying a text alternative.
             </li>
             <li>
-              contents: name comes from the text value of the <a>element</a> node. Although this might be allowed in addition to "author" in some <a>roles</a>, this is used in content only if higher
-              priority "author" features are not provided. Priority is defined by the <cite><a href="" class="accname">Accessible Name and Description Computation</a></cite> [[ACCNAME-1.2]].
+              heading: name comes from the text alternative of the first descendant <a>element</a> node (depth-first search) matching the role of <code>heading</code> as defined in the AccName 
+              computation algorithm for nameFrom: heading. Although "namefrom: heading" is allowed in addition to "namefrom: author" in some <a>roles</a>, "namefrom: heading" is used in content only 
+              if higher priority "namefrom: author" features are not provided. Priority is defined by the <cite><a href="" class="accname">Accessible Name and Description Computation</a></cite> 
+              [[ACCNAME-1.2]].
             </li>
+            <li>
+              contents: name comes from the text value of the <a>element</a> node. Although this might be allowed in addition to "namefrom: author" or "namefrom:heading" in some <a>roles</a>, this 
+              is used in content only if higher priority "namefrom: author" or "namefrom: heading" features are not provided. Priority is defined by the <cite><a href="" class="accname">Accessible 
+              Name and Description Computation</a></cite> [[ACCNAME-1.2]].
+            </li>
+            <li>Priority is defined by the <cite><a href="" class="accname">Accessible Name and Description Computation</a></cite> [[ACCNAME-1.2]].</li>
             <li>prohibited: the element does not support name from author. Authors MUST NOT use the <pref>aria-label</pref> or <pref>aria-labelledby</pref> attributes to name the element.</li>
           </ol>
           <section id="namefromauthor">
             <h4>Roles Supporting Name from Author</h4>
             <div id="index_fromauthor"></div>
           </section>
+          <section id="namefromheading">
+            <h4>Roles Supporting Name from Heading</h4>
+            <div id="index_fromheading"></div>
+          </section>
           <section id="namefromcontent">
             <h4>Roles Supporting Name from Content</h4>
             <div id="index_fromcontent"></div>
@@ -1670,7 +1682,12 @@ <h2>Definition of Roles</h2>
               </tr>
               <tr>
                 <th class="role-namefrom-head" scope="row">Name From:</th>
-                <td class="role-namefrom">author</td>
+                <td class="role-namefrom">
+                  <ul>
+                    <li>author</li>
+                    <li>heading</li>
+                  </ul>
+                </td>
               </tr>
               <tr>
                 <th class="role-namerequired-head" scope="row">Accessible Name Required:</th>
@@ -1886,7 +1903,12 @@ <h2>Definition of Roles</h2>
               </tr>
               <tr>
                 <th class="role-namefrom-head" scope="row">Name From:</th>
-                <td class="role-namefrom">author</td>
+                <td class="role-namefrom">
+                  <ul>
+                    <li>author</li>
+                    <li>heading</li>
+                  </ul>
+                </td>
               </tr>
               <tr>
                 <th class="role-namerequired-head" scope="row">Accessible Name Required:</th>
@@ -3631,7 +3653,7 @@ <h2>Definition of Roles</h2>
               focus to dialogs. See the <a href="https://www.w3.org/WAI/ARIA/apg/patterns/dialog-modal/">WAI-ARIA Authoring Practices: Dialog (modal) pattern</a> for additional details on implementing
               modal dialog design patterns.
             </p>
-            <p>Authors SHOULD provide an accessible name for a dialog, which can be done with the <pref>aria-label</pref> or <pref>aria-labelledby</pref> attribute.</p>
+            <p>Authors SHOULD provide an accessible name for a dialog, using either <a href="#namecalculation">namefrom</a>: author or <a href="#namecalculation">namefrom</a>: heading.</p>
             <p>
               Authors SHOULD ensure that all dialogs (both modal and non-modal) have at least one <a>focusable</a> descendant element. Authors SHOULD focus an element in the modal dialog when it is
               displayed, and authors SHOULD constrain keyboard focus to focusable elements within a modal dialog, until dismissed.
@@ -3721,7 +3743,12 @@ <h2>Definition of Roles</h2>
               </tr>
               <tr>
                 <th class="role-namefrom-head" scope="row">Name From:</th>
-                <td class="role-namefrom">author</td>
+                <td class="role-namefrom">
+                  <ul>
+                    <li>author</li>
+                    <li>heading</li>
+                  </ul>
+                </td>
               </tr>
               <tr>
                 <th class="role-namerequired-head" scope="row">Accessible Name Required:</th>