diff --git a/api-ref/src/wadls/common_project.ent b/api-ref/src/wadls/common_project.ent
index 0773461f3..d765e9e35 100644
--- a/api-ref/src/wadls/common_project.ent
+++ b/api-ref/src/wadls/common_project.ent
@@ -31,6 +31,21 @@
 <!ENTITY limitMarkerReqParameter '
 &limitReqParameter;
 &markerReqParameter;'>
+<!ENTITY x-openstack-request-idHeader '
+<param xmlns="http://wadl.dev.java.net/2009/02"
+   name="x-openstack-request-id" style="header" required="false"
+   type="xsd:string">
+<wadl:doc xmlns="http://docbook.org/ns/docbook"
+   xmlns:wadl="http://wadl.dev.java.net/2009/02"
+   xml:lang="EN">
+  <para>
+    A unique ID for tracking the request. The request ID associated with the
+    request appears in the log lines for that request. By default, the
+    middleware configuration ensures that the request ID appears in the log
+    files.
+  </para>
+</wadl:doc>
+</param>'>
 <!-- Timestamp entities           -->
 <!-- ISO 8601 request parameters  -->
 <!ENTITY before_timestamp-QueryParameter '
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/common.ent b/api-ref/src/wadls/compute-api/src/v2.1/common.ent
index 5ee6667cd..169b478cf 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/common.ent
+++ b/api-ref/src/wadls/compute-api/src/v2.1/common.ent
@@ -69,19 +69,6 @@
 <representation mediaType="application/xml" element="csapi:buildInProgress"/>
 <representation mediaType="application/json"/>
 </response>'>
-<!-- For v2.1 x-openstack-request-id  -->
-<!ENTITY x-openstack-request-idHeader '
-<param xmlns="http://wadl.dev.java.net/2009/02"
-   name="X-OpenStack-Request-ID" style="header" required="false"
-   type="xsd:string">
-   <wadl:doc xmlns="http://docbook.org/ns/docbook"
-      xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
-      <para>
-         A unique request ID that provides tracking for the request. Provider
-         must configure middleware to provide the request ID.
-      </para>
-   </wadl:doc>
-</param>'>
 <!-- TEMPLATE PARAMETERS -->
 <!ENTITY admin_tenant_idTemplateParameter '
 <param name="admin_tenant_id" style="template" type="csapi:UUID"
@@ -2964,22 +2951,6 @@
    </para>
 </wadl:doc>
 </param>'>
-<!-- For v2.1 x-compute-request-id  -->
-<!ENTITY x-compute-request-idHeader '
-<param xmlns="http://wadl.dev.java.net/2009/02"
-   name="X-Compute-Request-ID" style="header" required="false"
-   type="xsd:string">
-<wadl:doc xmlns="http://docbook.org/ns/docbook"
-   xmlns:wadl="http://wadl.dev.java.net/2009/02"
-   xml:lang="EN">
-  <para>
-    A unique ID for tracking the request. The request ID associated with the
-    request appears in the log lines for that request. By default, the
-    middleware configuration ensures that the request ID appears in the log
-    files.
-  </para>
-</wadl:doc>
-</param>'>
 <!ENTITY securityGroupRequestParameters '
 <param xmlns:csapi="http://docs.openstack.org/compute/api/v2"
    xmlns="http://wadl.dev.java.net/2009/02"
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/extensions-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/extensions-v2.1.wadl
index c29b309f4..be451a42c 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/extensions-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/extensions-v2.1.wadl
@@ -93,7 +93,7 @@
                     <xsdxt:code
                         href="../samples/extensions/extensions-list-response.json"
                     />
-                </wadl:doc> &x-openstack-request-idHeader;
+                </wadl:doc> &x-openstack-request-idResponseHeader;
             </representation>
         </response>
         <response status="203"/>
@@ -111,7 +111,7 @@
                     xml:lang="EN">
                     <xsdxt:code href="../samples/extensions/extension-show-response.json"
                     />
