diff --git a/docs/odata-url-conventions/odata-url-conventions.html b/docs/odata-url-conventions/odata-url-conventions.html
index 3e45311c..78af704a 100644
--- a/docs/odata-url-conventions/odata-url-conventions.html
+++ b/docs/odata-url-conventions/odata-url-conventions.html
@@ -264,7 +264,7 @@ <h1 id="table-of-contents">Table of Contents</h1>
 <li><a href="#AddressingtheMediaStreamofaMediaEntity">4.14 Addressing the Media Stream of a Media Entity</a></li>
 <li><a href="#AddressingtheCrossJoinofEntitySets">4.15 Addressing the Cross Join of Entity Sets</a></li>
 <li><a href="#AddressingAllEntitiesinaService">4.16 Addressing All Entities in a Service</a></li>
-<li><a href="#PassingResourcePathandQueryOptionsintheRequestBody">4.17 Passing Resource Path and Query Options in the Request Body</a></li>
+<li><a href="#PassingQueryOptionsintheRequestBody">4.17 Passing Query Options in the Request Body</a></li>
 </ul></li>
 <li><a href="#QueryOptions">5 Query Options</a>
 <ul>
@@ -431,7 +431,7 @@ <h2 id="11-changes-from-earlier-versions"><a id="ChangesfromEarlierVersions" hre
 </thead>
 <tbody>
 <tr class="odd">
-<td><a href="#PassingResourcePathandQueryOptionsintheRequestBody">Section 4.17</a></td>
+<td><a href="#PassingQueryOptionsintheRequestBody">Section 4.17</a></td>
 <td><code>POST ~/$query</code> with <code>Content-Type: application/x-www-form-urlencoded</code> or <code>application/json</code></td>
 <td><a href="https://github.com/oasis-tcs/odata-specs/issues/320">320</a>, <a href="https://github.com/oasis-tcs/odata-specs/issues/371">371</a>, <a href="https://github.com/oasis-tcs/odata-specs/issues/2011">2011</a></td>
 </tr>
@@ -1041,7 +1041,7 @@ <h2 id="416-addressing-all-entities-in-a-service"><a id="AddressingAllEntitiesin
 </div>
 </details>
 <details open><summary>
-<h2 id="417-passing-resource-path-and-query-options-in-the-request-body"><a id="PassingResourcePathandQueryOptionsintheRequestBody" href="#PassingResourcePathandQueryOptionsintheRequestBody">4.17 Passing Resource Path and Query Options in the Request Body</a></h2>
+<h2 id="417-passing-query-options-in-the-request-body"><a id="PassingQueryOptionsintheRequestBody" href="#PassingQueryOptionsintheRequestBody">4.17 Passing Query Options in the Request Body</a></h2>
 </summary>
 <p>The resource path and the query options part of an OData URL can be quite long, potentially exceeding the maximum length of URLs supported by components involved in transmitting or processing the request. One way to avoid this is wrapping the request in a batch request, which has the penalty of needing to construct a well-formed batch request body.</p>
 <p>An easier alternative for <code>GET</code> requests is to append <code>/$query</code> to the resource path of the URL, use the <code>POST</code> verb instead of <code>GET</code>, and pass the resource path or the query options part of the URL in the request body.</p>
