diff --git a/apps/cli/src/index.ts b/apps/cli/src/index.ts
index 43679e2..3309461 100644
--- a/apps/cli/src/index.ts
+++ b/apps/cli/src/index.ts
@@ -11,6 +11,7 @@ type ProgramProps = {
   fileName: string | undefined;
   cookies: boolean;
   generateForAngular: boolean;
+  prefixesToRemove?: string[];
   help: never;
 };
 
@@ -29,13 +30,24 @@ program
   )
   .option("-f, --file-name <name>", "Output file name (defaults to Api.ts)")
   .option("--cookies", "Generate API with cookies auth")
+  .option(
+    "-ptr, --prefixes-to-remove <prefixes>",
+    "Prefixes to remove from the generated code",
+  )
   .helpOption("-h, --help", "Show help");
 
 program.parse(process.argv);
 
 const options = program.opts<ProgramProps>();
 
-const { source, target, generateForAngular, fileName, cookies } = options;
+const {
+  source,
+  target,
+  generateForAngular,
+  fileName,
+  cookies,
+  prefixesToRemove,
+} = options;
 
 if (!source) {
   console.error("Error: Source -s is required.");
@@ -60,7 +72,7 @@ process.emitWarning = (warning, ...args) => {
   originalEmitWarning.call(process, warning, ...(args as any));
 };
 
-generateApiContent(source, generateForAngular, cookies)
+generateApiContent(source, generateForAngular, cookies, prefixesToRemove ?? [])
   .then(content => {
     if (content === null) {
       console.error("Failed to generate api content");
diff --git a/apps/cli/src/lib/generators/AngularServiceGenerator.ts b/apps/cli/src/lib/generators/AngularServiceGenerator.ts
index a9d48e2..c09a179 100644
--- a/apps/cli/src/lib/generators/AngularServiceGenerator.ts
+++ b/apps/cli/src/lib/generators/AngularServiceGenerator.ts
@@ -206,8 +206,11 @@ const getContractResult = (
   return Nothing;
 };
 
-export const generateAngularServices = (swagger: SwaggerSchema) => {
-  const endpoints = getEndpointsDescriptions(swagger).map(
+export const generateAngularServices = (
+  swagger: SwaggerSchema,
+  prefixesToRemove: string[],
+) => {
+  const endpoints = getEndpointsDescriptions(swagger, prefixesToRemove).map(
     endpointDescription => {
       const {
         formattedParam: formattedRequestContractType,
diff --git a/apps/cli/src/lib/generators/ApiDescriptionGenerator.ts b/apps/cli/src/lib/generators/ApiDescriptionGenerator.ts
index 224f375..2815a97 100644
--- a/apps/cli/src/lib/generators/ApiDescriptionGenerator.ts
+++ b/apps/cli/src/lib/generators/ApiDescriptionGenerator.ts
@@ -28,7 +28,19 @@ export type EndpointDescription = {
   isFileResponse: boolean;
 };
 
-export const getEndpointsDescriptions = (swagger: SwaggerSchema) => {
+const removePrefixes = (prop: string, prefixesToRemove: string[]): string => {
+  for (const prefix of prefixesToRemove) {
+    if (prop.startsWith(prefix)) {
+      return prop.substring(prefix.length);
+    }
+  }
+  return prop;
+};
+
+export const getEndpointsDescriptions = (
+  swagger: SwaggerSchema,
+  prefixesToRemove: string[],
+) => {
   const endpoints: EndpointDescription[][] = Object.keys(swagger.paths).map(
     e => {
       const pathObject = swagger.paths[e]!;
@@ -44,7 +56,7 @@ export const getEndpointsDescriptions = (swagger: SwaggerSchema) => {
       const methods = [];
       const generate = (methodType: MethodType, operation: Operation) => {
         const formattedName = snakeToCamel(
-          `${methodType.toLowerCase()}_${prop}`,
+          `${methodType.toLowerCase()}_${removePrefixes(prop, prefixesToRemove)}`,
         );
         const name = `${formattedName.replace(version, "")}${
           version === "V1" ? "" : version
diff --git a/apps/cli/src/lib/generators/ServiceGenerator.ts b/apps/cli/src/lib/generators/ServiceGenerator.ts
index 072c042..a20ab23 100644
--- a/apps/cli/src/lib/generators/ServiceGenerator.ts
+++ b/apps/cli/src/lib/generators/ServiceGenerator.ts
@@ -486,8 +486,11 @@ const bodyBasedMethod = (
   );
 };
 
-export const generateServices = (swagger: SwaggerSchema) => {
-  const endpoints = getEndpointsDescriptions(swagger);
+export const generateServices = (
+  swagger: SwaggerSchema,
+  prefixesToRemove: string[],
+) => {
+  const endpoints = getEndpointsDescriptions(swagger, prefixesToRemove);
   const view = endpoints
     .map(endpointDescription => {
       const {
diff --git a/apps/cli/src/lib/generators/index.ts b/apps/cli/src/lib/generators/index.ts
index d46d7f0..16a7de4 100644
--- a/apps/cli/src/lib/generators/index.ts
+++ b/apps/cli/src/lib/generators/index.ts
@@ -12,6 +12,7 @@ import { render } from "../renderers/Renderer";
 const generateContent = (
   schema: any,
   isCookiesAuthEnabled: boolean = false,
+  prefixesToRemove: string[] = [],
 ) => {
   const swaggerSchema = schema as SwaggerSchema;
   const contracts = generateContracts(swaggerSchema);
@@ -19,7 +20,7 @@ const generateContent = (
   const view = {
     infrastructure: getInfrastructureTemplate(isCookiesAuthEnabled),
     contracts,
-    services: generateServices(swaggerSchema),
+    services: generateServices(swaggerSchema, prefixesToRemove),
   };
   const content = render(
     "{{{ infrastructure }}}\n{{{ contracts }}}\n{{{ services }}}",
@@ -28,14 +29,14 @@ const generateContent = (
   return content;
 };
 
-const generateAngularContent = (schema: any) => {
+const generateAngularContent = (schema: any, prefixesToRemove: string[]) => {
   const swaggerSchema = schema as SwaggerSchema;
   const contracts = generateContracts(swaggerSchema);
 
   const view = {
     contracts,
     infrastructure: getAngularInfrastructureTemplate(),
-    services: generateAngularServices(swaggerSchema),
+    services: generateAngularServices(swaggerSchema, prefixesToRemove),
   };
   const content = render(
     "{{{ infrastructure }}}\n{{{ contracts }}}\n\n{{{ services }}}\n",
@@ -48,6 +49,7 @@ export const generate = async (
   api: any,
   generateForAngular: boolean = false,
   isCookiesAuthEnabled: boolean = false,
+  prefixesToRemove: string[] = [],
 ) => {
   const logStep = () => console.log("⚡2/3 - Generating code");
 
@@ -63,12 +65,12 @@ export const generate = async (
 
     logStep();
     return generateForAngular
-      ? generateAngularContent(response.data)
-      : generateContent(response.data, isCookiesAuthEnabled);
+      ? generateAngularContent(response.data, prefixesToRemove)
+      : generateContent(response.data, isCookiesAuthEnabled, prefixesToRemove);
   }
 
   logStep();
   return generateForAngular
-    ? generateAngularContent(api)
-    : generateContent(api, isCookiesAuthEnabled);
+    ? generateAngularContent(api, prefixesToRemove)
+    : generateContent(api, isCookiesAuthEnabled, prefixesToRemove);
 };
diff --git a/apps/cli/src/lib/index.ts b/apps/cli/src/lib/index.ts
index ffec063..569f24b 100644
--- a/apps/cli/src/lib/index.ts
+++ b/apps/cli/src/lib/index.ts
@@ -14,6 +14,7 @@ export async function generateApiContent(
   source: string,
   generateForAngular: boolean,
   cookies: boolean,
+  prefixesToRemove: string[],
 ): Promise<string | null> {
   console.log(`🤖1/3 - Getting OpenAPI definition from ${source}`);
 
@@ -24,5 +25,10 @@ export async function generateApiContent(
     return null;
   }
 
-  return await generate(openAPI, generateForAngular == true, cookies == true);
+  return await generate(
+    openAPI,
+    generateForAngular == true,
+    cookies == true,
+    prefixesToRemove,
+  );
 }
diff --git a/apps/cli/src/tests/__snapshots__/generate_allof_anonymous_schema.ts b/apps/cli/src/tests/__snapshots__/generate_allof_anonymous_schema.ts
index b54278e..000938e 100644
--- a/apps/cli/src/tests/__snapshots__/generate_allof_anonymous_schema.ts
+++ b/apps/cli/src/tests/__snapshots__/generate_allof_anonymous_schema.ts
@@ -435,14 +435,14 @@ export type Cow = {
 	discriminator: string;
 };
 
-export type GetApiTestFetchResponse = 
+export type GetTestFetchResponse = 
 | FetchResponse<{status: string;
 	data?: Dog | Cat | Cow | null;}, 200> 
 | ErrorResponse;
 
-export const getApiTestPath = () => `/api/test`;
+export const getTestPath = () => `/api/test`;
 
-export const getApiTest = (headers = new Headers()):
-  Promise<GetApiTestFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiTestPath()}`, headers, {}) as Promise<GetApiTestFetchResponse>;
+export const getTest = (headers = new Headers()):
+  Promise<GetTestFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getTestPath()}`, headers, {}) as Promise<GetTestFetchResponse>;
 }
diff --git a/apps/cli/src/tests/__snapshots__/generate_allof_anonymous_schema_angular.ts b/apps/cli/src/tests/__snapshots__/generate_allof_anonymous_schema_angular.ts
index 5a17000..df7b233 100644
--- a/apps/cli/src/tests/__snapshots__/generate_allof_anonymous_schema_angular.ts
+++ b/apps/cli/src/tests/__snapshots__/generate_allof_anonymous_schema_angular.ts
@@ -332,7 +332,7 @@ export class ApiService {
       this.baseUrl = baseUrl ?? "";
   }
 
-  getApiTest(): Observable<ResponseResult<{status: string;
+  getTest(): Observable<ResponseResult<{status: string;
 	data?: Dog | Cat | Cow | null;}, 200>> {
     return apiGet<ResponseResult<{status: string;
 	data?: Dog | Cat | Cow | null;}, 200>>(this.httpClient, `${this.baseUrl}/api/test`);
diff --git a/apps/cli/src/tests/__snapshots__/generate_allof_anonymous_schema_cookies.ts b/apps/cli/src/tests/__snapshots__/generate_allof_anonymous_schema_cookies.ts
index ab69fa4..7d61769 100644
--- a/apps/cli/src/tests/__snapshots__/generate_allof_anonymous_schema_cookies.ts
+++ b/apps/cli/src/tests/__snapshots__/generate_allof_anonymous_schema_cookies.ts
@@ -441,14 +441,14 @@ export type Cow = {
 	discriminator: string;
 };
 
-export type GetApiTestFetchResponse = 
+export type GetTestFetchResponse = 
 | FetchResponse<{status: string;
 	data?: Dog | Cat | Cow | null;}, 200> 
 | ErrorResponse;
 
-export const getApiTestPath = () => `/api/test`;
+export const getTestPath = () => `/api/test`;
 
-export const getApiTest = (headers = new Headers()):
-  Promise<GetApiTestFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiTestPath()}`, headers, {}) as Promise<GetApiTestFetchResponse>;
+export const getTest = (headers = new Headers()):
+  Promise<GetTestFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getTestPath()}`, headers, {}) as Promise<GetTestFetchResponse>;
 }
diff --git a/apps/cli/src/tests/__snapshots__/generate_anonymous_object.ts b/apps/cli/src/tests/__snapshots__/generate_anonymous_object.ts
index 45cb66e..c4e3e04 100644
--- a/apps/cli/src/tests/__snapshots__/generate_anonymous_object.ts
+++ b/apps/cli/src/tests/__snapshots__/generate_anonymous_object.ts
@@ -421,14 +421,14 @@ export type ElectronicTradeBigRiskItemResponseDTO = {
 	validationNumber?: number | null;
 };
 
-export type GetApiTestFetchResponse = 
+export type GetTestFetchResponse = 
 | FetchResponse<{status: string;
 	data: ElectronicTradeBigRiskItemResponseDTO;}, 200> 
 | ErrorResponse;
 
-export const getApiTestPath = () => `/api/test`;
+export const getTestPath = () => `/api/test`;
 
-export const getApiTest = (headers = new Headers()):
-  Promise<GetApiTestFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiTestPath()}`, headers, {}) as Promise<GetApiTestFetchResponse>;
+export const getTest = (headers = new Headers()):
+  Promise<GetTestFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getTestPath()}`, headers, {}) as Promise<GetTestFetchResponse>;
 }
diff --git a/apps/cli/src/tests/__snapshots__/generate_anonymous_object_angular.ts b/apps/cli/src/tests/__snapshots__/generate_anonymous_object_angular.ts
index 6c42f03..fd04c72 100644
--- a/apps/cli/src/tests/__snapshots__/generate_anonymous_object_angular.ts
+++ b/apps/cli/src/tests/__snapshots__/generate_anonymous_object_angular.ts
@@ -318,7 +318,7 @@ export class ApiService {
       this.baseUrl = baseUrl ?? "";
   }
 
-  getApiTest(): Observable<ResponseResult<{status: string;
+  getTest(): Observable<ResponseResult<{status: string;
 	data: ElectronicTradeBigRiskItemResponseDTO;}, 200>> {
     return apiGet<ResponseResult<{status: string;
 	data: ElectronicTradeBigRiskItemResponseDTO;}, 200>>(this.httpClient, `${this.baseUrl}/api/test`);
diff --git a/apps/cli/src/tests/__snapshots__/generate_anonymous_object_cookies.ts b/apps/cli/src/tests/__snapshots__/generate_anonymous_object_cookies.ts
index e66bd11..f1f70ff 100644
--- a/apps/cli/src/tests/__snapshots__/generate_anonymous_object_cookies.ts
+++ b/apps/cli/src/tests/__snapshots__/generate_anonymous_object_cookies.ts
@@ -427,14 +427,14 @@ export type ElectronicTradeBigRiskItemResponseDTO = {
 	validationNumber?: number | null;
 };
 
-export type GetApiTestFetchResponse = 
+export type GetTestFetchResponse = 
 | FetchResponse<{status: string;
 	data: ElectronicTradeBigRiskItemResponseDTO;}, 200> 
 | ErrorResponse;
 
-export const getApiTestPath = () => `/api/test`;
+export const getTestPath = () => `/api/test`;
 
-export const getApiTest = (headers = new Headers()):
-  Promise<GetApiTestFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiTestPath()}`, headers, {}) as Promise<GetApiTestFetchResponse>;
+export const getTest = (headers = new Headers()):
+  Promise<GetTestFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getTestPath()}`, headers, {}) as Promise<GetTestFetchResponse>;
 }
diff --git a/apps/cli/src/tests/__snapshots__/generate_auth_login.ts b/apps/cli/src/tests/__snapshots__/generate_auth_login.ts
index 16dac93..a61cc25 100644
--- a/apps/cli/src/tests/__snapshots__/generate_auth_login.ts
+++ b/apps/cli/src/tests/__snapshots__/generate_auth_login.ts
@@ -449,16 +449,16 @@ export type ProblemDetails = {
 	instance?: string | null;
 };
 
-export type PostApiAuthLoginFetchResponse = 
+export type PostAuthLoginFetchResponse = 
 | FetchResponse<AuthResult, 200> 
 | FetchResponse<ProblemDetails, 400> 
 | ErrorResponse;
 
-export const postApiAuthLoginPath = () => `/api/Auth/login`;
+export const postAuthLoginPath = () => `/api/Auth/login`;
 
-export const postApiAuthLogin = (requestContract: AuthRequest, headers = new Headers()):
-  Promise<PostApiAuthLoginFetchResponse> => {
+export const postAuthLogin = (requestContract: AuthRequest, headers = new Headers()):
+  Promise<PostAuthLoginFetchResponse> => {
     const requestData = getApiRequestData<AuthRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiAuthLoginPath()}`, requestData, headers) as Promise<PostApiAuthLoginFetchResponse>;
+    return apiPost(`${getApiUrl()}${postAuthLoginPath()}`, requestData, headers) as Promise<PostAuthLoginFetchResponse>;
 }
diff --git a/apps/cli/src/tests/__snapshots__/generate_auth_login_angular.ts b/apps/cli/src/tests/__snapshots__/generate_auth_login_angular.ts
index dff7ecc..3da6e5a 100644
--- a/apps/cli/src/tests/__snapshots__/generate_auth_login_angular.ts
+++ b/apps/cli/src/tests/__snapshots__/generate_auth_login_angular.ts
@@ -346,7 +346,7 @@ export class ApiService {
       this.baseUrl = baseUrl ?? "";
   }
 
-  postApiAuthLogin(requestContract: AuthRequest): Observable<ResponseResult<AuthResult, 200> | ResponseResult<ProblemDetails, 400>> {
+  postAuthLogin(requestContract: AuthRequest): Observable<ResponseResult<AuthResult, 200> | ResponseResult<ProblemDetails, 400>> {
     const requestData = getApiRequestData<AuthRequest>(requestContract, false);
 
     return apiPost<ResponseResult<AuthResult, 200> | ResponseResult<ProblemDetails, 400>>(this.httpClient, `${this.baseUrl}/api/Auth/login`, requestData);
diff --git a/apps/cli/src/tests/__snapshots__/generate_auth_login_cookies.ts b/apps/cli/src/tests/__snapshots__/generate_auth_login_cookies.ts
index 8309ec2..47cc751 100644
--- a/apps/cli/src/tests/__snapshots__/generate_auth_login_cookies.ts
+++ b/apps/cli/src/tests/__snapshots__/generate_auth_login_cookies.ts
@@ -455,16 +455,16 @@ export type ProblemDetails = {
 	instance?: string | null;
 };
 
-export type PostApiAuthLoginFetchResponse = 
+export type PostAuthLoginFetchResponse = 
 | FetchResponse<AuthResult, 200> 
 | FetchResponse<ProblemDetails, 400> 
 | ErrorResponse;
 
-export const postApiAuthLoginPath = () => `/api/Auth/login`;
+export const postAuthLoginPath = () => `/api/Auth/login`;
 
-export const postApiAuthLogin = (requestContract: AuthRequest, headers = new Headers()):
-  Promise<PostApiAuthLoginFetchResponse> => {
+export const postAuthLogin = (requestContract: AuthRequest, headers = new Headers()):
+  Promise<PostAuthLoginFetchResponse> => {
     const requestData = getApiRequestData<AuthRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiAuthLoginPath()}`, requestData, headers) as Promise<PostApiAuthLoginFetchResponse>;
+    return apiPost(`${getApiUrl()}${postAuthLoginPath()}`, requestData, headers) as Promise<PostAuthLoginFetchResponse>;
 }
diff --git a/apps/cli/src/tests/__snapshots__/generate_bracket_params.ts b/apps/cli/src/tests/__snapshots__/generate_bracket_params.ts
index e647beb..25a4ace 100644
--- a/apps/cli/src/tests/__snapshots__/generate_bracket_params.ts
+++ b/apps/cli/src/tests/__snapshots__/generate_bracket_params.ts
@@ -440,22 +440,22 @@ export type ProductItemDTO = {
 	hidden?: boolean | null;
 };
 
-export type GetApiProducersFetchResponse = 
+export type GetProducersFetchResponse = 
 | FetchResponse<ProducerItemDTO[], 200> 
 | FetchResponse<ExceptionDTO, 401> 
 | FetchResponse<ExceptionDTO, 403> 
 | FetchResponse<ExceptionDTO, 500> 
 | ErrorResponse;
 
-export const getApiProducersPath = () => `/api/producers`;
+export const getProducersPath = () => `/api/producers`;
 
-export const getApiProducers = (filterTerm?: string, filterHidden?: number, filterRegion?: string, filterCategory?: string, headers = new Headers()):
-  Promise<GetApiProducersFetchResponse> => {
+export const getProducers = (filterTerm?: string, filterHidden?: number, filterRegion?: string, filterCategory?: string, headers = new Headers()):
+  Promise<GetProducersFetchResponse> => {
     const queryParams = {
       "filter[term]": filterTerm,
       "filter[hidden]": filterHidden,
       "filter[region]": filterRegion,
       "filter[category]": filterCategory
     }
-    return apiGet(`${getApiUrl()}${getApiProducersPath()}`, headers, queryParams) as Promise<GetApiProducersFetchResponse>;
+    return apiGet(`${getApiUrl()}${getProducersPath()}`, headers, queryParams) as Promise<GetProducersFetchResponse>;
 }
diff --git a/apps/cli/src/tests/__snapshots__/generate_bracket_params_angular.ts b/apps/cli/src/tests/__snapshots__/generate_bracket_params_angular.ts
index a477b02..7b80f7a 100644
--- a/apps/cli/src/tests/__snapshots__/generate_bracket_params_angular.ts
+++ b/apps/cli/src/tests/__snapshots__/generate_bracket_params_angular.ts
@@ -337,7 +337,7 @@ export class ApiService {
       this.baseUrl = baseUrl ?? "";
   }
 
-  getApiProducers(filterTerm?: string, filterHidden?: number, filterRegion?: string, filterCategory?: string): Observable<ResponseResult<ProducerItemDTO[], 200> | ResponseResult<ExceptionDTO, 401> | ResponseResult<ExceptionDTO, 403> | ResponseResult<ExceptionDTO, 500>> {
+  getProducers(filterTerm?: string, filterHidden?: number, filterRegion?: string, filterCategory?: string): Observable<ResponseResult<ProducerItemDTO[], 200> | ResponseResult<ExceptionDTO, 401> | ResponseResult<ExceptionDTO, 403> | ResponseResult<ExceptionDTO, 500>> {
     const queryParams = {
       "filter[term]": filterTerm,
       "filter[hidden]": filterHidden,
diff --git a/apps/cli/src/tests/__snapshots__/generate_bracket_params_cookies.ts b/apps/cli/src/tests/__snapshots__/generate_bracket_params_cookies.ts
index 448d2ff..4e3af7d 100644
--- a/apps/cli/src/tests/__snapshots__/generate_bracket_params_cookies.ts
+++ b/apps/cli/src/tests/__snapshots__/generate_bracket_params_cookies.ts
@@ -446,22 +446,22 @@ export type ProductItemDTO = {
 	hidden?: boolean | null;
 };
 
-export type GetApiProducersFetchResponse = 
+export type GetProducersFetchResponse = 
 | FetchResponse<ProducerItemDTO[], 200> 
 | FetchResponse<ExceptionDTO, 401> 
 | FetchResponse<ExceptionDTO, 403> 
 | FetchResponse<ExceptionDTO, 500> 
 | ErrorResponse;
 
-export const getApiProducersPath = () => `/api/producers`;
+export const getProducersPath = () => `/api/producers`;
 
-export const getApiProducers = (filterTerm?: string, filterHidden?: number, filterRegion?: string, filterCategory?: string, headers = new Headers()):
-  Promise<GetApiProducersFetchResponse> => {
+export const getProducers = (filterTerm?: string, filterHidden?: number, filterRegion?: string, filterCategory?: string, headers = new Headers()):
+  Promise<GetProducersFetchResponse> => {
     const queryParams = {
       "filter[term]": filterTerm,
       "filter[hidden]": filterHidden,
       "filter[region]": filterRegion,
       "filter[category]": filterCategory
     }
-    return apiGet(`${getApiUrl()}${getApiProducersPath()}`, headers, queryParams) as Promise<GetApiProducersFetchResponse>;
+    return apiGet(`${getApiUrl()}${getProducersPath()}`, headers, queryParams) as Promise<GetProducersFetchResponse>;
 }
diff --git a/apps/cli/src/tests/__snapshots__/generate_common_prefix_v3.ts b/apps/cli/src/tests/__snapshots__/generate_common_prefix_api_v1.ts
similarity index 94%
rename from apps/cli/src/tests/__snapshots__/generate_common_prefix_v3.ts
rename to apps/cli/src/tests/__snapshots__/generate_common_prefix_api_v1.ts
index e54ee50..7c06186 100644
--- a/apps/cli/src/tests/__snapshots__/generate_common_prefix_v3.ts
+++ b/apps/cli/src/tests/__snapshots__/generate_common_prefix_api_v1.ts
@@ -506,32 +506,32 @@ export type CodeListItemDto = {
 	name: string;
 };
 
-export type GetApiUsersFetchResponse = 
+export type GetUsersFetchResponse = 
 | FetchResponse<EntityListOfUserListItemDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiUsersPath = () => `/api/v1/users`;
+export const getUsersPath = () => `/api/v1/users`;
 
-export const getApiUsers = (offset?: number, limit?: number, headers = new Headers()):
-  Promise<GetApiUsersFetchResponse> => {
+export const getUsers = (offset?: number, limit?: number, headers = new Headers()):
+  Promise<GetUsersFetchResponse> => {
     const queryParams = {
       "offset": offset,
       "limit": limit
     }
-    return apiGet(`${getApiUrl()}${getApiUsersPath()}`, headers, queryParams) as Promise<GetApiUsersFetchResponse>;
+    return apiGet(`${getApiUrl()}${getUsersPath()}`, headers, queryParams) as Promise<GetUsersFetchResponse>;
 }
 
-export type GetApiUsersUserIDFetchResponse = 
+export type GetUsersUserIDFetchResponse = 
 | FetchResponse<UserDetailDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiUsersUserIDPath = (userID: number) => `/api/v1/users/${userID}`;
+export const getUsersUserIDPath = (userID: number) => `/api/v1/users/${userID}`;
 
-export const getApiUsersUserID = (userID: number, headers = new Headers()):
-  Promise<GetApiUsersUserIDFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiUsersUserIDPath(userID)}`, headers, {}) as Promise<GetApiUsersUserIDFetchResponse>;
+export const getUsersUserID = (userID: number, headers = new Headers()):
+  Promise<GetUsersUserIDFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getUsersUserIDPath(userID)}`, headers, {}) as Promise<GetUsersUserIDFetchResponse>;
 }
diff --git a/apps/cli/src/tests/__snapshots__/generate_common_prefix_v3_angular.ts b/apps/cli/src/tests/__snapshots__/generate_common_prefix_api_v1_angular.ts
similarity index 96%
rename from apps/cli/src/tests/__snapshots__/generate_common_prefix_v3_angular.ts
rename to apps/cli/src/tests/__snapshots__/generate_common_prefix_api_v1_angular.ts
index 6b8ebe0..aa5db06 100644
--- a/apps/cli/src/tests/__snapshots__/generate_common_prefix_v3_angular.ts
+++ b/apps/cli/src/tests/__snapshots__/generate_common_prefix_api_v1_angular.ts
@@ -403,7 +403,7 @@ export class ApiService {
       this.baseUrl = baseUrl ?? "";
   }
 
-  getApiUsers(offset?: number, limit?: number): Observable<ResponseResult<EntityListOfUserListItemDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  getUsers(offset?: number, limit?: number): Observable<ResponseResult<EntityListOfUserListItemDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     const queryParams = {
       "offset": offset,
       "limit": limit
@@ -411,7 +411,7 @@ export class ApiService {
     return apiGet<ResponseResult<EntityListOfUserListItemDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/users`, queryParams);
   }
 
-  getApiUsersUserID(userID: number): Observable<ResponseResult<UserDetailDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  getUsersUserID(userID: number): Observable<ResponseResult<UserDetailDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<UserDetailDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/users/${userID}`);
   }
 }
diff --git a/apps/cli/src/tests/__snapshots__/generate_common_prefix_v3_cookies.ts b/apps/cli/src/tests/__snapshots__/generate_common_prefix_api_v1_cookies.ts
similarity index 94%
rename from apps/cli/src/tests/__snapshots__/generate_common_prefix_v3_cookies.ts
rename to apps/cli/src/tests/__snapshots__/generate_common_prefix_api_v1_cookies.ts
index 90f657b..2d36ea0 100644
--- a/apps/cli/src/tests/__snapshots__/generate_common_prefix_v3_cookies.ts
+++ b/apps/cli/src/tests/__snapshots__/generate_common_prefix_api_v1_cookies.ts
@@ -512,32 +512,32 @@ export type CodeListItemDto = {
 	name: string;
 };
 
-export type GetApiUsersFetchResponse = 
+export type GetUsersFetchResponse = 
 | FetchResponse<EntityListOfUserListItemDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiUsersPath = () => `/api/v1/users`;
+export const getUsersPath = () => `/api/v1/users`;
 
-export const getApiUsers = (offset?: number, limit?: number, headers = new Headers()):
-  Promise<GetApiUsersFetchResponse> => {
+export const getUsers = (offset?: number, limit?: number, headers = new Headers()):
+  Promise<GetUsersFetchResponse> => {
     const queryParams = {
       "offset": offset,
       "limit": limit
     }
-    return apiGet(`${getApiUrl()}${getApiUsersPath()}`, headers, queryParams) as Promise<GetApiUsersFetchResponse>;
+    return apiGet(`${getApiUrl()}${getUsersPath()}`, headers, queryParams) as Promise<GetUsersFetchResponse>;
 }
 
-export type GetApiUsersUserIDFetchResponse = 
+export type GetUsersUserIDFetchResponse = 
 | FetchResponse<UserDetailDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiUsersUserIDPath = (userID: number) => `/api/v1/users/${userID}`;
+export const getUsersUserIDPath = (userID: number) => `/api/v1/users/${userID}`;
 
-export const getApiUsersUserID = (userID: number, headers = new Headers()):
-  Promise<GetApiUsersUserIDFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiUsersUserIDPath(userID)}`, headers, {}) as Promise<GetApiUsersUserIDFetchResponse>;
+export const getUsersUserID = (userID: number, headers = new Headers()):
+  Promise<GetUsersUserIDFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getUsersUserIDPath(userID)}`, headers, {}) as Promise<GetUsersUserIDFetchResponse>;
 }
diff --git a/apps/cli/src/tests/__snapshots__/generate_multipart_formdata.ts b/apps/cli/src/tests/__snapshots__/generate_multipart_formdata.ts
index 4629b1a..b8a2737 100644
--- a/apps/cli/src/tests/__snapshots__/generate_multipart_formdata.ts
+++ b/apps/cli/src/tests/__snapshots__/generate_multipart_formdata.ts
@@ -467,18 +467,18 @@ export type ElectronicTradeFormalityRequestDTO = {
 	file?: File | null;
 };
 
-export type PostApiElectronicTradeTradesElectronicTradeIdFormalityFetchResponse = 
+export type PostElectronicTradeTradesElectronicTradeIdFormalityFetchResponse = 
 | FetchResponse<void, 204> 
 | ErrorResponse;
 
-export const postApiElectronicTradeTradesElectronicTradeIdFormalityPath = (electronicTradeId: number, fields?: string) => `/api/electronic-trade/trades/${electronicTradeId}/formality`;
+export const postElectronicTradeTradesElectronicTradeIdFormalityPath = (electronicTradeId: number, fields?: string) => `/api/electronic-trade/trades/${electronicTradeId}/formality`;
 
-export const postApiElectronicTradeTradesElectronicTradeIdFormality = (requestContract: ElectronicTradeFormalityRequestDTO, electronicTradeId: number, fields?: string, headers = new Headers()):
-  Promise<PostApiElectronicTradeTradesElectronicTradeIdFormalityFetchResponse> => {
+export const postElectronicTradeTradesElectronicTradeIdFormality = (requestContract: ElectronicTradeFormalityRequestDTO, electronicTradeId: number, fields?: string, headers = new Headers()):
+  Promise<PostElectronicTradeTradesElectronicTradeIdFormalityFetchResponse> => {
     const queryParams = {
       "fields": fields
     };
     const requestData = getApiRequestData<ElectronicTradeFormalityRequestDTO>(requestContract, true);
 
-    return apiPost(`${getApiUrl()}${postApiElectronicTradeTradesElectronicTradeIdFormalityPath(electronicTradeId)}`, requestData, headers, queryParams) as Promise<PostApiElectronicTradeTradesElectronicTradeIdFormalityFetchResponse>;
+    return apiPost(`${getApiUrl()}${postElectronicTradeTradesElectronicTradeIdFormalityPath(electronicTradeId)}`, requestData, headers, queryParams) as Promise<PostElectronicTradeTradesElectronicTradeIdFormalityFetchResponse>;
 }
diff --git a/apps/cli/src/tests/__snapshots__/generate_multipart_formdata_angular.ts b/apps/cli/src/tests/__snapshots__/generate_multipart_formdata_angular.ts
index f9343bf..29703c3 100644
--- a/apps/cli/src/tests/__snapshots__/generate_multipart_formdata_angular.ts
+++ b/apps/cli/src/tests/__snapshots__/generate_multipart_formdata_angular.ts
@@ -364,7 +364,7 @@ export class ApiService {
       this.baseUrl = baseUrl ?? "";
   }
 
-  postApiElectronicTradeTradesElectronicTradeIdFormality(requestContract: ElectronicTradeFormalityRequestDTO, electronicTradeId: number, fields?: string): Observable<ResponseResult<void, 204>> {
+  postElectronicTradeTradesElectronicTradeIdFormality(requestContract: ElectronicTradeFormalityRequestDTO, electronicTradeId: number, fields?: string): Observable<ResponseResult<void, 204>> {
 		const queryParams = {
       "fields": fields
     };
diff --git a/apps/cli/src/tests/__snapshots__/generate_multipart_formdata_cookies.ts b/apps/cli/src/tests/__snapshots__/generate_multipart_formdata_cookies.ts
index b4d943f..35f4409 100644
--- a/apps/cli/src/tests/__snapshots__/generate_multipart_formdata_cookies.ts
+++ b/apps/cli/src/tests/__snapshots__/generate_multipart_formdata_cookies.ts
@@ -473,18 +473,18 @@ export type ElectronicTradeFormalityRequestDTO = {
 	file?: File | null;
 };
 
-export type PostApiElectronicTradeTradesElectronicTradeIdFormalityFetchResponse = 
+export type PostElectronicTradeTradesElectronicTradeIdFormalityFetchResponse = 
 | FetchResponse<void, 204> 
 | ErrorResponse;
 
-export const postApiElectronicTradeTradesElectronicTradeIdFormalityPath = (electronicTradeId: number, fields?: string) => `/api/electronic-trade/trades/${electronicTradeId}/formality`;
+export const postElectronicTradeTradesElectronicTradeIdFormalityPath = (electronicTradeId: number, fields?: string) => `/api/electronic-trade/trades/${electronicTradeId}/formality`;
 
-export const postApiElectronicTradeTradesElectronicTradeIdFormality = (requestContract: ElectronicTradeFormalityRequestDTO, electronicTradeId: number, fields?: string, headers = new Headers()):
-  Promise<PostApiElectronicTradeTradesElectronicTradeIdFormalityFetchResponse> => {
+export const postElectronicTradeTradesElectronicTradeIdFormality = (requestContract: ElectronicTradeFormalityRequestDTO, electronicTradeId: number, fields?: string, headers = new Headers()):
+  Promise<PostElectronicTradeTradesElectronicTradeIdFormalityFetchResponse> => {
     const queryParams = {
       "fields": fields
     };
     const requestData = getApiRequestData<ElectronicTradeFormalityRequestDTO>(requestContract, true);
 
-    return apiPost(`${getApiUrl()}${postApiElectronicTradeTradesElectronicTradeIdFormalityPath(electronicTradeId)}`, requestData, headers, queryParams) as Promise<PostApiElectronicTradeTradesElectronicTradeIdFormalityFetchResponse>;
+    return apiPost(`${getApiUrl()}${postElectronicTradeTradesElectronicTradeIdFormalityPath(electronicTradeId)}`, requestData, headers, queryParams) as Promise<PostElectronicTradeTradesElectronicTradeIdFormalityFetchResponse>;
 }
diff --git a/apps/cli/src/tests/__snapshots__/generate_multipart_formdata_multiplefiles.ts b/apps/cli/src/tests/__snapshots__/generate_multipart_formdata_multiplefiles.ts
index 73c906e..04e22b6 100644
--- a/apps/cli/src/tests/__snapshots__/generate_multipart_formdata_multiplefiles.ts
+++ b/apps/cli/src/tests/__snapshots__/generate_multipart_formdata_multiplefiles.ts
@@ -467,18 +467,18 @@ export type ElectronicTradeFormalityRequestDTO = {
 	"files[]": File[];
 };
 
-export type PostApiElectronicTradeTradesElectronicTradeIdFormalityFetchResponse = 
+export type PostElectronicTradeTradesElectronicTradeIdFormalityFetchResponse = 
 | FetchResponse<void, 204> 
 | ErrorResponse;
 
-export const postApiElectronicTradeTradesElectronicTradeIdFormalityPath = (electronicTradeId: number, fields?: string) => `/api/electronic-trade/trades/${electronicTradeId}/formality`;
+export const postElectronicTradeTradesElectronicTradeIdFormalityPath = (electronicTradeId: number, fields?: string) => `/api/electronic-trade/trades/${electronicTradeId}/formality`;
 
-export const postApiElectronicTradeTradesElectronicTradeIdFormality = (requestContract: ElectronicTradeFormalityRequestDTO, electronicTradeId: number, fields?: string, headers = new Headers()):
-  Promise<PostApiElectronicTradeTradesElectronicTradeIdFormalityFetchResponse> => {
+export const postElectronicTradeTradesElectronicTradeIdFormality = (requestContract: ElectronicTradeFormalityRequestDTO, electronicTradeId: number, fields?: string, headers = new Headers()):
+  Promise<PostElectronicTradeTradesElectronicTradeIdFormalityFetchResponse> => {
     const queryParams = {
       "fields": fields
     };
     const requestData = getApiRequestData<ElectronicTradeFormalityRequestDTO>(requestContract, true);
 
-    return apiPost(`${getApiUrl()}${postApiElectronicTradeTradesElectronicTradeIdFormalityPath(electronicTradeId)}`, requestData, headers, queryParams) as Promise<PostApiElectronicTradeTradesElectronicTradeIdFormalityFetchResponse>;
+    return apiPost(`${getApiUrl()}${postElectronicTradeTradesElectronicTradeIdFormalityPath(electronicTradeId)}`, requestData, headers, queryParams) as Promise<PostElectronicTradeTradesElectronicTradeIdFormalityFetchResponse>;
 }
diff --git a/apps/cli/src/tests/__snapshots__/generate_multipart_formdata_multiplefiles_angular.ts b/apps/cli/src/tests/__snapshots__/generate_multipart_formdata_multiplefiles_angular.ts
index afcc9f5..5b910d7 100644
--- a/apps/cli/src/tests/__snapshots__/generate_multipart_formdata_multiplefiles_angular.ts
+++ b/apps/cli/src/tests/__snapshots__/generate_multipart_formdata_multiplefiles_angular.ts
@@ -364,7 +364,7 @@ export class ApiService {
       this.baseUrl = baseUrl ?? "";
   }
 
-  postApiElectronicTradeTradesElectronicTradeIdFormality(requestContract: ElectronicTradeFormalityRequestDTO, electronicTradeId: number, fields?: string): Observable<ResponseResult<void, 204>> {
+  postElectronicTradeTradesElectronicTradeIdFormality(requestContract: ElectronicTradeFormalityRequestDTO, electronicTradeId: number, fields?: string): Observable<ResponseResult<void, 204>> {
 		const queryParams = {
       "fields": fields
     };
diff --git a/apps/cli/src/tests/__snapshots__/generate_multipart_formdata_multiplefiles_cookies.ts b/apps/cli/src/tests/__snapshots__/generate_multipart_formdata_multiplefiles_cookies.ts
index 8592ffc..9c6f6c4 100644
--- a/apps/cli/src/tests/__snapshots__/generate_multipart_formdata_multiplefiles_cookies.ts
+++ b/apps/cli/src/tests/__snapshots__/generate_multipart_formdata_multiplefiles_cookies.ts
@@ -473,18 +473,18 @@ export type ElectronicTradeFormalityRequestDTO = {
 	"files[]": File[];
 };
 
-export type PostApiElectronicTradeTradesElectronicTradeIdFormalityFetchResponse = 
+export type PostElectronicTradeTradesElectronicTradeIdFormalityFetchResponse = 
 | FetchResponse<void, 204> 
 | ErrorResponse;
 
-export const postApiElectronicTradeTradesElectronicTradeIdFormalityPath = (electronicTradeId: number, fields?: string) => `/api/electronic-trade/trades/${electronicTradeId}/formality`;
+export const postElectronicTradeTradesElectronicTradeIdFormalityPath = (electronicTradeId: number, fields?: string) => `/api/electronic-trade/trades/${electronicTradeId}/formality`;
 
-export const postApiElectronicTradeTradesElectronicTradeIdFormality = (requestContract: ElectronicTradeFormalityRequestDTO, electronicTradeId: number, fields?: string, headers = new Headers()):
-  Promise<PostApiElectronicTradeTradesElectronicTradeIdFormalityFetchResponse> => {
+export const postElectronicTradeTradesElectronicTradeIdFormality = (requestContract: ElectronicTradeFormalityRequestDTO, electronicTradeId: number, fields?: string, headers = new Headers()):
+  Promise<PostElectronicTradeTradesElectronicTradeIdFormalityFetchResponse> => {
     const queryParams = {
       "fields": fields
     };
     const requestData = getApiRequestData<ElectronicTradeFormalityRequestDTO>(requestContract, true);
 
-    return apiPost(`${getApiUrl()}${postApiElectronicTradeTradesElectronicTradeIdFormalityPath(electronicTradeId)}`, requestData, headers, queryParams) as Promise<PostApiElectronicTradeTradesElectronicTradeIdFormalityFetchResponse>;
+    return apiPost(`${getApiUrl()}${postElectronicTradeTradesElectronicTradeIdFormalityPath(electronicTradeId)}`, requestData, headers, queryParams) as Promise<PostElectronicTradeTradesElectronicTradeIdFormalityFetchResponse>;
 }
diff --git a/apps/cli/src/tests/__snapshots__/generate_nswag.ts b/apps/cli/src/tests/__snapshots__/generate_nswag.ts
index 368305e..cd07073 100644
--- a/apps/cli/src/tests/__snapshots__/generate_nswag.ts
+++ b/apps/cli/src/tests/__snapshots__/generate_nswag.ts
@@ -2049,111 +2049,111 @@ export type SetPasswordCommand = {
 	password: string;
 };
 
-export type GetApiWorkflowsStepsFetchResponse = 
+export type GetWorkflowsStepsFetchResponse = 
 | FetchResponse<EntityListOfStepDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiWorkflowsStepsPath = () => `/api/v1/workflows/steps`;
+export const getWorkflowsStepsPath = () => `/api/v1/workflows/steps`;
 
-export const getApiWorkflowsSteps = (headers = new Headers()):
-  Promise<GetApiWorkflowsStepsFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiWorkflowsStepsPath()}`, headers, {}) as Promise<GetApiWorkflowsStepsFetchResponse>;
+export const getWorkflowsSteps = (headers = new Headers()):
+  Promise<GetWorkflowsStepsFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getWorkflowsStepsPath()}`, headers, {}) as Promise<GetWorkflowsStepsFetchResponse>;
 }
 
-export type GetApiUserCompanyFetchResponse = 
+export type GetUserCompanyFetchResponse = 
 | FetchResponse<UserCompanyDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiUserCompanyPath = () => `/api/v1/user/company`;
+export const getUserCompanyPath = () => `/api/v1/user/company`;
 
-export const getApiUserCompany = (headers = new Headers()):
-  Promise<GetApiUserCompanyFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiUserCompanyPath()}`, headers, {}) as Promise<GetApiUserCompanyFetchResponse>;
+export const getUserCompany = (headers = new Headers()):
+  Promise<GetUserCompanyFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getUserCompanyPath()}`, headers, {}) as Promise<GetUserCompanyFetchResponse>;
 }
 
-export type PutApiUserCompanyFetchResponse = 
+export type PutUserCompanyFetchResponse = 
 | FetchResponse<SetUserCompanyCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const putApiUserCompanyPath = () => `/api/v1/user/company`;
+export const putUserCompanyPath = () => `/api/v1/user/company`;
 
-export const putApiUserCompany = (requestContract: UserCompanySetRequest, headers = new Headers()):
-  Promise<PutApiUserCompanyFetchResponse> => {
+export const putUserCompany = (requestContract: UserCompanySetRequest, headers = new Headers()):
+  Promise<PutUserCompanyFetchResponse> => {
     const requestData = getApiRequestData<UserCompanySetRequest>(requestContract, false);
 
-    return apiPut(`${getApiUrl()}${putApiUserCompanyPath()}`, requestData, headers) as Promise<PutApiUserCompanyFetchResponse>;
+    return apiPut(`${getApiUrl()}${putUserCompanyPath()}`, requestData, headers) as Promise<PutUserCompanyFetchResponse>;
 }
 
-export type GetApiServicesPackagesFetchResponse = 
+export type GetServicesPackagesFetchResponse = 
 | FetchResponse<EntityListOfServicePackageListItemDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiServicesPackagesPath = () => `/api/v1/services/packages`;
+export const getServicesPackagesPath = () => `/api/v1/services/packages`;
 
-export const getApiServicesPackages = (offset?: number, limit?: number, headers = new Headers()):
-  Promise<GetApiServicesPackagesFetchResponse> => {
+export const getServicesPackages = (offset?: number, limit?: number, headers = new Headers()):
+  Promise<GetServicesPackagesFetchResponse> => {
     const queryParams = {
       "offset": offset,
       "limit": limit
     }
-    return apiGet(`${getApiUrl()}${getApiServicesPackagesPath()}`, headers, queryParams) as Promise<GetApiServicesPackagesFetchResponse>;
+    return apiGet(`${getApiUrl()}${getServicesPackagesPath()}`, headers, queryParams) as Promise<GetServicesPackagesFetchResponse>;
 }
 
-export type GetApiServicesPackagesAvailableServicesFetchResponse = 
+export type GetServicesPackagesAvailableServicesFetchResponse = 
 | FetchResponse<EntityListOfServiceListItemDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiServicesPackagesAvailableServicesPath = () => `/api/v1/services/packages/available-services`;
+export const getServicesPackagesAvailableServicesPath = () => `/api/v1/services/packages/available-services`;
 
-export const getApiServicesPackagesAvailableServices = (offset?: number, limit?: number, headers = new Headers()):
-  Promise<GetApiServicesPackagesAvailableServicesFetchResponse> => {
+export const getServicesPackagesAvailableServices = (offset?: number, limit?: number, headers = new Headers()):
+  Promise<GetServicesPackagesAvailableServicesFetchResponse> => {
     const queryParams = {
       "offset": offset,
       "limit": limit
     }
-    return apiGet(`${getApiUrl()}${getApiServicesPackagesAvailableServicesPath()}`, headers, queryParams) as Promise<GetApiServicesPackagesAvailableServicesFetchResponse>;
+    return apiGet(`${getApiUrl()}${getServicesPackagesAvailableServicesPath()}`, headers, queryParams) as Promise<GetServicesPackagesAvailableServicesFetchResponse>;
 }
 
-export type PostApiServicesPackageFetchResponse = 
+export type PostServicesPackageFetchResponse = 
 | FetchResponse<CreateServicePackageCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiServicesPackagePath = () => `/api/v1/services/package`;
+export const postServicesPackagePath = () => `/api/v1/services/package`;
 
-export const postApiServicesPackage = (requestContract: SaveServicePackageRequest, headers = new Headers()):
-  Promise<PostApiServicesPackageFetchResponse> => {
+export const postServicesPackage = (requestContract: SaveServicePackageRequest, headers = new Headers()):
+  Promise<PostServicesPackageFetchResponse> => {
     const requestData = getApiRequestData<SaveServicePackageRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiServicesPackagePath()}`, requestData, headers) as Promise<PostApiServicesPackageFetchResponse>;
+    return apiPost(`${getApiUrl()}${postServicesPackagePath()}`, requestData, headers) as Promise<PostServicesPackageFetchResponse>;
 }
 
-export type GetApiServicesServicePublicIDPackageFetchResponse = 
+export type GetServicesServicePublicIDPackageFetchResponse = 
 | FetchResponse<ServicePackageDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 403> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiServicesServicePublicIDPackagePath = (servicePublicID: string) => `/api/v1/services/${servicePublicID}/package`;
+export const getServicesServicePublicIDPackagePath = (servicePublicID: string) => `/api/v1/services/${servicePublicID}/package`;
 
-export const getApiServicesServicePublicIDPackage = (servicePublicID: string, headers = new Headers()):
-  Promise<GetApiServicesServicePublicIDPackageFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiServicesServicePublicIDPackagePath(servicePublicID)}`, headers, {}) as Promise<GetApiServicesServicePublicIDPackageFetchResponse>;
+export const getServicesServicePublicIDPackage = (servicePublicID: string, headers = new Headers()):
+  Promise<GetServicesServicePublicIDPackageFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getServicesServicePublicIDPackagePath(servicePublicID)}`, headers, {}) as Promise<GetServicesServicePublicIDPackageFetchResponse>;
 }
 
-export type DeleteApiServicesServicePublicIDPackageFetchResponse = 
+export type DeleteServicesServicePublicIDPackageFetchResponse = 
 | FetchResponse<ServicePackageDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 403> 
@@ -2161,14 +2161,14 @@ export type DeleteApiServicesServicePublicIDPackageFetchResponse =
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const deleteApiServicesServicePublicIDPackagePath = (servicePublicID: string) => `/api/v1/services/${servicePublicID}/package`;
+export const deleteServicesServicePublicIDPackagePath = (servicePublicID: string) => `/api/v1/services/${servicePublicID}/package`;
 
-export const deleteApiServicesServicePublicIDPackage = (servicePublicID: string, headers = new Headers()):
-  Promise<DeleteApiServicesServicePublicIDPackageFetchResponse> => {
-    return apiDelete(`${getApiUrl()}${deleteApiServicesServicePublicIDPackagePath(servicePublicID)}`, headers, {}) as Promise<DeleteApiServicesServicePublicIDPackageFetchResponse>;
+export const deleteServicesServicePublicIDPackage = (servicePublicID: string, headers = new Headers()):
+  Promise<DeleteServicesServicePublicIDPackageFetchResponse> => {
+    return apiDelete(`${getApiUrl()}${deleteServicesServicePublicIDPackagePath(servicePublicID)}`, headers, {}) as Promise<DeleteServicesServicePublicIDPackageFetchResponse>;
 }
 
-export type PutApiServicesServicePublicIDPackageFetchResponse = 
+export type PutServicesServicePublicIDPackageFetchResponse = 
 | FetchResponse<UpdateServicePackageCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 403> 
@@ -2176,57 +2176,57 @@ export type PutApiServicesServicePublicIDPackageFetchResponse =
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const putApiServicesServicePublicIDPackagePath = (servicePublicID: string) => `/api/v1/services/${servicePublicID}/package`;
+export const putServicesServicePublicIDPackagePath = (servicePublicID: string) => `/api/v1/services/${servicePublicID}/package`;
 
-export const putApiServicesServicePublicIDPackage = (requestContract: SaveServicePackageRequest, servicePublicID: string, headers = new Headers()):
-  Promise<PutApiServicesServicePublicIDPackageFetchResponse> => {
+export const putServicesServicePublicIDPackage = (requestContract: SaveServicePackageRequest, servicePublicID: string, headers = new Headers()):
+  Promise<PutServicesServicePublicIDPackageFetchResponse> => {
     const requestData = getApiRequestData<SaveServicePackageRequest>(requestContract, false);
 
-    return apiPut(`${getApiUrl()}${putApiServicesServicePublicIDPackagePath(servicePublicID)}`, requestData, headers) as Promise<PutApiServicesServicePublicIDPackageFetchResponse>;
+    return apiPut(`${getApiUrl()}${putServicesServicePublicIDPackagePath(servicePublicID)}`, requestData, headers) as Promise<PutServicesServicePublicIDPackageFetchResponse>;
 }
 
-export type GetApiPartiesPublicIDFetchResponse = 
+export type GetPartiesPublicIDFetchResponse = 
 | FetchResponse<PartyDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiPartiesPublicIDPath = (publicID: string) => `/api/v1/parties/${publicID}`;
+export const getPartiesPublicIDPath = (publicID: string) => `/api/v1/parties/${publicID}`;
 
-export const getApiPartiesPublicID = (publicID: string, headers = new Headers()):
-  Promise<GetApiPartiesPublicIDFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiPartiesPublicIDPath(publicID)}`, headers, {}) as Promise<GetApiPartiesPublicIDFetchResponse>;
+export const getPartiesPublicID = (publicID: string, headers = new Headers()):
+  Promise<GetPartiesPublicIDFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getPartiesPublicIDPath(publicID)}`, headers, {}) as Promise<GetPartiesPublicIDFetchResponse>;
 }
 
-export type GetApiPartiesSearchAresFetchResponse = 
+export type GetPartiesSearchAresFetchResponse = 
 | FetchResponse<PartyDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiPartiesSearchAresPath = () => `/api/v1/parties/search/ares`;
+export const getPartiesSearchAresPath = () => `/api/v1/parties/search/ares`;
 
-export const getApiPartiesSearchAres = (query?: string, partyType?: PartyType | undefined | null, headers = new Headers()):
-  Promise<GetApiPartiesSearchAresFetchResponse> => {
+export const getPartiesSearchAres = (query?: string, partyType?: PartyType | undefined | null, headers = new Headers()):
+  Promise<GetPartiesSearchAresFetchResponse> => {
     const queryParams = {
       "query": query,
       "partyType": partyType
     }
-    return apiGet(`${getApiUrl()}${getApiPartiesSearchAresPath()}`, headers, queryParams) as Promise<GetApiPartiesSearchAresFetchResponse>;
+    return apiGet(`${getApiUrl()}${getPartiesSearchAresPath()}`, headers, queryParams) as Promise<GetPartiesSearchAresFetchResponse>;
 }
 
-export type GetApiOrdersFetchResponse = 
+export type GetOrdersFetchResponse = 
 | FetchResponse<EntityListOfOrderListItemDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiOrdersPath = () => `/api/v1/orders`;
+export const getOrdersPath = () => `/api/v1/orders`;
 
-export const getApiOrders = (offset?: number, limit?: number, workflowStatuses?: string[], query?: string | undefined | null, startDate?: string | undefined | null, endDate?: string | undefined | null, isSearchInStructure?: boolean, onlyAfterInvoiceDueDate?: boolean, includeClientReminderAvailable?: boolean, headers = new Headers()):
-  Promise<GetApiOrdersFetchResponse> => {
+export const getOrders = (offset?: number, limit?: number, workflowStatuses?: string[], query?: string | undefined | null, startDate?: string | undefined | null, endDate?: string | undefined | null, isSearchInStructure?: boolean, onlyAfterInvoiceDueDate?: boolean, includeClientReminderAvailable?: boolean, headers = new Headers()):
+  Promise<GetOrdersFetchResponse> => {
     const queryParams = {
       "offset": offset,
       "limit": limit,
@@ -2238,412 +2238,412 @@ export const getApiOrders = (offset?: number, limit?: number, workflowStatuses?:
       "onlyAfterInvoiceDueDate": onlyAfterInvoiceDueDate,
       "includeClientReminderAvailable": includeClientReminderAvailable
     }
-    return apiGet(`${getApiUrl()}${getApiOrdersPath()}`, headers, queryParams) as Promise<GetApiOrdersFetchResponse>;
+    return apiGet(`${getApiUrl()}${getOrdersPath()}`, headers, queryParams) as Promise<GetOrdersFetchResponse>;
 }
 
-export type GetApiOrdersPublicIDFetchResponse = 
+export type GetOrdersPublicIDFetchResponse = 
 | FetchResponse<OrderDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiOrdersPublicIDPath = (publicID: string) => `/api/v1/orders/${publicID}`;
+export const getOrdersPublicIDPath = (publicID: string) => `/api/v1/orders/${publicID}`;
 
-export const getApiOrdersPublicID = (publicID: string, headers = new Headers()):
-  Promise<GetApiOrdersPublicIDFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiOrdersPublicIDPath(publicID)}`, headers, {}) as Promise<GetApiOrdersPublicIDFetchResponse>;
+export const getOrdersPublicID = (publicID: string, headers = new Headers()):
+  Promise<GetOrdersPublicIDFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getOrdersPublicIDPath(publicID)}`, headers, {}) as Promise<GetOrdersPublicIDFetchResponse>;
 }
 
-export type DeleteApiOrdersPublicIDFetchResponse = 
+export type DeleteOrdersPublicIDFetchResponse = 
 | FetchResponse<DeleteOrderCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const deleteApiOrdersPublicIDPath = (publicID: string) => `/api/v1/orders/${publicID}`;
+export const deleteOrdersPublicIDPath = (publicID: string) => `/api/v1/orders/${publicID}`;
 
-export const deleteApiOrdersPublicID = (publicID: string, headers = new Headers()):
-  Promise<DeleteApiOrdersPublicIDFetchResponse> => {
-    return apiDelete(`${getApiUrl()}${deleteApiOrdersPublicIDPath(publicID)}`, headers, {}) as Promise<DeleteApiOrdersPublicIDFetchResponse>;
+export const deleteOrdersPublicID = (publicID: string, headers = new Headers()):
+  Promise<DeleteOrdersPublicIDFetchResponse> => {
+    return apiDelete(`${getApiUrl()}${deleteOrdersPublicIDPath(publicID)}`, headers, {}) as Promise<DeleteOrdersPublicIDFetchResponse>;
 }
 
-export type PutApiOrdersPublicIDPeriodicityFetchResponse = 
+export type PutOrdersPublicIDPeriodicityFetchResponse = 
 | FetchResponse<SetPeriodicityCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const putApiOrdersPublicIDPeriodicityPath = (publicID: string) => `/api/v1/orders/${publicID}/periodicity`;
+export const putOrdersPublicIDPeriodicityPath = (publicID: string) => `/api/v1/orders/${publicID}/periodicity`;
 
-export const putApiOrdersPublicIDPeriodicity = (requestContract: SetPeriodicityRequest, publicID: string, headers = new Headers()):
-  Promise<PutApiOrdersPublicIDPeriodicityFetchResponse> => {
+export const putOrdersPublicIDPeriodicity = (requestContract: SetPeriodicityRequest, publicID: string, headers = new Headers()):
+  Promise<PutOrdersPublicIDPeriodicityFetchResponse> => {
     const requestData = getApiRequestData<SetPeriodicityRequest>(requestContract, false);
 
-    return apiPut(`${getApiUrl()}${putApiOrdersPublicIDPeriodicityPath(publicID)}`, requestData, headers) as Promise<PutApiOrdersPublicIDPeriodicityFetchResponse>;
+    return apiPut(`${getApiUrl()}${putOrdersPublicIDPeriodicityPath(publicID)}`, requestData, headers) as Promise<PutOrdersPublicIDPeriodicityFetchResponse>;
 }
 
-export type GetApiOrdersPublicIDServicesFetchResponse = 
+export type GetOrdersPublicIDServicesFetchResponse = 
 | FetchResponse<EntityListOfOrderServiceDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiOrdersPublicIDServicesPath = (publicID: string) => `/api/v1/orders/${publicID}/services`;
+export const getOrdersPublicIDServicesPath = (publicID: string) => `/api/v1/orders/${publicID}/services`;
 
-export const getApiOrdersPublicIDServices = (publicID: string, headers = new Headers()):
-  Promise<GetApiOrdersPublicIDServicesFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiOrdersPublicIDServicesPath(publicID)}`, headers, {}) as Promise<GetApiOrdersPublicIDServicesFetchResponse>;
+export const getOrdersPublicIDServices = (publicID: string, headers = new Headers()):
+  Promise<GetOrdersPublicIDServicesFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getOrdersPublicIDServicesPath(publicID)}`, headers, {}) as Promise<GetOrdersPublicIDServicesFetchResponse>;
 }
 
-export type DeleteApiOrdersServicesServiceIDFetchResponse = 
+export type DeleteOrdersServicesServiceIDFetchResponse = 
 | FetchResponse<DeleteOrderServiceCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const deleteApiOrdersServicesServiceIDPath = (serviceID: number) => `/api/v1/orders/services/${serviceID}`;
+export const deleteOrdersServicesServiceIDPath = (serviceID: number) => `/api/v1/orders/services/${serviceID}`;
 
-export const deleteApiOrdersServicesServiceID = (serviceID: number, headers = new Headers()):
-  Promise<DeleteApiOrdersServicesServiceIDFetchResponse> => {
-    return apiDelete(`${getApiUrl()}${deleteApiOrdersServicesServiceIDPath(serviceID)}`, headers, {}) as Promise<DeleteApiOrdersServicesServiceIDFetchResponse>;
+export const deleteOrdersServicesServiceID = (serviceID: number, headers = new Headers()):
+  Promise<DeleteOrdersServicesServiceIDFetchResponse> => {
+    return apiDelete(`${getApiUrl()}${deleteOrdersServicesServiceIDPath(serviceID)}`, headers, {}) as Promise<DeleteOrdersServicesServiceIDFetchResponse>;
 }
 
-export type GetApiOrdersPeriodicUpcomingFetchResponse = 
+export type GetOrdersPeriodicUpcomingFetchResponse = 
 | FetchResponse<EntityListOfUpcomingPeriodicOrderDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiOrdersPeriodicUpcomingPath = () => `/api/v1/orders/periodic/upcoming`;
+export const getOrdersPeriodicUpcomingPath = () => `/api/v1/orders/periodic/upcoming`;
 
-export const getApiOrdersPeriodicUpcoming = (offset?: number, limit?: number, nexOrderDate?: string, headers = new Headers()):
-  Promise<GetApiOrdersPeriodicUpcomingFetchResponse> => {
+export const getOrdersPeriodicUpcoming = (offset?: number, limit?: number, nexOrderDate?: string, headers = new Headers()):
+  Promise<GetOrdersPeriodicUpcomingFetchResponse> => {
     const queryParams = {
       "offset": offset,
       "limit": limit,
       "nexOrderDate": nexOrderDate
     }
-    return apiGet(`${getApiUrl()}${getApiOrdersPeriodicUpcomingPath()}`, headers, queryParams) as Promise<GetApiOrdersPeriodicUpcomingFetchResponse>;
+    return apiGet(`${getApiUrl()}${getOrdersPeriodicUpcomingPath()}`, headers, queryParams) as Promise<GetOrdersPeriodicUpcomingFetchResponse>;
 }
 
-export type GetApiOrdersRevocationExampleFileFetchResponse = 
+export type GetOrdersRevocationExampleFileFetchResponse = 
 | FetchResponse<File, 200> 
 | FetchResponse<ApiProblemDetails, 204> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiOrdersRevocationExampleFilePath = () => `/api/v1/orders/revocation/example/file`;
+export const getOrdersRevocationExampleFilePath = () => `/api/v1/orders/revocation/example/file`;
 
-export const getApiOrdersRevocationExampleFile = (headers = new Headers()):
-  Promise<GetApiOrdersRevocationExampleFileFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiOrdersRevocationExampleFilePath()}`, headers, {}) as Promise<GetApiOrdersRevocationExampleFileFetchResponse>;
+export const getOrdersRevocationExampleFile = (headers = new Headers()):
+  Promise<GetOrdersRevocationExampleFileFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getOrdersRevocationExampleFilePath()}`, headers, {}) as Promise<GetOrdersRevocationExampleFileFetchResponse>;
 }
 
-export type GetApiOrdersPublicIDPaymentCalendarItemsFetchResponse = 
+export type GetOrdersPublicIDPaymentCalendarItemsFetchResponse = 
 | FetchResponse<EntityListOfPaymentCalendarItemDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiOrdersPublicIDPaymentCalendarItemsPath = (publicID: string) => `/api/v1/orders/${publicID}/payment-calendar-items`;
+export const getOrdersPublicIDPaymentCalendarItemsPath = (publicID: string) => `/api/v1/orders/${publicID}/payment-calendar-items`;
 
-export const getApiOrdersPublicIDPaymentCalendarItems = (publicID: string, headers = new Headers()):
-  Promise<GetApiOrdersPublicIDPaymentCalendarItemsFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiOrdersPublicIDPaymentCalendarItemsPath(publicID)}`, headers, {}) as Promise<GetApiOrdersPublicIDPaymentCalendarItemsFetchResponse>;
+export const getOrdersPublicIDPaymentCalendarItems = (publicID: string, headers = new Headers()):
+  Promise<GetOrdersPublicIDPaymentCalendarItemsFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getOrdersPublicIDPaymentCalendarItemsPath(publicID)}`, headers, {}) as Promise<GetOrdersPublicIDPaymentCalendarItemsFetchResponse>;
 }
 
-export type GetApiOrdersCountFetchResponse = 
+export type GetOrdersCountFetchResponse = 
 | FetchResponse<GetOrdersCountQueryResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiOrdersCountPath = () => `/api/v1/orders/count`;
+export const getOrdersCountPath = () => `/api/v1/orders/count`;
 
-export const getApiOrdersCount = (onlyActive?: boolean, headers = new Headers()):
-  Promise<GetApiOrdersCountFetchResponse> => {
+export const getOrdersCount = (onlyActive?: boolean, headers = new Headers()):
+  Promise<GetOrdersCountFetchResponse> => {
     const queryParams = {
       "onlyActive": onlyActive
     }
-    return apiGet(`${getApiUrl()}${getApiOrdersCountPath()}`, headers, queryParams) as Promise<GetApiOrdersCountFetchResponse>;
+    return apiGet(`${getApiUrl()}${getOrdersCountPath()}`, headers, queryParams) as Promise<GetOrdersCountFetchResponse>;
 }
 
-export type PostApiOrdersOrderPublicIDClientInvoiceRecurringPaymentCreateInvoiceAndSetAsPaidByClientFetchResponse = 
+export type PostOrdersOrderPublicIDClientInvoiceRecurringPaymentCreateInvoiceAndSetAsPaidByClientFetchResponse = 
 | FetchResponse<SetPeriodicityCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersOrderPublicIDClientInvoiceRecurringPaymentCreateInvoiceAndSetAsPaidByClientPath = (orderPublicID: string) => `/api/v1/orders/${orderPublicID}/client-invoice-recurring-payment-create-invoice-and-set-as-paid-by-client`;
+export const postOrdersOrderPublicIDClientInvoiceRecurringPaymentCreateInvoiceAndSetAsPaidByClientPath = (orderPublicID: string) => `/api/v1/orders/${orderPublicID}/client-invoice-recurring-payment-create-invoice-and-set-as-paid-by-client`;
 
-export const postApiOrdersOrderPublicIDClientInvoiceRecurringPaymentCreateInvoiceAndSetAsPaidByClient = (requestContract: ClientInvoiceRecurringPaymentCreateInvoiceAndSetAsPaidByClientRequest, orderPublicID: string, headers = new Headers()):
-  Promise<PostApiOrdersOrderPublicIDClientInvoiceRecurringPaymentCreateInvoiceAndSetAsPaidByClientFetchResponse> => {
+export const postOrdersOrderPublicIDClientInvoiceRecurringPaymentCreateInvoiceAndSetAsPaidByClient = (requestContract: ClientInvoiceRecurringPaymentCreateInvoiceAndSetAsPaidByClientRequest, orderPublicID: string, headers = new Headers()):
+  Promise<PostOrdersOrderPublicIDClientInvoiceRecurringPaymentCreateInvoiceAndSetAsPaidByClientFetchResponse> => {
     const requestData = getApiRequestData<ClientInvoiceRecurringPaymentCreateInvoiceAndSetAsPaidByClientRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersOrderPublicIDClientInvoiceRecurringPaymentCreateInvoiceAndSetAsPaidByClientPath(orderPublicID)}`, requestData, headers) as Promise<PostApiOrdersOrderPublicIDClientInvoiceRecurringPaymentCreateInvoiceAndSetAsPaidByClientFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersOrderPublicIDClientInvoiceRecurringPaymentCreateInvoiceAndSetAsPaidByClientPath(orderPublicID)}`, requestData, headers) as Promise<PostOrdersOrderPublicIDClientInvoiceRecurringPaymentCreateInvoiceAndSetAsPaidByClientFetchResponse>;
 }
 
-export type GetApiOrdersPublicIDClientZonePaymentCalendarItemsFetchResponse = 
+export type GetOrdersPublicIDClientZonePaymentCalendarItemsFetchResponse = 
 | FetchResponse<EntityListOfPaymentCalendarClientZoneItemDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiOrdersPublicIDClientZonePaymentCalendarItemsPath = (publicID: string) => `/api/v1/orders/${publicID}/client-zone/payment-calendar-items`;
+export const getOrdersPublicIDClientZonePaymentCalendarItemsPath = (publicID: string) => `/api/v1/orders/${publicID}/client-zone/payment-calendar-items`;
 
-export const getApiOrdersPublicIDClientZonePaymentCalendarItems = (publicID: string, headers = new Headers()):
-  Promise<GetApiOrdersPublicIDClientZonePaymentCalendarItemsFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiOrdersPublicIDClientZonePaymentCalendarItemsPath(publicID)}`, headers, {}) as Promise<GetApiOrdersPublicIDClientZonePaymentCalendarItemsFetchResponse>;
+export const getOrdersPublicIDClientZonePaymentCalendarItems = (publicID: string, headers = new Headers()):
+  Promise<GetOrdersPublicIDClientZonePaymentCalendarItemsFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getOrdersPublicIDClientZonePaymentCalendarItemsPath(publicID)}`, headers, {}) as Promise<GetOrdersPublicIDClientZonePaymentCalendarItemsFetchResponse>;
 }
 
-export type GetApiOrdersPublicIDOrderServiceOrderServiceIDEucsOrderInfoFetchResponse = 
+export type GetOrdersPublicIDOrderServiceOrderServiceIDEucsOrderInfoFetchResponse = 
 | FetchResponse<GetEucsOrderInfoQueryResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiOrdersPublicIDOrderServiceOrderServiceIDEucsOrderInfoPath = (publicID: string, orderServiceID: number) => `/api/v1/orders/${publicID}/order-service/${orderServiceID}/eucs-order/info`;
+export const getOrdersPublicIDOrderServiceOrderServiceIDEucsOrderInfoPath = (publicID: string, orderServiceID: number) => `/api/v1/orders/${publicID}/order-service/${orderServiceID}/eucs-order/info`;
 
-export const getApiOrdersPublicIDOrderServiceOrderServiceIDEucsOrderInfo = (publicID: string, orderServiceID: number, headers = new Headers()):
-  Promise<GetApiOrdersPublicIDOrderServiceOrderServiceIDEucsOrderInfoFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiOrdersPublicIDOrderServiceOrderServiceIDEucsOrderInfoPath(publicID, orderServiceID)}`, headers, {}) as Promise<GetApiOrdersPublicIDOrderServiceOrderServiceIDEucsOrderInfoFetchResponse>;
+export const getOrdersPublicIDOrderServiceOrderServiceIDEucsOrderInfo = (publicID: string, orderServiceID: number, headers = new Headers()):
+  Promise<GetOrdersPublicIDOrderServiceOrderServiceIDEucsOrderInfoFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getOrdersPublicIDOrderServiceOrderServiceIDEucsOrderInfoPath(publicID, orderServiceID)}`, headers, {}) as Promise<GetOrdersPublicIDOrderServiceOrderServiceIDEucsOrderInfoFetchResponse>;
 }
 
-export type PostApiOrdersPublicIDOrderServiceOrderServiceIDProductCancelFetchResponse = 
+export type PostOrdersPublicIDOrderServiceOrderServiceIDProductCancelFetchResponse = 
 | FetchResponse<CancelProductInInstitutionCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ApiProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersPublicIDOrderServiceOrderServiceIDProductCancelPath = (publicID: string, orderServiceID: number) => `/api/v1/orders/${publicID}/order-service/${orderServiceID}/product/cancel`;
+export const postOrdersPublicIDOrderServiceOrderServiceIDProductCancelPath = (publicID: string, orderServiceID: number) => `/api/v1/orders/${publicID}/order-service/${orderServiceID}/product/cancel`;
 
-export const postApiOrdersPublicIDOrderServiceOrderServiceIDProductCancel = (requestContract: CancelProductInInstitutionCommandRequest, publicID: string, orderServiceID: number, headers = new Headers()):
-  Promise<PostApiOrdersPublicIDOrderServiceOrderServiceIDProductCancelFetchResponse> => {
+export const postOrdersPublicIDOrderServiceOrderServiceIDProductCancel = (requestContract: CancelProductInInstitutionCommandRequest, publicID: string, orderServiceID: number, headers = new Headers()):
+  Promise<PostOrdersPublicIDOrderServiceOrderServiceIDProductCancelFetchResponse> => {
     const requestData = getApiRequestData<CancelProductInInstitutionCommandRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersPublicIDOrderServiceOrderServiceIDProductCancelPath(publicID, orderServiceID)}`, requestData, headers) as Promise<PostApiOrdersPublicIDOrderServiceOrderServiceIDProductCancelFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersPublicIDOrderServiceOrderServiceIDProductCancelPath(publicID, orderServiceID)}`, requestData, headers) as Promise<PostOrdersPublicIDOrderServiceOrderServiceIDProductCancelFetchResponse>;
 }
 
-export type PostApiOrdersPublicIDOrderServiceOrderServiceIDProductCreateFetchResponse = 
+export type PostOrdersPublicIDOrderServiceOrderServiceIDProductCreateFetchResponse = 
 | FetchResponse<CreateProductInInstitutionCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ApiProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersPublicIDOrderServiceOrderServiceIDProductCreatePath = (publicID: string, orderServiceID: number) => `/api/v1/orders/${publicID}/order-service/${orderServiceID}/product/create`;
+export const postOrdersPublicIDOrderServiceOrderServiceIDProductCreatePath = (publicID: string, orderServiceID: number) => `/api/v1/orders/${publicID}/order-service/${orderServiceID}/product/create`;
 
-export const postApiOrdersPublicIDOrderServiceOrderServiceIDProductCreate = (requestContract: CreateProductInInstitutionRequest, publicID: string, orderServiceID: number, headers = new Headers()):
-  Promise<PostApiOrdersPublicIDOrderServiceOrderServiceIDProductCreateFetchResponse> => {
+export const postOrdersPublicIDOrderServiceOrderServiceIDProductCreate = (requestContract: CreateProductInInstitutionRequest, publicID: string, orderServiceID: number, headers = new Headers()):
+  Promise<PostOrdersPublicIDOrderServiceOrderServiceIDProductCreateFetchResponse> => {
     const requestData = getApiRequestData<CreateProductInInstitutionRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersPublicIDOrderServiceOrderServiceIDProductCreatePath(publicID, orderServiceID)}`, requestData, headers) as Promise<PostApiOrdersPublicIDOrderServiceOrderServiceIDProductCreateFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersPublicIDOrderServiceOrderServiceIDProductCreatePath(publicID, orderServiceID)}`, requestData, headers) as Promise<PostOrdersPublicIDOrderServiceOrderServiceIDProductCreateFetchResponse>;
 }
 
-export type GetApiOrdersPublicIDWorkflowStepsFetchResponse = 
+export type GetOrdersPublicIDWorkflowStepsFetchResponse = 
 | FetchResponse<EntityListOfOrderWorkflowStepDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiOrdersPublicIDWorkflowStepsPath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/steps`;
+export const getOrdersPublicIDWorkflowStepsPath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/steps`;
 
-export const getApiOrdersPublicIDWorkflowSteps = (publicID: string, headers = new Headers()):
-  Promise<GetApiOrdersPublicIDWorkflowStepsFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiOrdersPublicIDWorkflowStepsPath(publicID)}`, headers, {}) as Promise<GetApiOrdersPublicIDWorkflowStepsFetchResponse>;
+export const getOrdersPublicIDWorkflowSteps = (publicID: string, headers = new Headers()):
+  Promise<GetOrdersPublicIDWorkflowStepsFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getOrdersPublicIDWorkflowStepsPath(publicID)}`, headers, {}) as Promise<GetOrdersPublicIDWorkflowStepsFetchResponse>;
 }
 
-export type PostApiOrdersWorkflowDraftFetchResponse = 
+export type PostOrdersWorkflowDraftFetchResponse = 
 | FetchResponse<SaveDraftCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersWorkflowDraftPath = () => `/api/v1/orders/workflow/draft`;
+export const postOrdersWorkflowDraftPath = () => `/api/v1/orders/workflow/draft`;
 
-export const postApiOrdersWorkflowDraft = (requestContract: SaveDraftRequest, headers = new Headers()):
-  Promise<PostApiOrdersWorkflowDraftFetchResponse> => {
+export const postOrdersWorkflowDraft = (requestContract: SaveDraftRequest, headers = new Headers()):
+  Promise<PostOrdersWorkflowDraftFetchResponse> => {
     const requestData = getApiRequestData<SaveDraftRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersWorkflowDraftPath()}`, requestData, headers) as Promise<PostApiOrdersWorkflowDraftFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersWorkflowDraftPath()}`, requestData, headers) as Promise<PostOrdersWorkflowDraftFetchResponse>;
 }
 
-export type PostApiOrdersPublicIDWorkflowDraftCompleteFetchResponse = 
+export type PostOrdersPublicIDWorkflowDraftCompleteFetchResponse = 
 | FetchResponse<DraftStepCompleteCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersPublicIDWorkflowDraftCompletePath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/draft/complete`;
+export const postOrdersPublicIDWorkflowDraftCompletePath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/draft/complete`;
 
-export const postApiOrdersPublicIDWorkflowDraftComplete = (publicID: string, headers = new Headers()):
-  Promise<PostApiOrdersPublicIDWorkflowDraftCompleteFetchResponse> => {
+export const postOrdersPublicIDWorkflowDraftComplete = (publicID: string, headers = new Headers()):
+  Promise<PostOrdersPublicIDWorkflowDraftCompleteFetchResponse> => {
     const requestData = getApiRequestData<object>(undefined, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersPublicIDWorkflowDraftCompletePath(publicID)}`, requestData, headers) as Promise<PostApiOrdersPublicIDWorkflowDraftCompleteFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersPublicIDWorkflowDraftCompletePath(publicID)}`, requestData, headers) as Promise<PostOrdersPublicIDWorkflowDraftCompleteFetchResponse>;
 }
 
-export type GetApiOrdersWorkflowClientReviewTokenSummaryFetchResponse = 
+export type GetOrdersWorkflowClientReviewTokenSummaryFetchResponse = 
 | FetchResponse<GetClientReviewSummaryQueryResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiOrdersWorkflowClientReviewTokenSummaryPath = (token: string) => `/api/v1/orders/workflow/client-review/${token}/summary`;
+export const getOrdersWorkflowClientReviewTokenSummaryPath = (token: string) => `/api/v1/orders/workflow/client-review/${token}/summary`;
 
-export const getApiOrdersWorkflowClientReviewTokenSummary = (token: string, headers = new Headers()):
-  Promise<GetApiOrdersWorkflowClientReviewTokenSummaryFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiOrdersWorkflowClientReviewTokenSummaryPath(token)}`, headers, {}) as Promise<GetApiOrdersWorkflowClientReviewTokenSummaryFetchResponse>;
+export const getOrdersWorkflowClientReviewTokenSummary = (token: string, headers = new Headers()):
+  Promise<GetOrdersWorkflowClientReviewTokenSummaryFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getOrdersWorkflowClientReviewTokenSummaryPath(token)}`, headers, {}) as Promise<GetOrdersWorkflowClientReviewTokenSummaryFetchResponse>;
 }
 
-export type PostApiOrdersPublicIDWorkflowClientReviewReminderFetchResponse = 
+export type PostOrdersPublicIDWorkflowClientReviewReminderFetchResponse = 
 | FetchResponse<SendReminderCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersPublicIDWorkflowClientReviewReminderPath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/client-review/reminder`;
+export const postOrdersPublicIDWorkflowClientReviewReminderPath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/client-review/reminder`;
 
-export const postApiOrdersPublicIDWorkflowClientReviewReminder = (publicID: string, headers = new Headers()):
-  Promise<PostApiOrdersPublicIDWorkflowClientReviewReminderFetchResponse> => {
+export const postOrdersPublicIDWorkflowClientReviewReminder = (publicID: string, headers = new Headers()):
+  Promise<PostOrdersPublicIDWorkflowClientReviewReminderFetchResponse> => {
     const requestData = getApiRequestData<object>(undefined, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersPublicIDWorkflowClientReviewReminderPath(publicID)}`, requestData, headers) as Promise<PostApiOrdersPublicIDWorkflowClientReviewReminderFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersPublicIDWorkflowClientReviewReminderPath(publicID)}`, requestData, headers) as Promise<PostOrdersPublicIDWorkflowClientReviewReminderFetchResponse>;
 }
 
-export type PostApiOrdersWorkflowClientApprovalTokenRejectFetchResponse = 
+export type PostOrdersWorkflowClientApprovalTokenRejectFetchResponse = 
 | FetchResponse<ClientApprovalStepRejectCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersWorkflowClientApprovalTokenRejectPath = (token: string) => `/api/v1/orders/workflow/client-approval/${token}/reject`;
+export const postOrdersWorkflowClientApprovalTokenRejectPath = (token: string) => `/api/v1/orders/workflow/client-approval/${token}/reject`;
 
-export const postApiOrdersWorkflowClientApprovalTokenReject = (requestContract: ClientApprovalRejectRequest, token: string, headers = new Headers()):
-  Promise<PostApiOrdersWorkflowClientApprovalTokenRejectFetchResponse> => {
+export const postOrdersWorkflowClientApprovalTokenReject = (requestContract: ClientApprovalRejectRequest, token: string, headers = new Headers()):
+  Promise<PostOrdersWorkflowClientApprovalTokenRejectFetchResponse> => {
     const requestData = getApiRequestData<ClientApprovalRejectRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersWorkflowClientApprovalTokenRejectPath(token)}`, requestData, headers) as Promise<PostApiOrdersWorkflowClientApprovalTokenRejectFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersWorkflowClientApprovalTokenRejectPath(token)}`, requestData, headers) as Promise<PostOrdersWorkflowClientApprovalTokenRejectFetchResponse>;
 }
 
-export type PutApiOrdersWorkflowClientApprovalTokenInProgressFetchResponse = 
+export type PutOrdersWorkflowClientApprovalTokenInProgressFetchResponse = 
 | FetchResponse<ClientApprovalStepInitCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const putApiOrdersWorkflowClientApprovalTokenInProgressPath = (token: string) => `/api/v1/orders/workflow/client-approval/${token}/in-progress`;
+export const putOrdersWorkflowClientApprovalTokenInProgressPath = (token: string) => `/api/v1/orders/workflow/client-approval/${token}/in-progress`;
 
-export const putApiOrdersWorkflowClientApprovalTokenInProgress = (token: string, headers = new Headers()):
-  Promise<PutApiOrdersWorkflowClientApprovalTokenInProgressFetchResponse> => {
+export const putOrdersWorkflowClientApprovalTokenInProgress = (token: string, headers = new Headers()):
+  Promise<PutOrdersWorkflowClientApprovalTokenInProgressFetchResponse> => {
     const requestData = getApiRequestData<object>(undefined, false);
 
-    return apiPut(`${getApiUrl()}${putApiOrdersWorkflowClientApprovalTokenInProgressPath(token)}`, requestData, headers) as Promise<PutApiOrdersWorkflowClientApprovalTokenInProgressFetchResponse>;
+    return apiPut(`${getApiUrl()}${putOrdersWorkflowClientApprovalTokenInProgressPath(token)}`, requestData, headers) as Promise<PutOrdersWorkflowClientApprovalTokenInProgressFetchResponse>;
 }
 
-export type PostApiOrdersWorkflowClientApprovalTokenCompleteFetchResponse = 
+export type PostOrdersWorkflowClientApprovalTokenCompleteFetchResponse = 
 | FetchResponse<CompleteClientApprovalStepCommandResult, 200> 
 | FetchResponse<ApiProblemDetailsOfCompleteClientApprovalStepError, 400> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersWorkflowClientApprovalTokenCompletePath = (token: string) => `/api/v1/orders/workflow/client-approval/${token}/complete`;
+export const postOrdersWorkflowClientApprovalTokenCompletePath = (token: string) => `/api/v1/orders/workflow/client-approval/${token}/complete`;
 
-export const postApiOrdersWorkflowClientApprovalTokenComplete = (requestContract: ClientApprovalCompleteRequest, token: string, headers = new Headers()):
-  Promise<PostApiOrdersWorkflowClientApprovalTokenCompleteFetchResponse> => {
+export const postOrdersWorkflowClientApprovalTokenComplete = (requestContract: ClientApprovalCompleteRequest, token: string, headers = new Headers()):
+  Promise<PostOrdersWorkflowClientApprovalTokenCompleteFetchResponse> => {
     const requestData = getApiRequestData<ClientApprovalCompleteRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersWorkflowClientApprovalTokenCompletePath(token)}`, requestData, headers) as Promise<PostApiOrdersWorkflowClientApprovalTokenCompleteFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersWorkflowClientApprovalTokenCompletePath(token)}`, requestData, headers) as Promise<PostOrdersWorkflowClientApprovalTokenCompleteFetchResponse>;
 }
 
-export type PostApiOrdersPublicIDWorkflowProcessingServicesOrderServiceIDCompleteFetchResponse = 
+export type PostOrdersPublicIDWorkflowProcessingServicesOrderServiceIDCompleteFetchResponse = 
 | FetchResponse<OrderServiceCompleteCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersPublicIDWorkflowProcessingServicesOrderServiceIDCompletePath = (publicID: string, orderServiceID: number) => `/api/v1/orders/${publicID}/workflow/processing-services/${orderServiceID}/complete`;
+export const postOrdersPublicIDWorkflowProcessingServicesOrderServiceIDCompletePath = (publicID: string, orderServiceID: number) => `/api/v1/orders/${publicID}/workflow/processing-services/${orderServiceID}/complete`;
 
-export const postApiOrdersPublicIDWorkflowProcessingServicesOrderServiceIDComplete = (publicID: string, orderServiceID: number, headers = new Headers()):
-  Promise<PostApiOrdersPublicIDWorkflowProcessingServicesOrderServiceIDCompleteFetchResponse> => {
+export const postOrdersPublicIDWorkflowProcessingServicesOrderServiceIDComplete = (publicID: string, orderServiceID: number, headers = new Headers()):
+  Promise<PostOrdersPublicIDWorkflowProcessingServicesOrderServiceIDCompleteFetchResponse> => {
     const requestData = getApiRequestData<object>(undefined, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersPublicIDWorkflowProcessingServicesOrderServiceIDCompletePath(publicID, orderServiceID)}`, requestData, headers) as Promise<PostApiOrdersPublicIDWorkflowProcessingServicesOrderServiceIDCompleteFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersPublicIDWorkflowProcessingServicesOrderServiceIDCompletePath(publicID, orderServiceID)}`, requestData, headers) as Promise<PostOrdersPublicIDWorkflowProcessingServicesOrderServiceIDCompleteFetchResponse>;
 }
 
-export type PostApiOrdersPublicIDWorkflowInvoiceIssuanceCompleteFetchResponse = 
+export type PostOrdersPublicIDWorkflowInvoiceIssuanceCompleteFetchResponse = 
 | FetchResponse<InvoiceIssuanceStepCompleteCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersPublicIDWorkflowInvoiceIssuanceCompletePath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/invoice-issuance/complete`;
+export const postOrdersPublicIDWorkflowInvoiceIssuanceCompletePath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/invoice-issuance/complete`;
 
-export const postApiOrdersPublicIDWorkflowInvoiceIssuanceComplete = (publicID: string, headers = new Headers()):
-  Promise<PostApiOrdersPublicIDWorkflowInvoiceIssuanceCompleteFetchResponse> => {
+export const postOrdersPublicIDWorkflowInvoiceIssuanceComplete = (publicID: string, headers = new Headers()):
+  Promise<PostOrdersPublicIDWorkflowInvoiceIssuanceCompleteFetchResponse> => {
     const requestData = getApiRequestData<object>(undefined, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersPublicIDWorkflowInvoiceIssuanceCompletePath(publicID)}`, requestData, headers) as Promise<PostApiOrdersPublicIDWorkflowInvoiceIssuanceCompleteFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersPublicIDWorkflowInvoiceIssuanceCompletePath(publicID)}`, requestData, headers) as Promise<PostOrdersPublicIDWorkflowInvoiceIssuanceCompleteFetchResponse>;
 }
 
-export type PostApiOrdersPublicIDWorkflowInvoicePaymentCompleteFetchResponse = 
+export type PostOrdersPublicIDWorkflowInvoicePaymentCompleteFetchResponse = 
 | FetchResponse<InvoicePaymentStepCompleteCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersPublicIDWorkflowInvoicePaymentCompletePath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/invoice-payment/complete`;
+export const postOrdersPublicIDWorkflowInvoicePaymentCompletePath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/invoice-payment/complete`;
 
-export const postApiOrdersPublicIDWorkflowInvoicePaymentComplete = (publicID: string, headers = new Headers()):
-  Promise<PostApiOrdersPublicIDWorkflowInvoicePaymentCompleteFetchResponse> => {
+export const postOrdersPublicIDWorkflowInvoicePaymentComplete = (publicID: string, headers = new Headers()):
+  Promise<PostOrdersPublicIDWorkflowInvoicePaymentCompleteFetchResponse> => {
     const requestData = getApiRequestData<object>(undefined, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersPublicIDWorkflowInvoicePaymentCompletePath(publicID)}`, requestData, headers) as Promise<PostApiOrdersPublicIDWorkflowInvoicePaymentCompleteFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersPublicIDWorkflowInvoicePaymentCompletePath(publicID)}`, requestData, headers) as Promise<PostOrdersPublicIDWorkflowInvoicePaymentCompleteFetchResponse>;
 }
 
-export type PostApiOrdersPublicIDWorkflowInvoicePaymentReminderFetchResponse = 
+export type PostOrdersPublicIDWorkflowInvoicePaymentReminderFetchResponse = 
 | FetchResponse<InvoicePaymentStepReminderCommand, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersPublicIDWorkflowInvoicePaymentReminderPath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/invoice-payment/reminder`;
+export const postOrdersPublicIDWorkflowInvoicePaymentReminderPath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/invoice-payment/reminder`;
 
-export const postApiOrdersPublicIDWorkflowInvoicePaymentReminder = (publicID: string, headers = new Headers()):
-  Promise<PostApiOrdersPublicIDWorkflowInvoicePaymentReminderFetchResponse> => {
+export const postOrdersPublicIDWorkflowInvoicePaymentReminder = (publicID: string, headers = new Headers()):
+  Promise<PostOrdersPublicIDWorkflowInvoicePaymentReminderFetchResponse> => {
     const requestData = getApiRequestData<object>(undefined, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersPublicIDWorkflowInvoicePaymentReminderPath(publicID)}`, requestData, headers) as Promise<PostApiOrdersPublicIDWorkflowInvoicePaymentReminderFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersPublicIDWorkflowInvoicePaymentReminderPath(publicID)}`, requestData, headers) as Promise<PostOrdersPublicIDWorkflowInvoicePaymentReminderFetchResponse>;
 }
 
-export type GetApiOrdersPublicIDWorkflowEnterpriseInvoiceIssuanceAndPaymentFetchResponse = 
+export type GetOrdersPublicIDWorkflowEnterpriseInvoiceIssuanceAndPaymentFetchResponse = 
 | FetchResponse<EnterpriseInvoiceIssuanceAndPaymentStepQueryResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiOrdersPublicIDWorkflowEnterpriseInvoiceIssuanceAndPaymentPath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/enterprise-invoice-issuance-and-payment`;
+export const getOrdersPublicIDWorkflowEnterpriseInvoiceIssuanceAndPaymentPath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/enterprise-invoice-issuance-and-payment`;
 
-export const getApiOrdersPublicIDWorkflowEnterpriseInvoiceIssuanceAndPayment = (publicID: string, headers = new Headers()):
-  Promise<GetApiOrdersPublicIDWorkflowEnterpriseInvoiceIssuanceAndPaymentFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiOrdersPublicIDWorkflowEnterpriseInvoiceIssuanceAndPaymentPath(publicID)}`, headers, {}) as Promise<GetApiOrdersPublicIDWorkflowEnterpriseInvoiceIssuanceAndPaymentFetchResponse>;
+export const getOrdersPublicIDWorkflowEnterpriseInvoiceIssuanceAndPayment = (publicID: string, headers = new Headers()):
+  Promise<GetOrdersPublicIDWorkflowEnterpriseInvoiceIssuanceAndPaymentFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getOrdersPublicIDWorkflowEnterpriseInvoiceIssuanceAndPaymentPath(publicID)}`, headers, {}) as Promise<GetOrdersPublicIDWorkflowEnterpriseInvoiceIssuanceAndPaymentFetchResponse>;
 }
 
-export type PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDCancelFetchResponse = 
+export type PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDCancelFetchResponse = 
 | FetchResponse<ClientInvoiceRecurringPaymentCancelCommandResult, 200> 
 | FetchResponse<ApiProblemDetailsOfClientInvoiceRecurringPaymentCancelErrorStatus, 400> 
 | FetchResponse<ApiProblemDetails, 401> 
@@ -2651,16 +2651,16 @@ export type PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCal
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDCancelPath = (publicID: string, paymentCalendarItemID: number) => `/api/v1/orders/${publicID}/workflow/client-invoice-recurring-payment/${paymentCalendarItemID}/cancel`;
+export const postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDCancelPath = (publicID: string, paymentCalendarItemID: number) => `/api/v1/orders/${publicID}/workflow/client-invoice-recurring-payment/${paymentCalendarItemID}/cancel`;
 
-export const postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDCancel = (publicID: string, paymentCalendarItemID: number, headers = new Headers()):
-  Promise<PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDCancelFetchResponse> => {
+export const postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDCancel = (publicID: string, paymentCalendarItemID: number, headers = new Headers()):
+  Promise<PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDCancelFetchResponse> => {
     const requestData = getApiRequestData<object>(undefined, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDCancelPath(publicID, paymentCalendarItemID)}`, requestData, headers) as Promise<PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDCancelFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDCancelPath(publicID, paymentCalendarItemID)}`, requestData, headers) as Promise<PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDCancelFetchResponse>;
 }
 
-export type PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDReminderFetchResponse = 
+export type PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDReminderFetchResponse = 
 | FetchResponse<ClientInvoiceRecurringPaymentReminderCommandResult, 200> 
 | FetchResponse<ApiProblemDetailsOfClientInvoiceRecurringPaymentReminderErrorStatus, 400> 
 | FetchResponse<ApiProblemDetails, 401> 
@@ -2668,16 +2668,16 @@ export type PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCal
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDReminderPath = (publicID: string, paymentCalendarItemID: number) => `/api/v1/orders/${publicID}/workflow/client-invoice-recurring-payment/${paymentCalendarItemID}/reminder`;
+export const postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDReminderPath = (publicID: string, paymentCalendarItemID: number) => `/api/v1/orders/${publicID}/workflow/client-invoice-recurring-payment/${paymentCalendarItemID}/reminder`;
 
-export const postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDReminder = (publicID: string, paymentCalendarItemID: number, headers = new Headers()):
-  Promise<PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDReminderFetchResponse> => {
+export const postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDReminder = (publicID: string, paymentCalendarItemID: number, headers = new Headers()):
+  Promise<PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDReminderFetchResponse> => {
     const requestData = getApiRequestData<object>(undefined, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDReminderPath(publicID, paymentCalendarItemID)}`, requestData, headers) as Promise<PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDReminderFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDReminderPath(publicID, paymentCalendarItemID)}`, requestData, headers) as Promise<PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDReminderFetchResponse>;
 }
 
-export type PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidReminderFetchResponse = 
+export type PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidReminderFetchResponse = 
 | FetchResponse<ClientPrepaidInvoiceRecurringPaymentReminderCommandResult, 200> 
 | FetchResponse<ApiProblemDetailsOfClientPrepaidInvoiceRecurringPaymentReminderErrorStatus, 400> 
 | FetchResponse<ApiProblemDetails, 401> 
@@ -2685,16 +2685,16 @@ export type PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCal
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidReminderPath = (publicID: string, paymentCalendarItemID: number) => `/api/v1/orders/${publicID}/workflow/client-invoice-recurring-payment/${paymentCalendarItemID}/prepaid/reminder`;
+export const postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidReminderPath = (publicID: string, paymentCalendarItemID: number) => `/api/v1/orders/${publicID}/workflow/client-invoice-recurring-payment/${paymentCalendarItemID}/prepaid/reminder`;
 
-export const postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidReminder = (publicID: string, paymentCalendarItemID: number, headers = new Headers()):
-  Promise<PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidReminderFetchResponse> => {
+export const postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidReminder = (publicID: string, paymentCalendarItemID: number, headers = new Headers()):
+  Promise<PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidReminderFetchResponse> => {
     const requestData = getApiRequestData<object>(undefined, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidReminderPath(publicID, paymentCalendarItemID)}`, requestData, headers) as Promise<PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidReminderFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidReminderPath(publicID, paymentCalendarItemID)}`, requestData, headers) as Promise<PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidReminderFetchResponse>;
 }
 
-export type PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDSendInvoiceFetchResponse = 
+export type PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDSendInvoiceFetchResponse = 
 | FetchResponse<ClientInvoiceRecurringPaymentCreateInvoiceCommandResult, 200> 
 | FetchResponse<ApiProblemDetailsOfClientInvoiceRecurringPaymentCreateAndSendInvoiceToClientErrorStatus, 400> 
 | FetchResponse<ApiProblemDetails, 401> 
@@ -2702,16 +2702,16 @@ export type PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCal
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDSendInvoicePath = (publicID: string, paymentCalendarItemID: number) => `/api/v1/orders/${publicID}/workflow/client-invoice-recurring-payment/${paymentCalendarItemID}/send-invoice`;
+export const postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDSendInvoicePath = (publicID: string, paymentCalendarItemID: number) => `/api/v1/orders/${publicID}/workflow/client-invoice-recurring-payment/${paymentCalendarItemID}/send-invoice`;
 
-export const postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDSendInvoice = (publicID: string, paymentCalendarItemID: number, headers = new Headers()):
-  Promise<PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDSendInvoiceFetchResponse> => {
+export const postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDSendInvoice = (publicID: string, paymentCalendarItemID: number, headers = new Headers()):
+  Promise<PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDSendInvoiceFetchResponse> => {
     const requestData = getApiRequestData<object>(undefined, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDSendInvoicePath(publicID, paymentCalendarItemID)}`, requestData, headers) as Promise<PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDSendInvoiceFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDSendInvoicePath(publicID, paymentCalendarItemID)}`, requestData, headers) as Promise<PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDSendInvoiceFetchResponse>;
 }
 
-export type PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPayFetchResponse = 
+export type PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPayFetchResponse = 
 | FetchResponse<ClientInvoiceRecurringPaymentClientPaidCommandResult, 200> 
 | FetchResponse<ApiProblemDetailsOfClientInvoiceRecurringPaymentClientPaidErrorStatus, 400> 
 | FetchResponse<ApiProblemDetails, 401> 
@@ -2719,16 +2719,16 @@ export type PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCal
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPayPath = (publicID: string, paymentCalendarItemID: number) => `/api/v1/orders/${publicID}/workflow/client-invoice-recurring-payment/${paymentCalendarItemID}/pay`;
+export const postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPayPath = (publicID: string, paymentCalendarItemID: number) => `/api/v1/orders/${publicID}/workflow/client-invoice-recurring-payment/${paymentCalendarItemID}/pay`;
 
-export const postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPay = (requestContract: ClientInvoiceRecurringPaymentClientPaidRequest, publicID: string, paymentCalendarItemID: number, headers = new Headers()):
-  Promise<PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPayFetchResponse> => {
+export const postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPay = (requestContract: ClientInvoiceRecurringPaymentClientPaidRequest, publicID: string, paymentCalendarItemID: number, headers = new Headers()):
+  Promise<PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPayFetchResponse> => {
     const requestData = getApiRequestData<ClientInvoiceRecurringPaymentClientPaidRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPayPath(publicID, paymentCalendarItemID)}`, requestData, headers) as Promise<PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPayFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPayPath(publicID, paymentCalendarItemID)}`, requestData, headers) as Promise<PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPayFetchResponse>;
 }
 
-export type PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidSendInvoiceAndPayFetchResponse = 
+export type PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidSendInvoiceAndPayFetchResponse = 
 | FetchResponse<ClientPrepaidInvoiceRecurringPaymentSendInvoiceAndSetPaidCommandResult, 200> 
 | FetchResponse<ApiProblemDetailsOfClientPrepaidInvoiceRecurringPaymentSendInvoiceAndSetPaidErrorStatus, 400> 
 | FetchResponse<ApiProblemDetails, 401> 
@@ -2736,48 +2736,48 @@ export type PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCal
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidSendInvoiceAndPayPath = (publicID: string, paymentCalendarItemID: number) => `/api/v1/orders/${publicID}/workflow/client-invoice-recurring-payment/${paymentCalendarItemID}/prepaid/send-invoice-and-pay`;
+export const postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidSendInvoiceAndPayPath = (publicID: string, paymentCalendarItemID: number) => `/api/v1/orders/${publicID}/workflow/client-invoice-recurring-payment/${paymentCalendarItemID}/prepaid/send-invoice-and-pay`;
 
-export const postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidSendInvoiceAndPay = (requestContract: ClientPrepaidInvoiceRecurringPaymentSendInvoiceAndSetPaidRequest, publicID: string, paymentCalendarItemID: number, headers = new Headers()):
-  Promise<PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidSendInvoiceAndPayFetchResponse> => {
+export const postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidSendInvoiceAndPay = (requestContract: ClientPrepaidInvoiceRecurringPaymentSendInvoiceAndSetPaidRequest, publicID: string, paymentCalendarItemID: number, headers = new Headers()):
+  Promise<PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidSendInvoiceAndPayFetchResponse> => {
     const requestData = getApiRequestData<ClientPrepaidInvoiceRecurringPaymentSendInvoiceAndSetPaidRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidSendInvoiceAndPayPath(publicID, paymentCalendarItemID)}`, requestData, headers) as Promise<PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidSendInvoiceAndPayFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidSendInvoiceAndPayPath(publicID, paymentCalendarItemID)}`, requestData, headers) as Promise<PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidSendInvoiceAndPayFetchResponse>;
 }
 
-export type PostApiOrdersPublicIDWorkflowClientAssignmentSendAssignmentEmailFetchResponse = 
+export type PostOrdersPublicIDWorkflowClientAssignmentSendAssignmentEmailFetchResponse = 
 | FetchResponse<SendClientAssignmentEmailCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersPublicIDWorkflowClientAssignmentSendAssignmentEmailPath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/client-assignment/send-assignment-email`;
+export const postOrdersPublicIDWorkflowClientAssignmentSendAssignmentEmailPath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/client-assignment/send-assignment-email`;
 
-export const postApiOrdersPublicIDWorkflowClientAssignmentSendAssignmentEmail = (publicID: string, headers = new Headers()):
-  Promise<PostApiOrdersPublicIDWorkflowClientAssignmentSendAssignmentEmailFetchResponse> => {
+export const postOrdersPublicIDWorkflowClientAssignmentSendAssignmentEmail = (publicID: string, headers = new Headers()):
+  Promise<PostOrdersPublicIDWorkflowClientAssignmentSendAssignmentEmailFetchResponse> => {
     const requestData = getApiRequestData<object>(undefined, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersPublicIDWorkflowClientAssignmentSendAssignmentEmailPath(publicID)}`, requestData, headers) as Promise<PostApiOrdersPublicIDWorkflowClientAssignmentSendAssignmentEmailFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersPublicIDWorkflowClientAssignmentSendAssignmentEmailPath(publicID)}`, requestData, headers) as Promise<PostOrdersPublicIDWorkflowClientAssignmentSendAssignmentEmailFetchResponse>;
 }
 
-export type PostApiOrdersPublicIDWorkflowClientPrepaidPaymentApprovalCompleteFetchResponse = 
+export type PostOrdersPublicIDWorkflowClientPrepaidPaymentApprovalCompleteFetchResponse = 
 | FetchResponse<ClientPrepaidPaymentApprovalStepCompleteCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersPublicIDWorkflowClientPrepaidPaymentApprovalCompletePath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/client-prepaid-payment-approval/complete`;
+export const postOrdersPublicIDWorkflowClientPrepaidPaymentApprovalCompletePath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/client-prepaid-payment-approval/complete`;
 
-export const postApiOrdersPublicIDWorkflowClientPrepaidPaymentApprovalComplete = (requestContract: ClientPrepaidPaymentApprovalStepCompleteCommandRequest, publicID: string, headers = new Headers()):
-  Promise<PostApiOrdersPublicIDWorkflowClientPrepaidPaymentApprovalCompleteFetchResponse> => {
+export const postOrdersPublicIDWorkflowClientPrepaidPaymentApprovalComplete = (requestContract: ClientPrepaidPaymentApprovalStepCompleteCommandRequest, publicID: string, headers = new Headers()):
+  Promise<PostOrdersPublicIDWorkflowClientPrepaidPaymentApprovalCompleteFetchResponse> => {
     const requestData = getApiRequestData<ClientPrepaidPaymentApprovalStepCompleteCommandRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersPublicIDWorkflowClientPrepaidPaymentApprovalCompletePath(publicID)}`, requestData, headers) as Promise<PostApiOrdersPublicIDWorkflowClientPrepaidPaymentApprovalCompleteFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersPublicIDWorkflowClientPrepaidPaymentApprovalCompletePath(publicID)}`, requestData, headers) as Promise<PostOrdersPublicIDWorkflowClientPrepaidPaymentApprovalCompleteFetchResponse>;
 }
 
-export type PostApiOrdersWorkflowClientPrepaidPaymentApprovalTokenInProgressFetchResponse = 
+export type PostOrdersWorkflowClientPrepaidPaymentApprovalTokenInProgressFetchResponse = 
 | FetchResponse<ClientPrepaidPaymentApprovalStepInProgressCommandResult, 200> 
 | FetchResponse<ApiProblemDetailsOfInProgressClientApprovalStepError, 400> 
 | FetchResponse<ApiProblemDetails, 401> 
@@ -2785,246 +2785,246 @@ export type PostApiOrdersWorkflowClientPrepaidPaymentApprovalTokenInProgressFetc
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersWorkflowClientPrepaidPaymentApprovalTokenInProgressPath = (token: string) => `/api/v1/orders/workflow/client-prepaid-payment-approval/${token}/in-progress`;
+export const postOrdersWorkflowClientPrepaidPaymentApprovalTokenInProgressPath = (token: string) => `/api/v1/orders/workflow/client-prepaid-payment-approval/${token}/in-progress`;
 
-export const postApiOrdersWorkflowClientPrepaidPaymentApprovalTokenInProgress = (requestContract: ClientPrepaidPaymentApprovalStepInProgressRequest, token: string, headers = new Headers()):
-  Promise<PostApiOrdersWorkflowClientPrepaidPaymentApprovalTokenInProgressFetchResponse> => {
+export const postOrdersWorkflowClientPrepaidPaymentApprovalTokenInProgress = (requestContract: ClientPrepaidPaymentApprovalStepInProgressRequest, token: string, headers = new Headers()):
+  Promise<PostOrdersWorkflowClientPrepaidPaymentApprovalTokenInProgressFetchResponse> => {
     const requestData = getApiRequestData<ClientPrepaidPaymentApprovalStepInProgressRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersWorkflowClientPrepaidPaymentApprovalTokenInProgressPath(token)}`, requestData, headers) as Promise<PostApiOrdersWorkflowClientPrepaidPaymentApprovalTokenInProgressFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersWorkflowClientPrepaidPaymentApprovalTokenInProgressPath(token)}`, requestData, headers) as Promise<PostOrdersWorkflowClientPrepaidPaymentApprovalTokenInProgressFetchResponse>;
 }
 
-export type PostApiOrdersWorkflowClientPrepaidPaymentApprovalTokenRejectFetchResponse = 
+export type PostOrdersWorkflowClientPrepaidPaymentApprovalTokenRejectFetchResponse = 
 | FetchResponse<ClientPrepaidPaymentApprovalStepRejectCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersWorkflowClientPrepaidPaymentApprovalTokenRejectPath = (token: string) => `/api/v1/orders/workflow/client-prepaid-payment-approval/${token}/reject`;
+export const postOrdersWorkflowClientPrepaidPaymentApprovalTokenRejectPath = (token: string) => `/api/v1/orders/workflow/client-prepaid-payment-approval/${token}/reject`;
 
-export const postApiOrdersWorkflowClientPrepaidPaymentApprovalTokenReject = (requestContract: ClientPrepaidPaymentApprovalStepRejectRequest, token: string, headers = new Headers()):
-  Promise<PostApiOrdersWorkflowClientPrepaidPaymentApprovalTokenRejectFetchResponse> => {
+export const postOrdersWorkflowClientPrepaidPaymentApprovalTokenReject = (requestContract: ClientPrepaidPaymentApprovalStepRejectRequest, token: string, headers = new Headers()):
+  Promise<PostOrdersWorkflowClientPrepaidPaymentApprovalTokenRejectFetchResponse> => {
     const requestData = getApiRequestData<ClientPrepaidPaymentApprovalStepRejectRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersWorkflowClientPrepaidPaymentApprovalTokenRejectPath(token)}`, requestData, headers) as Promise<PostApiOrdersWorkflowClientPrepaidPaymentApprovalTokenRejectFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersWorkflowClientPrepaidPaymentApprovalTokenRejectPath(token)}`, requestData, headers) as Promise<PostOrdersWorkflowClientPrepaidPaymentApprovalTokenRejectFetchResponse>;
 }
 
-export type PutApiNotificationsUserSettingsFetchResponse = 
+export type PutNotificationsUserSettingsFetchResponse = 
 | FetchResponse<SaveUserNotificationSettingsCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const putApiNotificationsUserSettingsPath = () => `/api/v1/notifications/user-settings`;
+export const putNotificationsUserSettingsPath = () => `/api/v1/notifications/user-settings`;
 
-export const putApiNotificationsUserSettings = (requestContract: UserNotificationUpdateRequest, headers = new Headers()):
-  Promise<PutApiNotificationsUserSettingsFetchResponse> => {
+export const putNotificationsUserSettings = (requestContract: UserNotificationUpdateRequest, headers = new Headers()):
+  Promise<PutNotificationsUserSettingsFetchResponse> => {
     const requestData = getApiRequestData<UserNotificationUpdateRequest>(requestContract, false);
 
-    return apiPut(`${getApiUrl()}${putApiNotificationsUserSettingsPath()}`, requestData, headers) as Promise<PutApiNotificationsUserSettingsFetchResponse>;
+    return apiPut(`${getApiUrl()}${putNotificationsUserSettingsPath()}`, requestData, headers) as Promise<PutNotificationsUserSettingsFetchResponse>;
 }
 
-export type GetApiInvoicesUserInvoicesFetchResponse = 
+export type GetInvoicesUserInvoicesFetchResponse = 
 | FetchResponse<EntityListOfInvoiceForSupplierCompanyByUserListItemDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiInvoicesUserInvoicesPath = () => `/api/v1/invoices/user-invoices`;
+export const getInvoicesUserInvoicesPath = () => `/api/v1/invoices/user-invoices`;
 
-export const getApiInvoicesUserInvoices = (offset?: number, limit?: number, headers = new Headers()):
-  Promise<GetApiInvoicesUserInvoicesFetchResponse> => {
+export const getInvoicesUserInvoices = (offset?: number, limit?: number, headers = new Headers()):
+  Promise<GetInvoicesUserInvoicesFetchResponse> => {
     const queryParams = {
       "offset": offset,
       "limit": limit
     }
-    return apiGet(`${getApiUrl()}${getApiInvoicesUserInvoicesPath()}`, headers, queryParams) as Promise<GetApiInvoicesUserInvoicesFetchResponse>;
+    return apiGet(`${getApiUrl()}${getInvoicesUserInvoicesPath()}`, headers, queryParams) as Promise<GetInvoicesUserInvoicesFetchResponse>;
 }
 
-export type GetApiInvoicesPublicIDFetchResponse = 
+export type GetInvoicesPublicIDFetchResponse = 
 | FetchResponse<InvoiceDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiInvoicesPublicIDPath = (publicID: string) => `/api/v1/invoices/${publicID}`;
+export const getInvoicesPublicIDPath = (publicID: string) => `/api/v1/invoices/${publicID}`;
 
-export const getApiInvoicesPublicID = (publicID: string, headers = new Headers()):
-  Promise<GetApiInvoicesPublicIDFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiInvoicesPublicIDPath(publicID)}`, headers, {}) as Promise<GetApiInvoicesPublicIDFetchResponse>;
+export const getInvoicesPublicID = (publicID: string, headers = new Headers()):
+  Promise<GetInvoicesPublicIDFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getInvoicesPublicIDPath(publicID)}`, headers, {}) as Promise<GetInvoicesPublicIDFetchResponse>;
 }
 
-export type GetApiInvoicesPublicIDISDOCFetchResponse = 
+export type GetInvoicesPublicIDISDOCFetchResponse = 
 | FetchResponse<InvoiceISDOCDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiInvoicesPublicIDISDOCPath = (publicID: string) => `/api/v1/invoices/${publicID}/ISDOC`;
+export const getInvoicesPublicIDISDOCPath = (publicID: string) => `/api/v1/invoices/${publicID}/ISDOC`;
 
-export const getApiInvoicesPublicIDISDOC = (publicID: string, headers = new Headers()):
-  Promise<GetApiInvoicesPublicIDISDOCFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiInvoicesPublicIDISDOCPath(publicID)}`, headers, {}) as Promise<GetApiInvoicesPublicIDISDOCFetchResponse>;
+export const getInvoicesPublicIDISDOC = (publicID: string, headers = new Headers()):
+  Promise<GetInvoicesPublicIDISDOCFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getInvoicesPublicIDISDOCPath(publicID)}`, headers, {}) as Promise<GetInvoicesPublicIDISDOCFetchResponse>;
 }
 
-export type GetApiInvoicesPublicIDISDOCPdfFetchResponse = 
+export type GetInvoicesPublicIDISDOCPdfFetchResponse = 
 | FetchResponse<InvoiceISDOCPdfBase64Dto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiInvoicesPublicIDISDOCPdfPath = (publicID: string) => `/api/v1/invoices/${publicID}/ISDOCPdf`;
+export const getInvoicesPublicIDISDOCPdfPath = (publicID: string) => `/api/v1/invoices/${publicID}/ISDOCPdf`;
 
-export const getApiInvoicesPublicIDISDOCPdf = (publicID: string, headers = new Headers()):
-  Promise<GetApiInvoicesPublicIDISDOCPdfFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiInvoicesPublicIDISDOCPdfPath(publicID)}`, headers, {}) as Promise<GetApiInvoicesPublicIDISDOCPdfFetchResponse>;
+export const getInvoicesPublicIDISDOCPdf = (publicID: string, headers = new Headers()):
+  Promise<GetInvoicesPublicIDISDOCPdfFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getInvoicesPublicIDISDOCPdfPath(publicID)}`, headers, {}) as Promise<GetInvoicesPublicIDISDOCPdfFetchResponse>;
 }
 
-export type GetApiInvoicesInvoiceForSupplierCompanyByUserISDOCPdfFetchResponse = 
+export type GetInvoicesInvoiceForSupplierCompanyByUserISDOCPdfFetchResponse = 
 | FetchResponse<InvoiceForSupplierCompanyByUserISDOCPdfBase64ListDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiInvoicesInvoiceForSupplierCompanyByUserISDOCPdfPath = () => `/api/v1/invoices/invoice-for-supplier-company-by-user/ISDOCPdf`;
+export const getInvoicesInvoiceForSupplierCompanyByUserISDOCPdfPath = () => `/api/v1/invoices/invoice-for-supplier-company-by-user/ISDOCPdf`;
 
-export const getApiInvoicesInvoiceForSupplierCompanyByUserISDOCPdf = (InvoicePublicIDs?: string[], headers = new Headers()):
-  Promise<GetApiInvoicesInvoiceForSupplierCompanyByUserISDOCPdfFetchResponse> => {
+export const getInvoicesInvoiceForSupplierCompanyByUserISDOCPdf = (InvoicePublicIDs?: string[], headers = new Headers()):
+  Promise<GetInvoicesInvoiceForSupplierCompanyByUserISDOCPdfFetchResponse> => {
     const queryParams = {
       "InvoicePublicIDs": InvoicePublicIDs
     }
-    return apiGet(`${getApiUrl()}${getApiInvoicesInvoiceForSupplierCompanyByUserISDOCPdfPath()}`, headers, queryParams) as Promise<GetApiInvoicesInvoiceForSupplierCompanyByUserISDOCPdfFetchResponse>;
+    return apiGet(`${getApiUrl()}${getInvoicesInvoiceForSupplierCompanyByUserISDOCPdfPath()}`, headers, queryParams) as Promise<GetInvoicesInvoiceForSupplierCompanyByUserISDOCPdfFetchResponse>;
 }
 
-export type PostApiInvoicesInvoiceForClientByOrderPublicIDCancelFetchResponse = 
+export type PostInvoicesInvoiceForClientByOrderPublicIDCancelFetchResponse = 
 | FetchResponse<CancelInvoiceForClientByOrderCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiInvoicesInvoiceForClientByOrderPublicIDCancelPath = (publicID: string) => `/api/v1/invoices/invoice-for-client-by-order/${publicID}/cancel`;
+export const postInvoicesInvoiceForClientByOrderPublicIDCancelPath = (publicID: string) => `/api/v1/invoices/invoice-for-client-by-order/${publicID}/cancel`;
 
-export const postApiInvoicesInvoiceForClientByOrderPublicIDCancel = (publicID: string, headers = new Headers()):
-  Promise<PostApiInvoicesInvoiceForClientByOrderPublicIDCancelFetchResponse> => {
+export const postInvoicesInvoiceForClientByOrderPublicIDCancel = (publicID: string, headers = new Headers()):
+  Promise<PostInvoicesInvoiceForClientByOrderPublicIDCancelFetchResponse> => {
     const requestData = getApiRequestData<object>(undefined, false);
 
-    return apiPost(`${getApiUrl()}${postApiInvoicesInvoiceForClientByOrderPublicIDCancelPath(publicID)}`, requestData, headers) as Promise<PostApiInvoicesInvoiceForClientByOrderPublicIDCancelFetchResponse>;
+    return apiPost(`${getApiUrl()}${postInvoicesInvoiceForClientByOrderPublicIDCancelPath(publicID)}`, requestData, headers) as Promise<PostInvoicesInvoiceForClientByOrderPublicIDCancelFetchResponse>;
 }
 
-export type PostApiEnterprisesFetchResponse = 
+export type PostEnterprisesFetchResponse = 
 | FetchResponse<void, 204> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiEnterprisesPath = () => `/api/v1/enterprises`;
+export const postEnterprisesPath = () => `/api/v1/enterprises`;
 
-export const postApiEnterprises = (requestContract: CreateEnterpriseRequest, headers = new Headers()):
-  Promise<PostApiEnterprisesFetchResponse> => {
+export const postEnterprises = (requestContract: CreateEnterpriseRequest, headers = new Headers()):
+  Promise<PostEnterprisesFetchResponse> => {
     const requestData = getApiRequestData<CreateEnterpriseRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiEnterprisesPath()}`, requestData, headers) as Promise<PostApiEnterprisesFetchResponse>;
+    return apiPost(`${getApiUrl()}${postEnterprisesPath()}`, requestData, headers) as Promise<PostEnterprisesFetchResponse>;
 }
 
-export type PostApiEnterprisesChangeModeFetchResponse = 
+export type PostEnterprisesChangeModeFetchResponse = 
 | FetchResponse<ChangeEnterpriseModeCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ChangeEnterpriseModeCommandResult, 403> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiEnterprisesChangeModePath = () => `/api/v1/enterprises/change-mode`;
+export const postEnterprisesChangeModePath = () => `/api/v1/enterprises/change-mode`;
 
-export const postApiEnterprisesChangeMode = (requestContract: EnterpriseModeChangeRequest, headers = new Headers()):
-  Promise<PostApiEnterprisesChangeModeFetchResponse> => {
+export const postEnterprisesChangeMode = (requestContract: EnterpriseModeChangeRequest, headers = new Headers()):
+  Promise<PostEnterprisesChangeModeFetchResponse> => {
     const requestData = getApiRequestData<EnterpriseModeChangeRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiEnterprisesChangeModePath()}`, requestData, headers) as Promise<PostApiEnterprisesChangeModeFetchResponse>;
+    return apiPost(`${getApiUrl()}${postEnterprisesChangeModePath()}`, requestData, headers) as Promise<PostEnterprisesChangeModeFetchResponse>;
 }
 
-export type PutApiEnterprisesDesignSettingsFetchResponse = 
+export type PutEnterprisesDesignSettingsFetchResponse = 
 | FetchResponse<SaveEnterpriseDesignSettingsCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ChangeEnterpriseModeCommandResult, 403> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const putApiEnterprisesDesignSettingsPath = () => `/api/v1/enterprises/design-settings`;
+export const putEnterprisesDesignSettingsPath = () => `/api/v1/enterprises/design-settings`;
 
-export const putApiEnterprisesDesignSettings = (requestContract: EnterpriseDesignSettingsUpdateRequest, headers = new Headers()):
-  Promise<PutApiEnterprisesDesignSettingsFetchResponse> => {
+export const putEnterprisesDesignSettings = (requestContract: EnterpriseDesignSettingsUpdateRequest, headers = new Headers()):
+  Promise<PutEnterprisesDesignSettingsFetchResponse> => {
     const requestData = getApiRequestData<EnterpriseDesignSettingsUpdateRequest>(requestContract, false);
 
-    return apiPut(`${getApiUrl()}${putApiEnterprisesDesignSettingsPath()}`, requestData, headers) as Promise<PutApiEnterprisesDesignSettingsFetchResponse>;
+    return apiPut(`${getApiUrl()}${putEnterprisesDesignSettingsPath()}`, requestData, headers) as Promise<PutEnterprisesDesignSettingsFetchResponse>;
 }
 
-export type PutApiEnterprisesCommunicationSettingsFetchResponse = 
+export type PutEnterprisesCommunicationSettingsFetchResponse = 
 | FetchResponse<SaveEnterpriseCommunicationSettingsCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const putApiEnterprisesCommunicationSettingsPath = () => `/api/v1/enterprises/communication-settings`;
+export const putEnterprisesCommunicationSettingsPath = () => `/api/v1/enterprises/communication-settings`;
 
-export const putApiEnterprisesCommunicationSettings = (requestContract: EnterpriseCommunicationSettingsUpdateRequest, headers = new Headers()):
-  Promise<PutApiEnterprisesCommunicationSettingsFetchResponse> => {
+export const putEnterprisesCommunicationSettings = (requestContract: EnterpriseCommunicationSettingsUpdateRequest, headers = new Headers()):
+  Promise<PutEnterprisesCommunicationSettingsFetchResponse> => {
     const requestData = getApiRequestData<EnterpriseCommunicationSettingsUpdateRequest>(requestContract, false);
 
-    return apiPut(`${getApiUrl()}${putApiEnterprisesCommunicationSettingsPath()}`, requestData, headers) as Promise<PutApiEnterprisesCommunicationSettingsFetchResponse>;
+    return apiPut(`${getApiUrl()}${putEnterprisesCommunicationSettingsPath()}`, requestData, headers) as Promise<PutEnterprisesCommunicationSettingsFetchResponse>;
 }
 
-export type GetApiEnterprisesBasicSettingsFetchResponse = 
+export type GetEnterprisesBasicSettingsFetchResponse = 
 | FetchResponse<EnterpriseBasicSettingsDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiEnterprisesBasicSettingsPath = () => `/api/v1/enterprises/basic-settings`;
+export const getEnterprisesBasicSettingsPath = () => `/api/v1/enterprises/basic-settings`;
 
-export const getApiEnterprisesBasicSettings = (headers = new Headers()):
-  Promise<GetApiEnterprisesBasicSettingsFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiEnterprisesBasicSettingsPath()}`, headers, {}) as Promise<GetApiEnterprisesBasicSettingsFetchResponse>;
+export const getEnterprisesBasicSettings = (headers = new Headers()):
+  Promise<GetEnterprisesBasicSettingsFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getEnterprisesBasicSettingsPath()}`, headers, {}) as Promise<GetEnterprisesBasicSettingsFetchResponse>;
 }
 
-export type GetApiEnterprisesExternalIDBasicSettingsFetchResponse = 
+export type GetEnterprisesExternalIDBasicSettingsFetchResponse = 
 | FetchResponse<EnterpriseBasicSettingsDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiEnterprisesExternalIDBasicSettingsPath = (externalID: string) => `/api/v1/enterprises/${externalID}/basic-settings`;
+export const getEnterprisesExternalIDBasicSettingsPath = (externalID: string) => `/api/v1/enterprises/${externalID}/basic-settings`;
 
-export const getApiEnterprisesExternalIDBasicSettings = (externalID: string, headers = new Headers()):
-  Promise<GetApiEnterprisesExternalIDBasicSettingsFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiEnterprisesExternalIDBasicSettingsPath(externalID)}`, headers, {}) as Promise<GetApiEnterprisesExternalIDBasicSettingsFetchResponse>;
+export const getEnterprisesExternalIDBasicSettings = (externalID: string, headers = new Headers()):
+  Promise<GetEnterprisesExternalIDBasicSettingsFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getEnterprisesExternalIDBasicSettingsPath(externalID)}`, headers, {}) as Promise<GetEnterprisesExternalIDBasicSettingsFetchResponse>;
 }
 
-export type GetApiEnterprisesCommissionSettingsFetchResponse = 
+export type GetEnterprisesCommissionSettingsFetchResponse = 
 | FetchResponse<EntityListOfEnterpriseCommissionSettingsListItemDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ChangeEnterpriseModeCommandResult, 403> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiEnterprisesCommissionSettingsPath = () => `/api/v1/enterprises/commission-settings`;
+export const getEnterprisesCommissionSettingsPath = () => `/api/v1/enterprises/commission-settings`;
 
-export const getApiEnterprisesCommissionSettings = (offset?: number, limit?: number, headers = new Headers()):
-  Promise<GetApiEnterprisesCommissionSettingsFetchResponse> => {
+export const getEnterprisesCommissionSettings = (offset?: number, limit?: number, headers = new Headers()):
+  Promise<GetEnterprisesCommissionSettingsFetchResponse> => {
     const queryParams = {
       "offset": offset,
       "limit": limit
     }
-    return apiGet(`${getApiUrl()}${getApiEnterprisesCommissionSettingsPath()}`, headers, queryParams) as Promise<GetApiEnterprisesCommissionSettingsFetchResponse>;
+    return apiGet(`${getApiUrl()}${getEnterprisesCommissionSettingsPath()}`, headers, queryParams) as Promise<GetEnterprisesCommissionSettingsFetchResponse>;
 }
 
-export type PostApiEnterprisesCommissionSettingsFetchResponse = 
+export type PostEnterprisesCommissionSettingsFetchResponse = 
 | FetchResponse<CreateEnterpriseCommissionSettingsCommandResult, 200> 
 | FetchResponse<ApiProblemDetailsOfCreateEnterpriseCommissionSettingsErrorStatus, 400> 
 | FetchResponse<ApiProblemDetails, 401> 
@@ -3032,188 +3032,188 @@ export type PostApiEnterprisesCommissionSettingsFetchResponse =
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiEnterprisesCommissionSettingsPath = () => `/api/v1/enterprises/commission-settings`;
+export const postEnterprisesCommissionSettingsPath = () => `/api/v1/enterprises/commission-settings`;
 
-export const postApiEnterprisesCommissionSettings = (requestContract: CreateEnterpriseCommissionSettingsRequest, headers = new Headers()):
-  Promise<PostApiEnterprisesCommissionSettingsFetchResponse> => {
+export const postEnterprisesCommissionSettings = (requestContract: CreateEnterpriseCommissionSettingsRequest, headers = new Headers()):
+  Promise<PostEnterprisesCommissionSettingsFetchResponse> => {
     const requestData = getApiRequestData<CreateEnterpriseCommissionSettingsRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiEnterprisesCommissionSettingsPath()}`, requestData, headers) as Promise<PostApiEnterprisesCommissionSettingsFetchResponse>;
+    return apiPost(`${getApiUrl()}${postEnterprisesCommissionSettingsPath()}`, requestData, headers) as Promise<PostEnterprisesCommissionSettingsFetchResponse>;
 }
 
-export type GetApiEnterprisesServiceSettingsFetchResponse = 
+export type GetEnterprisesServiceSettingsFetchResponse = 
 | FetchResponse<EnterpriseServiceSettingsDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiEnterprisesServiceSettingsPath = () => `/api/v1/enterprises/service-settings`;
+export const getEnterprisesServiceSettingsPath = () => `/api/v1/enterprises/service-settings`;
 
-export const getApiEnterprisesServiceSettings = (headers = new Headers()):
-  Promise<GetApiEnterprisesServiceSettingsFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiEnterprisesServiceSettingsPath()}`, headers, {}) as Promise<GetApiEnterprisesServiceSettingsFetchResponse>;
+export const getEnterprisesServiceSettings = (headers = new Headers()):
+  Promise<GetEnterprisesServiceSettingsFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getEnterprisesServiceSettingsPath()}`, headers, {}) as Promise<GetEnterprisesServiceSettingsFetchResponse>;
 }
 
-export type PutApiEnterprisesServiceSettingsFetchResponse = 
+export type PutEnterprisesServiceSettingsFetchResponse = 
 | FetchResponse<SaveEnterpriseServiceSettingsCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ChangeEnterpriseModeCommandResult, 403> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const putApiEnterprisesServiceSettingsPath = () => `/api/v1/enterprises/service-settings`;
+export const putEnterprisesServiceSettingsPath = () => `/api/v1/enterprises/service-settings`;
 
-export const putApiEnterprisesServiceSettings = (requestContract: EnterpriseServiceSettingsUpdateRequest, headers = new Headers()):
-  Promise<PutApiEnterprisesServiceSettingsFetchResponse> => {
+export const putEnterprisesServiceSettings = (requestContract: EnterpriseServiceSettingsUpdateRequest, headers = new Headers()):
+  Promise<PutEnterprisesServiceSettingsFetchResponse> => {
     const requestData = getApiRequestData<EnterpriseServiceSettingsUpdateRequest>(requestContract, false);
 
-    return apiPut(`${getApiUrl()}${putApiEnterprisesServiceSettingsPath()}`, requestData, headers) as Promise<PutApiEnterprisesServiceSettingsFetchResponse>;
+    return apiPut(`${getApiUrl()}${putEnterprisesServiceSettingsPath()}`, requestData, headers) as Promise<PutEnterprisesServiceSettingsFetchResponse>;
 }
 
-export type GetApiEnterprisesServicesFetchResponse = 
+export type GetEnterprisesServicesFetchResponse = 
 | FetchResponse<EnterpriseServiceListItemDto[], 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiEnterprisesServicesPath = () => `/api/v1/enterprises/services`;
+export const getEnterprisesServicesPath = () => `/api/v1/enterprises/services`;
 
-export const getApiEnterprisesServices = (headers = new Headers()):
-  Promise<GetApiEnterprisesServicesFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiEnterprisesServicesPath()}`, headers, {}) as Promise<GetApiEnterprisesServicesFetchResponse>;
+export const getEnterprisesServices = (headers = new Headers()):
+  Promise<GetEnterprisesServicesFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getEnterprisesServicesPath()}`, headers, {}) as Promise<GetEnterprisesServicesFetchResponse>;
 }
 
-export type PutApiEnterprisesServicesFetchResponse = 
+export type PutEnterprisesServicesFetchResponse = 
 | FetchResponse<SaveEnterpriseServicesCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 403> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const putApiEnterprisesServicesPath = () => `/api/v1/enterprises/services`;
+export const putEnterprisesServicesPath = () => `/api/v1/enterprises/services`;
 
-export const putApiEnterprisesServices = (requestContract: EnterpriseServicesUpdateRequest, headers = new Headers()):
-  Promise<PutApiEnterprisesServicesFetchResponse> => {
+export const putEnterprisesServices = (requestContract: EnterpriseServicesUpdateRequest, headers = new Headers()):
+  Promise<PutEnterprisesServicesFetchResponse> => {
     const requestData = getApiRequestData<EnterpriseServicesUpdateRequest>(requestContract, false);
 
-    return apiPut(`${getApiUrl()}${putApiEnterprisesServicesPath()}`, requestData, headers) as Promise<PutApiEnterprisesServicesFetchResponse>;
+    return apiPut(`${getApiUrl()}${putEnterprisesServicesPath()}`, requestData, headers) as Promise<PutEnterprisesServicesFetchResponse>;
 }
 
-export type GetApiEnterprisesLogoFetchResponse = 
+export type GetEnterprisesLogoFetchResponse = 
 | FetchResponse<EnterpriseLogoDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiEnterprisesLogoPath = () => `/api/v1/enterprises/logo`;
+export const getEnterprisesLogoPath = () => `/api/v1/enterprises/logo`;
 
-export const getApiEnterprisesLogo = (headers = new Headers()):
-  Promise<GetApiEnterprisesLogoFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiEnterprisesLogoPath()}`, headers, {}) as Promise<GetApiEnterprisesLogoFetchResponse>;
+export const getEnterprisesLogo = (headers = new Headers()):
+  Promise<GetEnterprisesLogoFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getEnterprisesLogoPath()}`, headers, {}) as Promise<GetEnterprisesLogoFetchResponse>;
 }
 
-export type GetApiEnterprisesPublicIDLogoJsonFetchResponse = 
+export type GetEnterprisesPublicIDLogoJsonFetchResponse = 
 | FetchResponse<EnterpriseLogoDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiEnterprisesPublicIDLogoJsonPath = (publicID: string) => `/api/v1/enterprises/${publicID}/logo/json`;
+export const getEnterprisesPublicIDLogoJsonPath = (publicID: string) => `/api/v1/enterprises/${publicID}/logo/json`;
 
-export const getApiEnterprisesPublicIDLogoJson = (publicID: string, headers = new Headers()):
-  Promise<GetApiEnterprisesPublicIDLogoJsonFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiEnterprisesPublicIDLogoJsonPath(publicID)}`, headers, {}) as Promise<GetApiEnterprisesPublicIDLogoJsonFetchResponse>;
+export const getEnterprisesPublicIDLogoJson = (publicID: string, headers = new Headers()):
+  Promise<GetEnterprisesPublicIDLogoJsonFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getEnterprisesPublicIDLogoJsonPath(publicID)}`, headers, {}) as Promise<GetEnterprisesPublicIDLogoJsonFetchResponse>;
 }
 
-export type GetApiEnterprisesPublicIDLogoFileFetchResponse = 
+export type GetEnterprisesPublicIDLogoFileFetchResponse = 
 | FetchResponse<File, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiEnterprisesPublicIDLogoFilePath = (publicID: string) => `/api/v1/enterprises/${publicID}/logo/file`;
+export const getEnterprisesPublicIDLogoFilePath = (publicID: string) => `/api/v1/enterprises/${publicID}/logo/file`;
 
-export const getApiEnterprisesPublicIDLogoFile = (publicID: string, headers = new Headers()):
-  Promise<GetApiEnterprisesPublicIDLogoFileFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiEnterprisesPublicIDLogoFilePath(publicID)}`, headers, {}) as Promise<GetApiEnterprisesPublicIDLogoFileFetchResponse>;
+export const getEnterprisesPublicIDLogoFile = (publicID: string, headers = new Headers()):
+  Promise<GetEnterprisesPublicIDLogoFileFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getEnterprisesPublicIDLogoFilePath(publicID)}`, headers, {}) as Promise<GetEnterprisesPublicIDLogoFileFetchResponse>;
 }
 
-export type GetApiEnterprisesPublicIDLogoTenantFileFetchResponse = 
+export type GetEnterprisesPublicIDLogoTenantFileFetchResponse = 
 | FetchResponse<File, 200> 
 | FetchResponse<ApiProblemDetails, 204> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiEnterprisesPublicIDLogoTenantFilePath = (publicID: string) => `/api/v1/enterprises/${publicID}/logo/tenant/file`;
+export const getEnterprisesPublicIDLogoTenantFilePath = (publicID: string) => `/api/v1/enterprises/${publicID}/logo/tenant/file`;
 
-export const getApiEnterprisesPublicIDLogoTenantFile = (publicID: string, headers = new Headers()):
-  Promise<GetApiEnterprisesPublicIDLogoTenantFileFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiEnterprisesPublicIDLogoTenantFilePath(publicID)}`, headers, {}) as Promise<GetApiEnterprisesPublicIDLogoTenantFileFetchResponse>;
+export const getEnterprisesPublicIDLogoTenantFile = (publicID: string, headers = new Headers()):
+  Promise<GetEnterprisesPublicIDLogoTenantFileFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getEnterprisesPublicIDLogoTenantFilePath(publicID)}`, headers, {}) as Promise<GetEnterprisesPublicIDLogoTenantFileFetchResponse>;
 }
 
-export type GetApiEnterprisesPublicIDDesignSettingsFetchResponse = 
+export type GetEnterprisesPublicIDDesignSettingsFetchResponse = 
 | FetchResponse<EnterpriseDesignSettingsDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiEnterprisesPublicIDDesignSettingsPath = (publicID: string) => `/api/v1/enterprises/${publicID}/design-settings`;
+export const getEnterprisesPublicIDDesignSettingsPath = (publicID: string) => `/api/v1/enterprises/${publicID}/design-settings`;
 
-export const getApiEnterprisesPublicIDDesignSettings = (publicID: string, headers = new Headers()):
-  Promise<GetApiEnterprisesPublicIDDesignSettingsFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiEnterprisesPublicIDDesignSettingsPath(publicID)}`, headers, {}) as Promise<GetApiEnterprisesPublicIDDesignSettingsFetchResponse>;
+export const getEnterprisesPublicIDDesignSettings = (publicID: string, headers = new Headers()):
+  Promise<GetEnterprisesPublicIDDesignSettingsFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getEnterprisesPublicIDDesignSettingsPath(publicID)}`, headers, {}) as Promise<GetEnterprisesPublicIDDesignSettingsFetchResponse>;
 }
 
-export type GetApiEnterprisesPackageServiceSettingsFetchResponse = 
+export type GetEnterprisesPackageServiceSettingsFetchResponse = 
 | FetchResponse<EnterprisePackageServiceSettingsDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiEnterprisesPackageServiceSettingsPath = () => `/api/v1/enterprises/package-service-settings`;
+export const getEnterprisesPackageServiceSettingsPath = () => `/api/v1/enterprises/package-service-settings`;
 
-export const getApiEnterprisesPackageServiceSettings = (headers = new Headers()):
-  Promise<GetApiEnterprisesPackageServiceSettingsFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiEnterprisesPackageServiceSettingsPath()}`, headers, {}) as Promise<GetApiEnterprisesPackageServiceSettingsFetchResponse>;
+export const getEnterprisesPackageServiceSettings = (headers = new Headers()):
+  Promise<GetEnterprisesPackageServiceSettingsFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getEnterprisesPackageServiceSettingsPath()}`, headers, {}) as Promise<GetEnterprisesPackageServiceSettingsFetchResponse>;
 }
 
-export type PutApiEnterprisesPackageServiceSettingsFetchResponse = 
+export type PutEnterprisesPackageServiceSettingsFetchResponse = 
 | FetchResponse<SaveEnterprisePackageServiceSettingsCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const putApiEnterprisesPackageServiceSettingsPath = () => `/api/v1/enterprises/package-service-settings`;
+export const putEnterprisesPackageServiceSettingsPath = () => `/api/v1/enterprises/package-service-settings`;
 
-export const putApiEnterprisesPackageServiceSettings = (requestContract: EnterprisePackageServiceSettingsUpdateRequest, headers = new Headers()):
-  Promise<PutApiEnterprisesPackageServiceSettingsFetchResponse> => {
+export const putEnterprisesPackageServiceSettings = (requestContract: EnterprisePackageServiceSettingsUpdateRequest, headers = new Headers()):
+  Promise<PutEnterprisesPackageServiceSettingsFetchResponse> => {
     const requestData = getApiRequestData<EnterprisePackageServiceSettingsUpdateRequest>(requestContract, false);
 
-    return apiPut(`${getApiUrl()}${putApiEnterprisesPackageServiceSettingsPath()}`, requestData, headers) as Promise<PutApiEnterprisesPackageServiceSettingsFetchResponse>;
+    return apiPut(`${getApiUrl()}${putEnterprisesPackageServiceSettingsPath()}`, requestData, headers) as Promise<PutEnterprisesPackageServiceSettingsFetchResponse>;
 }
 
-export type GetApiCutoffsFetchResponse = 
+export type GetCutoffsFetchResponse = 
 | FetchResponse<EntityListOfCutoffListItemDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 403> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiCutoffsPath = () => `/api/v1/cutoffs`;
+export const getCutoffsPath = () => `/api/v1/cutoffs`;
 
-export const getApiCutoffs = (offset?: number, limit?: number, headers = new Headers()):
-  Promise<GetApiCutoffsFetchResponse> => {
+export const getCutoffs = (offset?: number, limit?: number, headers = new Headers()):
+  Promise<GetCutoffsFetchResponse> => {
     const queryParams = {
       "offset": offset,
       "limit": limit
     }
-    return apiGet(`${getApiUrl()}${getApiCutoffsPath()}`, headers, queryParams) as Promise<GetApiCutoffsFetchResponse>;
+    return apiGet(`${getApiUrl()}${getCutoffsPath()}`, headers, queryParams) as Promise<GetCutoffsFetchResponse>;
 }
 
-export type PostApiCutoffsFetchResponse = 
+export type PostCutoffsFetchResponse = 
 | FetchResponse<CreateCutoffCommandResult, 200> 
 | FetchResponse<ApiProblemDetailsOfCreateCutoffErrorStatus, 400> 
 | FetchResponse<ApiProblemDetails, 401> 
@@ -3222,16 +3222,16 @@ export type PostApiCutoffsFetchResponse =
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiCutoffsPath = () => `/api/v1/cutoffs`;
+export const postCutoffsPath = () => `/api/v1/cutoffs`;
 
-export const postApiCutoffs = (requestContract: CutoffCreateRequest, headers = new Headers()):
-  Promise<PostApiCutoffsFetchResponse> => {
+export const postCutoffs = (requestContract: CutoffCreateRequest, headers = new Headers()):
+  Promise<PostCutoffsFetchResponse> => {
     const requestData = getApiRequestData<CutoffCreateRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiCutoffsPath()}`, requestData, headers) as Promise<PostApiCutoffsFetchResponse>;
+    return apiPost(`${getApiUrl()}${postCutoffsPath()}`, requestData, headers) as Promise<PostCutoffsFetchResponse>;
 }
 
-export type GetApiCutoffsPublicIDFetchResponse = 
+export type GetCutoffsPublicIDFetchResponse = 
 | FetchResponse<CutoffDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 403> 
@@ -3239,54 +3239,54 @@ export type GetApiCutoffsPublicIDFetchResponse =
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiCutoffsPublicIDPath = (publicID: string) => `/api/v1/cutoffs/${publicID}`;
+export const getCutoffsPublicIDPath = (publicID: string) => `/api/v1/cutoffs/${publicID}`;
 
-export const getApiCutoffsPublicID = (publicID: string, headers = new Headers()):
-  Promise<GetApiCutoffsPublicIDFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiCutoffsPublicIDPath(publicID)}`, headers, {}) as Promise<GetApiCutoffsPublicIDFetchResponse>;
+export const getCutoffsPublicID = (publicID: string, headers = new Headers()):
+  Promise<GetCutoffsPublicIDFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getCutoffsPublicIDPath(publicID)}`, headers, {}) as Promise<GetCutoffsPublicIDFetchResponse>;
 }
 
-export type GetApiCutoffsCompanyIDDateFromForNextCutoffFetchResponse = 
+export type GetCutoffsCompanyIDDateFromForNextCutoffFetchResponse = 
 | FetchResponse<DateFromForNextCutoffDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 403> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiCutoffsCompanyIDDateFromForNextCutoffPath = (companyID: number) => `/api/v1/cutoffs/${companyID}/date-from-for-next-cutoff`;
+export const getCutoffsCompanyIDDateFromForNextCutoffPath = (companyID: number) => `/api/v1/cutoffs/${companyID}/date-from-for-next-cutoff`;
 
-export const getApiCutoffsCompanyIDDateFromForNextCutoff = (companyID: number, headers = new Headers()):
-  Promise<GetApiCutoffsCompanyIDDateFromForNextCutoffFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiCutoffsCompanyIDDateFromForNextCutoffPath(companyID)}`, headers, {}) as Promise<GetApiCutoffsCompanyIDDateFromForNextCutoffFetchResponse>;
+export const getCutoffsCompanyIDDateFromForNextCutoff = (companyID: number, headers = new Headers()):
+  Promise<GetCutoffsCompanyIDDateFromForNextCutoffFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getCutoffsCompanyIDDateFromForNextCutoffPath(companyID)}`, headers, {}) as Promise<GetCutoffsCompanyIDDateFromForNextCutoffFetchResponse>;
 }
 
-export type GetApiCutoffsExpectedUserCommissionFetchResponse = 
+export type GetCutoffsExpectedUserCommissionFetchResponse = 
 | FetchResponse<GetExpectedUserCommissionQueryResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiCutoffsExpectedUserCommissionPath = () => `/api/v1/cutoffs/expected-user-commission`;
+export const getCutoffsExpectedUserCommissionPath = () => `/api/v1/cutoffs/expected-user-commission`;
 
-export const getApiCutoffsExpectedUserCommission = (headers = new Headers()):
-  Promise<GetApiCutoffsExpectedUserCommissionFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiCutoffsExpectedUserCommissionPath()}`, headers, {}) as Promise<GetApiCutoffsExpectedUserCommissionFetchResponse>;
+export const getCutoffsExpectedUserCommission = (headers = new Headers()):
+  Promise<GetCutoffsExpectedUserCommissionFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getCutoffsExpectedUserCommissionPath()}`, headers, {}) as Promise<GetCutoffsExpectedUserCommissionFetchResponse>;
 }
 
-export type GetApiCutoffsPaidUserCommissionFetchResponse = 
+export type GetCutoffsPaidUserCommissionFetchResponse = 
 | FetchResponse<GetPaidUserCommissionQueryResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiCutoffsPaidUserCommissionPath = () => `/api/v1/cutoffs/paid-user-commission`;
+export const getCutoffsPaidUserCommissionPath = () => `/api/v1/cutoffs/paid-user-commission`;
 
-export const getApiCutoffsPaidUserCommission = (headers = new Headers()):
-  Promise<GetApiCutoffsPaidUserCommissionFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiCutoffsPaidUserCommissionPath()}`, headers, {}) as Promise<GetApiCutoffsPaidUserCommissionFetchResponse>;
+export const getCutoffsPaidUserCommission = (headers = new Headers()):
+  Promise<GetCutoffsPaidUserCommissionFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getCutoffsPaidUserCommissionPath()}`, headers, {}) as Promise<GetCutoffsPaidUserCommissionFetchResponse>;
 }
 
-export type GetApiCutoffsPublicIDISDOCPdfsFetchResponse = 
+export type GetCutoffsPublicIDISDOCPdfsFetchResponse = 
 | FetchResponse<CutoffISDOCPdfsDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 403> 
@@ -3294,14 +3294,14 @@ export type GetApiCutoffsPublicIDISDOCPdfsFetchResponse =
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiCutoffsPublicIDISDOCPdfsPath = (publicID: string) => `/api/v1/cutoffs/${publicID}/ISDOCPdfs`;
+export const getCutoffsPublicIDISDOCPdfsPath = (publicID: string) => `/api/v1/cutoffs/${publicID}/ISDOCPdfs`;
 
-export const getApiCutoffsPublicIDISDOCPdfs = (publicID: string, headers = new Headers()):
-  Promise<GetApiCutoffsPublicIDISDOCPdfsFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiCutoffsPublicIDISDOCPdfsPath(publicID)}`, headers, {}) as Promise<GetApiCutoffsPublicIDISDOCPdfsFetchResponse>;
+export const getCutoffsPublicIDISDOCPdfs = (publicID: string, headers = new Headers()):
+  Promise<GetCutoffsPublicIDISDOCPdfsFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getCutoffsPublicIDISDOCPdfsPath(publicID)}`, headers, {}) as Promise<GetCutoffsPublicIDISDOCPdfsFetchResponse>;
 }
 
-export type PostApiCutoffsPublicIDSendPaymentsFetchResponse = 
+export type PostCutoffsPublicIDSendPaymentsFetchResponse = 
 | FetchResponse<SendCutoffPaymentsCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 400> 
 | FetchResponse<ApiProblemDetails, 401> 
@@ -3310,16 +3310,16 @@ export type PostApiCutoffsPublicIDSendPaymentsFetchResponse =
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiCutoffsPublicIDSendPaymentsPath = (publicID: string) => `/api/v1/cutoffs/${publicID}/send-payments`;
+export const postCutoffsPublicIDSendPaymentsPath = (publicID: string) => `/api/v1/cutoffs/${publicID}/send-payments`;
 
-export const postApiCutoffsPublicIDSendPayments = (publicID: string, headers = new Headers()):
-  Promise<PostApiCutoffsPublicIDSendPaymentsFetchResponse> => {
+export const postCutoffsPublicIDSendPayments = (publicID: string, headers = new Headers()):
+  Promise<PostCutoffsPublicIDSendPaymentsFetchResponse> => {
     const requestData = getApiRequestData<object>(undefined, false);
 
-    return apiPost(`${getApiUrl()}${postApiCutoffsPublicIDSendPaymentsPath(publicID)}`, requestData, headers) as Promise<PostApiCutoffsPublicIDSendPaymentsFetchResponse>;
+    return apiPost(`${getApiUrl()}${postCutoffsPublicIDSendPaymentsPath(publicID)}`, requestData, headers) as Promise<PostCutoffsPublicIDSendPaymentsFetchResponse>;
 }
 
-export type GetApiCutoffsPublicIDDetailPdfFetchResponse = 
+export type GetCutoffsPublicIDDetailPdfFetchResponse = 
 | FetchResponse<CutoffDetailPdfBase64Dto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 403> 
@@ -3327,27 +3327,27 @@ export type GetApiCutoffsPublicIDDetailPdfFetchResponse =
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiCutoffsPublicIDDetailPdfPath = (publicID: string) => `/api/v1/cutoffs/${publicID}/detail-pdf`;
+export const getCutoffsPublicIDDetailPdfPath = (publicID: string) => `/api/v1/cutoffs/${publicID}/detail-pdf`;
 
-export const getApiCutoffsPublicIDDetailPdf = (publicID: string, headers = new Headers()):
-  Promise<GetApiCutoffsPublicIDDetailPdfFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiCutoffsPublicIDDetailPdfPath(publicID)}`, headers, {}) as Promise<GetApiCutoffsPublicIDDetailPdfFetchResponse>;
+export const getCutoffsPublicIDDetailPdf = (publicID: string, headers = new Headers()):
+  Promise<GetCutoffsPublicIDDetailPdfFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getCutoffsPublicIDDetailPdfPath(publicID)}`, headers, {}) as Promise<GetCutoffsPublicIDDetailPdfFetchResponse>;
 }
 
-export type GetApiCutoffsUserSupplierCompaniesFetchResponse = 
+export type GetCutoffsUserSupplierCompaniesFetchResponse = 
 | FetchResponse<CutoffUserSupplierCompanyListItemDto[], 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiCutoffsUserSupplierCompaniesPath = () => `/api/v1/cutoffs/user-supplier-companies`;
+export const getCutoffsUserSupplierCompaniesPath = () => `/api/v1/cutoffs/user-supplier-companies`;
 
-export const getApiCutoffsUserSupplierCompanies = (headers = new Headers()):
-  Promise<GetApiCutoffsUserSupplierCompaniesFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiCutoffsUserSupplierCompaniesPath()}`, headers, {}) as Promise<GetApiCutoffsUserSupplierCompaniesFetchResponse>;
+export const getCutoffsUserSupplierCompanies = (headers = new Headers()):
+  Promise<GetCutoffsUserSupplierCompaniesFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getCutoffsUserSupplierCompaniesPath()}`, headers, {}) as Promise<GetCutoffsUserSupplierCompaniesFetchResponse>;
 }
 
-export type GetApiCompaniesPublicIDFetchResponse = 
+export type GetCompaniesPublicIDFetchResponse = 
 | FetchResponse<CompanyDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 403> 
@@ -3355,104 +3355,104 @@ export type GetApiCompaniesPublicIDFetchResponse =
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiCompaniesPublicIDPath = (publicID: string) => `/api/v1/companies/${publicID}`;
+export const getCompaniesPublicIDPath = (publicID: string) => `/api/v1/companies/${publicID}`;
 
-export const getApiCompaniesPublicID = (publicID: string, headers = new Headers()):
-  Promise<GetApiCompaniesPublicIDFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiCompaniesPublicIDPath(publicID)}`, headers, {}) as Promise<GetApiCompaniesPublicIDFetchResponse>;
+export const getCompaniesPublicID = (publicID: string, headers = new Headers()):
+  Promise<GetCompaniesPublicIDFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getCompaniesPublicIDPath(publicID)}`, headers, {}) as Promise<GetCompaniesPublicIDFetchResponse>;
 }
 
-export type PostApiCompaniesFetchResponse = 
+export type PostCompaniesFetchResponse = 
 | FetchResponse<CreateCompanyCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiCompaniesPath = () => `/api/v1/companies`;
+export const postCompaniesPath = () => `/api/v1/companies`;
 
-export const postApiCompanies = (requestContract: CompanyCreateRequest, headers = new Headers()):
-  Promise<PostApiCompaniesFetchResponse> => {
+export const postCompanies = (requestContract: CompanyCreateRequest, headers = new Headers()):
+  Promise<PostCompaniesFetchResponse> => {
     const requestData = getApiRequestData<CompanyCreateRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiCompaniesPath()}`, requestData, headers) as Promise<PostApiCompaniesFetchResponse>;
+    return apiPost(`${getApiUrl()}${postCompaniesPath()}`, requestData, headers) as Promise<PostCompaniesFetchResponse>;
 }
 
-export type PutApiCompaniesFetchResponse = 
+export type PutCompaniesFetchResponse = 
 | FetchResponse<UpdateCompanyCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 403> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const putApiCompaniesPath = () => `/api/v1/companies`;
+export const putCompaniesPath = () => `/api/v1/companies`;
 
-export const putApiCompanies = (requestContract: CompanyUpdateRequest, headers = new Headers()):
-  Promise<PutApiCompaniesFetchResponse> => {
+export const putCompanies = (requestContract: CompanyUpdateRequest, headers = new Headers()):
+  Promise<PutCompaniesFetchResponse> => {
     const requestData = getApiRequestData<CompanyUpdateRequest>(requestContract, false);
 
-    return apiPut(`${getApiUrl()}${putApiCompaniesPath()}`, requestData, headers) as Promise<PutApiCompaniesFetchResponse>;
+    return apiPut(`${getApiUrl()}${putCompaniesPath()}`, requestData, headers) as Promise<PutCompaniesFetchResponse>;
 }
 
-export type GetApiCompaniesUserSupplierCompaniesFetchResponse = 
+export type GetCompaniesUserSupplierCompaniesFetchResponse = 
 | FetchResponse<UserSupplierCompanyListItemDto[], 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiCompaniesUserSupplierCompaniesPath = () => `/api/v1/companies/user-supplier-companies`;
+export const getCompaniesUserSupplierCompaniesPath = () => `/api/v1/companies/user-supplier-companies`;
 
-export const getApiCompaniesUserSupplierCompanies = (headers = new Headers()):
-  Promise<GetApiCompaniesUserSupplierCompaniesFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiCompaniesUserSupplierCompaniesPath()}`, headers, {}) as Promise<GetApiCompaniesUserSupplierCompaniesFetchResponse>;
+export const getCompaniesUserSupplierCompanies = (headers = new Headers()):
+  Promise<GetCompaniesUserSupplierCompaniesFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getCompaniesUserSupplierCompaniesPath()}`, headers, {}) as Promise<GetCompaniesUserSupplierCompaniesFetchResponse>;
 }
 
-export type PostApiCompaniesUserSupplierCompanyFetchResponse = 
+export type PostCompaniesUserSupplierCompanyFetchResponse = 
 | FetchResponse<SetUserSupplierCompanyCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 403> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiCompaniesUserSupplierCompanyPath = () => `/api/v1/companies/user-supplier-company`;
+export const postCompaniesUserSupplierCompanyPath = () => `/api/v1/companies/user-supplier-company`;
 
-export const postApiCompaniesUserSupplierCompany = (requestContract: UserSupplierCompanySetRequest, headers = new Headers()):
-  Promise<PostApiCompaniesUserSupplierCompanyFetchResponse> => {
+export const postCompaniesUserSupplierCompany = (requestContract: UserSupplierCompanySetRequest, headers = new Headers()):
+  Promise<PostCompaniesUserSupplierCompanyFetchResponse> => {
     const requestData = getApiRequestData<UserSupplierCompanySetRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiCompaniesUserSupplierCompanyPath()}`, requestData, headers) as Promise<PostApiCompaniesUserSupplierCompanyFetchResponse>;
+    return apiPost(`${getApiUrl()}${postCompaniesUserSupplierCompanyPath()}`, requestData, headers) as Promise<PostCompaniesUserSupplierCompanyFetchResponse>;
 }
 
-export type GetApiCompaniesPublicIDDesignSettingsFetchResponse = 
+export type GetCompaniesPublicIDDesignSettingsFetchResponse = 
 | FetchResponse<CompanyDesignSettingsDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiCompaniesPublicIDDesignSettingsPath = (publicID: string) => `/api/v1/companies/${publicID}/design-settings`;
+export const getCompaniesPublicIDDesignSettingsPath = (publicID: string) => `/api/v1/companies/${publicID}/design-settings`;
 
-export const getApiCompaniesPublicIDDesignSettings = (publicID: string, headers = new Headers()):
-  Promise<GetApiCompaniesPublicIDDesignSettingsFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiCompaniesPublicIDDesignSettingsPath(publicID)}`, headers, {}) as Promise<GetApiCompaniesPublicIDDesignSettingsFetchResponse>;
+export const getCompaniesPublicIDDesignSettings = (publicID: string, headers = new Headers()):
+  Promise<GetCompaniesPublicIDDesignSettingsFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getCompaniesPublicIDDesignSettingsPath(publicID)}`, headers, {}) as Promise<GetCompaniesPublicIDDesignSettingsFetchResponse>;
 }
 
-export type PutApiCompaniesPublicIDDesignSettingsFetchResponse = 
+export type PutCompaniesPublicIDDesignSettingsFetchResponse = 
 | FetchResponse<SaveCompanyDesignSettingsCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 403> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const putApiCompaniesPublicIDDesignSettingsPath = (publicID: string) => `/api/v1/companies/${publicID}/design-settings`;
+export const putCompaniesPublicIDDesignSettingsPath = (publicID: string) => `/api/v1/companies/${publicID}/design-settings`;
 
-export const putApiCompaniesPublicIDDesignSettings = (requestContract: SaveCompanyDesignSettingsRequest, publicID: string, headers = new Headers()):
-  Promise<PutApiCompaniesPublicIDDesignSettingsFetchResponse> => {
+export const putCompaniesPublicIDDesignSettings = (requestContract: SaveCompanyDesignSettingsRequest, publicID: string, headers = new Headers()):
+  Promise<PutCompaniesPublicIDDesignSettingsFetchResponse> => {
     const requestData = getApiRequestData<SaveCompanyDesignSettingsRequest>(requestContract, false);
 
-    return apiPut(`${getApiUrl()}${putApiCompaniesPublicIDDesignSettingsPath(publicID)}`, requestData, headers) as Promise<PutApiCompaniesPublicIDDesignSettingsFetchResponse>;
+    return apiPut(`${getApiUrl()}${putCompaniesPublicIDDesignSettingsPath(publicID)}`, requestData, headers) as Promise<PutCompaniesPublicIDDesignSettingsFetchResponse>;
 }
 
-export type GetApiCompaniesPublicIDFioSettingsFetchResponse = 
+export type GetCompaniesPublicIDFioSettingsFetchResponse = 
 | FetchResponse<CompanyFioSettingsDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 403> 
@@ -3460,118 +3460,118 @@ export type GetApiCompaniesPublicIDFioSettingsFetchResponse =
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiCompaniesPublicIDFioSettingsPath = (publicID: string) => `/api/v1/companies/${publicID}/fio-settings`;
+export const getCompaniesPublicIDFioSettingsPath = (publicID: string) => `/api/v1/companies/${publicID}/fio-settings`;
 
-export const getApiCompaniesPublicIDFioSettings = (publicID: string, headers = new Headers()):
-  Promise<GetApiCompaniesPublicIDFioSettingsFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiCompaniesPublicIDFioSettingsPath(publicID)}`, headers, {}) as Promise<GetApiCompaniesPublicIDFioSettingsFetchResponse>;
+export const getCompaniesPublicIDFioSettings = (publicID: string, headers = new Headers()):
+  Promise<GetCompaniesPublicIDFioSettingsFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getCompaniesPublicIDFioSettingsPath(publicID)}`, headers, {}) as Promise<GetCompaniesPublicIDFioSettingsFetchResponse>;
 }
 
-export type PutApiCompaniesPublicIDFioSettingsFetchResponse = 
+export type PutCompaniesPublicIDFioSettingsFetchResponse = 
 | FetchResponse<SaveCompanyFioSettingsCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 403> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const putApiCompaniesPublicIDFioSettingsPath = (publicID: string) => `/api/v1/companies/${publicID}/fio-settings`;
+export const putCompaniesPublicIDFioSettingsPath = (publicID: string) => `/api/v1/companies/${publicID}/fio-settings`;
 
-export const putApiCompaniesPublicIDFioSettings = (requestContract: SaveFioSettingsRequest, publicID: string, headers = new Headers()):
-  Promise<PutApiCompaniesPublicIDFioSettingsFetchResponse> => {
+export const putCompaniesPublicIDFioSettings = (requestContract: SaveFioSettingsRequest, publicID: string, headers = new Headers()):
+  Promise<PutCompaniesPublicIDFioSettingsFetchResponse> => {
     const requestData = getApiRequestData<SaveFioSettingsRequest>(requestContract, false);
 
-    return apiPut(`${getApiUrl()}${putApiCompaniesPublicIDFioSettingsPath(publicID)}`, requestData, headers) as Promise<PutApiCompaniesPublicIDFioSettingsFetchResponse>;
+    return apiPut(`${getApiUrl()}${putCompaniesPublicIDFioSettingsPath(publicID)}`, requestData, headers) as Promise<PutCompaniesPublicIDFioSettingsFetchResponse>;
 }
 
-export type GetApiCompaniesPublicIDLogoFileFetchResponse = 
+export type GetCompaniesPublicIDLogoFileFetchResponse = 
 | FetchResponse<File, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiCompaniesPublicIDLogoFilePath = (publicID: string) => `/api/v1/companies/${publicID}/logo/file`;
+export const getCompaniesPublicIDLogoFilePath = (publicID: string) => `/api/v1/companies/${publicID}/logo/file`;
 
-export const getApiCompaniesPublicIDLogoFile = (publicID: string, headers = new Headers()):
-  Promise<GetApiCompaniesPublicIDLogoFileFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiCompaniesPublicIDLogoFilePath(publicID)}`, headers, {}) as Promise<GetApiCompaniesPublicIDLogoFileFetchResponse>;
+export const getCompaniesPublicIDLogoFile = (publicID: string, headers = new Headers()):
+  Promise<GetCompaniesPublicIDLogoFileFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getCompaniesPublicIDLogoFilePath(publicID)}`, headers, {}) as Promise<GetCompaniesPublicIDLogoFileFetchResponse>;
 }
 
-export type GetApiCodeListsFetchResponse = 
+export type GetCodeListsFetchResponse = 
 | FetchResponse<GetCodeListCollectionQueryResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiCodeListsPath = () => `/api/v1/code-lists`;
+export const getCodeListsPath = () => `/api/v1/code-lists`;
 
-export const getApiCodeLists = (headers = new Headers()):
-  Promise<GetApiCodeListsFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiCodeListsPath()}`, headers, {}) as Promise<GetApiCodeListsFetchResponse>;
+export const getCodeLists = (headers = new Headers()):
+  Promise<GetCodeListsFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getCodeListsPath()}`, headers, {}) as Promise<GetCodeListsFetchResponse>;
 }
 
-export type GetApiClientsCountFetchResponse = 
+export type GetClientsCountFetchResponse = 
 | FetchResponse<GetClientsCountQueryResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiClientsCountPath = () => `/api/v1/clients/count`;
+export const getClientsCountPath = () => `/api/v1/clients/count`;
 
-export const getApiClientsCount = (headers = new Headers()):
-  Promise<GetApiClientsCountFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiClientsCountPath()}`, headers, {}) as Promise<GetApiClientsCountFetchResponse>;
+export const getClientsCount = (headers = new Headers()):
+  Promise<GetClientsCountFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getClientsCountPath()}`, headers, {}) as Promise<GetClientsCountFetchResponse>;
 }
 
-export type GetApiClientsSearchFetchResponse = 
+export type GetClientsSearchFetchResponse = 
 | FetchResponse<ClientDto[], 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiClientsSearchPath = () => `/api/v1/clients/search`;
+export const getClientsSearchPath = () => `/api/v1/clients/search`;
 
-export const getApiClientsSearch = (query?: string, headers = new Headers()):
-  Promise<GetApiClientsSearchFetchResponse> => {
+export const getClientsSearch = (query?: string, headers = new Headers()):
+  Promise<GetClientsSearchFetchResponse> => {
     const queryParams = {
       "query": query
     }
-    return apiGet(`${getApiUrl()}${getApiClientsSearchPath()}`, headers, queryParams) as Promise<GetApiClientsSearchFetchResponse>;
+    return apiGet(`${getApiUrl()}${getClientsSearchPath()}`, headers, queryParams) as Promise<GetClientsSearchFetchResponse>;
 }
 
-export type GetApiClientsSearchPersonalNumberFetchResponse = 
+export type GetClientsSearchPersonalNumberFetchResponse = 
 | FetchResponse<ClientDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiClientsSearchPersonalNumberPath = () => `/api/v1/clients/search/personal-number`;
+export const getClientsSearchPersonalNumberPath = () => `/api/v1/clients/search/personal-number`;
 
-export const getApiClientsSearchPersonalNumber = (query?: string, headers = new Headers()):
-  Promise<GetApiClientsSearchPersonalNumberFetchResponse> => {
+export const getClientsSearchPersonalNumber = (query?: string, headers = new Headers()):
+  Promise<GetClientsSearchPersonalNumberFetchResponse> => {
     const queryParams = {
       "query": query
     }
-    return apiGet(`${getApiUrl()}${getApiClientsSearchPersonalNumberPath()}`, headers, queryParams) as Promise<GetApiClientsSearchPersonalNumberFetchResponse>;
+    return apiGet(`${getApiUrl()}${getClientsSearchPersonalNumberPath()}`, headers, queryParams) as Promise<GetClientsSearchPersonalNumberFetchResponse>;
 }
 
-export type PostApiCacheRefreshFetchResponse = 
+export type PostCacheRefreshFetchResponse = 
 | FetchResponse<void, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 403> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiCacheRefreshPath = () => `/api/v1/cache/refresh`;
+export const postCacheRefreshPath = () => `/api/v1/cache/refresh`;
 
-export const postApiCacheRefresh = (body: string, headers = new Headers()):
-  Promise<PostApiCacheRefreshFetchResponse> => {
+export const postCacheRefresh = (body: string, headers = new Headers()):
+  Promise<PostCacheRefreshFetchResponse> => {
     const requestData = getApiRequestData<string>(body, false);
 
-    return apiPost(`${getApiUrl()}${postApiCacheRefreshPath()}`, requestData, headers) as Promise<PostApiCacheRefreshFetchResponse>;
+    return apiPost(`${getApiUrl()}${postCacheRefreshPath()}`, requestData, headers) as Promise<PostCacheRefreshFetchResponse>;
 }
 
-export type PostApiAuthSignUpFetchResponse = 
+export type PostAuthSignUpFetchResponse = 
 | FetchResponse<SignUpCommandResult, 201> 
 | FetchResponse<ApiProblemDetailsOfPasswordChangeResultStatus, 400> 
 | FetchResponse<ApiProblemDetails, 401> 
@@ -3579,128 +3579,128 @@ export type PostApiAuthSignUpFetchResponse =
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiAuthSignUpPath = () => `/api/v1/auth/sign-up`;
+export const postAuthSignUpPath = () => `/api/v1/auth/sign-up`;
 
-export const postApiAuthSignUp = (requestContract: SignUpCommand, headers = new Headers()):
-  Promise<PostApiAuthSignUpFetchResponse> => {
+export const postAuthSignUp = (requestContract: SignUpCommand, headers = new Headers()):
+  Promise<PostAuthSignUpFetchResponse> => {
     const requestData = getApiRequestData<SignUpCommand>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiAuthSignUpPath()}`, requestData, headers) as Promise<PostApiAuthSignUpFetchResponse>;
+    return apiPost(`${getApiUrl()}${postAuthSignUpPath()}`, requestData, headers) as Promise<PostAuthSignUpFetchResponse>;
 }
 
-export type PostApiAuthSignInFetchResponse = 
+export type PostAuthSignInFetchResponse = 
 | FetchResponse<SignInResult, 200> 
 | FetchResponse<ApiProblemDetailsOfAuthError, 400> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiAuthSignInPath = () => `/api/v1/auth/sign-in`;
+export const postAuthSignInPath = () => `/api/v1/auth/sign-in`;
 
-export const postApiAuthSignIn = (requestContract: SignInCommand, headers = new Headers()):
-  Promise<PostApiAuthSignInFetchResponse> => {
+export const postAuthSignIn = (requestContract: SignInCommand, headers = new Headers()):
+  Promise<PostAuthSignInFetchResponse> => {
     const requestData = getApiRequestData<SignInCommand>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiAuthSignInPath()}`, requestData, headers) as Promise<PostApiAuthSignInFetchResponse>;
+    return apiPost(`${getApiUrl()}${postAuthSignInPath()}`, requestData, headers) as Promise<PostAuthSignInFetchResponse>;
 }
 
-export type PostApiAuthTokenFetchResponse = 
+export type PostAuthTokenFetchResponse = 
 | FetchResponse<TokenResponse, 200> 
 | FetchResponse<ApiProblemDetailsOfAuthError, 400> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiAuthTokenPath = () => `/api/v1/auth/token`;
+export const postAuthTokenPath = () => `/api/v1/auth/token`;
 
-export const postApiAuthToken = (headers = new Headers()):
-  Promise<PostApiAuthTokenFetchResponse> => {
+export const postAuthToken = (headers = new Headers()):
+  Promise<PostAuthTokenFetchResponse> => {
     const requestData = getApiRequestData<object>(undefined, true);
 
-    return apiPost(`${getApiUrl()}${postApiAuthTokenPath()}`, requestData, headers) as Promise<PostApiAuthTokenFetchResponse>;
+    return apiPost(`${getApiUrl()}${postAuthTokenPath()}`, requestData, headers) as Promise<PostAuthTokenFetchResponse>;
 }
 
-export type PostApiAuthEmailVerificationFetchResponse = 
+export type PostAuthEmailVerificationFetchResponse = 
 | FetchResponse<EmailVerificationCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetailsOfEmailVerificationCommandResultStatus, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiAuthEmailVerificationPath = () => `/api/v1/auth/email-verification`;
+export const postAuthEmailVerificationPath = () => `/api/v1/auth/email-verification`;
 
-export const postApiAuthEmailVerification = (requestContract: EmailVerificationCommand, headers = new Headers()):
-  Promise<PostApiAuthEmailVerificationFetchResponse> => {
+export const postAuthEmailVerification = (requestContract: EmailVerificationCommand, headers = new Headers()):
+  Promise<PostAuthEmailVerificationFetchResponse> => {
     const requestData = getApiRequestData<EmailVerificationCommand>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiAuthEmailVerificationPath()}`, requestData, headers) as Promise<PostApiAuthEmailVerificationFetchResponse>;
+    return apiPost(`${getApiUrl()}${postAuthEmailVerificationPath()}`, requestData, headers) as Promise<PostAuthEmailVerificationFetchResponse>;
 }
 
-export type PostApiAuthEmailVerificationSendFetchResponse = 
+export type PostAuthEmailVerificationSendFetchResponse = 
 | FetchResponse<ResendVerificationEmailCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiAuthEmailVerificationSendPath = () => `/api/v1/auth/email-verification/send`;
+export const postAuthEmailVerificationSendPath = () => `/api/v1/auth/email-verification/send`;
 
-export const postApiAuthEmailVerificationSend = (requestContract: ResendVerificationEmailCommand, headers = new Headers()):
-  Promise<PostApiAuthEmailVerificationSendFetchResponse> => {
+export const postAuthEmailVerificationSend = (requestContract: ResendVerificationEmailCommand, headers = new Headers()):
+  Promise<PostAuthEmailVerificationSendFetchResponse> => {
     const requestData = getApiRequestData<ResendVerificationEmailCommand>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiAuthEmailVerificationSendPath()}`, requestData, headers) as Promise<PostApiAuthEmailVerificationSendFetchResponse>;
+    return apiPost(`${getApiUrl()}${postAuthEmailVerificationSendPath()}`, requestData, headers) as Promise<PostAuthEmailVerificationSendFetchResponse>;
 }
 
-export type PostApiAuthSsoFetchResponse = 
+export type PostAuthSsoFetchResponse = 
 | FetchResponse<SignInResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetailsOfAuthError, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiAuthSsoPath = () => `/api/v1/auth/sso`;
+export const postAuthSsoPath = () => `/api/v1/auth/sso`;
 
-export const postApiAuthSso = (requestContract: SsoSignInRequest, headers = new Headers()):
-  Promise<PostApiAuthSsoFetchResponse> => {
+export const postAuthSso = (requestContract: SsoSignInRequest, headers = new Headers()):
+  Promise<PostAuthSsoFetchResponse> => {
     const requestData = getApiRequestData<SsoSignInRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiAuthSsoPath()}`, requestData, headers) as Promise<PostApiAuthSsoFetchResponse>;
+    return apiPost(`${getApiUrl()}${postAuthSsoPath()}`, requestData, headers) as Promise<PostAuthSsoFetchResponse>;
 }
 
-export type GetApiAuthSsoTokenFetchResponse = 
+export type GetAuthSsoTokenFetchResponse = 
 | FetchResponse<RedirectHttpResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | FetchResponse<ApiProblemDetails, 501> 
 | ErrorResponse;
 
-export const getApiAuthSsoTokenPath = () => `/api/v1/auth/sso-token`;
+export const getAuthSsoTokenPath = () => `/api/v1/auth/sso-token`;
 
-export const getApiAuthSsoToken = (IdentityProvider?: IdentityProvider, headers = new Headers()):
-  Promise<GetApiAuthSsoTokenFetchResponse> => {
+export const getAuthSsoToken = (IdentityProvider?: IdentityProvider, headers = new Headers()):
+  Promise<GetAuthSsoTokenFetchResponse> => {
     const queryParams = {
       "IdentityProvider": IdentityProvider
     }
-    return apiGet(`${getApiUrl()}${getApiAuthSsoTokenPath()}`, headers, queryParams) as Promise<GetApiAuthSsoTokenFetchResponse>;
+    return apiGet(`${getApiUrl()}${getAuthSsoTokenPath()}`, headers, queryParams) as Promise<GetAuthSsoTokenFetchResponse>;
 }
 
-export type PostApiAuthPasswordResetFetchResponse = 
+export type PostAuthPasswordResetFetchResponse = 
 | FetchResponse<ResetPasswordCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetailsOfResetPasswordCommandResultStatus, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiAuthPasswordResetPath = () => `/api/v1/auth/password-reset`;
+export const postAuthPasswordResetPath = () => `/api/v1/auth/password-reset`;
 
-export const postApiAuthPasswordReset = (requestContract: ResetPasswordCommand, headers = new Headers()):
-  Promise<PostApiAuthPasswordResetFetchResponse> => {
+export const postAuthPasswordReset = (requestContract: ResetPasswordCommand, headers = new Headers()):
+  Promise<PostAuthPasswordResetFetchResponse> => {
     const requestData = getApiRequestData<ResetPasswordCommand>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiAuthPasswordResetPath()}`, requestData, headers) as Promise<PostApiAuthPasswordResetFetchResponse>;
+    return apiPost(`${getApiUrl()}${postAuthPasswordResetPath()}`, requestData, headers) as Promise<PostAuthPasswordResetFetchResponse>;
 }
 
-export type PutApiAuthPasswordFetchResponse = 
+export type PutAuthPasswordFetchResponse = 
 | FetchResponse<SetPasswordCommandResult, 200> 
 | FetchResponse<ApiProblemDetailsOfPasswordChangeResultStatus, 400> 
 | FetchResponse<ApiProblemDetails, 401> 
@@ -3708,11 +3708,11 @@ export type PutApiAuthPasswordFetchResponse =
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const putApiAuthPasswordPath = () => `/api/v1/auth/password`;
+export const putAuthPasswordPath = () => `/api/v1/auth/password`;
 
-export const putApiAuthPassword = (requestContract: SetPasswordCommand, headers = new Headers()):
-  Promise<PutApiAuthPasswordFetchResponse> => {
+export const putAuthPassword = (requestContract: SetPasswordCommand, headers = new Headers()):
+  Promise<PutAuthPasswordFetchResponse> => {
     const requestData = getApiRequestData<SetPasswordCommand>(requestContract, false);
 
-    return apiPut(`${getApiUrl()}${putApiAuthPasswordPath()}`, requestData, headers) as Promise<PutApiAuthPasswordFetchResponse>;
+    return apiPut(`${getApiUrl()}${putAuthPasswordPath()}`, requestData, headers) as Promise<PutAuthPasswordFetchResponse>;
 }
diff --git a/apps/cli/src/tests/__snapshots__/generate_nswag_angular.ts b/apps/cli/src/tests/__snapshots__/generate_nswag_angular.ts
index cae8746..ab0fe0c 100644
--- a/apps/cli/src/tests/__snapshots__/generate_nswag_angular.ts
+++ b/apps/cli/src/tests/__snapshots__/generate_nswag_angular.ts
@@ -1946,21 +1946,21 @@ export class ApiService {
       this.baseUrl = baseUrl ?? "";
   }
 
-  getApiWorkflowsSteps(): Observable<ResponseResult<EntityListOfStepDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  getWorkflowsSteps(): Observable<ResponseResult<EntityListOfStepDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<EntityListOfStepDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/workflows/steps`);
   }
 
-  getApiUserCompany(): Observable<ResponseResult<UserCompanyDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  getUserCompany(): Observable<ResponseResult<UserCompanyDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<UserCompanyDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/user/company`);
   }
 
-  putApiUserCompany(requestContract: UserCompanySetRequest): Observable<ResponseResult<SetUserCompanyCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  putUserCompany(requestContract: UserCompanySetRequest): Observable<ResponseResult<SetUserCompanyCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<UserCompanySetRequest>(requestContract, false);
 
     return apiPut<ResponseResult<SetUserCompanyCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/user/company`, requestData);
   }
 
-  getApiServicesPackages(offset?: number, limit?: number): Observable<ResponseResult<EntityListOfServicePackageListItemDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  getServicesPackages(offset?: number, limit?: number): Observable<ResponseResult<EntityListOfServicePackageListItemDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     const queryParams = {
       "offset": offset,
       "limit": limit
@@ -1968,7 +1968,7 @@ export class ApiService {
     return apiGet<ResponseResult<EntityListOfServicePackageListItemDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/services/packages`, queryParams);
   }
 
-  getApiServicesPackagesAvailableServices(offset?: number, limit?: number): Observable<ResponseResult<EntityListOfServiceListItemDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  getServicesPackagesAvailableServices(offset?: number, limit?: number): Observable<ResponseResult<EntityListOfServiceListItemDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     const queryParams = {
       "offset": offset,
       "limit": limit
@@ -1976,31 +1976,31 @@ export class ApiService {
     return apiGet<ResponseResult<EntityListOfServiceListItemDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/services/packages/available-services`, queryParams);
   }
 
-  postApiServicesPackage(requestContract: SaveServicePackageRequest): Observable<ResponseResult<CreateServicePackageCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  postServicesPackage(requestContract: SaveServicePackageRequest): Observable<ResponseResult<CreateServicePackageCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<SaveServicePackageRequest>(requestContract, false);
 
     return apiPost<ResponseResult<CreateServicePackageCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/services/package`, requestData);
   }
 
-  getApiServicesServicePublicIDPackage(servicePublicID: string): Observable<ResponseResult<ServicePackageDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ProblemDetails, 500>> {
+  getServicesServicePublicIDPackage(servicePublicID: string): Observable<ResponseResult<ServicePackageDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<ServicePackageDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/services/${servicePublicID}/package`);
   }
 
-  deleteApiServicesServicePublicIDPackage(servicePublicID: string): Observable<ResponseResult<ServicePackageDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  deleteServicesServicePublicIDPackage(servicePublicID: string): Observable<ResponseResult<ServicePackageDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     return apiDelete<ResponseResult<ServicePackageDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/services/${servicePublicID}/package`);
   }
 
-  putApiServicesServicePublicIDPackage(requestContract: SaveServicePackageRequest, servicePublicID: string): Observable<ResponseResult<UpdateServicePackageCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  putServicesServicePublicIDPackage(requestContract: SaveServicePackageRequest, servicePublicID: string): Observable<ResponseResult<UpdateServicePackageCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<SaveServicePackageRequest>(requestContract, false);
 
     return apiPut<ResponseResult<UpdateServicePackageCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/services/${servicePublicID}/package`, requestData);
   }
 
-  getApiPartiesPublicID(publicID: string): Observable<ResponseResult<PartyDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  getPartiesPublicID(publicID: string): Observable<ResponseResult<PartyDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<PartyDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/parties/${publicID}`);
   }
 
-  getApiPartiesSearchAres(query?: string, partyType?: PartyType | undefined | null): Observable<ResponseResult<PartyDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  getPartiesSearchAres(query?: string, partyType?: PartyType | undefined | null): Observable<ResponseResult<PartyDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     const queryParams = {
       "query": query,
       "partyType": partyType
@@ -2008,7 +2008,7 @@ export class ApiService {
     return apiGet<ResponseResult<PartyDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/parties/search/ares`, queryParams);
   }
 
-  getApiOrders(offset?: number, limit?: number, workflowStatuses?: string[], query?: string | undefined | null, startDate?: string | undefined | null, endDate?: string | undefined | null, isSearchInStructure?: boolean, onlyAfterInvoiceDueDate?: boolean, includeClientReminderAvailable?: boolean): Observable<ResponseResult<EntityListOfOrderListItemDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  getOrders(offset?: number, limit?: number, workflowStatuses?: string[], query?: string | undefined | null, startDate?: string | undefined | null, endDate?: string | undefined | null, isSearchInStructure?: boolean, onlyAfterInvoiceDueDate?: boolean, includeClientReminderAvailable?: boolean): Observable<ResponseResult<EntityListOfOrderListItemDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     const queryParams = {
       "offset": offset,
       "limit": limit,
@@ -2023,29 +2023,29 @@ export class ApiService {
     return apiGet<ResponseResult<EntityListOfOrderListItemDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders`, queryParams);
   }
 
-  getApiOrdersPublicID(publicID: string): Observable<ResponseResult<OrderDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  getOrdersPublicID(publicID: string): Observable<ResponseResult<OrderDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<OrderDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/${publicID}`);
   }
 
-  deleteApiOrdersPublicID(publicID: string): Observable<ResponseResult<DeleteOrderCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  deleteOrdersPublicID(publicID: string): Observable<ResponseResult<DeleteOrderCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     return apiDelete<ResponseResult<DeleteOrderCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/${publicID}`);
   }
 
-  putApiOrdersPublicIDPeriodicity(requestContract: SetPeriodicityRequest, publicID: string): Observable<ResponseResult<SetPeriodicityCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  putOrdersPublicIDPeriodicity(requestContract: SetPeriodicityRequest, publicID: string): Observable<ResponseResult<SetPeriodicityCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<SetPeriodicityRequest>(requestContract, false);
 
     return apiPut<ResponseResult<SetPeriodicityCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/${publicID}/periodicity`, requestData);
   }
 
-  getApiOrdersPublicIDServices(publicID: string): Observable<ResponseResult<EntityListOfOrderServiceDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  getOrdersPublicIDServices(publicID: string): Observable<ResponseResult<EntityListOfOrderServiceDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<EntityListOfOrderServiceDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/${publicID}/services`);
   }
 
-  deleteApiOrdersServicesServiceID(serviceID: number): Observable<ResponseResult<DeleteOrderServiceCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  deleteOrdersServicesServiceID(serviceID: number): Observable<ResponseResult<DeleteOrderServiceCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     return apiDelete<ResponseResult<DeleteOrderServiceCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/services/${serviceID}`);
   }
 
-  getApiOrdersPeriodicUpcoming(offset?: number, limit?: number, nexOrderDate?: string): Observable<ResponseResult<EntityListOfUpcomingPeriodicOrderDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  getOrdersPeriodicUpcoming(offset?: number, limit?: number, nexOrderDate?: string): Observable<ResponseResult<EntityListOfUpcomingPeriodicOrderDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     const queryParams = {
       "offset": offset,
       "limit": limit,
@@ -2054,186 +2054,186 @@ export class ApiService {
     return apiGet<ResponseResult<EntityListOfUpcomingPeriodicOrderDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/periodic/upcoming`, queryParams);
   }
 
-  getApiOrdersRevocationExampleFile(): Observable<ResponseResult<File, 200> | ResponseResult<ApiProblemDetails, 204> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  getOrdersRevocationExampleFile(): Observable<ResponseResult<File, 200> | ResponseResult<ApiProblemDetails, 204> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<File, 200> | ResponseResult<ApiProblemDetails, 204> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/revocation/example/file`);
   }
 
-  getApiOrdersPublicIDPaymentCalendarItems(publicID: string): Observable<ResponseResult<EntityListOfPaymentCalendarItemDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  getOrdersPublicIDPaymentCalendarItems(publicID: string): Observable<ResponseResult<EntityListOfPaymentCalendarItemDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<EntityListOfPaymentCalendarItemDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/${publicID}/payment-calendar-items`);
   }
 
-  getApiOrdersCount(onlyActive?: boolean): Observable<ResponseResult<GetOrdersCountQueryResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  getOrdersCount(onlyActive?: boolean): Observable<ResponseResult<GetOrdersCountQueryResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     const queryParams = {
       "onlyActive": onlyActive
     };
     return apiGet<ResponseResult<GetOrdersCountQueryResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/count`, queryParams);
   }
 
-  postApiOrdersOrderPublicIDClientInvoiceRecurringPaymentCreateInvoiceAndSetAsPaidByClient(requestContract: ClientInvoiceRecurringPaymentCreateInvoiceAndSetAsPaidByClientRequest, orderPublicID: string): Observable<ResponseResult<SetPeriodicityCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  postOrdersOrderPublicIDClientInvoiceRecurringPaymentCreateInvoiceAndSetAsPaidByClient(requestContract: ClientInvoiceRecurringPaymentCreateInvoiceAndSetAsPaidByClientRequest, orderPublicID: string): Observable<ResponseResult<SetPeriodicityCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<ClientInvoiceRecurringPaymentCreateInvoiceAndSetAsPaidByClientRequest>(requestContract, false);
 
     return apiPost<ResponseResult<SetPeriodicityCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/${orderPublicID}/client-invoice-recurring-payment-create-invoice-and-set-as-paid-by-client`, requestData);
   }
 
-  getApiOrdersPublicIDClientZonePaymentCalendarItems(publicID: string): Observable<ResponseResult<EntityListOfPaymentCalendarClientZoneItemDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  getOrdersPublicIDClientZonePaymentCalendarItems(publicID: string): Observable<ResponseResult<EntityListOfPaymentCalendarClientZoneItemDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<EntityListOfPaymentCalendarClientZoneItemDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/${publicID}/client-zone/payment-calendar-items`);
   }
 
-  getApiOrdersPublicIDOrderServiceOrderServiceIDEucsOrderInfo(publicID: string, orderServiceID: number): Observable<ResponseResult<GetEucsOrderInfoQueryResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  getOrdersPublicIDOrderServiceOrderServiceIDEucsOrderInfo(publicID: string, orderServiceID: number): Observable<ResponseResult<GetEucsOrderInfoQueryResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<GetEucsOrderInfoQueryResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/${publicID}/order-service/${orderServiceID}/eucs-order/info`);
   }
 
-  postApiOrdersPublicIDOrderServiceOrderServiceIDProductCancel(requestContract: CancelProductInInstitutionCommandRequest, publicID: string, orderServiceID: number): Observable<ResponseResult<CancelProductInInstitutionCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ApiProblemDetails, 500>> {
+  postOrdersPublicIDOrderServiceOrderServiceIDProductCancel(requestContract: CancelProductInInstitutionCommandRequest, publicID: string, orderServiceID: number): Observable<ResponseResult<CancelProductInInstitutionCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ApiProblemDetails, 500>> {
     const requestData = getApiRequestData<CancelProductInInstitutionCommandRequest>(requestContract, false);
 
     return apiPost<ResponseResult<CancelProductInInstitutionCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ApiProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/${publicID}/order-service/${orderServiceID}/product/cancel`, requestData);
   }
 
-  postApiOrdersPublicIDOrderServiceOrderServiceIDProductCreate(requestContract: CreateProductInInstitutionRequest, publicID: string, orderServiceID: number): Observable<ResponseResult<CreateProductInInstitutionCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ApiProblemDetails, 500>> {
+  postOrdersPublicIDOrderServiceOrderServiceIDProductCreate(requestContract: CreateProductInInstitutionRequest, publicID: string, orderServiceID: number): Observable<ResponseResult<CreateProductInInstitutionCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ApiProblemDetails, 500>> {
     const requestData = getApiRequestData<CreateProductInInstitutionRequest>(requestContract, false);
 
     return apiPost<ResponseResult<CreateProductInInstitutionCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ApiProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/${publicID}/order-service/${orderServiceID}/product/create`, requestData);
   }
 
-  getApiOrdersPublicIDWorkflowSteps(publicID: string): Observable<ResponseResult<EntityListOfOrderWorkflowStepDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  getOrdersPublicIDWorkflowSteps(publicID: string): Observable<ResponseResult<EntityListOfOrderWorkflowStepDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<EntityListOfOrderWorkflowStepDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/${publicID}/workflow/steps`);
   }
 
-  postApiOrdersWorkflowDraft(requestContract: SaveDraftRequest): Observable<ResponseResult<SaveDraftCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  postOrdersWorkflowDraft(requestContract: SaveDraftRequest): Observable<ResponseResult<SaveDraftCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<SaveDraftRequest>(requestContract, false);
 
     return apiPost<ResponseResult<SaveDraftCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/workflow/draft`, requestData);
   }
 
-  postApiOrdersPublicIDWorkflowDraftComplete(publicID: string): Observable<ResponseResult<DraftStepCompleteCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  postOrdersPublicIDWorkflowDraftComplete(publicID: string): Observable<ResponseResult<DraftStepCompleteCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<object>(undefined, false);
 
     return apiPost<ResponseResult<DraftStepCompleteCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/${publicID}/workflow/draft/complete`, requestData);
   }
 
-  getApiOrdersWorkflowClientReviewTokenSummary(token: string): Observable<ResponseResult<GetClientReviewSummaryQueryResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  getOrdersWorkflowClientReviewTokenSummary(token: string): Observable<ResponseResult<GetClientReviewSummaryQueryResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<GetClientReviewSummaryQueryResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/workflow/client-review/${token}/summary`);
   }
 
-  postApiOrdersPublicIDWorkflowClientReviewReminder(publicID: string): Observable<ResponseResult<SendReminderCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  postOrdersPublicIDWorkflowClientReviewReminder(publicID: string): Observable<ResponseResult<SendReminderCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<object>(undefined, false);
 
     return apiPost<ResponseResult<SendReminderCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/${publicID}/workflow/client-review/reminder`, requestData);
   }
 
-  postApiOrdersWorkflowClientApprovalTokenReject(requestContract: ClientApprovalRejectRequest, token: string): Observable<ResponseResult<ClientApprovalStepRejectCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  postOrdersWorkflowClientApprovalTokenReject(requestContract: ClientApprovalRejectRequest, token: string): Observable<ResponseResult<ClientApprovalStepRejectCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<ClientApprovalRejectRequest>(requestContract, false);
 
     return apiPost<ResponseResult<ClientApprovalStepRejectCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/workflow/client-approval/${token}/reject`, requestData);
   }
 
-  putApiOrdersWorkflowClientApprovalTokenInProgress(token: string): Observable<ResponseResult<ClientApprovalStepInitCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  putOrdersWorkflowClientApprovalTokenInProgress(token: string): Observable<ResponseResult<ClientApprovalStepInitCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<object>(undefined, false);
 
     return apiPut<ResponseResult<ClientApprovalStepInitCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/workflow/client-approval/${token}/in-progress`, requestData);
   }
 
-  postApiOrdersWorkflowClientApprovalTokenComplete(requestContract: ClientApprovalCompleteRequest, token: string): Observable<ResponseResult<CompleteClientApprovalStepCommandResult, 200> | ResponseResult<ApiProblemDetailsOfCompleteClientApprovalStepError, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  postOrdersWorkflowClientApprovalTokenComplete(requestContract: ClientApprovalCompleteRequest, token: string): Observable<ResponseResult<CompleteClientApprovalStepCommandResult, 200> | ResponseResult<ApiProblemDetailsOfCompleteClientApprovalStepError, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<ClientApprovalCompleteRequest>(requestContract, false);
 
     return apiPost<ResponseResult<CompleteClientApprovalStepCommandResult, 200> | ResponseResult<ApiProblemDetailsOfCompleteClientApprovalStepError, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/workflow/client-approval/${token}/complete`, requestData);
   }
 
-  postApiOrdersPublicIDWorkflowProcessingServicesOrderServiceIDComplete(publicID: string, orderServiceID: number): Observable<ResponseResult<OrderServiceCompleteCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  postOrdersPublicIDWorkflowProcessingServicesOrderServiceIDComplete(publicID: string, orderServiceID: number): Observable<ResponseResult<OrderServiceCompleteCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<object>(undefined, false);
 
     return apiPost<ResponseResult<OrderServiceCompleteCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/${publicID}/workflow/processing-services/${orderServiceID}/complete`, requestData);
   }
 
-  postApiOrdersPublicIDWorkflowInvoiceIssuanceComplete(publicID: string): Observable<ResponseResult<InvoiceIssuanceStepCompleteCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  postOrdersPublicIDWorkflowInvoiceIssuanceComplete(publicID: string): Observable<ResponseResult<InvoiceIssuanceStepCompleteCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<object>(undefined, false);
 
     return apiPost<ResponseResult<InvoiceIssuanceStepCompleteCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/${publicID}/workflow/invoice-issuance/complete`, requestData);
   }
 
-  postApiOrdersPublicIDWorkflowInvoicePaymentComplete(publicID: string): Observable<ResponseResult<InvoicePaymentStepCompleteCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  postOrdersPublicIDWorkflowInvoicePaymentComplete(publicID: string): Observable<ResponseResult<InvoicePaymentStepCompleteCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<object>(undefined, false);
 
     return apiPost<ResponseResult<InvoicePaymentStepCompleteCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/${publicID}/workflow/invoice-payment/complete`, requestData);
   }
 
-  postApiOrdersPublicIDWorkflowInvoicePaymentReminder(publicID: string): Observable<ResponseResult<InvoicePaymentStepReminderCommand, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  postOrdersPublicIDWorkflowInvoicePaymentReminder(publicID: string): Observable<ResponseResult<InvoicePaymentStepReminderCommand, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<object>(undefined, false);
 
     return apiPost<ResponseResult<InvoicePaymentStepReminderCommand, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/${publicID}/workflow/invoice-payment/reminder`, requestData);
   }
 
-  getApiOrdersPublicIDWorkflowEnterpriseInvoiceIssuanceAndPayment(publicID: string): Observable<ResponseResult<EnterpriseInvoiceIssuanceAndPaymentStepQueryResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  getOrdersPublicIDWorkflowEnterpriseInvoiceIssuanceAndPayment(publicID: string): Observable<ResponseResult<EnterpriseInvoiceIssuanceAndPaymentStepQueryResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<EnterpriseInvoiceIssuanceAndPaymentStepQueryResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/${publicID}/workflow/enterprise-invoice-issuance-and-payment`);
   }
 
-  postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDCancel(publicID: string, paymentCalendarItemID: number): Observable<ResponseResult<ClientInvoiceRecurringPaymentCancelCommandResult, 200> | ResponseResult<ApiProblemDetailsOfClientInvoiceRecurringPaymentCancelErrorStatus, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDCancel(publicID: string, paymentCalendarItemID: number): Observable<ResponseResult<ClientInvoiceRecurringPaymentCancelCommandResult, 200> | ResponseResult<ApiProblemDetailsOfClientInvoiceRecurringPaymentCancelErrorStatus, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<object>(undefined, false);
 
     return apiPost<ResponseResult<ClientInvoiceRecurringPaymentCancelCommandResult, 200> | ResponseResult<ApiProblemDetailsOfClientInvoiceRecurringPaymentCancelErrorStatus, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/${publicID}/workflow/client-invoice-recurring-payment/${paymentCalendarItemID}/cancel`, requestData);
   }
 
-  postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDReminder(publicID: string, paymentCalendarItemID: number): Observable<ResponseResult<ClientInvoiceRecurringPaymentReminderCommandResult, 200> | ResponseResult<ApiProblemDetailsOfClientInvoiceRecurringPaymentReminderErrorStatus, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDReminder(publicID: string, paymentCalendarItemID: number): Observable<ResponseResult<ClientInvoiceRecurringPaymentReminderCommandResult, 200> | ResponseResult<ApiProblemDetailsOfClientInvoiceRecurringPaymentReminderErrorStatus, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<object>(undefined, false);
 
     return apiPost<ResponseResult<ClientInvoiceRecurringPaymentReminderCommandResult, 200> | ResponseResult<ApiProblemDetailsOfClientInvoiceRecurringPaymentReminderErrorStatus, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/${publicID}/workflow/client-invoice-recurring-payment/${paymentCalendarItemID}/reminder`, requestData);
   }
 
-  postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidReminder(publicID: string, paymentCalendarItemID: number): Observable<ResponseResult<ClientPrepaidInvoiceRecurringPaymentReminderCommandResult, 200> | ResponseResult<ApiProblemDetailsOfClientPrepaidInvoiceRecurringPaymentReminderErrorStatus, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidReminder(publicID: string, paymentCalendarItemID: number): Observable<ResponseResult<ClientPrepaidInvoiceRecurringPaymentReminderCommandResult, 200> | ResponseResult<ApiProblemDetailsOfClientPrepaidInvoiceRecurringPaymentReminderErrorStatus, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<object>(undefined, false);
 
     return apiPost<ResponseResult<ClientPrepaidInvoiceRecurringPaymentReminderCommandResult, 200> | ResponseResult<ApiProblemDetailsOfClientPrepaidInvoiceRecurringPaymentReminderErrorStatus, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/${publicID}/workflow/client-invoice-recurring-payment/${paymentCalendarItemID}/prepaid/reminder`, requestData);
   }
 
-  postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDSendInvoice(publicID: string, paymentCalendarItemID: number): Observable<ResponseResult<ClientInvoiceRecurringPaymentCreateInvoiceCommandResult, 200> | ResponseResult<ApiProblemDetailsOfClientInvoiceRecurringPaymentCreateAndSendInvoiceToClientErrorStatus, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDSendInvoice(publicID: string, paymentCalendarItemID: number): Observable<ResponseResult<ClientInvoiceRecurringPaymentCreateInvoiceCommandResult, 200> | ResponseResult<ApiProblemDetailsOfClientInvoiceRecurringPaymentCreateAndSendInvoiceToClientErrorStatus, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<object>(undefined, false);
 
     return apiPost<ResponseResult<ClientInvoiceRecurringPaymentCreateInvoiceCommandResult, 200> | ResponseResult<ApiProblemDetailsOfClientInvoiceRecurringPaymentCreateAndSendInvoiceToClientErrorStatus, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/${publicID}/workflow/client-invoice-recurring-payment/${paymentCalendarItemID}/send-invoice`, requestData);
   }
 
-  postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPay(requestContract: ClientInvoiceRecurringPaymentClientPaidRequest, publicID: string, paymentCalendarItemID: number): Observable<ResponseResult<ClientInvoiceRecurringPaymentClientPaidCommandResult, 200> | ResponseResult<ApiProblemDetailsOfClientInvoiceRecurringPaymentClientPaidErrorStatus, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPay(requestContract: ClientInvoiceRecurringPaymentClientPaidRequest, publicID: string, paymentCalendarItemID: number): Observable<ResponseResult<ClientInvoiceRecurringPaymentClientPaidCommandResult, 200> | ResponseResult<ApiProblemDetailsOfClientInvoiceRecurringPaymentClientPaidErrorStatus, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<ClientInvoiceRecurringPaymentClientPaidRequest>(requestContract, false);
 
     return apiPost<ResponseResult<ClientInvoiceRecurringPaymentClientPaidCommandResult, 200> | ResponseResult<ApiProblemDetailsOfClientInvoiceRecurringPaymentClientPaidErrorStatus, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/${publicID}/workflow/client-invoice-recurring-payment/${paymentCalendarItemID}/pay`, requestData);
   }
 
-  postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidSendInvoiceAndPay(requestContract: ClientPrepaidInvoiceRecurringPaymentSendInvoiceAndSetPaidRequest, publicID: string, paymentCalendarItemID: number): Observable<ResponseResult<ClientPrepaidInvoiceRecurringPaymentSendInvoiceAndSetPaidCommandResult, 200> | ResponseResult<ApiProblemDetailsOfClientPrepaidInvoiceRecurringPaymentSendInvoiceAndSetPaidErrorStatus, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidSendInvoiceAndPay(requestContract: ClientPrepaidInvoiceRecurringPaymentSendInvoiceAndSetPaidRequest, publicID: string, paymentCalendarItemID: number): Observable<ResponseResult<ClientPrepaidInvoiceRecurringPaymentSendInvoiceAndSetPaidCommandResult, 200> | ResponseResult<ApiProblemDetailsOfClientPrepaidInvoiceRecurringPaymentSendInvoiceAndSetPaidErrorStatus, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<ClientPrepaidInvoiceRecurringPaymentSendInvoiceAndSetPaidRequest>(requestContract, false);
 
     return apiPost<ResponseResult<ClientPrepaidInvoiceRecurringPaymentSendInvoiceAndSetPaidCommandResult, 200> | ResponseResult<ApiProblemDetailsOfClientPrepaidInvoiceRecurringPaymentSendInvoiceAndSetPaidErrorStatus, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/${publicID}/workflow/client-invoice-recurring-payment/${paymentCalendarItemID}/prepaid/send-invoice-and-pay`, requestData);
   }
 
-  postApiOrdersPublicIDWorkflowClientAssignmentSendAssignmentEmail(publicID: string): Observable<ResponseResult<SendClientAssignmentEmailCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  postOrdersPublicIDWorkflowClientAssignmentSendAssignmentEmail(publicID: string): Observable<ResponseResult<SendClientAssignmentEmailCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<object>(undefined, false);
 
     return apiPost<ResponseResult<SendClientAssignmentEmailCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/${publicID}/workflow/client-assignment/send-assignment-email`, requestData);
   }
 
-  postApiOrdersPublicIDWorkflowClientPrepaidPaymentApprovalComplete(requestContract: ClientPrepaidPaymentApprovalStepCompleteCommandRequest, publicID: string): Observable<ResponseResult<ClientPrepaidPaymentApprovalStepCompleteCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  postOrdersPublicIDWorkflowClientPrepaidPaymentApprovalComplete(requestContract: ClientPrepaidPaymentApprovalStepCompleteCommandRequest, publicID: string): Observable<ResponseResult<ClientPrepaidPaymentApprovalStepCompleteCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<ClientPrepaidPaymentApprovalStepCompleteCommandRequest>(requestContract, false);
 
     return apiPost<ResponseResult<ClientPrepaidPaymentApprovalStepCompleteCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/${publicID}/workflow/client-prepaid-payment-approval/complete`, requestData);
   }
 
-  postApiOrdersWorkflowClientPrepaidPaymentApprovalTokenInProgress(requestContract: ClientPrepaidPaymentApprovalStepInProgressRequest, token: string): Observable<ResponseResult<ClientPrepaidPaymentApprovalStepInProgressCommandResult, 200> | ResponseResult<ApiProblemDetailsOfInProgressClientApprovalStepError, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  postOrdersWorkflowClientPrepaidPaymentApprovalTokenInProgress(requestContract: ClientPrepaidPaymentApprovalStepInProgressRequest, token: string): Observable<ResponseResult<ClientPrepaidPaymentApprovalStepInProgressCommandResult, 200> | ResponseResult<ApiProblemDetailsOfInProgressClientApprovalStepError, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<ClientPrepaidPaymentApprovalStepInProgressRequest>(requestContract, false);
 
     return apiPost<ResponseResult<ClientPrepaidPaymentApprovalStepInProgressCommandResult, 200> | ResponseResult<ApiProblemDetailsOfInProgressClientApprovalStepError, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/workflow/client-prepaid-payment-approval/${token}/in-progress`, requestData);
   }
 
-  postApiOrdersWorkflowClientPrepaidPaymentApprovalTokenReject(requestContract: ClientPrepaidPaymentApprovalStepRejectRequest, token: string): Observable<ResponseResult<ClientPrepaidPaymentApprovalStepRejectCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  postOrdersWorkflowClientPrepaidPaymentApprovalTokenReject(requestContract: ClientPrepaidPaymentApprovalStepRejectRequest, token: string): Observable<ResponseResult<ClientPrepaidPaymentApprovalStepRejectCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<ClientPrepaidPaymentApprovalStepRejectRequest>(requestContract, false);
 
     return apiPost<ResponseResult<ClientPrepaidPaymentApprovalStepRejectCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/orders/workflow/client-prepaid-payment-approval/${token}/reject`, requestData);
   }
 
-  putApiNotificationsUserSettings(requestContract: UserNotificationUpdateRequest): Observable<ResponseResult<SaveUserNotificationSettingsCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  putNotificationsUserSettings(requestContract: UserNotificationUpdateRequest): Observable<ResponseResult<SaveUserNotificationSettingsCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<UserNotificationUpdateRequest>(requestContract, false);
 
     return apiPut<ResponseResult<SaveUserNotificationSettingsCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/notifications/user-settings`, requestData);
   }
 
-  getApiInvoicesUserInvoices(offset?: number, limit?: number): Observable<ResponseResult<EntityListOfInvoiceForSupplierCompanyByUserListItemDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  getInvoicesUserInvoices(offset?: number, limit?: number): Observable<ResponseResult<EntityListOfInvoiceForSupplierCompanyByUserListItemDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     const queryParams = {
       "offset": offset,
       "limit": limit
@@ -2241,64 +2241,64 @@ export class ApiService {
     return apiGet<ResponseResult<EntityListOfInvoiceForSupplierCompanyByUserListItemDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/invoices/user-invoices`, queryParams);
   }
 
-  getApiInvoicesPublicID(publicID: string): Observable<ResponseResult<InvoiceDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  getInvoicesPublicID(publicID: string): Observable<ResponseResult<InvoiceDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<InvoiceDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/invoices/${publicID}`);
   }
 
-  getApiInvoicesPublicIDISDOC(publicID: string): Observable<ResponseResult<InvoiceISDOCDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  getInvoicesPublicIDISDOC(publicID: string): Observable<ResponseResult<InvoiceISDOCDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<InvoiceISDOCDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/invoices/${publicID}/ISDOC`);
   }
 
-  getApiInvoicesPublicIDISDOCPdf(publicID: string): Observable<ResponseResult<InvoiceISDOCPdfBase64Dto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  getInvoicesPublicIDISDOCPdf(publicID: string): Observable<ResponseResult<InvoiceISDOCPdfBase64Dto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<InvoiceISDOCPdfBase64Dto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/invoices/${publicID}/ISDOCPdf`);
   }
 
-  getApiInvoicesInvoiceForSupplierCompanyByUserISDOCPdf(InvoicePublicIDs?: string[]): Observable<ResponseResult<InvoiceForSupplierCompanyByUserISDOCPdfBase64ListDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  getInvoicesInvoiceForSupplierCompanyByUserISDOCPdf(InvoicePublicIDs?: string[]): Observable<ResponseResult<InvoiceForSupplierCompanyByUserISDOCPdfBase64ListDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     const queryParams = {
       "InvoicePublicIDs": InvoicePublicIDs
     };
     return apiGet<ResponseResult<InvoiceForSupplierCompanyByUserISDOCPdfBase64ListDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/invoices/invoice-for-supplier-company-by-user/ISDOCPdf`, queryParams);
   }
 
-  postApiInvoicesInvoiceForClientByOrderPublicIDCancel(publicID: string): Observable<ResponseResult<CancelInvoiceForClientByOrderCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  postInvoicesInvoiceForClientByOrderPublicIDCancel(publicID: string): Observable<ResponseResult<CancelInvoiceForClientByOrderCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<object>(undefined, false);
 
     return apiPost<ResponseResult<CancelInvoiceForClientByOrderCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/invoices/invoice-for-client-by-order/${publicID}/cancel`, requestData);
   }
 
-  postApiEnterprises(requestContract: CreateEnterpriseRequest): Observable<ResponseResult<void, 204> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  postEnterprises(requestContract: CreateEnterpriseRequest): Observable<ResponseResult<void, 204> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<CreateEnterpriseRequest>(requestContract, false);
 
     return apiPost<ResponseResult<void, 204> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/enterprises`, requestData);
   }
 
-  postApiEnterprisesChangeMode(requestContract: EnterpriseModeChangeRequest): Observable<ResponseResult<ChangeEnterpriseModeCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ChangeEnterpriseModeCommandResult, 403> | ResponseResult<ProblemDetails, 500>> {
+  postEnterprisesChangeMode(requestContract: EnterpriseModeChangeRequest): Observable<ResponseResult<ChangeEnterpriseModeCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ChangeEnterpriseModeCommandResult, 403> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<EnterpriseModeChangeRequest>(requestContract, false);
 
     return apiPost<ResponseResult<ChangeEnterpriseModeCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ChangeEnterpriseModeCommandResult, 403> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/enterprises/change-mode`, requestData);
   }
 
-  putApiEnterprisesDesignSettings(requestContract: EnterpriseDesignSettingsUpdateRequest): Observable<ResponseResult<SaveEnterpriseDesignSettingsCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ChangeEnterpriseModeCommandResult, 403> | ResponseResult<ProblemDetails, 500>> {
+  putEnterprisesDesignSettings(requestContract: EnterpriseDesignSettingsUpdateRequest): Observable<ResponseResult<SaveEnterpriseDesignSettingsCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ChangeEnterpriseModeCommandResult, 403> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<EnterpriseDesignSettingsUpdateRequest>(requestContract, false);
 
     return apiPut<ResponseResult<SaveEnterpriseDesignSettingsCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ChangeEnterpriseModeCommandResult, 403> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/enterprises/design-settings`, requestData);
   }
 
-  putApiEnterprisesCommunicationSettings(requestContract: EnterpriseCommunicationSettingsUpdateRequest): Observable<ResponseResult<SaveEnterpriseCommunicationSettingsCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  putEnterprisesCommunicationSettings(requestContract: EnterpriseCommunicationSettingsUpdateRequest): Observable<ResponseResult<SaveEnterpriseCommunicationSettingsCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<EnterpriseCommunicationSettingsUpdateRequest>(requestContract, false);
 
     return apiPut<ResponseResult<SaveEnterpriseCommunicationSettingsCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/enterprises/communication-settings`, requestData);
   }
 
-  getApiEnterprisesBasicSettings(): Observable<ResponseResult<EnterpriseBasicSettingsDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  getEnterprisesBasicSettings(): Observable<ResponseResult<EnterpriseBasicSettingsDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<EnterpriseBasicSettingsDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/enterprises/basic-settings`);
   }
 
-  getApiEnterprisesExternalIDBasicSettings(externalID: string): Observable<ResponseResult<EnterpriseBasicSettingsDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  getEnterprisesExternalIDBasicSettings(externalID: string): Observable<ResponseResult<EnterpriseBasicSettingsDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<EnterpriseBasicSettingsDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/enterprises/${externalID}/basic-settings`);
   }
 
-  getApiEnterprisesCommissionSettings(offset?: number, limit?: number): Observable<ResponseResult<EntityListOfEnterpriseCommissionSettingsListItemDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ChangeEnterpriseModeCommandResult, 403> | ResponseResult<ProblemDetails, 500>> {
+  getEnterprisesCommissionSettings(offset?: number, limit?: number): Observable<ResponseResult<EntityListOfEnterpriseCommissionSettingsListItemDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ChangeEnterpriseModeCommandResult, 403> | ResponseResult<ProblemDetails, 500>> {
     const queryParams = {
       "offset": offset,
       "limit": limit
@@ -2306,63 +2306,63 @@ export class ApiService {
     return apiGet<ResponseResult<EntityListOfEnterpriseCommissionSettingsListItemDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ChangeEnterpriseModeCommandResult, 403> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/enterprises/commission-settings`, queryParams);
   }
 
-  postApiEnterprisesCommissionSettings(requestContract: CreateEnterpriseCommissionSettingsRequest): Observable<ResponseResult<CreateEnterpriseCommissionSettingsCommandResult, 200> | ResponseResult<ApiProblemDetailsOfCreateEnterpriseCommissionSettingsErrorStatus, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ChangeEnterpriseModeCommandResult, 403> | ResponseResult<ProblemDetails, 500>> {
+  postEnterprisesCommissionSettings(requestContract: CreateEnterpriseCommissionSettingsRequest): Observable<ResponseResult<CreateEnterpriseCommissionSettingsCommandResult, 200> | ResponseResult<ApiProblemDetailsOfCreateEnterpriseCommissionSettingsErrorStatus, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ChangeEnterpriseModeCommandResult, 403> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<CreateEnterpriseCommissionSettingsRequest>(requestContract, false);
 
     return apiPost<ResponseResult<CreateEnterpriseCommissionSettingsCommandResult, 200> | ResponseResult<ApiProblemDetailsOfCreateEnterpriseCommissionSettingsErrorStatus, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ChangeEnterpriseModeCommandResult, 403> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/enterprises/commission-settings`, requestData);
   }
 
-  getApiEnterprisesServiceSettings(): Observable<ResponseResult<EnterpriseServiceSettingsDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  getEnterprisesServiceSettings(): Observable<ResponseResult<EnterpriseServiceSettingsDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<EnterpriseServiceSettingsDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/enterprises/service-settings`);
   }
 
-  putApiEnterprisesServiceSettings(requestContract: EnterpriseServiceSettingsUpdateRequest): Observable<ResponseResult<SaveEnterpriseServiceSettingsCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ChangeEnterpriseModeCommandResult, 403> | ResponseResult<ProblemDetails, 500>> {
+  putEnterprisesServiceSettings(requestContract: EnterpriseServiceSettingsUpdateRequest): Observable<ResponseResult<SaveEnterpriseServiceSettingsCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ChangeEnterpriseModeCommandResult, 403> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<EnterpriseServiceSettingsUpdateRequest>(requestContract, false);
 
     return apiPut<ResponseResult<SaveEnterpriseServiceSettingsCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ChangeEnterpriseModeCommandResult, 403> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/enterprises/service-settings`, requestData);
   }
 
-  getApiEnterprisesServices(): Observable<ResponseResult<EnterpriseServiceListItemDto[], 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  getEnterprisesServices(): Observable<ResponseResult<EnterpriseServiceListItemDto[], 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<EnterpriseServiceListItemDto[], 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/enterprises/services`);
   }
 
-  putApiEnterprisesServices(requestContract: EnterpriseServicesUpdateRequest): Observable<ResponseResult<SaveEnterpriseServicesCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ProblemDetails, 500>> {
+  putEnterprisesServices(requestContract: EnterpriseServicesUpdateRequest): Observable<ResponseResult<SaveEnterpriseServicesCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<EnterpriseServicesUpdateRequest>(requestContract, false);
 
     return apiPut<ResponseResult<SaveEnterpriseServicesCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/enterprises/services`, requestData);
   }
 
-  getApiEnterprisesLogo(): Observable<ResponseResult<EnterpriseLogoDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  getEnterprisesLogo(): Observable<ResponseResult<EnterpriseLogoDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<EnterpriseLogoDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/enterprises/logo`);
   }
 
-  getApiEnterprisesPublicIDLogoJson(publicID: string): Observable<ResponseResult<EnterpriseLogoDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  getEnterprisesPublicIDLogoJson(publicID: string): Observable<ResponseResult<EnterpriseLogoDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<EnterpriseLogoDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/enterprises/${publicID}/logo/json`);
   }
 
-  getApiEnterprisesPublicIDLogoFile(publicID: string): Observable<ResponseResult<File, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  getEnterprisesPublicIDLogoFile(publicID: string): Observable<ResponseResult<File, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<File, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/enterprises/${publicID}/logo/file`);
   }
 
-  getApiEnterprisesPublicIDLogoTenantFile(publicID: string): Observable<ResponseResult<File, 200> | ResponseResult<ApiProblemDetails, 204> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  getEnterprisesPublicIDLogoTenantFile(publicID: string): Observable<ResponseResult<File, 200> | ResponseResult<ApiProblemDetails, 204> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<File, 200> | ResponseResult<ApiProblemDetails, 204> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/enterprises/${publicID}/logo/tenant/file`);
   }
 
-  getApiEnterprisesPublicIDDesignSettings(publicID: string): Observable<ResponseResult<EnterpriseDesignSettingsDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  getEnterprisesPublicIDDesignSettings(publicID: string): Observable<ResponseResult<EnterpriseDesignSettingsDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<EnterpriseDesignSettingsDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/enterprises/${publicID}/design-settings`);
   }
 
-  getApiEnterprisesPackageServiceSettings(): Observable<ResponseResult<EnterprisePackageServiceSettingsDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  getEnterprisesPackageServiceSettings(): Observable<ResponseResult<EnterprisePackageServiceSettingsDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<EnterprisePackageServiceSettingsDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/enterprises/package-service-settings`);
   }
 
-  putApiEnterprisesPackageServiceSettings(requestContract: EnterprisePackageServiceSettingsUpdateRequest): Observable<ResponseResult<SaveEnterprisePackageServiceSettingsCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  putEnterprisesPackageServiceSettings(requestContract: EnterprisePackageServiceSettingsUpdateRequest): Observable<ResponseResult<SaveEnterprisePackageServiceSettingsCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<EnterprisePackageServiceSettingsUpdateRequest>(requestContract, false);
 
     return apiPut<ResponseResult<SaveEnterprisePackageServiceSettingsCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/enterprises/package-service-settings`, requestData);
   }
 
-  getApiCutoffs(offset?: number, limit?: number): Observable<ResponseResult<EntityListOfCutoffListItemDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ProblemDetails, 500>> {
+  getCutoffs(offset?: number, limit?: number): Observable<ResponseResult<EntityListOfCutoffListItemDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ProblemDetails, 500>> {
     const queryParams = {
       "offset": offset,
       "limit": limit
@@ -2370,174 +2370,174 @@ export class ApiService {
     return apiGet<ResponseResult<EntityListOfCutoffListItemDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/cutoffs`, queryParams);
   }
 
-  postApiCutoffs(requestContract: CutoffCreateRequest): Observable<ResponseResult<CreateCutoffCommandResult, 200> | ResponseResult<ApiProblemDetailsOfCreateCutoffErrorStatus, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ApiProblemDetailsOfCreateCutoffErrorStatus, 409> | ResponseResult<ProblemDetails, 500>> {
+  postCutoffs(requestContract: CutoffCreateRequest): Observable<ResponseResult<CreateCutoffCommandResult, 200> | ResponseResult<ApiProblemDetailsOfCreateCutoffErrorStatus, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ApiProblemDetailsOfCreateCutoffErrorStatus, 409> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<CutoffCreateRequest>(requestContract, false);
 
     return apiPost<ResponseResult<CreateCutoffCommandResult, 200> | ResponseResult<ApiProblemDetailsOfCreateCutoffErrorStatus, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ApiProblemDetailsOfCreateCutoffErrorStatus, 409> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/cutoffs`, requestData);
   }
 
-  getApiCutoffsPublicID(publicID: string): Observable<ResponseResult<CutoffDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  getCutoffsPublicID(publicID: string): Observable<ResponseResult<CutoffDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<CutoffDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/cutoffs/${publicID}`);
   }
 
-  getApiCutoffsCompanyIDDateFromForNextCutoff(companyID: number): Observable<ResponseResult<DateFromForNextCutoffDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ProblemDetails, 500>> {
+  getCutoffsCompanyIDDateFromForNextCutoff(companyID: number): Observable<ResponseResult<DateFromForNextCutoffDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<DateFromForNextCutoffDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/cutoffs/${companyID}/date-from-for-next-cutoff`);
   }
 
-  getApiCutoffsExpectedUserCommission(): Observable<ResponseResult<GetExpectedUserCommissionQueryResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  getCutoffsExpectedUserCommission(): Observable<ResponseResult<GetExpectedUserCommissionQueryResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<GetExpectedUserCommissionQueryResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/cutoffs/expected-user-commission`);
   }
 
-  getApiCutoffsPaidUserCommission(): Observable<ResponseResult<GetPaidUserCommissionQueryResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  getCutoffsPaidUserCommission(): Observable<ResponseResult<GetPaidUserCommissionQueryResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<GetPaidUserCommissionQueryResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/cutoffs/paid-user-commission`);
   }
 
-  getApiCutoffsPublicIDISDOCPdfs(publicID: string): Observable<ResponseResult<CutoffISDOCPdfsDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  getCutoffsPublicIDISDOCPdfs(publicID: string): Observable<ResponseResult<CutoffISDOCPdfsDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<CutoffISDOCPdfsDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/cutoffs/${publicID}/ISDOCPdfs`);
   }
 
-  postApiCutoffsPublicIDSendPayments(publicID: string): Observable<ResponseResult<SendCutoffPaymentsCommandResult, 200> | ResponseResult<ApiProblemDetails, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  postCutoffsPublicIDSendPayments(publicID: string): Observable<ResponseResult<SendCutoffPaymentsCommandResult, 200> | ResponseResult<ApiProblemDetails, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<object>(undefined, false);
 
     return apiPost<ResponseResult<SendCutoffPaymentsCommandResult, 200> | ResponseResult<ApiProblemDetails, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/cutoffs/${publicID}/send-payments`, requestData);
   }
 
-  getApiCutoffsPublicIDDetailPdf(publicID: string): Observable<ResponseResult<CutoffDetailPdfBase64Dto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  getCutoffsPublicIDDetailPdf(publicID: string): Observable<ResponseResult<CutoffDetailPdfBase64Dto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<CutoffDetailPdfBase64Dto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/cutoffs/${publicID}/detail-pdf`);
   }
 
-  getApiCutoffsUserSupplierCompanies(): Observable<ResponseResult<CutoffUserSupplierCompanyListItemDto[], 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  getCutoffsUserSupplierCompanies(): Observable<ResponseResult<CutoffUserSupplierCompanyListItemDto[], 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<CutoffUserSupplierCompanyListItemDto[], 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/cutoffs/user-supplier-companies`);
   }
 
-  getApiCompaniesPublicID(publicID: string): Observable<ResponseResult<CompanyDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  getCompaniesPublicID(publicID: string): Observable<ResponseResult<CompanyDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<CompanyDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/companies/${publicID}`);
   }
 
-  postApiCompanies(requestContract: CompanyCreateRequest): Observable<ResponseResult<CreateCompanyCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  postCompanies(requestContract: CompanyCreateRequest): Observable<ResponseResult<CreateCompanyCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<CompanyCreateRequest>(requestContract, false);
 
     return apiPost<ResponseResult<CreateCompanyCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/companies`, requestData);
   }
 
-  putApiCompanies(requestContract: CompanyUpdateRequest): Observable<ResponseResult<UpdateCompanyCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ProblemDetails, 500>> {
+  putCompanies(requestContract: CompanyUpdateRequest): Observable<ResponseResult<UpdateCompanyCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<CompanyUpdateRequest>(requestContract, false);
 
     return apiPut<ResponseResult<UpdateCompanyCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/companies`, requestData);
   }
 
-  getApiCompaniesUserSupplierCompanies(): Observable<ResponseResult<UserSupplierCompanyListItemDto[], 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  getCompaniesUserSupplierCompanies(): Observable<ResponseResult<UserSupplierCompanyListItemDto[], 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<UserSupplierCompanyListItemDto[], 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/companies/user-supplier-companies`);
   }
 
-  postApiCompaniesUserSupplierCompany(requestContract: UserSupplierCompanySetRequest): Observable<ResponseResult<SetUserSupplierCompanyCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ProblemDetails, 500>> {
+  postCompaniesUserSupplierCompany(requestContract: UserSupplierCompanySetRequest): Observable<ResponseResult<SetUserSupplierCompanyCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<UserSupplierCompanySetRequest>(requestContract, false);
 
     return apiPost<ResponseResult<SetUserSupplierCompanyCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/companies/user-supplier-company`, requestData);
   }
 
-  getApiCompaniesPublicIDDesignSettings(publicID: string): Observable<ResponseResult<CompanyDesignSettingsDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  getCompaniesPublicIDDesignSettings(publicID: string): Observable<ResponseResult<CompanyDesignSettingsDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<CompanyDesignSettingsDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/companies/${publicID}/design-settings`);
   }
 
-  putApiCompaniesPublicIDDesignSettings(requestContract: SaveCompanyDesignSettingsRequest, publicID: string): Observable<ResponseResult<SaveCompanyDesignSettingsCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ProblemDetails, 500>> {
+  putCompaniesPublicIDDesignSettings(requestContract: SaveCompanyDesignSettingsRequest, publicID: string): Observable<ResponseResult<SaveCompanyDesignSettingsCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<SaveCompanyDesignSettingsRequest>(requestContract, false);
 
     return apiPut<ResponseResult<SaveCompanyDesignSettingsCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/companies/${publicID}/design-settings`, requestData);
   }
 
-  getApiCompaniesPublicIDFioSettings(publicID: string): Observable<ResponseResult<CompanyFioSettingsDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  getCompaniesPublicIDFioSettings(publicID: string): Observable<ResponseResult<CompanyFioSettingsDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<CompanyFioSettingsDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/companies/${publicID}/fio-settings`);
   }
 
-  putApiCompaniesPublicIDFioSettings(requestContract: SaveFioSettingsRequest, publicID: string): Observable<ResponseResult<SaveCompanyFioSettingsCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ProblemDetails, 500>> {
+  putCompaniesPublicIDFioSettings(requestContract: SaveFioSettingsRequest, publicID: string): Observable<ResponseResult<SaveCompanyFioSettingsCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<SaveFioSettingsRequest>(requestContract, false);
 
     return apiPut<ResponseResult<SaveCompanyFioSettingsCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 403> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/companies/${publicID}/fio-settings`, requestData);
   }
 
-  getApiCompaniesPublicIDLogoFile(publicID: string): Observable<ResponseResult<File, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  getCompaniesPublicIDLogoFile(publicID: string): Observable<ResponseResult<File, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<File, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/companies/${publicID}/logo/file`);
   }
 
-  getApiCodeLists(): Observable<ResponseResult<GetCodeListCollectionQueryResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  getCodeLists(): Observable<ResponseResult<GetCodeListCollectionQueryResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<GetCodeListCollectionQueryResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/code-lists`);
   }
 
-  getApiClientsCount(): Observable<ResponseResult<GetClientsCountQueryResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  getClientsCount(): Observable<ResponseResult<GetClientsCountQueryResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     return apiGet<ResponseResult<GetClientsCountQueryResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/clients/count`);
   }
 
-  getApiClientsSearch(query?: string): Observable<ResponseResult<ClientDto[], 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  getClientsSearch(query?: string): Observable<ResponseResult<ClientDto[], 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     const queryParams = {
       "query": query
     };
     return apiGet<ResponseResult<ClientDto[], 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/clients/search`, queryParams);
   }
 
-  getApiClientsSearchPersonalNumber(query?: string): Observable<ResponseResult<ClientDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
+  getClientsSearchPersonalNumber(query?: string): Observable<ResponseResult<ClientDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>> {
     const queryParams = {
       "query": query
     };
     return apiGet<ResponseResult<ClientDto, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetails, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/clients/search/personal-number`, queryParams);
   }
 
-  postApiCacheRefresh(body: string): Observable<ResponseResult<void, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 403> | ResponseResult<ProblemDetails, 500>> {
+  postCacheRefresh(body: string): Observable<ResponseResult<void, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 403> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<string>(body, false);
 
     return apiPost<ResponseResult<void, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 403> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/cache/refresh`, requestData);
   }
 
-  postApiAuthSignUp(requestContract: SignUpCommand): Observable<ResponseResult<SignUpCommandResult, 201> | ResponseResult<ApiProblemDetailsOfPasswordChangeResultStatus, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetailsOfSignUpErrorStatus, 409> | ResponseResult<ProblemDetails, 500>> {
+  postAuthSignUp(requestContract: SignUpCommand): Observable<ResponseResult<SignUpCommandResult, 201> | ResponseResult<ApiProblemDetailsOfPasswordChangeResultStatus, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetailsOfSignUpErrorStatus, 409> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<SignUpCommand>(requestContract, false);
 
     return apiPost<ResponseResult<SignUpCommandResult, 201> | ResponseResult<ApiProblemDetailsOfPasswordChangeResultStatus, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetailsOfSignUpErrorStatus, 409> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/auth/sign-up`, requestData);
   }
 
-  postApiAuthSignIn(requestContract: SignInCommand): Observable<ResponseResult<SignInResult, 200> | ResponseResult<ApiProblemDetailsOfAuthError, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  postAuthSignIn(requestContract: SignInCommand): Observable<ResponseResult<SignInResult, 200> | ResponseResult<ApiProblemDetailsOfAuthError, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<SignInCommand>(requestContract, false);
 
     return apiPost<ResponseResult<SignInResult, 200> | ResponseResult<ApiProblemDetailsOfAuthError, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/auth/sign-in`, requestData);
   }
 
-  postApiAuthToken(): Observable<ResponseResult<TokenResponse, 200> | ResponseResult<ApiProblemDetailsOfAuthError, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  postAuthToken(): Observable<ResponseResult<TokenResponse, 200> | ResponseResult<ApiProblemDetailsOfAuthError, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<object>(undefined, true);
 
     return apiPost<ResponseResult<TokenResponse, 200> | ResponseResult<ApiProblemDetailsOfAuthError, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/auth/token`, requestData);
   }
 
-  postApiAuthEmailVerification(requestContract: EmailVerificationCommand): Observable<ResponseResult<EmailVerificationCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetailsOfEmailVerificationCommandResultStatus, 404> | ResponseResult<ProblemDetails, 500>> {
+  postAuthEmailVerification(requestContract: EmailVerificationCommand): Observable<ResponseResult<EmailVerificationCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetailsOfEmailVerificationCommandResultStatus, 404> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<EmailVerificationCommand>(requestContract, false);
 
     return apiPost<ResponseResult<EmailVerificationCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetailsOfEmailVerificationCommandResultStatus, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/auth/email-verification`, requestData);
   }
 
-  postApiAuthEmailVerificationSend(requestContract: ResendVerificationEmailCommand): Observable<ResponseResult<ResendVerificationEmailCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
+  postAuthEmailVerificationSend(requestContract: ResendVerificationEmailCommand): Observable<ResponseResult<ResendVerificationEmailCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<ResendVerificationEmailCommand>(requestContract, false);
 
     return apiPost<ResponseResult<ResendVerificationEmailCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/auth/email-verification/send`, requestData);
   }
 
-  postApiAuthSso(requestContract: SsoSignInRequest): Observable<ResponseResult<SignInResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetailsOfAuthError, 404> | ResponseResult<ProblemDetails, 500>> {
+  postAuthSso(requestContract: SsoSignInRequest): Observable<ResponseResult<SignInResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetailsOfAuthError, 404> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<SsoSignInRequest>(requestContract, false);
 
     return apiPost<ResponseResult<SignInResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetailsOfAuthError, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/auth/sso`, requestData);
   }
 
-  getApiAuthSsoToken(IdentityProvider?: IdentityProvider): Observable<ResponseResult<RedirectHttpResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500> | ResponseResult<ApiProblemDetails, 501>> {
+  getAuthSsoToken(IdentityProvider?: IdentityProvider): Observable<ResponseResult<RedirectHttpResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500> | ResponseResult<ApiProblemDetails, 501>> {
     const queryParams = {
       "IdentityProvider": IdentityProvider
     };
     return apiGet<ResponseResult<RedirectHttpResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ProblemDetails, 500> | ResponseResult<ApiProblemDetails, 501>>(this.httpClient, `${this.baseUrl}/api/v1/auth/sso-token`, queryParams);
   }
 
-  postApiAuthPasswordReset(requestContract: ResetPasswordCommand): Observable<ResponseResult<ResetPasswordCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetailsOfResetPasswordCommandResultStatus, 404> | ResponseResult<ProblemDetails, 500>> {
+  postAuthPasswordReset(requestContract: ResetPasswordCommand): Observable<ResponseResult<ResetPasswordCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetailsOfResetPasswordCommandResultStatus, 404> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<ResetPasswordCommand>(requestContract, false);
 
     return apiPost<ResponseResult<ResetPasswordCommandResult, 200> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetailsOfResetPasswordCommandResultStatus, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/auth/password-reset`, requestData);
   }
 
-  putApiAuthPassword(requestContract: SetPasswordCommand): Observable<ResponseResult<SetPasswordCommandResult, 200> | ResponseResult<ApiProblemDetailsOfPasswordChangeResultStatus, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetailsOfSetPasswordCommandStatus, 404> | ResponseResult<ProblemDetails, 500>> {
+  putAuthPassword(requestContract: SetPasswordCommand): Observable<ResponseResult<SetPasswordCommandResult, 200> | ResponseResult<ApiProblemDetailsOfPasswordChangeResultStatus, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetailsOfSetPasswordCommandStatus, 404> | ResponseResult<ProblemDetails, 500>> {
     const requestData = getApiRequestData<SetPasswordCommand>(requestContract, false);
 
     return apiPut<ResponseResult<SetPasswordCommandResult, 200> | ResponseResult<ApiProblemDetailsOfPasswordChangeResultStatus, 400> | ResponseResult<ApiProblemDetails, 401> | ResponseResult<ApiProblemDetailsOfSetPasswordCommandStatus, 404> | ResponseResult<ProblemDetails, 500>>(this.httpClient, `${this.baseUrl}/api/v1/auth/password`, requestData);
diff --git a/apps/cli/src/tests/__snapshots__/generate_nswag_cookies.ts b/apps/cli/src/tests/__snapshots__/generate_nswag_cookies.ts
index 3754f34..4060f94 100644
--- a/apps/cli/src/tests/__snapshots__/generate_nswag_cookies.ts
+++ b/apps/cli/src/tests/__snapshots__/generate_nswag_cookies.ts
@@ -2055,111 +2055,111 @@ export type SetPasswordCommand = {
 	password: string;
 };
 
-export type GetApiWorkflowsStepsFetchResponse = 
+export type GetWorkflowsStepsFetchResponse = 
 | FetchResponse<EntityListOfStepDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiWorkflowsStepsPath = () => `/api/v1/workflows/steps`;
+export const getWorkflowsStepsPath = () => `/api/v1/workflows/steps`;
 
-export const getApiWorkflowsSteps = (headers = new Headers()):
-  Promise<GetApiWorkflowsStepsFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiWorkflowsStepsPath()}`, headers, {}) as Promise<GetApiWorkflowsStepsFetchResponse>;
+export const getWorkflowsSteps = (headers = new Headers()):
+  Promise<GetWorkflowsStepsFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getWorkflowsStepsPath()}`, headers, {}) as Promise<GetWorkflowsStepsFetchResponse>;
 }
 
-export type GetApiUserCompanyFetchResponse = 
+export type GetUserCompanyFetchResponse = 
 | FetchResponse<UserCompanyDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiUserCompanyPath = () => `/api/v1/user/company`;
+export const getUserCompanyPath = () => `/api/v1/user/company`;
 
-export const getApiUserCompany = (headers = new Headers()):
-  Promise<GetApiUserCompanyFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiUserCompanyPath()}`, headers, {}) as Promise<GetApiUserCompanyFetchResponse>;
+export const getUserCompany = (headers = new Headers()):
+  Promise<GetUserCompanyFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getUserCompanyPath()}`, headers, {}) as Promise<GetUserCompanyFetchResponse>;
 }
 
-export type PutApiUserCompanyFetchResponse = 
+export type PutUserCompanyFetchResponse = 
 | FetchResponse<SetUserCompanyCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const putApiUserCompanyPath = () => `/api/v1/user/company`;
+export const putUserCompanyPath = () => `/api/v1/user/company`;
 
-export const putApiUserCompany = (requestContract: UserCompanySetRequest, headers = new Headers()):
-  Promise<PutApiUserCompanyFetchResponse> => {
+export const putUserCompany = (requestContract: UserCompanySetRequest, headers = new Headers()):
+  Promise<PutUserCompanyFetchResponse> => {
     const requestData = getApiRequestData<UserCompanySetRequest>(requestContract, false);
 
-    return apiPut(`${getApiUrl()}${putApiUserCompanyPath()}`, requestData, headers) as Promise<PutApiUserCompanyFetchResponse>;
+    return apiPut(`${getApiUrl()}${putUserCompanyPath()}`, requestData, headers) as Promise<PutUserCompanyFetchResponse>;
 }
 
-export type GetApiServicesPackagesFetchResponse = 
+export type GetServicesPackagesFetchResponse = 
 | FetchResponse<EntityListOfServicePackageListItemDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiServicesPackagesPath = () => `/api/v1/services/packages`;
+export const getServicesPackagesPath = () => `/api/v1/services/packages`;
 
-export const getApiServicesPackages = (offset?: number, limit?: number, headers = new Headers()):
-  Promise<GetApiServicesPackagesFetchResponse> => {
+export const getServicesPackages = (offset?: number, limit?: number, headers = new Headers()):
+  Promise<GetServicesPackagesFetchResponse> => {
     const queryParams = {
       "offset": offset,
       "limit": limit
     }
-    return apiGet(`${getApiUrl()}${getApiServicesPackagesPath()}`, headers, queryParams) as Promise<GetApiServicesPackagesFetchResponse>;
+    return apiGet(`${getApiUrl()}${getServicesPackagesPath()}`, headers, queryParams) as Promise<GetServicesPackagesFetchResponse>;
 }
 
-export type GetApiServicesPackagesAvailableServicesFetchResponse = 
+export type GetServicesPackagesAvailableServicesFetchResponse = 
 | FetchResponse<EntityListOfServiceListItemDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiServicesPackagesAvailableServicesPath = () => `/api/v1/services/packages/available-services`;
+export const getServicesPackagesAvailableServicesPath = () => `/api/v1/services/packages/available-services`;
 
-export const getApiServicesPackagesAvailableServices = (offset?: number, limit?: number, headers = new Headers()):
-  Promise<GetApiServicesPackagesAvailableServicesFetchResponse> => {
+export const getServicesPackagesAvailableServices = (offset?: number, limit?: number, headers = new Headers()):
+  Promise<GetServicesPackagesAvailableServicesFetchResponse> => {
     const queryParams = {
       "offset": offset,
       "limit": limit
     }
-    return apiGet(`${getApiUrl()}${getApiServicesPackagesAvailableServicesPath()}`, headers, queryParams) as Promise<GetApiServicesPackagesAvailableServicesFetchResponse>;
+    return apiGet(`${getApiUrl()}${getServicesPackagesAvailableServicesPath()}`, headers, queryParams) as Promise<GetServicesPackagesAvailableServicesFetchResponse>;
 }
 
-export type PostApiServicesPackageFetchResponse = 
+export type PostServicesPackageFetchResponse = 
 | FetchResponse<CreateServicePackageCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiServicesPackagePath = () => `/api/v1/services/package`;
+export const postServicesPackagePath = () => `/api/v1/services/package`;
 
-export const postApiServicesPackage = (requestContract: SaveServicePackageRequest, headers = new Headers()):
-  Promise<PostApiServicesPackageFetchResponse> => {
+export const postServicesPackage = (requestContract: SaveServicePackageRequest, headers = new Headers()):
+  Promise<PostServicesPackageFetchResponse> => {
     const requestData = getApiRequestData<SaveServicePackageRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiServicesPackagePath()}`, requestData, headers) as Promise<PostApiServicesPackageFetchResponse>;
+    return apiPost(`${getApiUrl()}${postServicesPackagePath()}`, requestData, headers) as Promise<PostServicesPackageFetchResponse>;
 }
 
-export type GetApiServicesServicePublicIDPackageFetchResponse = 
+export type GetServicesServicePublicIDPackageFetchResponse = 
 | FetchResponse<ServicePackageDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 403> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiServicesServicePublicIDPackagePath = (servicePublicID: string) => `/api/v1/services/${servicePublicID}/package`;
+export const getServicesServicePublicIDPackagePath = (servicePublicID: string) => `/api/v1/services/${servicePublicID}/package`;
 
-export const getApiServicesServicePublicIDPackage = (servicePublicID: string, headers = new Headers()):
-  Promise<GetApiServicesServicePublicIDPackageFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiServicesServicePublicIDPackagePath(servicePublicID)}`, headers, {}) as Promise<GetApiServicesServicePublicIDPackageFetchResponse>;
+export const getServicesServicePublicIDPackage = (servicePublicID: string, headers = new Headers()):
+  Promise<GetServicesServicePublicIDPackageFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getServicesServicePublicIDPackagePath(servicePublicID)}`, headers, {}) as Promise<GetServicesServicePublicIDPackageFetchResponse>;
 }
 
-export type DeleteApiServicesServicePublicIDPackageFetchResponse = 
+export type DeleteServicesServicePublicIDPackageFetchResponse = 
 | FetchResponse<ServicePackageDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 403> 
@@ -2167,14 +2167,14 @@ export type DeleteApiServicesServicePublicIDPackageFetchResponse =
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const deleteApiServicesServicePublicIDPackagePath = (servicePublicID: string) => `/api/v1/services/${servicePublicID}/package`;
+export const deleteServicesServicePublicIDPackagePath = (servicePublicID: string) => `/api/v1/services/${servicePublicID}/package`;
 
-export const deleteApiServicesServicePublicIDPackage = (servicePublicID: string, headers = new Headers()):
-  Promise<DeleteApiServicesServicePublicIDPackageFetchResponse> => {
-    return apiDelete(`${getApiUrl()}${deleteApiServicesServicePublicIDPackagePath(servicePublicID)}`, headers, {}) as Promise<DeleteApiServicesServicePublicIDPackageFetchResponse>;
+export const deleteServicesServicePublicIDPackage = (servicePublicID: string, headers = new Headers()):
+  Promise<DeleteServicesServicePublicIDPackageFetchResponse> => {
+    return apiDelete(`${getApiUrl()}${deleteServicesServicePublicIDPackagePath(servicePublicID)}`, headers, {}) as Promise<DeleteServicesServicePublicIDPackageFetchResponse>;
 }
 
-export type PutApiServicesServicePublicIDPackageFetchResponse = 
+export type PutServicesServicePublicIDPackageFetchResponse = 
 | FetchResponse<UpdateServicePackageCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 403> 
@@ -2182,57 +2182,57 @@ export type PutApiServicesServicePublicIDPackageFetchResponse =
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const putApiServicesServicePublicIDPackagePath = (servicePublicID: string) => `/api/v1/services/${servicePublicID}/package`;
+export const putServicesServicePublicIDPackagePath = (servicePublicID: string) => `/api/v1/services/${servicePublicID}/package`;
 
-export const putApiServicesServicePublicIDPackage = (requestContract: SaveServicePackageRequest, servicePublicID: string, headers = new Headers()):
-  Promise<PutApiServicesServicePublicIDPackageFetchResponse> => {
+export const putServicesServicePublicIDPackage = (requestContract: SaveServicePackageRequest, servicePublicID: string, headers = new Headers()):
+  Promise<PutServicesServicePublicIDPackageFetchResponse> => {
     const requestData = getApiRequestData<SaveServicePackageRequest>(requestContract, false);
 
-    return apiPut(`${getApiUrl()}${putApiServicesServicePublicIDPackagePath(servicePublicID)}`, requestData, headers) as Promise<PutApiServicesServicePublicIDPackageFetchResponse>;
+    return apiPut(`${getApiUrl()}${putServicesServicePublicIDPackagePath(servicePublicID)}`, requestData, headers) as Promise<PutServicesServicePublicIDPackageFetchResponse>;
 }
 
-export type GetApiPartiesPublicIDFetchResponse = 
+export type GetPartiesPublicIDFetchResponse = 
 | FetchResponse<PartyDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiPartiesPublicIDPath = (publicID: string) => `/api/v1/parties/${publicID}`;
+export const getPartiesPublicIDPath = (publicID: string) => `/api/v1/parties/${publicID}`;
 
-export const getApiPartiesPublicID = (publicID: string, headers = new Headers()):
-  Promise<GetApiPartiesPublicIDFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiPartiesPublicIDPath(publicID)}`, headers, {}) as Promise<GetApiPartiesPublicIDFetchResponse>;
+export const getPartiesPublicID = (publicID: string, headers = new Headers()):
+  Promise<GetPartiesPublicIDFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getPartiesPublicIDPath(publicID)}`, headers, {}) as Promise<GetPartiesPublicIDFetchResponse>;
 }
 
-export type GetApiPartiesSearchAresFetchResponse = 
+export type GetPartiesSearchAresFetchResponse = 
 | FetchResponse<PartyDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiPartiesSearchAresPath = () => `/api/v1/parties/search/ares`;
+export const getPartiesSearchAresPath = () => `/api/v1/parties/search/ares`;
 
-export const getApiPartiesSearchAres = (query?: string, partyType?: PartyType | undefined | null, headers = new Headers()):
-  Promise<GetApiPartiesSearchAresFetchResponse> => {
+export const getPartiesSearchAres = (query?: string, partyType?: PartyType | undefined | null, headers = new Headers()):
+  Promise<GetPartiesSearchAresFetchResponse> => {
     const queryParams = {
       "query": query,
       "partyType": partyType
     }
-    return apiGet(`${getApiUrl()}${getApiPartiesSearchAresPath()}`, headers, queryParams) as Promise<GetApiPartiesSearchAresFetchResponse>;
+    return apiGet(`${getApiUrl()}${getPartiesSearchAresPath()}`, headers, queryParams) as Promise<GetPartiesSearchAresFetchResponse>;
 }
 
-export type GetApiOrdersFetchResponse = 
+export type GetOrdersFetchResponse = 
 | FetchResponse<EntityListOfOrderListItemDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiOrdersPath = () => `/api/v1/orders`;
+export const getOrdersPath = () => `/api/v1/orders`;
 
-export const getApiOrders = (offset?: number, limit?: number, workflowStatuses?: string[], query?: string | undefined | null, startDate?: string | undefined | null, endDate?: string | undefined | null, isSearchInStructure?: boolean, onlyAfterInvoiceDueDate?: boolean, includeClientReminderAvailable?: boolean, headers = new Headers()):
-  Promise<GetApiOrdersFetchResponse> => {
+export const getOrders = (offset?: number, limit?: number, workflowStatuses?: string[], query?: string | undefined | null, startDate?: string | undefined | null, endDate?: string | undefined | null, isSearchInStructure?: boolean, onlyAfterInvoiceDueDate?: boolean, includeClientReminderAvailable?: boolean, headers = new Headers()):
+  Promise<GetOrdersFetchResponse> => {
     const queryParams = {
       "offset": offset,
       "limit": limit,
@@ -2244,412 +2244,412 @@ export const getApiOrders = (offset?: number, limit?: number, workflowStatuses?:
       "onlyAfterInvoiceDueDate": onlyAfterInvoiceDueDate,
       "includeClientReminderAvailable": includeClientReminderAvailable
     }
-    return apiGet(`${getApiUrl()}${getApiOrdersPath()}`, headers, queryParams) as Promise<GetApiOrdersFetchResponse>;
+    return apiGet(`${getApiUrl()}${getOrdersPath()}`, headers, queryParams) as Promise<GetOrdersFetchResponse>;
 }
 
-export type GetApiOrdersPublicIDFetchResponse = 
+export type GetOrdersPublicIDFetchResponse = 
 | FetchResponse<OrderDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiOrdersPublicIDPath = (publicID: string) => `/api/v1/orders/${publicID}`;
+export const getOrdersPublicIDPath = (publicID: string) => `/api/v1/orders/${publicID}`;
 
-export const getApiOrdersPublicID = (publicID: string, headers = new Headers()):
-  Promise<GetApiOrdersPublicIDFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiOrdersPublicIDPath(publicID)}`, headers, {}) as Promise<GetApiOrdersPublicIDFetchResponse>;
+export const getOrdersPublicID = (publicID: string, headers = new Headers()):
+  Promise<GetOrdersPublicIDFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getOrdersPublicIDPath(publicID)}`, headers, {}) as Promise<GetOrdersPublicIDFetchResponse>;
 }
 
-export type DeleteApiOrdersPublicIDFetchResponse = 
+export type DeleteOrdersPublicIDFetchResponse = 
 | FetchResponse<DeleteOrderCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const deleteApiOrdersPublicIDPath = (publicID: string) => `/api/v1/orders/${publicID}`;
+export const deleteOrdersPublicIDPath = (publicID: string) => `/api/v1/orders/${publicID}`;
 
-export const deleteApiOrdersPublicID = (publicID: string, headers = new Headers()):
-  Promise<DeleteApiOrdersPublicIDFetchResponse> => {
-    return apiDelete(`${getApiUrl()}${deleteApiOrdersPublicIDPath(publicID)}`, headers, {}) as Promise<DeleteApiOrdersPublicIDFetchResponse>;
+export const deleteOrdersPublicID = (publicID: string, headers = new Headers()):
+  Promise<DeleteOrdersPublicIDFetchResponse> => {
+    return apiDelete(`${getApiUrl()}${deleteOrdersPublicIDPath(publicID)}`, headers, {}) as Promise<DeleteOrdersPublicIDFetchResponse>;
 }
 
-export type PutApiOrdersPublicIDPeriodicityFetchResponse = 
+export type PutOrdersPublicIDPeriodicityFetchResponse = 
 | FetchResponse<SetPeriodicityCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const putApiOrdersPublicIDPeriodicityPath = (publicID: string) => `/api/v1/orders/${publicID}/periodicity`;
+export const putOrdersPublicIDPeriodicityPath = (publicID: string) => `/api/v1/orders/${publicID}/periodicity`;
 
-export const putApiOrdersPublicIDPeriodicity = (requestContract: SetPeriodicityRequest, publicID: string, headers = new Headers()):
-  Promise<PutApiOrdersPublicIDPeriodicityFetchResponse> => {
+export const putOrdersPublicIDPeriodicity = (requestContract: SetPeriodicityRequest, publicID: string, headers = new Headers()):
+  Promise<PutOrdersPublicIDPeriodicityFetchResponse> => {
     const requestData = getApiRequestData<SetPeriodicityRequest>(requestContract, false);
 
-    return apiPut(`${getApiUrl()}${putApiOrdersPublicIDPeriodicityPath(publicID)}`, requestData, headers) as Promise<PutApiOrdersPublicIDPeriodicityFetchResponse>;
+    return apiPut(`${getApiUrl()}${putOrdersPublicIDPeriodicityPath(publicID)}`, requestData, headers) as Promise<PutOrdersPublicIDPeriodicityFetchResponse>;
 }
 
-export type GetApiOrdersPublicIDServicesFetchResponse = 
+export type GetOrdersPublicIDServicesFetchResponse = 
 | FetchResponse<EntityListOfOrderServiceDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiOrdersPublicIDServicesPath = (publicID: string) => `/api/v1/orders/${publicID}/services`;
+export const getOrdersPublicIDServicesPath = (publicID: string) => `/api/v1/orders/${publicID}/services`;
 
-export const getApiOrdersPublicIDServices = (publicID: string, headers = new Headers()):
-  Promise<GetApiOrdersPublicIDServicesFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiOrdersPublicIDServicesPath(publicID)}`, headers, {}) as Promise<GetApiOrdersPublicIDServicesFetchResponse>;
+export const getOrdersPublicIDServices = (publicID: string, headers = new Headers()):
+  Promise<GetOrdersPublicIDServicesFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getOrdersPublicIDServicesPath(publicID)}`, headers, {}) as Promise<GetOrdersPublicIDServicesFetchResponse>;
 }
 
-export type DeleteApiOrdersServicesServiceIDFetchResponse = 
+export type DeleteOrdersServicesServiceIDFetchResponse = 
 | FetchResponse<DeleteOrderServiceCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const deleteApiOrdersServicesServiceIDPath = (serviceID: number) => `/api/v1/orders/services/${serviceID}`;
+export const deleteOrdersServicesServiceIDPath = (serviceID: number) => `/api/v1/orders/services/${serviceID}`;
 
-export const deleteApiOrdersServicesServiceID = (serviceID: number, headers = new Headers()):
-  Promise<DeleteApiOrdersServicesServiceIDFetchResponse> => {
-    return apiDelete(`${getApiUrl()}${deleteApiOrdersServicesServiceIDPath(serviceID)}`, headers, {}) as Promise<DeleteApiOrdersServicesServiceIDFetchResponse>;
+export const deleteOrdersServicesServiceID = (serviceID: number, headers = new Headers()):
+  Promise<DeleteOrdersServicesServiceIDFetchResponse> => {
+    return apiDelete(`${getApiUrl()}${deleteOrdersServicesServiceIDPath(serviceID)}`, headers, {}) as Promise<DeleteOrdersServicesServiceIDFetchResponse>;
 }
 
-export type GetApiOrdersPeriodicUpcomingFetchResponse = 
+export type GetOrdersPeriodicUpcomingFetchResponse = 
 | FetchResponse<EntityListOfUpcomingPeriodicOrderDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiOrdersPeriodicUpcomingPath = () => `/api/v1/orders/periodic/upcoming`;
+export const getOrdersPeriodicUpcomingPath = () => `/api/v1/orders/periodic/upcoming`;
 
-export const getApiOrdersPeriodicUpcoming = (offset?: number, limit?: number, nexOrderDate?: string, headers = new Headers()):
-  Promise<GetApiOrdersPeriodicUpcomingFetchResponse> => {
+export const getOrdersPeriodicUpcoming = (offset?: number, limit?: number, nexOrderDate?: string, headers = new Headers()):
+  Promise<GetOrdersPeriodicUpcomingFetchResponse> => {
     const queryParams = {
       "offset": offset,
       "limit": limit,
       "nexOrderDate": nexOrderDate
     }
-    return apiGet(`${getApiUrl()}${getApiOrdersPeriodicUpcomingPath()}`, headers, queryParams) as Promise<GetApiOrdersPeriodicUpcomingFetchResponse>;
+    return apiGet(`${getApiUrl()}${getOrdersPeriodicUpcomingPath()}`, headers, queryParams) as Promise<GetOrdersPeriodicUpcomingFetchResponse>;
 }
 
-export type GetApiOrdersRevocationExampleFileFetchResponse = 
+export type GetOrdersRevocationExampleFileFetchResponse = 
 | FetchResponse<File, 200> 
 | FetchResponse<ApiProblemDetails, 204> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiOrdersRevocationExampleFilePath = () => `/api/v1/orders/revocation/example/file`;
+export const getOrdersRevocationExampleFilePath = () => `/api/v1/orders/revocation/example/file`;
 
-export const getApiOrdersRevocationExampleFile = (headers = new Headers()):
-  Promise<GetApiOrdersRevocationExampleFileFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiOrdersRevocationExampleFilePath()}`, headers, {}) as Promise<GetApiOrdersRevocationExampleFileFetchResponse>;
+export const getOrdersRevocationExampleFile = (headers = new Headers()):
+  Promise<GetOrdersRevocationExampleFileFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getOrdersRevocationExampleFilePath()}`, headers, {}) as Promise<GetOrdersRevocationExampleFileFetchResponse>;
 }
 
-export type GetApiOrdersPublicIDPaymentCalendarItemsFetchResponse = 
+export type GetOrdersPublicIDPaymentCalendarItemsFetchResponse = 
 | FetchResponse<EntityListOfPaymentCalendarItemDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiOrdersPublicIDPaymentCalendarItemsPath = (publicID: string) => `/api/v1/orders/${publicID}/payment-calendar-items`;
+export const getOrdersPublicIDPaymentCalendarItemsPath = (publicID: string) => `/api/v1/orders/${publicID}/payment-calendar-items`;
 
-export const getApiOrdersPublicIDPaymentCalendarItems = (publicID: string, headers = new Headers()):
-  Promise<GetApiOrdersPublicIDPaymentCalendarItemsFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiOrdersPublicIDPaymentCalendarItemsPath(publicID)}`, headers, {}) as Promise<GetApiOrdersPublicIDPaymentCalendarItemsFetchResponse>;
+export const getOrdersPublicIDPaymentCalendarItems = (publicID: string, headers = new Headers()):
+  Promise<GetOrdersPublicIDPaymentCalendarItemsFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getOrdersPublicIDPaymentCalendarItemsPath(publicID)}`, headers, {}) as Promise<GetOrdersPublicIDPaymentCalendarItemsFetchResponse>;
 }
 
-export type GetApiOrdersCountFetchResponse = 
+export type GetOrdersCountFetchResponse = 
 | FetchResponse<GetOrdersCountQueryResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiOrdersCountPath = () => `/api/v1/orders/count`;
+export const getOrdersCountPath = () => `/api/v1/orders/count`;
 
-export const getApiOrdersCount = (onlyActive?: boolean, headers = new Headers()):
-  Promise<GetApiOrdersCountFetchResponse> => {
+export const getOrdersCount = (onlyActive?: boolean, headers = new Headers()):
+  Promise<GetOrdersCountFetchResponse> => {
     const queryParams = {
       "onlyActive": onlyActive
     }
-    return apiGet(`${getApiUrl()}${getApiOrdersCountPath()}`, headers, queryParams) as Promise<GetApiOrdersCountFetchResponse>;
+    return apiGet(`${getApiUrl()}${getOrdersCountPath()}`, headers, queryParams) as Promise<GetOrdersCountFetchResponse>;
 }
 
-export type PostApiOrdersOrderPublicIDClientInvoiceRecurringPaymentCreateInvoiceAndSetAsPaidByClientFetchResponse = 
+export type PostOrdersOrderPublicIDClientInvoiceRecurringPaymentCreateInvoiceAndSetAsPaidByClientFetchResponse = 
 | FetchResponse<SetPeriodicityCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersOrderPublicIDClientInvoiceRecurringPaymentCreateInvoiceAndSetAsPaidByClientPath = (orderPublicID: string) => `/api/v1/orders/${orderPublicID}/client-invoice-recurring-payment-create-invoice-and-set-as-paid-by-client`;
+export const postOrdersOrderPublicIDClientInvoiceRecurringPaymentCreateInvoiceAndSetAsPaidByClientPath = (orderPublicID: string) => `/api/v1/orders/${orderPublicID}/client-invoice-recurring-payment-create-invoice-and-set-as-paid-by-client`;
 
-export const postApiOrdersOrderPublicIDClientInvoiceRecurringPaymentCreateInvoiceAndSetAsPaidByClient = (requestContract: ClientInvoiceRecurringPaymentCreateInvoiceAndSetAsPaidByClientRequest, orderPublicID: string, headers = new Headers()):
-  Promise<PostApiOrdersOrderPublicIDClientInvoiceRecurringPaymentCreateInvoiceAndSetAsPaidByClientFetchResponse> => {
+export const postOrdersOrderPublicIDClientInvoiceRecurringPaymentCreateInvoiceAndSetAsPaidByClient = (requestContract: ClientInvoiceRecurringPaymentCreateInvoiceAndSetAsPaidByClientRequest, orderPublicID: string, headers = new Headers()):
+  Promise<PostOrdersOrderPublicIDClientInvoiceRecurringPaymentCreateInvoiceAndSetAsPaidByClientFetchResponse> => {
     const requestData = getApiRequestData<ClientInvoiceRecurringPaymentCreateInvoiceAndSetAsPaidByClientRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersOrderPublicIDClientInvoiceRecurringPaymentCreateInvoiceAndSetAsPaidByClientPath(orderPublicID)}`, requestData, headers) as Promise<PostApiOrdersOrderPublicIDClientInvoiceRecurringPaymentCreateInvoiceAndSetAsPaidByClientFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersOrderPublicIDClientInvoiceRecurringPaymentCreateInvoiceAndSetAsPaidByClientPath(orderPublicID)}`, requestData, headers) as Promise<PostOrdersOrderPublicIDClientInvoiceRecurringPaymentCreateInvoiceAndSetAsPaidByClientFetchResponse>;
 }
 
-export type GetApiOrdersPublicIDClientZonePaymentCalendarItemsFetchResponse = 
+export type GetOrdersPublicIDClientZonePaymentCalendarItemsFetchResponse = 
 | FetchResponse<EntityListOfPaymentCalendarClientZoneItemDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiOrdersPublicIDClientZonePaymentCalendarItemsPath = (publicID: string) => `/api/v1/orders/${publicID}/client-zone/payment-calendar-items`;
+export const getOrdersPublicIDClientZonePaymentCalendarItemsPath = (publicID: string) => `/api/v1/orders/${publicID}/client-zone/payment-calendar-items`;
 
-export const getApiOrdersPublicIDClientZonePaymentCalendarItems = (publicID: string, headers = new Headers()):
-  Promise<GetApiOrdersPublicIDClientZonePaymentCalendarItemsFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiOrdersPublicIDClientZonePaymentCalendarItemsPath(publicID)}`, headers, {}) as Promise<GetApiOrdersPublicIDClientZonePaymentCalendarItemsFetchResponse>;
+export const getOrdersPublicIDClientZonePaymentCalendarItems = (publicID: string, headers = new Headers()):
+  Promise<GetOrdersPublicIDClientZonePaymentCalendarItemsFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getOrdersPublicIDClientZonePaymentCalendarItemsPath(publicID)}`, headers, {}) as Promise<GetOrdersPublicIDClientZonePaymentCalendarItemsFetchResponse>;
 }
 
-export type GetApiOrdersPublicIDOrderServiceOrderServiceIDEucsOrderInfoFetchResponse = 
+export type GetOrdersPublicIDOrderServiceOrderServiceIDEucsOrderInfoFetchResponse = 
 | FetchResponse<GetEucsOrderInfoQueryResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiOrdersPublicIDOrderServiceOrderServiceIDEucsOrderInfoPath = (publicID: string, orderServiceID: number) => `/api/v1/orders/${publicID}/order-service/${orderServiceID}/eucs-order/info`;
+export const getOrdersPublicIDOrderServiceOrderServiceIDEucsOrderInfoPath = (publicID: string, orderServiceID: number) => `/api/v1/orders/${publicID}/order-service/${orderServiceID}/eucs-order/info`;
 
-export const getApiOrdersPublicIDOrderServiceOrderServiceIDEucsOrderInfo = (publicID: string, orderServiceID: number, headers = new Headers()):
-  Promise<GetApiOrdersPublicIDOrderServiceOrderServiceIDEucsOrderInfoFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiOrdersPublicIDOrderServiceOrderServiceIDEucsOrderInfoPath(publicID, orderServiceID)}`, headers, {}) as Promise<GetApiOrdersPublicIDOrderServiceOrderServiceIDEucsOrderInfoFetchResponse>;
+export const getOrdersPublicIDOrderServiceOrderServiceIDEucsOrderInfo = (publicID: string, orderServiceID: number, headers = new Headers()):
+  Promise<GetOrdersPublicIDOrderServiceOrderServiceIDEucsOrderInfoFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getOrdersPublicIDOrderServiceOrderServiceIDEucsOrderInfoPath(publicID, orderServiceID)}`, headers, {}) as Promise<GetOrdersPublicIDOrderServiceOrderServiceIDEucsOrderInfoFetchResponse>;
 }
 
-export type PostApiOrdersPublicIDOrderServiceOrderServiceIDProductCancelFetchResponse = 
+export type PostOrdersPublicIDOrderServiceOrderServiceIDProductCancelFetchResponse = 
 | FetchResponse<CancelProductInInstitutionCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ApiProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersPublicIDOrderServiceOrderServiceIDProductCancelPath = (publicID: string, orderServiceID: number) => `/api/v1/orders/${publicID}/order-service/${orderServiceID}/product/cancel`;
+export const postOrdersPublicIDOrderServiceOrderServiceIDProductCancelPath = (publicID: string, orderServiceID: number) => `/api/v1/orders/${publicID}/order-service/${orderServiceID}/product/cancel`;
 
-export const postApiOrdersPublicIDOrderServiceOrderServiceIDProductCancel = (requestContract: CancelProductInInstitutionCommandRequest, publicID: string, orderServiceID: number, headers = new Headers()):
-  Promise<PostApiOrdersPublicIDOrderServiceOrderServiceIDProductCancelFetchResponse> => {
+export const postOrdersPublicIDOrderServiceOrderServiceIDProductCancel = (requestContract: CancelProductInInstitutionCommandRequest, publicID: string, orderServiceID: number, headers = new Headers()):
+  Promise<PostOrdersPublicIDOrderServiceOrderServiceIDProductCancelFetchResponse> => {
     const requestData = getApiRequestData<CancelProductInInstitutionCommandRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersPublicIDOrderServiceOrderServiceIDProductCancelPath(publicID, orderServiceID)}`, requestData, headers) as Promise<PostApiOrdersPublicIDOrderServiceOrderServiceIDProductCancelFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersPublicIDOrderServiceOrderServiceIDProductCancelPath(publicID, orderServiceID)}`, requestData, headers) as Promise<PostOrdersPublicIDOrderServiceOrderServiceIDProductCancelFetchResponse>;
 }
 
-export type PostApiOrdersPublicIDOrderServiceOrderServiceIDProductCreateFetchResponse = 
+export type PostOrdersPublicIDOrderServiceOrderServiceIDProductCreateFetchResponse = 
 | FetchResponse<CreateProductInInstitutionCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ApiProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersPublicIDOrderServiceOrderServiceIDProductCreatePath = (publicID: string, orderServiceID: number) => `/api/v1/orders/${publicID}/order-service/${orderServiceID}/product/create`;
+export const postOrdersPublicIDOrderServiceOrderServiceIDProductCreatePath = (publicID: string, orderServiceID: number) => `/api/v1/orders/${publicID}/order-service/${orderServiceID}/product/create`;
 
-export const postApiOrdersPublicIDOrderServiceOrderServiceIDProductCreate = (requestContract: CreateProductInInstitutionRequest, publicID: string, orderServiceID: number, headers = new Headers()):
-  Promise<PostApiOrdersPublicIDOrderServiceOrderServiceIDProductCreateFetchResponse> => {
+export const postOrdersPublicIDOrderServiceOrderServiceIDProductCreate = (requestContract: CreateProductInInstitutionRequest, publicID: string, orderServiceID: number, headers = new Headers()):
+  Promise<PostOrdersPublicIDOrderServiceOrderServiceIDProductCreateFetchResponse> => {
     const requestData = getApiRequestData<CreateProductInInstitutionRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersPublicIDOrderServiceOrderServiceIDProductCreatePath(publicID, orderServiceID)}`, requestData, headers) as Promise<PostApiOrdersPublicIDOrderServiceOrderServiceIDProductCreateFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersPublicIDOrderServiceOrderServiceIDProductCreatePath(publicID, orderServiceID)}`, requestData, headers) as Promise<PostOrdersPublicIDOrderServiceOrderServiceIDProductCreateFetchResponse>;
 }
 
-export type GetApiOrdersPublicIDWorkflowStepsFetchResponse = 
+export type GetOrdersPublicIDWorkflowStepsFetchResponse = 
 | FetchResponse<EntityListOfOrderWorkflowStepDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiOrdersPublicIDWorkflowStepsPath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/steps`;
+export const getOrdersPublicIDWorkflowStepsPath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/steps`;
 
-export const getApiOrdersPublicIDWorkflowSteps = (publicID: string, headers = new Headers()):
-  Promise<GetApiOrdersPublicIDWorkflowStepsFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiOrdersPublicIDWorkflowStepsPath(publicID)}`, headers, {}) as Promise<GetApiOrdersPublicIDWorkflowStepsFetchResponse>;
+export const getOrdersPublicIDWorkflowSteps = (publicID: string, headers = new Headers()):
+  Promise<GetOrdersPublicIDWorkflowStepsFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getOrdersPublicIDWorkflowStepsPath(publicID)}`, headers, {}) as Promise<GetOrdersPublicIDWorkflowStepsFetchResponse>;
 }
 
-export type PostApiOrdersWorkflowDraftFetchResponse = 
+export type PostOrdersWorkflowDraftFetchResponse = 
 | FetchResponse<SaveDraftCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersWorkflowDraftPath = () => `/api/v1/orders/workflow/draft`;
+export const postOrdersWorkflowDraftPath = () => `/api/v1/orders/workflow/draft`;
 
-export const postApiOrdersWorkflowDraft = (requestContract: SaveDraftRequest, headers = new Headers()):
-  Promise<PostApiOrdersWorkflowDraftFetchResponse> => {
+export const postOrdersWorkflowDraft = (requestContract: SaveDraftRequest, headers = new Headers()):
+  Promise<PostOrdersWorkflowDraftFetchResponse> => {
     const requestData = getApiRequestData<SaveDraftRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersWorkflowDraftPath()}`, requestData, headers) as Promise<PostApiOrdersWorkflowDraftFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersWorkflowDraftPath()}`, requestData, headers) as Promise<PostOrdersWorkflowDraftFetchResponse>;
 }
 
-export type PostApiOrdersPublicIDWorkflowDraftCompleteFetchResponse = 
+export type PostOrdersPublicIDWorkflowDraftCompleteFetchResponse = 
 | FetchResponse<DraftStepCompleteCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersPublicIDWorkflowDraftCompletePath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/draft/complete`;
+export const postOrdersPublicIDWorkflowDraftCompletePath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/draft/complete`;
 
-export const postApiOrdersPublicIDWorkflowDraftComplete = (publicID: string, headers = new Headers()):
-  Promise<PostApiOrdersPublicIDWorkflowDraftCompleteFetchResponse> => {
+export const postOrdersPublicIDWorkflowDraftComplete = (publicID: string, headers = new Headers()):
+  Promise<PostOrdersPublicIDWorkflowDraftCompleteFetchResponse> => {
     const requestData = getApiRequestData<object>(undefined, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersPublicIDWorkflowDraftCompletePath(publicID)}`, requestData, headers) as Promise<PostApiOrdersPublicIDWorkflowDraftCompleteFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersPublicIDWorkflowDraftCompletePath(publicID)}`, requestData, headers) as Promise<PostOrdersPublicIDWorkflowDraftCompleteFetchResponse>;
 }
 
-export type GetApiOrdersWorkflowClientReviewTokenSummaryFetchResponse = 
+export type GetOrdersWorkflowClientReviewTokenSummaryFetchResponse = 
 | FetchResponse<GetClientReviewSummaryQueryResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiOrdersWorkflowClientReviewTokenSummaryPath = (token: string) => `/api/v1/orders/workflow/client-review/${token}/summary`;
+export const getOrdersWorkflowClientReviewTokenSummaryPath = (token: string) => `/api/v1/orders/workflow/client-review/${token}/summary`;
 
-export const getApiOrdersWorkflowClientReviewTokenSummary = (token: string, headers = new Headers()):
-  Promise<GetApiOrdersWorkflowClientReviewTokenSummaryFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiOrdersWorkflowClientReviewTokenSummaryPath(token)}`, headers, {}) as Promise<GetApiOrdersWorkflowClientReviewTokenSummaryFetchResponse>;
+export const getOrdersWorkflowClientReviewTokenSummary = (token: string, headers = new Headers()):
+  Promise<GetOrdersWorkflowClientReviewTokenSummaryFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getOrdersWorkflowClientReviewTokenSummaryPath(token)}`, headers, {}) as Promise<GetOrdersWorkflowClientReviewTokenSummaryFetchResponse>;
 }
 
-export type PostApiOrdersPublicIDWorkflowClientReviewReminderFetchResponse = 
+export type PostOrdersPublicIDWorkflowClientReviewReminderFetchResponse = 
 | FetchResponse<SendReminderCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersPublicIDWorkflowClientReviewReminderPath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/client-review/reminder`;
+export const postOrdersPublicIDWorkflowClientReviewReminderPath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/client-review/reminder`;
 
-export const postApiOrdersPublicIDWorkflowClientReviewReminder = (publicID: string, headers = new Headers()):
-  Promise<PostApiOrdersPublicIDWorkflowClientReviewReminderFetchResponse> => {
+export const postOrdersPublicIDWorkflowClientReviewReminder = (publicID: string, headers = new Headers()):
+  Promise<PostOrdersPublicIDWorkflowClientReviewReminderFetchResponse> => {
     const requestData = getApiRequestData<object>(undefined, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersPublicIDWorkflowClientReviewReminderPath(publicID)}`, requestData, headers) as Promise<PostApiOrdersPublicIDWorkflowClientReviewReminderFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersPublicIDWorkflowClientReviewReminderPath(publicID)}`, requestData, headers) as Promise<PostOrdersPublicIDWorkflowClientReviewReminderFetchResponse>;
 }
 
-export type PostApiOrdersWorkflowClientApprovalTokenRejectFetchResponse = 
+export type PostOrdersWorkflowClientApprovalTokenRejectFetchResponse = 
 | FetchResponse<ClientApprovalStepRejectCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersWorkflowClientApprovalTokenRejectPath = (token: string) => `/api/v1/orders/workflow/client-approval/${token}/reject`;
+export const postOrdersWorkflowClientApprovalTokenRejectPath = (token: string) => `/api/v1/orders/workflow/client-approval/${token}/reject`;
 
-export const postApiOrdersWorkflowClientApprovalTokenReject = (requestContract: ClientApprovalRejectRequest, token: string, headers = new Headers()):
-  Promise<PostApiOrdersWorkflowClientApprovalTokenRejectFetchResponse> => {
+export const postOrdersWorkflowClientApprovalTokenReject = (requestContract: ClientApprovalRejectRequest, token: string, headers = new Headers()):
+  Promise<PostOrdersWorkflowClientApprovalTokenRejectFetchResponse> => {
     const requestData = getApiRequestData<ClientApprovalRejectRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersWorkflowClientApprovalTokenRejectPath(token)}`, requestData, headers) as Promise<PostApiOrdersWorkflowClientApprovalTokenRejectFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersWorkflowClientApprovalTokenRejectPath(token)}`, requestData, headers) as Promise<PostOrdersWorkflowClientApprovalTokenRejectFetchResponse>;
 }
 
-export type PutApiOrdersWorkflowClientApprovalTokenInProgressFetchResponse = 
+export type PutOrdersWorkflowClientApprovalTokenInProgressFetchResponse = 
 | FetchResponse<ClientApprovalStepInitCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const putApiOrdersWorkflowClientApprovalTokenInProgressPath = (token: string) => `/api/v1/orders/workflow/client-approval/${token}/in-progress`;
+export const putOrdersWorkflowClientApprovalTokenInProgressPath = (token: string) => `/api/v1/orders/workflow/client-approval/${token}/in-progress`;
 
-export const putApiOrdersWorkflowClientApprovalTokenInProgress = (token: string, headers = new Headers()):
-  Promise<PutApiOrdersWorkflowClientApprovalTokenInProgressFetchResponse> => {
+export const putOrdersWorkflowClientApprovalTokenInProgress = (token: string, headers = new Headers()):
+  Promise<PutOrdersWorkflowClientApprovalTokenInProgressFetchResponse> => {
     const requestData = getApiRequestData<object>(undefined, false);
 
-    return apiPut(`${getApiUrl()}${putApiOrdersWorkflowClientApprovalTokenInProgressPath(token)}`, requestData, headers) as Promise<PutApiOrdersWorkflowClientApprovalTokenInProgressFetchResponse>;
+    return apiPut(`${getApiUrl()}${putOrdersWorkflowClientApprovalTokenInProgressPath(token)}`, requestData, headers) as Promise<PutOrdersWorkflowClientApprovalTokenInProgressFetchResponse>;
 }
 
-export type PostApiOrdersWorkflowClientApprovalTokenCompleteFetchResponse = 
+export type PostOrdersWorkflowClientApprovalTokenCompleteFetchResponse = 
 | FetchResponse<CompleteClientApprovalStepCommandResult, 200> 
 | FetchResponse<ApiProblemDetailsOfCompleteClientApprovalStepError, 400> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersWorkflowClientApprovalTokenCompletePath = (token: string) => `/api/v1/orders/workflow/client-approval/${token}/complete`;
+export const postOrdersWorkflowClientApprovalTokenCompletePath = (token: string) => `/api/v1/orders/workflow/client-approval/${token}/complete`;
 
-export const postApiOrdersWorkflowClientApprovalTokenComplete = (requestContract: ClientApprovalCompleteRequest, token: string, headers = new Headers()):
-  Promise<PostApiOrdersWorkflowClientApprovalTokenCompleteFetchResponse> => {
+export const postOrdersWorkflowClientApprovalTokenComplete = (requestContract: ClientApprovalCompleteRequest, token: string, headers = new Headers()):
+  Promise<PostOrdersWorkflowClientApprovalTokenCompleteFetchResponse> => {
     const requestData = getApiRequestData<ClientApprovalCompleteRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersWorkflowClientApprovalTokenCompletePath(token)}`, requestData, headers) as Promise<PostApiOrdersWorkflowClientApprovalTokenCompleteFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersWorkflowClientApprovalTokenCompletePath(token)}`, requestData, headers) as Promise<PostOrdersWorkflowClientApprovalTokenCompleteFetchResponse>;
 }
 
-export type PostApiOrdersPublicIDWorkflowProcessingServicesOrderServiceIDCompleteFetchResponse = 
+export type PostOrdersPublicIDWorkflowProcessingServicesOrderServiceIDCompleteFetchResponse = 
 | FetchResponse<OrderServiceCompleteCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersPublicIDWorkflowProcessingServicesOrderServiceIDCompletePath = (publicID: string, orderServiceID: number) => `/api/v1/orders/${publicID}/workflow/processing-services/${orderServiceID}/complete`;
+export const postOrdersPublicIDWorkflowProcessingServicesOrderServiceIDCompletePath = (publicID: string, orderServiceID: number) => `/api/v1/orders/${publicID}/workflow/processing-services/${orderServiceID}/complete`;
 
-export const postApiOrdersPublicIDWorkflowProcessingServicesOrderServiceIDComplete = (publicID: string, orderServiceID: number, headers = new Headers()):
-  Promise<PostApiOrdersPublicIDWorkflowProcessingServicesOrderServiceIDCompleteFetchResponse> => {
+export const postOrdersPublicIDWorkflowProcessingServicesOrderServiceIDComplete = (publicID: string, orderServiceID: number, headers = new Headers()):
+  Promise<PostOrdersPublicIDWorkflowProcessingServicesOrderServiceIDCompleteFetchResponse> => {
     const requestData = getApiRequestData<object>(undefined, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersPublicIDWorkflowProcessingServicesOrderServiceIDCompletePath(publicID, orderServiceID)}`, requestData, headers) as Promise<PostApiOrdersPublicIDWorkflowProcessingServicesOrderServiceIDCompleteFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersPublicIDWorkflowProcessingServicesOrderServiceIDCompletePath(publicID, orderServiceID)}`, requestData, headers) as Promise<PostOrdersPublicIDWorkflowProcessingServicesOrderServiceIDCompleteFetchResponse>;
 }
 
-export type PostApiOrdersPublicIDWorkflowInvoiceIssuanceCompleteFetchResponse = 
+export type PostOrdersPublicIDWorkflowInvoiceIssuanceCompleteFetchResponse = 
 | FetchResponse<InvoiceIssuanceStepCompleteCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersPublicIDWorkflowInvoiceIssuanceCompletePath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/invoice-issuance/complete`;
+export const postOrdersPublicIDWorkflowInvoiceIssuanceCompletePath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/invoice-issuance/complete`;
 
-export const postApiOrdersPublicIDWorkflowInvoiceIssuanceComplete = (publicID: string, headers = new Headers()):
-  Promise<PostApiOrdersPublicIDWorkflowInvoiceIssuanceCompleteFetchResponse> => {
+export const postOrdersPublicIDWorkflowInvoiceIssuanceComplete = (publicID: string, headers = new Headers()):
+  Promise<PostOrdersPublicIDWorkflowInvoiceIssuanceCompleteFetchResponse> => {
     const requestData = getApiRequestData<object>(undefined, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersPublicIDWorkflowInvoiceIssuanceCompletePath(publicID)}`, requestData, headers) as Promise<PostApiOrdersPublicIDWorkflowInvoiceIssuanceCompleteFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersPublicIDWorkflowInvoiceIssuanceCompletePath(publicID)}`, requestData, headers) as Promise<PostOrdersPublicIDWorkflowInvoiceIssuanceCompleteFetchResponse>;
 }
 
-export type PostApiOrdersPublicIDWorkflowInvoicePaymentCompleteFetchResponse = 
+export type PostOrdersPublicIDWorkflowInvoicePaymentCompleteFetchResponse = 
 | FetchResponse<InvoicePaymentStepCompleteCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersPublicIDWorkflowInvoicePaymentCompletePath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/invoice-payment/complete`;
+export const postOrdersPublicIDWorkflowInvoicePaymentCompletePath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/invoice-payment/complete`;
 
-export const postApiOrdersPublicIDWorkflowInvoicePaymentComplete = (publicID: string, headers = new Headers()):
-  Promise<PostApiOrdersPublicIDWorkflowInvoicePaymentCompleteFetchResponse> => {
+export const postOrdersPublicIDWorkflowInvoicePaymentComplete = (publicID: string, headers = new Headers()):
+  Promise<PostOrdersPublicIDWorkflowInvoicePaymentCompleteFetchResponse> => {
     const requestData = getApiRequestData<object>(undefined, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersPublicIDWorkflowInvoicePaymentCompletePath(publicID)}`, requestData, headers) as Promise<PostApiOrdersPublicIDWorkflowInvoicePaymentCompleteFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersPublicIDWorkflowInvoicePaymentCompletePath(publicID)}`, requestData, headers) as Promise<PostOrdersPublicIDWorkflowInvoicePaymentCompleteFetchResponse>;
 }
 
-export type PostApiOrdersPublicIDWorkflowInvoicePaymentReminderFetchResponse = 
+export type PostOrdersPublicIDWorkflowInvoicePaymentReminderFetchResponse = 
 | FetchResponse<InvoicePaymentStepReminderCommand, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersPublicIDWorkflowInvoicePaymentReminderPath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/invoice-payment/reminder`;
+export const postOrdersPublicIDWorkflowInvoicePaymentReminderPath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/invoice-payment/reminder`;
 
-export const postApiOrdersPublicIDWorkflowInvoicePaymentReminder = (publicID: string, headers = new Headers()):
-  Promise<PostApiOrdersPublicIDWorkflowInvoicePaymentReminderFetchResponse> => {
+export const postOrdersPublicIDWorkflowInvoicePaymentReminder = (publicID: string, headers = new Headers()):
+  Promise<PostOrdersPublicIDWorkflowInvoicePaymentReminderFetchResponse> => {
     const requestData = getApiRequestData<object>(undefined, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersPublicIDWorkflowInvoicePaymentReminderPath(publicID)}`, requestData, headers) as Promise<PostApiOrdersPublicIDWorkflowInvoicePaymentReminderFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersPublicIDWorkflowInvoicePaymentReminderPath(publicID)}`, requestData, headers) as Promise<PostOrdersPublicIDWorkflowInvoicePaymentReminderFetchResponse>;
 }
 
-export type GetApiOrdersPublicIDWorkflowEnterpriseInvoiceIssuanceAndPaymentFetchResponse = 
+export type GetOrdersPublicIDWorkflowEnterpriseInvoiceIssuanceAndPaymentFetchResponse = 
 | FetchResponse<EnterpriseInvoiceIssuanceAndPaymentStepQueryResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiOrdersPublicIDWorkflowEnterpriseInvoiceIssuanceAndPaymentPath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/enterprise-invoice-issuance-and-payment`;
+export const getOrdersPublicIDWorkflowEnterpriseInvoiceIssuanceAndPaymentPath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/enterprise-invoice-issuance-and-payment`;
 
-export const getApiOrdersPublicIDWorkflowEnterpriseInvoiceIssuanceAndPayment = (publicID: string, headers = new Headers()):
-  Promise<GetApiOrdersPublicIDWorkflowEnterpriseInvoiceIssuanceAndPaymentFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiOrdersPublicIDWorkflowEnterpriseInvoiceIssuanceAndPaymentPath(publicID)}`, headers, {}) as Promise<GetApiOrdersPublicIDWorkflowEnterpriseInvoiceIssuanceAndPaymentFetchResponse>;
+export const getOrdersPublicIDWorkflowEnterpriseInvoiceIssuanceAndPayment = (publicID: string, headers = new Headers()):
+  Promise<GetOrdersPublicIDWorkflowEnterpriseInvoiceIssuanceAndPaymentFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getOrdersPublicIDWorkflowEnterpriseInvoiceIssuanceAndPaymentPath(publicID)}`, headers, {}) as Promise<GetOrdersPublicIDWorkflowEnterpriseInvoiceIssuanceAndPaymentFetchResponse>;
 }
 
-export type PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDCancelFetchResponse = 
+export type PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDCancelFetchResponse = 
 | FetchResponse<ClientInvoiceRecurringPaymentCancelCommandResult, 200> 
 | FetchResponse<ApiProblemDetailsOfClientInvoiceRecurringPaymentCancelErrorStatus, 400> 
 | FetchResponse<ApiProblemDetails, 401> 
@@ -2657,16 +2657,16 @@ export type PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCal
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDCancelPath = (publicID: string, paymentCalendarItemID: number) => `/api/v1/orders/${publicID}/workflow/client-invoice-recurring-payment/${paymentCalendarItemID}/cancel`;
+export const postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDCancelPath = (publicID: string, paymentCalendarItemID: number) => `/api/v1/orders/${publicID}/workflow/client-invoice-recurring-payment/${paymentCalendarItemID}/cancel`;
 
-export const postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDCancel = (publicID: string, paymentCalendarItemID: number, headers = new Headers()):
-  Promise<PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDCancelFetchResponse> => {
+export const postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDCancel = (publicID: string, paymentCalendarItemID: number, headers = new Headers()):
+  Promise<PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDCancelFetchResponse> => {
     const requestData = getApiRequestData<object>(undefined, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDCancelPath(publicID, paymentCalendarItemID)}`, requestData, headers) as Promise<PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDCancelFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDCancelPath(publicID, paymentCalendarItemID)}`, requestData, headers) as Promise<PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDCancelFetchResponse>;
 }
 
-export type PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDReminderFetchResponse = 
+export type PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDReminderFetchResponse = 
 | FetchResponse<ClientInvoiceRecurringPaymentReminderCommandResult, 200> 
 | FetchResponse<ApiProblemDetailsOfClientInvoiceRecurringPaymentReminderErrorStatus, 400> 
 | FetchResponse<ApiProblemDetails, 401> 
@@ -2674,16 +2674,16 @@ export type PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCal
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDReminderPath = (publicID: string, paymentCalendarItemID: number) => `/api/v1/orders/${publicID}/workflow/client-invoice-recurring-payment/${paymentCalendarItemID}/reminder`;
+export const postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDReminderPath = (publicID: string, paymentCalendarItemID: number) => `/api/v1/orders/${publicID}/workflow/client-invoice-recurring-payment/${paymentCalendarItemID}/reminder`;
 
-export const postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDReminder = (publicID: string, paymentCalendarItemID: number, headers = new Headers()):
-  Promise<PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDReminderFetchResponse> => {
+export const postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDReminder = (publicID: string, paymentCalendarItemID: number, headers = new Headers()):
+  Promise<PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDReminderFetchResponse> => {
     const requestData = getApiRequestData<object>(undefined, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDReminderPath(publicID, paymentCalendarItemID)}`, requestData, headers) as Promise<PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDReminderFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDReminderPath(publicID, paymentCalendarItemID)}`, requestData, headers) as Promise<PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDReminderFetchResponse>;
 }
 
-export type PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidReminderFetchResponse = 
+export type PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidReminderFetchResponse = 
 | FetchResponse<ClientPrepaidInvoiceRecurringPaymentReminderCommandResult, 200> 
 | FetchResponse<ApiProblemDetailsOfClientPrepaidInvoiceRecurringPaymentReminderErrorStatus, 400> 
 | FetchResponse<ApiProblemDetails, 401> 
@@ -2691,16 +2691,16 @@ export type PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCal
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidReminderPath = (publicID: string, paymentCalendarItemID: number) => `/api/v1/orders/${publicID}/workflow/client-invoice-recurring-payment/${paymentCalendarItemID}/prepaid/reminder`;
+export const postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidReminderPath = (publicID: string, paymentCalendarItemID: number) => `/api/v1/orders/${publicID}/workflow/client-invoice-recurring-payment/${paymentCalendarItemID}/prepaid/reminder`;
 
-export const postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidReminder = (publicID: string, paymentCalendarItemID: number, headers = new Headers()):
-  Promise<PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidReminderFetchResponse> => {
+export const postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidReminder = (publicID: string, paymentCalendarItemID: number, headers = new Headers()):
+  Promise<PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidReminderFetchResponse> => {
     const requestData = getApiRequestData<object>(undefined, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidReminderPath(publicID, paymentCalendarItemID)}`, requestData, headers) as Promise<PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidReminderFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidReminderPath(publicID, paymentCalendarItemID)}`, requestData, headers) as Promise<PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidReminderFetchResponse>;
 }
 
-export type PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDSendInvoiceFetchResponse = 
+export type PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDSendInvoiceFetchResponse = 
 | FetchResponse<ClientInvoiceRecurringPaymentCreateInvoiceCommandResult, 200> 
 | FetchResponse<ApiProblemDetailsOfClientInvoiceRecurringPaymentCreateAndSendInvoiceToClientErrorStatus, 400> 
 | FetchResponse<ApiProblemDetails, 401> 
@@ -2708,16 +2708,16 @@ export type PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCal
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDSendInvoicePath = (publicID: string, paymentCalendarItemID: number) => `/api/v1/orders/${publicID}/workflow/client-invoice-recurring-payment/${paymentCalendarItemID}/send-invoice`;
+export const postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDSendInvoicePath = (publicID: string, paymentCalendarItemID: number) => `/api/v1/orders/${publicID}/workflow/client-invoice-recurring-payment/${paymentCalendarItemID}/send-invoice`;
 
-export const postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDSendInvoice = (publicID: string, paymentCalendarItemID: number, headers = new Headers()):
-  Promise<PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDSendInvoiceFetchResponse> => {
+export const postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDSendInvoice = (publicID: string, paymentCalendarItemID: number, headers = new Headers()):
+  Promise<PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDSendInvoiceFetchResponse> => {
     const requestData = getApiRequestData<object>(undefined, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDSendInvoicePath(publicID, paymentCalendarItemID)}`, requestData, headers) as Promise<PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDSendInvoiceFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDSendInvoicePath(publicID, paymentCalendarItemID)}`, requestData, headers) as Promise<PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDSendInvoiceFetchResponse>;
 }
 
-export type PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPayFetchResponse = 
+export type PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPayFetchResponse = 
 | FetchResponse<ClientInvoiceRecurringPaymentClientPaidCommandResult, 200> 
 | FetchResponse<ApiProblemDetailsOfClientInvoiceRecurringPaymentClientPaidErrorStatus, 400> 
 | FetchResponse<ApiProblemDetails, 401> 
@@ -2725,16 +2725,16 @@ export type PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCal
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPayPath = (publicID: string, paymentCalendarItemID: number) => `/api/v1/orders/${publicID}/workflow/client-invoice-recurring-payment/${paymentCalendarItemID}/pay`;
+export const postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPayPath = (publicID: string, paymentCalendarItemID: number) => `/api/v1/orders/${publicID}/workflow/client-invoice-recurring-payment/${paymentCalendarItemID}/pay`;
 
-export const postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPay = (requestContract: ClientInvoiceRecurringPaymentClientPaidRequest, publicID: string, paymentCalendarItemID: number, headers = new Headers()):
-  Promise<PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPayFetchResponse> => {
+export const postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPay = (requestContract: ClientInvoiceRecurringPaymentClientPaidRequest, publicID: string, paymentCalendarItemID: number, headers = new Headers()):
+  Promise<PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPayFetchResponse> => {
     const requestData = getApiRequestData<ClientInvoiceRecurringPaymentClientPaidRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPayPath(publicID, paymentCalendarItemID)}`, requestData, headers) as Promise<PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPayFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPayPath(publicID, paymentCalendarItemID)}`, requestData, headers) as Promise<PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPayFetchResponse>;
 }
 
-export type PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidSendInvoiceAndPayFetchResponse = 
+export type PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidSendInvoiceAndPayFetchResponse = 
 | FetchResponse<ClientPrepaidInvoiceRecurringPaymentSendInvoiceAndSetPaidCommandResult, 200> 
 | FetchResponse<ApiProblemDetailsOfClientPrepaidInvoiceRecurringPaymentSendInvoiceAndSetPaidErrorStatus, 400> 
 | FetchResponse<ApiProblemDetails, 401> 
@@ -2742,48 +2742,48 @@ export type PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCal
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidSendInvoiceAndPayPath = (publicID: string, paymentCalendarItemID: number) => `/api/v1/orders/${publicID}/workflow/client-invoice-recurring-payment/${paymentCalendarItemID}/prepaid/send-invoice-and-pay`;
+export const postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidSendInvoiceAndPayPath = (publicID: string, paymentCalendarItemID: number) => `/api/v1/orders/${publicID}/workflow/client-invoice-recurring-payment/${paymentCalendarItemID}/prepaid/send-invoice-and-pay`;
 
-export const postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidSendInvoiceAndPay = (requestContract: ClientPrepaidInvoiceRecurringPaymentSendInvoiceAndSetPaidRequest, publicID: string, paymentCalendarItemID: number, headers = new Headers()):
-  Promise<PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidSendInvoiceAndPayFetchResponse> => {
+export const postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidSendInvoiceAndPay = (requestContract: ClientPrepaidInvoiceRecurringPaymentSendInvoiceAndSetPaidRequest, publicID: string, paymentCalendarItemID: number, headers = new Headers()):
+  Promise<PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidSendInvoiceAndPayFetchResponse> => {
     const requestData = getApiRequestData<ClientPrepaidInvoiceRecurringPaymentSendInvoiceAndSetPaidRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidSendInvoiceAndPayPath(publicID, paymentCalendarItemID)}`, requestData, headers) as Promise<PostApiOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidSendInvoiceAndPayFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidSendInvoiceAndPayPath(publicID, paymentCalendarItemID)}`, requestData, headers) as Promise<PostOrdersPublicIDWorkflowClientInvoiceRecurringPaymentPaymentCalendarItemIDPrepaidSendInvoiceAndPayFetchResponse>;
 }
 
-export type PostApiOrdersPublicIDWorkflowClientAssignmentSendAssignmentEmailFetchResponse = 
+export type PostOrdersPublicIDWorkflowClientAssignmentSendAssignmentEmailFetchResponse = 
 | FetchResponse<SendClientAssignmentEmailCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersPublicIDWorkflowClientAssignmentSendAssignmentEmailPath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/client-assignment/send-assignment-email`;
+export const postOrdersPublicIDWorkflowClientAssignmentSendAssignmentEmailPath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/client-assignment/send-assignment-email`;
 
-export const postApiOrdersPublicIDWorkflowClientAssignmentSendAssignmentEmail = (publicID: string, headers = new Headers()):
-  Promise<PostApiOrdersPublicIDWorkflowClientAssignmentSendAssignmentEmailFetchResponse> => {
+export const postOrdersPublicIDWorkflowClientAssignmentSendAssignmentEmail = (publicID: string, headers = new Headers()):
+  Promise<PostOrdersPublicIDWorkflowClientAssignmentSendAssignmentEmailFetchResponse> => {
     const requestData = getApiRequestData<object>(undefined, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersPublicIDWorkflowClientAssignmentSendAssignmentEmailPath(publicID)}`, requestData, headers) as Promise<PostApiOrdersPublicIDWorkflowClientAssignmentSendAssignmentEmailFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersPublicIDWorkflowClientAssignmentSendAssignmentEmailPath(publicID)}`, requestData, headers) as Promise<PostOrdersPublicIDWorkflowClientAssignmentSendAssignmentEmailFetchResponse>;
 }
 
-export type PostApiOrdersPublicIDWorkflowClientPrepaidPaymentApprovalCompleteFetchResponse = 
+export type PostOrdersPublicIDWorkflowClientPrepaidPaymentApprovalCompleteFetchResponse = 
 | FetchResponse<ClientPrepaidPaymentApprovalStepCompleteCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersPublicIDWorkflowClientPrepaidPaymentApprovalCompletePath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/client-prepaid-payment-approval/complete`;
+export const postOrdersPublicIDWorkflowClientPrepaidPaymentApprovalCompletePath = (publicID: string) => `/api/v1/orders/${publicID}/workflow/client-prepaid-payment-approval/complete`;
 
-export const postApiOrdersPublicIDWorkflowClientPrepaidPaymentApprovalComplete = (requestContract: ClientPrepaidPaymentApprovalStepCompleteCommandRequest, publicID: string, headers = new Headers()):
-  Promise<PostApiOrdersPublicIDWorkflowClientPrepaidPaymentApprovalCompleteFetchResponse> => {
+export const postOrdersPublicIDWorkflowClientPrepaidPaymentApprovalComplete = (requestContract: ClientPrepaidPaymentApprovalStepCompleteCommandRequest, publicID: string, headers = new Headers()):
+  Promise<PostOrdersPublicIDWorkflowClientPrepaidPaymentApprovalCompleteFetchResponse> => {
     const requestData = getApiRequestData<ClientPrepaidPaymentApprovalStepCompleteCommandRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersPublicIDWorkflowClientPrepaidPaymentApprovalCompletePath(publicID)}`, requestData, headers) as Promise<PostApiOrdersPublicIDWorkflowClientPrepaidPaymentApprovalCompleteFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersPublicIDWorkflowClientPrepaidPaymentApprovalCompletePath(publicID)}`, requestData, headers) as Promise<PostOrdersPublicIDWorkflowClientPrepaidPaymentApprovalCompleteFetchResponse>;
 }
 
-export type PostApiOrdersWorkflowClientPrepaidPaymentApprovalTokenInProgressFetchResponse = 
+export type PostOrdersWorkflowClientPrepaidPaymentApprovalTokenInProgressFetchResponse = 
 | FetchResponse<ClientPrepaidPaymentApprovalStepInProgressCommandResult, 200> 
 | FetchResponse<ApiProblemDetailsOfInProgressClientApprovalStepError, 400> 
 | FetchResponse<ApiProblemDetails, 401> 
@@ -2791,246 +2791,246 @@ export type PostApiOrdersWorkflowClientPrepaidPaymentApprovalTokenInProgressFetc
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersWorkflowClientPrepaidPaymentApprovalTokenInProgressPath = (token: string) => `/api/v1/orders/workflow/client-prepaid-payment-approval/${token}/in-progress`;
+export const postOrdersWorkflowClientPrepaidPaymentApprovalTokenInProgressPath = (token: string) => `/api/v1/orders/workflow/client-prepaid-payment-approval/${token}/in-progress`;
 
-export const postApiOrdersWorkflowClientPrepaidPaymentApprovalTokenInProgress = (requestContract: ClientPrepaidPaymentApprovalStepInProgressRequest, token: string, headers = new Headers()):
-  Promise<PostApiOrdersWorkflowClientPrepaidPaymentApprovalTokenInProgressFetchResponse> => {
+export const postOrdersWorkflowClientPrepaidPaymentApprovalTokenInProgress = (requestContract: ClientPrepaidPaymentApprovalStepInProgressRequest, token: string, headers = new Headers()):
+  Promise<PostOrdersWorkflowClientPrepaidPaymentApprovalTokenInProgressFetchResponse> => {
     const requestData = getApiRequestData<ClientPrepaidPaymentApprovalStepInProgressRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersWorkflowClientPrepaidPaymentApprovalTokenInProgressPath(token)}`, requestData, headers) as Promise<PostApiOrdersWorkflowClientPrepaidPaymentApprovalTokenInProgressFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersWorkflowClientPrepaidPaymentApprovalTokenInProgressPath(token)}`, requestData, headers) as Promise<PostOrdersWorkflowClientPrepaidPaymentApprovalTokenInProgressFetchResponse>;
 }
 
-export type PostApiOrdersWorkflowClientPrepaidPaymentApprovalTokenRejectFetchResponse = 
+export type PostOrdersWorkflowClientPrepaidPaymentApprovalTokenRejectFetchResponse = 
 | FetchResponse<ClientPrepaidPaymentApprovalStepRejectCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiOrdersWorkflowClientPrepaidPaymentApprovalTokenRejectPath = (token: string) => `/api/v1/orders/workflow/client-prepaid-payment-approval/${token}/reject`;
+export const postOrdersWorkflowClientPrepaidPaymentApprovalTokenRejectPath = (token: string) => `/api/v1/orders/workflow/client-prepaid-payment-approval/${token}/reject`;
 
-export const postApiOrdersWorkflowClientPrepaidPaymentApprovalTokenReject = (requestContract: ClientPrepaidPaymentApprovalStepRejectRequest, token: string, headers = new Headers()):
-  Promise<PostApiOrdersWorkflowClientPrepaidPaymentApprovalTokenRejectFetchResponse> => {
+export const postOrdersWorkflowClientPrepaidPaymentApprovalTokenReject = (requestContract: ClientPrepaidPaymentApprovalStepRejectRequest, token: string, headers = new Headers()):
+  Promise<PostOrdersWorkflowClientPrepaidPaymentApprovalTokenRejectFetchResponse> => {
     const requestData = getApiRequestData<ClientPrepaidPaymentApprovalStepRejectRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiOrdersWorkflowClientPrepaidPaymentApprovalTokenRejectPath(token)}`, requestData, headers) as Promise<PostApiOrdersWorkflowClientPrepaidPaymentApprovalTokenRejectFetchResponse>;
+    return apiPost(`${getApiUrl()}${postOrdersWorkflowClientPrepaidPaymentApprovalTokenRejectPath(token)}`, requestData, headers) as Promise<PostOrdersWorkflowClientPrepaidPaymentApprovalTokenRejectFetchResponse>;
 }
 
-export type PutApiNotificationsUserSettingsFetchResponse = 
+export type PutNotificationsUserSettingsFetchResponse = 
 | FetchResponse<SaveUserNotificationSettingsCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const putApiNotificationsUserSettingsPath = () => `/api/v1/notifications/user-settings`;
+export const putNotificationsUserSettingsPath = () => `/api/v1/notifications/user-settings`;
 
-export const putApiNotificationsUserSettings = (requestContract: UserNotificationUpdateRequest, headers = new Headers()):
-  Promise<PutApiNotificationsUserSettingsFetchResponse> => {
+export const putNotificationsUserSettings = (requestContract: UserNotificationUpdateRequest, headers = new Headers()):
+  Promise<PutNotificationsUserSettingsFetchResponse> => {
     const requestData = getApiRequestData<UserNotificationUpdateRequest>(requestContract, false);
 
-    return apiPut(`${getApiUrl()}${putApiNotificationsUserSettingsPath()}`, requestData, headers) as Promise<PutApiNotificationsUserSettingsFetchResponse>;
+    return apiPut(`${getApiUrl()}${putNotificationsUserSettingsPath()}`, requestData, headers) as Promise<PutNotificationsUserSettingsFetchResponse>;
 }
 
-export type GetApiInvoicesUserInvoicesFetchResponse = 
+export type GetInvoicesUserInvoicesFetchResponse = 
 | FetchResponse<EntityListOfInvoiceForSupplierCompanyByUserListItemDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiInvoicesUserInvoicesPath = () => `/api/v1/invoices/user-invoices`;
+export const getInvoicesUserInvoicesPath = () => `/api/v1/invoices/user-invoices`;
 
-export const getApiInvoicesUserInvoices = (offset?: number, limit?: number, headers = new Headers()):
-  Promise<GetApiInvoicesUserInvoicesFetchResponse> => {
+export const getInvoicesUserInvoices = (offset?: number, limit?: number, headers = new Headers()):
+  Promise<GetInvoicesUserInvoicesFetchResponse> => {
     const queryParams = {
       "offset": offset,
       "limit": limit
     }
-    return apiGet(`${getApiUrl()}${getApiInvoicesUserInvoicesPath()}`, headers, queryParams) as Promise<GetApiInvoicesUserInvoicesFetchResponse>;
+    return apiGet(`${getApiUrl()}${getInvoicesUserInvoicesPath()}`, headers, queryParams) as Promise<GetInvoicesUserInvoicesFetchResponse>;
 }
 
-export type GetApiInvoicesPublicIDFetchResponse = 
+export type GetInvoicesPublicIDFetchResponse = 
 | FetchResponse<InvoiceDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiInvoicesPublicIDPath = (publicID: string) => `/api/v1/invoices/${publicID}`;
+export const getInvoicesPublicIDPath = (publicID: string) => `/api/v1/invoices/${publicID}`;
 
-export const getApiInvoicesPublicID = (publicID: string, headers = new Headers()):
-  Promise<GetApiInvoicesPublicIDFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiInvoicesPublicIDPath(publicID)}`, headers, {}) as Promise<GetApiInvoicesPublicIDFetchResponse>;
+export const getInvoicesPublicID = (publicID: string, headers = new Headers()):
+  Promise<GetInvoicesPublicIDFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getInvoicesPublicIDPath(publicID)}`, headers, {}) as Promise<GetInvoicesPublicIDFetchResponse>;
 }
 
-export type GetApiInvoicesPublicIDISDOCFetchResponse = 
+export type GetInvoicesPublicIDISDOCFetchResponse = 
 | FetchResponse<InvoiceISDOCDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiInvoicesPublicIDISDOCPath = (publicID: string) => `/api/v1/invoices/${publicID}/ISDOC`;
+export const getInvoicesPublicIDISDOCPath = (publicID: string) => `/api/v1/invoices/${publicID}/ISDOC`;
 
-export const getApiInvoicesPublicIDISDOC = (publicID: string, headers = new Headers()):
-  Promise<GetApiInvoicesPublicIDISDOCFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiInvoicesPublicIDISDOCPath(publicID)}`, headers, {}) as Promise<GetApiInvoicesPublicIDISDOCFetchResponse>;
+export const getInvoicesPublicIDISDOC = (publicID: string, headers = new Headers()):
+  Promise<GetInvoicesPublicIDISDOCFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getInvoicesPublicIDISDOCPath(publicID)}`, headers, {}) as Promise<GetInvoicesPublicIDISDOCFetchResponse>;
 }
 
-export type GetApiInvoicesPublicIDISDOCPdfFetchResponse = 
+export type GetInvoicesPublicIDISDOCPdfFetchResponse = 
 | FetchResponse<InvoiceISDOCPdfBase64Dto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiInvoicesPublicIDISDOCPdfPath = (publicID: string) => `/api/v1/invoices/${publicID}/ISDOCPdf`;
+export const getInvoicesPublicIDISDOCPdfPath = (publicID: string) => `/api/v1/invoices/${publicID}/ISDOCPdf`;
 
-export const getApiInvoicesPublicIDISDOCPdf = (publicID: string, headers = new Headers()):
-  Promise<GetApiInvoicesPublicIDISDOCPdfFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiInvoicesPublicIDISDOCPdfPath(publicID)}`, headers, {}) as Promise<GetApiInvoicesPublicIDISDOCPdfFetchResponse>;
+export const getInvoicesPublicIDISDOCPdf = (publicID: string, headers = new Headers()):
+  Promise<GetInvoicesPublicIDISDOCPdfFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getInvoicesPublicIDISDOCPdfPath(publicID)}`, headers, {}) as Promise<GetInvoicesPublicIDISDOCPdfFetchResponse>;
 }
 
-export type GetApiInvoicesInvoiceForSupplierCompanyByUserISDOCPdfFetchResponse = 
+export type GetInvoicesInvoiceForSupplierCompanyByUserISDOCPdfFetchResponse = 
 | FetchResponse<InvoiceForSupplierCompanyByUserISDOCPdfBase64ListDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiInvoicesInvoiceForSupplierCompanyByUserISDOCPdfPath = () => `/api/v1/invoices/invoice-for-supplier-company-by-user/ISDOCPdf`;
+export const getInvoicesInvoiceForSupplierCompanyByUserISDOCPdfPath = () => `/api/v1/invoices/invoice-for-supplier-company-by-user/ISDOCPdf`;
 
-export const getApiInvoicesInvoiceForSupplierCompanyByUserISDOCPdf = (InvoicePublicIDs?: string[], headers = new Headers()):
-  Promise<GetApiInvoicesInvoiceForSupplierCompanyByUserISDOCPdfFetchResponse> => {
+export const getInvoicesInvoiceForSupplierCompanyByUserISDOCPdf = (InvoicePublicIDs?: string[], headers = new Headers()):
+  Promise<GetInvoicesInvoiceForSupplierCompanyByUserISDOCPdfFetchResponse> => {
     const queryParams = {
       "InvoicePublicIDs": InvoicePublicIDs
     }
-    return apiGet(`${getApiUrl()}${getApiInvoicesInvoiceForSupplierCompanyByUserISDOCPdfPath()}`, headers, queryParams) as Promise<GetApiInvoicesInvoiceForSupplierCompanyByUserISDOCPdfFetchResponse>;
+    return apiGet(`${getApiUrl()}${getInvoicesInvoiceForSupplierCompanyByUserISDOCPdfPath()}`, headers, queryParams) as Promise<GetInvoicesInvoiceForSupplierCompanyByUserISDOCPdfFetchResponse>;
 }
 
-export type PostApiInvoicesInvoiceForClientByOrderPublicIDCancelFetchResponse = 
+export type PostInvoicesInvoiceForClientByOrderPublicIDCancelFetchResponse = 
 | FetchResponse<CancelInvoiceForClientByOrderCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiInvoicesInvoiceForClientByOrderPublicIDCancelPath = (publicID: string) => `/api/v1/invoices/invoice-for-client-by-order/${publicID}/cancel`;
+export const postInvoicesInvoiceForClientByOrderPublicIDCancelPath = (publicID: string) => `/api/v1/invoices/invoice-for-client-by-order/${publicID}/cancel`;
 
-export const postApiInvoicesInvoiceForClientByOrderPublicIDCancel = (publicID: string, headers = new Headers()):
-  Promise<PostApiInvoicesInvoiceForClientByOrderPublicIDCancelFetchResponse> => {
+export const postInvoicesInvoiceForClientByOrderPublicIDCancel = (publicID: string, headers = new Headers()):
+  Promise<PostInvoicesInvoiceForClientByOrderPublicIDCancelFetchResponse> => {
     const requestData = getApiRequestData<object>(undefined, false);
 
-    return apiPost(`${getApiUrl()}${postApiInvoicesInvoiceForClientByOrderPublicIDCancelPath(publicID)}`, requestData, headers) as Promise<PostApiInvoicesInvoiceForClientByOrderPublicIDCancelFetchResponse>;
+    return apiPost(`${getApiUrl()}${postInvoicesInvoiceForClientByOrderPublicIDCancelPath(publicID)}`, requestData, headers) as Promise<PostInvoicesInvoiceForClientByOrderPublicIDCancelFetchResponse>;
 }
 
-export type PostApiEnterprisesFetchResponse = 
+export type PostEnterprisesFetchResponse = 
 | FetchResponse<void, 204> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiEnterprisesPath = () => `/api/v1/enterprises`;
+export const postEnterprisesPath = () => `/api/v1/enterprises`;
 
-export const postApiEnterprises = (requestContract: CreateEnterpriseRequest, headers = new Headers()):
-  Promise<PostApiEnterprisesFetchResponse> => {
+export const postEnterprises = (requestContract: CreateEnterpriseRequest, headers = new Headers()):
+  Promise<PostEnterprisesFetchResponse> => {
     const requestData = getApiRequestData<CreateEnterpriseRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiEnterprisesPath()}`, requestData, headers) as Promise<PostApiEnterprisesFetchResponse>;
+    return apiPost(`${getApiUrl()}${postEnterprisesPath()}`, requestData, headers) as Promise<PostEnterprisesFetchResponse>;
 }
 
-export type PostApiEnterprisesChangeModeFetchResponse = 
+export type PostEnterprisesChangeModeFetchResponse = 
 | FetchResponse<ChangeEnterpriseModeCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ChangeEnterpriseModeCommandResult, 403> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiEnterprisesChangeModePath = () => `/api/v1/enterprises/change-mode`;
+export const postEnterprisesChangeModePath = () => `/api/v1/enterprises/change-mode`;
 
-export const postApiEnterprisesChangeMode = (requestContract: EnterpriseModeChangeRequest, headers = new Headers()):
-  Promise<PostApiEnterprisesChangeModeFetchResponse> => {
+export const postEnterprisesChangeMode = (requestContract: EnterpriseModeChangeRequest, headers = new Headers()):
+  Promise<PostEnterprisesChangeModeFetchResponse> => {
     const requestData = getApiRequestData<EnterpriseModeChangeRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiEnterprisesChangeModePath()}`, requestData, headers) as Promise<PostApiEnterprisesChangeModeFetchResponse>;
+    return apiPost(`${getApiUrl()}${postEnterprisesChangeModePath()}`, requestData, headers) as Promise<PostEnterprisesChangeModeFetchResponse>;
 }
 
-export type PutApiEnterprisesDesignSettingsFetchResponse = 
+export type PutEnterprisesDesignSettingsFetchResponse = 
 | FetchResponse<SaveEnterpriseDesignSettingsCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ChangeEnterpriseModeCommandResult, 403> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const putApiEnterprisesDesignSettingsPath = () => `/api/v1/enterprises/design-settings`;
+export const putEnterprisesDesignSettingsPath = () => `/api/v1/enterprises/design-settings`;
 
-export const putApiEnterprisesDesignSettings = (requestContract: EnterpriseDesignSettingsUpdateRequest, headers = new Headers()):
-  Promise<PutApiEnterprisesDesignSettingsFetchResponse> => {
+export const putEnterprisesDesignSettings = (requestContract: EnterpriseDesignSettingsUpdateRequest, headers = new Headers()):
+  Promise<PutEnterprisesDesignSettingsFetchResponse> => {
     const requestData = getApiRequestData<EnterpriseDesignSettingsUpdateRequest>(requestContract, false);
 
-    return apiPut(`${getApiUrl()}${putApiEnterprisesDesignSettingsPath()}`, requestData, headers) as Promise<PutApiEnterprisesDesignSettingsFetchResponse>;
+    return apiPut(`${getApiUrl()}${putEnterprisesDesignSettingsPath()}`, requestData, headers) as Promise<PutEnterprisesDesignSettingsFetchResponse>;
 }
 
-export type PutApiEnterprisesCommunicationSettingsFetchResponse = 
+export type PutEnterprisesCommunicationSettingsFetchResponse = 
 | FetchResponse<SaveEnterpriseCommunicationSettingsCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const putApiEnterprisesCommunicationSettingsPath = () => `/api/v1/enterprises/communication-settings`;
+export const putEnterprisesCommunicationSettingsPath = () => `/api/v1/enterprises/communication-settings`;
 
-export const putApiEnterprisesCommunicationSettings = (requestContract: EnterpriseCommunicationSettingsUpdateRequest, headers = new Headers()):
-  Promise<PutApiEnterprisesCommunicationSettingsFetchResponse> => {
+export const putEnterprisesCommunicationSettings = (requestContract: EnterpriseCommunicationSettingsUpdateRequest, headers = new Headers()):
+  Promise<PutEnterprisesCommunicationSettingsFetchResponse> => {
     const requestData = getApiRequestData<EnterpriseCommunicationSettingsUpdateRequest>(requestContract, false);
 
-    return apiPut(`${getApiUrl()}${putApiEnterprisesCommunicationSettingsPath()}`, requestData, headers) as Promise<PutApiEnterprisesCommunicationSettingsFetchResponse>;
+    return apiPut(`${getApiUrl()}${putEnterprisesCommunicationSettingsPath()}`, requestData, headers) as Promise<PutEnterprisesCommunicationSettingsFetchResponse>;
 }
 
-export type GetApiEnterprisesBasicSettingsFetchResponse = 
+export type GetEnterprisesBasicSettingsFetchResponse = 
 | FetchResponse<EnterpriseBasicSettingsDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiEnterprisesBasicSettingsPath = () => `/api/v1/enterprises/basic-settings`;
+export const getEnterprisesBasicSettingsPath = () => `/api/v1/enterprises/basic-settings`;
 
-export const getApiEnterprisesBasicSettings = (headers = new Headers()):
-  Promise<GetApiEnterprisesBasicSettingsFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiEnterprisesBasicSettingsPath()}`, headers, {}) as Promise<GetApiEnterprisesBasicSettingsFetchResponse>;
+export const getEnterprisesBasicSettings = (headers = new Headers()):
+  Promise<GetEnterprisesBasicSettingsFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getEnterprisesBasicSettingsPath()}`, headers, {}) as Promise<GetEnterprisesBasicSettingsFetchResponse>;
 }
 
-export type GetApiEnterprisesExternalIDBasicSettingsFetchResponse = 
+export type GetEnterprisesExternalIDBasicSettingsFetchResponse = 
 | FetchResponse<EnterpriseBasicSettingsDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiEnterprisesExternalIDBasicSettingsPath = (externalID: string) => `/api/v1/enterprises/${externalID}/basic-settings`;
+export const getEnterprisesExternalIDBasicSettingsPath = (externalID: string) => `/api/v1/enterprises/${externalID}/basic-settings`;
 
-export const getApiEnterprisesExternalIDBasicSettings = (externalID: string, headers = new Headers()):
-  Promise<GetApiEnterprisesExternalIDBasicSettingsFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiEnterprisesExternalIDBasicSettingsPath(externalID)}`, headers, {}) as Promise<GetApiEnterprisesExternalIDBasicSettingsFetchResponse>;
+export const getEnterprisesExternalIDBasicSettings = (externalID: string, headers = new Headers()):
+  Promise<GetEnterprisesExternalIDBasicSettingsFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getEnterprisesExternalIDBasicSettingsPath(externalID)}`, headers, {}) as Promise<GetEnterprisesExternalIDBasicSettingsFetchResponse>;
 }
 
-export type GetApiEnterprisesCommissionSettingsFetchResponse = 
+export type GetEnterprisesCommissionSettingsFetchResponse = 
 | FetchResponse<EntityListOfEnterpriseCommissionSettingsListItemDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ChangeEnterpriseModeCommandResult, 403> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiEnterprisesCommissionSettingsPath = () => `/api/v1/enterprises/commission-settings`;
+export const getEnterprisesCommissionSettingsPath = () => `/api/v1/enterprises/commission-settings`;
 
-export const getApiEnterprisesCommissionSettings = (offset?: number, limit?: number, headers = new Headers()):
-  Promise<GetApiEnterprisesCommissionSettingsFetchResponse> => {
+export const getEnterprisesCommissionSettings = (offset?: number, limit?: number, headers = new Headers()):
+  Promise<GetEnterprisesCommissionSettingsFetchResponse> => {
     const queryParams = {
       "offset": offset,
       "limit": limit
     }
-    return apiGet(`${getApiUrl()}${getApiEnterprisesCommissionSettingsPath()}`, headers, queryParams) as Promise<GetApiEnterprisesCommissionSettingsFetchResponse>;
+    return apiGet(`${getApiUrl()}${getEnterprisesCommissionSettingsPath()}`, headers, queryParams) as Promise<GetEnterprisesCommissionSettingsFetchResponse>;
 }
 
-export type PostApiEnterprisesCommissionSettingsFetchResponse = 
+export type PostEnterprisesCommissionSettingsFetchResponse = 
 | FetchResponse<CreateEnterpriseCommissionSettingsCommandResult, 200> 
 | FetchResponse<ApiProblemDetailsOfCreateEnterpriseCommissionSettingsErrorStatus, 400> 
 | FetchResponse<ApiProblemDetails, 401> 
@@ -3038,188 +3038,188 @@ export type PostApiEnterprisesCommissionSettingsFetchResponse =
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiEnterprisesCommissionSettingsPath = () => `/api/v1/enterprises/commission-settings`;
+export const postEnterprisesCommissionSettingsPath = () => `/api/v1/enterprises/commission-settings`;
 
-export const postApiEnterprisesCommissionSettings = (requestContract: CreateEnterpriseCommissionSettingsRequest, headers = new Headers()):
-  Promise<PostApiEnterprisesCommissionSettingsFetchResponse> => {
+export const postEnterprisesCommissionSettings = (requestContract: CreateEnterpriseCommissionSettingsRequest, headers = new Headers()):
+  Promise<PostEnterprisesCommissionSettingsFetchResponse> => {
     const requestData = getApiRequestData<CreateEnterpriseCommissionSettingsRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiEnterprisesCommissionSettingsPath()}`, requestData, headers) as Promise<PostApiEnterprisesCommissionSettingsFetchResponse>;
+    return apiPost(`${getApiUrl()}${postEnterprisesCommissionSettingsPath()}`, requestData, headers) as Promise<PostEnterprisesCommissionSettingsFetchResponse>;
 }
 
-export type GetApiEnterprisesServiceSettingsFetchResponse = 
+export type GetEnterprisesServiceSettingsFetchResponse = 
 | FetchResponse<EnterpriseServiceSettingsDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiEnterprisesServiceSettingsPath = () => `/api/v1/enterprises/service-settings`;
+export const getEnterprisesServiceSettingsPath = () => `/api/v1/enterprises/service-settings`;
 
-export const getApiEnterprisesServiceSettings = (headers = new Headers()):
-  Promise<GetApiEnterprisesServiceSettingsFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiEnterprisesServiceSettingsPath()}`, headers, {}) as Promise<GetApiEnterprisesServiceSettingsFetchResponse>;
+export const getEnterprisesServiceSettings = (headers = new Headers()):
+  Promise<GetEnterprisesServiceSettingsFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getEnterprisesServiceSettingsPath()}`, headers, {}) as Promise<GetEnterprisesServiceSettingsFetchResponse>;
 }
 
-export type PutApiEnterprisesServiceSettingsFetchResponse = 
+export type PutEnterprisesServiceSettingsFetchResponse = 
 | FetchResponse<SaveEnterpriseServiceSettingsCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ChangeEnterpriseModeCommandResult, 403> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const putApiEnterprisesServiceSettingsPath = () => `/api/v1/enterprises/service-settings`;
+export const putEnterprisesServiceSettingsPath = () => `/api/v1/enterprises/service-settings`;
 
-export const putApiEnterprisesServiceSettings = (requestContract: EnterpriseServiceSettingsUpdateRequest, headers = new Headers()):
-  Promise<PutApiEnterprisesServiceSettingsFetchResponse> => {
+export const putEnterprisesServiceSettings = (requestContract: EnterpriseServiceSettingsUpdateRequest, headers = new Headers()):
+  Promise<PutEnterprisesServiceSettingsFetchResponse> => {
     const requestData = getApiRequestData<EnterpriseServiceSettingsUpdateRequest>(requestContract, false);
 
-    return apiPut(`${getApiUrl()}${putApiEnterprisesServiceSettingsPath()}`, requestData, headers) as Promise<PutApiEnterprisesServiceSettingsFetchResponse>;
+    return apiPut(`${getApiUrl()}${putEnterprisesServiceSettingsPath()}`, requestData, headers) as Promise<PutEnterprisesServiceSettingsFetchResponse>;
 }
 
-export type GetApiEnterprisesServicesFetchResponse = 
+export type GetEnterprisesServicesFetchResponse = 
 | FetchResponse<EnterpriseServiceListItemDto[], 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiEnterprisesServicesPath = () => `/api/v1/enterprises/services`;
+export const getEnterprisesServicesPath = () => `/api/v1/enterprises/services`;
 
-export const getApiEnterprisesServices = (headers = new Headers()):
-  Promise<GetApiEnterprisesServicesFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiEnterprisesServicesPath()}`, headers, {}) as Promise<GetApiEnterprisesServicesFetchResponse>;
+export const getEnterprisesServices = (headers = new Headers()):
+  Promise<GetEnterprisesServicesFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getEnterprisesServicesPath()}`, headers, {}) as Promise<GetEnterprisesServicesFetchResponse>;
 }
 
-export type PutApiEnterprisesServicesFetchResponse = 
+export type PutEnterprisesServicesFetchResponse = 
 | FetchResponse<SaveEnterpriseServicesCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 403> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const putApiEnterprisesServicesPath = () => `/api/v1/enterprises/services`;
+export const putEnterprisesServicesPath = () => `/api/v1/enterprises/services`;
 
-export const putApiEnterprisesServices = (requestContract: EnterpriseServicesUpdateRequest, headers = new Headers()):
-  Promise<PutApiEnterprisesServicesFetchResponse> => {
+export const putEnterprisesServices = (requestContract: EnterpriseServicesUpdateRequest, headers = new Headers()):
+  Promise<PutEnterprisesServicesFetchResponse> => {
     const requestData = getApiRequestData<EnterpriseServicesUpdateRequest>(requestContract, false);
 
-    return apiPut(`${getApiUrl()}${putApiEnterprisesServicesPath()}`, requestData, headers) as Promise<PutApiEnterprisesServicesFetchResponse>;
+    return apiPut(`${getApiUrl()}${putEnterprisesServicesPath()}`, requestData, headers) as Promise<PutEnterprisesServicesFetchResponse>;
 }
 
-export type GetApiEnterprisesLogoFetchResponse = 
+export type GetEnterprisesLogoFetchResponse = 
 | FetchResponse<EnterpriseLogoDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiEnterprisesLogoPath = () => `/api/v1/enterprises/logo`;
+export const getEnterprisesLogoPath = () => `/api/v1/enterprises/logo`;
 
-export const getApiEnterprisesLogo = (headers = new Headers()):
-  Promise<GetApiEnterprisesLogoFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiEnterprisesLogoPath()}`, headers, {}) as Promise<GetApiEnterprisesLogoFetchResponse>;
+export const getEnterprisesLogo = (headers = new Headers()):
+  Promise<GetEnterprisesLogoFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getEnterprisesLogoPath()}`, headers, {}) as Promise<GetEnterprisesLogoFetchResponse>;
 }
 
-export type GetApiEnterprisesPublicIDLogoJsonFetchResponse = 
+export type GetEnterprisesPublicIDLogoJsonFetchResponse = 
 | FetchResponse<EnterpriseLogoDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiEnterprisesPublicIDLogoJsonPath = (publicID: string) => `/api/v1/enterprises/${publicID}/logo/json`;
+export const getEnterprisesPublicIDLogoJsonPath = (publicID: string) => `/api/v1/enterprises/${publicID}/logo/json`;
 
-export const getApiEnterprisesPublicIDLogoJson = (publicID: string, headers = new Headers()):
-  Promise<GetApiEnterprisesPublicIDLogoJsonFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiEnterprisesPublicIDLogoJsonPath(publicID)}`, headers, {}) as Promise<GetApiEnterprisesPublicIDLogoJsonFetchResponse>;
+export const getEnterprisesPublicIDLogoJson = (publicID: string, headers = new Headers()):
+  Promise<GetEnterprisesPublicIDLogoJsonFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getEnterprisesPublicIDLogoJsonPath(publicID)}`, headers, {}) as Promise<GetEnterprisesPublicIDLogoJsonFetchResponse>;
 }
 
-export type GetApiEnterprisesPublicIDLogoFileFetchResponse = 
+export type GetEnterprisesPublicIDLogoFileFetchResponse = 
 | FetchResponse<File, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiEnterprisesPublicIDLogoFilePath = (publicID: string) => `/api/v1/enterprises/${publicID}/logo/file`;
+export const getEnterprisesPublicIDLogoFilePath = (publicID: string) => `/api/v1/enterprises/${publicID}/logo/file`;
 
-export const getApiEnterprisesPublicIDLogoFile = (publicID: string, headers = new Headers()):
-  Promise<GetApiEnterprisesPublicIDLogoFileFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiEnterprisesPublicIDLogoFilePath(publicID)}`, headers, {}) as Promise<GetApiEnterprisesPublicIDLogoFileFetchResponse>;
+export const getEnterprisesPublicIDLogoFile = (publicID: string, headers = new Headers()):
+  Promise<GetEnterprisesPublicIDLogoFileFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getEnterprisesPublicIDLogoFilePath(publicID)}`, headers, {}) as Promise<GetEnterprisesPublicIDLogoFileFetchResponse>;
 }
 
-export type GetApiEnterprisesPublicIDLogoTenantFileFetchResponse = 
+export type GetEnterprisesPublicIDLogoTenantFileFetchResponse = 
 | FetchResponse<File, 200> 
 | FetchResponse<ApiProblemDetails, 204> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiEnterprisesPublicIDLogoTenantFilePath = (publicID: string) => `/api/v1/enterprises/${publicID}/logo/tenant/file`;
+export const getEnterprisesPublicIDLogoTenantFilePath = (publicID: string) => `/api/v1/enterprises/${publicID}/logo/tenant/file`;
 
-export const getApiEnterprisesPublicIDLogoTenantFile = (publicID: string, headers = new Headers()):
-  Promise<GetApiEnterprisesPublicIDLogoTenantFileFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiEnterprisesPublicIDLogoTenantFilePath(publicID)}`, headers, {}) as Promise<GetApiEnterprisesPublicIDLogoTenantFileFetchResponse>;
+export const getEnterprisesPublicIDLogoTenantFile = (publicID: string, headers = new Headers()):
+  Promise<GetEnterprisesPublicIDLogoTenantFileFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getEnterprisesPublicIDLogoTenantFilePath(publicID)}`, headers, {}) as Promise<GetEnterprisesPublicIDLogoTenantFileFetchResponse>;
 }
 
-export type GetApiEnterprisesPublicIDDesignSettingsFetchResponse = 
+export type GetEnterprisesPublicIDDesignSettingsFetchResponse = 
 | FetchResponse<EnterpriseDesignSettingsDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiEnterprisesPublicIDDesignSettingsPath = (publicID: string) => `/api/v1/enterprises/${publicID}/design-settings`;
+export const getEnterprisesPublicIDDesignSettingsPath = (publicID: string) => `/api/v1/enterprises/${publicID}/design-settings`;
 
-export const getApiEnterprisesPublicIDDesignSettings = (publicID: string, headers = new Headers()):
-  Promise<GetApiEnterprisesPublicIDDesignSettingsFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiEnterprisesPublicIDDesignSettingsPath(publicID)}`, headers, {}) as Promise<GetApiEnterprisesPublicIDDesignSettingsFetchResponse>;
+export const getEnterprisesPublicIDDesignSettings = (publicID: string, headers = new Headers()):
+  Promise<GetEnterprisesPublicIDDesignSettingsFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getEnterprisesPublicIDDesignSettingsPath(publicID)}`, headers, {}) as Promise<GetEnterprisesPublicIDDesignSettingsFetchResponse>;
 }
 
-export type GetApiEnterprisesPackageServiceSettingsFetchResponse = 
+export type GetEnterprisesPackageServiceSettingsFetchResponse = 
 | FetchResponse<EnterprisePackageServiceSettingsDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiEnterprisesPackageServiceSettingsPath = () => `/api/v1/enterprises/package-service-settings`;
+export const getEnterprisesPackageServiceSettingsPath = () => `/api/v1/enterprises/package-service-settings`;
 
-export const getApiEnterprisesPackageServiceSettings = (headers = new Headers()):
-  Promise<GetApiEnterprisesPackageServiceSettingsFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiEnterprisesPackageServiceSettingsPath()}`, headers, {}) as Promise<GetApiEnterprisesPackageServiceSettingsFetchResponse>;
+export const getEnterprisesPackageServiceSettings = (headers = new Headers()):
+  Promise<GetEnterprisesPackageServiceSettingsFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getEnterprisesPackageServiceSettingsPath()}`, headers, {}) as Promise<GetEnterprisesPackageServiceSettingsFetchResponse>;
 }
 
-export type PutApiEnterprisesPackageServiceSettingsFetchResponse = 
+export type PutEnterprisesPackageServiceSettingsFetchResponse = 
 | FetchResponse<SaveEnterprisePackageServiceSettingsCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const putApiEnterprisesPackageServiceSettingsPath = () => `/api/v1/enterprises/package-service-settings`;
+export const putEnterprisesPackageServiceSettingsPath = () => `/api/v1/enterprises/package-service-settings`;
 
-export const putApiEnterprisesPackageServiceSettings = (requestContract: EnterprisePackageServiceSettingsUpdateRequest, headers = new Headers()):
-  Promise<PutApiEnterprisesPackageServiceSettingsFetchResponse> => {
+export const putEnterprisesPackageServiceSettings = (requestContract: EnterprisePackageServiceSettingsUpdateRequest, headers = new Headers()):
+  Promise<PutEnterprisesPackageServiceSettingsFetchResponse> => {
     const requestData = getApiRequestData<EnterprisePackageServiceSettingsUpdateRequest>(requestContract, false);
 
-    return apiPut(`${getApiUrl()}${putApiEnterprisesPackageServiceSettingsPath()}`, requestData, headers) as Promise<PutApiEnterprisesPackageServiceSettingsFetchResponse>;
+    return apiPut(`${getApiUrl()}${putEnterprisesPackageServiceSettingsPath()}`, requestData, headers) as Promise<PutEnterprisesPackageServiceSettingsFetchResponse>;
 }
 
-export type GetApiCutoffsFetchResponse = 
+export type GetCutoffsFetchResponse = 
 | FetchResponse<EntityListOfCutoffListItemDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 403> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiCutoffsPath = () => `/api/v1/cutoffs`;
+export const getCutoffsPath = () => `/api/v1/cutoffs`;
 
-export const getApiCutoffs = (offset?: number, limit?: number, headers = new Headers()):
-  Promise<GetApiCutoffsFetchResponse> => {
+export const getCutoffs = (offset?: number, limit?: number, headers = new Headers()):
+  Promise<GetCutoffsFetchResponse> => {
     const queryParams = {
       "offset": offset,
       "limit": limit
     }
-    return apiGet(`${getApiUrl()}${getApiCutoffsPath()}`, headers, queryParams) as Promise<GetApiCutoffsFetchResponse>;
+    return apiGet(`${getApiUrl()}${getCutoffsPath()}`, headers, queryParams) as Promise<GetCutoffsFetchResponse>;
 }
 
-export type PostApiCutoffsFetchResponse = 
+export type PostCutoffsFetchResponse = 
 | FetchResponse<CreateCutoffCommandResult, 200> 
 | FetchResponse<ApiProblemDetailsOfCreateCutoffErrorStatus, 400> 
 | FetchResponse<ApiProblemDetails, 401> 
@@ -3228,16 +3228,16 @@ export type PostApiCutoffsFetchResponse =
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiCutoffsPath = () => `/api/v1/cutoffs`;
+export const postCutoffsPath = () => `/api/v1/cutoffs`;
 
-export const postApiCutoffs = (requestContract: CutoffCreateRequest, headers = new Headers()):
-  Promise<PostApiCutoffsFetchResponse> => {
+export const postCutoffs = (requestContract: CutoffCreateRequest, headers = new Headers()):
+  Promise<PostCutoffsFetchResponse> => {
     const requestData = getApiRequestData<CutoffCreateRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiCutoffsPath()}`, requestData, headers) as Promise<PostApiCutoffsFetchResponse>;
+    return apiPost(`${getApiUrl()}${postCutoffsPath()}`, requestData, headers) as Promise<PostCutoffsFetchResponse>;
 }
 
-export type GetApiCutoffsPublicIDFetchResponse = 
+export type GetCutoffsPublicIDFetchResponse = 
 | FetchResponse<CutoffDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 403> 
@@ -3245,54 +3245,54 @@ export type GetApiCutoffsPublicIDFetchResponse =
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiCutoffsPublicIDPath = (publicID: string) => `/api/v1/cutoffs/${publicID}`;
+export const getCutoffsPublicIDPath = (publicID: string) => `/api/v1/cutoffs/${publicID}`;
 
-export const getApiCutoffsPublicID = (publicID: string, headers = new Headers()):
-  Promise<GetApiCutoffsPublicIDFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiCutoffsPublicIDPath(publicID)}`, headers, {}) as Promise<GetApiCutoffsPublicIDFetchResponse>;
+export const getCutoffsPublicID = (publicID: string, headers = new Headers()):
+  Promise<GetCutoffsPublicIDFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getCutoffsPublicIDPath(publicID)}`, headers, {}) as Promise<GetCutoffsPublicIDFetchResponse>;
 }
 
-export type GetApiCutoffsCompanyIDDateFromForNextCutoffFetchResponse = 
+export type GetCutoffsCompanyIDDateFromForNextCutoffFetchResponse = 
 | FetchResponse<DateFromForNextCutoffDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 403> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiCutoffsCompanyIDDateFromForNextCutoffPath = (companyID: number) => `/api/v1/cutoffs/${companyID}/date-from-for-next-cutoff`;
+export const getCutoffsCompanyIDDateFromForNextCutoffPath = (companyID: number) => `/api/v1/cutoffs/${companyID}/date-from-for-next-cutoff`;
 
-export const getApiCutoffsCompanyIDDateFromForNextCutoff = (companyID: number, headers = new Headers()):
-  Promise<GetApiCutoffsCompanyIDDateFromForNextCutoffFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiCutoffsCompanyIDDateFromForNextCutoffPath(companyID)}`, headers, {}) as Promise<GetApiCutoffsCompanyIDDateFromForNextCutoffFetchResponse>;
+export const getCutoffsCompanyIDDateFromForNextCutoff = (companyID: number, headers = new Headers()):
+  Promise<GetCutoffsCompanyIDDateFromForNextCutoffFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getCutoffsCompanyIDDateFromForNextCutoffPath(companyID)}`, headers, {}) as Promise<GetCutoffsCompanyIDDateFromForNextCutoffFetchResponse>;
 }
 
-export type GetApiCutoffsExpectedUserCommissionFetchResponse = 
+export type GetCutoffsExpectedUserCommissionFetchResponse = 
 | FetchResponse<GetExpectedUserCommissionQueryResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiCutoffsExpectedUserCommissionPath = () => `/api/v1/cutoffs/expected-user-commission`;
+export const getCutoffsExpectedUserCommissionPath = () => `/api/v1/cutoffs/expected-user-commission`;
 
-export const getApiCutoffsExpectedUserCommission = (headers = new Headers()):
-  Promise<GetApiCutoffsExpectedUserCommissionFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiCutoffsExpectedUserCommissionPath()}`, headers, {}) as Promise<GetApiCutoffsExpectedUserCommissionFetchResponse>;
+export const getCutoffsExpectedUserCommission = (headers = new Headers()):
+  Promise<GetCutoffsExpectedUserCommissionFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getCutoffsExpectedUserCommissionPath()}`, headers, {}) as Promise<GetCutoffsExpectedUserCommissionFetchResponse>;
 }
 
-export type GetApiCutoffsPaidUserCommissionFetchResponse = 
+export type GetCutoffsPaidUserCommissionFetchResponse = 
 | FetchResponse<GetPaidUserCommissionQueryResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiCutoffsPaidUserCommissionPath = () => `/api/v1/cutoffs/paid-user-commission`;
+export const getCutoffsPaidUserCommissionPath = () => `/api/v1/cutoffs/paid-user-commission`;
 
-export const getApiCutoffsPaidUserCommission = (headers = new Headers()):
-  Promise<GetApiCutoffsPaidUserCommissionFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiCutoffsPaidUserCommissionPath()}`, headers, {}) as Promise<GetApiCutoffsPaidUserCommissionFetchResponse>;
+export const getCutoffsPaidUserCommission = (headers = new Headers()):
+  Promise<GetCutoffsPaidUserCommissionFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getCutoffsPaidUserCommissionPath()}`, headers, {}) as Promise<GetCutoffsPaidUserCommissionFetchResponse>;
 }
 
-export type GetApiCutoffsPublicIDISDOCPdfsFetchResponse = 
+export type GetCutoffsPublicIDISDOCPdfsFetchResponse = 
 | FetchResponse<CutoffISDOCPdfsDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 403> 
@@ -3300,14 +3300,14 @@ export type GetApiCutoffsPublicIDISDOCPdfsFetchResponse =
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiCutoffsPublicIDISDOCPdfsPath = (publicID: string) => `/api/v1/cutoffs/${publicID}/ISDOCPdfs`;
+export const getCutoffsPublicIDISDOCPdfsPath = (publicID: string) => `/api/v1/cutoffs/${publicID}/ISDOCPdfs`;
 
-export const getApiCutoffsPublicIDISDOCPdfs = (publicID: string, headers = new Headers()):
-  Promise<GetApiCutoffsPublicIDISDOCPdfsFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiCutoffsPublicIDISDOCPdfsPath(publicID)}`, headers, {}) as Promise<GetApiCutoffsPublicIDISDOCPdfsFetchResponse>;
+export const getCutoffsPublicIDISDOCPdfs = (publicID: string, headers = new Headers()):
+  Promise<GetCutoffsPublicIDISDOCPdfsFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getCutoffsPublicIDISDOCPdfsPath(publicID)}`, headers, {}) as Promise<GetCutoffsPublicIDISDOCPdfsFetchResponse>;
 }
 
-export type PostApiCutoffsPublicIDSendPaymentsFetchResponse = 
+export type PostCutoffsPublicIDSendPaymentsFetchResponse = 
 | FetchResponse<SendCutoffPaymentsCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 400> 
 | FetchResponse<ApiProblemDetails, 401> 
@@ -3316,16 +3316,16 @@ export type PostApiCutoffsPublicIDSendPaymentsFetchResponse =
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiCutoffsPublicIDSendPaymentsPath = (publicID: string) => `/api/v1/cutoffs/${publicID}/send-payments`;
+export const postCutoffsPublicIDSendPaymentsPath = (publicID: string) => `/api/v1/cutoffs/${publicID}/send-payments`;
 
-export const postApiCutoffsPublicIDSendPayments = (publicID: string, headers = new Headers()):
-  Promise<PostApiCutoffsPublicIDSendPaymentsFetchResponse> => {
+export const postCutoffsPublicIDSendPayments = (publicID: string, headers = new Headers()):
+  Promise<PostCutoffsPublicIDSendPaymentsFetchResponse> => {
     const requestData = getApiRequestData<object>(undefined, false);
 
-    return apiPost(`${getApiUrl()}${postApiCutoffsPublicIDSendPaymentsPath(publicID)}`, requestData, headers) as Promise<PostApiCutoffsPublicIDSendPaymentsFetchResponse>;
+    return apiPost(`${getApiUrl()}${postCutoffsPublicIDSendPaymentsPath(publicID)}`, requestData, headers) as Promise<PostCutoffsPublicIDSendPaymentsFetchResponse>;
 }
 
-export type GetApiCutoffsPublicIDDetailPdfFetchResponse = 
+export type GetCutoffsPublicIDDetailPdfFetchResponse = 
 | FetchResponse<CutoffDetailPdfBase64Dto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 403> 
@@ -3333,27 +3333,27 @@ export type GetApiCutoffsPublicIDDetailPdfFetchResponse =
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiCutoffsPublicIDDetailPdfPath = (publicID: string) => `/api/v1/cutoffs/${publicID}/detail-pdf`;
+export const getCutoffsPublicIDDetailPdfPath = (publicID: string) => `/api/v1/cutoffs/${publicID}/detail-pdf`;
 
-export const getApiCutoffsPublicIDDetailPdf = (publicID: string, headers = new Headers()):
-  Promise<GetApiCutoffsPublicIDDetailPdfFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiCutoffsPublicIDDetailPdfPath(publicID)}`, headers, {}) as Promise<GetApiCutoffsPublicIDDetailPdfFetchResponse>;
+export const getCutoffsPublicIDDetailPdf = (publicID: string, headers = new Headers()):
+  Promise<GetCutoffsPublicIDDetailPdfFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getCutoffsPublicIDDetailPdfPath(publicID)}`, headers, {}) as Promise<GetCutoffsPublicIDDetailPdfFetchResponse>;
 }
 
-export type GetApiCutoffsUserSupplierCompaniesFetchResponse = 
+export type GetCutoffsUserSupplierCompaniesFetchResponse = 
 | FetchResponse<CutoffUserSupplierCompanyListItemDto[], 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiCutoffsUserSupplierCompaniesPath = () => `/api/v1/cutoffs/user-supplier-companies`;
+export const getCutoffsUserSupplierCompaniesPath = () => `/api/v1/cutoffs/user-supplier-companies`;
 
-export const getApiCutoffsUserSupplierCompanies = (headers = new Headers()):
-  Promise<GetApiCutoffsUserSupplierCompaniesFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiCutoffsUserSupplierCompaniesPath()}`, headers, {}) as Promise<GetApiCutoffsUserSupplierCompaniesFetchResponse>;
+export const getCutoffsUserSupplierCompanies = (headers = new Headers()):
+  Promise<GetCutoffsUserSupplierCompaniesFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getCutoffsUserSupplierCompaniesPath()}`, headers, {}) as Promise<GetCutoffsUserSupplierCompaniesFetchResponse>;
 }
 
-export type GetApiCompaniesPublicIDFetchResponse = 
+export type GetCompaniesPublicIDFetchResponse = 
 | FetchResponse<CompanyDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 403> 
@@ -3361,104 +3361,104 @@ export type GetApiCompaniesPublicIDFetchResponse =
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiCompaniesPublicIDPath = (publicID: string) => `/api/v1/companies/${publicID}`;
+export const getCompaniesPublicIDPath = (publicID: string) => `/api/v1/companies/${publicID}`;
 
-export const getApiCompaniesPublicID = (publicID: string, headers = new Headers()):
-  Promise<GetApiCompaniesPublicIDFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiCompaniesPublicIDPath(publicID)}`, headers, {}) as Promise<GetApiCompaniesPublicIDFetchResponse>;
+export const getCompaniesPublicID = (publicID: string, headers = new Headers()):
+  Promise<GetCompaniesPublicIDFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getCompaniesPublicIDPath(publicID)}`, headers, {}) as Promise<GetCompaniesPublicIDFetchResponse>;
 }
 
-export type PostApiCompaniesFetchResponse = 
+export type PostCompaniesFetchResponse = 
 | FetchResponse<CreateCompanyCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiCompaniesPath = () => `/api/v1/companies`;
+export const postCompaniesPath = () => `/api/v1/companies`;
 
-export const postApiCompanies = (requestContract: CompanyCreateRequest, headers = new Headers()):
-  Promise<PostApiCompaniesFetchResponse> => {
+export const postCompanies = (requestContract: CompanyCreateRequest, headers = new Headers()):
+  Promise<PostCompaniesFetchResponse> => {
     const requestData = getApiRequestData<CompanyCreateRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiCompaniesPath()}`, requestData, headers) as Promise<PostApiCompaniesFetchResponse>;
+    return apiPost(`${getApiUrl()}${postCompaniesPath()}`, requestData, headers) as Promise<PostCompaniesFetchResponse>;
 }
 
-export type PutApiCompaniesFetchResponse = 
+export type PutCompaniesFetchResponse = 
 | FetchResponse<UpdateCompanyCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 403> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const putApiCompaniesPath = () => `/api/v1/companies`;
+export const putCompaniesPath = () => `/api/v1/companies`;
 
-export const putApiCompanies = (requestContract: CompanyUpdateRequest, headers = new Headers()):
-  Promise<PutApiCompaniesFetchResponse> => {
+export const putCompanies = (requestContract: CompanyUpdateRequest, headers = new Headers()):
+  Promise<PutCompaniesFetchResponse> => {
     const requestData = getApiRequestData<CompanyUpdateRequest>(requestContract, false);
 
-    return apiPut(`${getApiUrl()}${putApiCompaniesPath()}`, requestData, headers) as Promise<PutApiCompaniesFetchResponse>;
+    return apiPut(`${getApiUrl()}${putCompaniesPath()}`, requestData, headers) as Promise<PutCompaniesFetchResponse>;
 }
 
-export type GetApiCompaniesUserSupplierCompaniesFetchResponse = 
+export type GetCompaniesUserSupplierCompaniesFetchResponse = 
 | FetchResponse<UserSupplierCompanyListItemDto[], 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiCompaniesUserSupplierCompaniesPath = () => `/api/v1/companies/user-supplier-companies`;
+export const getCompaniesUserSupplierCompaniesPath = () => `/api/v1/companies/user-supplier-companies`;
 
-export const getApiCompaniesUserSupplierCompanies = (headers = new Headers()):
-  Promise<GetApiCompaniesUserSupplierCompaniesFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiCompaniesUserSupplierCompaniesPath()}`, headers, {}) as Promise<GetApiCompaniesUserSupplierCompaniesFetchResponse>;
+export const getCompaniesUserSupplierCompanies = (headers = new Headers()):
+  Promise<GetCompaniesUserSupplierCompaniesFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getCompaniesUserSupplierCompaniesPath()}`, headers, {}) as Promise<GetCompaniesUserSupplierCompaniesFetchResponse>;
 }
 
-export type PostApiCompaniesUserSupplierCompanyFetchResponse = 
+export type PostCompaniesUserSupplierCompanyFetchResponse = 
 | FetchResponse<SetUserSupplierCompanyCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 403> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiCompaniesUserSupplierCompanyPath = () => `/api/v1/companies/user-supplier-company`;
+export const postCompaniesUserSupplierCompanyPath = () => `/api/v1/companies/user-supplier-company`;
 
-export const postApiCompaniesUserSupplierCompany = (requestContract: UserSupplierCompanySetRequest, headers = new Headers()):
-  Promise<PostApiCompaniesUserSupplierCompanyFetchResponse> => {
+export const postCompaniesUserSupplierCompany = (requestContract: UserSupplierCompanySetRequest, headers = new Headers()):
+  Promise<PostCompaniesUserSupplierCompanyFetchResponse> => {
     const requestData = getApiRequestData<UserSupplierCompanySetRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiCompaniesUserSupplierCompanyPath()}`, requestData, headers) as Promise<PostApiCompaniesUserSupplierCompanyFetchResponse>;
+    return apiPost(`${getApiUrl()}${postCompaniesUserSupplierCompanyPath()}`, requestData, headers) as Promise<PostCompaniesUserSupplierCompanyFetchResponse>;
 }
 
-export type GetApiCompaniesPublicIDDesignSettingsFetchResponse = 
+export type GetCompaniesPublicIDDesignSettingsFetchResponse = 
 | FetchResponse<CompanyDesignSettingsDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiCompaniesPublicIDDesignSettingsPath = (publicID: string) => `/api/v1/companies/${publicID}/design-settings`;
+export const getCompaniesPublicIDDesignSettingsPath = (publicID: string) => `/api/v1/companies/${publicID}/design-settings`;
 
-export const getApiCompaniesPublicIDDesignSettings = (publicID: string, headers = new Headers()):
-  Promise<GetApiCompaniesPublicIDDesignSettingsFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiCompaniesPublicIDDesignSettingsPath(publicID)}`, headers, {}) as Promise<GetApiCompaniesPublicIDDesignSettingsFetchResponse>;
+export const getCompaniesPublicIDDesignSettings = (publicID: string, headers = new Headers()):
+  Promise<GetCompaniesPublicIDDesignSettingsFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getCompaniesPublicIDDesignSettingsPath(publicID)}`, headers, {}) as Promise<GetCompaniesPublicIDDesignSettingsFetchResponse>;
 }
 
-export type PutApiCompaniesPublicIDDesignSettingsFetchResponse = 
+export type PutCompaniesPublicIDDesignSettingsFetchResponse = 
 | FetchResponse<SaveCompanyDesignSettingsCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 403> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const putApiCompaniesPublicIDDesignSettingsPath = (publicID: string) => `/api/v1/companies/${publicID}/design-settings`;
+export const putCompaniesPublicIDDesignSettingsPath = (publicID: string) => `/api/v1/companies/${publicID}/design-settings`;
 
-export const putApiCompaniesPublicIDDesignSettings = (requestContract: SaveCompanyDesignSettingsRequest, publicID: string, headers = new Headers()):
-  Promise<PutApiCompaniesPublicIDDesignSettingsFetchResponse> => {
+export const putCompaniesPublicIDDesignSettings = (requestContract: SaveCompanyDesignSettingsRequest, publicID: string, headers = new Headers()):
+  Promise<PutCompaniesPublicIDDesignSettingsFetchResponse> => {
     const requestData = getApiRequestData<SaveCompanyDesignSettingsRequest>(requestContract, false);
 
-    return apiPut(`${getApiUrl()}${putApiCompaniesPublicIDDesignSettingsPath(publicID)}`, requestData, headers) as Promise<PutApiCompaniesPublicIDDesignSettingsFetchResponse>;
+    return apiPut(`${getApiUrl()}${putCompaniesPublicIDDesignSettingsPath(publicID)}`, requestData, headers) as Promise<PutCompaniesPublicIDDesignSettingsFetchResponse>;
 }
 
-export type GetApiCompaniesPublicIDFioSettingsFetchResponse = 
+export type GetCompaniesPublicIDFioSettingsFetchResponse = 
 | FetchResponse<CompanyFioSettingsDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 403> 
@@ -3466,118 +3466,118 @@ export type GetApiCompaniesPublicIDFioSettingsFetchResponse =
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiCompaniesPublicIDFioSettingsPath = (publicID: string) => `/api/v1/companies/${publicID}/fio-settings`;
+export const getCompaniesPublicIDFioSettingsPath = (publicID: string) => `/api/v1/companies/${publicID}/fio-settings`;
 
-export const getApiCompaniesPublicIDFioSettings = (publicID: string, headers = new Headers()):
-  Promise<GetApiCompaniesPublicIDFioSettingsFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiCompaniesPublicIDFioSettingsPath(publicID)}`, headers, {}) as Promise<GetApiCompaniesPublicIDFioSettingsFetchResponse>;
+export const getCompaniesPublicIDFioSettings = (publicID: string, headers = new Headers()):
+  Promise<GetCompaniesPublicIDFioSettingsFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getCompaniesPublicIDFioSettingsPath(publicID)}`, headers, {}) as Promise<GetCompaniesPublicIDFioSettingsFetchResponse>;
 }
 
-export type PutApiCompaniesPublicIDFioSettingsFetchResponse = 
+export type PutCompaniesPublicIDFioSettingsFetchResponse = 
 | FetchResponse<SaveCompanyFioSettingsCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 403> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const putApiCompaniesPublicIDFioSettingsPath = (publicID: string) => `/api/v1/companies/${publicID}/fio-settings`;
+export const putCompaniesPublicIDFioSettingsPath = (publicID: string) => `/api/v1/companies/${publicID}/fio-settings`;
 
-export const putApiCompaniesPublicIDFioSettings = (requestContract: SaveFioSettingsRequest, publicID: string, headers = new Headers()):
-  Promise<PutApiCompaniesPublicIDFioSettingsFetchResponse> => {
+export const putCompaniesPublicIDFioSettings = (requestContract: SaveFioSettingsRequest, publicID: string, headers = new Headers()):
+  Promise<PutCompaniesPublicIDFioSettingsFetchResponse> => {
     const requestData = getApiRequestData<SaveFioSettingsRequest>(requestContract, false);
 
-    return apiPut(`${getApiUrl()}${putApiCompaniesPublicIDFioSettingsPath(publicID)}`, requestData, headers) as Promise<PutApiCompaniesPublicIDFioSettingsFetchResponse>;
+    return apiPut(`${getApiUrl()}${putCompaniesPublicIDFioSettingsPath(publicID)}`, requestData, headers) as Promise<PutCompaniesPublicIDFioSettingsFetchResponse>;
 }
 
-export type GetApiCompaniesPublicIDLogoFileFetchResponse = 
+export type GetCompaniesPublicIDLogoFileFetchResponse = 
 | FetchResponse<File, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiCompaniesPublicIDLogoFilePath = (publicID: string) => `/api/v1/companies/${publicID}/logo/file`;
+export const getCompaniesPublicIDLogoFilePath = (publicID: string) => `/api/v1/companies/${publicID}/logo/file`;
 
-export const getApiCompaniesPublicIDLogoFile = (publicID: string, headers = new Headers()):
-  Promise<GetApiCompaniesPublicIDLogoFileFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiCompaniesPublicIDLogoFilePath(publicID)}`, headers, {}) as Promise<GetApiCompaniesPublicIDLogoFileFetchResponse>;
+export const getCompaniesPublicIDLogoFile = (publicID: string, headers = new Headers()):
+  Promise<GetCompaniesPublicIDLogoFileFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getCompaniesPublicIDLogoFilePath(publicID)}`, headers, {}) as Promise<GetCompaniesPublicIDLogoFileFetchResponse>;
 }
 
-export type GetApiCodeListsFetchResponse = 
+export type GetCodeListsFetchResponse = 
 | FetchResponse<GetCodeListCollectionQueryResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiCodeListsPath = () => `/api/v1/code-lists`;
+export const getCodeListsPath = () => `/api/v1/code-lists`;
 
-export const getApiCodeLists = (headers = new Headers()):
-  Promise<GetApiCodeListsFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiCodeListsPath()}`, headers, {}) as Promise<GetApiCodeListsFetchResponse>;
+export const getCodeLists = (headers = new Headers()):
+  Promise<GetCodeListsFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getCodeListsPath()}`, headers, {}) as Promise<GetCodeListsFetchResponse>;
 }
 
-export type GetApiClientsCountFetchResponse = 
+export type GetClientsCountFetchResponse = 
 | FetchResponse<GetClientsCountQueryResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiClientsCountPath = () => `/api/v1/clients/count`;
+export const getClientsCountPath = () => `/api/v1/clients/count`;
 
-export const getApiClientsCount = (headers = new Headers()):
-  Promise<GetApiClientsCountFetchResponse> => {
-    return apiGet(`${getApiUrl()}${getApiClientsCountPath()}`, headers, {}) as Promise<GetApiClientsCountFetchResponse>;
+export const getClientsCount = (headers = new Headers()):
+  Promise<GetClientsCountFetchResponse> => {
+    return apiGet(`${getApiUrl()}${getClientsCountPath()}`, headers, {}) as Promise<GetClientsCountFetchResponse>;
 }
 
-export type GetApiClientsSearchFetchResponse = 
+export type GetClientsSearchFetchResponse = 
 | FetchResponse<ClientDto[], 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiClientsSearchPath = () => `/api/v1/clients/search`;
+export const getClientsSearchPath = () => `/api/v1/clients/search`;
 
-export const getApiClientsSearch = (query?: string, headers = new Headers()):
-  Promise<GetApiClientsSearchFetchResponse> => {
+export const getClientsSearch = (query?: string, headers = new Headers()):
+  Promise<GetClientsSearchFetchResponse> => {
     const queryParams = {
       "query": query
     }
-    return apiGet(`${getApiUrl()}${getApiClientsSearchPath()}`, headers, queryParams) as Promise<GetApiClientsSearchFetchResponse>;
+    return apiGet(`${getApiUrl()}${getClientsSearchPath()}`, headers, queryParams) as Promise<GetClientsSearchFetchResponse>;
 }
 
-export type GetApiClientsSearchPersonalNumberFetchResponse = 
+export type GetClientsSearchPersonalNumberFetchResponse = 
 | FetchResponse<ClientDto, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetails, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const getApiClientsSearchPersonalNumberPath = () => `/api/v1/clients/search/personal-number`;
+export const getClientsSearchPersonalNumberPath = () => `/api/v1/clients/search/personal-number`;
 
-export const getApiClientsSearchPersonalNumber = (query?: string, headers = new Headers()):
-  Promise<GetApiClientsSearchPersonalNumberFetchResponse> => {
+export const getClientsSearchPersonalNumber = (query?: string, headers = new Headers()):
+  Promise<GetClientsSearchPersonalNumberFetchResponse> => {
     const queryParams = {
       "query": query
     }
-    return apiGet(`${getApiUrl()}${getApiClientsSearchPersonalNumberPath()}`, headers, queryParams) as Promise<GetApiClientsSearchPersonalNumberFetchResponse>;
+    return apiGet(`${getApiUrl()}${getClientsSearchPersonalNumberPath()}`, headers, queryParams) as Promise<GetClientsSearchPersonalNumberFetchResponse>;
 }
 
-export type PostApiCacheRefreshFetchResponse = 
+export type PostCacheRefreshFetchResponse = 
 | FetchResponse<void, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 403> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiCacheRefreshPath = () => `/api/v1/cache/refresh`;
+export const postCacheRefreshPath = () => `/api/v1/cache/refresh`;
 
-export const postApiCacheRefresh = (body: string, headers = new Headers()):
-  Promise<PostApiCacheRefreshFetchResponse> => {
+export const postCacheRefresh = (body: string, headers = new Headers()):
+  Promise<PostCacheRefreshFetchResponse> => {
     const requestData = getApiRequestData<string>(body, false);
 
-    return apiPost(`${getApiUrl()}${postApiCacheRefreshPath()}`, requestData, headers) as Promise<PostApiCacheRefreshFetchResponse>;
+    return apiPost(`${getApiUrl()}${postCacheRefreshPath()}`, requestData, headers) as Promise<PostCacheRefreshFetchResponse>;
 }
 
-export type PostApiAuthSignUpFetchResponse = 
+export type PostAuthSignUpFetchResponse = 
 | FetchResponse<SignUpCommandResult, 201> 
 | FetchResponse<ApiProblemDetailsOfPasswordChangeResultStatus, 400> 
 | FetchResponse<ApiProblemDetails, 401> 
@@ -3585,128 +3585,128 @@ export type PostApiAuthSignUpFetchResponse =
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiAuthSignUpPath = () => `/api/v1/auth/sign-up`;
+export const postAuthSignUpPath = () => `/api/v1/auth/sign-up`;
 
-export const postApiAuthSignUp = (requestContract: SignUpCommand, headers = new Headers()):
-  Promise<PostApiAuthSignUpFetchResponse> => {
+export const postAuthSignUp = (requestContract: SignUpCommand, headers = new Headers()):
+  Promise<PostAuthSignUpFetchResponse> => {
     const requestData = getApiRequestData<SignUpCommand>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiAuthSignUpPath()}`, requestData, headers) as Promise<PostApiAuthSignUpFetchResponse>;
+    return apiPost(`${getApiUrl()}${postAuthSignUpPath()}`, requestData, headers) as Promise<PostAuthSignUpFetchResponse>;
 }
 
-export type PostApiAuthSignInFetchResponse = 
+export type PostAuthSignInFetchResponse = 
 | FetchResponse<SignInResult, 200> 
 | FetchResponse<ApiProblemDetailsOfAuthError, 400> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiAuthSignInPath = () => `/api/v1/auth/sign-in`;
+export const postAuthSignInPath = () => `/api/v1/auth/sign-in`;
 
-export const postApiAuthSignIn = (requestContract: SignInCommand, headers = new Headers()):
-  Promise<PostApiAuthSignInFetchResponse> => {
+export const postAuthSignIn = (requestContract: SignInCommand, headers = new Headers()):
+  Promise<PostAuthSignInFetchResponse> => {
     const requestData = getApiRequestData<SignInCommand>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiAuthSignInPath()}`, requestData, headers) as Promise<PostApiAuthSignInFetchResponse>;
+    return apiPost(`${getApiUrl()}${postAuthSignInPath()}`, requestData, headers) as Promise<PostAuthSignInFetchResponse>;
 }
 
-export type PostApiAuthTokenFetchResponse = 
+export type PostAuthTokenFetchResponse = 
 | FetchResponse<TokenResponse, 200> 
 | FetchResponse<ApiProblemDetailsOfAuthError, 400> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiAuthTokenPath = () => `/api/v1/auth/token`;
+export const postAuthTokenPath = () => `/api/v1/auth/token`;
 
-export const postApiAuthToken = (headers = new Headers()):
-  Promise<PostApiAuthTokenFetchResponse> => {
+export const postAuthToken = (headers = new Headers()):
+  Promise<PostAuthTokenFetchResponse> => {
     const requestData = getApiRequestData<object>(undefined, true);
 
-    return apiPost(`${getApiUrl()}${postApiAuthTokenPath()}`, requestData, headers) as Promise<PostApiAuthTokenFetchResponse>;
+    return apiPost(`${getApiUrl()}${postAuthTokenPath()}`, requestData, headers) as Promise<PostAuthTokenFetchResponse>;
 }
 
-export type PostApiAuthEmailVerificationFetchResponse = 
+export type PostAuthEmailVerificationFetchResponse = 
 | FetchResponse<EmailVerificationCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetailsOfEmailVerificationCommandResultStatus, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiAuthEmailVerificationPath = () => `/api/v1/auth/email-verification`;
+export const postAuthEmailVerificationPath = () => `/api/v1/auth/email-verification`;
 
-export const postApiAuthEmailVerification = (requestContract: EmailVerificationCommand, headers = new Headers()):
-  Promise<PostApiAuthEmailVerificationFetchResponse> => {
+export const postAuthEmailVerification = (requestContract: EmailVerificationCommand, headers = new Headers()):
+  Promise<PostAuthEmailVerificationFetchResponse> => {
     const requestData = getApiRequestData<EmailVerificationCommand>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiAuthEmailVerificationPath()}`, requestData, headers) as Promise<PostApiAuthEmailVerificationFetchResponse>;
+    return apiPost(`${getApiUrl()}${postAuthEmailVerificationPath()}`, requestData, headers) as Promise<PostAuthEmailVerificationFetchResponse>;
 }
 
-export type PostApiAuthEmailVerificationSendFetchResponse = 
+export type PostAuthEmailVerificationSendFetchResponse = 
 | FetchResponse<ResendVerificationEmailCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiAuthEmailVerificationSendPath = () => `/api/v1/auth/email-verification/send`;
+export const postAuthEmailVerificationSendPath = () => `/api/v1/auth/email-verification/send`;
 
-export const postApiAuthEmailVerificationSend = (requestContract: ResendVerificationEmailCommand, headers = new Headers()):
-  Promise<PostApiAuthEmailVerificationSendFetchResponse> => {
+export const postAuthEmailVerificationSend = (requestContract: ResendVerificationEmailCommand, headers = new Headers()):
+  Promise<PostAuthEmailVerificationSendFetchResponse> => {
     const requestData = getApiRequestData<ResendVerificationEmailCommand>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiAuthEmailVerificationSendPath()}`, requestData, headers) as Promise<PostApiAuthEmailVerificationSendFetchResponse>;
+    return apiPost(`${getApiUrl()}${postAuthEmailVerificationSendPath()}`, requestData, headers) as Promise<PostAuthEmailVerificationSendFetchResponse>;
 }
 
-export type PostApiAuthSsoFetchResponse = 
+export type PostAuthSsoFetchResponse = 
 | FetchResponse<SignInResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetailsOfAuthError, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiAuthSsoPath = () => `/api/v1/auth/sso`;
+export const postAuthSsoPath = () => `/api/v1/auth/sso`;
 
-export const postApiAuthSso = (requestContract: SsoSignInRequest, headers = new Headers()):
-  Promise<PostApiAuthSsoFetchResponse> => {
+export const postAuthSso = (requestContract: SsoSignInRequest, headers = new Headers()):
+  Promise<PostAuthSsoFetchResponse> => {
     const requestData = getApiRequestData<SsoSignInRequest>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiAuthSsoPath()}`, requestData, headers) as Promise<PostApiAuthSsoFetchResponse>;
+    return apiPost(`${getApiUrl()}${postAuthSsoPath()}`, requestData, headers) as Promise<PostAuthSsoFetchResponse>;
 }
 
-export type GetApiAuthSsoTokenFetchResponse = 
+export type GetAuthSsoTokenFetchResponse = 
 | FetchResponse<RedirectHttpResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ProblemDetails, 500> 
 | FetchResponse<ApiProblemDetails, 501> 
 | ErrorResponse;
 
-export const getApiAuthSsoTokenPath = () => `/api/v1/auth/sso-token`;
+export const getAuthSsoTokenPath = () => `/api/v1/auth/sso-token`;
 
-export const getApiAuthSsoToken = (IdentityProvider?: IdentityProvider, headers = new Headers()):
-  Promise<GetApiAuthSsoTokenFetchResponse> => {
+export const getAuthSsoToken = (IdentityProvider?: IdentityProvider, headers = new Headers()):
+  Promise<GetAuthSsoTokenFetchResponse> => {
     const queryParams = {
       "IdentityProvider": IdentityProvider
     }
-    return apiGet(`${getApiUrl()}${getApiAuthSsoTokenPath()}`, headers, queryParams) as Promise<GetApiAuthSsoTokenFetchResponse>;
+    return apiGet(`${getApiUrl()}${getAuthSsoTokenPath()}`, headers, queryParams) as Promise<GetAuthSsoTokenFetchResponse>;
 }
 
-export type PostApiAuthPasswordResetFetchResponse = 
+export type PostAuthPasswordResetFetchResponse = 
 | FetchResponse<ResetPasswordCommandResult, 200> 
 | FetchResponse<ApiProblemDetails, 401> 
 | FetchResponse<ApiProblemDetailsOfResetPasswordCommandResultStatus, 404> 
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const postApiAuthPasswordResetPath = () => `/api/v1/auth/password-reset`;
+export const postAuthPasswordResetPath = () => `/api/v1/auth/password-reset`;
 
-export const postApiAuthPasswordReset = (requestContract: ResetPasswordCommand, headers = new Headers()):
-  Promise<PostApiAuthPasswordResetFetchResponse> => {
+export const postAuthPasswordReset = (requestContract: ResetPasswordCommand, headers = new Headers()):
+  Promise<PostAuthPasswordResetFetchResponse> => {
     const requestData = getApiRequestData<ResetPasswordCommand>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiAuthPasswordResetPath()}`, requestData, headers) as Promise<PostApiAuthPasswordResetFetchResponse>;
+    return apiPost(`${getApiUrl()}${postAuthPasswordResetPath()}`, requestData, headers) as Promise<PostAuthPasswordResetFetchResponse>;
 }
 
-export type PutApiAuthPasswordFetchResponse = 
+export type PutAuthPasswordFetchResponse = 
 | FetchResponse<SetPasswordCommandResult, 200> 
 | FetchResponse<ApiProblemDetailsOfPasswordChangeResultStatus, 400> 
 | FetchResponse<ApiProblemDetails, 401> 
@@ -3714,11 +3714,11 @@ export type PutApiAuthPasswordFetchResponse =
 | FetchResponse<ProblemDetails, 500> 
 | ErrorResponse;
 
-export const putApiAuthPasswordPath = () => `/api/v1/auth/password`;
+export const putAuthPasswordPath = () => `/api/v1/auth/password`;
 
-export const putApiAuthPassword = (requestContract: SetPasswordCommand, headers = new Headers()):
-  Promise<PutApiAuthPasswordFetchResponse> => {
+export const putAuthPassword = (requestContract: SetPasswordCommand, headers = new Headers()):
+  Promise<PutAuthPasswordFetchResponse> => {
     const requestData = getApiRequestData<SetPasswordCommand>(requestContract, false);
 
-    return apiPut(`${getApiUrl()}${putApiAuthPasswordPath()}`, requestData, headers) as Promise<PutApiAuthPasswordFetchResponse>;
+    return apiPut(`${getApiUrl()}${putAuthPasswordPath()}`, requestData, headers) as Promise<PutAuthPasswordFetchResponse>;
 }
diff --git a/apps/cli/src/tests/__snapshots__/generate_one_of.ts b/apps/cli/src/tests/__snapshots__/generate_one_of.ts
index 7a87766..2e6f31b 100644
--- a/apps/cli/src/tests/__snapshots__/generate_one_of.ts
+++ b/apps/cli/src/tests/__snapshots__/generate_one_of.ts
@@ -541,30 +541,30 @@ export type Idcard = {
 	issue_date: string;
 };
 
-export type GetApiBankIDVerifyBankIdFetchResponse = 
+export type GetBankIDVerifyBankIdFetchResponse = 
 | FetchResponse<ProcessBankIDVerificationCommandResult, 200> 
 | ErrorResponse;
 
-export const getApiBankIDVerifyBankIdPath = () => `/api/BankID/verify-bank-id`;
+export const getBankIDVerifyBankIdPath = () => `/api/BankID/verify-bank-id`;
 
-export const getApiBankIDVerifyBankId = (token?: string | undefined | null, headers = new Headers()):
-  Promise<GetApiBankIDVerifyBankIdFetchResponse> => {
+export const getBankIDVerifyBankId = (token?: string | undefined | null, headers = new Headers()):
+  Promise<GetBankIDVerifyBankIdFetchResponse> => {
     const queryParams = {
       "token": token
     }
-    return apiGet(`${getApiUrl()}${getApiBankIDVerifyBankIdPath()}`, headers, queryParams) as Promise<GetApiBankIDVerifyBankIdFetchResponse>;
+    return apiGet(`${getApiUrl()}${getBankIDVerifyBankIdPath()}`, headers, queryParams) as Promise<GetBankIDVerifyBankIdFetchResponse>;
 }
 
-export type GetApiProductListFetchResponse = 
+export type GetProductListFetchResponse = 
 | FetchResponse<ProductItemDto[], 200> 
 | ErrorResponse;
 
-export const getApiProductListPath = () => `/api/product/list`;
+export const getProductListPath = () => `/api/product/list`;
 
-export const getApiProductList = (contractTypeCode?: ContractTypeCode | undefined | null, headers = new Headers()):
-  Promise<GetApiProductListFetchResponse> => {
+export const getProductList = (contractTypeCode?: ContractTypeCode | undefined | null, headers = new Headers()):
+  Promise<GetProductListFetchResponse> => {
     const queryParams = {
       "contractTypeCode": contractTypeCode
     }
-    return apiGet(`${getApiUrl()}${getApiProductListPath()}`, headers, queryParams) as Promise<GetApiProductListFetchResponse>;
+    return apiGet(`${getApiUrl()}${getProductListPath()}`, headers, queryParams) as Promise<GetProductListFetchResponse>;
 }
diff --git a/apps/cli/src/tests/__snapshots__/generate_one_of_angular.ts b/apps/cli/src/tests/__snapshots__/generate_one_of_angular.ts
index 6675d4a..0095213 100644
--- a/apps/cli/src/tests/__snapshots__/generate_one_of_angular.ts
+++ b/apps/cli/src/tests/__snapshots__/generate_one_of_angular.ts
@@ -438,14 +438,14 @@ export class ApiService {
       this.baseUrl = baseUrl ?? "";
   }
 
-  getApiBankIDVerifyBankId(token?: string | undefined | null): Observable<ResponseResult<ProcessBankIDVerificationCommandResult, 200>> {
+  getBankIDVerifyBankId(token?: string | undefined | null): Observable<ResponseResult<ProcessBankIDVerificationCommandResult, 200>> {
     const queryParams = {
       "token": token
     };
     return apiGet<ResponseResult<ProcessBankIDVerificationCommandResult, 200>>(this.httpClient, `${this.baseUrl}/api/BankID/verify-bank-id`, queryParams);
   }
 
-  getApiProductList(contractTypeCode?: ContractTypeCode | undefined | null): Observable<ResponseResult<ProductItemDto[], 200>> {
+  getProductList(contractTypeCode?: ContractTypeCode | undefined | null): Observable<ResponseResult<ProductItemDto[], 200>> {
     const queryParams = {
       "contractTypeCode": contractTypeCode
     };
diff --git a/apps/cli/src/tests/__snapshots__/generate_one_of_cookies.ts b/apps/cli/src/tests/__snapshots__/generate_one_of_cookies.ts
index f44c112..f406083 100644
--- a/apps/cli/src/tests/__snapshots__/generate_one_of_cookies.ts
+++ b/apps/cli/src/tests/__snapshots__/generate_one_of_cookies.ts
@@ -547,30 +547,30 @@ export type Idcard = {
 	issue_date: string;
 };
 
-export type GetApiBankIDVerifyBankIdFetchResponse = 
+export type GetBankIDVerifyBankIdFetchResponse = 
 | FetchResponse<ProcessBankIDVerificationCommandResult, 200> 
 | ErrorResponse;
 
-export const getApiBankIDVerifyBankIdPath = () => `/api/BankID/verify-bank-id`;
+export const getBankIDVerifyBankIdPath = () => `/api/BankID/verify-bank-id`;
 
-export const getApiBankIDVerifyBankId = (token?: string | undefined | null, headers = new Headers()):
-  Promise<GetApiBankIDVerifyBankIdFetchResponse> => {
+export const getBankIDVerifyBankId = (token?: string | undefined | null, headers = new Headers()):
+  Promise<GetBankIDVerifyBankIdFetchResponse> => {
     const queryParams = {
       "token": token
     }
-    return apiGet(`${getApiUrl()}${getApiBankIDVerifyBankIdPath()}`, headers, queryParams) as Promise<GetApiBankIDVerifyBankIdFetchResponse>;
+    return apiGet(`${getApiUrl()}${getBankIDVerifyBankIdPath()}`, headers, queryParams) as Promise<GetBankIDVerifyBankIdFetchResponse>;
 }
 
-export type GetApiProductListFetchResponse = 
+export type GetProductListFetchResponse = 
 | FetchResponse<ProductItemDto[], 200> 
 | ErrorResponse;
 
-export const getApiProductListPath = () => `/api/product/list`;
+export const getProductListPath = () => `/api/product/list`;
 
-export const getApiProductList = (contractTypeCode?: ContractTypeCode | undefined | null, headers = new Headers()):
-  Promise<GetApiProductListFetchResponse> => {
+export const getProductList = (contractTypeCode?: ContractTypeCode | undefined | null, headers = new Headers()):
+  Promise<GetProductListFetchResponse> => {
     const queryParams = {
       "contractTypeCode": contractTypeCode
     }
-    return apiGet(`${getApiUrl()}${getApiProductListPath()}`, headers, queryParams) as Promise<GetApiProductListFetchResponse>;
+    return apiGet(`${getApiUrl()}${getProductListPath()}`, headers, queryParams) as Promise<GetProductListFetchResponse>;
 }
diff --git a/apps/cli/src/tests/__snapshots__/generate_post_put_bodies.ts b/apps/cli/src/tests/__snapshots__/generate_post_put_bodies.ts
index 7f24356..23f5c52 100644
--- a/apps/cli/src/tests/__snapshots__/generate_post_put_bodies.ts
+++ b/apps/cli/src/tests/__snapshots__/generate_post_put_bodies.ts
@@ -459,28 +459,28 @@ export type ApiCallError = {
 }[];
 };
 
-export type PostApiSignatureSmsFetchResponse = 
+export type PostSignatureSmsFetchResponse = 
 | FetchResponse<boolean, 200> 
 | ErrorResponse;
 
-export const postApiSignatureSmsPath = () => `/api/signature/sms`;
+export const postSignatureSmsPath = () => `/api/signature/sms`;
 
-export const postApiSignatureSms = (requestContract: CreateNewSignatureCommand, headers = new Headers()):
-  Promise<PostApiSignatureSmsFetchResponse> => {
+export const postSignatureSms = (requestContract: CreateNewSignatureCommand, headers = new Headers()):
+  Promise<PostSignatureSmsFetchResponse> => {
     const requestData = getApiRequestData<CreateNewSignatureCommand>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiSignatureSmsPath()}`, requestData, headers) as Promise<PostApiSignatureSmsFetchResponse>;
+    return apiPost(`${getApiUrl()}${postSignatureSmsPath()}`, requestData, headers) as Promise<PostSignatureSmsFetchResponse>;
 }
 
-export type PutApiSignatureSmsFetchResponse = 
+export type PutSignatureSmsFetchResponse = 
 | FetchResponse<SignSmsCommandResult, 200> 
 | ErrorResponse;
 
-export const putApiSignatureSmsPath = () => `/api/signature/sms`;
+export const putSignatureSmsPath = () => `/api/signature/sms`;
 
-export const putApiSignatureSms = (requestContract: SmsSignDto, headers = new Headers()):
-  Promise<PutApiSignatureSmsFetchResponse> => {
+export const putSignatureSms = (requestContract: SmsSignDto, headers = new Headers()):
+  Promise<PutSignatureSmsFetchResponse> => {
     const requestData = getApiRequestData<SmsSignDto>(requestContract, false);
 
-    return apiPut(`${getApiUrl()}${putApiSignatureSmsPath()}`, requestData, headers) as Promise<PutApiSignatureSmsFetchResponse>;
+    return apiPut(`${getApiUrl()}${putSignatureSmsPath()}`, requestData, headers) as Promise<PutSignatureSmsFetchResponse>;
 }
diff --git a/apps/cli/src/tests/__snapshots__/generate_post_put_bodies_angular.ts b/apps/cli/src/tests/__snapshots__/generate_post_put_bodies_angular.ts
index e328756..b99ce26 100644
--- a/apps/cli/src/tests/__snapshots__/generate_post_put_bodies_angular.ts
+++ b/apps/cli/src/tests/__snapshots__/generate_post_put_bodies_angular.ts
@@ -356,13 +356,13 @@ export class ApiService {
       this.baseUrl = baseUrl ?? "";
   }
 
-  postApiSignatureSms(requestContract: CreateNewSignatureCommand): Observable<ResponseResult<boolean, 200>> {
+  postSignatureSms(requestContract: CreateNewSignatureCommand): Observable<ResponseResult<boolean, 200>> {
     const requestData = getApiRequestData<CreateNewSignatureCommand>(requestContract, false);
 
     return apiPost<ResponseResult<boolean, 200>>(this.httpClient, `${this.baseUrl}/api/signature/sms`, requestData);
   }
 
-  putApiSignatureSms(requestContract: SmsSignDto): Observable<ResponseResult<SignSmsCommandResult, 200>> {
+  putSignatureSms(requestContract: SmsSignDto): Observable<ResponseResult<SignSmsCommandResult, 200>> {
     const requestData = getApiRequestData<SmsSignDto>(requestContract, false);
 
     return apiPut<ResponseResult<SignSmsCommandResult, 200>>(this.httpClient, `${this.baseUrl}/api/signature/sms`, requestData);
diff --git a/apps/cli/src/tests/__snapshots__/generate_post_put_bodies_cookies.ts b/apps/cli/src/tests/__snapshots__/generate_post_put_bodies_cookies.ts
index ab9f5a6..5584d80 100644
--- a/apps/cli/src/tests/__snapshots__/generate_post_put_bodies_cookies.ts
+++ b/apps/cli/src/tests/__snapshots__/generate_post_put_bodies_cookies.ts
@@ -465,28 +465,28 @@ export type ApiCallError = {
 }[];
 };
 
-export type PostApiSignatureSmsFetchResponse = 
+export type PostSignatureSmsFetchResponse = 
 | FetchResponse<boolean, 200> 
 | ErrorResponse;
 
-export const postApiSignatureSmsPath = () => `/api/signature/sms`;
+export const postSignatureSmsPath = () => `/api/signature/sms`;
 
-export const postApiSignatureSms = (requestContract: CreateNewSignatureCommand, headers = new Headers()):
-  Promise<PostApiSignatureSmsFetchResponse> => {
+export const postSignatureSms = (requestContract: CreateNewSignatureCommand, headers = new Headers()):
+  Promise<PostSignatureSmsFetchResponse> => {
     const requestData = getApiRequestData<CreateNewSignatureCommand>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiSignatureSmsPath()}`, requestData, headers) as Promise<PostApiSignatureSmsFetchResponse>;
+    return apiPost(`${getApiUrl()}${postSignatureSmsPath()}`, requestData, headers) as Promise<PostSignatureSmsFetchResponse>;
 }
 
-export type PutApiSignatureSmsFetchResponse = 
+export type PutSignatureSmsFetchResponse = 
 | FetchResponse<SignSmsCommandResult, 200> 
 | ErrorResponse;
 
-export const putApiSignatureSmsPath = () => `/api/signature/sms`;
+export const putSignatureSmsPath = () => `/api/signature/sms`;
 
-export const putApiSignatureSms = (requestContract: SmsSignDto, headers = new Headers()):
-  Promise<PutApiSignatureSmsFetchResponse> => {
+export const putSignatureSms = (requestContract: SmsSignDto, headers = new Headers()):
+  Promise<PutSignatureSmsFetchResponse> => {
     const requestData = getApiRequestData<SmsSignDto>(requestContract, false);
 
-    return apiPut(`${getApiUrl()}${putApiSignatureSmsPath()}`, requestData, headers) as Promise<PutApiSignatureSmsFetchResponse>;
+    return apiPut(`${getApiUrl()}${putSignatureSmsPath()}`, requestData, headers) as Promise<PutSignatureSmsFetchResponse>;
 }
diff --git a/apps/cli/src/tests/__snapshots__/generate_swagger_2_0.ts b/apps/cli/src/tests/__snapshots__/generate_swagger_2_0.ts
index 9c4c1aa..291026c 100644
--- a/apps/cli/src/tests/__snapshots__/generate_swagger_2_0.ts
+++ b/apps/cli/src/tests/__snapshots__/generate_swagger_2_0.ts
@@ -462,57 +462,57 @@ export enum Status {
 	InvalidOperation = "InvalidOperation"
 };
 
-export type GetApiAgendaSearchFetchResponse = 
+export type GetAgendaSearchFetchResponse = 
 | FetchResponse<SearchResponse[], 200> 
 | ErrorResponse;
 
-export const getApiAgendaSearchPath = () => `/api/Agenda/Search`;
+export const getAgendaSearchPath = () => `/api/Agenda/Search`;
 
-export const getApiAgendaSearch = (do_num: string, dO_Id?: number, headers = new Headers()):
-  Promise<GetApiAgendaSearchFetchResponse> => {
+export const getAgendaSearch = (do_num: string, dO_Id?: number, headers = new Headers()):
+  Promise<GetAgendaSearchFetchResponse> => {
     const queryParams = {
       "do_num": do_num,
       "dO_Id": dO_Id
     }
-    return apiGet(`${getApiUrl()}${getApiAgendaSearchPath()}`, headers, queryParams) as Promise<GetApiAgendaSearchFetchResponse>;
+    return apiGet(`${getApiUrl()}${getAgendaSearchPath()}`, headers, queryParams) as Promise<GetAgendaSearchFetchResponse>;
 }
 
-export type PostApiApiUsersIsUserValidFetchResponse = 
+export type PostApiUsersIsUserValidFetchResponse = 
 | FetchResponse<object, 200> 
 | FetchResponse<number, 201> 
 | ErrorResponse;
 
-export const postApiApiUsersIsUserValidPath = () => `/api/ApiUsers/IsUserValid`;
+export const postApiUsersIsUserValidPath = () => `/api/ApiUsers/IsUserValid`;
 
-export const postApiApiUsersIsUserValid = (requestContract: LoginDataDataContract, headers = new Headers()):
-  Promise<PostApiApiUsersIsUserValidFetchResponse> => {
+export const postApiUsersIsUserValid = (requestContract: LoginDataDataContract, headers = new Headers()):
+  Promise<PostApiUsersIsUserValidFetchResponse> => {
     const requestData = getApiRequestData<LoginDataDataContract>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiApiUsersIsUserValidPath()}`, requestData, headers) as Promise<PostApiApiUsersIsUserValidFetchResponse>;
+    return apiPost(`${getApiUrl()}${postApiUsersIsUserValidPath()}`, requestData, headers) as Promise<PostApiUsersIsUserValidFetchResponse>;
 }
 
-export type PostApiContractEditContractSignaturesFetchResponse = 
+export type PostContractEditContractSignaturesFetchResponse = 
 | FetchResponse<object, 200> 
 | ErrorResponse;
 
-export const postApiContractEditContractSignaturesPath = () => `/api/Contract/EditContractSignatures`;
+export const postContractEditContractSignaturesPath = () => `/api/Contract/EditContractSignatures`;
 
-export const postApiContractEditContractSignatures = (requestContract: IPA_PlexDbContext_ContractSignature[], headers = new Headers()):
-  Promise<PostApiContractEditContractSignaturesFetchResponse> => {
+export const postContractEditContractSignatures = (requestContract: IPA_PlexDbContext_ContractSignature[], headers = new Headers()):
+  Promise<PostContractEditContractSignaturesFetchResponse> => {
     const requestData = getApiRequestData<IPA_PlexDbContext_ContractSignature[]>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiContractEditContractSignaturesPath()}`, requestData, headers) as Promise<PostApiContractEditContractSignaturesFetchResponse>;
+    return apiPost(`${getApiUrl()}${postContractEditContractSignaturesPath()}`, requestData, headers) as Promise<PostContractEditContractSignaturesFetchResponse>;
 }
 
-export type PatchApiCaseUpdateCaseTypeCaseNoCaseTypeFetchResponse = 
+export type PatchCaseUpdateCaseTypeCaseNoCaseTypeFetchResponse = 
 | FetchResponse<object, 200> 
 | ErrorResponse;
 
-export const patchApiCaseUpdateCaseTypeCaseNoCaseTypePath = (caseNo: string, caseType: string) => `/api/Case/UpdateCaseType/${caseNo}/${caseType}`;
+export const patchCaseUpdateCaseTypeCaseNoCaseTypePath = (caseNo: string, caseType: string) => `/api/Case/UpdateCaseType/${caseNo}/${caseType}`;
 
-export const patchApiCaseUpdateCaseTypeCaseNoCaseType = (caseNo: string, caseType: string, headers = new Headers()):
-  Promise<PatchApiCaseUpdateCaseTypeCaseNoCaseTypeFetchResponse> => {
+export const patchCaseUpdateCaseTypeCaseNoCaseType = (caseNo: string, caseType: string, headers = new Headers()):
+  Promise<PatchCaseUpdateCaseTypeCaseNoCaseTypeFetchResponse> => {
     const requestData = getApiRequestData<object>(undefined, false);
 
-    return apiPatch(`${getApiUrl()}${patchApiCaseUpdateCaseTypeCaseNoCaseTypePath(caseNo, caseType)}`, requestData, headers) as Promise<PatchApiCaseUpdateCaseTypeCaseNoCaseTypeFetchResponse>;
+    return apiPatch(`${getApiUrl()}${patchCaseUpdateCaseTypeCaseNoCaseTypePath(caseNo, caseType)}`, requestData, headers) as Promise<PatchCaseUpdateCaseTypeCaseNoCaseTypeFetchResponse>;
 }
diff --git a/apps/cli/src/tests/__snapshots__/generate_swagger_2_0_angular.ts b/apps/cli/src/tests/__snapshots__/generate_swagger_2_0_angular.ts
index 3443694..d0f3ede 100644
--- a/apps/cli/src/tests/__snapshots__/generate_swagger_2_0_angular.ts
+++ b/apps/cli/src/tests/__snapshots__/generate_swagger_2_0_angular.ts
@@ -359,7 +359,7 @@ export class ApiService {
       this.baseUrl = baseUrl ?? "";
   }
 
-  getApiAgendaSearch(do_num: string, dO_Id?: number): Observable<ResponseResult<SearchResponse[], 200>> {
+  getAgendaSearch(do_num: string, dO_Id?: number): Observable<ResponseResult<SearchResponse[], 200>> {
     const queryParams = {
       "do_num": do_num,
       "dO_Id": dO_Id
@@ -367,19 +367,19 @@ export class ApiService {
     return apiGet<ResponseResult<SearchResponse[], 200>>(this.httpClient, `${this.baseUrl}/api/Agenda/Search`, queryParams);
   }
 
-  postApiApiUsersIsUserValid(requestContract: LoginDataDataContract): Observable<ResponseResult<object, 200> | ResponseResult<number, 201>> {
+  postApiUsersIsUserValid(requestContract: LoginDataDataContract): Observable<ResponseResult<object, 200> | ResponseResult<number, 201>> {
     const requestData = getApiRequestData<LoginDataDataContract>(requestContract, false);
 
     return apiPost<ResponseResult<object, 200> | ResponseResult<number, 201>>(this.httpClient, `${this.baseUrl}/api/ApiUsers/IsUserValid`, requestData);
   }
 
-  postApiContractEditContractSignatures(requestContract: IPA_PlexDbContext_ContractSignature[]): Observable<ResponseResult<object, 200>> {
+  postContractEditContractSignatures(requestContract: IPA_PlexDbContext_ContractSignature[]): Observable<ResponseResult<object, 200>> {
     const requestData = getApiRequestData<IPA_PlexDbContext_ContractSignature[]>(requestContract, false);
 
     return apiPost<ResponseResult<object, 200>>(this.httpClient, `${this.baseUrl}/api/Contract/EditContractSignatures`, requestData);
   }
 
-  patchApiCaseUpdateCaseTypeCaseNoCaseType(caseNo: string, caseType: string): Observable<ResponseResult<object, 200>> {
+  patchCaseUpdateCaseTypeCaseNoCaseType(caseNo: string, caseType: string): Observable<ResponseResult<object, 200>> {
     const requestData = getApiRequestData<object>(undefined, false);
 
     return apiPatch<ResponseResult<object, 200>>(this.httpClient, `${this.baseUrl}/api/Case/UpdateCaseType/${caseNo}/${caseType}`, requestData);
diff --git a/apps/cli/src/tests/__snapshots__/generate_swagger_2_0_cookies.ts b/apps/cli/src/tests/__snapshots__/generate_swagger_2_0_cookies.ts
index 70eefdb..b770358 100644
--- a/apps/cli/src/tests/__snapshots__/generate_swagger_2_0_cookies.ts
+++ b/apps/cli/src/tests/__snapshots__/generate_swagger_2_0_cookies.ts
@@ -468,57 +468,57 @@ export enum Status {
 	InvalidOperation = "InvalidOperation"
 };
 
-export type GetApiAgendaSearchFetchResponse = 
+export type GetAgendaSearchFetchResponse = 
 | FetchResponse<SearchResponse[], 200> 
 | ErrorResponse;
 
-export const getApiAgendaSearchPath = () => `/api/Agenda/Search`;
+export const getAgendaSearchPath = () => `/api/Agenda/Search`;
 
-export const getApiAgendaSearch = (do_num: string, dO_Id?: number, headers = new Headers()):
-  Promise<GetApiAgendaSearchFetchResponse> => {
+export const getAgendaSearch = (do_num: string, dO_Id?: number, headers = new Headers()):
+  Promise<GetAgendaSearchFetchResponse> => {
     const queryParams = {
       "do_num": do_num,
       "dO_Id": dO_Id
     }
-    return apiGet(`${getApiUrl()}${getApiAgendaSearchPath()}`, headers, queryParams) as Promise<GetApiAgendaSearchFetchResponse>;
+    return apiGet(`${getApiUrl()}${getAgendaSearchPath()}`, headers, queryParams) as Promise<GetAgendaSearchFetchResponse>;
 }
 
-export type PostApiApiUsersIsUserValidFetchResponse = 
+export type PostApiUsersIsUserValidFetchResponse = 
 | FetchResponse<object, 200> 
 | FetchResponse<number, 201> 
 | ErrorResponse;
 
-export const postApiApiUsersIsUserValidPath = () => `/api/ApiUsers/IsUserValid`;
+export const postApiUsersIsUserValidPath = () => `/api/ApiUsers/IsUserValid`;
 
-export const postApiApiUsersIsUserValid = (requestContract: LoginDataDataContract, headers = new Headers()):
-  Promise<PostApiApiUsersIsUserValidFetchResponse> => {
+export const postApiUsersIsUserValid = (requestContract: LoginDataDataContract, headers = new Headers()):
+  Promise<PostApiUsersIsUserValidFetchResponse> => {
     const requestData = getApiRequestData<LoginDataDataContract>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiApiUsersIsUserValidPath()}`, requestData, headers) as Promise<PostApiApiUsersIsUserValidFetchResponse>;
+    return apiPost(`${getApiUrl()}${postApiUsersIsUserValidPath()}`, requestData, headers) as Promise<PostApiUsersIsUserValidFetchResponse>;
 }
 
-export type PostApiContractEditContractSignaturesFetchResponse = 
+export type PostContractEditContractSignaturesFetchResponse = 
 | FetchResponse<object, 200> 
 | ErrorResponse;
 
-export const postApiContractEditContractSignaturesPath = () => `/api/Contract/EditContractSignatures`;
+export const postContractEditContractSignaturesPath = () => `/api/Contract/EditContractSignatures`;
 
-export const postApiContractEditContractSignatures = (requestContract: IPA_PlexDbContext_ContractSignature[], headers = new Headers()):
-  Promise<PostApiContractEditContractSignaturesFetchResponse> => {
+export const postContractEditContractSignatures = (requestContract: IPA_PlexDbContext_ContractSignature[], headers = new Headers()):
+  Promise<PostContractEditContractSignaturesFetchResponse> => {
     const requestData = getApiRequestData<IPA_PlexDbContext_ContractSignature[]>(requestContract, false);
 
-    return apiPost(`${getApiUrl()}${postApiContractEditContractSignaturesPath()}`, requestData, headers) as Promise<PostApiContractEditContractSignaturesFetchResponse>;
+    return apiPost(`${getApiUrl()}${postContractEditContractSignaturesPath()}`, requestData, headers) as Promise<PostContractEditContractSignaturesFetchResponse>;
 }
 
-export type PatchApiCaseUpdateCaseTypeCaseNoCaseTypeFetchResponse = 
+export type PatchCaseUpdateCaseTypeCaseNoCaseTypeFetchResponse = 
 | FetchResponse<object, 200> 
 | ErrorResponse;
 
-export const patchApiCaseUpdateCaseTypeCaseNoCaseTypePath = (caseNo: string, caseType: string) => `/api/Case/UpdateCaseType/${caseNo}/${caseType}`;
+export const patchCaseUpdateCaseTypeCaseNoCaseTypePath = (caseNo: string, caseType: string) => `/api/Case/UpdateCaseType/${caseNo}/${caseType}`;
 
-export const patchApiCaseUpdateCaseTypeCaseNoCaseType = (caseNo: string, caseType: string, headers = new Headers()):
-  Promise<PatchApiCaseUpdateCaseTypeCaseNoCaseTypeFetchResponse> => {
+export const patchCaseUpdateCaseTypeCaseNoCaseType = (caseNo: string, caseType: string, headers = new Headers()):
+  Promise<PatchCaseUpdateCaseTypeCaseNoCaseTypeFetchResponse> => {
     const requestData = getApiRequestData<object>(undefined, false);
 
-    return apiPatch(`${getApiUrl()}${patchApiCaseUpdateCaseTypeCaseNoCaseTypePath(caseNo, caseType)}`, requestData, headers) as Promise<PatchApiCaseUpdateCaseTypeCaseNoCaseTypeFetchResponse>;
+    return apiPatch(`${getApiUrl()}${patchCaseUpdateCaseTypeCaseNoCaseTypePath(caseNo, caseType)}`, requestData, headers) as Promise<PatchCaseUpdateCaseTypeCaseNoCaseTypeFetchResponse>;
 }
diff --git a/apps/cli/src/tests/fixtures/common_prefix_v3.json b/apps/cli/src/tests/fixtures/common_prefix_api_v1.json
similarity index 100%
rename from apps/cli/src/tests/fixtures/common_prefix_v3.json
rename to apps/cli/src/tests/fixtures/common_prefix_api_v1.json
diff --git a/apps/cli/src/tests/generate.test.ts b/apps/cli/src/tests/generate.test.ts
index 840cb4c..63a3b65 100644
--- a/apps/cli/src/tests/generate.test.ts
+++ b/apps/cli/src/tests/generate.test.ts
@@ -14,10 +14,10 @@ const cases = [
   "swagger_2_0",
   "multipart_formdata",
   "multipart_formdata_multiplefiles",
+  "common_prefix_api_v1",
   "common_prefix_countryCode",
   "common_prefix_v1",
   "common_prefix_v2",
-  "common_prefix_v3",
   "all_of_reference",
 ];
 
@@ -33,19 +33,19 @@ for (const name of cases) {
   describe(name, () => {
     test("Generate", async () => {
       const api = await SwaggerParser.parse(fixturePath(name));
-      const content = await generate(api);
+      const content = await generate(api, false, false, ["api_", "v1_"]);
       expect(content).toMatchFileSnapshot(snapshotPath(name));
     });
 
     test("Generate with cookies", async () => {
       const api = await SwaggerParser.parse(fixturePath(name));
-      const content = await generate(api, false, true);
+      const content = await generate(api, false, true, ["api_", "v1_"]);
       expect(content).toMatchFileSnapshot(snapshotPath(`${name}_cookies`));
     });
 
     test("Generate angular", async () => {
       const api = await SwaggerParser.parse(fixturePath(name));
-      const content = await generate(api, true, true);
+      const content = await generate(api, true, true, ["api_", "v1_"]);
       expect(content).toMatchFileSnapshot(snapshotPath(`${name}_angular`));
     });
   });
diff --git a/apps/docs/docs/configuration/cli-configuration.md b/apps/docs/docs/configuration/cli-configuration.md
index 3e651b8..c42a1ec 100644
--- a/apps/docs/docs/configuration/cli-configuration.md
+++ b/apps/docs/docs/configuration/cli-configuration.md
@@ -58,6 +58,18 @@ Default value is `Api.ts`.
  npx rest2ts --source https://petstore.swagger.io/v2/swagger.json --target ./generated --generate-for-angular --file-name MyApi.ts
 ```
 
+### --prefixes-to-remove / -ptr
+
+When API contains same prefix over and over again, you can use this option to remove it.
+
+For example, if you have `/api/v1/` prefix in your API, you can remove it with this option.
+
+#### Example
+
+```bash
+npx rest2ts --source https://petstore.swagger.io/v2/swagger.json --target ./generated --prefixes-to-remove api_,v1_
+```
+
 ### --cookies
 
 Generates API with cookies auth.