WIP.
diff --git a/built-in-entity-parser.html b/built-in-entity-parser.html
index aceaf0c..bb784e0 100644
--- a/built-in-entity-parser.html
+++ b/built-in-entity-parser.html
@@ -26,7 +26,7 @@
         <h2 class="section-title">Overview<a href="#"><i class="top-link fas fa-fw fa-angle-double-up"></i></a></h2>
 
         <p>
-            {% scaladoc NCEntityParser NCEntityParser %} trait is part of <a href="api-components.html#model-pipeline">Model Pipeline</a>.
+            {% scaladoc NCEntityParser NCEntityParser %} trait is part of {% scaladoc NCPipeline NCPipeline %}.
             Its implementation should allow to find user defined named entities
             based on prepared tokens as input.
         </p>
@@ -247,7 +247,7 @@
                 ...
                 "elements": [
                     {
-                        "id": "transport.vehicle",
+                        "type": "transport.vehicle",
                         "description": "Transportation vehicle",
                         "synonyms": [
                             "car",
@@ -317,7 +317,7 @@
                  ]
                 "elements": [
                     {
-                        "id": "transport.vehicle",
+                        "type": "transport.vehicle",
                         "description": "Transportation vehicle",
                         "synonyms": [
                             "car",
@@ -566,7 +566,7 @@
                  ]
                 "elements": [
                     {
-                        "id": "transport.vehicle",
+                        "type": "transport.vehicle",
                         "description": "Transportation vehicle",
                         "synonyms": [
                             "car",
diff --git a/short-term-memory.html b/short-term-memory.html
index f49d5e0..72cc381 100644
--- a/short-term-memory.html
+++ b/short-term-memory.html
@@ -366,10 +366,10 @@
             have the following 4 intents:
         </p>
         <ul>
-            <li><code>id=sale term={# == 'sale'}</code></li>
-            <li><code>id=best_sale_person term={# == 'sale'} term={# == best_employee}</code></li>
-            <li><code>id=buy term={# == 'buy'}</code></li>
-            <li><code>id=buy_best_person term={# == 'buy'} term={# == best_employee}</code></li>
+            <li><code>intent=sale term={# == 'sale'}</code></li>
+            <li><code>intent=best_sale_person term={# == 'sale'} term={# == best_employee}</code></li>
+            <li><code>intent=buy term={# == 'buy'}</code></li>
+            <li><code>intent=buy_best_person term={# == 'buy'} term={# == best_employee}</code></li>
         </ul>
         <p>
             (this is actual <a href="/intent-matching.html">Intent Definition Language</a> (IDL) used by NLPCraft -