-                </wadl:doc> &x-openstack-request-idHeader;
+                </wadl:doc> &x-openstack-request-idResponseHeader;
             </representation>
         </response>
         <response status="203"/>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/flavors-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/flavors-v2.1.wadl
index 92b939082..263d89ff5 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/flavors-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/flavors-v2.1.wadl
@@ -47,7 +47,7 @@
                 <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook">
                     <xsdxt:code
                         href="../samples/flavors/flavor-show-response.json"/>
-                </wadl:doc> &x-openstack-request-idHeader;
+                </wadl:doc> &x-openstack-request-idResponseHeader;
             </representation>
         </response>
     </method>
@@ -65,7 +65,7 @@
                     <xsdxt:code
                         href="../samples/flavors/flavors-list-detail-response.json"
                     />
-                </wadl:doc> &x-openstack-request-idHeader;
+                </wadl:doc> &x-openstack-request-idResponseHeader;
             </representation>
         </response>
     </method>
@@ -83,7 +83,7 @@
                     <xsdxt:code
                         href="../samples/flavors/flavors-list-response.json"
                     />
-                </wadl:doc> &x-openstack-request-idHeader;
+                </wadl:doc> &x-openstack-request-idResponseHeader;
             </representation>
         </response>
     </method>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/images-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/images-v2.1.wadl
index 72ab77b7d..3b73e5fcd 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/images-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/images-v2.1.wadl
@@ -104,7 +104,7 @@
             </wadl:doc>
          </representation>
          <representation mediaType="application/xml">
-            &x-compute-request-idHeader;
+            &x-openstack-request-idHeader;
             <param name="next" style="plain" type="xsd:anyURI"
                path="/csapi:images/atom:link[@rel='next']/@href">
             <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
@@ -148,7 +148,7 @@
             </wadl:doc>
          </representation>
          <representation mediaType="application/xml">
-            &x-compute-request-idHeader;
+            &x-openstack-request-idHeader;
             <param name="images" style="plain" required="true"
                type="csapi:ImagesWithOnlyIDsNamesLinks" path="/csapi:images">
             <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
@@ -191,7 +191,7 @@
             <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
                <xsdxt:code href="../samples/images/image-show-response.json"/>
             </wadl:doc>
-            &x-compute-request-idHeader;
+            &x-openstack-request-idHeader;
          </representation>
       </response>
       <response status="203">
@@ -221,7 +221,7 @@
             </wadl:doc>
          </representation>
          <representation mediaType="application/xml">
-            &x-compute-request-idHeader;
+            &x-openstack-request-idHeader;
             <param name="next" style="plain" type="xsd:anyURI"
                path="/csapi:metadata/atom:link[@rel='next']/@href">
             <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
@@ -354,7 +354,7 @@
             <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
                <xsdxt:code href="../samples/images/image-metadata-item-show-response.json"/>
             </wadl:doc>
-            &x-compute-request-idHeader;
+            &x-openstack-request-idHeader;
          </representation>
       </response>
       <response status="203">
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/limits-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/limits-v2.1.wadl
index 5234632fe..b1ca1b5aa 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/limits-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/limits-v2.1.wadl
@@ -38,7 +38,7 @@
                         href="../samples/limits/limits-get-response.json"
                     />
                 </wadl:doc>
-                &x-openstack-request-idHeader;
+                &x-openstack-request-idResponseHeader;
             </representation>
         </response>
     </method>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/metadata-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/metadata-v2.1.wadl
index 0a8144c75..cee778067 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/metadata-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/metadata-v2.1.wadl
@@ -53,7 +53,7 @@
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
                     <xsdxt:code href="../samples/metadata/server-metadata-list-response.json"/>
-                </wadl:doc> &x-openstack-request-idHeader;
+                </wadl:doc> &x-openstack-request-idResponseHeader;
             </representation>
         </response>
     </method>
@@ -140,7 +140,7 @@
             <representation mediaType="application/json">
                 <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
                     <xsdxt:code href="../samples/metadata/server-metadata-show-response.json"/>