diff --git a/docs/odata-url-conventions/odata-url-conventions.md b/docs/odata-url-conventions/odata-url-conventions.md
index 25b0433b..3a26bb1a 100644
--- a/docs/odata-url-conventions/odata-url-conventions.md
+++ b/docs/odata-url-conventions/odata-url-conventions.md
@@ -133,7 +133,7 @@ For complete copyright information please see the full Notices section in an App
   - [4.14 Addressing the Media Stream of a Media Entity](#AddressingtheMediaStreamofaMediaEntity)
   - [4.15 Addressing the Cross Join of Entity Sets](#AddressingtheCrossJoinofEntitySets)
   - [4.16 Addressing All Entities in a Service](#AddressingAllEntitiesinaService)
-  - [4.17 Passing Resource Path and Query Options in the Request Body](#PassingResourcePathandQueryOptionsintheRequestBody)
+  - [4.17 Passing Query Options in the Request Body](#PassingQueryOptionsintheRequestBody)
 - [5 Query Options](#QueryOptions)
   - [5.1 System Query Options](#SystemQueryOptions)
     - [5.1.1 Common Expression Syntax](#CommonExpressionSyntax)
@@ -270,7 +270,7 @@ ecosystem of reusable client components and libraries.
 
 Section | Feature / Change | Issue
 --------|------------------|------
-[Section 4.17](#PassingResourcePathandQueryOptionsintheRequestBody)| `POST ~/$query` with `Content-Type: application/x-www-form-urlencoded` or `application/json`| [320](https://github.com/oasis-tcs/odata-specs/issues/320), [371](https://github.com/oasis-tcs/odata-specs/issues/371), [2011](https://github.com/oasis-tcs/odata-specs/issues/2011)
+[Section 4.17](#PassingQueryOptionsintheRequestBody)| `POST ~/$query` with `Content-Type: application/x-www-form-urlencoded` or `application/json`| [320](https://github.com/oasis-tcs/odata-specs/issues/320), [371](https://github.com/oasis-tcs/odata-specs/issues/371), [2011](https://github.com/oasis-tcs/odata-specs/issues/2011)
 [Section 5.1.1.7.1](#matchespattern)| New overload for function `matchespattern` with flags| [441](https://github.com/oasis-tcs/odata-specs/issues/441)
 [Section 5.1.3](#SystemQueryOptionexpand)| Nested query options can only appear once per expand item| [2004](https://github.com/oasis-tcs/odata-specs/issues/2004)
 [Section 5.1.8](#SystemQueryOptionsearch)| Allow alternative `$search` syntax| [293](https://github.com/oasis-tcs/odata-specs/issues/293)
@@ -1454,7 +1454,7 @@ http://host/service/$all/Model.Customer?$filter=contains(Name,'red')
 ```
 :::
 
-## <a id="PassingResourcePathandQueryOptionsintheRequestBody" href="#PassingResourcePathandQueryOptionsintheRequestBody">4.17 Passing Resource Path and Query Options in the Request Body</a>
+## <a id="PassingQueryOptionsintheRequestBody" href="#PassingQueryOptionsintheRequestBody">4.17 Passing Query Options in the Request Body</a>
 
 The resource path and the query options part of an OData URL can be quite long, potentially
 exceeding the maximum length of URLs supported by components involved in
diff --git a/odata-url-conventions/1 Introduction.md b/odata-url-conventions/1 Introduction.md
index 7aaa6eea..a0c4a6ed 100644
--- a/odata-url-conventions/1 Introduction.md	
+++ b/odata-url-conventions/1 Introduction.md	
@@ -26,7 +26,7 @@ ecosystem of reusable client components and libraries.
 
 Section | Feature / Change | Issue
 --------|------------------|------
-[Section ##PassingResourcePathandQueryOptionsintheRequestBody]| 
+[Section ##PassingQueryOptionsintheRequestBody]| 
 `POST ~/$query` with `Content-Type: application/x-www-form-urlencoded` or `application/json`| 
 [320](https://github.com/oasis-tcs/odata-specs/issues/320), [371](https://github.com/oasis-tcs/odata-specs/issues/371), [2011](https://github.com/oasis-tcs/odata-specs/issues/2011)
 [Section ##matchespattern]| 
diff --git a/odata-url-conventions/4 Resource Path.md b/odata-url-conventions/4 Resource Path.md
index a82be584..8a6bc95d 100644
--- a/odata-url-conventions/4 Resource Path.md	
+++ b/odata-url-conventions/4 Resource Path.md	
@@ -997,7 +997,7 @@ http://host/service/$all/Model.Customer?$filter=contains(Name,'red')
 ```
 :::
 
-## ##subsec Passing Resource Path and Query Options in the Request Body
+## ##subsec Passing Query Options in the Request Body
 
 The resource path and the query options part of an OData URL can be quite long, potentially
 exceeding the maximum length of URLs supported by components involved in