diff --git a/lib/core/api/src/index.ts b/lib/core/api/src/index.ts
index f731288ee9..e79643fd1f 100644
--- a/lib/core/api/src/index.ts
+++ b/lib/core/api/src/index.ts
@@ -19,4 +19,4 @@ export * from './lib/api-client.factory';
 export * from './lib/api-clients.service';
 export * from './lib/clients';
 export * from './lib/types';
-export * from './lib/alfresco-api/alfresco-api.http-client';
+export * from './lib/adf-http-client.service';
diff --git a/lib/core/api/src/lib/alfresco-api/alfresco-api.http-client.spec.ts b/lib/core/api/src/lib/adf-http-client.service.spec.ts
similarity index 97%
rename from lib/core/api/src/lib/alfresco-api/alfresco-api.http-client.spec.ts
rename to lib/core/api/src/lib/adf-http-client.service.spec.ts
index ab85c9e062..e85ae052ab 100644
--- a/lib/core/api/src/lib/alfresco-api/alfresco-api.http-client.spec.ts
+++ b/lib/core/api/src/lib/adf-http-client.service.spec.ts
@@ -19,8 +19,8 @@ import { Emitters, RequestOptions, ResultListDataRepresentationTaskRepresentatio
 import { HttpParams } from '@angular/common/http';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
-import { AlfrescoApiHttpClient } from './alfresco-api.http-client';
-import { AlfrescoApiResponseError } from './alfresco-api.response-error';
+import { AdfHttpClient } from './alfresco-api.http-client';
+import { AlfrescoApiResponseError } from './alfresco-api/alfresco-api.response-error';
 
 const securityOptions: SecurityOptions = {
     authentications: {},
@@ -52,8 +52,8 @@ const mockResponse =  {
     ]
 };
 
-describe('AlfrescoApiHttpClient', () => {
-    let angularHttpClient: AlfrescoApiHttpClient;
+describe('AdfHttpClient', () => {
+    let angularHttpClient: AdfHttpClient;
     let controller: HttpTestingController;
 
     beforeEach(() => {
@@ -62,7 +62,7 @@ describe('AlfrescoApiHttpClient', () => {
                 HttpClientTestingModule
             ]
         });
-        angularHttpClient = TestBed.inject(AlfrescoApiHttpClient);
+        angularHttpClient = TestBed.inject(AdfHttpClient);
         controller = TestBed.inject(HttpTestingController);
     });
 
diff --git a/lib/core/api/src/lib/alfresco-api/alfresco-api.http-client.ts b/lib/core/api/src/lib/adf-http-client.service.ts
similarity index 95%
rename from lib/core/api/src/lib/alfresco-api/alfresco-api.http-client.ts
rename to lib/core/api/src/lib/adf-http-client.service.ts
index e9841f2c3c..5e6a04445e 100644
--- a/lib/core/api/src/lib/alfresco-api/alfresco-api.http-client.ts
+++ b/lib/core/api/src/lib/adf-http-client.service.ts
@@ -29,15 +29,15 @@ import { Constructor } from '../types';
 @Injectable({
     providedIn: 'root'
 })
-export class AlfrescoApiHttpClient implements JsApiHttpClient {
+export class AdfHttpClient implements JsApiHttpClient {
 
     constructor(private httpClient: HttpClient) {}
 
     request<T = any>(url: string, options: RequestOptions, sc: SecurityOptions, emitters: JsApiEmitters): Promise<T> {
-        const body = AlfrescoApiHttpClient.getBody(options);
+        const body = AdfHttpClient.getBody(options);
         const params = getQueryParamsWithCustomEncoder(options.queryParams, new AlfrescoApiParamEncoder());
-        const headers = AlfrescoApiHttpClient.getHeaders(options);
-        const responseType = AlfrescoApiHttpClient.getResponseType(options);
+        const headers = AdfHttpClient.getHeaders(options);
+        const responseType = AdfHttpClient.getResponseType(options);
         const context = new HttpContext().set(SHOULD_ADD_AUTH_TOKEN, true);
 
         const request = this.httpClient.request(
@@ -88,7 +88,7 @@ export class AlfrescoApiHttpClient implements JsApiHttpClient {
 
                 if (isHttpResponseEvent(res)) {
                     eventEmitter.emit('success', res.body);
-                    return AlfrescoApiHttpClient.deserialize(res, returnType);
+                    return AdfHttpClient.deserialize(res, returnType);
                 }
             }),
             catchError((err: HttpErrorResponse): Observable<AlfrescoApiResponseError> => {
@@ -200,7 +200,7 @@ export class AlfrescoApiHttpClient implements JsApiHttpClient {
         }
 
         if (isBlobResponse(response, returnType)) {
-            return AlfrescoApiHttpClient.deserializeBlobResponse(response);
+            return AdfHttpClient.deserializeBlobResponse(response);
         }
 
         if (!isConstructor(returnType)) {