-                </wadl:doc> &x-openstack-request-idHeader;
+                </wadl:doc> &x-openstack-request-idResponseHeader;
             </representation>
         </response>
     </method>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-agents-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-agents-v2.1.wadl
index 82e207274..ceb1df33d 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-agents-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-agents-v2.1.wadl
@@ -68,7 +68,7 @@
                     <xsdxt:code
                         href="../samples/os-agents/agents-list-response.json"
                     />
-                </wadl:doc> &x-openstack-request-idHeader;
+                </wadl:doc> &x-openstack-request-idResponseHeader;
             </representation>
         </response>
     </method>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-cells-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-cells-v2.1.wadl
index a686cbab3..5b445a919 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-cells-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-cells-v2.1.wadl
@@ -72,7 +72,7 @@
                     <xsdxt:code
                         href="../samples/os-cells/cell-show-response.json"
                     />
-                </wadl:doc> &x-openstack-request-idHeader;
+                </wadl:doc> &x-openstack-request-idResponseHeader;
             </representation>
         </response> &fault501; </method>
     <method name="GET" id="listCellssDetail">
@@ -91,7 +91,7 @@
                     <xsdxt:code
                         href="../samples/os-cells/cells-list-empty-response.json"
                     />
-                </wadl:doc> &x-openstack-request-idHeader;
+                </wadl:doc> &x-openstack-request-idResponseHeader;
             </representation>
         </response> &fault501; </method>
     <method name="GET" id="listCells">
@@ -110,7 +110,7 @@
                     <xsdxt:code
                         href="../samples/os-cells/cells-list-response.json"
                     />
-                </wadl:doc> &x-openstack-request-idHeader;
+                </wadl:doc> &x-openstack-request-idResponseHeader;
             </representation>
         </response> &fault501; </method>
 </application>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-certificates-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-certificates-v2.1.wadl
index aec6adad2..1a3a99b56 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-certificates-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-certificates-v2.1.wadl
@@ -54,7 +54,7 @@
                     <xsdxt:code
                         href="../samples/os-certificates/certificate-show-root-response.json"
                     />
-                </wadl:doc> &x-openstack-request-idHeader;
+                </wadl:doc> &x-openstack-request-idResponseHeader;
             </representation>
         </response>
     </method>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavor-access-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavor-access-v2.1.wadl
index af09eb374..24b074f68 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavor-access-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavor-access-v2.1.wadl
@@ -75,7 +75,7 @@
                     <xsdxt:code
                         href="../samples/os-flavor-access/flavor-access-list-response.json"
                     />
-                </wadl:doc> &x-openstack-request-idHeader;
+                </wadl:doc> &x-openstack-request-idResponseHeader;
             </representation>
         </response>
     </method>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavor-extra-specs-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavor-extra-specs-v2.1.wadl
index 8ba6cb1cf..5f30d8706 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavor-extra-specs-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavor-extra-specs-v2.1.wadl
@@ -77,7 +77,7 @@
                         href="../samples/os-flavor-extra-specs/flavor-extra-spec-show-response.json"
                     />
                 </wadl:doc>
-                &x-openstack-request-idHeader;
+                &x-openstack-request-idResponseHeader;
             </representation>
         </response>
     </method>
@@ -104,7 +104,7 @@
                         href="../samples/os-flavor-extra-specs/flavor-extra-specs-list-response.json"
                     />
                 </wadl:doc>
-                &x-openstack-request-idHeader;
+                &x-openstack-request-idResponseHeader;
             </representation>
         </response>
     </method>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-hosts-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-hosts-v2.1.wadl
index 40c9c4663..32de0cfc2 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-hosts-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-hosts-v2.1.wadl
@@ -50,7 +50,7 @@
                     <xsdxt:code
                         href="../samples/os-hosts/host-reboot-response.json"
                     />
-                </wadl:doc> &x-openstack-request-idHeader;
+                </wadl:doc> &x-openstack-request-idResponseHeader;
             </representation>
         </response>
     </method>
