diff --git a/demo-shell/src/app/components/files/custom-sources.component.html b/demo-shell/src/app/components/files/custom-sources.component.html
index cbae81a06a..abeb0e05ac 100644
--- a/demo-shell/src/app/components/files/custom-sources.component.html
+++ b/demo-shell/src/app/components/files/custom-sources.component.html
@@ -10,6 +10,7 @@
     </adf-toolbar-title>
 </adf-toolbar>
 <adf-document-list
+    #customSourcesDocumentList
     [currentFolderId]="selectedSource"
     locationFormat="/files"
     selectionMode="multiple">
diff --git a/demo-shell/src/app/components/files/custom-sources.component.ts b/demo-shell/src/app/components/files/custom-sources.component.ts
index d3ff0ff261..85f078f695 100644
--- a/demo-shell/src/app/components/files/custom-sources.component.ts
+++ b/demo-shell/src/app/components/files/custom-sources.component.ts
@@ -27,7 +27,7 @@ export class CustomSourcesComponent {
     @Input()
     selectedSource = '-recent-';
 
-    @ViewChild(DocumentListComponent)
+    @ViewChild('customSourcesDocumentList')
     documentList: DocumentListComponent;
 
     sources = [
diff --git a/demo-shell/src/app/components/files/files.component.ts b/demo-shell/src/app/components/files/files.component.ts
index 83f54e9504..0989a2872d 100644
--- a/demo-shell/src/app/components/files/files.component.ts
+++ b/demo-shell/src/app/components/files/files.component.ts
@@ -141,7 +141,7 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
     @ViewChild('documentList')
     documentList: DocumentListComponent;
 
-    @ViewChild(PaginationComponent)
+    @ViewChild('standardPagination')
     standardPagination: PaginationComponent;
 
     permissionsStyle: PermissionStyleModel[] = [];
diff --git a/demo-shell/src/app/components/form/form-list.component.html b/demo-shell/src/app/components/form/form-list.component.html
index 8159c7d4e1..b5a2673e32 100644
--- a/demo-shell/src/app/components/form/form-list.component.html
+++ b/demo-shell/src/app/components/form/form-list.component.html
@@ -1,7 +1,7 @@
 <adf-form-list [forms]="formList" (row-dblclick)="onRowDblClick($event)">
 </adf-form-list>
 <div class="form-container" *ngIf="!isEmptyForm()">
-    <adf-form [form]="form" [data]="restoredData">
+    <adf-form #adfForm [form]="form" [data]="restoredData">
     </adf-form>
 </div>
 <button mat-button (click)="store()" color="primary">{{'FORM-LIST.STORE' | translate }}</button>
diff --git a/demo-shell/src/app/components/form/form-list.component.ts b/demo-shell/src/app/components/form/form-list.component.ts
index 74d2ae4a6a..b78435bd70 100644
--- a/demo-shell/src/app/components/form/form-list.component.ts
+++ b/demo-shell/src/app/components/form/form-list.component.ts
@@ -25,7 +25,7 @@ import { FormComponent, FormModel, FormService, LogService } from '@alfresco/adf
 })
 export class FormListComponent {
 
-    @ViewChild(FormComponent)
+    @ViewChild('adfForm')
     activitiForm: FormComponent;
 
     formList: any [] = [];
diff --git a/demo-shell/src/app/components/process-service/process-attachments.component.ts b/demo-shell/src/app/components/process-service/process-attachments.component.ts
index 79c7d8bed2..0b03509c15 100644
--- a/demo-shell/src/app/components/process-service/process-attachments.component.ts
+++ b/demo-shell/src/app/components/process-service/process-attachments.component.ts
@@ -41,7 +41,7 @@ export function processUploadServiceFactory(api: AlfrescoApiService, config: App
 
 export class ProcessAttachmentsComponent implements OnInit, OnChanges {
 
-    @ViewChild(ProcessAttachmentListComponent)
+    @ViewChild('processAttachList')
     processAttachList: ProcessAttachmentListComponent;
 
     @Input()
diff --git a/demo-shell/src/app/components/process-service/task-attachments.component.ts b/demo-shell/src/app/components/process-service/task-attachments.component.ts
index baa6e009e9..ae4aa7efb1 100644
--- a/demo-shell/src/app/components/process-service/task-attachments.component.ts
+++ b/demo-shell/src/app/components/process-service/task-attachments.component.ts
@@ -38,7 +38,7 @@ export function taskUploadServiceFactory(api: AlfrescoApiService, config: AppCon
 
 export class TaskAttachmentsComponent implements OnInit, OnChanges {
 
-    @ViewChild(TaskAttachmentListComponent)
+    @ViewChild('taskAttachList')
     taskAttachList: TaskAttachmentListComponent;
 
     @Input()
diff --git a/demo-shell/src/app/components/trashcan/trashcan.component.ts b/demo-shell/src/app/components/trashcan/trashcan.component.ts
index 36bb2b001c..aa6e96bc39 100644
--- a/demo-shell/src/app/components/trashcan/trashcan.component.ts
+++ b/demo-shell/src/app/components/trashcan/trashcan.component.ts
@@ -32,11 +32,11 @@ import { DocumentListComponent } from '@alfresco/adf-content-services';
 })
 export class TrashcanComponent {
 
-    @ViewChild(DocumentListComponent)
-    documentList;
+    @ViewChild('documentList')
+    documentList: DocumentListComponent;
 
     refresh() {
-        this.documentList.loadTrashcan();
+        this.documentList.reload();
         this.documentList.resetSelection();
     }
 
diff --git a/lib/content-services/breadcrumb/dropdown-breadcrumb.component.html b/lib/content-services/breadcrumb/dropdown-breadcrumb.component.html
index 824ce75ba0..361605fdfb 100644
--- a/lib/content-services/breadcrumb/dropdown-breadcrumb.component.html
+++ b/lib/content-services/breadcrumb/dropdown-breadcrumb.component.html
@@ -10,6 +10,7 @@
     <mat-icon class="adf-dropddown-breadcrumb-item-chevron">chevron_right</mat-icon>
 
     <mat-select
+        #select
         *ngIf="hasPreviousNodes()"
         class="adf-dropdown-breadcrumb-path"
         tabindex="0"
diff --git a/lib/content-services/breadcrumb/dropdown-breadcrumb.component.ts b/lib/content-services/breadcrumb/dropdown-breadcrumb.component.ts
index 2f1899d292..1bc0a05664 100644
--- a/lib/content-services/breadcrumb/dropdown-breadcrumb.component.ts
+++ b/lib/content-services/breadcrumb/dropdown-breadcrumb.component.ts
@@ -31,7 +31,7 @@ import { BreadcrumbComponent } from './breadcrumb.component';
 })
 export class DropdownBreadcrumbComponent extends BreadcrumbComponent implements OnChanges {
 
-    @ViewChild(MatSelect)
+    @ViewChild('select')
     selectbox: MatSelect;
 
     currentNode: PathElementEntity;
diff --git a/lib/content-services/content-node-selector/content-node-selector-panel.component.ts b/lib/content-services/content-node-selector/content-node-selector-panel.component.ts
index a780e0d368..46c0cfc435 100644
--- a/lib/content-services/content-node-selector/content-node-selector-panel.component.ts
+++ b/lib/content-services/content-node-selector/content-node-selector-panel.component.ts
@@ -104,7 +104,7 @@ export class ContentNodeSelectorPanelComponent implements OnInit {
     @Output()
     select: EventEmitter<MinimalNodeEntryEntity[]> = new EventEmitter<MinimalNodeEntryEntity[]>();
 
-    @ViewChild(DocumentListComponent)
+    @ViewChild('documentList')
     documentList: DocumentListComponent;
 
     @ViewChild(HighlightDirective)
diff --git a/lib/content-services/search/components/search-control.component.html b/lib/content-services/search/components/search-control.component.html
index 09b18f6816..c123329ce9 100644
--- a/lib/content-services/search/components/search-control.component.html
+++ b/lib/content-services/search/components/search-control.component.html
@@ -25,7 +25,8 @@
     </div>
 </div>
 
-<adf-search #auto="searchAutocomplete"
+<adf-search #search
+            #auto="searchAutocomplete"
             class="adf-search-result-autocomplete"
             [maxResults]="liveSearchMaxResults"
             [queryBody]="customQueryBody">
diff --git a/lib/content-services/search/components/search-control.component.ts b/lib/content-services/search/components/search-control.component.ts
index f10c653988..71abba0b26 100644
--- a/lib/content-services/search/components/search-control.component.ts
+++ b/lib/content-services/search/components/search-control.component.ts
@@ -94,7 +94,7 @@ export class SearchControlComponent implements OnInit, OnDestroy {
     @Output()
     optionClicked: EventEmitter<any> = new EventEmitter();
 
-    @ViewChild(SearchComponent)
+    @ViewChild('search')
     searchAutocomplete: SearchComponent;
 
     @ViewChild('searchInput')
diff --git a/lib/content-services/upload/components/file-uploading-dialog.component.ts b/lib/content-services/upload/components/file-uploading-dialog.component.ts
index 375a75f892..3c0a9a7ec8 100644
--- a/lib/content-services/upload/components/file-uploading-dialog.component.ts
+++ b/lib/content-services/upload/components/file-uploading-dialog.component.ts
@@ -32,7 +32,7 @@ import 'rxjs/add/observable/merge';
     styleUrls: ['./file-uploading-dialog.component.scss']
 })
 export class FileUploadingDialogComponent implements OnInit, OnDestroy {
-    @ViewChild(FileUploadingListComponent)
+    @ViewChild('uploadList')
     uploadList: FileUploadingListComponent;
 
     /** Dialog position. Can be 'left' or 'right'. */
diff --git a/lib/core/card-view/components/card-view-dateitem/card-view-dateitem.component.ts b/lib/core/card-view/components/card-view-dateitem/card-view-dateitem.component.ts
index 09f5be4e9b..cb6bc0a2ff 100644
--- a/lib/core/card-view/components/card-view-dateitem/card-view-dateitem.component.ts
+++ b/lib/core/card-view/components/card-view-dateitem/card-view-dateitem.component.ts
@@ -51,7 +51,7 @@ export class CardViewDateItemComponent implements OnInit {
     @Input()
     displayEmpty: boolean = true;
 
-    @ViewChild(MatDatetimepicker)
+    @ViewChild('datetimePicker')
     public datepicker: MatDatetimepicker<any>;
 
     valueDate: Moment;
diff --git a/lib/process-services/people/components/people-list/people-list.component.html b/lib/process-services/people/components/people-list/people-list.component.html
index dd6548199b..64351a070b 100644
--- a/lib/process-services/people/components/people-list/people-list.component.html
+++ b/lib/process-services/people/components/people-list/people-list.component.html
@@ -1,4 +1,5 @@
 <adf-datatable
+    #dataTable
     class="adf-task-people-list"
     [rows]="users"
     [actions]="hasActions()"
diff --git a/lib/process-services/people/components/people-list/people-list.component.ts b/lib/process-services/people/components/people-list/people-list.component.ts
index 337e959a2e..6031783bee 100644
--- a/lib/process-services/people/components/people-list/people-list.component.ts
+++ b/lib/process-services/people/components/people-list/people-list.component.ts
@@ -30,7 +30,7 @@ export class PeopleListComponent implements AfterViewInit, AfterContentInit {
 
     @ContentChild(DataColumnListComponent) columnList: DataColumnListComponent;
 
-    @ViewChild(DataTableComponent)
+    @ViewChild('dataTable')
     peopleDataTable: DataTableComponent;
 
     /** The array of user data used to populate the people list. */
diff --git a/lib/process-services/people/components/people-selector/people-selector.component.html b/lib/process-services/people/components/people-selector/people-selector.component.html
index e37245ae05..64ce9c5754 100644
--- a/lib/process-services/people/components/people-selector/people-selector.component.html
+++ b/lib/process-services/people/components/people-selector/people-selector.component.html
@@ -1,4 +1,5 @@
 <adf-people-search-field
+    #peopleSearchField
     class="adf-people-selector-field"
     [performSearch]="performSearch"
     [placeholder]="placeholder"
@@ -11,4 +12,4 @@
     data-automation-id="adf-people-selector-deselect"
     (click)="userDeselected()">
         <mat-icon>cancel</mat-icon>
-</button>
\ No newline at end of file
+</button>
diff --git a/lib/process-services/people/components/people-selector/people-selector.component.ts b/lib/process-services/people/components/people-selector/people-selector.component.ts
index 5a31e6f6d6..bd0fcb4b41 100644
--- a/lib/process-services/people/components/people-selector/people-selector.component.ts
+++ b/lib/process-services/people/components/people-selector/people-selector.component.ts
@@ -41,7 +41,7 @@ export class PeopleSelectorComponent {
     @Output()
     peopleIdChange: EventEmitter<number>;
 
-    @ViewChild(PeopleSearchFieldComponent)
+    @ViewChild('peopleSearchField')
     searchFieldComponent: PeopleSearchFieldComponent;
 
     performSearch: PerformSearchCallback;
diff --git a/lib/process-services/people/components/people/people.component.html b/lib/process-services/people/components/people/people.component.html
index 184c600b08..f62045d575 100644
--- a/lib/process-services/people/components/people/people.component.html
+++ b/lib/process-services/people/components/people/people.component.html
@@ -13,10 +13,11 @@
             </div>
             <div class="assignment-container" *ngIf="showAssignment">
                 <adf-people-search
-                (searchPeople)="searchUser($event)"
-                (success)="involveUser($event)"
-                (closeSearch)="onCloseSearch()"
-                [results]="peopleSearch$">
+                    #peopleSearch
+                    (searchPeople)="searchUser($event)"
+                    (success)="involveUser($event)"
+                    (closeSearch)="onCloseSearch()"
+                    [results]="peopleSearch$">
                     <ng-container people-search-title>{{ 'ADF_TASK_LIST.DETAILS.LABELS.ADD_PEOPLE' | translate }}</ng-container>
                     <ng-container people-search-action-label>{{ 'ADF_TASK_LIST.PEOPLE.ADD_USER' | translate }}</ng-container>
                 </adf-people-search>
diff --git a/lib/process-services/people/components/people/people.component.ts b/lib/process-services/people/components/people/people.component.ts
index 93497d5a87..ee8c34269f 100644
--- a/lib/process-services/people/components/people/people.component.ts
+++ b/lib/process-services/people/components/people/people.component.ts
@@ -42,7 +42,7 @@ export class PeopleComponent implements OnInit, AfterViewInit {
     @Input()
     readOnly: boolean = false;
 
-    @ViewChild(PeopleSearchComponent)
+    @ViewChild('peopleSearch')
     peopleSearch: PeopleSearchComponent;
 
     showAssignment: boolean = false;
diff --git a/lib/process-services/process-list/components/process-instance-details.component.html b/lib/process-services/process-list/components/process-instance-details.component.html
index 900fed27f9..1d5e729634 100644
--- a/lib/process-services/process-list/components/process-instance-details.component.html
+++ b/lib/process-services/process-list/components/process-instance-details.component.html
@@ -5,6 +5,7 @@
     </mat-card-header>
     <mat-card-content>
         <adf-process-instance-header
+            #processInstanceHeader
             [processInstance]="processInstanceDetails"
             (showProcessDiagram)="onShowProcessDiagram($event)">
         </adf-process-instance-header>
@@ -14,6 +15,7 @@
         <mat-card>
             <mat-card-content>
                 <adf-process-instance-tasks
+                    #processInstanceTasks
                     [processInstanceDetails]="processInstanceDetails"
                     (taskClick)="onTaskClicked($event)">
                 </adf-process-instance-tasks>
diff --git a/lib/process-services/process-list/components/process-instance-details.component.ts b/lib/process-services/process-list/components/process-instance-details.component.ts
index feb4f1a8d6..40c12f153f 100644
--- a/lib/process-services/process-list/components/process-instance-details.component.ts
+++ b/lib/process-services/process-list/components/process-instance-details.component.ts
@@ -36,10 +36,10 @@ export class ProcessInstanceDetailsComponent implements OnChanges {
     @Input()
     processInstanceId: string;
 
-    @ViewChild(ProcessInstanceHeaderComponent)
+    @ViewChild('processInstanceHeader')
     processInstanceHeader: ProcessInstanceHeaderComponent;
 
-    @ViewChild(ProcessInstanceTasksComponent)
+    @ViewChild('processInstanceTasks')
     tasksList: ProcessInstanceTasksComponent;
 
     /** Toggles whether to show or hide the title. */
diff --git a/lib/process-services/process-list/components/start-process.component.html b/lib/process-services/process-list/components/start-process.component.html
index 8d8952a0c1..4dba152516 100644
--- a/lib/process-services/process-list/components/start-process.component.html
+++ b/lib/process-services/process-list/components/start-process.component.html
@@ -20,7 +20,9 @@
             </mat-form-field>
         </div>
 
-        <adf-start-form *ngIf="hasStartForm()"
+        <adf-start-form
+            #startForm
+            *ngIf="hasStartForm()"
                         [data]="values"
             [disableStartProcessButton]="!hasProcessName()"
 			[processDefinitionId]="selectedProcessDef.id"
diff --git a/lib/process-services/process-list/components/start-process.component.ts b/lib/process-services/process-list/components/start-process.component.ts
index f26887921a..813edc839b 100644
--- a/lib/process-services/process-list/components/start-process.component.ts
+++ b/lib/process-services/process-list/components/start-process.component.ts
@@ -86,7 +86,7 @@ export class StartProcessInstanceComponent implements OnChanges {
     @Output()
     error: EventEmitter<ProcessInstance> = new EventEmitter<ProcessInstance>();
 
-    @ViewChild(StartFormComponent)
+    @ViewChild('startForm')
     startForm: StartFormComponent;
 
     processDefinitions: ProcessDefinitionRepresentation[] = [];