diff --git a/README.md b/README.md
index 2a84648..d5dbe66 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Copyright 2022, The Khronos Group Inc.
 SPDX-License-Identifier: CC-BY-4.0
 -->
 
-Publicly-maintained data about what runtimes, middleware components or engines support which OpenXR extensions. Together, the Runtime and Client Support Matrices offer a clear overview of extension support across both runtime implementations and client integrations in the OpenXR ecosystem.
+Publicly-maintained data about what runtimes and middleware components support which OpenXR extensions. Together, the Runtime and Middleware Support Matrices offer a clear overview of extension support across both runtime implementations and middleware integrations in the OpenXR ecosystem.
 
 View the output online:
 
diff --git a/openxr_inventory/templates/client_extension_support.jinja2.html b/openxr_inventory/templates/client_extension_support.jinja2.html
index 3ac70b0..c93fbb3 100644
--- a/openxr_inventory/templates/client_extension_support.jinja2.html
+++ b/openxr_inventory/templates/client_extension_support.jinja2.html
@@ -6,17 +6,17 @@
 
 {% extends "base.jinja2.html" %}
 {% block title -%}
-    OpenXR Client Extension Support Report
+    OpenXR Middleware Extension Support Report
 {%- endblock title %}
 
 {% block navbar_brand_text -%}
-    OpenXR Client Extension Support Report
+    OpenXR Middleware Extension Support Report
 {%- endblock navbar_brand_text %}
 
 {% block navbar_list_items %}
-    <li><a href="#client_matrix">Client Support Matrix</a></li>
+    <li><a href="#client_matrix">Middleware Support Matrix</a></li>
     <li><a href="#extensions">Extensions</a></li>
-    <li><a href="#clients">Clients</a></li>
+    <li><a href="#clients">Middleware Components</a></li>
 {% endblock navbar_list_items %}
 
 {% block style %}
@@ -46,14 +46,16 @@
 {% block container_contents %}
     <section>
         <div id="client_matrix" class="jumbotron row">
-            <h2>Client support matrix</h2>
+            <h2>Middleware support matrix</h2><br>
+            <i>The middleware support information presented on this page is self-reported by the respective project maintainers.<br>
+            Khronos does not verify, certify, or endorse these components or their reported extension support.</i>
         </div>
         <table class="table table-hover table-condensed table-sticky-col-headers">
             <thead>
                 <tr>
                     <th></th>
                     {% for client in clients | sort %}
-                        {# pragmatic check if the client name fits in the layout or if it needs to be truncated and put the full name in tooltip #}
+                        {# pragmatic check if the middleware name fits in the layout or if it needs to be truncated and put the full name in tooltip #}
                         <th class="rotate" style="border:none"><div>
                             {% if client.name|length < 34 %}
                             <span>{{ client.name }}</span>
@@ -111,7 +113,7 @@ <h2>Client support matrix</h2>
                 {% endfor %}
 
                 <tr class="active">
-                    <th style="text-align:center" colspan="{{ clients|length + 1 }}">Client Features</th>
+                    <th style="text-align:center" colspan="{{ clients|length + 1 }}">Middleware Features</th>
                 </tr>
 
                 {% for ff, view_configurations in known_form_factors.items() %}
@@ -194,7 +196,7 @@ <h3>{{ extension_name }} ({{ support.client_count }} client{{ "s" if support.cli
                     for {{ extension_name }}</a>
             </p>
             {% if support.client_count > 0 %}
-            Clients:<br>
+            Middleware Components:<br>
             <ul>
                 {% for client in clients | sort %}
                 {% if extension_name in client_support[client.name] %}
@@ -212,7 +214,7 @@ <h3>{{ extension_name }} ({{ support.client_count }} client{{ "s" if support.cli
     <section>
         <!-- client toc -->
         <div id="clients" class="jumbotron row">
-            <h2>Clients</h2>
+            <h2>Middleware Components</h2>
 
             <ul class="list-unstyled">
                 {% for client in clients | sort %}
diff --git a/openxr_inventory/templates/extension_support.html b/openxr_inventory/templates/extension_support.html
index faa3f74..d57c9b0 100644
--- a/openxr_inventory/templates/extension_support.html
+++ b/openxr_inventory/templates/extension_support.html
@@ -23,16 +23,18 @@
         <div style="margin-top: 80px;">
             <h1>OpenXR Extension Support</h1>
             <p style="font-size: 16px; margin: 20px 0;">
-                These reports show the support coverage for OpenXR extensions across runtimes and clients in the ecosystem.<br>
+                These reports show the support coverage for OpenXR extensions across runtimes and middleware components in the ecosystem.<br><br>
                 <strong>OpenXR Runtimes</strong> are implementations of the OpenXR API that run on various platforms and devices. 
-                They provide the core OpenXR functionality that applications depend on.<br>
-                <strong>Clients</strong> (such as game engines or middleware) use the OpenXR API but do not implement it themselves; 
-                instead, they interface with runtimes to access XR capabilities.
+                They provide the core OpenXR functionality that applications depend on. <br><br>
+                <strong>Middleware components</strong> (such as game engines) use the OpenXR API but do not implement it themselves; 
+                instead, they interface with runtimes to access and expose OpenXR capabilities. <br>
+                <u>Disclaimer</u>: The middleware support information presented on this page is self-reported by the respective project maintainers.<br>
+                Khronos does not verify, certify, or endorse these components or their reported extension support.
             </p>
             <p>Choose which report you'd like to view:</p>
             <ul class="list-unstyled" style="font-size: 18px; line-height: 2;">
                 <li><a href="runtime_extension_support.html"><strong>Runtime Extension Support</strong></a> - View which extensions are supported by OpenXR runtimes</li>
-                <li><a href="client_extension_support.html"><strong>Client Extension Support</strong></a> - View which extensions are supported by OpenXR clients</li>
+                <li><a href="client_extension_support.html"><strong>Middleware Extension Support</strong></a> - View which OpenXR extensions are supported by middleware components</li>
             </ul>
         </div>
         <hr>