@@ -66,7 +66,7 @@
                     <xsdxt:code
                         href="../samples/os-hosts/host-show-response.json"
                     />
-                </wadl:doc> &x-openstack-request-idHeader;
+                </wadl:doc> &x-openstack-request-idResponseHeader;
             </representation>
         </response>
     </method>
@@ -81,7 +81,7 @@
                     <xsdxt:code
                         href="../samples/os-hosts/host-shutdown-response.json"
                     />
-                </wadl:doc> &x-openstack-request-idHeader;
+                </wadl:doc> &x-openstack-request-idResponseHeader;
             </representation>
         </response>
     </method>
@@ -96,7 +96,7 @@
                     <xsdxt:code
                         href="../samples/os-hosts/host-start-response.json"
                     />
-                </wadl:doc> &x-openstack-request-idHeader;
+                </wadl:doc> &x-openstack-request-idResponseHeader;
             </representation>
         </response>
     </method>
@@ -137,7 +137,7 @@
                     <xsdxt:code
                         href="../samples/os-hosts/hosts-list-response.json"
                     />
-                </wadl:doc> &x-openstack-request-idHeader;
+                </wadl:doc> &x-openstack-request-idResponseHeader;
             </representation>
         </response>
     </method>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-hypervisors-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-hypervisors-v2.1.wadl
index 4217bbd30..707b3cd1f 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-hypervisors-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-hypervisors-v2.1.wadl
@@ -46,7 +46,7 @@
                     <xsdxt:code
                         href="../samples/os-hypervisors/hypervisors-list-response.json"
                     />
-                </wadl:doc> &x-openstack-request-idHeader;
+                </wadl:doc> &x-openstack-request-idResponseHeader;
             </representation>
         </response>
     </method>
@@ -63,7 +63,7 @@
                     <xsdxt:code
                         href="../samples/os-hypervisors/hypervisor-show-response.json"
                     />
-                </wadl:doc> &x-openstack-request-idHeader;
+                </wadl:doc> &x-openstack-request-idResponseHeader;
             </representation>
         </response>
     </method>
@@ -82,7 +82,7 @@
                     <xsdxt:code
                         href="../samples/os-hypervisors/hypervisor-statistics-show-response.json"
                     />
-                </wadl:doc> &x-openstack-request-idHeader;
+                </wadl:doc> &x-openstack-request-idResponseHeader;
             </representation>
         </response>
     </method>
@@ -99,7 +99,7 @@
                     <xsdxt:code
                         href="../samples/os-hypervisors/hypervisor-uptime-show-response.json"
                     />
-                </wadl:doc> &x-openstack-request-idHeader;
+                </wadl:doc> &x-openstack-request-idResponseHeader;
             </representation>
         </response>
     </method>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-instance-actions-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-instance-actions-v2.1.wadl
index f2e8d2fc0..8f5c051ed 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-instance-actions-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-instance-actions-v2.1.wadl
@@ -49,7 +49,7 @@
                         href="../samples/os-instance-actions/instance-action-show-response.json"
                     />
                 </wadl:doc>
-                &x-openstack-request-idHeader;
+                &x-openstack-request-idResponseHeader;
             </representation>
         </response>
     </method>
@@ -67,7 +67,7 @@
                         href="../samples/os-instance-actions/instance-actions-list-response.json"
                     />
                 </wadl:doc>
-                &x-openstack-request-idHeader;
+                &x-openstack-request-idResponseHeader;
             </representation>
         </response>
     </method>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-instance-usage-audit-log-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-instance-usage-audit-log-v2.1.wadl
index bedd9ec42..432fb8d6c 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-instance-usage-audit-log-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-instance-usage-audit-log-v2.1.wadl
@@ -43,7 +43,7 @@
                     <xsdxt:code
                         href="../samples/os-instance-usage-audit-log/usage-audits-list-response.json"
                     />
-                </wadl:doc> &x-openstack-request-idHeader;
+                </wadl:doc> &x-openstack-request-idResponseHeader;
             </representation>
         </response>
     </method>
