diff --git a/packages/gen-ai-hub/src/client/interface.ts b/packages/gen-ai-hub/src/client/interface.ts
index 48592f46..75c30350 100644
--- a/packages/gen-ai-hub/src/client/interface.ts
+++ b/packages/gen-ai-hub/src/client/interface.ts
@@ -1,5 +1,5 @@
 import { BaseLlmParameters, CustomRequestConfig } from '../core/http-client.js';
-import { GenAiBaseLlmOutput } from './types.js';
+import { BaseLlmOutput } from './types.js';
 
 /**
  * The base client interface for all provider specific clients.
@@ -14,7 +14,7 @@ export interface BaseClient<T extends BaseLlmParameters> {
   chatCompletion(
     data: T,
     requestConfig?: CustomRequestConfig
-  ): Promise<GenAiBaseLlmOutput>;
+  ): Promise<BaseLlmOutput>;
   /**
    * Creates an embedding vector representing the given text.
    * @param data - The input parameters for the chat completion.
@@ -24,5 +24,5 @@ export interface BaseClient<T extends BaseLlmParameters> {
   embeddings(
     data: T,
     requestConfig?: CustomRequestConfig
-  ): Promise<GenAiBaseLlmOutput>;
+  ): Promise<BaseLlmOutput>;
 }
diff --git a/packages/gen-ai-hub/src/client/types.ts b/packages/gen-ai-hub/src/client/types.ts
index 3e0f6040..4e88e69b 100644
--- a/packages/gen-ai-hub/src/client/types.ts
+++ b/packages/gen-ai-hub/src/client/types.ts
@@ -6,6 +6,6 @@ import {
 /**
  * Base LLM Output.
  */
-export type GenAiBaseLlmOutput =
+export type BaseLlmOutput =
   | OpenAiChatCompletionOutput
   | OpenAiEmbeddingOutput;
diff --git a/packages/gen-ai-hub/src/index.ts b/packages/gen-ai-hub/src/index.ts
index d7df3d5d..34ef485e 100644
--- a/packages/gen-ai-hub/src/index.ts
+++ b/packages/gen-ai-hub/src/index.ts
@@ -7,6 +7,5 @@ export {
 } from './client/index.js';
 export { CustomRequestConfig, BaseLlmParameters } from './core/index.js';
 export {
-  getOrchestrationClient,
-  OrchestrationClientRequest
+  GenAiHubClient
 } from './orchestration/index.js';
diff --git a/packages/gen-ai-hub/src/orchestration/orchestration-client.ts b/packages/gen-ai-hub/src/orchestration/orchestration-client.ts
index 9d6e26f1..e16cd980 100644
--- a/packages/gen-ai-hub/src/orchestration/orchestration-client.ts
+++ b/packages/gen-ai-hub/src/orchestration/orchestration-client.ts
@@ -1,9 +1,9 @@
 import { HttpDestination } from '@sap-cloud-sdk/connectivity';
 import { DefaultApi } from './api/default-api.js';
-import { CompletionPostRequest } from './api/schema/index.js';
+import { CompletionPostRequest, CompletionPostResponse } from './api/schema/index.js';
 import { CustomRequestConfig } from '../core/http-client.js';
 
-export type OrchestrationCompletionParameters = Pick<
+export type GenAiHubCompletionParameters = Pick<
   CompletionPostRequest,
   'orchestration_config' | 'return_module_results'
 >;
@@ -11,22 +11,20 @@ export type OrchestrationCompletionParameters = Pick<
 /**
  * Get the orchestration client.
  */
-export class OrchestrationClient {
+export class GenAiHubClient {
     destination: HttpDestination;
     constructor(destination: HttpDestination) {
         this.destination = destination;
     }
   async chatCompletion(
-    body: OrchestrationCompletionParameters,
+    body: GenAiHubCompletionParameters,
     requestConfig: CustomRequestConfig
-  ) {
-    const response = await DefaultApi.orchestrationV1EndpointsCreate({
+  ): Promise<CompletionPostResponse> {
+    return DefaultApi.orchestrationV1EndpointsCreate({
       ...body,
       input_params: {}
     })
     .addCustomRequestConfiguration(requestConfig)
     .execute(this.destination,);
-
-    return response.data;
   }
 }