diff --git a/index.html b/index.html
index 47acf8cf5..0648a14a7 100644
--- a/index.html
+++ b/index.html
@@ -1374,7 +1374,7 @@ <h2>Core Vocabulary Definitions</h2>
 <tr class="rfc2119-table-assertion" id="td-vocab-actions--Thing"><td><code>actions</code></td><td>All Action-based interaction affordance of the Thing.</td><td>optional</td><td>map of <a href="#actionaffordance"><code>ActionAffordance</code></a></td></tr>
 <tr class="rfc2119-table-assertion" id="td-vocab-events--Thing"><td><code>events</code></td><td>All Event-based interaction affordance of the Thing.</td><td>optional</td><td>map of <a href="#eventaffordance"><code>EventAffordance</code></a></td></tr>
 <tr class="rfc2119-table-assertion" id="td-vocab-links--Thing"><td><code>links</code></td><td>Provides Web links to arbitrary resources that relate to the specified Thing Description.</td><td>optional</td><td>array of <a href="#link"><code>Link</code></a></td></tr>
-<tr class="rfc2119-table-assertion" id="td-vocab-forms--Thing"><td><code>forms</code></td><td>Indicates one or more endpoints at which operation(s) on this resource are accessible. In this version of TD, all operations that can be described at the Thing level are concerning how to interact with the Thing's <a href="#propertyaffordance">property affordances</a> collectively at once.</td><td>optional</td><td>array of <a href="#form"><code>Form</code></a></td></tr>
+<tr class="rfc2119-table-assertion" id="td-vocab-forms--Thing"><td><code>forms</code></td><td>Set of one or more form hypermedia controls that describe how the affordance can be activated. In this version of TD, all operations that can be described at the Thing level are concerning how to interact with the Thing's <a href="#propertyaffordance">property affordances</a> collectively at once.</td><td>optional</td><td>array of <a href="#form"><code>Form</code></a></td></tr>
 <tr class="rfc2119-table-assertion" id="td-vocab-security--Thing"><td><code>security</code></td><td>Set of security definition names, chosen from those defined in securityDefinitions.  These must all be satisfied for access to resources.</td><td>mandatory</td><td><a href="http://www.w3.org/TR/2012/REC-xmlschema11-2-20120405/#string"><code>string</code></a> or array of <a href="http://www.w3.org/TR/2012/REC-xmlschema11-2-20120405/#string"><code>string</code></a></td></tr>
 <tr class="rfc2119-table-assertion" id="td-vocab-securityDefinitions--Thing"><td><code>securityDefinitions</code></td><td>Set of named security configurations (definitions only).  Not actually applied unless names are used in a security section.</td><td>mandatory</td><td>map of <a href="#securityscheme"><code>SecurityScheme</code></a></td></tr></tbody></table>
 <p>
@@ -1434,7 +1434,7 @@ <h2>Core Vocabulary Definitions</h2>
 <tr class="rfc2119-table-assertion" id="td-vocab-titles--InteractionAffordance"><td><code>titles</code></td><td>Provides multi-language human-readable titles (e.g., display a text for UI representation in different languages) of the interaction pattern.</td><td>optional</td><td><a href="#multilanguage"><code>MultiLanguage</code></a></td></tr>
 <tr class="rfc2119-table-assertion" id="td-vocab-description--InteractionAffordance"><td><code>description</code></td><td>Provides additional (human-readable) information based on a default language.</td><td>optional</td><td><a href="http://www.w3.org/TR/2012/REC-xmlschema11-2-20120405/#string"><code>string</code></a></td></tr>
 <tr class="rfc2119-table-assertion" id="td-vocab-descriptions--InteractionAffordance"><td><code>descriptions</code></td><td>Can be used to support (human-readable) information in different languages.</td><td>optional</td><td><a href="#multilanguage"><code>MultiLanguage</code></a></td></tr>
-<tr class="rfc2119-table-assertion" id="td-vocab-forms--InteractionAffordance"><td><code>forms</code></td><td>Indicates one or more endpoints at which operation(s) on this resource are accessible.</td><td>mandatory</td><td>array of <a href="#form"><code>Form</code></a></td></tr>
+<tr class="rfc2119-table-assertion" id="td-vocab-forms--InteractionAffordance"><td><code>forms</code></td><td>Set of one or more form hypermedia controls that describe how the affordance can be activated.</td><td>mandatory</td><td>array of <a href="#form"><code>Form</code></a></td></tr>
 <tr class="rfc2119-table-assertion" id="td-vocab-uriVariables--InteractionAffordance"><td><code>uriVariables</code></td><td>Define URI template variables as collection based on DataSchema declarations.</td><td>optional</td><td>map of <a href="#dataschema"><code>DataSchema</code></a></td></tr></tbody></table><p>The class <code>InteractionAffordance</code> has the following subclasses:</p><ul><li><a href="#actionaffordance"><code>ActionAffordance</code></a></li>
 <li><a href="#propertyaffordance"><code>PropertyAffordance</code></a></li>
 <li><a href="#eventaffordance"><code>EventAffordance</code></a></li></ul></section>
@@ -5113,7 +5113,7 @@ <h1>Thing Templates</h1>
     (properties, actions and events), however it does not contain device-specific
     information, such as a serial number, GPS location, security information or concrete protocol endpoints.
     </p><p>
-    Since a Thing Template does not contain a Protocol Binding to specific endpoints and 
+    Since a Thing Template does not contain a Protocol Binding to specific submission targets and 
     does not define a specific security mechanism, the <em>forms</em> and <em>securityDefinitions</em> and 
     <em>security</em> keys must not be present.
     </p><p>
diff --git a/index.template.html b/index.template.html
index 9898f9447..7ed83be6b 100644
--- a/index.template.html
+++ b/index.template.html
@@ -3444,7 +3444,7 @@ <h1>Thing Templates</h1>
     (properties, actions and events), however it does not contain device-specific
     information, such as a serial number, GPS location, security information or concrete protocol endpoints.
     </p><p>
-    Since a Thing Template does not contain a Protocol Binding to specific endpoints and 
+    Since a Thing Template does not contain a Protocol Binding to specific submission targets and 
     does not define a specific security mechanism, the <em>forms</em> and <em>securityDefinitions</em> and 
     <em>security</em> keys must not be present.
     </p><p>
diff --git a/ontology/td.ttl b/ontology/td.ttl
index bb42f34cd..db2258cba 100644
--- a/ontology/td.ttl
+++ b/ontology/td.ttl
@@ -78,7 +78,7 @@
        
        rdfs:label "forms" ;
        
-       rdfs:comment "Indicates one or more endpoints at which operation(s) on this resource are accessible."@en .
+       rdfs:comment "Set of one or more form hypermedia controls that describe how the affordance can be activated."@en .
 
 
 ###  http://www.w3.org/2019/td#uriVariables