diff --git a/docs/data-column.component.md b/docs/data-column.component.md
index 48a11eda1c..5938e88845 100644
--- a/docs/data-column.component.md
+++ b/docs/data-column.component.md
@@ -102,9 +102,9 @@ It is possible to assign a custom column template like the following:
 <adf-datatable ...>
     <data-columns>
         <data-column title="Version" key="properties.cm:versionLabel">
-            <template let-value="value">
+            <ng-template let-value="value">
                 <span>V. {{value}}</span>
-            </template>
+            </ng-template>
         </data-column>
     </data-columns>
 </adf-datatable>
@@ -113,21 +113,21 @@ It is possible to assign a custom column template like the following:
 Example above shows access to the underlying cell value by binding `value` property to the underlying context `value`:
 
 ```html
-<template let-value="value">
+<ng-template let-value="value">
 ```
 
 Alternatively you can get access to the entire data context using the following syntax:
 
 ```html
-<template let-entry="$implicit">
+<ng-template let-entry="$implicit">
 ```
 
 That means you are going to create local variable `entry` that is bound to the data context via Angular's special `$implicit` keyword.
 
 ```html
-<template let-entry="$implicit">
+<ng-template let-entry="$implicit">
     <span>V. {{entry.data.getValue(entry.row, entry.col)}}</span>
-</template>
+</ng-template>
 ```
 
 In the second case `entry` variable is holding a reference to the following data context:
diff --git a/docs/document-list.component.md b/docs/document-list.component.md
index 4aa6ede257..574aa38c5f 100644
--- a/docs/document-list.component.md
+++ b/docs/document-list.component.md
@@ -1233,9 +1233,9 @@ This can be changed by means of the custom html template:
 ```html
 <adf-document-list ...>
     <empty-folder-content>
-        <template>
+        <ng-template>
             <h1>Sorry, no content here</h1>
-        </template>
+        </ng-template>
     </empty-folder-content>
 </adf-document-list>
 ```
diff --git a/docs/login.component.md b/docs/login.component.md
index dd4b5abf41..a386217ec3 100644
--- a/docs/login.component.md
+++ b/docs/login.component.md
@@ -94,7 +94,7 @@ You can replace the entire content in the footer of the login component with you
 
 ```html
 <adf-login ...>
-    <login-footer><template>My custom HTML for the footer</template></login-footer>
+    <login-footer><ng-template>My custom HTML for the footer</ng-template></login-footer>
 </adf-login>`
 ```
 
@@ -106,7 +106,7 @@ You can replace the entire content in the header of the login component with you
 
 ```html
 <adf-login ...>
-    <login-header><template>My custom HTML for the header</template></login-header>
+    <login-header><ng-template>My custom HTML for the header</ng-template></login-header>
 </adf-login>`
 ```
 
diff --git a/docs/metadata-indicators.md b/docs/metadata-indicators.md
index ebb58d08a9..fc9209f09b 100644
--- a/docs/metadata-indicators.md
+++ b/docs/metadata-indicators.md
@@ -13,10 +13,10 @@ Here's an example of basic image-related metadata fetched from the server:
 <alfresco-document-list ...>
     <data-columns>
         <data-column key="properties" [sortable]="false">
-            <template let-value="value">
+            <ng-template let-value="value">
                 <adf-metadata-icons [metadata]="value">
                 </adf-metadata-icons>
-            </template>
+            </ng-template>
         </data-column>
         ...
     </data-columns>
@@ -59,9 +59,9 @@ Next we propagate the `value` reference to the `<adf-metadata-icons>` component
 
 ```html
 <data-column key="properties" [sortable]="false">
-    <template let-value="value">
+    <ng-template let-value="value">
         <adf-metadata-icons [metadata]="value"></adf-metadata-icons>
-    </template>
+    </ng-template>
 </data-column>
 ```
 
diff --git a/docs/task-details.component.md b/docs/task-details.component.md
index ae49a202cc..a1e1867fb1 100644
--- a/docs/task-details.component.md
+++ b/docs/task-details.component.md
@@ -69,10 +69,10 @@ This can be changed by adding the following custom html template:
 ```html
 <adf-task-details [taskId]="taskId">
     <no-task-details-template>
-        <template>
+        <ng-template>
              <h1>Sorry, no tasks here</h1>
              <img src="example.jpg">
-        </template>
+        </ng-template>
     </no-task-details-template>
 </adf-task-details>    
 ```
diff --git a/docs/viewer.component.md b/docs/viewer.component.md
index 96bfa555ff..cc00cdbc41 100644
--- a/docs/viewer.component.md
+++ b/docs/viewer.component.md
@@ -122,12 +122,12 @@ Below you can find an example with the use of `extension-viewer` if you can hand
     [overlayMode]="true">
     
     <extension-viewer [supportedExtensions]="['obj','3ds']" #extension>
-        <template let-urlFileContent="urlFileContent" let-extension="extension">
+        <ng-template let-urlFileContent="urlFileContent" let-extension="extension">
             <threed-viewer 
                 [urlFile]="urlFileContent" 
                 [extension]="extension">
             </threed-viewer>
-        </template>
+        </ng-template>
     </extension-viewer>
 
 </adf-viewer> 
@@ -144,19 +144,19 @@ It is possible to define multiple `extension-viewer` templates:
     [overlayMode]="true">
 
     <extension-viewer [supportedExtensions]="['xls','xlsx']" #extension>
-        <template let-urlFileContent="urlFileContent"  >
+        <ng-template let-urlFileContent="urlFileContent"  >
             <my-custom-xls-component 
                 urlFileContent="urlFileContent">
             </my-custom-xls-component>
-        </template>
+        </ng-template>
     </extension-viewer>
 
     <extension-viewer [supportedExtensions]="['txt']" #extension>
-        <template  let-urlFileContent="urlFileContent" >               
+        <ng-template  let-urlFileContent="urlFileContent" >               
             <my-custom-txt-component 
                 urlFileContent="urlFileContent">
             </my-custom-txt-component>
-        </template>
+        </ng-template>
     </extension-viewer>
 </adf-viewer> 
 ```