diff --git a/html-aam/index.html b/html-aam/index.html
index dbc72d153..8b66d92ba 100644
--- a/html-aam/index.html
+++ b/html-aam/index.html
@@ -2320,7 +2320,7 @@ <h4 id="el-figcaption">`figcaption`</h4>
             </tr>
             <tr>
               <th>[[wai-aria-1.2]]</th>
-              <td><a class="core-mapping" href="#role-map-group">`caption`</a> role</td>
+              <td><a class="core-mapping" href="#role-map-caption">`caption`</a> role</td>
             </tr>
             <tr>
               <th><a data-cite="core-aam-1.2/#roleMappingComputedRole">Computed Role</a></th>
@@ -2331,32 +2331,25 @@ <h4 id="el-figcaption">`figcaption`</h4>
                 <a href="https://msdn.microsoft.com/en-us/library/dd373608%28v=VS.85%29.aspx">MSAA</a> + <a href="http://accessibility.linuxfoundation.org/a11yspecs/ia2/docs/html/">IAccessible2</a>
               </th>
               <td>
-                <div class="role"><span class="type">Roles:</span> `ROLE_SYSTEM_TEXT`; `IA2_ROLE_CAPTION`</div>
-                <div class="relations"><span class="type">Relations:</span> `IA2_RELATION_LABEL_FOR` with parent <a href="#el-figure">`figure`</a> element</div>
+                <div class="role"><span class="type">Role:</span> Use WAI-ARIA mapping</div>
               </td>
             </tr>
             <tr>
               <th><a href="https://msdn.microsoft.com/en-us/library/ms726297%28v=VS.85%29.aspx">UIA</a></th>
               <td>
-                <div class="ctrltype"><span class="type">Control Type:</span> `Text`</div>
+                <div class="ctrltype"><span class="type">Role:</span> Use WAI-ARIA mapping</div>
               </td>
             </tr>
             <tr>
               <th><a href="https://gnome.pages.gitlab.gnome.org/atk/">ATK</a></th>
               <td>
-                <div class="role"><span class="type">Role:</span> `ATK_ROLE_CAPTION`</div>
-                <div class="relations">
-                  <span class="type">Relations:</span>
-                  `ATK_RELATION_LABEL_FOR` with parent <a href="#el-figure">`figure`</a> element
-                </div>
+                <div class="role"><span class="type">Role:</span> Use WAI-ARIA mapping</div>
               </td>
             </tr>
             <tr>
               <th><a href="https://developer.apple.com/reference/appkit/nsaccessibility">AX</a></th>
               <td>
-                <div class="role"><span class="type">AXRole:</span> `AXGroup`</div>
-                <div class="subrole"><span class="type">AXSubrole:</span> `(nil)`</div>
-                <div class="roledesc"><span class="type">AXRoleDescription:</span> `"group"`</div>
+                <div class="role"><span class="type">Role:</span> Use WAI-ARIA mapping</div>
               </td>
             </tr>
             <!-- <th><a href="#accessible-name-and-description-computation">Naming Algorithm</a></th> -->
@@ -2389,24 +2382,18 @@ <h4 id="el-figure">`figure`</h4>
               </th>
               <td>
                 <div class="role"><span class="type">Role:</span> Use WAI-ARIA mapping</div>
-                <div class="relations"><span class="type">Relations:</span> `IA2_RELATION_LABELLED_BY` with child <a href="#el-figcaption">`figcaption`</a> element</div>
               </td>
             </tr>
             <tr>
               <th><a href="https://msdn.microsoft.com/en-us/library/ms726297%28v=VS.85%29.aspx">UIA</a></th>
               <td>
                 <div class="role"><span class="type">Role:</span> Use WAI-ARIA mapping</div>
-                <div class="general">
-                  Accessible name derived from `figcaption` according to the <a href="#figure-element-accessible-name-computation">`figure` Element Accessible Name Computation</a>
-                </div>
               </td>
             </tr>
             <tr>
               <th><a href="https://gnome.pages.gitlab.gnome.org/atk/">ATK</a></th>
               <td>
                 <div class="role"><span class="type">Role:</span> Use WAI-ARIA mapping</div>
-                <div class="name"><span class="type">Name:</span> related <a href="#el-figcaption">`figcaption`</a> content</div>
-                <div class="relations"><span class="type">Relations:</span> `ATK_RELATION_LABELLED_BY` with child <a href="#el-figcaption">`figcaption`</a> element</div>
               </td>
             </tr>
             <tr>
@@ -16245,18 +16232,19 @@ <h4>`summary` Element Accessible Name Computation</h4>
         </section>
         <section>
           <h4>`figure` Element Accessible Name Computation</h4>
+          <p>
+            A <a href="#el-figcaption">`figcaption`</a> provides additional information related to its parent <a href="#el-figure">`figure`</a> element. A `figcaption` does not take part in the
+            <a data-cite="accname-1.2/#dfn-accessible-name">accessible name</a> or <a data-cite="accname-1.2/#dfn-accessible-description">accessible description</a>
+            computation, unless explicitly referenced by an author.
+          </p>
           <ol>
             <li>
               If the `figure` 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 href="" 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 `figure` element has a
-              <a href="https://dom.spec.whatwg.org/#concept-tree-child">child</a> that is a `figcaption` element, then use the subtree of the first such element.
-            </li>
-            <li>If the <a data-cite="accname-1.2/#dfn-accessible-name">accessible name</a> is still empty, then: if the `figure` element has a `title` attribute, then use that attribute.</li>
-            <li>Otherwise, there is no <a data-cite="accname-1.2/#dfn-accessible-name">accessible name</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>
@@ -16268,13 +16256,14 @@ <h4>`img` Element Accessible Name Computation</h4>
               <a href="" class="accname">Accessible Name and Description: Computation and API Mappings</a>.
             </li>
             <li>
-              Otherwise use `alt` attribute, even if its value is the empty string.
+              If the <a data-cite="accname-1.2/#dfn-accessible-name">accessible name</a> is still empty: use `alt` attribute, even if its value is the empty string.
               <div class="note">
                 An `img` with an `alt` attribute whose value is the empty string is mapped to the
                 <a class="core-mapping" href="#role-map-presentation">`presentation`</a> role. It has no accessible name.
               </div>
             </li>
-            <li>Otherwise, if there is no `alt` attribute use the `title` attribute.</li>
+            <li>If the <a data-cite="accname-1.2/#dfn-accessible-name">accessible name</a> is still empty and there is no `alt` attribute, use the `title` attribute.</li>
+            <li>If the <a data-cite="accname-1.2/#dfn-accessible-name">accessible name</a> is still empty and there are no `alt` or `title` attributes, and the `img` is a descendent of a `figure` element with a child `figcaption` but no other <a data-cite="html/dom.html#flow-content-2">flow content</a> or <a data-cite="html/dom.html#inter-element-whitespace">whitespace</a> descendents, then use the <a data-cite="accname-1.2/#mapping_additional_nd_te">text equivalent computation</a> of the `figcaption` element's subtree.  
             <li>Otherwise there is no <a data-cite="accname-1.2/#dfn-accessible-name">accessible name</a>.</li>
           </ol>
         </section>