@@ -65,7 +65,7 @@
                     <xsdxt:code
                         href="../samples/os-instance-usage-audit-log/usage-audits-log-list-response.json"
                     />
-                </wadl:doc> &x-openstack-request-idHeader;
+                </wadl:doc> &x-openstack-request-idResponseHeader;
             </representation>
         </response>
     </method>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-migrations-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-migrations-v2.1.wadl
index 318b007c1..c570d3ec3 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-migrations-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-migrations-v2.1.wadl
@@ -43,7 +43,7 @@
                     <xsdxt:code
                         href="../samples/os-migrations/migrations-list-response.json"
                     />
-                </wadl:doc> &x-openstack-request-idHeader;
+                </wadl:doc> &x-openstack-request-idResponseHeader;
             </representation>
         </response>
     </method>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-quota-class-sets-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-quota-class-sets-v2.1.wadl
index f1e77235c..01d39b3e2 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-quota-class-sets-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-quota-class-sets-v2.1.wadl
@@ -42,7 +42,7 @@
                     <xsdxt:code
                         href="../samples/os-quota-class-sets/quota-class-show-response.json"
                     />
-                </wadl:doc> &x-openstack-request-idHeader;
+                </wadl:doc> &x-openstack-request-idResponseHeader;
             </representation>
         </response>
     </method>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-simple-tenant-usage-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-simple-tenant-usage-v2.1.wadl
index 1433aa3c5..37f4d627c 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-simple-tenant-usage-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-simple-tenant-usage-v2.1.wadl
@@ -41,7 +41,7 @@
                     <xsdxt:code
                         href="../samples/os-simple-tenant-usage/simple-tenant-usage-show-general-response.json"
                     />
-                </wadl:doc> &x-openstack-request-idHeader;
+                </wadl:doc> &x-openstack-request-idResponseHeader;
             </representation>
         </response>
     </method>
@@ -58,7 +58,7 @@
                     <xsdxt:code
                         href="../samples/os-simple-tenant-usage/simple-tenant-usage-show-response.json"
                     />
-                </wadl:doc> &x-openstack-request-idHeader;
+                </wadl:doc> &x-openstack-request-idResponseHeader;
             </representation>
         </response>
     </method>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/servers-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/servers-v2.1.wadl
index 3ac205540..a146b7a86 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/servers-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/servers-v2.1.wadl
@@ -306,7 +306,7 @@
             <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
                <xsdxt:code href="../samples/servers/servers-list-response.json"/>
             </wadl:doc>
-            &x-compute-request-idHeader;
+            &x-openstack-request-idHeader;
          </representation>
       </response>
       <!-- Common Faults and Header --> &commonFaults;
@@ -413,7 +413,7 @@
             <wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
                <xsdxt:code href="../samples/servers/server-show-response.json"/>
             </wadl:doc>
-            &x-compute-request-idHeader;
+            &x-openstack-request-idHeader;
             &serverObjectParameter;
             &serverResponseParameters;
          </representation>
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/versions-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/versions-v2.1.wadl
index bfa802331..6ec0748b7 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/versions-v2.1.wadl
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/versions-v2.1.wadl
@@ -33,7 +33,7 @@
                     <xsdxt:code
                         href="../samples/versions/versions-list-response.json"
                     />
-                </wadl:doc> &x-openstack-request-idHeader;
+                </wadl:doc> &x-openstack-request-idResponseHeader;
             </representation>
         </response>
     </method>
diff --git a/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity.wadl b/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity.wadl
index d1157c286..ee1996895 100644
--- a/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity.wadl
+++ b/api-ref/src/wadls/identity-api/src/v2.0/wadl/identity.wadl
@@ -139,7 +139,8 @@
                     xml:lang="EN">
                     <xsdxt:code href="../samples/admin/extension-show-response.json"
                     />
-                </wadl:doc> &x-openstack-request-idResponseHeader;
+                </wadl:doc>
+                &x-openstack-request-idResponseHeader;
             </representation>
         </response>
         <response status="203"/>