diff --git a/lib/content-services/src/lib/aspect-list/aspect-list.service.ts b/lib/content-services/src/lib/aspect-list/aspect-list.service.ts
index 54e324ccf6..3d1d7c1002 100644
--- a/lib/content-services/src/lib/aspect-list/aspect-list.service.ts
+++ b/lib/content-services/src/lib/aspect-list/aspect-list.service.ts
@@ -22,7 +22,7 @@ import { from, Observable, of, Subject, zip } from 'rxjs';
 import { AspectListDialogComponentData } from './aspect-list-dialog-data.interface';
 import { AspectListDialogComponent } from './aspect-list-dialog.component';
 import { catchError, map } from 'rxjs/operators';
-import { AspectEntry, AspectPaging, AspectsApi, NodesApi } from '@alfresco/js-api';
+import { AspectEntry, AspectPaging, AspectsApi } from '@alfresco/js-api';
 
 @Injectable({
     providedIn: 'root'
diff --git a/lib/content-services/src/lib/audit/audit.service.ts b/lib/content-services/src/lib/audit/audit.service.ts
index b1d7143bcf..2869733c99 100644
--- a/lib/content-services/src/lib/audit/audit.service.ts
+++ b/lib/content-services/src/lib/audit/audit.service.ts
@@ -25,8 +25,7 @@ import {
     AuditApp,
     AuditBodyUpdate,
     AuditEntryPaging,
-    AuditEntryEntry,
-    AspectsApi
+    AuditEntryEntry
 } from '@alfresco/js-api';
 import { catchError } from 'rxjs/operators';
 
diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.directive.ts b/lib/content-services/src/lib/content-node-share/content-node-share.directive.ts
index ce9ef516a3..0931e8822f 100644
--- a/lib/content-services/src/lib/content-node-share/content-node-share.directive.ts
+++ b/lib/content-services/src/lib/content-node-share/content-node-share.directive.ts
@@ -44,7 +44,7 @@ export class NodeSharedDirective implements OnChanges, OnDestroy {
 
     private onDestroy$ = new Subject<boolean>();
 
-    get nodes(): NodesApi {
+    get nodesApi(): NodesApi {
         return new NodesApi(this.alfrescoApiService.getInstance());
     }
 
diff --git a/lib/content-services/src/lib/document-list/components/document-list.component.ts b/lib/content-services/src/lib/document-list/components/document-list.component.ts
index 87d2a0ddd6..82bd3eefe9 100644
--- a/lib/content-services/src/lib/document-list/components/document-list.component.ts
+++ b/lib/content-services/src/lib/document-list/components/document-list.component.ts
@@ -343,7 +343,7 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
     private loadingTimeout;
     private onDestroy$ = new Subject<boolean>();
 
-    get nodes(): NodesApi {
+    get nodesApi(): NodesApi {
         return new NodesApi(this.alfrescoApiService.getInstance());
     }
 
diff --git a/lib/content-services/src/lib/document-list/services/custom-resources.service.ts b/lib/content-services/src/lib/document-list/services/custom-resources.service.ts
index bf3297889b..4ec17e969f 100644
--- a/lib/content-services/src/lib/document-list/services/custom-resources.service.ts
+++ b/lib/content-services/src/lib/document-list/services/custom-resources.service.ts
@@ -65,7 +65,7 @@ export class CustomResourcesService {
         return new FavoritesApi(this.apiService.getInstance());
     }
 
-    get nodes(): NodesApi {
+    get nodesApi(): NodesApi {
         return new NodesApi(this.apiService.getInstance());
     }
 
diff --git a/lib/content-services/src/lib/webscript/webscript.component.ts b/lib/content-services/src/lib/webscript/webscript.component.ts
index 92e3798e3c..8db5815391 100644
--- a/lib/content-services/src/lib/webscript/webscript.component.ts
+++ b/lib/content-services/src/lib/webscript/webscript.component.ts
@@ -17,7 +17,7 @@
 
 import { ObjectDataTableAdapter, AlfrescoApiService, LogService } from '@alfresco/adf-core';
 import { Component, EventEmitter, Input, OnChanges, Output } from '@angular/core';
-import { TaskFormsApi, WebscriptApi } from '@alfresco/js-api';
+import { WebscriptApi } from '@alfresco/js-api';
 
 /**
  * <adf-webscript-get [scriptPath]="string"
diff --git a/lib/core/form/services/widget-visibility.service.ts b/lib/core/form/services/widget-visibility.service.ts
index 9818ed97dc..abe23a93d7 100644
--- a/lib/core/form/services/widget-visibility.service.ts
+++ b/lib/core/form/services/widget-visibility.service.ts
@@ -30,7 +30,7 @@ import {
 import { TaskProcessVariableModel } from '../models/task-process-variable.model';
 import { WidgetVisibilityModel, WidgetTypeEnum } from '../models/widget-visibility.model';
 import { map, catchError } from 'rxjs/operators';
-import { RuntimeAppDefinitionsApi, TaskFormsApi } from '@alfresco/js-api';
+import { TaskFormsApi } from '@alfresco/js-api';
 
 @Injectable({
     providedIn: 'root'
diff --git a/lib/insights/src/lib/analytics-process/services/analytics.service.ts b/lib/insights/src/lib/analytics-process/services/analytics.service.ts
index 67f24a88b0..8c8c67c0e2 100644
--- a/lib/insights/src/lib/analytics-process/services/analytics.service.ts
+++ b/lib/insights/src/lib/analytics-process/services/analytics.service.ts
@@ -28,7 +28,7 @@ import { MultiBarChart } from '../../diagram/models/chart/multi-bar-chart.model'
 import { PieChart } from '../../diagram/models/chart/pie-chart.model';
 import { TableChart } from '../../diagram/models/chart/table-chart.model';
 import { map, catchError } from 'rxjs/operators';
-import { ActivitiContentApi, ProcessDefinitionsApi, ReportApi } from '@alfresco/js-api';
+import { ProcessDefinitionsApi, ReportApi } from '@alfresco/js-api';
 
 @Injectable({ providedIn: 'root' })
 export class AnalyticsService {
@@ -37,7 +37,7 @@ export class AnalyticsService {
         return new ReportApi(this.apiService.getInstance());
     }
 
-    get reportApi(): ProcessDefinitionsApi {
+    get processDefinitionsApi(): ProcessDefinitionsApi {
         return new ProcessDefinitionsApi(this.apiService.getInstance());
     }