From e5bc19245bb881afca97409b8df04ab1ad3bc665 Mon Sep 17 00:00:00 2001 From: azure-sdk Date: Wed, 28 Aug 2024 07:49:22 +0000 Subject: [PATCH 1/3] [Automation] Generate SDK based on TypeSpec 0.20.0 --- eng/emitter-package-lock.json | 14 +- eng/emitter-package.json | 2 +- .../azure/compute/batch/BatchAsyncClient.java | 115 ++-- .../com/azure/compute/batch/BatchClient.java | 105 +++- .../batch/implementation/BatchClientImpl.java | 496 ++++++++++-------- ...zure-compute-batch_apiview_properties.json | 6 +- .../JobRouterAdministrationClientImpl.java | 80 +-- .../implementation/JobRouterClientImpl.java | 76 +-- ...nication-jobrouter_apiview_properties.json | 12 +- .../MessageTemplateClientImpl.java | 12 +- .../NotificationMessagesClientImpl.java | 28 +- ...unication-messages_apiview_properties.json | 12 +- .../computefleet/fluent/AzureFleetClient.java | 2 +- .../AzureFleetClientBuilder.java | 7 +- .../implementation/AzureFleetClientImpl.java | 6 +- .../implementation/FleetsClientImpl.java | 52 +- .../implementation/OperationsClientImpl.java | 8 +- .../contentsafety/BlocklistAsyncClient.java | 36 +- .../ai/contentsafety/BlocklistClient.java | 36 +- .../implementation/BlocklistClientImpl.java | 110 ++-- .../ContentSafetyClientImpl.java | 36 +- ...e-ai-contentsafety_apiview_properties.json | 12 +- .../DeploymentEnvironmentsClientImpl.java | 102 ++-- .../implementation/DevBoxesClientImpl.java | 142 +++-- .../implementation/DevCenterClientImpl.java | 16 +- ...eveloper-devcenter_apiview_properties.json | 18 +- .../fluent/DeviceRegistryClient.java | 2 +- .../AssetEndpointProfilesClientImpl.java | 49 +- .../implementation/AssetsClientImpl.java | 44 +- .../DeviceRegistryClientBuilder.java | 7 +- .../DeviceRegistryClientImpl.java | 6 +- .../OperationStatusClientImpl.java | 2 +- .../implementation/OperationsClientImpl.java | 8 +- .../fluent/DevOpsInfrastructureClient.java | 2 +- .../DevOpsInfrastructureClientBuilder.java | 7 +- .../DevOpsInfrastructureClientImpl.java | 6 +- .../ImageVersionsClientImpl.java | 8 +- .../implementation/OperationsClientImpl.java | 8 +- .../implementation/PoolsClientImpl.java | 41 +- .../ResourceDetailsClientImpl.java | 8 +- .../implementation/SkusClientImpl.java | 8 +- .../SubscriptionUsagesClientImpl.java | 8 +- .../DocumentIntelligenceAsyncClient.java | 16 + .../DocumentIntelligenceClient.java | 16 + ...tIntelligenceAdministrationClientImpl.java | 188 ++++--- .../DocumentIntelligenceClientImpl.java | 142 ++++- ...cumentintelligence_apiview_properties.json | 12 +- .../easm/implementation/EasmClientImpl.java | 261 +++++---- ...tics-defender-easm_apiview_properties.json | 6 +- .../EventGridReceiverClientImpl.java | 52 +- .../EventGridSenderClientImpl.java | 8 +- ...entgrid-namespaces_apiview_properties.json | 12 +- .../azure/ai/vision/face/FaceAsyncClient.java | 4 +- .../com/azure/ai/vision/face/FaceClient.java | 4 +- .../face/implementation/FaceClientImpl.java | 67 ++- .../implementation/FaceSessionClientImpl.java | 70 +-- ...ure-ai-vision-face_apiview_properties.json | 12 +- .../DeidentificationAsyncClient.java | 9 +- .../DeidentificationClient.java | 8 +- .../DeidentificationClientImpl.java | 71 +-- ...h-deidentification_apiview_properties.json | 6 +- .../fluent/HealthDataAIServicesClient.java | 2 +- .../DeidServicesClientImpl.java | 46 +- .../HealthDataAIServicesClientBuilder.java | 7 +- .../HealthDataAIServicesClientImpl.java | 6 +- .../implementation/OperationsClientImpl.java | 8 +- .../PrivateEndpointConnectionsClientImpl.java | 21 +- .../PrivateLinksClientImpl.java | 8 +- .../RadiologyInsightsAsyncClient.java | 47 +- .../RadiologyInsightsClient.java | 47 +- .../RadiologyInsightsClientImpl.java | 70 +-- .../models/InferRadiologyInsightsRequest.java | 76 +++ .../implementation/models/package-info.java | 12 + .../src/main/java/module-info.java | 1 + ...-radiologyinsights_apiview_properties.json | 8 +- .../mongocluster/fluent/DocumentDBClient.java | 2 +- .../DocumentDBClientBuilder.java | 7 +- .../implementation/DocumentDBClientImpl.java | 6 +- .../FirewallRulesClientImpl.java | 28 +- .../MongoClustersClientImpl.java | 64 ++- .../implementation/OperationsClientImpl.java | 8 +- .../PrivateEndpointConnectionsClientImpl.java | 21 +- .../PrivateLinksClientImpl.java | 8 +- .../implementation/AssistantsClientImpl.java | 340 ++++++------ .../implementation/OpenAIClientImpl.java | 108 ++-- .../azure-ai-openai_apiview_properties.json | 6 +- .../implementation/DiscoveriesImpl.java | 54 +- .../datamap/implementation/EntitiesImpl.java | 336 +++++++----- .../implementation/GlossariesImpl.java | 285 +++++----- .../datamap/implementation/LineagesImpl.java | 12 +- .../implementation/RelationshipsImpl.java | 36 +- .../implementation/TypeDefinitionsImpl.java | 125 +++-- ...cs-purview-datamap_apiview_properties.json | 2 +- .../standbypool/fluent/StandbyPoolClient.java | 2 +- .../implementation/OperationsClientImpl.java | 8 +- ...tainerGroupPoolRuntimeViewsClientImpl.java | 10 +- .../StandbyContainerGroupPoolsClientImpl.java | 44 +- .../StandbyPoolClientBuilder.java | 7 +- .../implementation/StandbyPoolClientImpl.java | 6 +- ...tualMachinePoolRuntimeViewsClientImpl.java | 10 +- .../StandbyVirtualMachinePoolsClientImpl.java | 44 +- .../StandbyVirtualMachinesClientImpl.java | 10 +- .../DocumentTranslationClientImpl.java | 55 +- .../SingleDocumentTranslationClientImpl.java | 8 +- ...anslation-document_apiview_properties.json | 12 +- .../TextTranslationClientImpl.java | 87 +-- 106 files changed, 2963 insertions(+), 1866 deletions(-) create mode 100644 sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/implementation/models/InferRadiologyInsightsRequest.java create mode 100644 sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/implementation/models/package-info.java diff --git a/eng/emitter-package-lock.json b/eng/emitter-package-lock.json index c5794a34ad2d..45a18f407b3d 100644 --- a/eng/emitter-package-lock.json +++ b/eng/emitter-package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "dependencies": { - "@azure-tools/typespec-java": "0.19.3" + "@azure-tools/typespec-java": "0.20.0" }, "devDependencies": { "@azure-tools/typespec-autorest": "0.45.0", @@ -161,9 +161,9 @@ } }, "node_modules/@azure-tools/typespec-java": { - "version": "0.19.3", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-java/-/typespec-java-0.19.3.tgz", - "integrity": "sha512-MmRiOR6mVLrXVTbEEVT9u0jlGmtPJlOz56fcdrE1nEGCuuDUwVNHL+R1cUC1ozLrbw2yTxllEUYobfxUklKFJA==", + "version": "0.20.0", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-java/-/typespec-java-0.20.0.tgz", + "integrity": "sha512-U7jm9kp6w6uc/IoZFFcRcsiUeuoO+T9XWbGhVNXFvOGAX9//+4aaV+rK2xvIWAHa08hnGX9D14t3qRade6ymvQ==", "license": "MIT", "dependencies": { "@autorest/codemodel": "~4.20.0", @@ -692,9 +692,9 @@ } }, "node_modules/micromatch": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz", - "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "license": "MIT", "dependencies": { "braces": "^3.0.3", diff --git a/eng/emitter-package.json b/eng/emitter-package.json index e04bb11a2ba7..a7b86596a0e2 100644 --- a/eng/emitter-package.json +++ b/eng/emitter-package.json @@ -1,7 +1,7 @@ { "main": "dist/src/index.js", "dependencies": { - "@azure-tools/typespec-java": "0.19.3" + "@azure-tools/typespec-java": "0.20.0" }, "devDependencies": { "@azure-tools/typespec-autorest": "0.45.0", diff --git a/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/BatchAsyncClient.java b/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/BatchAsyncClient.java index 1b30b8b19c22..c101beb2ae72 100644 --- a/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/BatchAsyncClient.java +++ b/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/BatchAsyncClient.java @@ -3385,8 +3385,11 @@ PagedFlux listApplications(RequestOptions requestOptions) { * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return contains information about an application in an Azure Batch Account along with {@link Response} on - * successful completion of {@link Mono}. + * @return information about the specified Application. + * + * This operation returns only Applications and versions that are available for + * use on Compute Nodes; that is, that can be used in an Package reference along with {@link Response} on successful + * completion of {@link Mono}. */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) @@ -6518,8 +6521,11 @@ public Mono> enablePoolAutoScaleWithResponse(String poolId, Binar * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the results and errors from an execution of a Pool autoscale formula along with {@link Response} on - * successful completion of {@link Mono}. + * @return the result of evaluating an automatic scaling formula on the Pool. + * + * This API is primarily for validating an autoscale formula, as it simply returns + * the result without applying the formula to the Pool along with {@link Response} on successful completion of + * {@link Mono}. */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) @@ -13391,7 +13397,10 @@ PagedFlux listJobPreparationAndReleaseTaskStatus(String jobId, Reque * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the Task and TaskSlot counts for a Job along with {@link Response} on successful completion of + * @return the Task counts for the specified Job. + * + * Task counts provide a count of the Tasks by active, running or completed Task + * state, and a count of Tasks which succeeded or failed along with {@link Response} on successful completion of * {@link Mono}. */ @Generated @@ -20203,11 +20212,10 @@ public Mono> deleteTaskWithResponse(String jobId, String taskId, * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return batch will retry Tasks when a recovery operation is triggered on a Node. - * Examples of recovery operations include (but are not limited to) when an - * unhealthy Node is rebooted or a Compute Node disappeared due to host failure. - * Retries due to recovery operations are independent of and are not counted - * against the maxTaskRetryCount along with {@link Response} on successful completion of {@link Mono}. + * @return information about the specified Task. + * + * For multi-instance Tasks, information such as affinityId, executionInfo and + * nodeInfo refer to the primary Task along with {@link Response} on successful completion of {@link Mono}. */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) @@ -22523,8 +22531,11 @@ public Mono> enableNodeSchedulingWithResponse(String poolId, Stri * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401. * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. - * @return the remote login settings for a Compute Node along with {@link Response} on successful completion of - * {@link Mono}. + * @return the settings required for remote login to a Compute Node. + * + * Before you can remotely login to a Compute Node using the remote login + * settings, you must create a user Account on the Compute Node along with {@link Response} on successful completion + * of {@link Mono}. */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) @@ -23944,8 +23955,10 @@ PagedFlux listApplicationsInternal() { * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains information about an application in an Azure Batch Account on successful completion of - * {@link Mono}. + * @return information about the specified Application. + * + * This operation returns only Applications and versions that are available for + * use on Compute Nodes; that is, that can be used in an Package reference on successful completion of {@link Mono}. */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) @@ -23975,8 +23988,10 @@ Mono getApplicationInternal(String applicationId, Integer time * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return contains information about an application in an Azure Batch Account on successful completion of - * {@link Mono}. + * @return information about the specified Application. + * + * This operation returns only Applications and versions that are available for + * use on Compute Nodes; that is, that can be used in an Package reference on successful completion of {@link Mono}. */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) @@ -24921,7 +24936,10 @@ PagedFlux listJobPreparationAndReleaseT * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the Task and TaskSlot counts for a Job on successful completion of {@link Mono}. + * @return the Task counts for the specified Job. + * + * Task counts provide a count of the Tasks by active, running or completed Task + * state, and a count of Tasks which succeeded or failed on successful completion of {@link Mono}. */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) @@ -24950,7 +24968,10 @@ Mono getJobTaskCountsInternal(String jobId, Integer timeO * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the Task and TaskSlot counts for a Job on successful completion of {@link Mono}. + * @return the Task counts for the specified Job. + * + * Task counts provide a count of the Tasks by active, running or completed Task + * state, and a count of Tasks which succeeded or failed on successful completion of {@link Mono}. */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) @@ -25629,11 +25650,10 @@ Mono deleteTaskInternal(String jobId, String taskId) { * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return batch will retry Tasks when a recovery operation is triggered on a Node. - * Examples of recovery operations include (but are not limited to) when an - * unhealthy Node is rebooted or a Compute Node disappeared due to host failure. - * Retries due to recovery operations are independent of and are not counted - * against the maxTaskRetryCount on successful completion of {@link Mono}. + * @return information about the specified Task. + * + * For multi-instance Tasks, information such as affinityId, executionInfo and + * nodeInfo refer to the primary Task on successful completion of {@link Mono}. */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) @@ -25695,11 +25715,10 @@ Mono getTaskInternal(String jobId, String taskId, Integer timeOutInSe * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return batch will retry Tasks when a recovery operation is triggered on a Node. - * Examples of recovery operations include (but are not limited to) when an - * unhealthy Node is rebooted or a Compute Node disappeared due to host failure. - * Retries due to recovery operations are independent of and are not counted - * against the maxTaskRetryCount on successful completion of {@link Mono}. + * @return information about the specified Task. + * + * For multi-instance Tasks, information such as affinityId, executionInfo and + * nodeInfo refer to the primary Task on successful completion of {@link Mono}. */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) @@ -26435,7 +26454,10 @@ Mono enableNodeSchedulingInternal(String poolId, String nodeId) { * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the remote login settings for a Compute Node on successful completion of {@link Mono}. + * @return the settings required for remote login to a Compute Node. + * + * Before you can remotely login to a Compute Node using the remote login + * settings, you must create a user Account on the Compute Node on successful completion of {@link Mono}. */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) @@ -26465,7 +26487,10 @@ Mono getNodeRemoteLoginSettingsInternal(String poo * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404. * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409. * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent. - * @return the remote login settings for a Compute Node on successful completion of {@link Mono}. + * @return the settings required for remote login to a Compute Node. + * + * Before you can remotely login to a Compute Node using the remote login + * settings, you must create a user Account on the Compute Node on successful completion of {@link Mono}. */ @Generated @ServiceMethod(returns = ReturnType.SINGLE) @@ -26852,6 +26877,8 @@ PagedFlux listNodeFilesInternal(String poolId, String nodeId) { * * * + * * *
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/json; + * odata=minimalmetadata".
If-Modified-SinceOffsetDateTimeNoA timestamp indicating the last modified time * of the resource known to the * client. The operation will be performed only if the resource on the service has @@ -27006,6 +27033,14 @@ public Mono> terminateJobWithResponse(String jobId, RequestOption * instead.".
* You can add these to a request with {@link RequestOptions#addQueryParam} + *

Header Parameters

+ * + * + * + * + *
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/json; + * odata=minimalmetadata".
+ * You can add these to a request with {@link RequestOptions#addHeader} *

Request Body Schema

* * 
{@code
@@ -27094,6 +27129,14 @@ public Mono> rebootNodeWithResponse(String poolId, String nodeId,
      * instead.".
      * 
      * You can add these to a request with {@link RequestOptions#addQueryParam}
+     * 
Header Parameters

+     * 
+     * 
+     * 
+     * 
+     * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/json;
+     * odata=minimalmetadata".

+     * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

      * 
      * 
{@code
@@ -28379,8 +28422,10 @@ Mono enablePoolAutoScaleInternal(String poolId, BatchPoolEnableAutoScaleCo
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the results and errors from an execution of a Pool autoscale formula on successful completion of
-     * {@link Mono}.
+     * @return the result of evaluating an automatic scaling formula on the Pool.
+     *
+     * This API is primarily for validating an autoscale formula, as it simply returns
+     * the result without applying the formula to the Pool on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -28411,8 +28456,10 @@ Mono evaluatePoolAutoScaleInternal(String poolId, BatchPoolEvaluat
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the results and errors from an execution of a Pool autoscale formula on successful completion of
-     * {@link Mono}.
+     * @return the result of evaluating an automatic scaling formula on the Pool.
+     *
+     * This API is primarily for validating an autoscale formula, as it simply returns
+     * the result without applying the formula to the Pool on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/BatchClient.java b/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/BatchClient.java
index 1e6720ba9e5e..f3913a234d2f 100644
--- a/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/BatchClient.java
+++ b/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/BatchClient.java
@@ -3233,7 +3233,10 @@ PagedIterable listApplications(RequestOptions requestOptions) {
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return contains information about an application in an Azure Batch Account along with {@link Response}.
+     * @return information about the specified Application.
+     *
+     * This operation returns only Applications and versions that are available for
+     * use on Compute Nodes; that is, that can be used in an Package reference along with {@link Response}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -6364,7 +6367,10 @@ public Response enablePoolAutoScaleWithResponse(String poolId, BinaryData
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return the results and errors from an execution of a Pool autoscale formula along with {@link Response}.
+     * @return the result of evaluating an automatic scaling formula on the Pool.
+     *
+     * This API is primarily for validating an autoscale formula, as it simply returns
+     * the result without applying the formula to the Pool along with {@link Response}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -13234,7 +13240,10 @@ PagedIterable listJobPreparationAndReleaseTaskStatus(String jobId, R
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return the Task and TaskSlot counts for a Job along with {@link Response}.
+     * @return the Task counts for the specified Job.
+     *
+     * Task counts provide a count of the Tasks by active, running or completed Task
+     * state, and a count of Tasks which succeeded or failed along with {@link Response}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -20038,11 +20047,10 @@ public Response deleteTaskWithResponse(String jobId, String taskId, Reques
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return batch will retry Tasks when a recovery operation is triggered on a Node.
-     * Examples of recovery operations include (but are not limited to) when an
-     * unhealthy Node is rebooted or a Compute Node disappeared due to host failure.
-     * Retries due to recovery operations are independent of and are not counted
-     * against the maxTaskRetryCount along with {@link Response}.
+     * @return information about the specified Task.
+     *
+     * For multi-instance Tasks, information such as affinityId, executionInfo and
+     * nodeInfo refer to the primary Task along with {@link Response}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -22351,7 +22359,10 @@ public Response enableNodeSchedulingWithResponse(String poolId, String nod
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return the remote login settings for a Compute Node along with {@link Response}.
+     * @return the settings required for remote login to a Compute Node.
+     *
+     * Before you can remotely login to a Compute Node using the remote login
+     * settings, you must create a user Account on the Compute Node along with {@link Response}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -23753,7 +23764,10 @@ PagedIterable listApplicationsInternal() {
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return contains information about an application in an Azure Batch Account.
+     * @return information about the specified Application.
+     *
+     * This operation returns only Applications and versions that are available for
+     * use on Compute Nodes; that is, that can be used in an Package reference.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -23783,7 +23797,10 @@ BatchApplication getApplicationInternal(String applicationId, Integer timeOutInS
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return contains information about an application in an Azure Batch Account.
+     * @return information about the specified Application.
+     *
+     * This operation returns only Applications and versions that are available for
+     * use on Compute Nodes; that is, that can be used in an Package reference.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -24632,7 +24649,10 @@ PagedIterable listJobsFromScheduleInternal(String jobScheduleId) {
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the Task and TaskSlot counts for a Job.
+     * @return the Task counts for the specified Job.
+     *
+     * Task counts provide a count of the Tasks by active, running or completed Task
+     * state, and a count of Tasks which succeeded or failed.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -24661,7 +24681,10 @@ BatchTaskCountsResult getJobTaskCountsInternal(String jobId, Integer timeOutInSe
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the Task and TaskSlot counts for a Job.
+     * @return the Task counts for the specified Job.
+     *
+     * Task counts provide a count of the Tasks by active, running or completed Task
+     * state, and a count of Tasks which succeeded or failed.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -25306,11 +25329,10 @@ void deleteTaskInternal(String jobId, String taskId) {
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return batch will retry Tasks when a recovery operation is triggered on a Node.
-     * Examples of recovery operations include (but are not limited to) when an
-     * unhealthy Node is rebooted or a Compute Node disappeared due to host failure.
-     * Retries due to recovery operations are independent of and are not counted
-     * against the maxTaskRetryCount.
+     * @return information about the specified Task.
+     *
+     * For multi-instance Tasks, information such as affinityId, executionInfo and
+     * nodeInfo refer to the primary Task.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -25371,11 +25393,10 @@ BatchTask getTaskInternal(String jobId, String taskId, Integer timeOutInSeconds,
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return batch will retry Tasks when a recovery operation is triggered on a Node.
-     * Examples of recovery operations include (but are not limited to) when an
-     * unhealthy Node is rebooted or a Compute Node disappeared due to host failure.
-     * Retries due to recovery operations are independent of and are not counted
-     * against the maxTaskRetryCount.
+     * @return information about the specified Task.
+     *
+     * For multi-instance Tasks, information such as affinityId, executionInfo and
+     * nodeInfo refer to the primary Task.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -26057,7 +26078,10 @@ void enableNodeSchedulingInternal(String poolId, String nodeId) {
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the remote login settings for a Compute Node.
+     * @return the settings required for remote login to a Compute Node.
+     *
+     * Before you can remotely login to a Compute Node using the remote login
+     * settings, you must create a user Account on the Compute Node.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -26087,7 +26111,10 @@ BatchNodeRemoteLoginSettings getNodeRemoteLoginSettingsInternal(String poolId, S
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the remote login settings for a Compute Node.
+     * @return the settings required for remote login to a Compute Node.
+     *
+     * Before you can remotely login to a Compute Node using the remote login
+     * settings, you must create a user Account on the Compute Node.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -26433,6 +26460,8 @@ PagedIterable listNodeFilesInternal(String poolId, String nodeId)
      * 
      * 
      * 
+     * 
      * 
      * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/json;
+     * odata=minimalmetadata".
If-Modified-SinceOffsetDateTimeNoA timestamp indicating the last modified time
      * of the resource known to the
      * client. The operation will be performed only if the resource on the service has
@@ -26587,6 +26616,14 @@ public Response terminateJobWithResponse(String jobId, RequestOptions requ
      * instead.".

      * You can add these to a request with {@link RequestOptions#addQueryParam}
+     * 
Header Parameters

+     * 
+     * 
+     * 
+     * 
+     * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/json;
+     * odata=minimalmetadata".

+     * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

      * 
      * 
{@code
@@ -26675,6 +26712,14 @@ public Response rebootNodeWithResponse(String poolId, String nodeId, Reque
      * instead.".
      * 
      * You can add these to a request with {@link RequestOptions#addQueryParam}
+     * 
Header Parameters

+     * 
+     * 
+     * 
+     * 
+     * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/json;
+     * odata=minimalmetadata".

+     * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

      * 
      * 
{@code
@@ -27792,7 +27837,10 @@ void enablePoolAutoScaleInternal(String poolId, BatchPoolEnableAutoScaleContent
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the results and errors from an execution of a Pool autoscale formula.
+     * @return the result of evaluating an automatic scaling formula on the Pool.
+     *
+     * This API is primarily for validating an autoscale formula, as it simply returns
+     * the result without applying the formula to the Pool.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -27823,7 +27871,10 @@ AutoScaleRun evaluatePoolAutoScaleInternal(String poolId, BatchPoolEvaluateAutoS
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the results and errors from an execution of a Pool autoscale formula.
+     * @return the result of evaluating an automatic scaling formula on the Pool.
+     *
+     * This API is primarily for validating an autoscale formula, as it simply returns
+     * the result without applying the formula to the Pool.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/implementation/BatchClientImpl.java b/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/implementation/BatchClientImpl.java
index 54e0962c9c3f..0bdf474956b0 100644
--- a/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/implementation/BatchClientImpl.java
+++ b/sdk/batch/azure-compute-batch/src/main/java/com/azure/compute/batch/implementation/BatchClientImpl.java
@@ -166,7 +166,7 @@ public interface BatchClientService {
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listApplicationsInternal(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/applications")
@@ -176,7 +176,7 @@ Mono> listApplicationsInternal(@HostParam("endpoint") Strin
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listApplicationsInternalSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/applications/{applicationId}")
@@ -187,7 +187,7 @@ Response listApplicationsInternalSync(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getApplicationInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("applicationId") String applicationId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/applications/{applicationId}")
         @ExpectedResponses({ 200 })
@@ -197,7 +197,7 @@ Mono> getApplicationInternal(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getApplicationInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("applicationId") String applicationId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/poolusagemetrics")
         @ExpectedResponses({ 200 })
@@ -206,7 +206,7 @@ Response getApplicationInternalSync(@HostParam("endpoint") String en
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listPoolUsageMetricsInternal(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/poolusagemetrics")
@@ -216,7 +216,7 @@ Mono> listPoolUsageMetricsInternal(@HostParam("endpoint") S
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listPoolUsageMetricsInternalSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Post("/pools")
@@ -227,7 +227,7 @@ Response listPoolUsageMetricsInternalSync(@HostParam("endpoint") Str
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> createPoolInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
-            @HeaderParam("accept") String accept, @BodyParam("application/json; odata=minimalmetadata") BinaryData pool,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json; odata=minimalmetadata") BinaryData pool,
             RequestOptions requestOptions, Context context);
 
         @Post("/pools")
@@ -238,7 +238,7 @@ Mono> createPoolInternal(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response createPoolInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
-            @HeaderParam("accept") String accept, @BodyParam("application/json; odata=minimalmetadata") BinaryData pool,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json; odata=minimalmetadata") BinaryData pool,
             RequestOptions requestOptions, Context context);
 
         @Get("/pools")
@@ -248,7 +248,7 @@ Response createPoolInternalSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listPoolsInternal(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/pools")
@@ -258,7 +258,7 @@ Mono> listPoolsInternal(@HostParam("endpoint") String endpo
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listPoolsInternalSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Delete("/pools/{poolId}")
@@ -269,7 +269,7 @@ Response listPoolsInternalSync(@HostParam("endpoint") String endpoin
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> deletePoolInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/pools/{poolId}")
         @ExpectedResponses({ 202 })
@@ -279,7 +279,7 @@ Mono> deletePoolInternal(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response deletePoolInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Head("/pools/{poolId}")
         @ExpectedResponses({ 200, 404 })
@@ -288,7 +288,7 @@ Response deletePoolInternalSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> poolExistsInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Head("/pools/{poolId}")
         @ExpectedResponses({ 200, 404 })
@@ -297,7 +297,7 @@ Mono> poolExistsInternal(@HostParam("endpoint") String endpoin
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response poolExistsInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/pools/{poolId}")
         @ExpectedResponses({ 200 })
@@ -307,7 +307,7 @@ Response poolExistsInternalSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getPoolInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/pools/{poolId}")
         @ExpectedResponses({ 200 })
@@ -317,7 +317,7 @@ Mono> getPoolInternal(@HostParam("endpoint") String endpoin
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getPoolInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Patch("/pools/{poolId}")
         @ExpectedResponses({ 200 })
@@ -327,7 +327,7 @@ Response getPoolInternalSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> updatePoolInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
-            @PathParam("poolId") String poolId, @HeaderParam("accept") String accept,
+            @PathParam("poolId") String poolId, @HeaderParam("Accept") String accept,
             @BodyParam("application/json; odata=minimalmetadata") BinaryData pool, RequestOptions requestOptions,
             Context context);
 
@@ -339,7 +339,7 @@ Mono> updatePoolInternal(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response updatePoolInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
-            @PathParam("poolId") String poolId, @HeaderParam("accept") String accept,
+            @PathParam("poolId") String poolId, @HeaderParam("Accept") String accept,
             @BodyParam("application/json; odata=minimalmetadata") BinaryData pool, RequestOptions requestOptions,
             Context context);
 
@@ -351,7 +351,7 @@ Response updatePoolInternalSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> disablePoolAutoScaleInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/pools/{poolId}/disableautoscale")
         @ExpectedResponses({ 200 })
@@ -361,7 +361,7 @@ Mono> disablePoolAutoScaleInternal(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response disablePoolAutoScaleInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/pools/{poolId}/enableautoscale")
         @ExpectedResponses({ 200 })
@@ -371,7 +371,7 @@ Response disablePoolAutoScaleInternalSync(@HostParam("endpoint") String en
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> enablePoolAutoScaleInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
-            @HeaderParam("content-type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json; odata=minimalmetadata") BinaryData content, RequestOptions requestOptions,
             Context context);
 
@@ -383,7 +383,7 @@ Mono> enablePoolAutoScaleInternal(@HostParam("endpoint") String e
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response enablePoolAutoScaleInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
-            @HeaderParam("content-type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json; odata=minimalmetadata") BinaryData content, RequestOptions requestOptions,
             Context context);
 
@@ -395,7 +395,7 @@ Response enablePoolAutoScaleInternalSync(@HostParam("endpoint") String end
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> evaluatePoolAutoScaleInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
-            @PathParam("poolId") String poolId, @HeaderParam("accept") String accept,
+            @PathParam("poolId") String poolId, @HeaderParam("Accept") String accept,
             @BodyParam("application/json; odata=minimalmetadata") BinaryData content, RequestOptions requestOptions,
             Context context);
 
@@ -407,7 +407,7 @@ Mono> evaluatePoolAutoScaleInternal(@HostParam("endpoint")
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response evaluatePoolAutoScaleInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
-            @PathParam("poolId") String poolId, @HeaderParam("accept") String accept,
+            @PathParam("poolId") String poolId, @HeaderParam("Accept") String accept,
             @BodyParam("application/json; odata=minimalmetadata") BinaryData content, RequestOptions requestOptions,
             Context context);
 
@@ -419,7 +419,7 @@ Response evaluatePoolAutoScaleInternalSync(@HostParam("endpoint") St
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> resizePoolInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
-            @HeaderParam("content-type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json; odata=minimalmetadata") BinaryData content, RequestOptions requestOptions,
             Context context);
 
@@ -431,7 +431,7 @@ Mono> resizePoolInternal(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response resizePoolInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
-            @HeaderParam("content-type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json; odata=minimalmetadata") BinaryData content, RequestOptions requestOptions,
             Context context);
 
@@ -443,7 +443,7 @@ Response resizePoolInternalSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> stopPoolResizeInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/pools/{poolId}/stopresize")
         @ExpectedResponses({ 202 })
@@ -453,7 +453,7 @@ Mono> stopPoolResizeInternal(@HostParam("endpoint") String endpoi
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response stopPoolResizeInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/pools/{poolId}/updateproperties")
         @ExpectedResponses({ 204 })
@@ -463,7 +463,7 @@ Response stopPoolResizeInternalSync(@HostParam("endpoint") String endpoint
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> replacePoolPropertiesInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
-            @PathParam("poolId") String poolId, @HeaderParam("accept") String accept,
+            @PathParam("poolId") String poolId, @HeaderParam("Accept") String accept,
             @BodyParam("application/json; odata=minimalmetadata") BinaryData pool, RequestOptions requestOptions,
             Context context);
 
@@ -475,7 +475,7 @@ Mono> replacePoolPropertiesInternal(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response replacePoolPropertiesInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
-            @PathParam("poolId") String poolId, @HeaderParam("accept") String accept,
+            @PathParam("poolId") String poolId, @HeaderParam("Accept") String accept,
             @BodyParam("application/json; odata=minimalmetadata") BinaryData pool, RequestOptions requestOptions,
             Context context);
 
@@ -487,7 +487,7 @@ Response replacePoolPropertiesInternalSync(@HostParam("endpoint") String e
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> removeNodesInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
-            @HeaderParam("content-type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json; odata=minimalmetadata") BinaryData content, RequestOptions requestOptions,
             Context context);
 
@@ -499,7 +499,7 @@ Mono> removeNodesInternal(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response removeNodesInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
-            @HeaderParam("content-type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json; odata=minimalmetadata") BinaryData content, RequestOptions requestOptions,
             Context context);
 
@@ -510,7 +510,7 @@ Response removeNodesInternalSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listSupportedImagesInternal(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/supportedimages")
@@ -520,7 +520,7 @@ Mono> listSupportedImagesInternal(@HostParam("endpoint") St
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listSupportedImagesInternalSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/nodecounts")
@@ -530,7 +530,7 @@ Response listSupportedImagesInternalSync(@HostParam("endpoint") Stri
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listPoolNodeCountsInternal(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/nodecounts")
@@ -540,7 +540,7 @@ Mono> listPoolNodeCountsInternal(@HostParam("endpoint") Str
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listPoolNodeCountsInternalSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Delete("/jobs/{jobId}")
@@ -551,7 +551,7 @@ Response listPoolNodeCountsInternalSync(@HostParam("endpoint") Strin
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> deleteJobInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/jobs/{jobId}")
         @ExpectedResponses({ 202 })
@@ -561,7 +561,7 @@ Mono> deleteJobInternal(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response deleteJobInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/jobs/{jobId}")
         @ExpectedResponses({ 200 })
@@ -571,7 +571,7 @@ Response deleteJobInternalSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getJobInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/jobs/{jobId}")
         @ExpectedResponses({ 200 })
@@ -581,7 +581,7 @@ Mono> getJobInternal(@HostParam("endpoint") String endpoint
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getJobInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Patch("/jobs/{jobId}")
         @ExpectedResponses({ 200 })
@@ -591,7 +591,7 @@ Response getJobInternalSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> updateJobInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
-            @PathParam("jobId") String jobId, @HeaderParam("accept") String accept,
+            @PathParam("jobId") String jobId, @HeaderParam("Accept") String accept,
             @BodyParam("application/json; odata=minimalmetadata") BinaryData job, RequestOptions requestOptions,
             Context context);
 
@@ -603,7 +603,7 @@ Mono> updateJobInternal(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response updateJobInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
-            @PathParam("jobId") String jobId, @HeaderParam("accept") String accept,
+            @PathParam("jobId") String jobId, @HeaderParam("Accept") String accept,
             @BodyParam("application/json; odata=minimalmetadata") BinaryData job, RequestOptions requestOptions,
             Context context);
 
@@ -615,7 +615,7 @@ Response updateJobInternalSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> replaceJobInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
-            @PathParam("jobId") String jobId, @HeaderParam("accept") String accept,
+            @PathParam("jobId") String jobId, @HeaderParam("Accept") String accept,
             @BodyParam("application/json; odata=minimalmetadata") BinaryData job, RequestOptions requestOptions,
             Context context);
 
@@ -627,7 +627,7 @@ Mono> replaceJobInternal(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response replaceJobInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
-            @PathParam("jobId") String jobId, @HeaderParam("accept") String accept,
+            @PathParam("jobId") String jobId, @HeaderParam("Accept") String accept,
             @BodyParam("application/json; odata=minimalmetadata") BinaryData job, RequestOptions requestOptions,
             Context context);
 
@@ -639,7 +639,7 @@ Response replaceJobInternalSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> disableJobInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
-            @PathParam("jobId") String jobId, @HeaderParam("accept") String accept,
+            @PathParam("jobId") String jobId, @HeaderParam("Accept") String accept,
             @BodyParam("application/json; odata=minimalmetadata") BinaryData content, RequestOptions requestOptions,
             Context context);
 
@@ -651,7 +651,7 @@ Mono> disableJobInternal(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response disableJobInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
-            @PathParam("jobId") String jobId, @HeaderParam("accept") String accept,
+            @PathParam("jobId") String jobId, @HeaderParam("Accept") String accept,
             @BodyParam("application/json; odata=minimalmetadata") BinaryData content, RequestOptions requestOptions,
             Context context);
 
@@ -663,7 +663,7 @@ Response disableJobInternalSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> enableJobInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/jobs/{jobId}/enable")
         @ExpectedResponses({ 202 })
@@ -673,7 +673,7 @@ Mono> enableJobInternal(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response enableJobInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/jobs/{jobId}/terminate")
         @ExpectedResponses({ 202 })
@@ -682,9 +682,8 @@ Response enableJobInternalSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> terminateJobInternal(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
-            @PathParam("jobId") String jobId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
-            Context context);
+            @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/jobs/{jobId}/terminate")
         @ExpectedResponses({ 202 })
@@ -693,9 +692,8 @@ Mono> terminateJobInternal(@HostParam("endpoint") String endpoint
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response terminateJobInternalSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
-            @PathParam("jobId") String jobId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
-            Context context);
+            @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/jobs")
         @ExpectedResponses({ 201 })
@@ -705,7 +703,7 @@ Response terminateJobInternalSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> createJobInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
-            @HeaderParam("accept") String accept, @BodyParam("application/json; odata=minimalmetadata") BinaryData job,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json; odata=minimalmetadata") BinaryData job,
             RequestOptions requestOptions, Context context);
 
         @Post("/jobs")
@@ -716,7 +714,7 @@ Mono> createJobInternal(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response createJobInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
-            @HeaderParam("accept") String accept, @BodyParam("application/json; odata=minimalmetadata") BinaryData job,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json; odata=minimalmetadata") BinaryData job,
             RequestOptions requestOptions, Context context);
 
         @Get("/jobs")
@@ -726,7 +724,7 @@ Response createJobInternalSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listJobsInternal(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/jobs")
@@ -736,7 +734,7 @@ Mono> listJobsInternal(@HostParam("endpoint") String endpoi
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listJobsInternalSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/jobschedules/{jobScheduleId}/jobs")
@@ -747,7 +745,7 @@ Response listJobsInternalSync(@HostParam("endpoint") String endpoint
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listJobsFromScheduleInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobScheduleId") String jobScheduleId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/jobschedules/{jobScheduleId}/jobs")
         @ExpectedResponses({ 200 })
@@ -757,7 +755,7 @@ Mono> listJobsFromScheduleInternal(@HostParam("endpoint") S
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listJobsFromScheduleInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobScheduleId") String jobScheduleId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/jobs/{jobId}/jobpreparationandreleasetaskstatus")
         @ExpectedResponses({ 200 })
@@ -767,7 +765,7 @@ Response listJobsFromScheduleInternalSync(@HostParam("endpoint") Str
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listJobPreparationAndReleaseTaskStatusInternal(
             @HostParam("endpoint") String endpoint, @QueryParam("api-version") String apiVersion,
-            @PathParam("jobId") String jobId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("jobId") String jobId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/jobs/{jobId}/jobpreparationandreleasetaskstatus")
@@ -778,7 +776,7 @@ Mono> listJobPreparationAndReleaseTaskStatusInternal(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listJobPreparationAndReleaseTaskStatusInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/jobs/{jobId}/taskcounts")
         @ExpectedResponses({ 200 })
@@ -788,7 +786,7 @@ Response listJobPreparationAndReleaseTaskStatusInternalSync(@HostPar
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getJobTaskCountsInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/jobs/{jobId}/taskcounts")
         @ExpectedResponses({ 200 })
@@ -798,7 +796,7 @@ Mono> getJobTaskCountsInternal(@HostParam("endpoint") Strin
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getJobTaskCountsInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Head("/jobschedules/{jobScheduleId}")
         @ExpectedResponses({ 200, 404 })
@@ -807,7 +805,7 @@ Response getJobTaskCountsInternalSync(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> jobScheduleExistsInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobScheduleId") String jobScheduleId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Head("/jobschedules/{jobScheduleId}")
         @ExpectedResponses({ 200, 404 })
@@ -816,7 +814,7 @@ Mono> jobScheduleExistsInternal(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response jobScheduleExistsInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobScheduleId") String jobScheduleId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/jobschedules/{jobScheduleId}")
         @ExpectedResponses({ 202 })
@@ -826,7 +824,7 @@ Response jobScheduleExistsInternalSync(@HostParam("endpoint") String en
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> deleteJobScheduleInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobScheduleId") String jobScheduleId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/jobschedules/{jobScheduleId}")
         @ExpectedResponses({ 202 })
@@ -836,7 +834,7 @@ Mono> deleteJobScheduleInternal(@HostParam("endpoint") String end
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response deleteJobScheduleInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobScheduleId") String jobScheduleId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/jobschedules/{jobScheduleId}")
         @ExpectedResponses({ 200 })
@@ -846,7 +844,7 @@ Response deleteJobScheduleInternalSync(@HostParam("endpoint") String endpo
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getJobScheduleInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobScheduleId") String jobScheduleId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/jobschedules/{jobScheduleId}")
         @ExpectedResponses({ 200 })
@@ -856,7 +854,7 @@ Mono> getJobScheduleInternal(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getJobScheduleInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobScheduleId") String jobScheduleId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Patch("/jobschedules/{jobScheduleId}")
         @ExpectedResponses({ 200 })
@@ -866,7 +864,7 @@ Response getJobScheduleInternalSync(@HostParam("endpoint") String en
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> updateJobScheduleInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
-            @PathParam("jobScheduleId") String jobScheduleId, @HeaderParam("accept") String accept,
+            @PathParam("jobScheduleId") String jobScheduleId, @HeaderParam("Accept") String accept,
             @BodyParam("application/json; odata=minimalmetadata") BinaryData jobSchedule, RequestOptions requestOptions,
             Context context);
 
@@ -878,7 +876,7 @@ Mono> updateJobScheduleInternal(@HostParam("endpoint") String end
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response updateJobScheduleInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
-            @PathParam("jobScheduleId") String jobScheduleId, @HeaderParam("accept") String accept,
+            @PathParam("jobScheduleId") String jobScheduleId, @HeaderParam("Accept") String accept,
             @BodyParam("application/json; odata=minimalmetadata") BinaryData jobSchedule, RequestOptions requestOptions,
             Context context);
 
@@ -890,7 +888,7 @@ Response updateJobScheduleInternalSync(@HostParam("endpoint") String endpo
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> replaceJobScheduleInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
-            @PathParam("jobScheduleId") String jobScheduleId, @HeaderParam("accept") String accept,
+            @PathParam("jobScheduleId") String jobScheduleId, @HeaderParam("Accept") String accept,
             @BodyParam("application/json; odata=minimalmetadata") BinaryData jobSchedule, RequestOptions requestOptions,
             Context context);
 
@@ -902,7 +900,7 @@ Mono> replaceJobScheduleInternal(@HostParam("endpoint") String en
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response replaceJobScheduleInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
-            @PathParam("jobScheduleId") String jobScheduleId, @HeaderParam("accept") String accept,
+            @PathParam("jobScheduleId") String jobScheduleId, @HeaderParam("Accept") String accept,
             @BodyParam("application/json; odata=minimalmetadata") BinaryData jobSchedule, RequestOptions requestOptions,
             Context context);
 
@@ -914,7 +912,7 @@ Response replaceJobScheduleInternalSync(@HostParam("endpoint") String endp
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> disableJobScheduleInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobScheduleId") String jobScheduleId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/jobschedules/{jobScheduleId}/disable")
         @ExpectedResponses({ 204 })
@@ -924,7 +922,7 @@ Mono> disableJobScheduleInternal(@HostParam("endpoint") String en
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response disableJobScheduleInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobScheduleId") String jobScheduleId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/jobschedules/{jobScheduleId}/enable")
         @ExpectedResponses({ 204 })
@@ -934,7 +932,7 @@ Response disableJobScheduleInternalSync(@HostParam("endpoint") String endp
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> enableJobScheduleInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobScheduleId") String jobScheduleId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/jobschedules/{jobScheduleId}/enable")
         @ExpectedResponses({ 204 })
@@ -944,7 +942,7 @@ Mono> enableJobScheduleInternal(@HostParam("endpoint") String end
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response enableJobScheduleInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobScheduleId") String jobScheduleId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/jobschedules/{jobScheduleId}/terminate")
         @ExpectedResponses({ 202 })
@@ -954,7 +952,7 @@ Response enableJobScheduleInternalSync(@HostParam("endpoint") String endpo
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> terminateJobScheduleInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobScheduleId") String jobScheduleId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/jobschedules/{jobScheduleId}/terminate")
         @ExpectedResponses({ 202 })
@@ -964,7 +962,7 @@ Mono> terminateJobScheduleInternal(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response terminateJobScheduleInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobScheduleId") String jobScheduleId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/jobschedules")
         @ExpectedResponses({ 201 })
@@ -974,7 +972,7 @@ Response terminateJobScheduleInternalSync(@HostParam("endpoint") String en
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> createJobScheduleInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
-            @HeaderParam("accept") String accept,
+            @HeaderParam("Accept") String accept,
             @BodyParam("application/json; odata=minimalmetadata") BinaryData jobSchedule, RequestOptions requestOptions,
             Context context);
 
@@ -986,7 +984,7 @@ Mono> createJobScheduleInternal(@HostParam("endpoint") String end
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response createJobScheduleInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
-            @HeaderParam("accept") String accept,
+            @HeaderParam("Accept") String accept,
             @BodyParam("application/json; odata=minimalmetadata") BinaryData jobSchedule, RequestOptions requestOptions,
             Context context);
 
@@ -997,7 +995,7 @@ Response createJobScheduleInternalSync(@HostParam("endpoint") String endpo
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listJobSchedulesInternal(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/jobschedules")
@@ -1007,7 +1005,7 @@ Mono> listJobSchedulesInternal(@HostParam("endpoint") Strin
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listJobSchedulesInternalSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Post("/jobs/{jobId}/tasks")
@@ -1018,7 +1016,7 @@ Response listJobSchedulesInternalSync(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> createTaskInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
-            @PathParam("jobId") String jobId, @HeaderParam("accept") String accept,
+            @PathParam("jobId") String jobId, @HeaderParam("Accept") String accept,
             @BodyParam("application/json; odata=minimalmetadata") BinaryData task, RequestOptions requestOptions,
             Context context);
 
@@ -1030,7 +1028,7 @@ Mono> createTaskInternal(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response createTaskInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
-            @PathParam("jobId") String jobId, @HeaderParam("accept") String accept,
+            @PathParam("jobId") String jobId, @HeaderParam("Accept") String accept,
             @BodyParam("application/json; odata=minimalmetadata") BinaryData task, RequestOptions requestOptions,
             Context context);
 
@@ -1042,7 +1040,7 @@ Response createTaskInternalSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listTasksInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/jobs/{jobId}/tasks")
         @ExpectedResponses({ 200 })
@@ -1052,7 +1050,7 @@ Mono> listTasksInternal(@HostParam("endpoint") String endpo
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listTasksInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/jobs/{jobId}/addtaskcollection")
         @ExpectedResponses({ 200 })
@@ -1062,7 +1060,7 @@ Response listTasksInternalSync(@HostParam("endpoint") String endpoin
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> createTaskCollectionInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
-            @PathParam("jobId") String jobId, @HeaderParam("accept") String accept,
+            @PathParam("jobId") String jobId, @HeaderParam("Accept") String accept,
             @BodyParam("application/json; odata=minimalmetadata") BinaryData taskCollection,
             RequestOptions requestOptions, Context context);
 
@@ -1074,7 +1072,7 @@ Mono> createTaskCollectionInternal(@HostParam("endpoint") S
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response createTaskCollectionInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
-            @PathParam("jobId") String jobId, @HeaderParam("accept") String accept,
+            @PathParam("jobId") String jobId, @HeaderParam("Accept") String accept,
             @BodyParam("application/json; odata=minimalmetadata") BinaryData taskCollection,
             RequestOptions requestOptions, Context context);
 
@@ -1086,7 +1084,7 @@ Response createTaskCollectionInternalSync(@HostParam("endpoint") Str
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> deleteTaskInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @PathParam("taskId") String taskId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("taskId") String taskId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Delete("/jobs/{jobId}/tasks/{taskId}")
@@ -1097,7 +1095,7 @@ Mono> deleteTaskInternal(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response deleteTaskInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @PathParam("taskId") String taskId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("taskId") String taskId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/jobs/{jobId}/tasks/{taskId}")
@@ -1108,7 +1106,7 @@ Response deleteTaskInternalSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getTaskInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @PathParam("taskId") String taskId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("taskId") String taskId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/jobs/{jobId}/tasks/{taskId}")
@@ -1119,7 +1117,7 @@ Mono> getTaskInternal(@HostParam("endpoint") String endpoin
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getTaskInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @PathParam("taskId") String taskId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("taskId") String taskId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Put("/jobs/{jobId}/tasks/{taskId}")
@@ -1130,7 +1128,7 @@ Response getTaskInternalSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> replaceTaskInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
-            @PathParam("jobId") String jobId, @PathParam("taskId") String taskId, @HeaderParam("accept") String accept,
+            @PathParam("jobId") String jobId, @PathParam("taskId") String taskId, @HeaderParam("Accept") String accept,
             @BodyParam("application/json; odata=minimalmetadata") BinaryData task, RequestOptions requestOptions,
             Context context);
 
@@ -1142,7 +1140,7 @@ Mono> replaceTaskInternal(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response replaceTaskInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
-            @PathParam("jobId") String jobId, @PathParam("taskId") String taskId, @HeaderParam("accept") String accept,
+            @PathParam("jobId") String jobId, @PathParam("taskId") String taskId, @HeaderParam("Accept") String accept,
             @BodyParam("application/json; odata=minimalmetadata") BinaryData task, RequestOptions requestOptions,
             Context context);
 
@@ -1154,7 +1152,7 @@ Response replaceTaskInternalSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listSubTasksInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @PathParam("taskId") String taskId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("taskId") String taskId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/jobs/{jobId}/tasks/{taskId}/subtasksinfo")
@@ -1165,7 +1163,7 @@ Mono> listSubTasksInternal(@HostParam("endpoint") String en
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listSubTasksInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @PathParam("taskId") String taskId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("taskId") String taskId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Post("/jobs/{jobId}/tasks/{taskId}/terminate")
@@ -1176,7 +1174,7 @@ Response listSubTasksInternalSync(@HostParam("endpoint") String endp
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> terminateTaskInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @PathParam("taskId") String taskId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("taskId") String taskId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Post("/jobs/{jobId}/tasks/{taskId}/terminate")
@@ -1187,7 +1185,7 @@ Mono> terminateTaskInternal(@HostParam("endpoint") String endpoin
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response terminateTaskInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @PathParam("taskId") String taskId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("taskId") String taskId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Post("/jobs/{jobId}/tasks/{taskId}/reactivate")
@@ -1198,7 +1196,7 @@ Response terminateTaskInternalSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> reactivateTaskInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @PathParam("taskId") String taskId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("taskId") String taskId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Post("/jobs/{jobId}/tasks/{taskId}/reactivate")
@@ -1209,7 +1207,7 @@ Mono> reactivateTaskInternal(@HostParam("endpoint") String endpoi
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response reactivateTaskInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @PathParam("taskId") String taskId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("taskId") String taskId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Delete("/jobs/{jobId}/tasks/{taskId}/files/{filePath}")
@@ -1221,7 +1219,7 @@ Response reactivateTaskInternalSync(@HostParam("endpoint") String endpoint
         Mono> deleteTaskFileInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
             @PathParam("taskId") String taskId, @PathParam("filePath") String filePath,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/jobs/{jobId}/tasks/{taskId}/files/{filePath}")
         @ExpectedResponses({ 200 })
@@ -1232,7 +1230,7 @@ Mono> deleteTaskFileInternal(@HostParam("endpoint") String endpoi
         Response deleteTaskFileInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
             @PathParam("taskId") String taskId, @PathParam("filePath") String filePath,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/jobs/{jobId}/tasks/{taskId}/files/{filePath}")
         @ExpectedResponses({ 200 })
@@ -1243,7 +1241,7 @@ Response deleteTaskFileInternalSync(@HostParam("endpoint") String endpoint
         Mono> getTaskFileInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
             @PathParam("taskId") String taskId, @PathParam("filePath") String filePath,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/jobs/{jobId}/tasks/{taskId}/files/{filePath}")
         @ExpectedResponses({ 200 })
@@ -1254,7 +1252,7 @@ Mono> getTaskFileInternal(@HostParam("endpoint") String end
         Response getTaskFileInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
             @PathParam("taskId") String taskId, @PathParam("filePath") String filePath,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Head("/jobs/{jobId}/tasks/{taskId}/files/{filePath}")
         @ExpectedResponses({ 200 })
@@ -1265,7 +1263,7 @@ Response getTaskFileInternalSync(@HostParam("endpoint") String endpo
         Mono> getTaskFilePropertiesInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
             @PathParam("taskId") String taskId, @PathParam("filePath") String filePath,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Head("/jobs/{jobId}/tasks/{taskId}/files/{filePath}")
         @ExpectedResponses({ 200 })
@@ -1276,7 +1274,7 @@ Mono> getTaskFilePropertiesInternal(@HostParam("endpoint") String
         Response getTaskFilePropertiesInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
             @PathParam("taskId") String taskId, @PathParam("filePath") String filePath,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/jobs/{jobId}/tasks/{taskId}/files")
         @ExpectedResponses({ 200 })
@@ -1286,7 +1284,7 @@ Response getTaskFilePropertiesInternalSync(@HostParam("endpoint") String e
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listTaskFilesInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @PathParam("taskId") String taskId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("taskId") String taskId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/jobs/{jobId}/tasks/{taskId}/files")
@@ -1297,7 +1295,7 @@ Mono> listTaskFilesInternal(@HostParam("endpoint") String e
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listTaskFilesInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @PathParam("taskId") String taskId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("taskId") String taskId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Post("/pools/{poolId}/nodes/{nodeId}/users")
@@ -1309,7 +1307,7 @@ Response listTaskFilesInternalSync(@HostParam("endpoint") String end
         Mono> createNodeUserInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
             @PathParam("poolId") String poolId, @PathParam("nodeId") String nodeId,
-            @HeaderParam("accept") String accept, @BodyParam("application/json; odata=minimalmetadata") BinaryData user,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json; odata=minimalmetadata") BinaryData user,
             RequestOptions requestOptions, Context context);
 
         @Post("/pools/{poolId}/nodes/{nodeId}/users")
@@ -1321,7 +1319,7 @@ Mono> createNodeUserInternal(@HostParam("endpoint") String endpoi
         Response createNodeUserInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
             @PathParam("poolId") String poolId, @PathParam("nodeId") String nodeId,
-            @HeaderParam("accept") String accept, @BodyParam("application/json; odata=minimalmetadata") BinaryData user,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json; odata=minimalmetadata") BinaryData user,
             RequestOptions requestOptions, Context context);
 
         @Delete("/pools/{poolId}/nodes/{nodeId}/users/{userName}")
@@ -1333,7 +1331,7 @@ Response createNodeUserInternalSync(@HostParam("endpoint") String endpoint
         Mono> deleteNodeUserInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
             @PathParam("nodeId") String nodeId, @PathParam("userName") String userName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/pools/{poolId}/nodes/{nodeId}/users/{userName}")
         @ExpectedResponses({ 200 })
@@ -1344,7 +1342,7 @@ Mono> deleteNodeUserInternal(@HostParam("endpoint") String endpoi
         Response deleteNodeUserInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
             @PathParam("nodeId") String nodeId, @PathParam("userName") String userName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Put("/pools/{poolId}/nodes/{nodeId}/users/{userName}")
         @ExpectedResponses({ 200 })
@@ -1355,7 +1353,7 @@ Response deleteNodeUserInternalSync(@HostParam("endpoint") String endpoint
         Mono> replaceNodeUserInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
             @PathParam("poolId") String poolId, @PathParam("nodeId") String nodeId,
-            @PathParam("userName") String userName, @HeaderParam("accept") String accept,
+            @PathParam("userName") String userName, @HeaderParam("Accept") String accept,
             @BodyParam("application/json; odata=minimalmetadata") BinaryData content, RequestOptions requestOptions,
             Context context);
 
@@ -1368,7 +1366,7 @@ Mono> replaceNodeUserInternal(@HostParam("endpoint") String endpo
         Response replaceNodeUserInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
             @PathParam("poolId") String poolId, @PathParam("nodeId") String nodeId,
-            @PathParam("userName") String userName, @HeaderParam("accept") String accept,
+            @PathParam("userName") String userName, @HeaderParam("Accept") String accept,
             @BodyParam("application/json; odata=minimalmetadata") BinaryData content, RequestOptions requestOptions,
             Context context);
 
@@ -1380,7 +1378,7 @@ Response replaceNodeUserInternalSync(@HostParam("endpoint") String endpoin
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getNodeInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
-            @PathParam("nodeId") String nodeId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("nodeId") String nodeId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/pools/{poolId}/nodes/{nodeId}")
@@ -1391,7 +1389,7 @@ Mono> getNodeInternal(@HostParam("endpoint") String endpoin
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getNodeInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
-            @PathParam("nodeId") String nodeId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("nodeId") String nodeId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Post("/pools/{poolId}/nodes/{nodeId}/reboot")
@@ -1401,9 +1399,9 @@ Response getNodeInternalSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> rebootNodeInternal(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
-            @PathParam("poolId") String poolId, @PathParam("nodeId") String nodeId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
+            @PathParam("nodeId") String nodeId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
+            Context context);
 
         @Post("/pools/{poolId}/nodes/{nodeId}/reboot")
         @ExpectedResponses({ 202 })
@@ -1412,9 +1410,9 @@ Mono> rebootNodeInternal(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response rebootNodeInternalSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
-            @PathParam("poolId") String poolId, @PathParam("nodeId") String nodeId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
+            @PathParam("nodeId") String nodeId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
+            Context context);
 
         @Post("/pools/{poolId}/nodes/{nodeId}/disablescheduling")
         @ExpectedResponses({ 200 })
@@ -1423,9 +1421,9 @@ Response rebootNodeInternalSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> disableNodeSchedulingInternal(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
-            @PathParam("poolId") String poolId, @PathParam("nodeId") String nodeId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
+            @PathParam("nodeId") String nodeId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
+            Context context);
 
         @Post("/pools/{poolId}/nodes/{nodeId}/disablescheduling")
         @ExpectedResponses({ 200 })
@@ -1434,9 +1432,9 @@ Mono> disableNodeSchedulingInternal(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response disableNodeSchedulingInternalSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
-            @PathParam("poolId") String poolId, @PathParam("nodeId") String nodeId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
+            @PathParam("nodeId") String nodeId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
+            Context context);
 
         @Post("/pools/{poolId}/nodes/{nodeId}/enablescheduling")
         @ExpectedResponses({ 200 })
@@ -1446,7 +1444,7 @@ Response disableNodeSchedulingInternalSync(@HostParam("endpoint") String e
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> enableNodeSchedulingInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
-            @PathParam("nodeId") String nodeId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("nodeId") String nodeId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Post("/pools/{poolId}/nodes/{nodeId}/enablescheduling")
@@ -1457,7 +1455,7 @@ Mono> enableNodeSchedulingInternal(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response enableNodeSchedulingInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
-            @PathParam("nodeId") String nodeId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("nodeId") String nodeId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/pools/{poolId}/nodes/{nodeId}/remoteloginsettings")
@@ -1468,7 +1466,7 @@ Response enableNodeSchedulingInternalSync(@HostParam("endpoint") String en
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getNodeRemoteLoginSettingsInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
-            @PathParam("nodeId") String nodeId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("nodeId") String nodeId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/pools/{poolId}/nodes/{nodeId}/remoteloginsettings")
@@ -1479,7 +1477,7 @@ Mono> getNodeRemoteLoginSettingsInternal(@HostParam("endpoi
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getNodeRemoteLoginSettingsInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
-            @PathParam("nodeId") String nodeId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("nodeId") String nodeId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Post("/pools/{poolId}/nodes/{nodeId}/uploadbatchservicelogs")
@@ -1491,7 +1489,7 @@ Response getNodeRemoteLoginSettingsInternalSync(@HostParam("endpoint
         Mono> uploadNodeLogsInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
             @PathParam("poolId") String poolId, @PathParam("nodeId") String nodeId,
-            @HeaderParam("accept") String accept,
+            @HeaderParam("Accept") String accept,
             @BodyParam("application/json; odata=minimalmetadata") BinaryData content, RequestOptions requestOptions,
             Context context);
 
@@ -1504,7 +1502,7 @@ Mono> uploadNodeLogsInternal(@HostParam("endpoint") String
         Response uploadNodeLogsInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @HeaderParam("content-type") String contentType,
             @PathParam("poolId") String poolId, @PathParam("nodeId") String nodeId,
-            @HeaderParam("accept") String accept,
+            @HeaderParam("Accept") String accept,
             @BodyParam("application/json; odata=minimalmetadata") BinaryData content, RequestOptions requestOptions,
             Context context);
 
@@ -1516,7 +1514,7 @@ Response uploadNodeLogsInternalSync(@HostParam("endpoint") String en
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listNodesInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/pools/{poolId}/nodes")
         @ExpectedResponses({ 200 })
@@ -1526,7 +1524,7 @@ Mono> listNodesInternal(@HostParam("endpoint") String endpo
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listNodesInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/pools/{poolId}/nodes/{nodeId}/extensions/{extensionName}")
         @ExpectedResponses({ 200 })
@@ -1537,7 +1535,7 @@ Response listNodesInternalSync(@HostParam("endpoint") String endpoin
         Mono> getNodeExtensionInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
             @PathParam("nodeId") String nodeId, @PathParam("extensionName") String extensionName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/pools/{poolId}/nodes/{nodeId}/extensions/{extensionName}")
         @ExpectedResponses({ 200 })
@@ -1548,7 +1546,7 @@ Mono> getNodeExtensionInternal(@HostParam("endpoint") Strin
         Response getNodeExtensionInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
             @PathParam("nodeId") String nodeId, @PathParam("extensionName") String extensionName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/pools/{poolId}/nodes/{nodeId}/extensions")
         @ExpectedResponses({ 200 })
@@ -1558,7 +1556,7 @@ Response getNodeExtensionInternalSync(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listNodeExtensionsInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
-            @PathParam("nodeId") String nodeId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("nodeId") String nodeId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/pools/{poolId}/nodes/{nodeId}/extensions")
@@ -1569,7 +1567,7 @@ Mono> listNodeExtensionsInternal(@HostParam("endpoint") Str
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listNodeExtensionsInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
-            @PathParam("nodeId") String nodeId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("nodeId") String nodeId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Delete("/pools/{poolId}/nodes/{nodeId}/files/{filePath}")
@@ -1581,7 +1579,7 @@ Response listNodeExtensionsInternalSync(@HostParam("endpoint") Strin
         Mono> deleteNodeFileInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
             @PathParam("nodeId") String nodeId, @PathParam("filePath") String filePath,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/pools/{poolId}/nodes/{nodeId}/files/{filePath}")
         @ExpectedResponses({ 200 })
@@ -1592,7 +1590,7 @@ Mono> deleteNodeFileInternal(@HostParam("endpoint") String endpoi
         Response deleteNodeFileInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
             @PathParam("nodeId") String nodeId, @PathParam("filePath") String filePath,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/pools/{poolId}/nodes/{nodeId}/files/{filePath}")
         @ExpectedResponses({ 200 })
@@ -1603,7 +1601,7 @@ Response deleteNodeFileInternalSync(@HostParam("endpoint") String endpoint
         Mono> getNodeFileInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
             @PathParam("nodeId") String nodeId, @PathParam("filePath") String filePath,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/pools/{poolId}/nodes/{nodeId}/files/{filePath}")
         @ExpectedResponses({ 200 })
@@ -1614,7 +1612,7 @@ Mono> getNodeFileInternal(@HostParam("endpoint") String end
         Response getNodeFileInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
             @PathParam("nodeId") String nodeId, @PathParam("filePath") String filePath,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Head("/pools/{poolId}/nodes/{nodeId}/files/{filePath}")
         @ExpectedResponses({ 200 })
@@ -1625,7 +1623,7 @@ Response getNodeFileInternalSync(@HostParam("endpoint") String endpo
         Mono> getNodeFilePropertiesInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
             @PathParam("nodeId") String nodeId, @PathParam("filePath") String filePath,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Head("/pools/{poolId}/nodes/{nodeId}/files/{filePath}")
         @ExpectedResponses({ 200 })
@@ -1636,7 +1634,7 @@ Mono> getNodeFilePropertiesInternal(@HostParam("endpoint") String
         Response getNodeFilePropertiesInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
             @PathParam("nodeId") String nodeId, @PathParam("filePath") String filePath,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/pools/{poolId}/nodes/{nodeId}/files")
         @ExpectedResponses({ 200 })
@@ -1646,7 +1644,7 @@ Response getNodeFilePropertiesInternalSync(@HostParam("endpoint") String e
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listNodeFilesInternal(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
-            @PathParam("nodeId") String nodeId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("nodeId") String nodeId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/pools/{poolId}/nodes/{nodeId}/files")
@@ -1657,7 +1655,7 @@ Mono> listNodeFilesInternal(@HostParam("endpoint") String e
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listNodeFilesInternalSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("poolId") String poolId,
-            @PathParam("nodeId") String nodeId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("nodeId") String nodeId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -1668,7 +1666,7 @@ Response listNodeFilesInternalSync(@HostParam("endpoint") String end
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listApplicationsInternalNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -1678,7 +1676,7 @@ Mono> listApplicationsInternalNext(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listApplicationsInternalNextSync(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -1688,7 +1686,7 @@ Response listApplicationsInternalNextSync(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listPoolUsageMetricsInternalNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -1698,7 +1696,7 @@ Mono> listPoolUsageMetricsInternalNext(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listPoolUsageMetricsInternalNextSync(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -1707,7 +1705,7 @@ Response listPoolUsageMetricsInternalNextSync(
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listPoolsInternalNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -1717,7 +1715,7 @@ Mono> listPoolsInternalNext(@PathParam(value = "nextLink",
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listPoolsInternalNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -1728,7 +1726,7 @@ Response listPoolsInternalNextSync(@PathParam(value = "nextLink", en
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listSupportedImagesInternalNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -1738,7 +1736,7 @@ Mono> listSupportedImagesInternalNext(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listSupportedImagesInternalNextSync(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -1748,7 +1746,7 @@ Response listSupportedImagesInternalNextSync(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listPoolNodeCountsInternalNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -1758,7 +1756,7 @@ Mono> listPoolNodeCountsInternalNext(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listPoolNodeCountsInternalNextSync(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -1767,7 +1765,7 @@ Response listPoolNodeCountsInternalNextSync(
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listJobsInternalNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -1777,7 +1775,7 @@ Mono> listJobsInternalNext(@PathParam(value = "nextLink", e
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listJobsInternalNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -1788,7 +1786,7 @@ Response listJobsInternalNextSync(@PathParam(value = "nextLink", enc
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listJobsFromScheduleInternalNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -1798,7 +1796,7 @@ Mono> listJobsFromScheduleInternalNext(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listJobsFromScheduleInternalNextSync(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -1808,7 +1806,7 @@ Response listJobsFromScheduleInternalNextSync(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listJobPreparationAndReleaseTaskStatusInternalNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -1818,7 +1816,7 @@ Mono> listJobPreparationAndReleaseTaskStatusInternalNext(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listJobPreparationAndReleaseTaskStatusInternalNextSync(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -1828,7 +1826,7 @@ Response listJobPreparationAndReleaseTaskStatusInternalNextSync(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listJobSchedulesInternalNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -1838,7 +1836,7 @@ Mono> listJobSchedulesInternalNext(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listJobSchedulesInternalNextSync(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -1847,7 +1845,7 @@ Response listJobSchedulesInternalNextSync(
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listTasksInternalNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -1857,7 +1855,7 @@ Mono> listTasksInternalNext(@PathParam(value = "nextLink",
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listTasksInternalNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -1868,7 +1866,7 @@ Response listTasksInternalNextSync(@PathParam(value = "nextLink", en
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listSubTasksInternalNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -1878,7 +1876,7 @@ Mono> listSubTasksInternalNext(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listSubTasksInternalNextSync(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -1888,7 +1886,7 @@ Response listSubTasksInternalNextSync(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listTaskFilesInternalNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -1898,7 +1896,7 @@ Mono> listTaskFilesInternalNext(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listTaskFilesInternalNextSync(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -1907,7 +1905,7 @@ Response listTaskFilesInternalNextSync(
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listNodesInternalNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -1917,7 +1915,7 @@ Mono> listNodesInternalNext(@PathParam(value = "nextLink",
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listNodesInternalNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -1928,7 +1926,7 @@ Response listNodesInternalNextSync(@PathParam(value = "nextLink", en
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listNodeExtensionsInternalNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -1938,7 +1936,7 @@ Mono> listNodeExtensionsInternalNext(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listNodeExtensionsInternalNextSync(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -1948,7 +1946,7 @@ Response listNodeExtensionsInternalNextSync(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listNodeFilesInternalNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -1958,7 +1956,7 @@ Mono> listNodeFilesInternalNext(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listNodeFilesInternalNextSync(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
     }
 
     /**
@@ -2232,8 +2230,11 @@ public PagedIterable listApplicationsInternal(RequestOptions request
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return contains information about an application in an Azure Batch Account along with {@link Response} on
-     * successful completion of {@link Mono}.
+     * @return information about the specified Application.
+     * 
+     * This operation returns only Applications and versions that are available for
+     * use on Compute Nodes; that is, that can be used in an Package reference along with {@link Response} on successful
+     * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getApplicationInternalWithResponseAsync(String applicationId,
@@ -2278,7 +2279,10 @@ public Mono> getApplicationInternalWithResponseAsync(String
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return contains information about an application in an Azure Batch Account along with {@link Response}.
+     * @return information about the specified Application.
+     * 
+     * This operation returns only Applications and versions that are available for
+     * use on Compute Nodes; that is, that can be used in an Package reference along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response getApplicationInternalWithResponse(String applicationId,
@@ -6104,8 +6108,11 @@ public Response enablePoolAutoScaleInternalWithResponse(String poolId, Bin
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return the results and errors from an execution of a Pool autoscale formula along with {@link Response} on
-     * successful completion of {@link Mono}.
+     * @return the result of evaluating an automatic scaling formula on the Pool.
+     * 
+     * This API is primarily for validating an autoscale formula, as it simply returns
+     * the result without applying the formula to the Pool along with {@link Response} on successful completion of
+     * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> evaluatePoolAutoScaleInternalWithResponseAsync(String poolId, BinaryData content,
@@ -6165,7 +6172,10 @@ public Mono> evaluatePoolAutoScaleInternalWithResponseAsync
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return the results and errors from an execution of a Pool autoscale formula along with {@link Response}.
+     * @return the result of evaluating an automatic scaling formula on the Pool.
+     * 
+     * This API is primarily for validating an autoscale formula, as it simply returns
+     * the result without applying the formula to the Pool along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response evaluatePoolAutoScaleInternalWithResponse(String poolId, BinaryData content,
@@ -10186,6 +10196,8 @@ public Response enableJobInternalWithResponse(String jobId, RequestOptions
      * 
      * 
      * 
+     * 
      * 
      * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/json;
+     * odata=minimalmetadata".
If-Modified-SinceOffsetDateTimeNoA timestamp indicating the last modified time
      * of the resource known to the
      * client. The operation will be performed only if the resource on the service has
@@ -10222,7 +10234,6 @@ public Response enableJobInternalWithResponse(String jobId, RequestOptions
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> terminateJobInternalWithResponseAsync(String jobId, RequestOptions requestOptions) {
-        final String contentType = "application/json; odata=minimalmetadata";
         final String accept = "application/json";
         RequestOptions requestOptionsLocal = requestOptions == null ? new RequestOptions() : requestOptions;
         requestOptionsLocal.addRequestCallback(requestLocal -> {
@@ -10231,7 +10242,7 @@ public Mono> terminateJobInternalWithResponseAsync(String jobId,
             }
         });
         return FluxUtil.withContext(context -> service.terminateJobInternal(this.getEndpoint(),
-            this.getServiceVersion().getVersion(), contentType, jobId, accept, requestOptionsLocal, context));
+            this.getServiceVersion().getVersion(), jobId, accept, requestOptionsLocal, context));
     }
 
     /**
@@ -10256,6 +10267,8 @@ public Mono> terminateJobInternalWithResponseAsync(String jobId,
      * 
      * 
      * 
+     * 
      * 
      * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/json;
+     * odata=minimalmetadata".
If-Modified-SinceOffsetDateTimeNoA timestamp indicating the last modified time
      * of the resource known to the
      * client. The operation will be performed only if the resource on the service has
@@ -10292,7 +10305,6 @@ public Mono> terminateJobInternalWithResponseAsync(String jobId,
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response terminateJobInternalWithResponse(String jobId, RequestOptions requestOptions) {
-        final String contentType = "application/json; odata=minimalmetadata";
         final String accept = "application/json";
         RequestOptions requestOptionsLocal = requestOptions == null ? new RequestOptions() : requestOptions;
         requestOptionsLocal.addRequestCallback(requestLocal -> {
@@ -10300,8 +10312,8 @@ public Response terminateJobInternalWithResponse(String jobId, RequestOpti
                 requestLocal.getHeaders().set(HttpHeaderName.CONTENT_TYPE, "application/json; odata=minimalmetadata");
             }
         });
-        return service.terminateJobInternalSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType,
-            jobId, accept, requestOptionsLocal, Context.NONE);
+        return service.terminateJobInternalSync(this.getEndpoint(), this.getServiceVersion().getVersion(), jobId,
+            accept, requestOptionsLocal, Context.NONE);
     }
 
     /**
@@ -15203,7 +15215,10 @@ public PagedIterable listJobPreparationAndReleaseTaskStatusInternal(
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return the Task and TaskSlot counts for a Job along with {@link Response} on successful completion of
+     * @return the Task counts for the specified Job.
+     * 
+     * Task counts provide a count of the Tasks by active, running or completed Task
+     * state, and a count of Tasks which succeeded or failed along with {@link Response} on successful completion of
      * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -15257,7 +15272,10 @@ public Mono> getJobTaskCountsInternalWithResponseAsync(Stri
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return the Task and TaskSlot counts for a Job along with {@link Response}.
+     * @return the Task counts for the specified Job.
+     * 
+     * Task counts provide a count of the Tasks by active, running or completed Task
+     * state, and a count of Tasks which succeeded or failed along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response getJobTaskCountsInternalWithResponse(String jobId, RequestOptions requestOptions) {
@@ -23156,11 +23174,10 @@ public Response deleteTaskInternalWithResponse(String jobId, String taskId
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return batch will retry Tasks when a recovery operation is triggered on a Node.
-     * Examples of recovery operations include (but are not limited to) when an
-     * unhealthy Node is rebooted or a Compute Node disappeared due to host failure.
-     * Retries due to recovery operations are independent of and are not counted
-     * against the maxTaskRetryCount along with {@link Response} on successful completion of {@link Mono}.
+     * @return information about the specified Task.
+     * 
+     * For multi-instance Tasks, information such as affinityId, executionInfo and
+     * nodeInfo refer to the primary Task along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getTaskInternalWithResponseAsync(String jobId, String taskId,
@@ -23400,11 +23417,10 @@ public Mono> getTaskInternalWithResponseAsync(String jobId,
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return batch will retry Tasks when a recovery operation is triggered on a Node.
-     * Examples of recovery operations include (but are not limited to) when an
-     * unhealthy Node is rebooted or a Compute Node disappeared due to host failure.
-     * Retries due to recovery operations are independent of and are not counted
-     * against the maxTaskRetryCount along with {@link Response}.
+     * @return information about the specified Task.
+     * 
+     * For multi-instance Tasks, information such as affinityId, executionInfo and
+     * nodeInfo refer to the primary Task along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response getTaskInternalWithResponse(String jobId, String taskId,
@@ -24529,7 +24545,7 @@ public Response deleteTaskFileInternalWithResponse(String jobId, String ta
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getTaskFileInternalWithResponseAsync(String jobId, String taskId, String filePath,
         RequestOptions requestOptions) {
-        final String accept = "application/octet-stream, application/json";
+        final String accept = "application/octet-stream";
         return FluxUtil.withContext(context -> service.getTaskFileInternal(this.getEndpoint(),
             this.getServiceVersion().getVersion(), jobId, taskId, filePath, accept, requestOptions, context));
     }
@@ -24581,7 +24597,7 @@ public Mono> getTaskFileInternalWithResponseAsync(String jo
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response getTaskFileInternalWithResponse(String jobId, String taskId, String filePath,
         RequestOptions requestOptions) {
-        final String accept = "application/octet-stream, application/json";
+        final String accept = "application/octet-stream";
         return service.getTaskFileInternalSync(this.getEndpoint(), this.getServiceVersion().getVersion(), jobId, taskId,
             filePath, accept, requestOptions, Context.NONE);
     }
@@ -25558,6 +25574,14 @@ public Response getNodeInternalWithResponse(String poolId, String no
      * instead.".

      * You can add these to a request with {@link RequestOptions#addQueryParam}
+     * 
Header Parameters

+     * 
+     * 
+     * 
+     * 
+     * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/json;
+     * odata=minimalmetadata".

+     * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

      * 
      * 
{@code
@@ -25578,7 +25602,6 @@ public Response getNodeInternalWithResponse(String poolId, String no
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> rebootNodeInternalWithResponseAsync(String poolId, String nodeId,
         RequestOptions requestOptions) {
-        final String contentType = "application/json; odata=minimalmetadata";
         final String accept = "application/json";
         RequestOptions requestOptionsLocal = requestOptions == null ? new RequestOptions() : requestOptions;
         requestOptionsLocal.addRequestCallback(requestLocal -> {
@@ -25587,7 +25610,7 @@ public Mono> rebootNodeInternalWithResponseAsync(String poolId, S
             }
         });
         return FluxUtil.withContext(context -> service.rebootNodeInternal(this.getEndpoint(),
-            this.getServiceVersion().getVersion(), contentType, poolId, nodeId, accept, requestOptionsLocal, context));
+            this.getServiceVersion().getVersion(), poolId, nodeId, accept, requestOptionsLocal, context));
     }
 
     /**
@@ -25603,6 +25626,14 @@ public Mono> rebootNodeInternalWithResponseAsync(String poolId, S
      * instead.".

      * You can add these to a request with {@link RequestOptions#addQueryParam}
+     * 
Header Parameters

+     * 
+     * 
+     * 
+     * 
+     * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/json;
+     * odata=minimalmetadata".

+     * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

      * 
      * 
{@code
@@ -25622,7 +25653,6 @@ public Mono> rebootNodeInternalWithResponseAsync(String poolId, S
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response rebootNodeInternalWithResponse(String poolId, String nodeId, RequestOptions requestOptions) {
-        final String contentType = "application/json; odata=minimalmetadata";
         final String accept = "application/json";
         RequestOptions requestOptionsLocal = requestOptions == null ? new RequestOptions() : requestOptions;
         requestOptionsLocal.addRequestCallback(requestLocal -> {
@@ -25630,8 +25660,8 @@ public Response rebootNodeInternalWithResponse(String poolId, String nodeI
                 requestLocal.getHeaders().set(HttpHeaderName.CONTENT_TYPE, "application/json; odata=minimalmetadata");
             }
         });
-        return service.rebootNodeInternalSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType,
-            poolId, nodeId, accept, requestOptionsLocal, Context.NONE);
+        return service.rebootNodeInternalSync(this.getEndpoint(), this.getServiceVersion().getVersion(), poolId, nodeId,
+            accept, requestOptionsLocal, Context.NONE);
     }
 
     /**
@@ -25648,6 +25678,14 @@ public Response rebootNodeInternalWithResponse(String poolId, String nodeI
      * instead.".
      * 
      * You can add these to a request with {@link RequestOptions#addQueryParam}
+     * 
Header Parameters

+     * 
+     * 
+     * 
+     * 
+     * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/json;
+     * odata=minimalmetadata".

+     * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

      * 
      * 
{@code
@@ -25668,7 +25706,6 @@ public Response rebootNodeInternalWithResponse(String poolId, String nodeI
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> disableNodeSchedulingInternalWithResponseAsync(String poolId, String nodeId,
         RequestOptions requestOptions) {
-        final String contentType = "application/json; odata=minimalmetadata";
         final String accept = "application/json";
         RequestOptions requestOptionsLocal = requestOptions == null ? new RequestOptions() : requestOptions;
         requestOptionsLocal.addRequestCallback(requestLocal -> {
@@ -25677,7 +25714,7 @@ public Mono> disableNodeSchedulingInternalWithResponseAsync(Strin
             }
         });
         return FluxUtil.withContext(context -> service.disableNodeSchedulingInternal(this.getEndpoint(),
-            this.getServiceVersion().getVersion(), contentType, poolId, nodeId, accept, requestOptionsLocal, context));
+            this.getServiceVersion().getVersion(), poolId, nodeId, accept, requestOptionsLocal, context));
     }
 
     /**
@@ -25694,6 +25731,14 @@ public Mono> disableNodeSchedulingInternalWithResponseAsync(Strin
      * instead.".
      * 
      * You can add these to a request with {@link RequestOptions#addQueryParam}
+     * 
Header Parameters

+     * 
+     * 
+     * 
+     * 
+     * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values: "application/json;
+     * odata=minimalmetadata".

+     * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

      * 
      * 
{@code
@@ -25714,7 +25759,6 @@ public Mono> disableNodeSchedulingInternalWithResponseAsync(Strin
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response disableNodeSchedulingInternalWithResponse(String poolId, String nodeId,
         RequestOptions requestOptions) {
-        final String contentType = "application/json; odata=minimalmetadata";
         final String accept = "application/json";
         RequestOptions requestOptionsLocal = requestOptions == null ? new RequestOptions() : requestOptions;
         requestOptionsLocal.addRequestCallback(requestLocal -> {
@@ -25723,7 +25767,7 @@ public Response disableNodeSchedulingInternalWithResponse(String poolId, S
             }
         });
         return service.disableNodeSchedulingInternalSync(this.getEndpoint(), this.getServiceVersion().getVersion(),
-            contentType, poolId, nodeId, accept, requestOptionsLocal, Context.NONE);
+            poolId, nodeId, accept, requestOptionsLocal, Context.NONE);
     }
 
     /**
@@ -25821,8 +25865,11 @@ public Response enableNodeSchedulingInternalWithResponse(String poolId, St
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return the remote login settings for a Compute Node along with {@link Response} on successful completion of
-     * {@link Mono}.
+     * @return the settings required for remote login to a Compute Node.
+     * 
+     * Before you can remotely login to a Compute Node using the remote login
+     * settings, you must create a user Account on the Compute Node along with {@link Response} on successful completion
+     * of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getNodeRemoteLoginSettingsInternalWithResponseAsync(String poolId, String nodeId,
@@ -25863,7 +25910,10 @@ public Mono> getNodeRemoteLoginSettingsInternalWithResponse
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return the remote login settings for a Compute Node along with {@link Response}.
+     * @return the settings required for remote login to a Compute Node.
+     * 
+     * Before you can remotely login to a Compute Node using the remote login
+     * settings, you must create a user Account on the Compute Node along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response getNodeRemoteLoginSettingsInternalWithResponse(String poolId, String nodeId,
@@ -27367,7 +27417,7 @@ public Response deleteNodeFileInternalWithResponse(String poolId, String n
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getNodeFileInternalWithResponseAsync(String poolId, String nodeId,
         String filePath, RequestOptions requestOptions) {
-        final String accept = "application/octet-stream, application/json";
+        final String accept = "application/octet-stream";
         return FluxUtil.withContext(context -> service.getNodeFileInternal(this.getEndpoint(),
             this.getServiceVersion().getVersion(), poolId, nodeId, filePath, accept, requestOptions, context));
     }
@@ -27419,7 +27469,7 @@ public Mono> getNodeFileInternalWithResponseAsync(String po
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response getNodeFileInternalWithResponse(String poolId, String nodeId, String filePath,
         RequestOptions requestOptions) {
-        final String accept = "application/octet-stream, application/json";
+        final String accept = "application/octet-stream";
         return service.getNodeFileInternalSync(this.getEndpoint(), this.getServiceVersion().getVersion(), poolId,
             nodeId, filePath, accept, requestOptions, Context.NONE);
     }
@@ -28704,6 +28754,10 @@ private PagedResponse listSupportedImagesInternalNextSinglePage(Stri
     }
 
     /**
+     * Gets the number of Compute Nodes in each state, grouped by Pool. Note that the
+     * numbers returned may not always be up to date. If you need exact node counts,
+     * use a list query.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -28752,6 +28806,10 @@ private Mono> listPoolNodeCountsInternalNextSinglePage
     }
 
     /**
+     * Gets the number of Compute Nodes in each state, grouped by Pool. Note that the
+     * numbers returned may not always be up to date. If you need exact node counts,
+     * use a list query.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
diff --git a/sdk/batch/azure-compute-batch/src/main/resources/META-INF/azure-compute-batch_apiview_properties.json b/sdk/batch/azure-compute-batch/src/main/resources/META-INF/azure-compute-batch_apiview_properties.json
index 2f624dc6467c..2ae3877cfbc2 100644
--- a/sdk/batch/azure-compute-batch/src/main/resources/META-INF/azure-compute-batch_apiview_properties.json
+++ b/sdk/batch/azure-compute-batch/src/main/resources/META-INF/azure-compute-batch_apiview_properties.json
@@ -1,7 +1,7 @@
 {
   "flavor": "azure", 
   "CrossLanguageDefinitionId": {
-    "com.azure.compute.batch.BatchAsyncClient": "Azure.Batch.BatchClient",
+    "com.azure.compute.batch.BatchAsyncClient": "Azure.Batch.Batch",
     "com.azure.compute.batch.BatchAsyncClient.createJobInternal": "Azure.Batch.Batch.createJob",
     "com.azure.compute.batch.BatchAsyncClient.createJobInternalWithResponse": "Azure.Batch.Batch.createJob",
     "com.azure.compute.batch.BatchAsyncClient.createJobScheduleInternal": "Azure.Batch.Batch.createJobSchedule",
@@ -125,7 +125,7 @@
     "com.azure.compute.batch.BatchAsyncClient.updatePoolInternalWithResponse": "Azure.Batch.Batch.updatePool",
     "com.azure.compute.batch.BatchAsyncClient.uploadNodeLogsInternal": "Azure.Batch.Batch.uploadNodeLogs",
     "com.azure.compute.batch.BatchAsyncClient.uploadNodeLogsInternalWithResponse": "Azure.Batch.Batch.uploadNodeLogs",
-    "com.azure.compute.batch.BatchClient": "Azure.Batch.BatchClient",
+    "com.azure.compute.batch.BatchClient": "Azure.Batch.Batch",
     "com.azure.compute.batch.BatchClient.createJobInternal": "Azure.Batch.Batch.createJob",
     "com.azure.compute.batch.BatchClient.createJobInternalWithResponse": "Azure.Batch.Batch.createJob",
     "com.azure.compute.batch.BatchClient.createJobScheduleInternal": "Azure.Batch.Batch.createJobSchedule",
@@ -249,7 +249,7 @@
     "com.azure.compute.batch.BatchClient.updatePoolInternalWithResponse": "Azure.Batch.Batch.updatePool",
     "com.azure.compute.batch.BatchClient.uploadNodeLogsInternal": "Azure.Batch.Batch.uploadNodeLogs",
     "com.azure.compute.batch.BatchClient.uploadNodeLogsInternalWithResponse": "Azure.Batch.Batch.uploadNodeLogs",
-    "com.azure.compute.batch.BatchClientBuilder": "Azure.Batch.BatchClient",
+    "com.azure.compute.batch.BatchClientBuilder": "Azure.Batch.Batch",
     "com.azure.compute.batch.models.AccessScope": "Azure.Batch.AccessScope",
     "com.azure.compute.batch.models.AffinityInfo": "Azure.Batch.AffinityInfo",
     "com.azure.compute.batch.models.AllocationState": "Azure.Batch.AllocationState",
diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/implementation/JobRouterAdministrationClientImpl.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/implementation/JobRouterAdministrationClientImpl.java
index c575096419fb..05c1de59db08 100644
--- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/implementation/JobRouterAdministrationClientImpl.java
+++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/implementation/JobRouterAdministrationClientImpl.java
@@ -167,7 +167,7 @@ public interface JobRouterAdministrationClientService {
         Mono> upsertDistributionPolicy(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion,
             @PathParam("distributionPolicyId") String distributionPolicyId,
-            @HeaderParam("Content-Type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/merge-patch+json") BinaryData resource, RequestOptions requestOptions,
             Context context);
 
@@ -180,7 +180,7 @@ Mono> upsertDistributionPolicy(@HostParam("endpoint") Strin
         Response upsertDistributionPolicySync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion,
             @PathParam("distributionPolicyId") String distributionPolicyId,
-            @HeaderParam("Content-Type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/merge-patch+json") BinaryData resource, RequestOptions requestOptions,
             Context context);
 
@@ -192,7 +192,7 @@ Response upsertDistributionPolicySync(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getDistributionPolicy(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion,
-            @PathParam("distributionPolicyId") String distributionPolicyId, @HeaderParam("accept") String accept,
+            @PathParam("distributionPolicyId") String distributionPolicyId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/routing/distributionPolicies/{distributionPolicyId}")
@@ -203,7 +203,7 @@ Mono> getDistributionPolicy(@HostParam("endpoint") String e
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getDistributionPolicySync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion,
-            @PathParam("distributionPolicyId") String distributionPolicyId, @HeaderParam("accept") String accept,
+            @PathParam("distributionPolicyId") String distributionPolicyId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/routing/distributionPolicies")
@@ -213,7 +213,7 @@ Response getDistributionPolicySync(@HostParam("endpoint") String end
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listDistributionPolicies(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/routing/distributionPolicies")
@@ -223,7 +223,7 @@ Mono> listDistributionPolicies(@HostParam("endpoint") Strin
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listDistributionPoliciesSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Delete("/routing/distributionPolicies/{distributionPolicyId}")
@@ -234,7 +234,7 @@ Response listDistributionPoliciesSync(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> deleteDistributionPolicy(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion,
-            @PathParam("distributionPolicyId") String distributionPolicyId, @HeaderParam("accept") String accept,
+            @PathParam("distributionPolicyId") String distributionPolicyId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Delete("/routing/distributionPolicies/{distributionPolicyId}")
@@ -245,7 +245,7 @@ Mono> deleteDistributionPolicy(@HostParam("endpoint") String endp
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response deleteDistributionPolicySync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion,
-            @PathParam("distributionPolicyId") String distributionPolicyId, @HeaderParam("accept") String accept,
+            @PathParam("distributionPolicyId") String distributionPolicyId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Patch("/routing/classificationPolicies/{classificationPolicyId}")
@@ -257,7 +257,7 @@ Response deleteDistributionPolicySync(@HostParam("endpoint") String endpoi
         Mono> upsertClassificationPolicy(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion,
             @PathParam("classificationPolicyId") String classificationPolicyId,
-            @HeaderParam("Content-Type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/merge-patch+json") BinaryData resource, RequestOptions requestOptions,
             Context context);
 
@@ -270,7 +270,7 @@ Mono> upsertClassificationPolicy(@HostParam("endpoint") Str
         Response upsertClassificationPolicySync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion,
             @PathParam("classificationPolicyId") String classificationPolicyId,
-            @HeaderParam("Content-Type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/merge-patch+json") BinaryData resource, RequestOptions requestOptions,
             Context context);
 
@@ -282,7 +282,7 @@ Response upsertClassificationPolicySync(@HostParam("endpoint") Strin
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getClassificationPolicy(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion,
-            @PathParam("classificationPolicyId") String classificationPolicyId, @HeaderParam("accept") String accept,
+            @PathParam("classificationPolicyId") String classificationPolicyId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/routing/classificationPolicies/{classificationPolicyId}")
@@ -293,7 +293,7 @@ Mono> getClassificationPolicy(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getClassificationPolicySync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion,
-            @PathParam("classificationPolicyId") String classificationPolicyId, @HeaderParam("accept") String accept,
+            @PathParam("classificationPolicyId") String classificationPolicyId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/routing/classificationPolicies")
@@ -303,7 +303,7 @@ Response getClassificationPolicySync(@HostParam("endpoint") String e
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listClassificationPolicies(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/routing/classificationPolicies")
@@ -313,7 +313,7 @@ Mono> listClassificationPolicies(@HostParam("endpoint") Str
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listClassificationPoliciesSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Delete("/routing/classificationPolicies/{classificationPolicyId}")
@@ -324,7 +324,7 @@ Response listClassificationPoliciesSync(@HostParam("endpoint") Strin
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> deleteClassificationPolicy(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion,
-            @PathParam("classificationPolicyId") String classificationPolicyId, @HeaderParam("accept") String accept,
+            @PathParam("classificationPolicyId") String classificationPolicyId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Delete("/routing/classificationPolicies/{classificationPolicyId}")
@@ -335,7 +335,7 @@ Mono> deleteClassificationPolicy(@HostParam("endpoint") String en
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response deleteClassificationPolicySync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion,
-            @PathParam("classificationPolicyId") String classificationPolicyId, @HeaderParam("accept") String accept,
+            @PathParam("classificationPolicyId") String classificationPolicyId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Patch("/routing/exceptionPolicies/{exceptionPolicyId}")
@@ -346,7 +346,7 @@ Response deleteClassificationPolicySync(@HostParam("endpoint") String endp
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> upsertExceptionPolicy(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("exceptionPolicyId") String exceptionPolicyId,
-            @HeaderParam("Content-Type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/merge-patch+json") BinaryData resource, RequestOptions requestOptions,
             Context context);
 
@@ -358,7 +358,7 @@ Mono> upsertExceptionPolicy(@HostParam("endpoint") String e
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response upsertExceptionPolicySync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("exceptionPolicyId") String exceptionPolicyId,
-            @HeaderParam("Content-Type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/merge-patch+json") BinaryData resource, RequestOptions requestOptions,
             Context context);
 
@@ -370,7 +370,7 @@ Response upsertExceptionPolicySync(@HostParam("endpoint") String end
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getExceptionPolicy(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("exceptionPolicyId") String exceptionPolicyId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/routing/exceptionPolicies/{exceptionPolicyId}")
         @ExpectedResponses({ 200 })
@@ -380,7 +380,7 @@ Mono> getExceptionPolicy(@HostParam("endpoint") String endp
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getExceptionPolicySync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("exceptionPolicyId") String exceptionPolicyId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/routing/exceptionPolicies")
         @ExpectedResponses({ 200 })
@@ -389,7 +389,7 @@ Response getExceptionPolicySync(@HostParam("endpoint") String endpoi
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listExceptionPolicies(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/routing/exceptionPolicies")
@@ -399,7 +399,7 @@ Mono> listExceptionPolicies(@HostParam("endpoint") String e
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listExceptionPoliciesSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Delete("/routing/exceptionPolicies/{exceptionPolicyId}")
@@ -410,7 +410,7 @@ Response listExceptionPoliciesSync(@HostParam("endpoint") String end
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> deleteExceptionPolicy(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("exceptionPolicyId") String exceptionPolicyId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/routing/exceptionPolicies/{exceptionPolicyId}")
         @ExpectedResponses({ 204 })
@@ -420,7 +420,7 @@ Mono> deleteExceptionPolicy(@HostParam("endpoint") String endpoin
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response deleteExceptionPolicySync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("exceptionPolicyId") String exceptionPolicyId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Patch("/routing/queues/{queueId}")
         @ExpectedResponses({ 200, 201 })
@@ -430,7 +430,7 @@ Response deleteExceptionPolicySync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> upsertQueue(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("queueId") String queueId,
-            @HeaderParam("Content-Type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/merge-patch+json") BinaryData resource, RequestOptions requestOptions,
             Context context);
 
@@ -442,7 +442,7 @@ Mono> upsertQueue(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response upsertQueueSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("queueId") String queueId,
-            @HeaderParam("Content-Type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/merge-patch+json") BinaryData resource, RequestOptions requestOptions,
             Context context);
 
@@ -454,7 +454,7 @@ Response upsertQueueSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getQueue(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("queueId") String queueId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/routing/queues/{queueId}")
         @ExpectedResponses({ 200 })
@@ -464,7 +464,7 @@ Mono> getQueue(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getQueueSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("queueId") String queueId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/routing/queues")
         @ExpectedResponses({ 200 })
@@ -473,7 +473,7 @@ Response getQueueSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listQueues(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/routing/queues")
@@ -483,7 +483,7 @@ Mono> listQueues(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listQueuesSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Delete("/routing/queues/{queueId}")
@@ -494,7 +494,7 @@ Response listQueuesSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> deleteQueue(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("queueId") String queueId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/routing/queues/{queueId}")
         @ExpectedResponses({ 204 })
@@ -504,7 +504,7 @@ Mono> deleteQueue(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response deleteQueueSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("queueId") String queueId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -514,7 +514,7 @@ Response deleteQueueSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listDistributionPoliciesNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -524,7 +524,7 @@ Mono> listDistributionPoliciesNext(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listDistributionPoliciesNextSync(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -534,7 +534,7 @@ Response listDistributionPoliciesNextSync(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listClassificationPoliciesNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -544,7 +544,7 @@ Mono> listClassificationPoliciesNext(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listClassificationPoliciesNextSync(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -554,7 +554,7 @@ Response listClassificationPoliciesNextSync(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listExceptionPoliciesNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -564,7 +564,7 @@ Mono> listExceptionPoliciesNext(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listExceptionPoliciesNextSync(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -573,7 +573,7 @@ Response listExceptionPoliciesNextSync(
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listQueuesNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -583,7 +583,7 @@ Mono> listQueuesNext(@PathParam(value = "nextLink", encoded
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listQueuesNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
     }
 
diff --git a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/implementation/JobRouterClientImpl.java b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/implementation/JobRouterClientImpl.java
index a7f25e9ce546..d00db9d025fb 100644
--- a/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/implementation/JobRouterClientImpl.java
+++ b/sdk/communication/azure-communication-jobrouter/src/main/java/com/azure/communication/jobrouter/implementation/JobRouterClientImpl.java
@@ -166,7 +166,7 @@ public interface JobRouterClientService {
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> upsertJob(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @HeaderParam("Content-Type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/merge-patch+json") BinaryData resource, RequestOptions requestOptions,
             Context context);
 
@@ -178,7 +178,7 @@ Mono> upsertJob(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response upsertJobSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @HeaderParam("Content-Type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/merge-patch+json") BinaryData resource, RequestOptions requestOptions,
             Context context);
 
@@ -190,7 +190,7 @@ Response upsertJobSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getJob(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/routing/jobs/{jobId}")
         @ExpectedResponses({ 200 })
@@ -200,7 +200,7 @@ Mono> getJob(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getJobSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/routing/jobs/{jobId}")
         @ExpectedResponses({ 204 })
@@ -210,7 +210,7 @@ Response getJobSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> deleteJob(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/routing/jobs/{jobId}")
         @ExpectedResponses({ 204 })
@@ -220,7 +220,7 @@ Mono> deleteJob(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response deleteJobSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/routing/jobs/{jobId}:reclassify")
         @ExpectedResponses({ 200 })
@@ -230,7 +230,7 @@ Response deleteJobSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> reclassifyJob(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/routing/jobs/{jobId}:reclassify")
         @ExpectedResponses({ 200 })
@@ -240,7 +240,7 @@ Mono> reclassifyJob(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response reclassifyJobSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/routing/jobs/{jobId}:cancel")
         @ExpectedResponses({ 200 })
@@ -250,7 +250,7 @@ Response reclassifyJobSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> cancelJob(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/routing/jobs/{jobId}:cancel")
         @ExpectedResponses({ 200 })
@@ -260,7 +260,7 @@ Mono> cancelJob(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response cancelJobSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/routing/jobs/{jobId}/assignments/{assignmentId}:complete")
         @ExpectedResponses({ 200 })
@@ -270,7 +270,7 @@ Response cancelJobSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> completeJob(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @PathParam("assignmentId") String assignmentId, @HeaderParam("accept") String accept,
+            @PathParam("assignmentId") String assignmentId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Post("/routing/jobs/{jobId}/assignments/{assignmentId}:complete")
@@ -281,7 +281,7 @@ Mono> completeJob(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response completeJobSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @PathParam("assignmentId") String assignmentId, @HeaderParam("accept") String accept,
+            @PathParam("assignmentId") String assignmentId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Post("/routing/jobs/{jobId}/assignments/{assignmentId}:close")
@@ -292,7 +292,7 @@ Response completeJobSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> closeJob(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @PathParam("assignmentId") String assignmentId, @HeaderParam("accept") String accept,
+            @PathParam("assignmentId") String assignmentId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Post("/routing/jobs/{jobId}/assignments/{assignmentId}:close")
@@ -303,7 +303,7 @@ Mono> closeJob(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response closeJobSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @PathParam("assignmentId") String assignmentId, @HeaderParam("accept") String accept,
+            @PathParam("assignmentId") String assignmentId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/routing/jobs")
@@ -313,7 +313,7 @@ Response closeJobSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listJobs(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/routing/jobs")
@@ -323,7 +323,7 @@ Mono> listJobs(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listJobsSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/routing/jobs/{jobId}/position")
@@ -334,7 +334,7 @@ Response listJobsSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getQueuePosition(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/routing/jobs/{jobId}/position")
         @ExpectedResponses({ 200 })
@@ -344,7 +344,7 @@ Mono> getQueuePosition(@HostParam("endpoint") String endpoi
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getQueuePositionSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/routing/jobs/{jobId}/assignments/{assignmentId}:unassign")
         @ExpectedResponses({ 200 })
@@ -354,7 +354,7 @@ Response getQueuePositionSync(@HostParam("endpoint") String endpoint
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> unassignJob(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @PathParam("assignmentId") String assignmentId, @HeaderParam("accept") String accept,
+            @PathParam("assignmentId") String assignmentId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Post("/routing/jobs/{jobId}/assignments/{assignmentId}:unassign")
@@ -365,7 +365,7 @@ Mono> unassignJob(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response unassignJobSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("jobId") String jobId,
-            @PathParam("assignmentId") String assignmentId, @HeaderParam("accept") String accept,
+            @PathParam("assignmentId") String assignmentId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Post("/routing/workers/{workerId}/offers/{offerId}:accept")
@@ -376,7 +376,7 @@ Response unassignJobSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> acceptJobOffer(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("workerId") String workerId,
-            @PathParam("offerId") String offerId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("offerId") String offerId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Post("/routing/workers/{workerId}/offers/{offerId}:accept")
@@ -387,7 +387,7 @@ Mono> acceptJobOffer(@HostParam("endpoint") String endpoint
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response acceptJobOfferSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("workerId") String workerId,
-            @PathParam("offerId") String offerId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("offerId") String offerId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Post("/routing/workers/{workerId}/offers/{offerId}:decline")
@@ -398,7 +398,7 @@ Response acceptJobOfferSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> declineJobOffer(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("workerId") String workerId,
-            @PathParam("offerId") String offerId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("offerId") String offerId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Post("/routing/workers/{workerId}/offers/{offerId}:decline")
@@ -409,7 +409,7 @@ Mono> declineJobOffer(@HostParam("endpoint") String endpoin
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response declineJobOfferSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("workerId") String workerId,
-            @PathParam("offerId") String offerId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("offerId") String offerId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/routing/queues/{queueId}/statistics")
@@ -420,7 +420,7 @@ Response declineJobOfferSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getQueueStatistics(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("queueId") String queueId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/routing/queues/{queueId}/statistics")
         @ExpectedResponses({ 200 })
@@ -430,7 +430,7 @@ Mono> getQueueStatistics(@HostParam("endpoint") String endp
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getQueueStatisticsSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("queueId") String queueId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Patch("/routing/workers/{workerId}")
         @ExpectedResponses({ 200, 201 })
@@ -440,7 +440,7 @@ Response getQueueStatisticsSync(@HostParam("endpoint") String endpoi
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> upsertWorker(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("workerId") String workerId,
-            @HeaderParam("Content-Type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/merge-patch+json") BinaryData resource, RequestOptions requestOptions,
             Context context);
 
@@ -452,7 +452,7 @@ Mono> upsertWorker(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response upsertWorkerSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("workerId") String workerId,
-            @HeaderParam("Content-Type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/merge-patch+json") BinaryData resource, RequestOptions requestOptions,
             Context context);
 
@@ -464,7 +464,7 @@ Response upsertWorkerSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getWorker(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("workerId") String workerId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/routing/workers/{workerId}")
         @ExpectedResponses({ 200 })
@@ -474,7 +474,7 @@ Mono> getWorker(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getWorkerSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("workerId") String workerId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/routing/workers/{workerId}")
         @ExpectedResponses({ 204 })
@@ -484,7 +484,7 @@ Response getWorkerSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> deleteWorker(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("workerId") String workerId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/routing/workers/{workerId}")
         @ExpectedResponses({ 204 })
@@ -494,7 +494,7 @@ Mono> deleteWorker(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response deleteWorkerSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("workerId") String workerId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/routing/workers")
         @ExpectedResponses({ 200 })
@@ -503,7 +503,7 @@ Response deleteWorkerSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listWorkers(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/routing/workers")
@@ -513,7 +513,7 @@ Mono> listWorkers(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listWorkersSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
@@ -523,7 +523,7 @@ Response listWorkersSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listJobsNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -533,7 +533,7 @@ Mono> listJobsNext(@PathParam(value = "nextLink", encoded =
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listJobsNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -543,7 +543,7 @@ Response listJobsNextSync(@PathParam(value = "nextLink", encoded = t
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listWorkersNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -553,7 +553,7 @@ Mono> listWorkersNext(@PathParam(value = "nextLink", encode
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listWorkersNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
     }
 
diff --git a/sdk/communication/azure-communication-jobrouter/src/main/resources/META-INF/azure-communication-jobrouter_apiview_properties.json b/sdk/communication/azure-communication-jobrouter/src/main/resources/META-INF/azure-communication-jobrouter_apiview_properties.json
index 976918b77eeb..7ec09f388109 100644
--- a/sdk/communication/azure-communication-jobrouter/src/main/resources/META-INF/azure-communication-jobrouter_apiview_properties.json
+++ b/sdk/communication/azure-communication-jobrouter/src/main/resources/META-INF/azure-communication-jobrouter_apiview_properties.json
@@ -1,7 +1,7 @@
 {
   "flavor": "azure", 
   "CrossLanguageDefinitionId": {
-    "com.azure.communication.jobrouter.JobRouterAdministrationAsyncClient": "AzureCommunicationRoutingService.JobRouterAdministrationClient",
+    "com.azure.communication.jobrouter.JobRouterAdministrationAsyncClient": "ClientForAcsJobRouter.JobRouterAdministrationRestClient",
     "com.azure.communication.jobrouter.JobRouterAdministrationAsyncClient.deleteClassificationPolicy": "ClientForAcsJobRouter.JobRouterAdministrationRestClient.deleteClassificationPolicy",
     "com.azure.communication.jobrouter.JobRouterAdministrationAsyncClient.deleteClassificationPolicyWithResponse": "ClientForAcsJobRouter.JobRouterAdministrationRestClient.deleteClassificationPolicy",
     "com.azure.communication.jobrouter.JobRouterAdministrationAsyncClient.deleteDistributionPolicy": "ClientForAcsJobRouter.JobRouterAdministrationRestClient.deleteDistributionPolicy",
@@ -30,7 +30,7 @@
     "com.azure.communication.jobrouter.JobRouterAdministrationAsyncClient.upsertExceptionPolicyWithResponse": "ClientForAcsJobRouter.JobRouterAdministrationRestClient.upsertExceptionPolicy",
     "com.azure.communication.jobrouter.JobRouterAdministrationAsyncClient.upsertQueue": "ClientForAcsJobRouter.JobRouterAdministrationRestClient.upsertQueue",
     "com.azure.communication.jobrouter.JobRouterAdministrationAsyncClient.upsertQueueWithResponse": "ClientForAcsJobRouter.JobRouterAdministrationRestClient.upsertQueue",
-    "com.azure.communication.jobrouter.JobRouterAdministrationClient": "AzureCommunicationRoutingService.JobRouterAdministrationClient",
+    "com.azure.communication.jobrouter.JobRouterAdministrationClient": "ClientForAcsJobRouter.JobRouterAdministrationRestClient",
     "com.azure.communication.jobrouter.JobRouterAdministrationClient.deleteClassificationPolicy": "ClientForAcsJobRouter.JobRouterAdministrationRestClient.deleteClassificationPolicy",
     "com.azure.communication.jobrouter.JobRouterAdministrationClient.deleteClassificationPolicyWithResponse": "ClientForAcsJobRouter.JobRouterAdministrationRestClient.deleteClassificationPolicy",
     "com.azure.communication.jobrouter.JobRouterAdministrationClient.deleteDistributionPolicy": "ClientForAcsJobRouter.JobRouterAdministrationRestClient.deleteDistributionPolicy",
@@ -59,8 +59,8 @@
     "com.azure.communication.jobrouter.JobRouterAdministrationClient.upsertExceptionPolicyWithResponse": "ClientForAcsJobRouter.JobRouterAdministrationRestClient.upsertExceptionPolicy",
     "com.azure.communication.jobrouter.JobRouterAdministrationClient.upsertQueue": "ClientForAcsJobRouter.JobRouterAdministrationRestClient.upsertQueue",
     "com.azure.communication.jobrouter.JobRouterAdministrationClient.upsertQueueWithResponse": "ClientForAcsJobRouter.JobRouterAdministrationRestClient.upsertQueue",
-    "com.azure.communication.jobrouter.JobRouterAdministrationClientBuilder": "AzureCommunicationRoutingService.JobRouterAdministrationClient",
-    "com.azure.communication.jobrouter.JobRouterAsyncClient": "AzureCommunicationRoutingService.JobRouterClient",
+    "com.azure.communication.jobrouter.JobRouterAdministrationClientBuilder": "ClientForAcsJobRouter.JobRouterAdministrationRestClient",
+    "com.azure.communication.jobrouter.JobRouterAsyncClient": "ClientForAcsJobRouter.JobRouterRestClient",
     "com.azure.communication.jobrouter.JobRouterAsyncClient.acceptJobOffer": "ClientForAcsJobRouter.JobRouterRestClient.accept",
     "com.azure.communication.jobrouter.JobRouterAsyncClient.acceptJobOfferWithResponse": "ClientForAcsJobRouter.JobRouterRestClient.accept",
     "com.azure.communication.jobrouter.JobRouterAsyncClient.cancelJob": "ClientForAcsJobRouter.JobRouterRestClient.cancel",
@@ -93,7 +93,7 @@
     "com.azure.communication.jobrouter.JobRouterAsyncClient.upsertJobWithResponse": "ClientForAcsJobRouter.JobRouterRestClient.upsertJob",
     "com.azure.communication.jobrouter.JobRouterAsyncClient.upsertWorker": "ClientForAcsJobRouter.JobRouterRestClient.upsertWorker",
     "com.azure.communication.jobrouter.JobRouterAsyncClient.upsertWorkerWithResponse": "ClientForAcsJobRouter.JobRouterRestClient.upsertWorker",
-    "com.azure.communication.jobrouter.JobRouterClient": "AzureCommunicationRoutingService.JobRouterClient",
+    "com.azure.communication.jobrouter.JobRouterClient": "ClientForAcsJobRouter.JobRouterRestClient",
     "com.azure.communication.jobrouter.JobRouterClient.acceptJobOffer": "ClientForAcsJobRouter.JobRouterRestClient.accept",
     "com.azure.communication.jobrouter.JobRouterClient.acceptJobOfferWithResponse": "ClientForAcsJobRouter.JobRouterRestClient.accept",
     "com.azure.communication.jobrouter.JobRouterClient.cancelJob": "ClientForAcsJobRouter.JobRouterRestClient.cancel",
@@ -126,7 +126,7 @@
     "com.azure.communication.jobrouter.JobRouterClient.upsertJobWithResponse": "ClientForAcsJobRouter.JobRouterRestClient.upsertJob",
     "com.azure.communication.jobrouter.JobRouterClient.upsertWorker": "ClientForAcsJobRouter.JobRouterRestClient.upsertWorker",
     "com.azure.communication.jobrouter.JobRouterClient.upsertWorkerWithResponse": "ClientForAcsJobRouter.JobRouterRestClient.upsertWorker",
-    "com.azure.communication.jobrouter.JobRouterClientBuilder": "AzureCommunicationRoutingService.JobRouterClient",
+    "com.azure.communication.jobrouter.JobRouterClientBuilder": "ClientForAcsJobRouter.JobRouterRestClient",
     "com.azure.communication.jobrouter.implementation.models.CancelJobResultInternal": "AzureCommunicationRoutingService.CancelJobResult",
     "com.azure.communication.jobrouter.implementation.models.CloseJobResultInternal": "AzureCommunicationRoutingService.CloseJobResult",
     "com.azure.communication.jobrouter.implementation.models.CompleteJobResultInternal": "AzureCommunicationRoutingService.CompleteJobResult",
diff --git a/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/implementation/MessageTemplateClientImpl.java b/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/implementation/MessageTemplateClientImpl.java
index 15d5054b68e5..43b56ec06338 100644
--- a/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/implementation/MessageTemplateClientImpl.java
+++ b/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/implementation/MessageTemplateClientImpl.java
@@ -163,7 +163,7 @@ public interface MessageTemplateClientService {
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listTemplates(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("channelId") String channelId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/messages/channels/{channelId}/templates")
         @ExpectedResponses({ 200 })
@@ -173,7 +173,7 @@ Mono> listTemplates(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listTemplatesSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("channelId") String channelId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -182,7 +182,7 @@ Response listTemplatesSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listTemplatesNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -192,7 +192,7 @@ Mono> listTemplatesNext(@PathParam(value = "nextLink", enco
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listTemplatesNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
     }
 
@@ -388,6 +388,8 @@ public PagedIterable listTemplates(String channelId, RequestOptions
     }
 
     /**
+     * List all templates for given Azure Communication Services channel
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -421,6 +423,8 @@ private Mono> listTemplatesNextSinglePageAsync(String
     }
 
     /**
+     * List all templates for given Azure Communication Services channel
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
diff --git a/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/implementation/NotificationMessagesClientImpl.java b/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/implementation/NotificationMessagesClientImpl.java
index 7e9694dad8a9..5d6efec0ff7a 100644
--- a/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/implementation/NotificationMessagesClientImpl.java
+++ b/sdk/communication/azure-communication-messages/src/main/java/com/azure/communication/messages/implementation/NotificationMessagesClientImpl.java
@@ -160,9 +160,9 @@ public interface NotificationMessagesClientService {
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> send(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData notificationContent, RequestOptions requestOptions,
-            Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData notificationContent,
+            RequestOptions requestOptions, Context context);
 
         @Post("/messages/notifications:send")
         @ExpectedResponses({ 202 })
@@ -171,9 +171,9 @@ Mono> send(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response sendSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData notificationContent, RequestOptions requestOptions,
-            Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData notificationContent,
+            RequestOptions requestOptions, Context context);
 
         @Get("/messages/streams/{id}")
         @ExpectedResponses({ 200 })
@@ -183,7 +183,7 @@ Response sendSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> downloadMedia(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("id") String mediaId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/messages/streams/{id}")
         @ExpectedResponses({ 200 })
@@ -193,7 +193,7 @@ Mono> downloadMedia(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response downloadMediaSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("id") String mediaId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
     }
 
     /**
@@ -244,6 +244,7 @@ Response downloadMediaSync(@HostParam("endpoint") String endpoint,
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> sendWithResponseAsync(BinaryData notificationContent,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         RequestOptions requestOptionsLocal = requestOptions == null ? new RequestOptions() : requestOptions;
         requestOptionsLocal.addRequestCallback(requestLocal -> {
@@ -260,7 +261,7 @@ public Mono> sendWithResponseAsync(BinaryData notificationC
             }
         });
         return FluxUtil.withContext(context -> service.send(this.getEndpoint(), this.getServiceVersion().getVersion(),
-            accept, notificationContent, requestOptionsLocal, context));
+            contentType, accept, notificationContent, requestOptionsLocal, context));
     }
 
     /**
@@ -309,6 +310,7 @@ public Mono> sendWithResponseAsync(BinaryData notificationC
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response sendWithResponse(BinaryData notificationContent, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         RequestOptions requestOptionsLocal = requestOptions == null ? new RequestOptions() : requestOptions;
         requestOptionsLocal.addRequestCallback(requestLocal -> {
@@ -324,8 +326,8 @@ public Response sendWithResponse(BinaryData notificationContent, Req
                         DateTimeRfc1123.toRfc1123String(OffsetDateTime.now()));
             }
         });
-        return service.sendSync(this.getEndpoint(), this.getServiceVersion().getVersion(), accept, notificationContent,
-            requestOptionsLocal, Context.NONE);
+        return service.sendSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, accept,
+            notificationContent, requestOptionsLocal, Context.NONE);
     }
 
     /**
@@ -346,7 +348,7 @@ public Response sendWithResponse(BinaryData notificationContent, Req
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> downloadMediaWithResponseAsync(String mediaId, RequestOptions requestOptions) {
-        final String accept = "application/octet-stream, application/json";
+        final String accept = "application/octet-stream";
         return FluxUtil.withContext(context -> service.downloadMedia(this.getEndpoint(),
             this.getServiceVersion().getVersion(), mediaId, accept, requestOptions, context));
     }
@@ -369,7 +371,7 @@ public Mono> downloadMediaWithResponseAsync(String mediaId,
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response downloadMediaWithResponse(String mediaId, RequestOptions requestOptions) {
-        final String accept = "application/octet-stream, application/json";
+        final String accept = "application/octet-stream";
         return service.downloadMediaSync(this.getEndpoint(), this.getServiceVersion().getVersion(), mediaId, accept,
             requestOptions, Context.NONE);
     }
diff --git a/sdk/communication/azure-communication-messages/src/main/resources/META-INF/azure-communication-messages_apiview_properties.json b/sdk/communication/azure-communication-messages/src/main/resources/META-INF/azure-communication-messages_apiview_properties.json
index 341dea4534fb..d1daa4831af3 100644
--- a/sdk/communication/azure-communication-messages/src/main/resources/META-INF/azure-communication-messages_apiview_properties.json
+++ b/sdk/communication/azure-communication-messages/src/main/resources/META-INF/azure-communication-messages_apiview_properties.json
@@ -1,22 +1,22 @@
 {
   "flavor": "azure", 
   "CrossLanguageDefinitionId": {
-    "com.azure.communication.messages.MessageTemplateAsyncClient": "Azure.Communication.MessagesService.MessageTemplateClient",
+    "com.azure.communication.messages.MessageTemplateAsyncClient": "ClientForAcsMessages.MessageTemplateClient",
     "com.azure.communication.messages.MessageTemplateAsyncClient.listTemplates": "Azure.Communication.MessagesService.MessageTemplateClient.listTemplates",
-    "com.azure.communication.messages.MessageTemplateClient": "Azure.Communication.MessagesService.MessageTemplateClient",
+    "com.azure.communication.messages.MessageTemplateClient": "ClientForAcsMessages.MessageTemplateClient",
     "com.azure.communication.messages.MessageTemplateClient.listTemplates": "Azure.Communication.MessagesService.MessageTemplateClient.listTemplates",
-    "com.azure.communication.messages.MessageTemplateClientBuilder": "Azure.Communication.MessagesService.MessageTemplateClient",
-    "com.azure.communication.messages.NotificationMessagesAsyncClient": "Azure.Communication.MessagesService.NotificationMessagesClient",
+    "com.azure.communication.messages.MessageTemplateClientBuilder": "ClientForAcsMessages.MessageTemplateClient",
+    "com.azure.communication.messages.NotificationMessagesAsyncClient": "ClientForAcsMessages.NotificationMessagesClient",
     "com.azure.communication.messages.NotificationMessagesAsyncClient.downloadMedia": "ClientForAcsMessages.NotificationMessagesClient.downloadMedia",
     "com.azure.communication.messages.NotificationMessagesAsyncClient.downloadMediaWithResponse": "ClientForAcsMessages.NotificationMessagesClient.downloadMedia",
     "com.azure.communication.messages.NotificationMessagesAsyncClient.send": "Azure.Communication.MessagesService.NotificationMessagesClient.send",
     "com.azure.communication.messages.NotificationMessagesAsyncClient.sendWithResponse": "Azure.Communication.MessagesService.NotificationMessagesClient.send",
-    "com.azure.communication.messages.NotificationMessagesClient": "Azure.Communication.MessagesService.NotificationMessagesClient",
+    "com.azure.communication.messages.NotificationMessagesClient": "ClientForAcsMessages.NotificationMessagesClient",
     "com.azure.communication.messages.NotificationMessagesClient.downloadMedia": "ClientForAcsMessages.NotificationMessagesClient.downloadMedia",
     "com.azure.communication.messages.NotificationMessagesClient.downloadMediaWithResponse": "ClientForAcsMessages.NotificationMessagesClient.downloadMedia",
     "com.azure.communication.messages.NotificationMessagesClient.send": "Azure.Communication.MessagesService.NotificationMessagesClient.send",
     "com.azure.communication.messages.NotificationMessagesClient.sendWithResponse": "Azure.Communication.MessagesService.NotificationMessagesClient.send",
-    "com.azure.communication.messages.NotificationMessagesClientBuilder": "Azure.Communication.MessagesService.NotificationMessagesClient",
+    "com.azure.communication.messages.NotificationMessagesClientBuilder": "ClientForAcsMessages.NotificationMessagesClient",
     "com.azure.communication.messages.models.CommunicationMessageKind": "Azure.Communication.MessagesService.CommunicationMessageKind",
     "com.azure.communication.messages.models.CommunicationMessagesChannel": "Azure.Communication.MessagesService.CommunicationMessagesChannel",
     "com.azure.communication.messages.models.MediaNotificationContent": "Azure.Communication.MessagesService.MediaNotificationContent",
diff --git a/sdk/computefleet/azure-resourcemanager-computefleet/src/main/java/com/azure/resourcemanager/computefleet/fluent/AzureFleetClient.java b/sdk/computefleet/azure-resourcemanager-computefleet/src/main/java/com/azure/resourcemanager/computefleet/fluent/AzureFleetClient.java
index fe07fb794c18..800fc3e1be1a 100644
--- a/sdk/computefleet/azure-resourcemanager-computefleet/src/main/java/com/azure/resourcemanager/computefleet/fluent/AzureFleetClient.java
+++ b/sdk/computefleet/azure-resourcemanager-computefleet/src/main/java/com/azure/resourcemanager/computefleet/fluent/AzureFleetClient.java
@@ -12,7 +12,7 @@
  */
 public interface AzureFleetClient {
     /**
-     * Gets Server parameter.
+     * Gets Service host.
      * 
      * @return the endpoint value.
      */
diff --git a/sdk/computefleet/azure-resourcemanager-computefleet/src/main/java/com/azure/resourcemanager/computefleet/implementation/AzureFleetClientBuilder.java b/sdk/computefleet/azure-resourcemanager-computefleet/src/main/java/com/azure/resourcemanager/computefleet/implementation/AzureFleetClientBuilder.java
index 533a8e59a3c8..9ae3496b06a8 100644
--- a/sdk/computefleet/azure-resourcemanager-computefleet/src/main/java/com/azure/resourcemanager/computefleet/implementation/AzureFleetClientBuilder.java
+++ b/sdk/computefleet/azure-resourcemanager-computefleet/src/main/java/com/azure/resourcemanager/computefleet/implementation/AzureFleetClientBuilder.java
@@ -20,12 +20,12 @@
 @ServiceClientBuilder(serviceClients = { AzureFleetClientImpl.class })
 public final class AzureFleetClientBuilder {
     /*
-     * Server parameter
+     * Service host
      */
     private String endpoint;
 
     /**
-     * Sets Server parameter.
+     * Sets Service host.
      * 
      * @param endpoint the endpoint value.
      * @return the AzureFleetClientBuilder.
@@ -121,6 +121,7 @@ public AzureFleetClientBuilder serializerAdapter(SerializerAdapter serializerAda
      * @return an instance of AzureFleetClientImpl.
      */
     public AzureFleetClientImpl buildClient() {
+        String localEndpoint = (endpoint != null) ? endpoint : "https://management.azure.com";
         AzureEnvironment localEnvironment = (environment != null) ? environment : AzureEnvironment.AZURE;
         HttpPipeline localPipeline = (pipeline != null)
             ? pipeline
@@ -131,7 +132,7 @@ public AzureFleetClientImpl buildClient() {
             ? serializerAdapter
             : SerializerFactory.createDefaultManagementSerializerAdapter();
         AzureFleetClientImpl client = new AzureFleetClientImpl(localPipeline, localSerializerAdapter,
-            localDefaultPollInterval, localEnvironment, this.endpoint, this.subscriptionId);
+            localDefaultPollInterval, localEnvironment, localEndpoint, this.subscriptionId);
         return client;
     }
 }
diff --git a/sdk/computefleet/azure-resourcemanager-computefleet/src/main/java/com/azure/resourcemanager/computefleet/implementation/AzureFleetClientImpl.java b/sdk/computefleet/azure-resourcemanager-computefleet/src/main/java/com/azure/resourcemanager/computefleet/implementation/AzureFleetClientImpl.java
index 1c6069e31897..8c9bb0b0e39a 100644
--- a/sdk/computefleet/azure-resourcemanager-computefleet/src/main/java/com/azure/resourcemanager/computefleet/implementation/AzureFleetClientImpl.java
+++ b/sdk/computefleet/azure-resourcemanager-computefleet/src/main/java/com/azure/resourcemanager/computefleet/implementation/AzureFleetClientImpl.java
@@ -41,12 +41,12 @@
 @ServiceClient(builder = AzureFleetClientBuilder.class)
 public final class AzureFleetClientImpl implements AzureFleetClient {
     /**
-     * Server parameter.
+     * Service host.
      */
     private final String endpoint;
 
     /**
-     * Gets Server parameter.
+     * Gets Service host.
      * 
      * @return the endpoint value.
      */
@@ -159,7 +159,7 @@ public FleetsClient getFleets() {
      * @param serializerAdapter The serializer to serialize an object into a string.
      * @param defaultPollInterval The default poll interval for long-running operation.
      * @param environment The Azure environment.
-     * @param endpoint Server parameter.
+     * @param endpoint Service host.
      * @param subscriptionId The ID of the target subscription. The value must be an UUID.
      */
     AzureFleetClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, Duration defaultPollInterval,
diff --git a/sdk/computefleet/azure-resourcemanager-computefleet/src/main/java/com/azure/resourcemanager/computefleet/implementation/FleetsClientImpl.java b/sdk/computefleet/azure-resourcemanager-computefleet/src/main/java/com/azure/resourcemanager/computefleet/implementation/FleetsClientImpl.java
index c747796fdffd..fbdf31fcec25 100644
--- a/sdk/computefleet/azure-resourcemanager-computefleet/src/main/java/com/azure/resourcemanager/computefleet/implementation/FleetsClientImpl.java
+++ b/sdk/computefleet/azure-resourcemanager-computefleet/src/main/java/com/azure/resourcemanager/computefleet/implementation/FleetsClientImpl.java
@@ -80,26 +80,25 @@ public interface FleetsService {
         Mono> getByResourceGroup(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("fleetName") String fleetName,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
-        @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.AzureFleet/fleets/{fleetName}")
         @ExpectedResponses({ 200, 201 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono>> createOrUpdate(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("fleetName") String fleetName,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") FleetInner resource, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") FleetInner resource, Context context);
 
-        @Headers({ "Content-Type: application/json" })
         @Patch("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.AzureFleet/fleets/{fleetName}")
         @ExpectedResponses({ 200, 202 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono>> update(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("fleetName") String fleetName,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") FleetUpdate properties,
-            Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") FleetUpdate properties, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.AzureFleet/fleets/{fleetName}")
@@ -108,7 +107,7 @@ Mono>> update(@HostParam("endpoint") String endpoint,
         Mono>> delete(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("fleetName") String fleetName,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.AzureFleet/fleets")
@@ -116,7 +115,7 @@ Mono>> delete(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listByResourceGroup(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
-            @PathParam("resourceGroupName") String resourceGroupName, @HeaderParam("accept") String accept,
+            @PathParam("resourceGroupName") String resourceGroupName, @HeaderParam("Accept") String accept,
             Context context);
 
         @Headers({ "Content-Type: application/json" })
@@ -125,7 +124,7 @@ Mono> listByResourceGroup(@HostParam("endpoint") Strin
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> list(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.AzureFleet/fleets/{name}/virtualMachineScaleSets")
@@ -135,7 +134,7 @@ Mono> listVirtualMachineScaleSets(
             @HostParam("endpoint") String endpoint, @QueryParam("api-version") String apiVersion,
             @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("name") String name,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
@@ -143,7 +142,7 @@ Mono> listVirtualMachineScaleSets(
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listByResourceGroupNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
@@ -151,7 +150,7 @@ Mono> listByResourceGroupNext(
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listBySubscriptionNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
@@ -159,7 +158,7 @@ Mono> listBySubscriptionNext(
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listVirtualMachineScaleSetsNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -313,10 +312,11 @@ private Mono>> createOrUpdateWithResponseAsync(String
         } else {
             resource.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getApiVersion(),
-                this.client.getSubscriptionId(), resourceGroupName, fleetName, accept, resource, context))
+                this.client.getSubscriptionId(), resourceGroupName, fleetName, contentType, accept, resource, context))
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
@@ -355,10 +355,11 @@ private Mono>> createOrUpdateWithResponseAsync(String
         } else {
             resource.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getApiVersion(),
-            this.client.getSubscriptionId(), resourceGroupName, fleetName, accept, resource, context);
+            this.client.getSubscriptionId(), resourceGroupName, fleetName, contentType, accept, resource, context);
     }
 
     /**
@@ -540,10 +541,10 @@ private Mono>> updateWithResponseAsync(String resource
         } else {
             properties.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil
-            .withContext(context -> service.update(this.client.getEndpoint(), this.client.getApiVersion(),
-                this.client.getSubscriptionId(), resourceGroupName, fleetName, accept, properties, context))
+        return FluxUtil.withContext(context -> service.update(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), resourceGroupName, fleetName, contentType, accept, properties, context))
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
@@ -582,10 +583,11 @@ private Mono>> updateWithResponseAsync(String resource
         } else {
             properties.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.update(this.client.getEndpoint(), this.client.getApiVersion(), this.client.getSubscriptionId(),
-            resourceGroupName, fleetName, accept, properties, context);
+            resourceGroupName, fleetName, contentType, accept, properties, context);
     }
 
     /**
@@ -1315,6 +1317,8 @@ public PagedIterable listVirtualMachineScaleSets(St
     }
 
     /**
+     * List Fleet resources by resource group
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -1343,6 +1347,8 @@ private Mono> listByResourceGroupNextSinglePageAsync(S
     }
 
     /**
+     * List Fleet resources by resource group
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -1370,6 +1376,8 @@ private Mono> listByResourceGroupNextSinglePageAsync(S
     }
 
     /**
+     * List Fleet resources by subscription ID
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -1398,6 +1406,8 @@ private Mono> listBySubscriptionNextSinglePageAsync(St
     }
 
     /**
+     * List Fleet resources by subscription ID
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -1425,6 +1435,8 @@ private Mono> listBySubscriptionNextSinglePageAsync(St
     }
 
     /**
+     * List VirtualMachineScaleSet resources by Fleet
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -1453,6 +1465,8 @@ private Mono> listBySubscriptionNextSinglePageAsync(St
     }
 
     /**
+     * List VirtualMachineScaleSet resources by Fleet
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
diff --git a/sdk/computefleet/azure-resourcemanager-computefleet/src/main/java/com/azure/resourcemanager/computefleet/implementation/OperationsClientImpl.java b/sdk/computefleet/azure-resourcemanager-computefleet/src/main/java/com/azure/resourcemanager/computefleet/implementation/OperationsClientImpl.java
index 3d80ee86d336..2b20395eb04f 100644
--- a/sdk/computefleet/azure-resourcemanager-computefleet/src/main/java/com/azure/resourcemanager/computefleet/implementation/OperationsClientImpl.java
+++ b/sdk/computefleet/azure-resourcemanager-computefleet/src/main/java/com/azure/resourcemanager/computefleet/implementation/OperationsClientImpl.java
@@ -67,14 +67,14 @@ public interface OperationsService {
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> list(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, Context context);
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -181,6 +181,8 @@ public PagedIterable list(Context context) {
     }
 
     /**
+     * List the operations for the provider
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -207,6 +209,8 @@ private Mono> listNextSinglePageAsync(String nextL
     }
 
     /**
+     * List the operations for the provider
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
diff --git a/sdk/contentsafety/azure-ai-contentsafety/src/main/java/com/azure/ai/contentsafety/BlocklistAsyncClient.java b/sdk/contentsafety/azure-ai-contentsafety/src/main/java/com/azure/ai/contentsafety/BlocklistAsyncClient.java
index 171acc42fc9c..bffb9ab343d6 100644
--- a/sdk/contentsafety/azure-ai-contentsafety/src/main/java/com/azure/ai/contentsafety/BlocklistAsyncClient.java
+++ b/sdk/contentsafety/azure-ai-contentsafety/src/main/java/com/azure/ai/contentsafety/BlocklistAsyncClient.java
@@ -174,7 +174,9 @@ public Mono> deleteTextBlocklistWithResponse(String name, Request
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return text Blocklist along with {@link Response} on successful completion of {@link Mono}.
+     * @return text Blocklist By blocklistName
+     *
+     * Returns text blocklist details along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -203,7 +205,9 @@ public Mono> getTextBlocklistWithResponse(String name, Requ
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return blocklistItem by blocklistName and blocklistItemId from a text blocklist along with {@link Response} on
+     * @return blocklistItem By blocklistName And blocklistItemId
+     *
+     * Get blocklistItem by blocklistName and blocklistItemId from a text blocklist along with {@link Response} on
      * successful completion of {@link Mono}.
      */
     @Generated
@@ -242,7 +246,9 @@ public Mono> getTextBlocklistItemWithResponse(String name,
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return all blocklistItems in a text blocklist as paginated response with {@link PagedFlux}.
+     * @return all BlocklistItems By blocklistName
+     *
+     * Get all blocklistItems in a text blocklist as paginated response with {@link PagedFlux}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.COLLECTION)
@@ -268,7 +274,9 @@ public PagedFlux listTextBlocklistItems(String name, RequestOptions
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return all text blocklists details as paginated response with {@link PagedFlux}.
+     * @return all Text Blocklists
+     *
+     * Get all text blocklists details as paginated response with {@link PagedFlux}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.COLLECTION)
@@ -367,7 +375,9 @@ public Mono deleteTextBlocklist(String name) {
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return text Blocklist on successful completion of {@link Mono}.
+     * @return text Blocklist By blocklistName
+     *
+     * Returns text blocklist details on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -391,7 +401,9 @@ public Mono getTextBlocklist(String name) {
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return blocklistItem by blocklistName and blocklistItemId from a text blocklist on successful completion of
+     * @return blocklistItem By blocklistName And blocklistItemId
+     *
+     * Get blocklistItem by blocklistName and blocklistItemId from a text blocklist on successful completion of
      * {@link Mono}.
      */
     @Generated
@@ -417,7 +429,9 @@ public Mono getTextBlocklistItem(String name, String blocklis
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all blocklistItems in a text blocklist as paginated response with {@link PagedFlux}.
+     * @return all BlocklistItems By blocklistName
+     *
+     * Get all blocklistItems in a text blocklist as paginated response with {@link PagedFlux}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.COLLECTION)
@@ -457,7 +471,9 @@ public PagedFlux listTextBlocklistItems(String name, Integer
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all blocklistItems in a text blocklist as paginated response with {@link PagedFlux}.
+     * @return all BlocklistItems By blocklistName
+     *
+     * Get all blocklistItems in a text blocklist as paginated response with {@link PagedFlux}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.COLLECTION)
@@ -489,7 +505,9 @@ public PagedFlux listTextBlocklistItems(String name) {
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all text blocklists details as paginated response with {@link PagedFlux}.
+     * @return all Text Blocklists
+     *
+     * Get all text blocklists details as paginated response with {@link PagedFlux}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.COLLECTION)
diff --git a/sdk/contentsafety/azure-ai-contentsafety/src/main/java/com/azure/ai/contentsafety/BlocklistClient.java b/sdk/contentsafety/azure-ai-contentsafety/src/main/java/com/azure/ai/contentsafety/BlocklistClient.java
index 64415b69b0ea..77fdfb75afb1 100644
--- a/sdk/contentsafety/azure-ai-contentsafety/src/main/java/com/azure/ai/contentsafety/BlocklistClient.java
+++ b/sdk/contentsafety/azure-ai-contentsafety/src/main/java/com/azure/ai/contentsafety/BlocklistClient.java
@@ -167,7 +167,9 @@ public Response deleteTextBlocklistWithResponse(String name, RequestOption
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return text Blocklist along with {@link Response}.
+     * @return text Blocklist By blocklistName
+     *
+     * Returns text blocklist details along with {@link Response}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -196,7 +198,9 @@ public Response getTextBlocklistWithResponse(String name, RequestOpt
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return blocklistItem by blocklistName and blocklistItemId from a text blocklist along with {@link Response}.
+     * @return blocklistItem By blocklistName And blocklistItemId
+     *
+     * Get blocklistItem by blocklistName and blocklistItemId from a text blocklist along with {@link Response}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -234,7 +238,9 @@ public Response getTextBlocklistItemWithResponse(String name, String
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return all blocklistItems in a text blocklist as paginated response with {@link PagedIterable}.
+     * @return all BlocklistItems By blocklistName
+     *
+     * Get all blocklistItems in a text blocklist as paginated response with {@link PagedIterable}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.COLLECTION)
@@ -260,7 +266,9 @@ public PagedIterable listTextBlocklistItems(String name, RequestOpti
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return all text blocklists details as paginated response with {@link PagedIterable}.
+     * @return all Text Blocklists
+     *
+     * Get all text blocklists details as paginated response with {@link PagedIterable}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.COLLECTION)
@@ -357,7 +365,9 @@ public void deleteTextBlocklist(String name) {
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return text Blocklist.
+     * @return text Blocklist By blocklistName
+     *
+     * Returns text blocklist details.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -380,7 +390,9 @@ public TextBlocklist getTextBlocklist(String name) {
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return blocklistItem by blocklistName and blocklistItemId from a text blocklist.
+     * @return blocklistItem By blocklistName And blocklistItemId
+     *
+     * Get blocklistItem by blocklistName and blocklistItemId from a text blocklist.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -405,7 +417,9 @@ public TextBlocklistItem getTextBlocklistItem(String name, String blocklistItemI
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all blocklistItems in a text blocklist as paginated response with {@link PagedIterable}.
+     * @return all BlocklistItems By blocklistName
+     *
+     * Get all blocklistItems in a text blocklist as paginated response with {@link PagedIterable}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.COLLECTION)
@@ -434,7 +448,9 @@ public PagedIterable listTextBlocklistItems(String name, Inte
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all blocklistItems in a text blocklist as paginated response with {@link PagedIterable}.
+     * @return all BlocklistItems By blocklistName
+     *
+     * Get all blocklistItems in a text blocklist as paginated response with {@link PagedIterable}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.COLLECTION)
@@ -455,7 +471,9 @@ public PagedIterable listTextBlocklistItems(String name) {
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return all text blocklists details as paginated response with {@link PagedIterable}.
+     * @return all Text Blocklists
+     *
+     * Get all text blocklists details as paginated response with {@link PagedIterable}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.COLLECTION)
diff --git a/sdk/contentsafety/azure-ai-contentsafety/src/main/java/com/azure/ai/contentsafety/implementation/BlocklistClientImpl.java b/sdk/contentsafety/azure-ai-contentsafety/src/main/java/com/azure/ai/contentsafety/implementation/BlocklistClientImpl.java
index 5f14a7e480c3..34909edb4416 100644
--- a/sdk/contentsafety/azure-ai-contentsafety/src/main/java/com/azure/ai/contentsafety/implementation/BlocklistClientImpl.java
+++ b/sdk/contentsafety/azure-ai-contentsafety/src/main/java/com/azure/ai/contentsafety/implementation/BlocklistClientImpl.java
@@ -170,8 +170,8 @@ public interface BlocklistClientService {
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> addOrUpdateBlocklistItems(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("blocklistName") String name,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData options,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData options, RequestOptions requestOptions, Context context);
 
         @Post("/text/blocklists/{blocklistName}:addOrUpdateBlocklistItems")
         @ExpectedResponses({ 200 })
@@ -181,8 +181,8 @@ Mono> addOrUpdateBlocklistItems(@HostParam("endpoint") Stri
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response addOrUpdateBlocklistItemsSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("blocklistName") String name,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData options,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData options, RequestOptions requestOptions, Context context);
 
         @Patch("/text/blocklists/{blocklistName}")
         @ExpectedResponses({ 200, 201 })
@@ -192,7 +192,7 @@ Response addOrUpdateBlocklistItemsSync(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> createOrUpdateTextBlocklist(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("blocklistName") String name,
-            @HeaderParam("Content-Type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/merge-patch+json") BinaryData options, RequestOptions requestOptions,
             Context context);
 
@@ -204,7 +204,7 @@ Mono> createOrUpdateTextBlocklist(@HostParam("endpoint") St
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response createOrUpdateTextBlocklistSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("blocklistName") String name,
-            @HeaderParam("Content-Type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/merge-patch+json") BinaryData options, RequestOptions requestOptions,
             Context context);
 
@@ -216,7 +216,7 @@ Response createOrUpdateTextBlocklistSync(@HostParam("endpoint") Stri
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> deleteTextBlocklist(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("blocklistName") String name,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/text/blocklists/{blocklistName}")
         @ExpectedResponses({ 204 })
@@ -226,7 +226,7 @@ Mono> deleteTextBlocklist(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response deleteTextBlocklistSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("blocklistName") String name,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/text/blocklists/{blocklistName}")
         @ExpectedResponses({ 200 })
@@ -236,7 +236,7 @@ Response deleteTextBlocklistSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getTextBlocklist(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("blocklistName") String name,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/text/blocklists/{blocklistName}")
         @ExpectedResponses({ 200 })
@@ -246,7 +246,7 @@ Mono> getTextBlocklist(@HostParam("endpoint") String endpoi
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getTextBlocklistSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("blocklistName") String name,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/text/blocklists/{blocklistName}/blocklistItems/{blocklistItemId}")
         @ExpectedResponses({ 200 })
@@ -256,7 +256,7 @@ Response getTextBlocklistSync(@HostParam("endpoint") String endpoint
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getTextBlocklistItem(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("blocklistName") String name,
-            @PathParam("blocklistItemId") String blocklistItemId, @HeaderParam("accept") String accept,
+            @PathParam("blocklistItemId") String blocklistItemId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/text/blocklists/{blocklistName}/blocklistItems/{blocklistItemId}")
@@ -267,7 +267,7 @@ Mono> getTextBlocklistItem(@HostParam("endpoint") String en
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getTextBlocklistItemSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("blocklistName") String name,
-            @PathParam("blocklistItemId") String blocklistItemId, @HeaderParam("accept") String accept,
+            @PathParam("blocklistItemId") String blocklistItemId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/text/blocklists/{blocklistName}/blocklistItems")
@@ -278,7 +278,7 @@ Response getTextBlocklistItemSync(@HostParam("endpoint") String endp
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listTextBlocklistItems(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("blocklistName") String name,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/text/blocklists/{blocklistName}/blocklistItems")
         @ExpectedResponses({ 200 })
@@ -288,7 +288,7 @@ Mono> listTextBlocklistItems(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listTextBlocklistItemsSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("blocklistName") String name,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/text/blocklists")
         @ExpectedResponses({ 200 })
@@ -297,7 +297,7 @@ Response listTextBlocklistItemsSync(@HostParam("endpoint") String en
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listTextBlocklists(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/text/blocklists")
@@ -307,7 +307,7 @@ Mono> listTextBlocklists(@HostParam("endpoint") String endp
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listTextBlocklistsSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Post("/text/blocklists/{blocklistName}:removeBlocklistItems")
@@ -318,8 +318,8 @@ Response listTextBlocklistsSync(@HostParam("endpoint") String endpoi
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> removeBlocklistItems(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("blocklistName") String name,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData options,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData options, RequestOptions requestOptions, Context context);
 
         @Post("/text/blocklists/{blocklistName}:removeBlocklistItems")
         @ExpectedResponses({ 204 })
@@ -329,8 +329,8 @@ Mono> removeBlocklistItems(@HostParam("endpoint") String endpoint
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response removeBlocklistItemsSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("blocklistName") String name,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData options,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData options, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -340,7 +340,7 @@ Response removeBlocklistItemsSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listTextBlocklistItemsNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -350,7 +350,7 @@ Mono> listTextBlocklistItemsNext(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listTextBlocklistItemsNextSync(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -360,7 +360,7 @@ Response listTextBlocklistItemsNextSync(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listTextBlocklistsNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -369,7 +369,7 @@ Mono> listTextBlocklistsNext(
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listTextBlocklistsNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
     }
 
@@ -419,9 +419,10 @@ Response listTextBlocklistsNextSync(@PathParam(value = "nextLink", e
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> addOrUpdateBlocklistItemsWithResponseAsync(String name, BinaryData options,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.addOrUpdateBlocklistItems(this.getEndpoint(),
-            this.getServiceVersion().getVersion(), name, accept, options, requestOptions, context));
+            this.getServiceVersion().getVersion(), name, contentType, accept, options, requestOptions, context));
     }
 
     /**
@@ -469,9 +470,10 @@ public Mono> addOrUpdateBlocklistItemsWithResponseAsync(Str
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response addOrUpdateBlocklistItemsWithResponse(String name, BinaryData options,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return service.addOrUpdateBlocklistItemsSync(this.getEndpoint(), this.getServiceVersion().getVersion(), name,
-            accept, options, requestOptions, Context.NONE);
+            contentType, accept, options, requestOptions, Context.NONE);
     }
 
     /**
@@ -613,7 +615,9 @@ public Response deleteTextBlocklistWithResponse(String name, RequestOption
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return text Blocklist along with {@link Response} on successful completion of {@link Mono}.
+     * @return text Blocklist By blocklistName
+     * 
+     * Returns text blocklist details along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getTextBlocklistWithResponseAsync(String name, RequestOptions requestOptions) {
@@ -641,7 +645,9 @@ public Mono> getTextBlocklistWithResponseAsync(String name,
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return text Blocklist along with {@link Response}.
+     * @return text Blocklist By blocklistName
+     * 
+     * Returns text blocklist details along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response getTextBlocklistWithResponse(String name, RequestOptions requestOptions) {
@@ -671,7 +677,9 @@ public Response getTextBlocklistWithResponse(String name, RequestOpt
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return blocklistItem by blocklistName and blocklistItemId from a text blocklist along with {@link Response} on
+     * @return blocklistItem By blocklistName And blocklistItemId
+     * 
+     * Get blocklistItem by blocklistName and blocklistItemId from a text blocklist along with {@link Response} on
      * successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -703,7 +711,9 @@ public Mono> getTextBlocklistItemWithResponseAsync(String n
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return blocklistItem by blocklistName and blocklistItemId from a text blocklist along with {@link Response}.
+     * @return blocklistItem By blocklistName And blocklistItemId
+     * 
+     * Get blocklistItem by blocklistName and blocklistItemId from a text blocklist along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response getTextBlocklistItemWithResponse(String name, String blocklistItemId,
@@ -742,7 +752,9 @@ public Response getTextBlocklistItemWithResponse(String name, String
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return all blocklistItems in a text blocklist along with {@link PagedResponse} on successful completion of
+     * @return all BlocklistItems By blocklistName
+     * 
+     * Get all blocklistItems in a text blocklist along with {@link PagedResponse} on successful completion of
      * {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -785,7 +797,9 @@ private Mono> listTextBlocklistItemsSinglePageAsync(St
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return all blocklistItems in a text blocklist as paginated response with {@link PagedFlux}.
+     * @return all BlocklistItems By blocklistName
+     * 
+     * Get all blocklistItems in a text blocklist as paginated response with {@link PagedFlux}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedFlux listTextBlocklistItemsAsync(String name, RequestOptions requestOptions) {
@@ -845,7 +859,9 @@ public PagedFlux listTextBlocklistItemsAsync(String name, RequestOpt
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return all blocklistItems in a text blocklist along with {@link PagedResponse}.
+     * @return all BlocklistItems By blocklistName
+     * 
+     * Get all blocklistItems in a text blocklist along with {@link PagedResponse}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private PagedResponse listTextBlocklistItemsSinglePage(String name, RequestOptions requestOptions) {
@@ -885,7 +901,9 @@ private PagedResponse listTextBlocklistItemsSinglePage(String name,
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return all blocklistItems in a text blocklist as paginated response with {@link PagedIterable}.
+     * @return all BlocklistItems By blocklistName
+     * 
+     * Get all blocklistItems in a text blocklist as paginated response with {@link PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable listTextBlocklistItems(String name, RequestOptions requestOptions) {
@@ -934,7 +952,9 @@ public PagedIterable listTextBlocklistItems(String name, RequestOpti
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return all text blocklists details along with {@link PagedResponse} on successful completion of {@link Mono}.
+     * @return all Text Blocklists
+     * 
+     * Get all text blocklists details along with {@link PagedResponse} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> listTextBlocklistsSinglePageAsync(RequestOptions requestOptions) {
@@ -964,7 +984,9 @@ private Mono> listTextBlocklistsSinglePageAsync(Reques
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return all text blocklists details as paginated response with {@link PagedFlux}.
+     * @return all Text Blocklists
+     * 
+     * Get all text blocklists details as paginated response with {@link PagedFlux}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedFlux listTextBlocklistsAsync(RequestOptions requestOptions) {
@@ -993,7 +1015,9 @@ public PagedFlux listTextBlocklistsAsync(RequestOptions requestOptio
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return all text blocklists details along with {@link PagedResponse}.
+     * @return all Text Blocklists
+     * 
+     * Get all text blocklists details along with {@link PagedResponse}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private PagedResponse listTextBlocklistsSinglePage(RequestOptions requestOptions) {
@@ -1022,7 +1046,9 @@ private PagedResponse listTextBlocklistsSinglePage(RequestOptions re
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return all text blocklists details as paginated response with {@link PagedIterable}.
+     * @return all Text Blocklists
+     * 
+     * Get all text blocklists details as paginated response with {@link PagedIterable}.
      */
     @ServiceMethod(returns = ReturnType.COLLECTION)
     public PagedIterable listTextBlocklists(RequestOptions requestOptions) {
@@ -1059,9 +1085,10 @@ public PagedIterable listTextBlocklists(RequestOptions requestOption
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> removeBlocklistItemsWithResponseAsync(String name, BinaryData options,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.removeBlocklistItems(this.getEndpoint(),
-            this.getServiceVersion().getVersion(), name, accept, options, requestOptions, context));
+            this.getServiceVersion().getVersion(), name, contentType, accept, options, requestOptions, context));
     }
 
     /**
@@ -1090,9 +1117,10 @@ public Mono> removeBlocklistItemsWithResponseAsync(String name, B
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response removeBlocklistItemsWithResponse(String name, BinaryData options,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.removeBlocklistItemsSync(this.getEndpoint(), this.getServiceVersion().getVersion(), name, accept,
-            options, requestOptions, Context.NONE);
+        return service.removeBlocklistItemsSync(this.getEndpoint(), this.getServiceVersion().getVersion(), name,
+            contentType, accept, options, requestOptions, Context.NONE);
     }
 
     /**
diff --git a/sdk/contentsafety/azure-ai-contentsafety/src/main/java/com/azure/ai/contentsafety/implementation/ContentSafetyClientImpl.java b/sdk/contentsafety/azure-ai-contentsafety/src/main/java/com/azure/ai/contentsafety/implementation/ContentSafetyClientImpl.java
index af66d0d512d2..86b5c9f86445 100644
--- a/sdk/contentsafety/azure-ai-contentsafety/src/main/java/com/azure/ai/contentsafety/implementation/ContentSafetyClientImpl.java
+++ b/sdk/contentsafety/azure-ai-contentsafety/src/main/java/com/azure/ai/contentsafety/implementation/ContentSafetyClientImpl.java
@@ -159,8 +159,9 @@ public interface ContentSafetyClientService {
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> analyzeImage(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData options, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData options,
+            RequestOptions requestOptions, Context context);
 
         @Post("/image:analyze")
         @ExpectedResponses({ 200 })
@@ -169,8 +170,9 @@ Mono> analyzeImage(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response analyzeImageSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData options, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData options,
+            RequestOptions requestOptions, Context context);
 
         @Post("/text:analyze")
         @ExpectedResponses({ 200 })
@@ -179,8 +181,9 @@ Response analyzeImageSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> analyzeText(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData options, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData options,
+            RequestOptions requestOptions, Context context);
 
         @Post("/text:analyze")
         @ExpectedResponses({ 200 })
@@ -189,8 +192,9 @@ Mono> analyzeText(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response analyzeTextSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData options, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData options,
+            RequestOptions requestOptions, Context context);
     }
 
     /**
@@ -236,9 +240,10 @@ Response analyzeTextSync(@HostParam("endpoint") String endpoint,
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> analyzeImageWithResponseAsync(BinaryData options, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.analyzeImage(this.getEndpoint(),
-            this.getServiceVersion().getVersion(), accept, options, requestOptions, context));
+            this.getServiceVersion().getVersion(), contentType, accept, options, requestOptions, context));
     }
 
     /**
@@ -284,9 +289,10 @@ public Mono> analyzeImageWithResponseAsync(BinaryData optio
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response analyzeImageWithResponse(BinaryData options, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.analyzeImageSync(this.getEndpoint(), this.getServiceVersion().getVersion(), accept, options,
-            requestOptions, Context.NONE);
+        return service.analyzeImageSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, accept,
+            options, requestOptions, Context.NONE);
     }
 
     /**
@@ -340,9 +346,10 @@ public Response analyzeImageWithResponse(BinaryData options, Request
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> analyzeTextWithResponseAsync(BinaryData options, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.analyzeText(this.getEndpoint(),
-            this.getServiceVersion().getVersion(), accept, options, requestOptions, context));
+            this.getServiceVersion().getVersion(), contentType, accept, options, requestOptions, context));
     }
 
     /**
@@ -396,8 +403,9 @@ public Mono> analyzeTextWithResponseAsync(BinaryData option
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response analyzeTextWithResponse(BinaryData options, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.analyzeTextSync(this.getEndpoint(), this.getServiceVersion().getVersion(), accept, options,
-            requestOptions, Context.NONE);
+        return service.analyzeTextSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, accept,
+            options, requestOptions, Context.NONE);
     }
 }
diff --git a/sdk/contentsafety/azure-ai-contentsafety/src/main/resources/META-INF/azure-ai-contentsafety_apiview_properties.json b/sdk/contentsafety/azure-ai-contentsafety/src/main/resources/META-INF/azure-ai-contentsafety_apiview_properties.json
index 7fb8bfb766d4..1c762b068246 100644
--- a/sdk/contentsafety/azure-ai-contentsafety/src/main/resources/META-INF/azure-ai-contentsafety_apiview_properties.json
+++ b/sdk/contentsafety/azure-ai-contentsafety/src/main/resources/META-INF/azure-ai-contentsafety_apiview_properties.json
@@ -1,7 +1,7 @@
 {
   "flavor": "azure", 
   "CrossLanguageDefinitionId": {
-    "com.azure.ai.contentsafety.BlocklistAsyncClient": "ContentSafety.BlocklistClient",
+    "com.azure.ai.contentsafety.BlocklistAsyncClient": "Customizations.BlocklistClient",
     "com.azure.ai.contentsafety.BlocklistAsyncClient.addOrUpdateBlocklistItems": "Customizations.BlocklistClient.addOrUpdateBlocklistItems",
     "com.azure.ai.contentsafety.BlocklistAsyncClient.addOrUpdateBlocklistItemsWithResponse": "Customizations.BlocklistClient.addOrUpdateBlocklistItems",
     "com.azure.ai.contentsafety.BlocklistAsyncClient.createOrUpdateTextBlocklist": "Customizations.BlocklistClient.createOrUpdateTextBlocklist",
@@ -16,7 +16,7 @@
     "com.azure.ai.contentsafety.BlocklistAsyncClient.listTextBlocklists": "Customizations.BlocklistClient.listTextBlocklists",
     "com.azure.ai.contentsafety.BlocklistAsyncClient.removeBlocklistItems": "Customizations.BlocklistClient.removeBlocklistItems",
     "com.azure.ai.contentsafety.BlocklistAsyncClient.removeBlocklistItemsWithResponse": "Customizations.BlocklistClient.removeBlocklistItems",
-    "com.azure.ai.contentsafety.BlocklistClient": "ContentSafety.BlocklistClient",
+    "com.azure.ai.contentsafety.BlocklistClient": "Customizations.BlocklistClient",
     "com.azure.ai.contentsafety.BlocklistClient.addOrUpdateBlocklistItems": "Customizations.BlocklistClient.addOrUpdateBlocklistItems",
     "com.azure.ai.contentsafety.BlocklistClient.addOrUpdateBlocklistItemsWithResponse": "Customizations.BlocklistClient.addOrUpdateBlocklistItems",
     "com.azure.ai.contentsafety.BlocklistClient.createOrUpdateTextBlocklist": "Customizations.BlocklistClient.createOrUpdateTextBlocklist",
@@ -31,18 +31,18 @@
     "com.azure.ai.contentsafety.BlocklistClient.listTextBlocklists": "Customizations.BlocklistClient.listTextBlocklists",
     "com.azure.ai.contentsafety.BlocklistClient.removeBlocklistItems": "Customizations.BlocklistClient.removeBlocklistItems",
     "com.azure.ai.contentsafety.BlocklistClient.removeBlocklistItemsWithResponse": "Customizations.BlocklistClient.removeBlocklistItems",
-    "com.azure.ai.contentsafety.BlocklistClientBuilder": "ContentSafety.BlocklistClient",
-    "com.azure.ai.contentsafety.ContentSafetyAsyncClient": "ContentSafety.ContentSafetyClient",
+    "com.azure.ai.contentsafety.BlocklistClientBuilder": "Customizations.BlocklistClient",
+    "com.azure.ai.contentsafety.ContentSafetyAsyncClient": "Customizations.ContentSafetyClient",
     "com.azure.ai.contentsafety.ContentSafetyAsyncClient.analyzeImage": "Customizations.ContentSafetyClient.analyzeImage",
     "com.azure.ai.contentsafety.ContentSafetyAsyncClient.analyzeImageWithResponse": "Customizations.ContentSafetyClient.analyzeImage",
     "com.azure.ai.contentsafety.ContentSafetyAsyncClient.analyzeText": "Customizations.ContentSafetyClient.analyzeText",
     "com.azure.ai.contentsafety.ContentSafetyAsyncClient.analyzeTextWithResponse": "Customizations.ContentSafetyClient.analyzeText",
-    "com.azure.ai.contentsafety.ContentSafetyClient": "ContentSafety.ContentSafetyClient",
+    "com.azure.ai.contentsafety.ContentSafetyClient": "Customizations.ContentSafetyClient",
     "com.azure.ai.contentsafety.ContentSafetyClient.analyzeImage": "Customizations.ContentSafetyClient.analyzeImage",
     "com.azure.ai.contentsafety.ContentSafetyClient.analyzeImageWithResponse": "Customizations.ContentSafetyClient.analyzeImage",
     "com.azure.ai.contentsafety.ContentSafetyClient.analyzeText": "Customizations.ContentSafetyClient.analyzeText",
     "com.azure.ai.contentsafety.ContentSafetyClient.analyzeTextWithResponse": "Customizations.ContentSafetyClient.analyzeText",
-    "com.azure.ai.contentsafety.ContentSafetyClientBuilder": "ContentSafety.ContentSafetyClient",
+    "com.azure.ai.contentsafety.ContentSafetyClientBuilder": "Customizations.ContentSafetyClient",
     "com.azure.ai.contentsafety.models.AddOrUpdateTextBlocklistItemsOptions": "ContentSafety.AddOrUpdateTextBlocklistItemsOptions",
     "com.azure.ai.contentsafety.models.AddOrUpdateTextBlocklistItemsResult": "ContentSafety.AddOrUpdateTextBlocklistItemsResult",
     "com.azure.ai.contentsafety.models.AnalyzeImageOptions": "ContentSafety.AnalyzeImageOptions",
diff --git a/sdk/devcenter/azure-developer-devcenter/src/main/java/com/azure/developer/devcenter/implementation/DeploymentEnvironmentsClientImpl.java b/sdk/devcenter/azure-developer-devcenter/src/main/java/com/azure/developer/devcenter/implementation/DeploymentEnvironmentsClientImpl.java
index 8cc507ab0850..6cd1af37651f 100644
--- a/sdk/devcenter/azure-developer-devcenter/src/main/java/com/azure/developer/devcenter/implementation/DeploymentEnvironmentsClientImpl.java
+++ b/sdk/devcenter/azure-developer-devcenter/src/main/java/com/azure/developer/devcenter/implementation/DeploymentEnvironmentsClientImpl.java
@@ -174,7 +174,7 @@ public interface DeploymentEnvironmentsClientService {
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listAllEnvironments(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/projects/{projectName}/environments")
         @ExpectedResponses({ 200 })
@@ -184,7 +184,7 @@ Mono> listAllEnvironments(@HostParam("endpoint") String end
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listAllEnvironmentsSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/projects/{projectName}/users/{userId}/environments")
         @ExpectedResponses({ 200 })
@@ -194,7 +194,7 @@ Response listAllEnvironmentsSync(@HostParam("endpoint") String endpo
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listEnvironments(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
-            @PathParam("userId") String userId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("userId") String userId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/projects/{projectName}/users/{userId}/environments")
@@ -205,7 +205,7 @@ Mono> listEnvironments(@HostParam("endpoint") String endpoi
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listEnvironmentsSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
-            @PathParam("userId") String userId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("userId") String userId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/projects/{projectName}/users/{userId}/environments/{environmentName}")
@@ -217,7 +217,7 @@ Response listEnvironmentsSync(@HostParam("endpoint") String endpoint
         Mono> getEnvironment(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
             @PathParam("userId") String userId, @PathParam("environmentName") String environmentName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/projects/{projectName}/users/{userId}/environments/{environmentName}")
         @ExpectedResponses({ 200 })
@@ -228,7 +228,7 @@ Mono> getEnvironment(@HostParam("endpoint") String endpoint
         Response getEnvironmentSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
             @PathParam("userId") String userId, @PathParam("environmentName") String environmentName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Put("/projects/{projectName}/users/{userId}/environments/{environmentName}")
         @ExpectedResponses({ 201 })
@@ -239,8 +239,8 @@ Response getEnvironmentSync(@HostParam("endpoint") String endpoint,
         Mono> createOrUpdateEnvironment(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
             @PathParam("userId") String userId, @PathParam("environmentName") String environmentName,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Put("/projects/{projectName}/users/{userId}/environments/{environmentName}")
         @ExpectedResponses({ 201 })
@@ -251,8 +251,8 @@ Mono> createOrUpdateEnvironment(@HostParam("endpoint") Stri
         Response createOrUpdateEnvironmentSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
             @PathParam("userId") String userId, @PathParam("environmentName") String environmentName,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Delete("/projects/{projectName}/users/{userId}/environments/{environmentName}")
         @ExpectedResponses({ 202, 204 })
@@ -263,7 +263,7 @@ Response createOrUpdateEnvironmentSync(@HostParam("endpoint") String
         Mono> deleteEnvironment(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
             @PathParam("userId") String userId, @PathParam("environmentName") String environmentName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/projects/{projectName}/users/{userId}/environments/{environmentName}")
         @ExpectedResponses({ 202, 204 })
@@ -274,7 +274,7 @@ Mono> deleteEnvironment(@HostParam("endpoint") String endpo
         Response deleteEnvironmentSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
             @PathParam("userId") String userId, @PathParam("environmentName") String environmentName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/projects/{projectName}/catalogs")
         @ExpectedResponses({ 200 })
@@ -284,7 +284,7 @@ Response deleteEnvironmentSync(@HostParam("endpoint") String endpoin
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listCatalogs(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/projects/{projectName}/catalogs")
         @ExpectedResponses({ 200 })
@@ -294,7 +294,7 @@ Mono> listCatalogs(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listCatalogsSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/projects/{projectName}/catalogs/{catalogName}")
         @ExpectedResponses({ 200 })
@@ -304,7 +304,7 @@ Response listCatalogsSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getCatalog(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
-            @PathParam("catalogName") String catalogName, @HeaderParam("accept") String accept,
+            @PathParam("catalogName") String catalogName, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/projects/{projectName}/catalogs/{catalogName}")
@@ -315,7 +315,7 @@ Mono> getCatalog(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getCatalogSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
-            @PathParam("catalogName") String catalogName, @HeaderParam("accept") String accept,
+            @PathParam("catalogName") String catalogName, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/projects/{projectName}/environmentDefinitions")
@@ -326,7 +326,7 @@ Response getCatalogSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listEnvironmentDefinitions(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/projects/{projectName}/environmentDefinitions")
         @ExpectedResponses({ 200 })
@@ -336,7 +336,7 @@ Mono> listEnvironmentDefinitions(@HostParam("endpoint") Str
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listEnvironmentDefinitionsSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/projects/{projectName}/catalogs/{catalogName}/environmentDefinitions")
         @ExpectedResponses({ 200 })
@@ -346,7 +346,7 @@ Response listEnvironmentDefinitionsSync(@HostParam("endpoint") Strin
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listEnvironmentDefinitionsByCatalog(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
-            @PathParam("catalogName") String catalogName, @HeaderParam("accept") String accept,
+            @PathParam("catalogName") String catalogName, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/projects/{projectName}/catalogs/{catalogName}/environmentDefinitions")
@@ -357,7 +357,7 @@ Mono> listEnvironmentDefinitionsByCatalog(@HostParam("endpo
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listEnvironmentDefinitionsByCatalogSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
-            @PathParam("catalogName") String catalogName, @HeaderParam("accept") String accept,
+            @PathParam("catalogName") String catalogName, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/projects/{projectName}/catalogs/{catalogName}/environmentDefinitions/{definitionName}")
@@ -369,7 +369,7 @@ Response listEnvironmentDefinitionsByCatalogSync(@HostParam("endpoin
         Mono> getEnvironmentDefinition(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
             @PathParam("catalogName") String catalogName, @PathParam("definitionName") String definitionName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/projects/{projectName}/catalogs/{catalogName}/environmentDefinitions/{definitionName}")
         @ExpectedResponses({ 200 })
@@ -380,7 +380,7 @@ Mono> getEnvironmentDefinition(@HostParam("endpoint") Strin
         Response getEnvironmentDefinitionSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
             @PathParam("catalogName") String catalogName, @PathParam("definitionName") String definitionName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/projects/{projectName}/environmentTypes")
         @ExpectedResponses({ 200 })
@@ -390,7 +390,7 @@ Response getEnvironmentDefinitionSync(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listEnvironmentTypes(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/projects/{projectName}/environmentTypes")
         @ExpectedResponses({ 200 })
@@ -400,7 +400,7 @@ Mono> listEnvironmentTypes(@HostParam("endpoint") String en
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listEnvironmentTypesSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -410,7 +410,7 @@ Response listEnvironmentTypesSync(@HostParam("endpoint") String endp
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listAllEnvironmentsNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -419,7 +419,7 @@ Mono> listAllEnvironmentsNext(
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listAllEnvironmentsNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -429,7 +429,7 @@ Response listAllEnvironmentsNextSync(@PathParam(value = "nextLink",
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listEnvironmentsNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -439,7 +439,7 @@ Mono> listEnvironmentsNext(@PathParam(value = "nextLink", e
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listEnvironmentsNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -449,7 +449,7 @@ Response listEnvironmentsNextSync(@PathParam(value = "nextLink", enc
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listCatalogsNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -459,7 +459,7 @@ Mono> listCatalogsNext(@PathParam(value = "nextLink", encod
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listCatalogsNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -470,7 +470,7 @@ Response listCatalogsNextSync(@PathParam(value = "nextLink", encoded
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listEnvironmentDefinitionsNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -480,7 +480,7 @@ Mono> listEnvironmentDefinitionsNext(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listEnvironmentDefinitionsNextSync(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -490,7 +490,7 @@ Response listEnvironmentDefinitionsNextSync(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listEnvironmentDefinitionsByCatalogNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -500,7 +500,7 @@ Mono> listEnvironmentDefinitionsByCatalogNext(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listEnvironmentDefinitionsByCatalogNextSync(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -510,7 +510,7 @@ Response listEnvironmentDefinitionsByCatalogNextSync(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listEnvironmentTypesNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -520,7 +520,7 @@ Mono> listEnvironmentTypesNext(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listEnvironmentTypesNextSync(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
     }
 
     /**
@@ -1100,10 +1100,11 @@ public Response getEnvironmentWithResponse(String projectName, Strin
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> createOrUpdateEnvironmentWithResponseAsync(String projectName, String userId,
         String environmentName, BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(
             context -> service.createOrUpdateEnvironment(this.getEndpoint(), this.getServiceVersion().getVersion(),
-                projectName, userId, environmentName, accept, body, requestOptions, context));
+                projectName, userId, environmentName, contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -1181,9 +1182,10 @@ private Mono> createOrUpdateEnvironmentWithResponseAsync(St
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Response createOrUpdateEnvironmentWithResponse(String projectName, String userId,
         String environmentName, BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return service.createOrUpdateEnvironmentSync(this.getEndpoint(), this.getServiceVersion().getVersion(),
-            projectName, userId, environmentName, accept, body, requestOptions, Context.NONE);
+            projectName, userId, environmentName, contentType, accept, body, requestOptions, Context.NONE);
     }
 
     /**
@@ -2617,6 +2619,8 @@ public PagedIterable listEnvironmentTypes(String projectName, Reques
     }
 
     /**
+     * Lists the environments for a project.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -2667,6 +2671,8 @@ private Mono> listAllEnvironmentsNextSinglePageAsync(S
     }
 
     /**
+     * Lists the environments for a project.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -2716,6 +2722,8 @@ private PagedResponse listAllEnvironmentsNextSinglePage(String nextL
     }
 
     /**
+     * Lists the environments for a project and user.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -2767,6 +2775,8 @@ private Mono> listEnvironmentsNextSinglePageAsync(Stri
     }
 
     /**
+     * Lists the environments for a project and user.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -2815,6 +2825,8 @@ private PagedResponse listEnvironmentsNextSinglePage(String nextLink
     }
 
     /**
+     * Lists all of the catalogs available for a project.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -2845,6 +2857,8 @@ private Mono> listCatalogsNextSinglePageAsync(String n
     }
 
     /**
+     * Lists all of the catalogs available for a project.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -2872,6 +2886,8 @@ private PagedResponse listCatalogsNextSinglePage(String nextLink, Re
     }
 
     /**
+     * Lists all environment definitions available for a project.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -2921,6 +2937,8 @@ private Mono> listEnvironmentDefinitionsNextSinglePage
     }
 
     /**
+     * Lists all environment definitions available for a project.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -2968,6 +2986,8 @@ private PagedResponse listEnvironmentDefinitionsNextSinglePage(Strin
     }
 
     /**
+     * Lists all environment definitions available within a catalog.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -3017,6 +3037,8 @@ private Mono> listEnvironmentDefinitionsByCatalogNextS
     }
 
     /**
+     * Lists all environment definitions available within a catalog.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -3064,6 +3086,8 @@ private PagedResponse listEnvironmentDefinitionsByCatalogNextSingleP
     }
 
     /**
+     * Lists all environment types configured for a project.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -3095,6 +3119,8 @@ private Mono> listEnvironmentTypesNextSinglePageAsync(
     }
 
     /**
+     * Lists all environment types configured for a project.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
diff --git a/sdk/devcenter/azure-developer-devcenter/src/main/java/com/azure/developer/devcenter/implementation/DevBoxesClientImpl.java b/sdk/devcenter/azure-developer-devcenter/src/main/java/com/azure/developer/devcenter/implementation/DevBoxesClientImpl.java
index f1e8865ff014..e3e9a7455a03 100644
--- a/sdk/devcenter/azure-developer-devcenter/src/main/java/com/azure/developer/devcenter/implementation/DevBoxesClientImpl.java
+++ b/sdk/devcenter/azure-developer-devcenter/src/main/java/com/azure/developer/devcenter/implementation/DevBoxesClientImpl.java
@@ -173,7 +173,7 @@ public interface DevBoxesClientService {
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listPools(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/projects/{projectName}/pools")
         @ExpectedResponses({ 200 })
@@ -183,7 +183,7 @@ Mono> listPools(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listPoolsSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/projects/{projectName}/pools/{poolName}")
         @ExpectedResponses({ 200 })
@@ -193,7 +193,7 @@ Response listPoolsSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getPool(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
-            @PathParam("poolName") String poolName, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("poolName") String poolName, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/projects/{projectName}/pools/{poolName}")
@@ -204,7 +204,7 @@ Mono> getPool(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getPoolSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
-            @PathParam("poolName") String poolName, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("poolName") String poolName, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/projects/{projectName}/pools/{poolName}/schedules")
@@ -215,7 +215,7 @@ Response getPoolSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listSchedules(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
-            @PathParam("poolName") String poolName, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("poolName") String poolName, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/projects/{projectName}/pools/{poolName}/schedules")
@@ -226,7 +226,7 @@ Mono> listSchedules(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listSchedulesSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
-            @PathParam("poolName") String poolName, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("poolName") String poolName, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/projects/{projectName}/pools/{poolName}/schedules/{scheduleName}")
@@ -238,7 +238,7 @@ Response listSchedulesSync(@HostParam("endpoint") String endpoint,
         Mono> getSchedule(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
             @PathParam("poolName") String poolName, @PathParam("scheduleName") String scheduleName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/projects/{projectName}/pools/{poolName}/schedules/{scheduleName}")
         @ExpectedResponses({ 200 })
@@ -249,7 +249,7 @@ Mono> getSchedule(@HostParam("endpoint") String endpoint,
         Response getScheduleSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
             @PathParam("poolName") String poolName, @PathParam("scheduleName") String scheduleName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/devboxes")
         @ExpectedResponses({ 200 })
@@ -258,7 +258,7 @@ Response getScheduleSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listAllDevBoxes(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/devboxes")
@@ -268,7 +268,7 @@ Mono> listAllDevBoxes(@HostParam("endpoint") String endpoin
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listAllDevBoxesSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/users/{userId}/devboxes")
@@ -279,7 +279,7 @@ Response listAllDevBoxesSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listAllDevBoxesByUser(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("userId") String userId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/users/{userId}/devboxes")
         @ExpectedResponses({ 200 })
@@ -289,7 +289,7 @@ Mono> listAllDevBoxesByUser(@HostParam("endpoint") String e
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listAllDevBoxesByUserSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("userId") String userId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/projects/{projectName}/users/{userId}/devboxes")
         @ExpectedResponses({ 200 })
@@ -299,7 +299,7 @@ Response listAllDevBoxesByUserSync(@HostParam("endpoint") String end
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listDevBoxes(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
-            @PathParam("userId") String userId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("userId") String userId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/projects/{projectName}/users/{userId}/devboxes")
@@ -310,7 +310,7 @@ Mono> listDevBoxes(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listDevBoxesSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
-            @PathParam("userId") String userId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("userId") String userId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/projects/{projectName}/users/{userId}/devboxes/{devBoxName}")
@@ -322,7 +322,7 @@ Response listDevBoxesSync(@HostParam("endpoint") String endpoint,
         Mono> getDevBox(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
             @PathParam("userId") String userId, @PathParam("devBoxName") String devBoxName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/projects/{projectName}/users/{userId}/devboxes/{devBoxName}")
         @ExpectedResponses({ 200 })
@@ -333,7 +333,7 @@ Mono> getDevBox(@HostParam("endpoint") String endpoint,
         Response getDevBoxSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
             @PathParam("userId") String userId, @PathParam("devBoxName") String devBoxName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Put("/projects/{projectName}/users/{userId}/devboxes/{devBoxName}")
         @ExpectedResponses({ 200, 201 })
@@ -344,8 +344,8 @@ Response getDevBoxSync(@HostParam("endpoint") String endpoint,
         Mono> createDevBox(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
             @PathParam("userId") String userId, @PathParam("devBoxName") String devBoxName,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Put("/projects/{projectName}/users/{userId}/devboxes/{devBoxName}")
         @ExpectedResponses({ 200, 201 })
@@ -356,8 +356,8 @@ Mono> createDevBox(@HostParam("endpoint") String endpoint,
         Response createDevBoxSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
             @PathParam("userId") String userId, @PathParam("devBoxName") String devBoxName,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Delete("/projects/{projectName}/users/{userId}/devboxes/{devBoxName}")
         @ExpectedResponses({ 202, 204 })
@@ -368,7 +368,7 @@ Response createDevBoxSync(@HostParam("endpoint") String endpoint,
         Mono> deleteDevBox(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
             @PathParam("userId") String userId, @PathParam("devBoxName") String devBoxName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/projects/{projectName}/users/{userId}/devboxes/{devBoxName}")
         @ExpectedResponses({ 202, 204 })
@@ -379,7 +379,7 @@ Mono> deleteDevBox(@HostParam("endpoint") String endpoint,
         Response deleteDevBoxSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
             @PathParam("userId") String userId, @PathParam("devBoxName") String devBoxName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/projects/{projectName}/users/{userId}/devboxes/{devBoxName}:start")
         @ExpectedResponses({ 202 })
@@ -390,7 +390,7 @@ Response deleteDevBoxSync(@HostParam("endpoint") String endpoint,
         Mono> startDevBox(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
             @PathParam("userId") String userId, @PathParam("devBoxName") String devBoxName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/projects/{projectName}/users/{userId}/devboxes/{devBoxName}:start")
         @ExpectedResponses({ 202 })
@@ -401,7 +401,7 @@ Mono> startDevBox(@HostParam("endpoint") String endpoint,
         Response startDevBoxSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
             @PathParam("userId") String userId, @PathParam("devBoxName") String devBoxName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/projects/{projectName}/users/{userId}/devboxes/{devBoxName}:stop")
         @ExpectedResponses({ 202 })
@@ -412,7 +412,7 @@ Response startDevBoxSync(@HostParam("endpoint") String endpoint,
         Mono> stopDevBox(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
             @PathParam("userId") String userId, @PathParam("devBoxName") String devBoxName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/projects/{projectName}/users/{userId}/devboxes/{devBoxName}:stop")
         @ExpectedResponses({ 202 })
@@ -423,7 +423,7 @@ Mono> stopDevBox(@HostParam("endpoint") String endpoint,
         Response stopDevBoxSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
             @PathParam("userId") String userId, @PathParam("devBoxName") String devBoxName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/projects/{projectName}/users/{userId}/devboxes/{devBoxName}:restart")
         @ExpectedResponses({ 202 })
@@ -434,7 +434,7 @@ Response stopDevBoxSync(@HostParam("endpoint") String endpoint,
         Mono> restartDevBox(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
             @PathParam("userId") String userId, @PathParam("devBoxName") String devBoxName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/projects/{projectName}/users/{userId}/devboxes/{devBoxName}:restart")
         @ExpectedResponses({ 202 })
@@ -445,7 +445,7 @@ Mono> restartDevBox(@HostParam("endpoint") String endpoint,
         Response restartDevBoxSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
             @PathParam("userId") String userId, @PathParam("devBoxName") String devBoxName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/projects/{projectName}/users/{userId}/devboxes/{devBoxName}/remoteConnection")
         @ExpectedResponses({ 200 })
@@ -456,7 +456,7 @@ Response restartDevBoxSync(@HostParam("endpoint") String endpoint,
         Mono> getRemoteConnection(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
             @PathParam("userId") String userId, @PathParam("devBoxName") String devBoxName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/projects/{projectName}/users/{userId}/devboxes/{devBoxName}/remoteConnection")
         @ExpectedResponses({ 200 })
@@ -467,7 +467,7 @@ Mono> getRemoteConnection(@HostParam("endpoint") String end
         Response getRemoteConnectionSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
             @PathParam("userId") String userId, @PathParam("devBoxName") String devBoxName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/projects/{projectName}/users/{userId}/devboxes/{devBoxName}/actions")
         @ExpectedResponses({ 200 })
@@ -478,7 +478,7 @@ Response getRemoteConnectionSync(@HostParam("endpoint") String endpo
         Mono> listDevBoxActions(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
             @PathParam("userId") String userId, @PathParam("devBoxName") String devBoxName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/projects/{projectName}/users/{userId}/devboxes/{devBoxName}/actions")
         @ExpectedResponses({ 200 })
@@ -489,7 +489,7 @@ Mono> listDevBoxActions(@HostParam("endpoint") String endpo
         Response listDevBoxActionsSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
             @PathParam("userId") String userId, @PathParam("devBoxName") String devBoxName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/projects/{projectName}/users/{userId}/devboxes/{devBoxName}/actions/{actionName}")
         @ExpectedResponses({ 200 })
@@ -500,7 +500,7 @@ Response listDevBoxActionsSync(@HostParam("endpoint") String endpoin
         Mono> getDevBoxAction(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
             @PathParam("userId") String userId, @PathParam("devBoxName") String devBoxName,
-            @PathParam("actionName") String actionName, @HeaderParam("accept") String accept,
+            @PathParam("actionName") String actionName, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/projects/{projectName}/users/{userId}/devboxes/{devBoxName}/actions/{actionName}")
@@ -512,7 +512,7 @@ Mono> getDevBoxAction(@HostParam("endpoint") String endpoin
         Response getDevBoxActionSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
             @PathParam("userId") String userId, @PathParam("devBoxName") String devBoxName,
-            @PathParam("actionName") String actionName, @HeaderParam("accept") String accept,
+            @PathParam("actionName") String actionName, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Post("/projects/{projectName}/users/{userId}/devboxes/{devBoxName}/actions/{actionName}:skip")
@@ -524,7 +524,7 @@ Response getDevBoxActionSync(@HostParam("endpoint") String endpoint,
         Mono> skipAction(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
             @PathParam("userId") String userId, @PathParam("devBoxName") String devBoxName,
-            @PathParam("actionName") String actionName, @HeaderParam("accept") String accept,
+            @PathParam("actionName") String actionName, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Post("/projects/{projectName}/users/{userId}/devboxes/{devBoxName}/actions/{actionName}:skip")
@@ -536,7 +536,7 @@ Mono> skipAction(@HostParam("endpoint") String endpoint,
         Response skipActionSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
             @PathParam("userId") String userId, @PathParam("devBoxName") String devBoxName,
-            @PathParam("actionName") String actionName, @HeaderParam("accept") String accept,
+            @PathParam("actionName") String actionName, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Post("/projects/{projectName}/users/{userId}/devboxes/{devBoxName}/actions/{actionName}:delay")
@@ -549,7 +549,7 @@ Mono> delayAction(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
             @PathParam("userId") String userId, @PathParam("devBoxName") String devBoxName,
             @PathParam("actionName") String actionName, @QueryParam("until") OffsetDateTime delayUntil,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/projects/{projectName}/users/{userId}/devboxes/{devBoxName}/actions/{actionName}:delay")
         @ExpectedResponses({ 200 })
@@ -561,7 +561,7 @@ Response delayActionSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
             @PathParam("userId") String userId, @PathParam("devBoxName") String devBoxName,
             @PathParam("actionName") String actionName, @QueryParam("until") OffsetDateTime delayUntil,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/projects/{projectName}/users/{userId}/devboxes/{devBoxName}/actions:delay")
         @ExpectedResponses({ 200 })
@@ -572,7 +572,7 @@ Response delayActionSync(@HostParam("endpoint") String endpoint,
         Mono> delayAllActions(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
             @PathParam("userId") String userId, @PathParam("devBoxName") String devBoxName,
-            @QueryParam("until") OffsetDateTime delayUntil, @HeaderParam("accept") String accept,
+            @QueryParam("until") OffsetDateTime delayUntil, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Post("/projects/{projectName}/users/{userId}/devboxes/{devBoxName}/actions:delay")
@@ -584,7 +584,7 @@ Mono> delayAllActions(@HostParam("endpoint") String endpoin
         Response delayAllActionsSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
             @PathParam("userId") String userId, @PathParam("devBoxName") String devBoxName,
-            @QueryParam("until") OffsetDateTime delayUntil, @HeaderParam("accept") String accept,
+            @QueryParam("until") OffsetDateTime delayUntil, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
@@ -594,7 +594,7 @@ Response delayAllActionsSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listPoolsNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -604,7 +604,7 @@ Mono> listPoolsNext(@PathParam(value = "nextLink", encoded
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listPoolsNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -614,7 +614,7 @@ Response listPoolsNextSync(@PathParam(value = "nextLink", encoded =
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listSchedulesNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -624,7 +624,7 @@ Mono> listSchedulesNext(@PathParam(value = "nextLink", enco
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listSchedulesNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -634,7 +634,7 @@ Response listSchedulesNextSync(@PathParam(value = "nextLink", encode
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listAllDevBoxesNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -644,7 +644,7 @@ Mono> listAllDevBoxesNext(@PathParam(value = "nextLink", en
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listAllDevBoxesNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -655,7 +655,7 @@ Response listAllDevBoxesNextSync(@PathParam(value = "nextLink", enco
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listAllDevBoxesByUserNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -665,7 +665,7 @@ Mono> listAllDevBoxesByUserNext(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listAllDevBoxesByUserNextSync(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -674,7 +674,7 @@ Response listAllDevBoxesByUserNextSync(
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listDevBoxesNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -684,7 +684,7 @@ Mono> listDevBoxesNext(@PathParam(value = "nextLink", encod
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listDevBoxesNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -694,7 +694,7 @@ Response listDevBoxesNextSync(@PathParam(value = "nextLink", encoded
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listDevBoxActionsNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -704,7 +704,7 @@ Mono> listDevBoxActionsNext(@PathParam(value = "nextLink",
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listDevBoxActionsNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -714,7 +714,7 @@ Response listDevBoxActionsNextSync(@PathParam(value = "nextLink", en
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> delayAllActionsNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -724,7 +724,7 @@ Mono> delayAllActionsNext(@PathParam(value = "nextLink", en
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response delayAllActionsNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
     }
 
@@ -2335,10 +2335,11 @@ public Response getDevBoxWithResponse(String projectName, String use
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> createDevBoxWithResponseAsync(String projectName, String userId,
         String devBoxName, BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createDevBox(this.getEndpoint(), this.getServiceVersion().getVersion(),
-                projectName, userId, devBoxName, accept, body, requestOptions, context));
+                projectName, userId, devBoxName, contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -2457,9 +2458,10 @@ private Mono> createDevBoxWithResponseAsync(String projectN
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Response createDevBoxWithResponse(String projectName, String userId, String devBoxName,
         BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return service.createDevBoxSync(this.getEndpoint(), this.getServiceVersion().getVersion(), projectName, userId,
-            devBoxName, accept, body, requestOptions, Context.NONE);
+            devBoxName, contentType, accept, body, requestOptions, Context.NONE);
     }
 
     /**
@@ -4893,6 +4895,8 @@ public PagedIterable delayAllActions(String projectName, String user
     }
 
     /**
+     * Lists available pools.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -4948,6 +4952,8 @@ private Mono> listPoolsNextSinglePageAsync(String next
     }
 
     /**
+     * Lists available pools.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -5001,6 +5007,8 @@ private PagedResponse listPoolsNextSinglePage(String nextLink, Reque
     }
 
     /**
+     * Lists all schedules within a pool that are configured by your project administrator.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -5035,6 +5043,8 @@ private Mono> listSchedulesNextSinglePageAsync(String
     }
 
     /**
+     * Lists all schedules within a pool that are configured by your project administrator.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -5066,6 +5076,8 @@ private PagedResponse listSchedulesNextSinglePage(String nextLink, R
     }
 
     /**
+     * Lists Dev Boxes that the caller has access to in the DevCenter.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -5137,6 +5149,8 @@ private Mono> listAllDevBoxesNextSinglePageAsync(Strin
     }
 
     /**
+     * Lists Dev Boxes that the caller has access to in the DevCenter.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -5205,6 +5219,8 @@ private PagedResponse listAllDevBoxesNextSinglePage(String nextLink,
     }
 
     /**
+     * Lists Dev Boxes in the Dev Center for a particular user.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -5275,6 +5291,8 @@ private Mono> listAllDevBoxesByUserNextSinglePageAsync
     }
 
     /**
+     * Lists Dev Boxes in the Dev Center for a particular user.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -5344,6 +5362,8 @@ private PagedResponse listAllDevBoxesByUserNextSinglePage(String nex
     }
 
     /**
+     * Lists Dev Boxes in the project for a particular user.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -5415,6 +5435,8 @@ private Mono> listDevBoxesNextSinglePageAsync(String n
     }
 
     /**
+     * Lists Dev Boxes in the project for a particular user.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -5483,6 +5505,8 @@ private PagedResponse listDevBoxesNextSinglePage(String nextLink, Re
     }
 
     /**
+     * Lists actions on a Dev Box.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -5519,6 +5543,8 @@ private Mono> listDevBoxActionsNextSinglePageAsync(Str
     }
 
     /**
+     * Lists actions on a Dev Box.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -5552,6 +5578,8 @@ private PagedResponse listDevBoxActionsNextSinglePage(String nextLin
     }
 
     /**
+     * Delays all actions.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -5604,6 +5632,8 @@ private Mono> delayAllActionsNextSinglePageAsync(Strin
     }
 
     /**
+     * Delays all actions.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
diff --git a/sdk/devcenter/azure-developer-devcenter/src/main/java/com/azure/developer/devcenter/implementation/DevCenterClientImpl.java b/sdk/devcenter/azure-developer-devcenter/src/main/java/com/azure/developer/devcenter/implementation/DevCenterClientImpl.java
index 0b4ec1fb57b8..186d207bceb4 100644
--- a/sdk/devcenter/azure-developer-devcenter/src/main/java/com/azure/developer/devcenter/implementation/DevCenterClientImpl.java
+++ b/sdk/devcenter/azure-developer-devcenter/src/main/java/com/azure/developer/devcenter/implementation/DevCenterClientImpl.java
@@ -159,7 +159,7 @@ public interface DevCenterClientService {
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listProjects(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/projects")
@@ -169,7 +169,7 @@ Mono> listProjects(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listProjectsSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/projects/{projectName}")
@@ -180,7 +180,7 @@ Response listProjectsSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getProject(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/projects/{projectName}")
         @ExpectedResponses({ 200 })
@@ -190,7 +190,7 @@ Mono> getProject(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getProjectSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("projectName") String projectName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -199,7 +199,7 @@ Response getProjectSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listProjectsNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -209,7 +209,7 @@ Mono> listProjectsNext(@PathParam(value = "nextLink", encod
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listProjectsNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
     }
 
@@ -382,6 +382,8 @@ public Response getProjectWithResponse(String projectName, RequestOp
     }
 
     /**
+     * Lists all projects.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -414,6 +416,8 @@ private Mono> listProjectsNextSinglePageAsync(String n
     }
 
     /**
+     * Lists all projects.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
diff --git a/sdk/devcenter/azure-developer-devcenter/src/main/resources/META-INF/azure-developer-devcenter_apiview_properties.json b/sdk/devcenter/azure-developer-devcenter/src/main/resources/META-INF/azure-developer-devcenter_apiview_properties.json
index 113fa66daf42..4e834e262204 100644
--- a/sdk/devcenter/azure-developer-devcenter/src/main/resources/META-INF/azure-developer-devcenter_apiview_properties.json
+++ b/sdk/devcenter/azure-developer-devcenter/src/main/resources/META-INF/azure-developer-devcenter_apiview_properties.json
@@ -1,7 +1,7 @@
 {
   "flavor": "azure", 
   "CrossLanguageDefinitionId": {
-    "com.azure.developer.devcenter.DeploymentEnvironmentsAsyncClient": "DevCenterService.DeploymentEnvironmentsClient",
+    "com.azure.developer.devcenter.DeploymentEnvironmentsAsyncClient": "SdkCustomizations.EnvironmentClientOperations",
     "com.azure.developer.devcenter.DeploymentEnvironmentsAsyncClient.beginCreateOrUpdateEnvironment": "SdkCustomizations.EnvironmentClientOperations.createOrUpdateEnvironment",
     "com.azure.developer.devcenter.DeploymentEnvironmentsAsyncClient.beginCreateOrUpdateEnvironmentWithModel": "SdkCustomizations.EnvironmentClientOperations.createOrUpdateEnvironment",
     "com.azure.developer.devcenter.DeploymentEnvironmentsAsyncClient.beginDeleteEnvironment": "SdkCustomizations.EnvironmentClientOperations.deleteEnvironment",
@@ -18,7 +18,7 @@
     "com.azure.developer.devcenter.DeploymentEnvironmentsAsyncClient.listEnvironmentDefinitionsByCatalog": "SdkCustomizations.EnvironmentClientOperations.listEnvironmentDefinitionsByCatalog",
     "com.azure.developer.devcenter.DeploymentEnvironmentsAsyncClient.listEnvironmentTypes": "SdkCustomizations.EnvironmentClientOperations.listEnvironmentTypes",
     "com.azure.developer.devcenter.DeploymentEnvironmentsAsyncClient.listEnvironments": "SdkCustomizations.EnvironmentClientOperations.listEnvironments",
-    "com.azure.developer.devcenter.DeploymentEnvironmentsClient": "DevCenterService.DeploymentEnvironmentsClient",
+    "com.azure.developer.devcenter.DeploymentEnvironmentsClient": "SdkCustomizations.EnvironmentClientOperations",
     "com.azure.developer.devcenter.DeploymentEnvironmentsClient.beginCreateOrUpdateEnvironment": "SdkCustomizations.EnvironmentClientOperations.createOrUpdateEnvironment",
     "com.azure.developer.devcenter.DeploymentEnvironmentsClient.beginCreateOrUpdateEnvironmentWithModel": "SdkCustomizations.EnvironmentClientOperations.createOrUpdateEnvironment",
     "com.azure.developer.devcenter.DeploymentEnvironmentsClient.beginDeleteEnvironment": "SdkCustomizations.EnvironmentClientOperations.deleteEnvironment",
@@ -35,8 +35,8 @@
     "com.azure.developer.devcenter.DeploymentEnvironmentsClient.listEnvironmentDefinitionsByCatalog": "SdkCustomizations.EnvironmentClientOperations.listEnvironmentDefinitionsByCatalog",
     "com.azure.developer.devcenter.DeploymentEnvironmentsClient.listEnvironmentTypes": "SdkCustomizations.EnvironmentClientOperations.listEnvironmentTypes",
     "com.azure.developer.devcenter.DeploymentEnvironmentsClient.listEnvironments": "SdkCustomizations.EnvironmentClientOperations.listEnvironments",
-    "com.azure.developer.devcenter.DeploymentEnvironmentsClientBuilder": "DevCenterService.DeploymentEnvironmentsClient",
-    "com.azure.developer.devcenter.DevBoxesAsyncClient": "DevCenterService.DevBoxesClient",
+    "com.azure.developer.devcenter.DeploymentEnvironmentsClientBuilder": "SdkCustomizations.EnvironmentClientOperations",
+    "com.azure.developer.devcenter.DevBoxesAsyncClient": "SdkCustomizations.DevBoxesClientOperations",
     "com.azure.developer.devcenter.DevBoxesAsyncClient.beginCreateDevBox": "SdkCustomizations.DevBoxesClientOperations.createDevBox",
     "com.azure.developer.devcenter.DevBoxesAsyncClient.beginCreateDevBoxWithModel": "SdkCustomizations.DevBoxesClientOperations.createDevBox",
     "com.azure.developer.devcenter.DevBoxesAsyncClient.beginDeleteDevBox": "SdkCustomizations.DevBoxesClientOperations.deleteDevBox",
@@ -68,7 +68,7 @@
     "com.azure.developer.devcenter.DevBoxesAsyncClient.listSchedules": "SdkCustomizations.DevBoxesClientOperations.listSchedules",
     "com.azure.developer.devcenter.DevBoxesAsyncClient.skipAction": "SdkCustomizations.DevBoxesClientOperations.skipAction",
     "com.azure.developer.devcenter.DevBoxesAsyncClient.skipActionWithResponse": "SdkCustomizations.DevBoxesClientOperations.skipAction",
-    "com.azure.developer.devcenter.DevBoxesClient": "DevCenterService.DevBoxesClient",
+    "com.azure.developer.devcenter.DevBoxesClient": "SdkCustomizations.DevBoxesClientOperations",
     "com.azure.developer.devcenter.DevBoxesClient.beginCreateDevBox": "SdkCustomizations.DevBoxesClientOperations.createDevBox",
     "com.azure.developer.devcenter.DevBoxesClient.beginCreateDevBoxWithModel": "SdkCustomizations.DevBoxesClientOperations.createDevBox",
     "com.azure.developer.devcenter.DevBoxesClient.beginDeleteDevBox": "SdkCustomizations.DevBoxesClientOperations.deleteDevBox",
@@ -100,16 +100,16 @@
     "com.azure.developer.devcenter.DevBoxesClient.listSchedules": "SdkCustomizations.DevBoxesClientOperations.listSchedules",
     "com.azure.developer.devcenter.DevBoxesClient.skipAction": "SdkCustomizations.DevBoxesClientOperations.skipAction",
     "com.azure.developer.devcenter.DevBoxesClient.skipActionWithResponse": "SdkCustomizations.DevBoxesClientOperations.skipAction",
-    "com.azure.developer.devcenter.DevBoxesClientBuilder": "DevCenterService.DevBoxesClient",
-    "com.azure.developer.devcenter.DevCenterAsyncClient": "DevCenterService.DevCenterClient",
+    "com.azure.developer.devcenter.DevBoxesClientBuilder": "SdkCustomizations.DevBoxesClientOperations",
+    "com.azure.developer.devcenter.DevCenterAsyncClient": "SdkCustomizations.DevCenterClientOperations",
     "com.azure.developer.devcenter.DevCenterAsyncClient.getProject": "SdkCustomizations.DevCenterClientOperations.getProject",
     "com.azure.developer.devcenter.DevCenterAsyncClient.getProjectWithResponse": "SdkCustomizations.DevCenterClientOperations.getProject",
     "com.azure.developer.devcenter.DevCenterAsyncClient.listProjects": "SdkCustomizations.DevCenterClientOperations.listProjects",
-    "com.azure.developer.devcenter.DevCenterClient": "DevCenterService.DevCenterClient",
+    "com.azure.developer.devcenter.DevCenterClient": "SdkCustomizations.DevCenterClientOperations",
     "com.azure.developer.devcenter.DevCenterClient.getProject": "SdkCustomizations.DevCenterClientOperations.getProject",
     "com.azure.developer.devcenter.DevCenterClient.getProjectWithResponse": "SdkCustomizations.DevCenterClientOperations.getProject",
     "com.azure.developer.devcenter.DevCenterClient.listProjects": "SdkCustomizations.DevCenterClientOperations.listProjects",
-    "com.azure.developer.devcenter.DevCenterClientBuilder": "DevCenterService.DevCenterClient",
+    "com.azure.developer.devcenter.DevCenterClientBuilder": "SdkCustomizations.DevCenterClientOperations",
     "com.azure.developer.devcenter.models.DevBox": "DevCenterService.DevBox",
     "com.azure.developer.devcenter.models.DevBoxAction": "DevCenterService.DevBoxAction",
     "com.azure.developer.devcenter.models.DevBoxActionDelayResult": "DevCenterService.DevBoxActionDelayResult",
diff --git a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/fluent/DeviceRegistryClient.java b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/fluent/DeviceRegistryClient.java
index dcfc89a7db74..e2bfee52a58b 100644
--- a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/fluent/DeviceRegistryClient.java
+++ b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/fluent/DeviceRegistryClient.java
@@ -12,7 +12,7 @@
  */
 public interface DeviceRegistryClient {
     /**
-     * Gets Server parameter.
+     * Gets Service host.
      * 
      * @return the endpoint value.
      */
diff --git a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/implementation/AssetEndpointProfilesClientImpl.java b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/implementation/AssetEndpointProfilesClientImpl.java
index 05b44060a32f..862608beb075 100644
--- a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/implementation/AssetEndpointProfilesClientImpl.java
+++ b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/implementation/AssetEndpointProfilesClientImpl.java
@@ -80,9 +80,8 @@ Mono> getByResourceGroup(@HostParam("endpoin
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName,
             @PathParam("assetEndpointProfileName") String assetEndpointProfileName,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
-        @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DeviceRegistry/assetEndpointProfiles/{assetEndpointProfileName}")
         @ExpectedResponses({ 200, 201 })
         @UnexpectedResponseExceptionType(ManagementException.class)
@@ -90,10 +89,9 @@ Mono>> createOrReplace(@HostParam("endpoint") String e
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName,
             @PathParam("assetEndpointProfileName") String assetEndpointProfileName,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") AssetEndpointProfileInner resource,
-            Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") AssetEndpointProfileInner resource, Context context);
 
-        @Headers({ "Content-Type: application/json" })
         @Patch("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DeviceRegistry/assetEndpointProfiles/{assetEndpointProfileName}")
         @ExpectedResponses({ 200, 202 })
         @UnexpectedResponseExceptionType(ManagementException.class)
@@ -101,8 +99,8 @@ Mono>> update(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName,
             @PathParam("assetEndpointProfileName") String assetEndpointProfileName,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") AssetEndpointProfileUpdate properties,
-            Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") AssetEndpointProfileUpdate properties, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DeviceRegistry/assetEndpointProfiles/{assetEndpointProfileName}")
@@ -112,7 +110,7 @@ Mono>> delete(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName,
             @PathParam("assetEndpointProfileName") String assetEndpointProfileName,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DeviceRegistry/assetEndpointProfiles")
@@ -120,7 +118,7 @@ Mono>> delete(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listByResourceGroup(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
-            @PathParam("resourceGroupName") String resourceGroupName, @HeaderParam("accept") String accept,
+            @PathParam("resourceGroupName") String resourceGroupName, @HeaderParam("Accept") String accept,
             Context context);
 
         @Headers({ "Content-Type: application/json" })
@@ -129,7 +127,7 @@ Mono> listByResourceGroup(@HostParam("e
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> list(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
@@ -137,7 +135,7 @@ Mono> list(@HostParam("endpoint") Strin
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listByResourceGroupNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
@@ -145,7 +143,7 @@ Mono> listByResourceGroupNext(
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listBySubscriptionNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -304,11 +302,12 @@ private Mono>> createOrReplaceWithResponseAsync(String
         } else {
             resource.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrReplace(this.client.getEndpoint(), this.client.getApiVersion(),
-                this.client.getSubscriptionId(), resourceGroupName, assetEndpointProfileName, accept, resource,
-                context))
+                this.client.getSubscriptionId(), resourceGroupName, assetEndpointProfileName, contentType, accept,
+                resource, context))
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
@@ -348,10 +347,12 @@ private Mono>> createOrReplaceWithResponseAsync(String
         } else {
             resource.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrReplace(this.client.getEndpoint(), this.client.getApiVersion(),
-            this.client.getSubscriptionId(), resourceGroupName, assetEndpointProfileName, accept, resource, context);
+            this.client.getSubscriptionId(), resourceGroupName, assetEndpointProfileName, contentType, accept, resource,
+            context);
     }
 
     /**
@@ -542,9 +543,12 @@ private Mono>> updateWithResponseAsync(String resource
         } else {
             properties.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil.withContext(context -> service.update(this.client.getEndpoint(), this.client.getApiVersion(),
-            this.client.getSubscriptionId(), resourceGroupName, assetEndpointProfileName, accept, properties, context))
+        return FluxUtil
+            .withContext(context -> service.update(this.client.getEndpoint(), this.client.getApiVersion(),
+                this.client.getSubscriptionId(), resourceGroupName, assetEndpointProfileName, contentType, accept,
+                properties, context))
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
@@ -584,10 +588,11 @@ private Mono>> updateWithResponseAsync(String resource
         } else {
             properties.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.update(this.client.getEndpoint(), this.client.getApiVersion(), this.client.getSubscriptionId(),
-            resourceGroupName, assetEndpointProfileName, accept, properties, context);
+            resourceGroupName, assetEndpointProfileName, contentType, accept, properties, context);
     }
 
     /**
@@ -1187,6 +1192,8 @@ public PagedIterable list(Context context) {
     }
 
     /**
+     * List AssetEndpointProfile resources by resource group
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -1215,6 +1222,8 @@ private Mono> listByResourceGroupNextSi
     }
 
     /**
+     * List AssetEndpointProfile resources by resource group
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -1243,6 +1252,8 @@ private Mono> listByResourceGroupNextSi
     }
 
     /**
+     * List AssetEndpointProfile resources by subscription ID
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -1271,6 +1282,8 @@ private Mono> listBySubscriptionNextSin
     }
 
     /**
+     * List AssetEndpointProfile resources by subscription ID
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
diff --git a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/implementation/AssetsClientImpl.java b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/implementation/AssetsClientImpl.java
index dbbfc57a37cf..0e74559319ee 100644
--- a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/implementation/AssetsClientImpl.java
+++ b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/implementation/AssetsClientImpl.java
@@ -78,26 +78,25 @@ public interface AssetsService {
         Mono> getByResourceGroup(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("assetName") String assetName,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
-        @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DeviceRegistry/assets/{assetName}")
         @ExpectedResponses({ 200, 201 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono>> createOrReplace(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("assetName") String assetName,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") AssetInner resource, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") AssetInner resource, Context context);
 
-        @Headers({ "Content-Type: application/json" })
         @Patch("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DeviceRegistry/assets/{assetName}")
         @ExpectedResponses({ 200, 202 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono>> update(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("assetName") String assetName,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") AssetUpdate properties,
-            Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") AssetUpdate properties, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DeviceRegistry/assets/{assetName}")
@@ -106,7 +105,7 @@ Mono>> update(@HostParam("endpoint") String endpoint,
         Mono>> delete(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("assetName") String assetName,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DeviceRegistry/assets")
@@ -114,7 +113,7 @@ Mono>> delete(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listByResourceGroup(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
-            @PathParam("resourceGroupName") String resourceGroupName, @HeaderParam("accept") String accept,
+            @PathParam("resourceGroupName") String resourceGroupName, @HeaderParam("Accept") String accept,
             Context context);
 
         @Headers({ "Content-Type: application/json" })
@@ -123,7 +122,7 @@ Mono> listByResourceGroup(@HostParam("endpoint") Strin
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> list(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
@@ -131,7 +130,7 @@ Mono> list(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listByResourceGroupNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
@@ -139,7 +138,7 @@ Mono> listByResourceGroupNext(
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listBySubscriptionNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -293,10 +292,11 @@ private Mono>> createOrReplaceWithResponseAsync(String
         } else {
             resource.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrReplace(this.client.getEndpoint(), this.client.getApiVersion(),
-                this.client.getSubscriptionId(), resourceGroupName, assetName, accept, resource, context))
+                this.client.getSubscriptionId(), resourceGroupName, assetName, contentType, accept, resource, context))
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
@@ -335,10 +335,11 @@ private Mono>> createOrReplaceWithResponseAsync(String
         } else {
             resource.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrReplace(this.client.getEndpoint(), this.client.getApiVersion(),
-            this.client.getSubscriptionId(), resourceGroupName, assetName, accept, resource, context);
+            this.client.getSubscriptionId(), resourceGroupName, assetName, contentType, accept, resource, context);
     }
 
     /**
@@ -522,10 +523,10 @@ private Mono>> updateWithResponseAsync(String resource
         } else {
             properties.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil
-            .withContext(context -> service.update(this.client.getEndpoint(), this.client.getApiVersion(),
-                this.client.getSubscriptionId(), resourceGroupName, assetName, accept, properties, context))
+        return FluxUtil.withContext(context -> service.update(this.client.getEndpoint(), this.client.getApiVersion(),
+            this.client.getSubscriptionId(), resourceGroupName, assetName, contentType, accept, properties, context))
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
@@ -564,10 +565,11 @@ private Mono>> updateWithResponseAsync(String resource
         } else {
             properties.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.update(this.client.getEndpoint(), this.client.getApiVersion(), this.client.getSubscriptionId(),
-            resourceGroupName, assetName, accept, properties, context);
+            resourceGroupName, assetName, contentType, accept, properties, context);
     }
 
     /**
@@ -1152,6 +1154,8 @@ public PagedIterable list(Context context) {
     }
 
     /**
+     * List Asset resources by resource group
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -1180,6 +1184,8 @@ private Mono> listByResourceGroupNextSinglePageAsync(S
     }
 
     /**
+     * List Asset resources by resource group
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -1207,6 +1213,8 @@ private Mono> listByResourceGroupNextSinglePageAsync(S
     }
 
     /**
+     * List Asset resources by subscription ID
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -1235,6 +1243,8 @@ private Mono> listBySubscriptionNextSinglePageAsync(St
     }
 
     /**
+     * List Asset resources by subscription ID
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
diff --git a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/implementation/DeviceRegistryClientBuilder.java b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/implementation/DeviceRegistryClientBuilder.java
index 5cd488347c62..54d34610039a 100644
--- a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/implementation/DeviceRegistryClientBuilder.java
+++ b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/implementation/DeviceRegistryClientBuilder.java
@@ -20,12 +20,12 @@
 @ServiceClientBuilder(serviceClients = { DeviceRegistryClientImpl.class })
 public final class DeviceRegistryClientBuilder {
     /*
-     * Server parameter
+     * Service host
      */
     private String endpoint;
 
     /**
-     * Sets Server parameter.
+     * Sets Service host.
      * 
      * @param endpoint the endpoint value.
      * @return the DeviceRegistryClientBuilder.
@@ -121,6 +121,7 @@ public DeviceRegistryClientBuilder serializerAdapter(SerializerAdapter serialize
      * @return an instance of DeviceRegistryClientImpl.
      */
     public DeviceRegistryClientImpl buildClient() {
+        String localEndpoint = (endpoint != null) ? endpoint : "https://management.azure.com";
         AzureEnvironment localEnvironment = (environment != null) ? environment : AzureEnvironment.AZURE;
         HttpPipeline localPipeline = (pipeline != null)
             ? pipeline
@@ -131,7 +132,7 @@ public DeviceRegistryClientImpl buildClient() {
             ? serializerAdapter
             : SerializerFactory.createDefaultManagementSerializerAdapter();
         DeviceRegistryClientImpl client = new DeviceRegistryClientImpl(localPipeline, localSerializerAdapter,
-            localDefaultPollInterval, localEnvironment, this.endpoint, this.subscriptionId);
+            localDefaultPollInterval, localEnvironment, localEndpoint, this.subscriptionId);
         return client;
     }
 }
diff --git a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/implementation/DeviceRegistryClientImpl.java b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/implementation/DeviceRegistryClientImpl.java
index 5f385ff9d223..1debc96b5ea7 100644
--- a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/implementation/DeviceRegistryClientImpl.java
+++ b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/implementation/DeviceRegistryClientImpl.java
@@ -43,12 +43,12 @@
 @ServiceClient(builder = DeviceRegistryClientBuilder.class)
 public final class DeviceRegistryClientImpl implements DeviceRegistryClient {
     /**
-     * Server parameter.
+     * Service host.
      */
     private final String endpoint;
 
     /**
-     * Gets Server parameter.
+     * Gets Service host.
      * 
      * @return the endpoint value.
      */
@@ -189,7 +189,7 @@ public AssetEndpointProfilesClient getAssetEndpointProfiles() {
      * @param serializerAdapter The serializer to serialize an object into a string.
      * @param defaultPollInterval The default poll interval for long-running operation.
      * @param environment The Azure environment.
-     * @param endpoint Server parameter.
+     * @param endpoint Service host.
      * @param subscriptionId The ID of the target subscription. The value must be an UUID.
      */
     DeviceRegistryClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter,
diff --git a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/implementation/OperationStatusClientImpl.java b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/implementation/OperationStatusClientImpl.java
index 5caeae315aca..43559249df70 100644
--- a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/implementation/OperationStatusClientImpl.java
+++ b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/implementation/OperationStatusClientImpl.java
@@ -64,7 +64,7 @@ public interface OperationStatusService {
         Mono> get(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("location") String location, @PathParam("operationId") String operationId,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
diff --git a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/implementation/OperationsClientImpl.java b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/implementation/OperationsClientImpl.java
index b0bb756e6eb2..f97cb8518aee 100644
--- a/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/implementation/OperationsClientImpl.java
+++ b/sdk/deviceregistry/azure-resourcemanager-deviceregistry/src/main/java/com/azure/resourcemanager/deviceregistry/implementation/OperationsClientImpl.java
@@ -67,14 +67,14 @@ public interface OperationsService {
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> list(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, Context context);
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -181,6 +181,8 @@ public PagedIterable list(Context context) {
     }
 
     /**
+     * List the operations for the provider
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -207,6 +209,8 @@ private Mono> listNextSinglePageAsync(String nextL
     }
 
     /**
+     * List the operations for the provider
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
diff --git a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/fluent/DevOpsInfrastructureClient.java b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/fluent/DevOpsInfrastructureClient.java
index df3dc0a5b961..057f48292c48 100644
--- a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/fluent/DevOpsInfrastructureClient.java
+++ b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/fluent/DevOpsInfrastructureClient.java
@@ -12,7 +12,7 @@
  */
 public interface DevOpsInfrastructureClient {
     /**
-     * Gets Server parameter.
+     * Gets Service host.
      * 
      * @return the endpoint value.
      */
diff --git a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/implementation/DevOpsInfrastructureClientBuilder.java b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/implementation/DevOpsInfrastructureClientBuilder.java
index 022153a89b86..5e9aa51e154f 100644
--- a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/implementation/DevOpsInfrastructureClientBuilder.java
+++ b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/implementation/DevOpsInfrastructureClientBuilder.java
@@ -20,12 +20,12 @@
 @ServiceClientBuilder(serviceClients = { DevOpsInfrastructureClientImpl.class })
 public final class DevOpsInfrastructureClientBuilder {
     /*
-     * Server parameter
+     * Service host
      */
     private String endpoint;
 
     /**
-     * Sets Server parameter.
+     * Sets Service host.
      * 
      * @param endpoint the endpoint value.
      * @return the DevOpsInfrastructureClientBuilder.
@@ -121,6 +121,7 @@ public DevOpsInfrastructureClientBuilder serializerAdapter(SerializerAdapter ser
      * @return an instance of DevOpsInfrastructureClientImpl.
      */
     public DevOpsInfrastructureClientImpl buildClient() {
+        String localEndpoint = (endpoint != null) ? endpoint : "https://management.azure.com";
         AzureEnvironment localEnvironment = (environment != null) ? environment : AzureEnvironment.AZURE;
         HttpPipeline localPipeline = (pipeline != null)
             ? pipeline
@@ -131,7 +132,7 @@ public DevOpsInfrastructureClientImpl buildClient() {
             ? serializerAdapter
             : SerializerFactory.createDefaultManagementSerializerAdapter();
         DevOpsInfrastructureClientImpl client = new DevOpsInfrastructureClientImpl(localPipeline,
-            localSerializerAdapter, localDefaultPollInterval, localEnvironment, this.endpoint, this.subscriptionId);
+            localSerializerAdapter, localDefaultPollInterval, localEnvironment, localEndpoint, this.subscriptionId);
         return client;
     }
 }
diff --git a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/implementation/DevOpsInfrastructureClientImpl.java b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/implementation/DevOpsInfrastructureClientImpl.java
index 43ca37f41eea..60a6302b37c4 100644
--- a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/implementation/DevOpsInfrastructureClientImpl.java
+++ b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/implementation/DevOpsInfrastructureClientImpl.java
@@ -45,12 +45,12 @@
 @ServiceClient(builder = DevOpsInfrastructureClientBuilder.class)
 public final class DevOpsInfrastructureClientImpl implements DevOpsInfrastructureClient {
     /**
-     * Server parameter.
+     * Service host.
      */
     private final String endpoint;
 
     /**
-     * Gets Server parameter.
+     * Gets Service host.
      * 
      * @return the endpoint value.
      */
@@ -219,7 +219,7 @@ public ImageVersionsClient getImageVersions() {
      * @param serializerAdapter The serializer to serialize an object into a string.
      * @param defaultPollInterval The default poll interval for long-running operation.
      * @param environment The Azure environment.
-     * @param endpoint Server parameter.
+     * @param endpoint Service host.
      * @param subscriptionId The ID of the target subscription. The value must be an UUID.
      */
     DevOpsInfrastructureClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter,
diff --git a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/implementation/ImageVersionsClientImpl.java b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/implementation/ImageVersionsClientImpl.java
index 59e7fb045d33..a7d13d9f12a9 100644
--- a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/implementation/ImageVersionsClientImpl.java
+++ b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/implementation/ImageVersionsClientImpl.java
@@ -69,7 +69,7 @@ public interface ImageVersionsService {
         Mono> listByImage(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("imageName") String imageName,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
@@ -77,7 +77,7 @@ Mono> listByImage(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listByImageNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -222,6 +222,8 @@ public PagedIterable listByImage(String resourceGroupName, St
     }
 
     /**
+     * List ImageVersion resources by Image
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -249,6 +251,8 @@ private Mono> listByImageNextSinglePageAsync(St
     }
 
     /**
+     * List ImageVersion resources by Image
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
diff --git a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/implementation/OperationsClientImpl.java b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/implementation/OperationsClientImpl.java
index 6dc0dcf314e4..bf40b9a9c7bd 100644
--- a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/implementation/OperationsClientImpl.java
+++ b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/implementation/OperationsClientImpl.java
@@ -67,14 +67,14 @@ public interface OperationsService {
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> list(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, Context context);
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -181,6 +181,8 @@ public PagedIterable list(Context context) {
     }
 
     /**
+     * List the operations for the provider
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -207,6 +209,8 @@ private Mono> listNextSinglePageAsync(String nextL
     }
 
     /**
+     * List the operations for the provider
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
diff --git a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/implementation/PoolsClientImpl.java b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/implementation/PoolsClientImpl.java
index 3a91b8a9f7c3..71bfe980f2be 100644
--- a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/implementation/PoolsClientImpl.java
+++ b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/implementation/PoolsClientImpl.java
@@ -78,26 +78,25 @@ public interface PoolsService {
         Mono> getByResourceGroup(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("poolName") String poolName,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
-        @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DevOpsInfrastructure/pools/{poolName}")
         @ExpectedResponses({ 200, 201 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono>> createOrUpdate(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("poolName") String poolName,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") PoolInner resource, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") PoolInner resource, Context context);
 
-        @Headers({ "Content-Type: application/json" })
         @Patch("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DevOpsInfrastructure/pools/{poolName}")
         @ExpectedResponses({ 200, 202 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono>> update(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("poolName") String poolName,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") PoolUpdate properties,
-            Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") PoolUpdate properties, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DevOpsInfrastructure/pools/{poolName}")
@@ -106,7 +105,7 @@ Mono>> update(@HostParam("endpoint") String endpoint,
         Mono>> delete(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("poolName") String poolName,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DevOpsInfrastructure/pools")
@@ -114,7 +113,7 @@ Mono>> delete(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listByResourceGroup(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
-            @PathParam("resourceGroupName") String resourceGroupName, @HeaderParam("accept") String accept,
+            @PathParam("resourceGroupName") String resourceGroupName, @HeaderParam("Accept") String accept,
             Context context);
 
         @Headers({ "Content-Type: application/json" })
@@ -123,7 +122,7 @@ Mono> listByResourceGroup(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> list(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
@@ -131,7 +130,7 @@ Mono> list(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listByResourceGroupNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
@@ -139,7 +138,7 @@ Mono> listByResourceGroupNext(
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listBySubscriptionNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -294,10 +293,11 @@ private Mono>> createOrUpdateWithResponseAsync(String
         } else {
             resource.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getApiVersion(),
-                this.client.getSubscriptionId(), resourceGroupName, poolName, accept, resource, context))
+                this.client.getSubscriptionId(), resourceGroupName, poolName, contentType, accept, resource, context))
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
@@ -337,10 +337,11 @@ private Mono>> createOrUpdateWithResponseAsync(String
         } else {
             resource.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getApiVersion(),
-            this.client.getSubscriptionId(), resourceGroupName, poolName, accept, resource, context);
+            this.client.getSubscriptionId(), resourceGroupName, poolName, contentType, accept, resource, context);
     }
 
     /**
@@ -529,10 +530,11 @@ private Mono>> updateWithResponseAsync(String resource
         } else {
             properties.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.update(this.client.getEndpoint(), this.client.getApiVersion(),
-                this.client.getSubscriptionId(), resourceGroupName, poolName, accept, properties, context))
+                this.client.getSubscriptionId(), resourceGroupName, poolName, contentType, accept, properties, context))
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
@@ -572,10 +574,11 @@ private Mono>> updateWithResponseAsync(String resource
         } else {
             properties.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.update(this.client.getEndpoint(), this.client.getApiVersion(), this.client.getSubscriptionId(),
-            resourceGroupName, poolName, accept, properties, context);
+            resourceGroupName, poolName, contentType, accept, properties, context);
     }
 
     /**
@@ -1166,6 +1169,8 @@ public PagedIterable list(Context context) {
     }
 
     /**
+     * List Pool resources by resource group
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -1194,6 +1199,8 @@ private Mono> listByResourceGroupNextSinglePageAsync(St
     }
 
     /**
+     * List Pool resources by resource group
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -1221,6 +1228,8 @@ private Mono> listByResourceGroupNextSinglePageAsync(St
     }
 
     /**
+     * List Pool resources by subscription ID
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -1249,6 +1258,8 @@ private Mono> listBySubscriptionNextSinglePageAsync(Str
     }
 
     /**
+     * List Pool resources by subscription ID
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
diff --git a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/implementation/ResourceDetailsClientImpl.java b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/implementation/ResourceDetailsClientImpl.java
index f372a06fadd7..470940cc24ad 100644
--- a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/implementation/ResourceDetailsClientImpl.java
+++ b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/implementation/ResourceDetailsClientImpl.java
@@ -69,7 +69,7 @@ public interface ResourceDetailsService {
         Mono> listByPool(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName, @PathParam("poolName") String poolName,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
@@ -77,7 +77,7 @@ Mono> listByPool(@HostParam("endpoint"
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listByPoolNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -224,6 +224,8 @@ public PagedIterable listByPool(String resourceGroup
     }
 
     /**
+     * List ResourceDetailsObject resources by Pool
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -251,6 +253,8 @@ private Mono> listByPoolNextSinglePage
     }
 
     /**
+     * List ResourceDetailsObject resources by Pool
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
diff --git a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/implementation/SkusClientImpl.java b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/implementation/SkusClientImpl.java
index 9a3ae6d2d859..8b27ae87381b 100644
--- a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/implementation/SkusClientImpl.java
+++ b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/implementation/SkusClientImpl.java
@@ -67,7 +67,7 @@ public interface SkusService {
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listByLocation(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
-            @PathParam("locationName") String locationName, @HeaderParam("accept") String accept, Context context);
+            @PathParam("locationName") String locationName, @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
@@ -75,7 +75,7 @@ Mono> listByLocation(@HostParam("endpoint") Stri
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listByLocationNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -204,6 +204,8 @@ public PagedIterable listByLocation(String locationName, Conte
     }
 
     /**
+     * List ResourceSku resources by subscription ID
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -231,6 +233,8 @@ private Mono> listByLocationNextSinglePageAsync(
     }
 
     /**
+     * List ResourceSku resources by subscription ID
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
diff --git a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/implementation/SubscriptionUsagesClientImpl.java b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/implementation/SubscriptionUsagesClientImpl.java
index 74c3e39f5d0a..d8a6ed0fba19 100644
--- a/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/implementation/SubscriptionUsagesClientImpl.java
+++ b/sdk/devopsinfrastructure/azure-resourcemanager-devopsinfrastructure/src/main/java/com/azure/resourcemanager/devopsinfrastructure/implementation/SubscriptionUsagesClientImpl.java
@@ -68,14 +68,14 @@ public interface SubscriptionUsagesService {
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> usages(@HostParam("endpoint") String endpoint,
             @PathParam("subscriptionId") String subscriptionId, @PathParam("location") String location,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> usagesNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, Context context);
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -203,6 +203,8 @@ public PagedIterable usages(String location, Context context) {
     }
 
     /**
+     * List Quota resources by subscription ID
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -229,6 +231,8 @@ private Mono> usagesNextSinglePageAsync(String nextLin
     }
 
     /**
+     * List Quota resources by subscription ID
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
diff --git a/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/DocumentIntelligenceAsyncClient.java b/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/DocumentIntelligenceAsyncClient.java
index dd2626ce1083..9094d010e167 100644
--- a/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/DocumentIntelligenceAsyncClient.java
+++ b/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/DocumentIntelligenceAsyncClient.java
@@ -76,6 +76,14 @@ public final class DocumentIntelligenceAsyncClient {
      * the form of "," separated string.
      * 
      * You can add these to a request with {@link RequestOptions#addQueryParam}
+     * 
Header Parameters

+     * 
+     * 
+     * 
+     * 
+     * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
+     * "application/json".

+     * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

      * 
      * 
{@code
@@ -122,6 +130,14 @@ public PollerFlux beginAnalyzeDocument(String modelId, R
      * the form of "," separated string.
      * 
      * You can add these to a request with {@link RequestOptions#addQueryParam}
+     * 
Header Parameters

+     * 
+     * 
+     * 
+     * 
+     * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
+     * "application/json".

+     * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

      * 
      * 
{@code
diff --git a/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/DocumentIntelligenceClient.java b/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/DocumentIntelligenceClient.java
index ad7132ec6587..734b968a24ee 100644
--- a/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/DocumentIntelligenceClient.java
+++ b/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/DocumentIntelligenceClient.java
@@ -74,6 +74,14 @@ public final class DocumentIntelligenceClient {
      * the form of "," separated string.
      * 
      * You can add these to a request with {@link RequestOptions#addQueryParam}
+     * 
Header Parameters

+     * 
+     * 
+     * 
+     * 
+     * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
+     * "application/json".

+     * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

      * 
      * 
{@code
@@ -120,6 +128,14 @@ public SyncPoller beginAnalyzeDocument(String modelId, R
      * the form of "," separated string.
      * 
      * You can add these to a request with {@link RequestOptions#addQueryParam}
+     * 
Header Parameters

+     * 
+     * 
+     * 
+     * 
+     * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
+     * "application/json".

+     * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

      * 
      * 
{@code
diff --git a/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/implementation/DocumentIntelligenceAdministrationClientImpl.java b/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/implementation/DocumentIntelligenceAdministrationClientImpl.java
index 51a9882a1cfb..434f8156d34a 100644
--- a/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/implementation/DocumentIntelligenceAdministrationClientImpl.java
+++ b/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/implementation/DocumentIntelligenceAdministrationClientImpl.java
@@ -177,8 +177,9 @@ public interface DocumentIntelligenceAdministrationClientService {
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> buildDocumentModel(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData buildRequest, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData buildRequest,
+            RequestOptions requestOptions, Context context);
 
         @Post("/documentModels:build")
         @ExpectedResponses({ 202 })
@@ -187,8 +188,9 @@ Mono> buildDocumentModel(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response buildDocumentModelSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData buildRequest, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData buildRequest,
+            RequestOptions requestOptions, Context context);
 
         @Post("/documentModels:compose")
         @ExpectedResponses({ 202 })
@@ -197,8 +199,9 @@ Response buildDocumentModelSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> composeModel(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData composeRequest, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData composeRequest,
+            RequestOptions requestOptions, Context context);
 
         @Post("/documentModels:compose")
         @ExpectedResponses({ 202 })
@@ -207,8 +210,9 @@ Mono> composeModel(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response composeModelSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData composeRequest, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData composeRequest,
+            RequestOptions requestOptions, Context context);
 
         @Post("/documentModels:authorizeCopy")
         @ExpectedResponses({ 200 })
@@ -217,9 +221,9 @@ Response composeModelSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> authorizeModelCopy(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData authorizeCopyRequest, RequestOptions requestOptions,
-            Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData authorizeCopyRequest,
+            RequestOptions requestOptions, Context context);
 
         @Post("/documentModels:authorizeCopy")
         @ExpectedResponses({ 200 })
@@ -228,9 +232,9 @@ Mono> authorizeModelCopy(@HostParam("endpoint") String endp
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response authorizeModelCopySync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData authorizeCopyRequest, RequestOptions requestOptions,
-            Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData authorizeCopyRequest,
+            RequestOptions requestOptions, Context context);
 
         @Post("/documentModels/{modelId}:copyTo")
         @ExpectedResponses({ 202 })
@@ -240,8 +244,8 @@ Response authorizeModelCopySync(@HostParam("endpoint") String endpoi
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> copyModelTo(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("modelId") String modelId,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData copyToRequest,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData copyToRequest, RequestOptions requestOptions, Context context);
 
         @Post("/documentModels/{modelId}:copyTo")
         @ExpectedResponses({ 202 })
@@ -251,8 +255,8 @@ Mono> copyModelTo(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response copyModelToSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("modelId") String modelId,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData copyToRequest,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData copyToRequest, RequestOptions requestOptions, Context context);
 
         @Get("/documentModels/{modelId}")
         @ExpectedResponses({ 200 })
@@ -262,7 +266,7 @@ Response copyModelToSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getModel(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("modelId") String modelId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/documentModels/{modelId}")
         @ExpectedResponses({ 200 })
@@ -272,7 +276,7 @@ Mono> getModel(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getModelSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("modelId") String modelId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/documentModels")
         @ExpectedResponses({ 200 })
@@ -281,7 +285,7 @@ Response getModelSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listModels(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/documentModels")
@@ -291,7 +295,7 @@ Mono> listModels(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listModelsSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Delete("/documentModels/{modelId}")
@@ -302,7 +306,7 @@ Response listModelsSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> deleteModel(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("modelId") String modelId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/documentModels/{modelId}")
         @ExpectedResponses({ 204 })
@@ -312,7 +316,7 @@ Mono> deleteModel(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response deleteModelSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("modelId") String modelId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/info")
         @ExpectedResponses({ 200 })
@@ -321,7 +325,7 @@ Response deleteModelSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getResourceInfo(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/info")
@@ -331,7 +335,7 @@ Mono> getResourceInfo(@HostParam("endpoint") String endpoin
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getResourceInfoSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/operations/{operationId}")
@@ -342,7 +346,7 @@ Response getResourceInfoSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getOperation(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("operationId") String operationId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/operations/{operationId}")
         @ExpectedResponses({ 200 })
@@ -352,7 +356,7 @@ Mono> getOperation(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getOperationSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("operationId") String operationId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/operations")
         @ExpectedResponses({ 200 })
@@ -361,7 +365,7 @@ Response getOperationSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listOperations(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/operations")
@@ -371,7 +375,7 @@ Mono> listOperations(@HostParam("endpoint") String endpoint
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listOperationsSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Post("/documentClassifiers:build")
@@ -381,8 +385,9 @@ Response listOperationsSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> buildClassifier(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData buildRequest, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData buildRequest,
+            RequestOptions requestOptions, Context context);
 
         @Post("/documentClassifiers:build")
         @ExpectedResponses({ 202 })
@@ -391,8 +396,9 @@ Mono> buildClassifier(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response buildClassifierSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData buildRequest, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData buildRequest,
+            RequestOptions requestOptions, Context context);
 
         @Post("/documentClassifiers:authorizeCopy")
         @ExpectedResponses({ 200 })
@@ -401,9 +407,9 @@ Response buildClassifierSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> authorizeClassifierCopy(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData authorizeCopyRequest, RequestOptions requestOptions,
-            Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData authorizeCopyRequest,
+            RequestOptions requestOptions, Context context);
 
         @Post("/documentClassifiers:authorizeCopy")
         @ExpectedResponses({ 200 })
@@ -412,9 +418,9 @@ Mono> authorizeClassifierCopy(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response authorizeClassifierCopySync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData authorizeCopyRequest, RequestOptions requestOptions,
-            Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData authorizeCopyRequest,
+            RequestOptions requestOptions, Context context);
 
         @Post("/documentClassifiers/{classifierId}:copyTo")
         @ExpectedResponses({ 202 })
@@ -424,8 +430,8 @@ Response authorizeClassifierCopySync(@HostParam("endpoint") String e
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> copyClassifierTo(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("classifierId") String classifierId,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData copyToRequest,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData copyToRequest, RequestOptions requestOptions, Context context);
 
         @Post("/documentClassifiers/{classifierId}:copyTo")
         @ExpectedResponses({ 202 })
@@ -435,8 +441,8 @@ Mono> copyClassifierTo(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response copyClassifierToSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("classifierId") String classifierId,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData copyToRequest,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData copyToRequest, RequestOptions requestOptions, Context context);
 
         @Get("/documentClassifiers/{classifierId}")
         @ExpectedResponses({ 200 })
@@ -446,7 +452,7 @@ Response copyClassifierToSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getClassifier(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("classifierId") String classifierId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/documentClassifiers/{classifierId}")
         @ExpectedResponses({ 200 })
@@ -456,7 +462,7 @@ Mono> getClassifier(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getClassifierSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("classifierId") String classifierId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/documentClassifiers")
         @ExpectedResponses({ 200 })
@@ -465,7 +471,7 @@ Response getClassifierSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listClassifiers(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/documentClassifiers")
@@ -475,7 +481,7 @@ Mono> listClassifiers(@HostParam("endpoint") String endpoin
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listClassifiersSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Delete("/documentClassifiers/{classifierId}")
@@ -486,7 +492,7 @@ Response listClassifiersSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> deleteClassifier(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("classifierId") String classifierId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/documentClassifiers/{classifierId}")
         @ExpectedResponses({ 204 })
@@ -496,7 +502,7 @@ Mono> deleteClassifier(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response deleteClassifierSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("classifierId") String classifierId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -505,7 +511,7 @@ Response deleteClassifierSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listModelsNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -515,7 +521,7 @@ Mono> listModelsNext(@PathParam(value = "nextLink", encoded
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listModelsNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -525,7 +531,7 @@ Response listModelsNextSync(@PathParam(value = "nextLink", encoded =
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listOperationsNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -535,7 +541,7 @@ Mono> listOperationsNext(@PathParam(value = "nextLink", enc
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listOperationsNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -545,7 +551,7 @@ Response listOperationsNextSync(@PathParam(value = "nextLink", encod
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listClassifiersNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -555,7 +561,7 @@ Mono> listClassifiersNext(@PathParam(value = "nextLink", en
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listClassifiersNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
     }
 
@@ -595,9 +601,10 @@ Response listClassifiersNextSync(@PathParam(value = "nextLink", enco
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> buildDocumentModelWithResponseAsync(BinaryData buildRequest,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.buildDocumentModel(this.getEndpoint(),
-            this.getServiceVersion().getVersion(), accept, buildRequest, requestOptions, context));
+            this.getServiceVersion().getVersion(), contentType, accept, buildRequest, requestOptions, context));
     }
 
     /**
@@ -635,9 +642,10 @@ private Mono> buildDocumentModelWithResponseAsync(BinaryData buil
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Response buildDocumentModelWithResponse(BinaryData buildRequest, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.buildDocumentModelSync(this.getEndpoint(), this.getServiceVersion().getVersion(), accept,
-            buildRequest, requestOptions, Context.NONE);
+        return service.buildDocumentModelSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType,
+            accept, buildRequest, requestOptions, Context.NONE);
     }
 
     /**
@@ -894,9 +902,10 @@ public SyncPoller beginBuildDocumentModel(BinaryData bui
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> composeModelWithResponseAsync(BinaryData composeRequest,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.composeModel(this.getEndpoint(),
-            this.getServiceVersion().getVersion(), accept, composeRequest, requestOptions, context));
+            this.getServiceVersion().getVersion(), contentType, accept, composeRequest, requestOptions, context));
     }
 
     /**
@@ -954,8 +963,9 @@ private Mono> composeModelWithResponseAsync(BinaryData composeReq
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Response composeModelWithResponse(BinaryData composeRequest, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.composeModelSync(this.getEndpoint(), this.getServiceVersion().getVersion(), accept,
+        return service.composeModelSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, accept,
             composeRequest, requestOptions, Context.NONE);
     }
 
@@ -1277,9 +1287,10 @@ public SyncPoller beginComposeModel(BinaryData composeRe
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> authorizeModelCopyWithResponseAsync(BinaryData authorizeCopyRequest,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.authorizeModelCopy(this.getEndpoint(),
-            this.getServiceVersion().getVersion(), accept, authorizeCopyRequest, requestOptions, context));
+            this.getServiceVersion().getVersion(), contentType, accept, authorizeCopyRequest, requestOptions, context));
     }
 
     /**
@@ -1322,9 +1333,10 @@ public Mono> authorizeModelCopyWithResponseAsync(BinaryData
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response authorizeModelCopyWithResponse(BinaryData authorizeCopyRequest,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.authorizeModelCopySync(this.getEndpoint(), this.getServiceVersion().getVersion(), accept,
-            authorizeCopyRequest, requestOptions, Context.NONE);
+        return service.authorizeModelCopySync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType,
+            accept, authorizeCopyRequest, requestOptions, Context.NONE);
     }
 
     /**
@@ -1354,9 +1366,11 @@ public Response authorizeModelCopyWithResponse(BinaryData authorizeC
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> copyModelToWithResponseAsync(String modelId, BinaryData copyToRequest,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil.withContext(context -> service.copyModelTo(this.getEndpoint(),
-            this.getServiceVersion().getVersion(), modelId, accept, copyToRequest, requestOptions, context));
+        return FluxUtil
+            .withContext(context -> service.copyModelTo(this.getEndpoint(), this.getServiceVersion().getVersion(),
+                modelId, contentType, accept, copyToRequest, requestOptions, context));
     }
 
     /**
@@ -1386,9 +1400,10 @@ private Mono> copyModelToWithResponseAsync(String modelId, Binary
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Response copyModelToWithResponse(String modelId, BinaryData copyToRequest,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.copyModelToSync(this.getEndpoint(), this.getServiceVersion().getVersion(), modelId, accept,
-            copyToRequest, requestOptions, Context.NONE);
+        return service.copyModelToSync(this.getEndpoint(), this.getServiceVersion().getVersion(), modelId, contentType,
+            accept, copyToRequest, requestOptions, Context.NONE);
     }
 
     /**
@@ -2461,9 +2476,10 @@ public PagedIterable listOperations(RequestOptions requestOptions) {
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> buildClassifierWithResponseAsync(BinaryData buildRequest,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.buildClassifier(this.getEndpoint(),
-            this.getServiceVersion().getVersion(), accept, buildRequest, requestOptions, context));
+            this.getServiceVersion().getVersion(), contentType, accept, buildRequest, requestOptions, context));
     }
 
     /**
@@ -2502,9 +2518,10 @@ private Mono> buildClassifierWithResponseAsync(BinaryData buildRe
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Response buildClassifierWithResponse(BinaryData buildRequest, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.buildClassifierSync(this.getEndpoint(), this.getServiceVersion().getVersion(), accept,
-            buildRequest, requestOptions, Context.NONE);
+        return service.buildClassifierSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType,
+            accept, buildRequest, requestOptions, Context.NONE);
     }
 
     /**
@@ -2749,9 +2766,10 @@ public SyncPoller beginBuildClassifier(BinaryData buildR
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> authorizeClassifierCopyWithResponseAsync(BinaryData authorizeCopyRequest,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.authorizeClassifierCopy(this.getEndpoint(),
-            this.getServiceVersion().getVersion(), accept, authorizeCopyRequest, requestOptions, context));
+            this.getServiceVersion().getVersion(), contentType, accept, authorizeCopyRequest, requestOptions, context));
     }
 
     /**
@@ -2794,9 +2812,10 @@ public Mono> authorizeClassifierCopyWithResponseAsync(Binar
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response authorizeClassifierCopyWithResponse(BinaryData authorizeCopyRequest,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.authorizeClassifierCopySync(this.getEndpoint(), this.getServiceVersion().getVersion(), accept,
-            authorizeCopyRequest, requestOptions, Context.NONE);
+        return service.authorizeClassifierCopySync(this.getEndpoint(), this.getServiceVersion().getVersion(),
+            contentType, accept, authorizeCopyRequest, requestOptions, Context.NONE);
     }
 
     /**
@@ -2826,9 +2845,11 @@ public Response authorizeClassifierCopyWithResponse(BinaryData autho
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> copyClassifierToWithResponseAsync(String classifierId, BinaryData copyToRequest,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil.withContext(context -> service.copyClassifierTo(this.getEndpoint(),
-            this.getServiceVersion().getVersion(), classifierId, accept, copyToRequest, requestOptions, context));
+        return FluxUtil
+            .withContext(context -> service.copyClassifierTo(this.getEndpoint(), this.getServiceVersion().getVersion(),
+                classifierId, contentType, accept, copyToRequest, requestOptions, context));
     }
 
     /**
@@ -2858,9 +2879,10 @@ private Mono> copyClassifierToWithResponseAsync(String classifier
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Response copyClassifierToWithResponse(String classifierId, BinaryData copyToRequest,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return service.copyClassifierToSync(this.getEndpoint(), this.getServiceVersion().getVersion(), classifierId,
-            accept, copyToRequest, requestOptions, Context.NONE);
+            contentType, accept, copyToRequest, requestOptions, Context.NONE);
     }
 
     /**
@@ -3371,6 +3393,8 @@ public Response deleteClassifierWithResponse(String classifierId, RequestO
     }
 
     /**
+     * List all document models
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -3456,6 +3480,8 @@ private Mono> listModelsNextSinglePageAsync(String nex
     }
 
     /**
+     * List all document models
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -3538,6 +3564,8 @@ private PagedResponse listModelsNextSinglePage(String nextLink, Requ
     }
 
     /**
+     * Lists all operations.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -3591,6 +3619,8 @@ private Mono> listOperationsNextSinglePageAsync(String
     }
 
     /**
+     * Lists all operations.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -3641,6 +3671,8 @@ private PagedResponse listOperationsNextSinglePage(String nextLink,
     }
 
     /**
+     * List all document classifiers.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -3696,6 +3728,8 @@ private Mono> listClassifiersNextSinglePageAsync(Strin
     }
 
     /**
+     * List all document classifiers.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
diff --git a/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/implementation/DocumentIntelligenceClientImpl.java b/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/implementation/DocumentIntelligenceClientImpl.java
index 66455c2f2ca5..e04f9877204e 100644
--- a/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/implementation/DocumentIntelligenceClientImpl.java
+++ b/sdk/documentintelligence/azure-ai-documentintelligence/src/main/java/com/azure/ai/documentintelligence/implementation/DocumentIntelligenceClientImpl.java
@@ -167,8 +167,7 @@ public interface DocumentIntelligenceClientService {
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> analyzeDocument(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("modelId") String modelId,
-            @HeaderParam("content-type") String contentType, @HeaderParam("accept") String accept,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/documentModels/{modelId}:analyze")
         @ExpectedResponses({ 202 })
@@ -178,8 +177,7 @@ Mono> analyzeDocument(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response analyzeDocumentSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("modelId") String modelId,
-            @HeaderParam("content-type") String contentType, @HeaderParam("accept") String accept,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/documentModels/{modelId}:analyzeBatch")
         @ExpectedResponses({ 202 })
@@ -189,8 +187,7 @@ Response analyzeDocumentSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> analyzeBatchDocuments(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("modelId") String modelId,
-            @HeaderParam("content-type") String contentType, @HeaderParam("accept") String accept,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/documentModels/{modelId}:analyzeBatch")
         @ExpectedResponses({ 202 })
@@ -200,8 +197,7 @@ Mono> analyzeBatchDocuments(@HostParam("endpoint") String endpoin
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response analyzeBatchDocumentsSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("modelId") String modelId,
-            @HeaderParam("content-type") String contentType, @HeaderParam("accept") String accept,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/documentModels/{modelId}/analyzeResults/{resultId}/pdf")
         @ExpectedResponses({ 200 })
@@ -211,7 +207,7 @@ Response analyzeBatchDocumentsSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getAnalyzeResultPdf(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("modelId") String modelId,
-            @PathParam("resultId") String resultId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("resultId") String resultId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/documentModels/{modelId}/analyzeResults/{resultId}/pdf")
@@ -222,7 +218,7 @@ Mono> getAnalyzeResultPdf(@HostParam("endpoint") String end
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getAnalyzeResultPdfSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("modelId") String modelId,
-            @PathParam("resultId") String resultId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("resultId") String resultId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/documentModels/{modelId}/analyzeResults/{resultId}/figures/{figureId}")
@@ -234,7 +230,7 @@ Response getAnalyzeResultPdfSync(@HostParam("endpoint") String endpo
         Mono> getAnalyzeResultFigure(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("modelId") String modelId,
             @PathParam("resultId") String resultId, @PathParam("figureId") String figureId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/documentModels/{modelId}/analyzeResults/{resultId}/figures/{figureId}")
         @ExpectedResponses({ 200 })
@@ -245,7 +241,7 @@ Mono> getAnalyzeResultFigure(@HostParam("endpoint") String
         Response getAnalyzeResultFigureSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("modelId") String modelId,
             @PathParam("resultId") String resultId, @PathParam("figureId") String figureId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/documentClassifiers/{classifierId}:analyze")
         @ExpectedResponses({ 202 })
@@ -255,7 +251,7 @@ Response getAnalyzeResultFigureSync(@HostParam("endpoint") String en
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> classifyDocument(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("classifierId") String classifierId,
-            @HeaderParam("content-type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") BinaryData classifyRequest, RequestOptions requestOptions, Context context);
 
         @Post("/documentClassifiers/{classifierId}:analyze")
@@ -266,7 +262,7 @@ Mono> classifyDocument(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response classifyDocumentSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("classifierId") String classifierId,
-            @HeaderParam("content-type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") BinaryData classifyRequest, RequestOptions requestOptions, Context context);
     }
 
@@ -293,6 +289,14 @@ Response classifyDocumentSync(@HostParam("endpoint") String endpoint,
      * the form of "," separated string.
      * 
      * You can add these to a request with {@link RequestOptions#addQueryParam}
+     * 
Header Parameters

+     * 
+     * 
+     * 
+     * 
+     * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
+     * "application/json".

+     * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

      * 
      * 
{@code
@@ -312,7 +316,6 @@ Response classifyDocumentSync(@HostParam("endpoint") String endpoint,
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> analyzeDocumentWithResponseAsync(String modelId, RequestOptions requestOptions) {
-        final String contentType = "application/json";
         final String accept = "application/json";
         RequestOptions requestOptionsLocal = requestOptions == null ? new RequestOptions() : requestOptions;
         requestOptionsLocal.addRequestCallback(requestLocal -> {
@@ -321,7 +324,7 @@ private Mono> analyzeDocumentWithResponseAsync(String modelId, Re
             }
         });
         return FluxUtil.withContext(context -> service.analyzeDocument(this.getEndpoint(),
-            this.getServiceVersion().getVersion(), modelId, contentType, accept, requestOptionsLocal, context));
+            this.getServiceVersion().getVersion(), modelId, accept, requestOptionsLocal, context));
     }
 
     /**
@@ -347,6 +350,14 @@ private Mono> analyzeDocumentWithResponseAsync(String modelId, Re
      * the form of "," separated string.
      * 
      * You can add these to a request with {@link RequestOptions#addQueryParam}
+     * 
Header Parameters

+     * 
+     * 
+     * 
+     * 
+     * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
+     * "application/json".

+     * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

      * 
      * 
{@code
@@ -366,7 +377,6 @@ private Mono> analyzeDocumentWithResponseAsync(String modelId, Re
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Response analyzeDocumentWithResponse(String modelId, RequestOptions requestOptions) {
-        final String contentType = "application/json";
         final String accept = "application/json";
         RequestOptions requestOptionsLocal = requestOptions == null ? new RequestOptions() : requestOptions;
         requestOptionsLocal.addRequestCallback(requestLocal -> {
@@ -374,8 +384,8 @@ private Response analyzeDocumentWithResponse(String modelId, RequestOption
                 requestLocal.getHeaders().set(HttpHeaderName.CONTENT_TYPE, "application/json");
             }
         });
-        return service.analyzeDocumentSync(this.getEndpoint(), this.getServiceVersion().getVersion(), modelId,
-            contentType, accept, requestOptionsLocal, Context.NONE);
+        return service.analyzeDocumentSync(this.getEndpoint(), this.getServiceVersion().getVersion(), modelId, accept,
+            requestOptionsLocal, Context.NONE);
     }
 
     /**
@@ -401,6 +411,14 @@ private Response analyzeDocumentWithResponse(String modelId, RequestOption
      * the form of "," separated string.
      * 
      * You can add these to a request with {@link RequestOptions#addQueryParam}
+     * 
Header Parameters

+     * 
+     * 
+     * 
+     * 
+     * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
+     * "application/json".

+     * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

      * 
      * 
{@code
@@ -456,6 +474,14 @@ public PollerFlux beginAnalyzeDocumentAsync(String model
      * the form of "," separated string.
      * 
      * You can add these to a request with {@link RequestOptions#addQueryParam}
+     * 
Header Parameters

+     * 
+     * 
+     * 
+     * 
+     * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
+     * "application/json".

+     * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

      * 
      * 
{@code
@@ -511,6 +537,14 @@ public SyncPoller beginAnalyzeDocument(String modelId, R
      * the form of "," separated string.
      * 
      * You can add these to a request with {@link RequestOptions#addQueryParam}
+     * 
Header Parameters

+     * 
+     * 
+     * 
+     * 
+     * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
+     * "application/json".

+     * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

      * 
      * 
{@code
@@ -568,6 +602,14 @@ public PollerFlux beginAnalyzeDocumentWit
      * the form of "," separated string.
      * 
      * You can add these to a request with {@link RequestOptions#addQueryParam}
+     * 
Header Parameters

+     * 
+     * 
+     * 
+     * 
+     * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
+     * "application/json".

+     * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

      * 
      * 
{@code
@@ -625,6 +667,14 @@ public SyncPoller beginAnalyzeDocumentWit
      * the form of "," separated string.
      * 
      * You can add these to a request with {@link RequestOptions#addQueryParam}
+     * 
Header Parameters

+     * 
+     * 
+     * 
+     * 
+     * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
+     * "application/json".

+     * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

      * 
      * 
{@code
@@ -653,7 +703,6 @@ public SyncPoller beginAnalyzeDocumentWit
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> analyzeBatchDocumentsWithResponseAsync(String modelId, RequestOptions requestOptions) {
-        final String contentType = "application/json";
         final String accept = "application/json";
         RequestOptions requestOptionsLocal = requestOptions == null ? new RequestOptions() : requestOptions;
         requestOptionsLocal.addRequestCallback(requestLocal -> {
@@ -662,7 +711,7 @@ private Mono> analyzeBatchDocumentsWithResponseAsync(String model
             }
         });
         return FluxUtil.withContext(context -> service.analyzeBatchDocuments(this.getEndpoint(),
-            this.getServiceVersion().getVersion(), modelId, contentType, accept, requestOptionsLocal, context));
+            this.getServiceVersion().getVersion(), modelId, accept, requestOptionsLocal, context));
     }
 
     /**
@@ -688,6 +737,14 @@ private Mono> analyzeBatchDocumentsWithResponseAsync(String model
      * the form of "," separated string.
      * 
      * You can add these to a request with {@link RequestOptions#addQueryParam}
+     * 
Header Parameters

+     * 
+     * 
+     * 
+     * 
+     * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
+     * "application/json".

+     * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

      * 
      * 
{@code
@@ -716,7 +773,6 @@ private Mono> analyzeBatchDocumentsWithResponseAsync(String model
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Response analyzeBatchDocumentsWithResponse(String modelId, RequestOptions requestOptions) {
-        final String contentType = "application/json";
         final String accept = "application/json";
         RequestOptions requestOptionsLocal = requestOptions == null ? new RequestOptions() : requestOptions;
         requestOptionsLocal.addRequestCallback(requestLocal -> {
@@ -725,7 +781,7 @@ private Response analyzeBatchDocumentsWithResponse(String modelId, Request
             }
         });
         return service.analyzeBatchDocumentsSync(this.getEndpoint(), this.getServiceVersion().getVersion(), modelId,
-            contentType, accept, requestOptionsLocal, Context.NONE);
+            accept, requestOptionsLocal, Context.NONE);
     }
 
     /**
@@ -751,6 +807,14 @@ private Response analyzeBatchDocumentsWithResponse(String modelId, Request
      * the form of "," separated string.
      * 
      * You can add these to a request with {@link RequestOptions#addQueryParam}
+     * 
Header Parameters

+     * 
+     * 
+     * 
+     * 
+     * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
+     * "application/json".

+     * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

      * 
      * 
{@code
@@ -816,6 +880,14 @@ public PollerFlux beginAnalyzeBatchDocumentsAsync(String
      * the form of "," separated string.
      * 
      * You can add these to a request with {@link RequestOptions#addQueryParam}
+     * 
Header Parameters

+     * 
+     * 
+     * 
+     * 
+     * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
+     * "application/json".

+     * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

      * 
      * 
{@code
@@ -881,6 +953,14 @@ public SyncPoller beginAnalyzeBatchDocuments(String mode
      * the form of "," separated string.
      * 
      * You can add these to a request with {@link RequestOptions#addQueryParam}
+     * 
Header Parameters

+     * 
+     * 
+     * 
+     * 
+     * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
+     * "application/json".

+     * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

      * 
      * 
{@code
@@ -947,6 +1027,14 @@ public SyncPoller beginAnalyzeBatchDocuments(String mode
      * the form of "," separated string.
      * 
      * You can add these to a request with {@link RequestOptions#addQueryParam}
+     * 
Header Parameters

+     * 
+     * 
+     * 
+     * 
+     * 
Header Parameters
NameTypeRequiredDescription
Content-TypeStringNoThe content type. Allowed values:
+     * "application/json".

+     * You can add these to a request with {@link RequestOptions#addHeader}
      * 
Request Body Schema

      * 
      * 
{@code
@@ -1011,7 +1099,7 @@ public SyncPoller beginAnalyzeBatchDocuments(String mode
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getAnalyzeResultPdfWithResponseAsync(String modelId, String resultId,
         RequestOptions requestOptions) {
-        final String accept = "application/pdf, application/json";
+        final String accept = "application/pdf";
         return FluxUtil.withContext(context -> service.getAnalyzeResultPdf(this.getEndpoint(),
             this.getServiceVersion().getVersion(), modelId, resultId, accept, requestOptions, context));
     }
@@ -1036,7 +1124,7 @@ public Mono> getAnalyzeResultPdfWithResponseAsync(String mo
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response getAnalyzeResultPdfWithResponse(String modelId, String resultId,
         RequestOptions requestOptions) {
-        final String accept = "application/pdf, application/json";
+        final String accept = "application/pdf";
         return service.getAnalyzeResultPdfSync(this.getEndpoint(), this.getServiceVersion().getVersion(), modelId,
             resultId, accept, requestOptions, Context.NONE);
     }
@@ -1063,7 +1151,7 @@ public Response getAnalyzeResultPdfWithResponse(String modelId, Stri
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getAnalyzeResultFigureWithResponseAsync(String modelId, String resultId,
         String figureId, RequestOptions requestOptions) {
-        final String accept = "image/png, application/json";
+        final String accept = "image/png";
         return FluxUtil.withContext(context -> service.getAnalyzeResultFigure(this.getEndpoint(),
             this.getServiceVersion().getVersion(), modelId, resultId, figureId, accept, requestOptions, context));
     }
@@ -1089,7 +1177,7 @@ public Mono> getAnalyzeResultFigureWithResponseAsync(String
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response getAnalyzeResultFigureWithResponse(String modelId, String resultId, String figureId,
         RequestOptions requestOptions) {
-        final String accept = "image/png, application/json";
+        final String accept = "image/png";
         return service.getAnalyzeResultFigureSync(this.getEndpoint(), this.getServiceVersion().getVersion(), modelId,
             resultId, figureId, accept, requestOptions, Context.NONE);
     }
diff --git a/sdk/documentintelligence/azure-ai-documentintelligence/src/main/resources/META-INF/azure-ai-documentintelligence_apiview_properties.json b/sdk/documentintelligence/azure-ai-documentintelligence/src/main/resources/META-INF/azure-ai-documentintelligence_apiview_properties.json
index e56c45aa3777..c6e56a5006f6 100644
--- a/sdk/documentintelligence/azure-ai-documentintelligence/src/main/resources/META-INF/azure-ai-documentintelligence_apiview_properties.json
+++ b/sdk/documentintelligence/azure-ai-documentintelligence/src/main/resources/META-INF/azure-ai-documentintelligence_apiview_properties.json
@@ -1,7 +1,7 @@
 {
   "flavor": "azure", 
   "CrossLanguageDefinitionId": {
-    "com.azure.ai.documentintelligence.DocumentIntelligenceAdministrationAsyncClient": "DocumentIntelligence.DocumentIntelligenceAdministrationClient",
+    "com.azure.ai.documentintelligence.DocumentIntelligenceAdministrationAsyncClient": "ClientCustomizations.DocumentIntelligenceAdministrationClient",
     "com.azure.ai.documentintelligence.DocumentIntelligenceAdministrationAsyncClient.authorizeClassifierCopy": "ClientCustomizations.DocumentIntelligenceAdministrationClient.authorizeClassifierCopy",
     "com.azure.ai.documentintelligence.DocumentIntelligenceAdministrationAsyncClient.authorizeClassifierCopyWithResponse": "ClientCustomizations.DocumentIntelligenceAdministrationClient.authorizeClassifierCopy",
     "com.azure.ai.documentintelligence.DocumentIntelligenceAdministrationAsyncClient.authorizeModelCopy": "ClientCustomizations.DocumentIntelligenceAdministrationClient.authorizeModelCopy",
@@ -31,7 +31,7 @@
     "com.azure.ai.documentintelligence.DocumentIntelligenceAdministrationAsyncClient.listClassifiers": "ClientCustomizations.DocumentIntelligenceAdministrationClient.listClassifiers",
     "com.azure.ai.documentintelligence.DocumentIntelligenceAdministrationAsyncClient.listModels": "ClientCustomizations.DocumentIntelligenceAdministrationClient.listModels",
     "com.azure.ai.documentintelligence.DocumentIntelligenceAdministrationAsyncClient.listOperations": "ClientCustomizations.DocumentIntelligenceAdministrationClient.listOperations",
-    "com.azure.ai.documentintelligence.DocumentIntelligenceAdministrationClient": "DocumentIntelligence.DocumentIntelligenceAdministrationClient",
+    "com.azure.ai.documentintelligence.DocumentIntelligenceAdministrationClient": "ClientCustomizations.DocumentIntelligenceAdministrationClient",
     "com.azure.ai.documentintelligence.DocumentIntelligenceAdministrationClient.authorizeClassifierCopy": "ClientCustomizations.DocumentIntelligenceAdministrationClient.authorizeClassifierCopy",
     "com.azure.ai.documentintelligence.DocumentIntelligenceAdministrationClient.authorizeClassifierCopyWithResponse": "ClientCustomizations.DocumentIntelligenceAdministrationClient.authorizeClassifierCopy",
     "com.azure.ai.documentintelligence.DocumentIntelligenceAdministrationClient.authorizeModelCopy": "ClientCustomizations.DocumentIntelligenceAdministrationClient.authorizeModelCopy",
@@ -61,8 +61,8 @@
     "com.azure.ai.documentintelligence.DocumentIntelligenceAdministrationClient.listClassifiers": "ClientCustomizations.DocumentIntelligenceAdministrationClient.listClassifiers",
     "com.azure.ai.documentintelligence.DocumentIntelligenceAdministrationClient.listModels": "ClientCustomizations.DocumentIntelligenceAdministrationClient.listModels",
     "com.azure.ai.documentintelligence.DocumentIntelligenceAdministrationClient.listOperations": "ClientCustomizations.DocumentIntelligenceAdministrationClient.listOperations",
-    "com.azure.ai.documentintelligence.DocumentIntelligenceAdministrationClientBuilder": "DocumentIntelligence.DocumentIntelligenceAdministrationClient",
-    "com.azure.ai.documentintelligence.DocumentIntelligenceAsyncClient": "DocumentIntelligence.DocumentIntelligenceClient",
+    "com.azure.ai.documentintelligence.DocumentIntelligenceAdministrationClientBuilder": "ClientCustomizations.DocumentIntelligenceAdministrationClient",
+    "com.azure.ai.documentintelligence.DocumentIntelligenceAsyncClient": "ClientCustomizations.DocumentIntelligenceClient",
     "com.azure.ai.documentintelligence.DocumentIntelligenceAsyncClient.beginAnalyzeBatchDocuments": "ClientCustomizations.DocumentIntelligenceClient.analyzeBatchDocuments",
     "com.azure.ai.documentintelligence.DocumentIntelligenceAsyncClient.beginAnalyzeBatchDocumentsWithModel": "ClientCustomizations.DocumentIntelligenceClient.analyzeBatchDocuments",
     "com.azure.ai.documentintelligence.DocumentIntelligenceAsyncClient.beginAnalyzeDocument": "ClientCustomizations.DocumentIntelligenceClient.analyzeDocument",
@@ -73,7 +73,7 @@
     "com.azure.ai.documentintelligence.DocumentIntelligenceAsyncClient.getAnalyzeResultFigureWithResponse": "ClientCustomizations.DocumentIntelligenceClient.getAnalyzeResultFigure",
     "com.azure.ai.documentintelligence.DocumentIntelligenceAsyncClient.getAnalyzeResultPdf": "ClientCustomizations.DocumentIntelligenceClient.getAnalyzeResultPdf",
     "com.azure.ai.documentintelligence.DocumentIntelligenceAsyncClient.getAnalyzeResultPdfWithResponse": "ClientCustomizations.DocumentIntelligenceClient.getAnalyzeResultPdf",
-    "com.azure.ai.documentintelligence.DocumentIntelligenceClient": "DocumentIntelligence.DocumentIntelligenceClient",
+    "com.azure.ai.documentintelligence.DocumentIntelligenceClient": "ClientCustomizations.DocumentIntelligenceClient",
     "com.azure.ai.documentintelligence.DocumentIntelligenceClient.beginAnalyzeBatchDocuments": "ClientCustomizations.DocumentIntelligenceClient.analyzeBatchDocuments",
     "com.azure.ai.documentintelligence.DocumentIntelligenceClient.beginAnalyzeBatchDocumentsWithModel": "ClientCustomizations.DocumentIntelligenceClient.analyzeBatchDocuments",
     "com.azure.ai.documentintelligence.DocumentIntelligenceClient.beginAnalyzeDocument": "ClientCustomizations.DocumentIntelligenceClient.analyzeDocument",
@@ -84,7 +84,7 @@
     "com.azure.ai.documentintelligence.DocumentIntelligenceClient.getAnalyzeResultFigureWithResponse": "ClientCustomizations.DocumentIntelligenceClient.getAnalyzeResultFigure",
     "com.azure.ai.documentintelligence.DocumentIntelligenceClient.getAnalyzeResultPdf": "ClientCustomizations.DocumentIntelligenceClient.getAnalyzeResultPdf",
     "com.azure.ai.documentintelligence.DocumentIntelligenceClient.getAnalyzeResultPdfWithResponse": "ClientCustomizations.DocumentIntelligenceClient.getAnalyzeResultPdf",
-    "com.azure.ai.documentintelligence.DocumentIntelligenceClientBuilder": "DocumentIntelligence.DocumentIntelligenceClient",
+    "com.azure.ai.documentintelligence.DocumentIntelligenceClientBuilder": "ClientCustomizations.DocumentIntelligenceClient",
     "com.azure.ai.documentintelligence.models.AddressValue": "DocumentIntelligence.AddressValue",
     "com.azure.ai.documentintelligence.models.AnalyzeBatchDocumentsRequest": "DocumentIntelligence.AnalyzeBatchDocumentsRequest",
     "com.azure.ai.documentintelligence.models.AnalyzeBatchOperationDetail": "DocumentIntelligence.AnalyzeBatchOperationDetail",
diff --git a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/implementation/EasmClientImpl.java b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/implementation/EasmClientImpl.java
index f37991d698d7..55a2dcee6f6b 100644
--- a/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/implementation/EasmClientImpl.java
+++ b/sdk/easm/azure-analytics-defender-easm/src/main/java/com/azure/analytics/defender/easm/implementation/EasmClientImpl.java
@@ -168,7 +168,7 @@ public interface EasmClientService {
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listAssetResource(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/assets")
@@ -178,7 +178,7 @@ Mono> listAssetResource(@HostParam("endpoint") String endpo
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listAssetResourceSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Post("/assets")
@@ -189,8 +189,8 @@ Response listAssetResourceSync(@HostParam("endpoint") String endpoin
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> updateAssets(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @QueryParam("filter") String filter,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Post("/assets")
         @ExpectedResponses({ 200 })
@@ -200,8 +200,8 @@ Mono> updateAssets(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response updateAssetsSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @QueryParam("filter") String filter,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Get("/assets/{assetId}")
         @ExpectedResponses({ 200 })
@@ -211,7 +211,7 @@ Response updateAssetsSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getAssetResource(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("assetId") String assetId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/assets/{assetId}")
         @ExpectedResponses({ 200 })
@@ -221,7 +221,7 @@ Mono> getAssetResource(@HostParam("endpoint") String endpoi
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getAssetResourceSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("assetId") String assetId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/dataConnections")
         @ExpectedResponses({ 200 })
@@ -230,7 +230,7 @@ Response getAssetResourceSync(@HostParam("endpoint") String endpoint
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listDataConnection(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/dataConnections")
@@ -240,7 +240,7 @@ Mono> listDataConnection(@HostParam("endpoint") String endp
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listDataConnectionSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Post("/dataConnections:validate")
@@ -250,8 +250,9 @@ Response listDataConnectionSync(@HostParam("endpoint") String endpoi
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> validateDataConnection(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Post("/dataConnections:validate")
         @ExpectedResponses({ 200 })
@@ -260,8 +261,9 @@ Mono> validateDataConnection(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response validateDataConnectionSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Get("/dataConnections/{dataConnectionName}")
         @ExpectedResponses({ 200 })
@@ -271,7 +273,7 @@ Response validateDataConnectionSync(@HostParam("endpoint") String en
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getDataConnection(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("dataConnectionName") String dataConnectionName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/dataConnections/{dataConnectionName}")
         @ExpectedResponses({ 200 })
@@ -281,7 +283,7 @@ Mono> getDataConnection(@HostParam("endpoint") String endpo
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getDataConnectionSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("dataConnectionName") String dataConnectionName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Put("/dataConnections/{dataConnectionName}")
         @ExpectedResponses({ 200 })
@@ -291,8 +293,8 @@ Response getDataConnectionSync(@HostParam("endpoint") String endpoin
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> createOrReplaceDataConnection(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("dataConnectionName") String dataConnectionName,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Put("/dataConnections/{dataConnectionName}")
         @ExpectedResponses({ 200 })
@@ -302,8 +304,8 @@ Mono> createOrReplaceDataConnection(@HostParam("endpoint")
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response createOrReplaceDataConnectionSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("dataConnectionName") String dataConnectionName,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Delete("/dataConnections/{dataConnectionName}")
         @ExpectedResponses({ 204 })
@@ -313,7 +315,7 @@ Response createOrReplaceDataConnectionSync(@HostParam("endpoint") St
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> deleteDataConnection(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("dataConnectionName") String dataConnectionName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/dataConnections/{dataConnectionName}")
         @ExpectedResponses({ 204 })
@@ -323,7 +325,7 @@ Mono> deleteDataConnection(@HostParam("endpoint") String endpoint
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response deleteDataConnectionSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("dataConnectionName") String dataConnectionName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/discoGroups")
         @ExpectedResponses({ 200 })
@@ -332,7 +334,7 @@ Response deleteDataConnectionSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listDiscoGroup(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/discoGroups")
@@ -342,7 +344,7 @@ Mono> listDiscoGroup(@HostParam("endpoint") String endpoint
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listDiscoGroupSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Post("/discoGroups:validate")
@@ -352,8 +354,9 @@ Response listDiscoGroupSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> validateDiscoGroup(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Post("/discoGroups:validate")
         @ExpectedResponses({ 200 })
@@ -362,8 +365,9 @@ Mono> validateDiscoGroup(@HostParam("endpoint") String endp
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response validateDiscoGroupSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Get("/discoGroups/{groupName}")
         @ExpectedResponses({ 200 })
@@ -373,7 +377,7 @@ Response validateDiscoGroupSync(@HostParam("endpoint") String endpoi
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getDiscoGroup(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("groupName") String groupName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/discoGroups/{groupName}")
         @ExpectedResponses({ 200 })
@@ -383,7 +387,7 @@ Mono> getDiscoGroup(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getDiscoGroupSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("groupName") String groupName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Put("/discoGroups/{groupName}")
         @ExpectedResponses({ 200 })
@@ -393,8 +397,8 @@ Response getDiscoGroupSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> createOrReplaceDiscoGroup(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("groupName") String groupName,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Put("/discoGroups/{groupName}")
         @ExpectedResponses({ 200 })
@@ -404,8 +408,8 @@ Mono> createOrReplaceDiscoGroup(@HostParam("endpoint") Stri
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response createOrReplaceDiscoGroupSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("groupName") String groupName,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Post("/discoGroups/{groupName}:run")
         @ExpectedResponses({ 204 })
@@ -415,7 +419,7 @@ Response createOrReplaceDiscoGroupSync(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> runDiscoGroup(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("groupName") String groupName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/discoGroups/{groupName}:run")
         @ExpectedResponses({ 204 })
@@ -425,7 +429,7 @@ Mono> runDiscoGroup(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response runDiscoGroupSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("groupName") String groupName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/discoGroups/{groupName}/runs")
         @ExpectedResponses({ 200 })
@@ -435,7 +439,7 @@ Response runDiscoGroupSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listRuns(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("groupName") String groupName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/discoGroups/{groupName}/runs")
         @ExpectedResponses({ 200 })
@@ -445,7 +449,7 @@ Mono> listRuns(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listRunsSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("groupName") String groupName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/discoTemplates")
         @ExpectedResponses({ 200 })
@@ -454,7 +458,7 @@ Response listRunsSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listDiscoTemplate(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/discoTemplates")
@@ -464,7 +468,7 @@ Mono> listDiscoTemplate(@HostParam("endpoint") String endpo
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listDiscoTemplateSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/discoTemplates/{templateId}")
@@ -475,7 +479,7 @@ Response listDiscoTemplateSync(@HostParam("endpoint") String endpoin
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getDiscoTemplate(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("templateId") String templateId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/discoTemplates/{templateId}")
         @ExpectedResponses({ 200 })
@@ -485,7 +489,7 @@ Mono> getDiscoTemplate(@HostParam("endpoint") String endpoi
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getDiscoTemplateSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("templateId") String templateId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/reports/assets:getBillable")
         @ExpectedResponses({ 200 })
@@ -494,7 +498,7 @@ Response getDiscoTemplateSync(@HostParam("endpoint") String endpoint
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getBillable(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Post("/reports/assets:getBillable")
@@ -504,7 +508,7 @@ Mono> getBillable(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getBillableSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Post("/reports/assets:getSnapshot")
@@ -514,8 +518,9 @@ Response getBillableSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getSnapshot(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Post("/reports/assets:getSnapshot")
         @ExpectedResponses({ 200 })
@@ -524,8 +529,9 @@ Mono> getSnapshot(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getSnapshotSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Post("/reports/assets:getSummary")
         @ExpectedResponses({ 200 })
@@ -534,8 +540,9 @@ Response getSnapshotSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getSummary(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Post("/reports/assets:getSummary")
         @ExpectedResponses({ 200 })
@@ -544,8 +551,9 @@ Mono> getSummary(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getSummarySync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Get("/savedFilters")
         @ExpectedResponses({ 200 })
@@ -554,7 +562,7 @@ Response getSummarySync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listSavedFilter(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/savedFilters")
@@ -564,7 +572,7 @@ Mono> listSavedFilter(@HostParam("endpoint") String endpoin
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listSavedFilterSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/savedFilters/{filterName}")
@@ -575,7 +583,7 @@ Response listSavedFilterSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getSavedFilter(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("filterName") String filterName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/savedFilters/{filterName}")
         @ExpectedResponses({ 200 })
@@ -585,7 +593,7 @@ Mono> getSavedFilter(@HostParam("endpoint") String endpoint
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getSavedFilterSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("filterName") String filterName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Put("/savedFilters/{filterName}")
         @ExpectedResponses({ 200 })
@@ -595,8 +603,8 @@ Response getSavedFilterSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> createOrReplaceSavedFilter(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("filterName") String filterName,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Put("/savedFilters/{filterName}")
         @ExpectedResponses({ 200 })
@@ -606,8 +614,8 @@ Mono> createOrReplaceSavedFilter(@HostParam("endpoint") Str
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response createOrReplaceSavedFilterSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("filterName") String filterName,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Delete("/savedFilters/{filterName}")
         @ExpectedResponses({ 204 })
@@ -617,7 +625,7 @@ Response createOrReplaceSavedFilterSync(@HostParam("endpoint") Strin
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> deleteSavedFilter(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("filterName") String filterName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/savedFilters/{filterName}")
         @ExpectedResponses({ 204 })
@@ -627,7 +635,7 @@ Mono> deleteSavedFilter(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response deleteSavedFilterSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("filterName") String filterName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/tasks")
         @ExpectedResponses({ 200 })
@@ -636,7 +644,7 @@ Response deleteSavedFilterSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listTask(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/tasks")
@@ -646,7 +654,7 @@ Mono> listTask(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listTaskSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/tasks/{taskId}")
@@ -657,7 +665,7 @@ Response listTaskSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getTask(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("taskId") String taskId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/tasks/{taskId}")
         @ExpectedResponses({ 200 })
@@ -667,7 +675,7 @@ Mono> getTask(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getTaskSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("taskId") String taskId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/tasks/{taskId}:cancel")
         @ExpectedResponses({ 200 })
@@ -677,7 +685,7 @@ Response getTaskSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> cancelTask(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("taskId") String taskId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/tasks/{taskId}:cancel")
         @ExpectedResponses({ 200 })
@@ -687,7 +695,7 @@ Mono> cancelTask(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response cancelTaskSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("taskId") String taskId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -696,7 +704,7 @@ Response cancelTaskSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listAssetResourceNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -706,7 +714,7 @@ Mono> listAssetResourceNext(@PathParam(value = "nextLink",
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listAssetResourceNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -717,7 +725,7 @@ Response listAssetResourceNextSync(@PathParam(value = "nextLink", en
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listDataConnectionNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -726,7 +734,7 @@ Mono> listDataConnectionNext(
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listDataConnectionNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -736,7 +744,7 @@ Response listDataConnectionNextSync(@PathParam(value = "nextLink", e
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listDiscoGroupNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -746,7 +754,7 @@ Mono> listDiscoGroupNext(@PathParam(value = "nextLink", enc
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listDiscoGroupNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -756,7 +764,7 @@ Response listDiscoGroupNextSync(@PathParam(value = "nextLink", encod
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listRunsNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -766,7 +774,7 @@ Mono> listRunsNext(@PathParam(value = "nextLink", encoded =
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listRunsNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -776,7 +784,7 @@ Response listRunsNextSync(@PathParam(value = "nextLink", encoded = t
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listDiscoTemplateNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -786,7 +794,7 @@ Mono> listDiscoTemplateNext(@PathParam(value = "nextLink",
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listDiscoTemplateNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -796,7 +804,7 @@ Response listDiscoTemplateNextSync(@PathParam(value = "nextLink", en
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listSavedFilterNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -806,7 +814,7 @@ Mono> listSavedFilterNext(@PathParam(value = "nextLink", en
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listSavedFilterNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -816,7 +824,7 @@ Response listSavedFilterNextSync(@PathParam(value = "nextLink", enco
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listTaskNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -826,7 +834,7 @@ Mono> listTaskNext(@PathParam(value = "nextLink", encoded =
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listTaskNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
     }
 
@@ -1164,9 +1172,10 @@ public PagedIterable listAssetResource(RequestOptions requestOptions
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> updateAssetsWithResponseAsync(String filter, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.updateAssets(this.getEndpoint(),
-            this.getServiceVersion().getVersion(), filter, accept, body, requestOptions, context));
+            this.getServiceVersion().getVersion(), filter, contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -1213,9 +1222,10 @@ public Mono> updateAssetsWithResponseAsync(String filter, B
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response updateAssetsWithResponse(String filter, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.updateAssetsSync(this.getEndpoint(), this.getServiceVersion().getVersion(), filter, accept, body,
-            requestOptions, Context.NONE);
+        return service.updateAssetsSync(this.getEndpoint(), this.getServiceVersion().getVersion(), filter, contentType,
+            accept, body, requestOptions, Context.NONE);
     }
 
     /**
@@ -1582,9 +1592,10 @@ public PagedIterable listDataConnection(RequestOptions requestOption
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> validateDataConnectionWithResponseAsync(BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.validateDataConnection(this.getEndpoint(),
-            this.getServiceVersion().getVersion(), accept, body, requestOptions, context));
+            this.getServiceVersion().getVersion(), contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -1630,9 +1641,10 @@ public Mono> validateDataConnectionWithResponseAsync(Binary
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response validateDataConnectionWithResponse(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.validateDataConnectionSync(this.getEndpoint(), this.getServiceVersion().getVersion(), accept,
-            body, requestOptions, Context.NONE);
+        return service.validateDataConnectionSync(this.getEndpoint(), this.getServiceVersion().getVersion(),
+            contentType, accept, body, requestOptions, Context.NONE);
     }
 
     /**
@@ -1754,9 +1766,11 @@ public Response getDataConnectionWithResponse(String dataConnectionN
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> createOrReplaceDataConnectionWithResponseAsync(String dataConnectionName,
         BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil.withContext(context -> service.createOrReplaceDataConnection(this.getEndpoint(),
-            this.getServiceVersion().getVersion(), dataConnectionName, accept, body, requestOptions, context));
+        return FluxUtil.withContext(
+            context -> service.createOrReplaceDataConnection(this.getEndpoint(), this.getServiceVersion().getVersion(),
+                dataConnectionName, contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -1804,9 +1818,10 @@ public Mono> createOrReplaceDataConnectionWithResponseAsync
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response createOrReplaceDataConnectionWithResponse(String dataConnectionName, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return service.createOrReplaceDataConnectionSync(this.getEndpoint(), this.getServiceVersion().getVersion(),
-            dataConnectionName, accept, body, requestOptions, Context.NONE);
+            dataConnectionName, contentType, accept, body, requestOptions, Context.NONE);
     }
 
     /**
@@ -2229,9 +2244,10 @@ public PagedIterable listDiscoGroup(RequestOptions requestOptions) {
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> validateDiscoGroupWithResponseAsync(BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.validateDiscoGroup(this.getEndpoint(),
-            this.getServiceVersion().getVersion(), accept, body, requestOptions, context));
+            this.getServiceVersion().getVersion(), contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -2289,9 +2305,10 @@ public Mono> validateDiscoGroupWithResponseAsync(BinaryData
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response validateDiscoGroupWithResponse(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.validateDiscoGroupSync(this.getEndpoint(), this.getServiceVersion().getVersion(), accept, body,
-            requestOptions, Context.NONE);
+        return service.validateDiscoGroupSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType,
+            accept, body, requestOptions, Context.NONE);
     }
 
     /**
@@ -2498,9 +2515,10 @@ public Response getDiscoGroupWithResponse(String groupName, RequestO
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> createOrReplaceDiscoGroupWithResponseAsync(String groupName, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.createOrReplaceDiscoGroup(this.getEndpoint(),
-            this.getServiceVersion().getVersion(), groupName, accept, body, requestOptions, context));
+            this.getServiceVersion().getVersion(), groupName, contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -2585,9 +2603,10 @@ public Mono> createOrReplaceDiscoGroupWithResponseAsync(Str
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response createOrReplaceDiscoGroupWithResponse(String groupName, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return service.createOrReplaceDiscoGroupSync(this.getEndpoint(), this.getServiceVersion().getVersion(),
-            groupName, accept, body, requestOptions, Context.NONE);
+            groupName, contentType, accept, body, requestOptions, Context.NONE);
     }
 
     /**
@@ -3349,9 +3368,10 @@ public Response getBillableWithResponse(RequestOptions requestOption
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getSnapshotWithResponseAsync(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.getSnapshot(this.getEndpoint(),
-            this.getServiceVersion().getVersion(), accept, body, requestOptions, context));
+            this.getServiceVersion().getVersion(), contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -3422,9 +3442,10 @@ public Mono> getSnapshotWithResponseAsync(BinaryData body,
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response getSnapshotWithResponse(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.getSnapshotSync(this.getEndpoint(), this.getServiceVersion().getVersion(), accept, body,
-            requestOptions, Context.NONE);
+        return service.getSnapshotSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, accept,
+            body, requestOptions, Context.NONE);
     }
 
     /**
@@ -3482,9 +3503,10 @@ public Response getSnapshotWithResponse(BinaryData body, RequestOpti
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getSummaryWithResponseAsync(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.getSummary(this.getEndpoint(),
-            this.getServiceVersion().getVersion(), accept, body, requestOptions, context));
+            this.getServiceVersion().getVersion(), contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -3541,9 +3563,10 @@ public Mono> getSummaryWithResponseAsync(BinaryData body, R
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response getSummaryWithResponse(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.getSummarySync(this.getEndpoint(), this.getServiceVersion().getVersion(), accept, body,
-            requestOptions, Context.NONE);
+        return service.getSummarySync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, accept,
+            body, requestOptions, Context.NONE);
     }
 
     /**
@@ -3838,9 +3861,10 @@ public Response getSavedFilterWithResponse(String filterName, Reques
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> createOrReplaceSavedFilterWithResponseAsync(String filterName, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.createOrReplaceSavedFilter(this.getEndpoint(),
-            this.getServiceVersion().getVersion(), filterName, accept, body, requestOptions, context));
+            this.getServiceVersion().getVersion(), filterName, contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -3878,9 +3902,10 @@ public Mono> createOrReplaceSavedFilterWithResponseAsync(St
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response createOrReplaceSavedFilterWithResponse(String filterName, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return service.createOrReplaceSavedFilterSync(this.getEndpoint(), this.getServiceVersion().getVersion(),
-            filterName, accept, body, requestOptions, Context.NONE);
+            filterName, contentType, accept, body, requestOptions, Context.NONE);
     }
 
     /**
@@ -4281,6 +4306,8 @@ public Response cancelTaskWithResponse(String taskId, RequestOptions
     }
 
     /**
+     * Retrieve a list of assets for the provided search parameters.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -4334,6 +4361,8 @@ private Mono> listAssetResourceNextSinglePageAsync(Str
     }
 
     /**
+     * Retrieve a list of assets for the provided search parameters.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -4384,6 +4413,8 @@ private PagedResponse listAssetResourceNextSinglePage(String nextLin
     }
 
     /**
+     * Retrieve a list of data connections.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -4424,6 +4455,8 @@ private Mono> listDataConnectionNextSinglePageAsync(St
     }
 
     /**
+     * Retrieve a list of data connections.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -4462,6 +4495,8 @@ private PagedResponse listDataConnectionNextSinglePage(String nextLi
     }
 
     /**
+     * Retrieve a list of discovery group for the provided search parameters.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -4528,6 +4563,8 @@ private Mono> listDiscoGroupNextSinglePageAsync(String
     }
 
     /**
+     * Retrieve a list of discovery group for the provided search parameters.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -4591,6 +4628,8 @@ private PagedResponse listDiscoGroupNextSinglePage(String nextLink,
     }
 
     /**
+     * Retrieve a collection of discovery run results for a discovery group with a given groupName.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -4636,6 +4675,8 @@ private Mono> listRunsNextSinglePageAsync(String nextL
     }
 
     /**
+     * Retrieve a collection of discovery run results for a discovery group with a given groupName.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -4680,6 +4721,8 @@ private PagedResponse listRunsNextSinglePage(String nextLink, Reques
     }
 
     /**
+     * Retrieve a list of disco templates for the provided search parameters.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -4726,6 +4769,8 @@ private Mono> listDiscoTemplateNextSinglePageAsync(Str
     }
 
     /**
+     * Retrieve a list of disco templates for the provided search parameters.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -4769,6 +4814,8 @@ private PagedResponse listDiscoTemplateNextSinglePage(String nextLin
     }
 
     /**
+     * Retrieve a list of saved filters for the provided search parameters.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -4803,6 +4850,8 @@ private Mono> listSavedFilterNextSinglePageAsync(Strin
     }
 
     /**
+     * Retrieve a list of saved filters for the provided search parameters.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -4834,6 +4883,8 @@ private PagedResponse listSavedFilterNextSinglePage(String nextLink,
     }
 
     /**
+     * Retrieve a list of tasks for the provided search parameters.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
@@ -4871,6 +4922,8 @@ private Mono> listTaskNextSinglePageAsync(String nextL
     }
 
     /**
+     * Retrieve a list of tasks for the provided search parameters.
+     * 
      * Get the next page of items.
      * 
Response Body Schema

      * 
diff --git a/sdk/easm/azure-analytics-defender-easm/src/main/resources/META-INF/azure-analytics-defender-easm_apiview_properties.json b/sdk/easm/azure-analytics-defender-easm/src/main/resources/META-INF/azure-analytics-defender-easm_apiview_properties.json
index 9c915ec53fa1..ab00eaa8e32f 100644
--- a/sdk/easm/azure-analytics-defender-easm/src/main/resources/META-INF/azure-analytics-defender-easm_apiview_properties.json
+++ b/sdk/easm/azure-analytics-defender-easm/src/main/resources/META-INF/azure-analytics-defender-easm_apiview_properties.json
@@ -1,7 +1,7 @@
 {
   "flavor": "azure", 
   "CrossLanguageDefinitionId": {
-    "com.azure.analytics.defender.easm.EasmAsyncClient": "Easm.EasmClient",
+    "com.azure.analytics.defender.easm.EasmAsyncClient": "Customizations.EasmClient",
     "com.azure.analytics.defender.easm.EasmAsyncClient.cancelTask": "Customizations.EasmClient.cancelTask",
     "com.azure.analytics.defender.easm.EasmAsyncClient.cancelTaskWithResponse": "Customizations.EasmClient.cancelTask",
     "com.azure.analytics.defender.easm.EasmAsyncClient.createOrReplaceDataConnection": "Customizations.EasmClient.createOrReplaceDataConnection",
@@ -47,7 +47,7 @@
     "com.azure.analytics.defender.easm.EasmAsyncClient.validateDataConnectionWithResponse": "Customizations.EasmClient.validateDataConnection",
     "com.azure.analytics.defender.easm.EasmAsyncClient.validateDiscoGroup": "Customizations.EasmClient.validateDiscoGroup",
     "com.azure.analytics.defender.easm.EasmAsyncClient.validateDiscoGroupWithResponse": "Customizations.EasmClient.validateDiscoGroup",
-    "com.azure.analytics.defender.easm.EasmClient": "Easm.EasmClient",
+    "com.azure.analytics.defender.easm.EasmClient": "Customizations.EasmClient",
     "com.azure.analytics.defender.easm.EasmClient.cancelTask": "Customizations.EasmClient.cancelTask",
     "com.azure.analytics.defender.easm.EasmClient.cancelTaskWithResponse": "Customizations.EasmClient.cancelTask",
     "com.azure.analytics.defender.easm.EasmClient.createOrReplaceDataConnection": "Customizations.EasmClient.createOrReplaceDataConnection",
@@ -93,7 +93,7 @@
     "com.azure.analytics.defender.easm.EasmClient.validateDataConnectionWithResponse": "Customizations.EasmClient.validateDataConnection",
     "com.azure.analytics.defender.easm.EasmClient.validateDiscoGroup": "Customizations.EasmClient.validateDiscoGroup",
     "com.azure.analytics.defender.easm.EasmClient.validateDiscoGroupWithResponse": "Customizations.EasmClient.validateDiscoGroup",
-    "com.azure.analytics.defender.easm.EasmClientBuilder": "Easm.EasmClient",
+    "com.azure.analytics.defender.easm.EasmClientBuilder": "Customizations.EasmClient",
     "com.azure.analytics.defender.easm.models.AlexaDetails": "Easm.AlexaInfo",
     "com.azure.analytics.defender.easm.models.AsAsset": "Easm.AsAsset",
     "com.azure.analytics.defender.easm.models.AsAssetResource": "Easm.AsAssetResource",
diff --git a/sdk/eventgrid/azure-messaging-eventgrid-namespaces/src/main/java/com/azure/messaging/eventgrid/namespaces/implementation/EventGridReceiverClientImpl.java b/sdk/eventgrid/azure-messaging-eventgrid-namespaces/src/main/java/com/azure/messaging/eventgrid/namespaces/implementation/EventGridReceiverClientImpl.java
index cc885d562307..067b2fda5339 100644
--- a/sdk/eventgrid/azure-messaging-eventgrid-namespaces/src/main/java/com/azure/messaging/eventgrid/namespaces/implementation/EventGridReceiverClientImpl.java
+++ b/sdk/eventgrid/azure-messaging-eventgrid-namespaces/src/main/java/com/azure/messaging/eventgrid/namespaces/implementation/EventGridReceiverClientImpl.java
@@ -156,7 +156,7 @@ public interface EventGridReceiverClientService {
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> receive(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("topicName") String topicName,
-            @PathParam("eventSubscriptionName") String eventSubscriptionName, @HeaderParam("accept") String accept,
+            @PathParam("eventSubscriptionName") String eventSubscriptionName, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Post("/topics/{topicName}/eventsubscriptions/{eventSubscriptionName}:receive")
@@ -167,7 +167,7 @@ Mono> receive(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response receiveSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("topicName") String topicName,
-            @PathParam("eventSubscriptionName") String eventSubscriptionName, @HeaderParam("accept") String accept,
+            @PathParam("eventSubscriptionName") String eventSubscriptionName, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Post("/topics/{topicName}/eventsubscriptions/{eventSubscriptionName}:acknowledge")
@@ -178,7 +178,8 @@ Response receiveSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> acknowledge(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("topicName") String topicName,
-            @PathParam("eventSubscriptionName") String eventSubscriptionName, @HeaderParam("accept") String accept,
+            @PathParam("eventSubscriptionName") String eventSubscriptionName,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") BinaryData acknowledgeRequest, RequestOptions requestOptions,
             Context context);
 
@@ -190,7 +191,8 @@ Mono> acknowledge(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response acknowledgeSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("topicName") String topicName,
-            @PathParam("eventSubscriptionName") String eventSubscriptionName, @HeaderParam("accept") String accept,
+            @PathParam("eventSubscriptionName") String eventSubscriptionName,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") BinaryData acknowledgeRequest, RequestOptions requestOptions,
             Context context);
 
@@ -202,7 +204,8 @@ Response acknowledgeSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> release(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("topicName") String topicName,
-            @PathParam("eventSubscriptionName") String eventSubscriptionName, @HeaderParam("accept") String accept,
+            @PathParam("eventSubscriptionName") String eventSubscriptionName,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") BinaryData releaseRequest, RequestOptions requestOptions, Context context);
 
         @Post("/topics/{topicName}/eventsubscriptions/{eventSubscriptionName}:release")
@@ -213,7 +216,8 @@ Mono> release(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response releaseSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("topicName") String topicName,
-            @PathParam("eventSubscriptionName") String eventSubscriptionName, @HeaderParam("accept") String accept,
+            @PathParam("eventSubscriptionName") String eventSubscriptionName,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") BinaryData releaseRequest, RequestOptions requestOptions, Context context);
 
         @Post("/topics/{topicName}/eventsubscriptions/{eventSubscriptionName}:reject")
@@ -224,7 +228,8 @@ Response releaseSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> reject(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("topicName") String topicName,
-            @PathParam("eventSubscriptionName") String eventSubscriptionName, @HeaderParam("accept") String accept,
+            @PathParam("eventSubscriptionName") String eventSubscriptionName,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") BinaryData rejectRequest, RequestOptions requestOptions, Context context);
 
         @Post("/topics/{topicName}/eventsubscriptions/{eventSubscriptionName}:reject")
@@ -235,7 +240,8 @@ Mono> reject(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response rejectSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("topicName") String topicName,
-            @PathParam("eventSubscriptionName") String eventSubscriptionName, @HeaderParam("accept") String accept,
+            @PathParam("eventSubscriptionName") String eventSubscriptionName,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") BinaryData rejectRequest, RequestOptions requestOptions, Context context);
 
         @Post("/topics/{topicName}/eventsubscriptions/{eventSubscriptionName}:renewLock")
@@ -246,7 +252,8 @@ Response rejectSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> renewLocks(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("topicName") String topicName,
-            @PathParam("eventSubscriptionName") String eventSubscriptionName, @HeaderParam("accept") String accept,
+            @PathParam("eventSubscriptionName") String eventSubscriptionName,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") BinaryData renewLocksRequest, RequestOptions requestOptions,
             Context context);
 
@@ -258,7 +265,8 @@ Mono> renewLocks(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response renewLocksSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("topicName") String topicName,
-            @PathParam("eventSubscriptionName") String eventSubscriptionName, @HeaderParam("accept") String accept,
+            @PathParam("eventSubscriptionName") String eventSubscriptionName,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") BinaryData renewLocksRequest, RequestOptions requestOptions,
             Context context);
     }
@@ -435,10 +443,11 @@ public Response receiveWithResponse(String topicName, String eventSu
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> acknowledgeWithResponseAsync(String topicName, String eventSubscriptionName,
         BinaryData acknowledgeRequest, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.acknowledge(this.getEndpoint(), this.getServiceVersion().getVersion(),
-                topicName, eventSubscriptionName, accept, acknowledgeRequest, requestOptions, context));
+                topicName, eventSubscriptionName, contentType, accept, acknowledgeRequest, requestOptions, context));
     }
 
     /**
@@ -495,9 +504,10 @@ public Mono> acknowledgeWithResponseAsync(String topicName,
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response acknowledgeWithResponse(String topicName, String eventSubscriptionName,
         BinaryData acknowledgeRequest, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return service.acknowledgeSync(this.getEndpoint(), this.getServiceVersion().getVersion(), topicName,
-            eventSubscriptionName, accept, acknowledgeRequest, requestOptions, Context.NONE);
+            eventSubscriptionName, contentType, accept, acknowledgeRequest, requestOptions, Context.NONE);
     }
 
     /**
@@ -562,10 +572,11 @@ public Response acknowledgeWithResponse(String topicName, String eve
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> releaseWithResponseAsync(String topicName, String eventSubscriptionName,
         BinaryData releaseRequest, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.release(this.getEndpoint(), this.getServiceVersion().getVersion(),
-                topicName, eventSubscriptionName, accept, releaseRequest, requestOptions, context));
+                topicName, eventSubscriptionName, contentType, accept, releaseRequest, requestOptions, context));
     }
 
     /**
@@ -630,9 +641,10 @@ public Mono> releaseWithResponseAsync(String topicName, Str
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response releaseWithResponse(String topicName, String eventSubscriptionName,
         BinaryData releaseRequest, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return service.releaseSync(this.getEndpoint(), this.getServiceVersion().getVersion(), topicName,
-            eventSubscriptionName, accept, releaseRequest, requestOptions, Context.NONE);
+            eventSubscriptionName, contentType, accept, releaseRequest, requestOptions, Context.NONE);
     }
 
     /**
@@ -689,9 +701,10 @@ public Response releaseWithResponse(String topicName, String eventSu
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> rejectWithResponseAsync(String topicName, String eventSubscriptionName,
         BinaryData rejectRequest, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.reject(this.getEndpoint(), this.getServiceVersion().getVersion(),
-            topicName, eventSubscriptionName, accept, rejectRequest, requestOptions, context));
+            topicName, eventSubscriptionName, contentType, accept, rejectRequest, requestOptions, context));
     }
 
     /**
@@ -748,9 +761,10 @@ public Mono> rejectWithResponseAsync(String topicName, Stri
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response rejectWithResponse(String topicName, String eventSubscriptionName,
         BinaryData rejectRequest, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return service.rejectSync(this.getEndpoint(), this.getServiceVersion().getVersion(), topicName,
-            eventSubscriptionName, accept, rejectRequest, requestOptions, Context.NONE);
+            eventSubscriptionName, contentType, accept, rejectRequest, requestOptions, Context.NONE);
     }
 
     /**
@@ -808,10 +822,11 @@ public Response rejectWithResponse(String topicName, String eventSub
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> renewLocksWithResponseAsync(String topicName, String eventSubscriptionName,
         BinaryData renewLocksRequest, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.renewLocks(this.getEndpoint(), this.getServiceVersion().getVersion(),
-                topicName, eventSubscriptionName, accept, renewLocksRequest, requestOptions, context));
+                topicName, eventSubscriptionName, contentType, accept, renewLocksRequest, requestOptions, context));
     }
 
     /**
@@ -868,8 +883,9 @@ public Mono> renewLocksWithResponseAsync(String topicName,
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response renewLocksWithResponse(String topicName, String eventSubscriptionName,
         BinaryData renewLocksRequest, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return service.renewLocksSync(this.getEndpoint(), this.getServiceVersion().getVersion(), topicName,
-            eventSubscriptionName, accept, renewLocksRequest, requestOptions, Context.NONE);
+            eventSubscriptionName, contentType, accept, renewLocksRequest, requestOptions, Context.NONE);
     }
 }
diff --git a/sdk/eventgrid/azure-messaging-eventgrid-namespaces/src/main/java/com/azure/messaging/eventgrid/namespaces/implementation/EventGridSenderClientImpl.java b/sdk/eventgrid/azure-messaging-eventgrid-namespaces/src/main/java/com/azure/messaging/eventgrid/namespaces/implementation/EventGridSenderClientImpl.java
index 5b7bd7e58780..d0d1015d742d 100644
--- a/sdk/eventgrid/azure-messaging-eventgrid-namespaces/src/main/java/com/azure/messaging/eventgrid/namespaces/implementation/EventGridSenderClientImpl.java
+++ b/sdk/eventgrid/azure-messaging-eventgrid-namespaces/src/main/java/com/azure/messaging/eventgrid/namespaces/implementation/EventGridSenderClientImpl.java
@@ -156,7 +156,7 @@ public interface EventGridSenderClientService {
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> send(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("topicName") String topicName,
-            @HeaderParam("content-type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/cloudevents+json; charset=utf-8") BinaryData event, RequestOptions requestOptions,
             Context context);
 
@@ -168,7 +168,7 @@ Mono> send(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response sendSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("topicName") String topicName,
-            @HeaderParam("content-type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/cloudevents+json; charset=utf-8") BinaryData event, RequestOptions requestOptions,
             Context context);
 
@@ -180,7 +180,7 @@ Response sendSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> sendEvents(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("topicName") String topicName,
-            @HeaderParam("content-type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/cloudevents-batch+json; charset=utf-8") BinaryData events,
             RequestOptions requestOptions, Context context);
 
@@ -192,7 +192,7 @@ Mono> sendEvents(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response sendEventsSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("topicName") String topicName,
-            @HeaderParam("content-type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/cloudevents-batch+json; charset=utf-8") BinaryData events,
             RequestOptions requestOptions, Context context);
     }
diff --git a/sdk/eventgrid/azure-messaging-eventgrid-namespaces/src/main/resources/META-INF/azure-messaging-eventgrid-namespaces_apiview_properties.json b/sdk/eventgrid/azure-messaging-eventgrid-namespaces/src/main/resources/META-INF/azure-messaging-eventgrid-namespaces_apiview_properties.json
index 897960f94707..e028d898eccb 100644
--- a/sdk/eventgrid/azure-messaging-eventgrid-namespaces/src/main/resources/META-INF/azure-messaging-eventgrid-namespaces_apiview_properties.json
+++ b/sdk/eventgrid/azure-messaging-eventgrid-namespaces/src/main/resources/META-INF/azure-messaging-eventgrid-namespaces_apiview_properties.json
@@ -1,7 +1,7 @@
 {
   "flavor": "azure", 
   "CrossLanguageDefinitionId": {
-    "com.azure.messaging.eventgrid.namespaces.EventGridReceiverAsyncClient": "Microsoft.EventGrid.EventGridReceiverClient",
+    "com.azure.messaging.eventgrid.namespaces.EventGridReceiverAsyncClient": "Customizations.ClientReceiver2",
     "com.azure.messaging.eventgrid.namespaces.EventGridReceiverAsyncClient.acknowledge": "Customizations.ClientReceiver2.acknowledge",
     "com.azure.messaging.eventgrid.namespaces.EventGridReceiverAsyncClient.acknowledgeWithResponse": "Customizations.ClientReceiver2.acknowledge",
     "com.azure.messaging.eventgrid.namespaces.EventGridReceiverAsyncClient.receive": "Customizations.ClientReceiver2.receive",
@@ -12,7 +12,7 @@
     "com.azure.messaging.eventgrid.namespaces.EventGridReceiverAsyncClient.releaseWithResponse": "Customizations.ClientReceiver2.release",
     "com.azure.messaging.eventgrid.namespaces.EventGridReceiverAsyncClient.renewLocks": "Customizations.ClientReceiver2.renewLocks",
     "com.azure.messaging.eventgrid.namespaces.EventGridReceiverAsyncClient.renewLocksWithResponse": "Customizations.ClientReceiver2.renewLocks",
-    "com.azure.messaging.eventgrid.namespaces.EventGridReceiverClient": "Microsoft.EventGrid.EventGridReceiverClient",
+    "com.azure.messaging.eventgrid.namespaces.EventGridReceiverClient": "Customizations.ClientReceiver2",
     "com.azure.messaging.eventgrid.namespaces.EventGridReceiverClient.acknowledge": "Customizations.ClientReceiver2.acknowledge",
     "com.azure.messaging.eventgrid.namespaces.EventGridReceiverClient.acknowledgeWithResponse": "Customizations.ClientReceiver2.acknowledge",
     "com.azure.messaging.eventgrid.namespaces.EventGridReceiverClient.receive": "Customizations.ClientReceiver2.receive",
@@ -23,18 +23,18 @@
     "com.azure.messaging.eventgrid.namespaces.EventGridReceiverClient.releaseWithResponse": "Customizations.ClientReceiver2.release",
     "com.azure.messaging.eventgrid.namespaces.EventGridReceiverClient.renewLocks": "Customizations.ClientReceiver2.renewLocks",
     "com.azure.messaging.eventgrid.namespaces.EventGridReceiverClient.renewLocksWithResponse": "Customizations.ClientReceiver2.renewLocks",
-    "com.azure.messaging.eventgrid.namespaces.EventGridReceiverClientBuilder": "Microsoft.EventGrid.EventGridReceiverClient",
-    "com.azure.messaging.eventgrid.namespaces.EventGridSenderAsyncClient": "Microsoft.EventGrid.EventGridSenderClient",
+    "com.azure.messaging.eventgrid.namespaces.EventGridReceiverClientBuilder": "Customizations.ClientReceiver2",
+    "com.azure.messaging.eventgrid.namespaces.EventGridSenderAsyncClient": "Customizations.ClientSender2",
     "com.azure.messaging.eventgrid.namespaces.EventGridSenderAsyncClient.send": "Customizations.ClientSender2.send",
     "com.azure.messaging.eventgrid.namespaces.EventGridSenderAsyncClient.sendEvents": "Customizations.ClientSender2.sendEvents",
     "com.azure.messaging.eventgrid.namespaces.EventGridSenderAsyncClient.sendEventsWithResponse": "Customizations.ClientSender2.sendEvents",
     "com.azure.messaging.eventgrid.namespaces.EventGridSenderAsyncClient.sendWithResponse": "Customizations.ClientSender2.send",
-    "com.azure.messaging.eventgrid.namespaces.EventGridSenderClient": "Microsoft.EventGrid.EventGridSenderClient",
+    "com.azure.messaging.eventgrid.namespaces.EventGridSenderClient": "Customizations.ClientSender2",
     "com.azure.messaging.eventgrid.namespaces.EventGridSenderClient.send": "Customizations.ClientSender2.send",
     "com.azure.messaging.eventgrid.namespaces.EventGridSenderClient.sendEvents": "Customizations.ClientSender2.sendEvents",
     "com.azure.messaging.eventgrid.namespaces.EventGridSenderClient.sendEventsWithResponse": "Customizations.ClientSender2.sendEvents",
     "com.azure.messaging.eventgrid.namespaces.EventGridSenderClient.sendWithResponse": "Customizations.ClientSender2.send",
-    "com.azure.messaging.eventgrid.namespaces.EventGridSenderClientBuilder": "Microsoft.EventGrid.EventGridSenderClient",
+    "com.azure.messaging.eventgrid.namespaces.EventGridSenderClientBuilder": "Customizations.ClientSender2",
     "com.azure.messaging.eventgrid.namespaces.implementation.models.AcknowledgeRequest": "acknowledge.Request.anonymous",
     "com.azure.messaging.eventgrid.namespaces.implementation.models.PublishResult": "Microsoft.EventGrid.PublishResult",
     "com.azure.messaging.eventgrid.namespaces.implementation.models.RejectRequest": "reject.Request.anonymous",
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceAsyncClient.java b/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceAsyncClient.java
index 3e45ee6e7784..4d9e3f656f61 100644
--- a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceAsyncClient.java
+++ b/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceAsyncClient.java
@@ -779,8 +779,6 @@ Mono> detectImplWithResponse(BinaryData imageContent, Reque
     Mono> detectFromUrlImpl(DetectFromUrlImplOptions options) {
         // Generated convenience method for detectFromUrlImplWithResponse
         RequestOptions requestOptions = new RequestOptions();
-        DetectFromUrlImplRequest detectFromUrlRequestObj = new DetectFromUrlImplRequest(options.getUrl());
-        BinaryData detectFromUrlRequest = BinaryData.fromObject(detectFromUrlRequestObj);
         FaceDetectionModel detectionModel = options.getDetectionModel();
         FaceRecognitionModel recognitionModel = options.getRecognitionModel();
         Boolean returnFaceId = options.isReturnFaceId();
@@ -788,6 +786,8 @@ Mono> detectFromUrlImpl(DetectFromUrlImplOptions optio
         Boolean returnFaceLandmarks = options.isReturnFaceLandmarks();
         Boolean returnRecognitionModel = options.isReturnRecognitionModel();
         Integer faceIdTimeToLive = options.getFaceIdTimeToLive();
+        DetectFromUrlImplRequest detectFromUrlRequestObj = new DetectFromUrlImplRequest(options.getUrl());
+        BinaryData detectFromUrlRequest = BinaryData.fromObject(detectFromUrlRequestObj);
         if (detectionModel != null) {
             requestOptions.addQueryParam("detectionModel", detectionModel.toString(), false);
         }
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceClient.java b/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceClient.java
index edca171d9beb..b479cccfc2bc 100644
--- a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceClient.java
+++ b/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/FaceClient.java
@@ -773,8 +773,6 @@ Response detectImplWithResponse(BinaryData imageContent, RequestOpti
     List detectFromUrlImpl(DetectFromUrlImplOptions options) {
         // Generated convenience method for detectFromUrlImplWithResponse
         RequestOptions requestOptions = new RequestOptions();
-        DetectFromUrlImplRequest detectFromUrlRequestObj = new DetectFromUrlImplRequest(options.getUrl());
-        BinaryData detectFromUrlRequest = BinaryData.fromObject(detectFromUrlRequestObj);
         FaceDetectionModel detectionModel = options.getDetectionModel();
         FaceRecognitionModel recognitionModel = options.getRecognitionModel();
         Boolean returnFaceId = options.isReturnFaceId();
@@ -782,6 +780,8 @@ List detectFromUrlImpl(DetectFromUrlImplOptions options) {
         Boolean returnFaceLandmarks = options.isReturnFaceLandmarks();
         Boolean returnRecognitionModel = options.isReturnRecognitionModel();
         Integer faceIdTimeToLive = options.getFaceIdTimeToLive();
+        DetectFromUrlImplRequest detectFromUrlRequestObj = new DetectFromUrlImplRequest(options.getUrl());
+        BinaryData detectFromUrlRequest = BinaryData.fromObject(detectFromUrlRequestObj);
         if (detectionModel != null) {
             requestOptions.addQueryParam("detectionModel", detectionModel.toString(), false);
         }
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/FaceClientImpl.java b/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/FaceClientImpl.java
index cb3b25c91072..59f5eaf17af4 100644
--- a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/FaceClientImpl.java
+++ b/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/FaceClientImpl.java
@@ -156,7 +156,7 @@ public interface FaceClientService {
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> detectFromUrlImpl(@HostParam("endpoint") String endpoint,
             @HostParam("apiVersion") String apiVersion, @HeaderParam("content-type") String contentType,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData detectFromUrlRequest,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData detectFromUrlRequest,
             RequestOptions requestOptions, Context context);
 
         @Post("/detect")
@@ -167,7 +167,7 @@ Mono> detectFromUrlImpl(@HostParam("endpoint") String endpo
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response detectFromUrlImplSync(@HostParam("endpoint") String endpoint,
             @HostParam("apiVersion") String apiVersion, @HeaderParam("content-type") String contentType,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData detectFromUrlRequest,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData detectFromUrlRequest,
             RequestOptions requestOptions, Context context);
 
         @Post("/detect")
@@ -178,7 +178,7 @@ Response detectFromUrlImplSync(@HostParam("endpoint") String endpoin
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> detectImpl(@HostParam("endpoint") String endpoint,
             @HostParam("apiVersion") String apiVersion, @HeaderParam("content-type") String contentType,
-            @HeaderParam("accept") String accept, @BodyParam("application/octet-stream") BinaryData imageContent,
+            @HeaderParam("Accept") String accept, @BodyParam("application/octet-stream") BinaryData imageContent,
             RequestOptions requestOptions, Context context);
 
         @Post("/detect")
@@ -189,7 +189,7 @@ Mono> detectImpl(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response detectImplSync(@HostParam("endpoint") String endpoint,
             @HostParam("apiVersion") String apiVersion, @HeaderParam("content-type") String contentType,
-            @HeaderParam("accept") String accept, @BodyParam("application/octet-stream") BinaryData imageContent,
+            @HeaderParam("Accept") String accept, @BodyParam("application/octet-stream") BinaryData imageContent,
             RequestOptions requestOptions, Context context);
 
         @Post("/findsimilars")
@@ -199,9 +199,9 @@ Response detectImplSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> findSimilar(@HostParam("endpoint") String endpoint,
-            @HostParam("apiVersion") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData findSimilarRequest, RequestOptions requestOptions,
-            Context context);
+            @HostParam("apiVersion") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData findSimilarRequest,
+            RequestOptions requestOptions, Context context);
 
         @Post("/findsimilars")
         @ExpectedResponses({ 200 })
@@ -210,9 +210,9 @@ Mono> findSimilar(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response findSimilarSync(@HostParam("endpoint") String endpoint,
-            @HostParam("apiVersion") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData findSimilarRequest, RequestOptions requestOptions,
-            Context context);
+            @HostParam("apiVersion") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData findSimilarRequest,
+            RequestOptions requestOptions, Context context);
 
         @Post("/verify")
         @ExpectedResponses({ 200 })
@@ -221,9 +221,9 @@ Response findSimilarSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> verifyFaceToFace(@HostParam("endpoint") String endpoint,
-            @HostParam("apiVersion") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData verifyFaceToFaceRequest, RequestOptions requestOptions,
-            Context context);
+            @HostParam("apiVersion") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData verifyFaceToFaceRequest,
+            RequestOptions requestOptions, Context context);
 
         @Post("/verify")
         @ExpectedResponses({ 200 })
@@ -232,9 +232,9 @@ Mono> verifyFaceToFace(@HostParam("endpoint") String endpoi
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response verifyFaceToFaceSync(@HostParam("endpoint") String endpoint,
-            @HostParam("apiVersion") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData verifyFaceToFaceRequest, RequestOptions requestOptions,
-            Context context);
+            @HostParam("apiVersion") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData verifyFaceToFaceRequest,
+            RequestOptions requestOptions, Context context);
 
         @Post("/group")
         @ExpectedResponses({ 200 })
@@ -243,8 +243,9 @@ Response verifyFaceToFaceSync(@HostParam("endpoint") String endpoint
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> group(@HostParam("endpoint") String endpoint,
-            @HostParam("apiVersion") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData groupRequest, RequestOptions requestOptions, Context context);
+            @HostParam("apiVersion") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData groupRequest,
+            RequestOptions requestOptions, Context context);
 
         @Post("/group")
         @ExpectedResponses({ 200 })
@@ -253,8 +254,9 @@ Mono> group(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response groupSync(@HostParam("endpoint") String endpoint,
-            @HostParam("apiVersion") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData groupRequest, RequestOptions requestOptions, Context context);
+            @HostParam("apiVersion") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData groupRequest,
+            RequestOptions requestOptions, Context context);
     }
 
     /**
@@ -1054,9 +1056,10 @@ public Response detectImplWithResponse(BinaryData imageContent, Requ
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> findSimilarWithResponseAsync(BinaryData findSimilarRequest,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.findSimilar(this.getEndpoint(),
-            this.getServiceVersion().getVersion(), accept, findSimilarRequest, requestOptions, context));
+            this.getServiceVersion().getVersion(), contentType, accept, findSimilarRequest, requestOptions, context));
     }
 
     /**
@@ -1108,8 +1111,9 @@ public Mono> findSimilarWithResponseAsync(BinaryData findSi
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response findSimilarWithResponse(BinaryData findSimilarRequest, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.findSimilarSync(this.getEndpoint(), this.getServiceVersion().getVersion(), accept,
+        return service.findSimilarSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, accept,
             findSimilarRequest, requestOptions, Context.NONE);
     }
 
@@ -1152,9 +1156,11 @@ public Response findSimilarWithResponse(BinaryData findSimilarReques
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> verifyFaceToFaceWithResponseAsync(BinaryData verifyFaceToFaceRequest,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil.withContext(context -> service.verifyFaceToFace(this.getEndpoint(),
-            this.getServiceVersion().getVersion(), accept, verifyFaceToFaceRequest, requestOptions, context));
+        return FluxUtil
+            .withContext(context -> service.verifyFaceToFace(this.getEndpoint(), this.getServiceVersion().getVersion(),
+                contentType, accept, verifyFaceToFaceRequest, requestOptions, context));
     }
 
     /**
@@ -1196,9 +1202,10 @@ public Mono> verifyFaceToFaceWithResponseAsync(BinaryData v
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response verifyFaceToFaceWithResponse(BinaryData verifyFaceToFaceRequest,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.verifyFaceToFaceSync(this.getEndpoint(), this.getServiceVersion().getVersion(), accept,
-            verifyFaceToFaceRequest, requestOptions, Context.NONE);
+        return service.verifyFaceToFaceSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType,
+            accept, verifyFaceToFaceRequest, requestOptions, Context.NONE);
     }
 
     /**
@@ -1250,9 +1257,10 @@ public Response verifyFaceToFaceWithResponse(BinaryData verifyFaceTo
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> groupWithResponseAsync(BinaryData groupRequest, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.group(this.getEndpoint(), this.getServiceVersion().getVersion(),
-            accept, groupRequest, requestOptions, context));
+            contentType, accept, groupRequest, requestOptions, context));
     }
 
     /**
@@ -1303,8 +1311,9 @@ public Mono> groupWithResponseAsync(BinaryData groupRequest
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response groupWithResponse(BinaryData groupRequest, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.groupSync(this.getEndpoint(), this.getServiceVersion().getVersion(), accept, groupRequest,
-            requestOptions, Context.NONE);
+        return service.groupSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, accept,
+            groupRequest, requestOptions, Context.NONE);
     }
 }
diff --git a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/FaceSessionClientImpl.java b/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/FaceSessionClientImpl.java
index 7267f1ec448c..39a6f806dd24 100644
--- a/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/FaceSessionClientImpl.java
+++ b/sdk/face/azure-ai-vision-face/src/main/java/com/azure/ai/vision/face/implementation/FaceSessionClientImpl.java
@@ -159,8 +159,9 @@ public interface FaceSessionClientService {
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> createLivenessSession(@HostParam("endpoint") String endpoint,
-            @HostParam("apiVersion") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @HostParam("apiVersion") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Post("/detectLiveness/singleModal/sessions")
         @ExpectedResponses({ 200 })
@@ -169,8 +170,9 @@ Mono> createLivenessSession(@HostParam("endpoint") String e
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response createLivenessSessionSync(@HostParam("endpoint") String endpoint,
-            @HostParam("apiVersion") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @HostParam("apiVersion") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Delete("/detectLiveness/singleModal/sessions/{sessionId}")
         @ExpectedResponses({ 200 })
@@ -180,7 +182,7 @@ Response createLivenessSessionSync(@HostParam("endpoint") String end
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> deleteLivenessSession(@HostParam("endpoint") String endpoint,
             @HostParam("apiVersion") String apiVersion, @PathParam("sessionId") String sessionId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/detectLiveness/singleModal/sessions/{sessionId}")
         @ExpectedResponses({ 200 })
@@ -190,7 +192,7 @@ Mono> deleteLivenessSession(@HostParam("endpoint") String endpoin
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response deleteLivenessSessionSync(@HostParam("endpoint") String endpoint,
             @HostParam("apiVersion") String apiVersion, @PathParam("sessionId") String sessionId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/detectLiveness/singleModal/sessions/{sessionId}")
         @ExpectedResponses({ 200 })
@@ -200,7 +202,7 @@ Response deleteLivenessSessionSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getLivenessSessionResult(@HostParam("endpoint") String endpoint,
             @HostParam("apiVersion") String apiVersion, @PathParam("sessionId") String sessionId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/detectLiveness/singleModal/sessions/{sessionId}")
         @ExpectedResponses({ 200 })
@@ -210,7 +212,7 @@ Mono> getLivenessSessionResult(@HostParam("endpoint") Strin
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getLivenessSessionResultSync(@HostParam("endpoint") String endpoint,
             @HostParam("apiVersion") String apiVersion, @PathParam("sessionId") String sessionId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/detectLiveness/singleModal/sessions")
         @ExpectedResponses({ 200 })
@@ -219,7 +221,7 @@ Response getLivenessSessionResultSync(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getLivenessSessions(@HostParam("endpoint") String endpoint,
-            @HostParam("apiVersion") String apiVersion, @HeaderParam("accept") String accept,
+            @HostParam("apiVersion") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/detectLiveness/singleModal/sessions")
@@ -229,7 +231,7 @@ Mono> getLivenessSessions(@HostParam("endpoint") String end
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getLivenessSessionsSync(@HostParam("endpoint") String endpoint,
-            @HostParam("apiVersion") String apiVersion, @HeaderParam("accept") String accept,
+            @HostParam("apiVersion") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/detectLiveness/singleModal/sessions/{sessionId}/audit")
@@ -240,7 +242,7 @@ Response getLivenessSessionsSync(@HostParam("endpoint") String endpo
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getLivenessSessionAuditEntries(@HostParam("endpoint") String endpoint,
             @HostParam("apiVersion") String apiVersion, @PathParam("sessionId") String sessionId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/detectLiveness/singleModal/sessions/{sessionId}/audit")
         @ExpectedResponses({ 200 })
@@ -250,7 +252,7 @@ Mono> getLivenessSessionAuditEntries(@HostParam("endpoint")
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getLivenessSessionAuditEntriesSync(@HostParam("endpoint") String endpoint,
             @HostParam("apiVersion") String apiVersion, @PathParam("sessionId") String sessionId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/detectLivenessWithVerify/singleModal/sessions")
         @ExpectedResponses({ 200 })
@@ -259,8 +261,9 @@ Response getLivenessSessionAuditEntriesSync(@HostParam("endpoint") S
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> createLivenessWithVerifySession(@HostParam("endpoint") String endpoint,
-            @HostParam("apiVersion") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @HostParam("apiVersion") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Post("/detectLivenessWithVerify/singleModal/sessions")
         @ExpectedResponses({ 200 })
@@ -269,8 +272,9 @@ Mono> createLivenessWithVerifySession(@HostParam("endpoint"
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response createLivenessWithVerifySessionSync(@HostParam("endpoint") String endpoint,
-            @HostParam("apiVersion") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @HostParam("apiVersion") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         // @Multipart not supported by RestProxy
         @Post("/detectLivenessWithVerify/singleModal/sessions")
@@ -281,7 +285,7 @@ Response createLivenessWithVerifySessionSync(@HostParam("endpoint")
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> createLivenessWithVerifySessionWithVerifyImage(
             @HostParam("endpoint") String endpoint, @HostParam("apiVersion") String apiVersion,
-            @HeaderParam("content-type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("multipart/form-data") BinaryData body, RequestOptions requestOptions, Context context);
 
         // @Multipart not supported by RestProxy
@@ -293,7 +297,7 @@ Mono> createLivenessWithVerifySessionWithVerifyImage(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response createLivenessWithVerifySessionWithVerifyImageSync(@HostParam("endpoint") String endpoint,
             @HostParam("apiVersion") String apiVersion, @HeaderParam("content-type") String contentType,
-            @HeaderParam("accept") String accept, @BodyParam("multipart/form-data") BinaryData body,
+            @HeaderParam("Accept") String accept, @BodyParam("multipart/form-data") BinaryData body,
             RequestOptions requestOptions, Context context);
 
         @Delete("/detectLivenessWithVerify/singleModal/sessions/{sessionId}")
@@ -304,7 +308,7 @@ Response createLivenessWithVerifySessionWithVerifyImageSync(@HostPar
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> deleteLivenessWithVerifySession(@HostParam("endpoint") String endpoint,
             @HostParam("apiVersion") String apiVersion, @PathParam("sessionId") String sessionId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/detectLivenessWithVerify/singleModal/sessions/{sessionId}")
         @ExpectedResponses({ 200 })
@@ -314,7 +318,7 @@ Mono> deleteLivenessWithVerifySession(@HostParam("endpoint") Stri
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response deleteLivenessWithVerifySessionSync(@HostParam("endpoint") String endpoint,
             @HostParam("apiVersion") String apiVersion, @PathParam("sessionId") String sessionId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/detectLivenessWithVerify/singleModal/sessions/{sessionId}")
         @ExpectedResponses({ 200 })
@@ -324,7 +328,7 @@ Response deleteLivenessWithVerifySessionSync(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getLivenessWithVerifySessionResult(@HostParam("endpoint") String endpoint,
             @HostParam("apiVersion") String apiVersion, @PathParam("sessionId") String sessionId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/detectLivenessWithVerify/singleModal/sessions/{sessionId}")
         @ExpectedResponses({ 200 })
@@ -334,7 +338,7 @@ Mono> getLivenessWithVerifySessionResult(@HostParam("endpoi
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getLivenessWithVerifySessionResultSync(@HostParam("endpoint") String endpoint,
             @HostParam("apiVersion") String apiVersion, @PathParam("sessionId") String sessionId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/detectLivenessWithVerify/singleModal/sessions")
         @ExpectedResponses({ 200 })
@@ -343,7 +347,7 @@ Response getLivenessWithVerifySessionResultSync(@HostParam("endpoint
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getLivenessWithVerifySessions(@HostParam("endpoint") String endpoint,
-            @HostParam("apiVersion") String apiVersion, @HeaderParam("accept") String accept,
+            @HostParam("apiVersion") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/detectLivenessWithVerify/singleModal/sessions")
@@ -353,7 +357,7 @@ Mono> getLivenessWithVerifySessions(@HostParam("endpoint")
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getLivenessWithVerifySessionsSync(@HostParam("endpoint") String endpoint,
-            @HostParam("apiVersion") String apiVersion, @HeaderParam("accept") String accept,
+            @HostParam("apiVersion") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/detectLivenessWithVerify/singleModal/sessions/{sessionId}/audit")
@@ -364,7 +368,7 @@ Response getLivenessWithVerifySessionsSync(@HostParam("endpoint") St
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getLivenessWithVerifySessionAuditEntries(@HostParam("endpoint") String endpoint,
             @HostParam("apiVersion") String apiVersion, @PathParam("sessionId") String sessionId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/detectLivenessWithVerify/singleModal/sessions/{sessionId}/audit")
         @ExpectedResponses({ 200 })
@@ -374,7 +378,7 @@ Mono> getLivenessWithVerifySessionAuditEntries(@HostParam("
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getLivenessWithVerifySessionAuditEntriesSync(@HostParam("endpoint") String endpoint,
             @HostParam("apiVersion") String apiVersion, @PathParam("sessionId") String sessionId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
     }
 
     /**
@@ -429,9 +433,10 @@ Response getLivenessWithVerifySessionAuditEntriesSync(@HostParam("en
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> createLivenessSessionWithResponseAsync(BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.createLivenessSession(this.getEndpoint(),
-            this.getServiceVersion().getVersion(), accept, body, requestOptions, context));
+            this.getServiceVersion().getVersion(), contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -484,9 +489,10 @@ public Mono> createLivenessSessionWithResponseAsync(BinaryD
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response createLivenessSessionWithResponse(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.createLivenessSessionSync(this.getEndpoint(), this.getServiceVersion().getVersion(), accept,
-            body, requestOptions, Context.NONE);
+        return service.createLivenessSessionSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType,
+            accept, body, requestOptions, Context.NONE);
     }
 
     /**
@@ -1023,9 +1029,10 @@ public Response getLivenessSessionAuditEntriesWithResponse(String se
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> createLivenessWithVerifySessionWithResponseAsync(BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.createLivenessWithVerifySession(this.getEndpoint(),
-            this.getServiceVersion().getVersion(), accept, body, requestOptions, context));
+            this.getServiceVersion().getVersion(), contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -1099,9 +1106,10 @@ public Mono> createLivenessWithVerifySessionWithResponseAsy
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response createLivenessWithVerifySessionWithResponse(BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return service.createLivenessWithVerifySessionSync(this.getEndpoint(), this.getServiceVersion().getVersion(),
-            accept, body, requestOptions, Context.NONE);
+            contentType, accept, body, requestOptions, Context.NONE);
     }
 
     /**
diff --git a/sdk/face/azure-ai-vision-face/src/main/resources/META-INF/azure-ai-vision-face_apiview_properties.json b/sdk/face/azure-ai-vision-face/src/main/resources/META-INF/azure-ai-vision-face_apiview_properties.json
index e5d021fdcc4e..092afd387a89 100644
--- a/sdk/face/azure-ai-vision-face/src/main/resources/META-INF/azure-ai-vision-face_apiview_properties.json
+++ b/sdk/face/azure-ai-vision-face/src/main/resources/META-INF/azure-ai-vision-face_apiview_properties.json
@@ -1,7 +1,7 @@
 {
   "flavor": "azure", 
   "CrossLanguageDefinitionId": {
-    "com.azure.ai.vision.face.FaceAsyncClient": "Face.FaceClient",
+    "com.azure.ai.vision.face.FaceAsyncClient": "ClientCustomizations.FaceClient",
     "com.azure.ai.vision.face.FaceAsyncClient.detectFromUrlImpl": "ClientCustomizations.FaceClient.detectFromUrl",
     "com.azure.ai.vision.face.FaceAsyncClient.detectFromUrlImplWithResponse": "ClientCustomizations.FaceClient.detectFromUrl",
     "com.azure.ai.vision.face.FaceAsyncClient.detectImpl": "ClientCustomizations.FaceClient.detect",
@@ -12,7 +12,7 @@
     "com.azure.ai.vision.face.FaceAsyncClient.groupWithResponse": "ClientCustomizations.FaceClient.group",
     "com.azure.ai.vision.face.FaceAsyncClient.verifyFaceToFace": "ClientCustomizations.FaceClient.verifyFaceToFace",
     "com.azure.ai.vision.face.FaceAsyncClient.verifyFaceToFaceWithResponse": "ClientCustomizations.FaceClient.verifyFaceToFace",
-    "com.azure.ai.vision.face.FaceClient": "Face.FaceClient",
+    "com.azure.ai.vision.face.FaceClient": "ClientCustomizations.FaceClient",
     "com.azure.ai.vision.face.FaceClient.detectFromUrlImpl": "ClientCustomizations.FaceClient.detectFromUrl",
     "com.azure.ai.vision.face.FaceClient.detectFromUrlImplWithResponse": "ClientCustomizations.FaceClient.detectFromUrl",
     "com.azure.ai.vision.face.FaceClient.detectImpl": "ClientCustomizations.FaceClient.detect",
@@ -23,8 +23,8 @@
     "com.azure.ai.vision.face.FaceClient.groupWithResponse": "ClientCustomizations.FaceClient.group",
     "com.azure.ai.vision.face.FaceClient.verifyFaceToFace": "ClientCustomizations.FaceClient.verifyFaceToFace",
     "com.azure.ai.vision.face.FaceClient.verifyFaceToFaceWithResponse": "ClientCustomizations.FaceClient.verifyFaceToFace",
-    "com.azure.ai.vision.face.FaceClientBuilder": "Face.FaceClient",
-    "com.azure.ai.vision.face.FaceSessionAsyncClient": "Face.FaceSessionClient",
+    "com.azure.ai.vision.face.FaceClientBuilder": "ClientCustomizations.FaceClient",
+    "com.azure.ai.vision.face.FaceSessionAsyncClient": "ClientCustomizations.FaceSessionClient",
     "com.azure.ai.vision.face.FaceSessionAsyncClient.createLivenessSession": "ClientCustomizations.FaceSessionClient.createLivenessSession",
     "com.azure.ai.vision.face.FaceSessionAsyncClient.createLivenessSessionWithResponse": "ClientCustomizations.FaceSessionClient.createLivenessSession",
     "com.azure.ai.vision.face.FaceSessionAsyncClient.createLivenessWithVerifySession": "ClientCustomizations.FaceSessionClient.createLivenessWithVerifySession",
@@ -47,7 +47,7 @@
     "com.azure.ai.vision.face.FaceSessionAsyncClient.getLivenessWithVerifySessionResultWithResponse": "ClientCustomizations.FaceSessionClient.getLivenessWithVerifySessionResult",
     "com.azure.ai.vision.face.FaceSessionAsyncClient.getLivenessWithVerifySessions": "ClientCustomizations.FaceSessionClient.getLivenessWithVerifySessions",
     "com.azure.ai.vision.face.FaceSessionAsyncClient.getLivenessWithVerifySessionsWithResponse": "ClientCustomizations.FaceSessionClient.getLivenessWithVerifySessions",
-    "com.azure.ai.vision.face.FaceSessionClient": "Face.FaceSessionClient",
+    "com.azure.ai.vision.face.FaceSessionClient": "ClientCustomizations.FaceSessionClient",
     "com.azure.ai.vision.face.FaceSessionClient.createLivenessSession": "ClientCustomizations.FaceSessionClient.createLivenessSession",
     "com.azure.ai.vision.face.FaceSessionClient.createLivenessSessionWithResponse": "ClientCustomizations.FaceSessionClient.createLivenessSession",
     "com.azure.ai.vision.face.FaceSessionClient.createLivenessWithVerifySession": "ClientCustomizations.FaceSessionClient.createLivenessWithVerifySession",
@@ -70,7 +70,7 @@
     "com.azure.ai.vision.face.FaceSessionClient.getLivenessWithVerifySessionResultWithResponse": "ClientCustomizations.FaceSessionClient.getLivenessWithVerifySessionResult",
     "com.azure.ai.vision.face.FaceSessionClient.getLivenessWithVerifySessions": "ClientCustomizations.FaceSessionClient.getLivenessWithVerifySessions",
     "com.azure.ai.vision.face.FaceSessionClient.getLivenessWithVerifySessionsWithResponse": "ClientCustomizations.FaceSessionClient.getLivenessWithVerifySessions",
-    "com.azure.ai.vision.face.FaceSessionClientBuilder": "Face.FaceSessionClient",
+    "com.azure.ai.vision.face.FaceSessionClientBuilder": "ClientCustomizations.FaceSessionClient",
     "com.azure.ai.vision.face.implementation.models.CreateLivenessWithVerifySessionMultipartContent": "Face.CreateLivenessWithVerifySessionMultipartContent",
     "com.azure.ai.vision.face.implementation.models.DetectFromUrlImplOptions": "null",
     "com.azure.ai.vision.face.implementation.models.DetectFromUrlImplRequest": "detectFromUrl.Request.anonymous",
diff --git a/sdk/healthdataaiservices/azure-health-deidentification/src/main/java/com/azure/health/deidentification/DeidentificationAsyncClient.java b/sdk/healthdataaiservices/azure-health-deidentification/src/main/java/com/azure/health/deidentification/DeidentificationAsyncClient.java
index fb4dfd77ffb9..e8029ccdb7c5 100644
--- a/sdk/healthdataaiservices/azure-health-deidentification/src/main/java/com/azure/health/deidentification/DeidentificationAsyncClient.java
+++ b/sdk/healthdataaiservices/azure-health-deidentification/src/main/java/com/azure/health/deidentification/DeidentificationAsyncClient.java
@@ -102,8 +102,9 @@ public final class DeidentificationAsyncClient {
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return a job containing a batch of documents to de-identify along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return a de-identification job.
+     * 
+     * Resource read operation template along with {@link Response} on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -498,7 +499,9 @@ public Mono> deidentifyWithResponse(BinaryData body, Reques
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a job containing a batch of documents to de-identify on successful completion of {@link Mono}.
+     * @return a de-identification job.
+     * 
+     * Resource read operation template on successful completion of {@link Mono}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/sdk/healthdataaiservices/azure-health-deidentification/src/main/java/com/azure/health/deidentification/DeidentificationClient.java b/sdk/healthdataaiservices/azure-health-deidentification/src/main/java/com/azure/health/deidentification/DeidentificationClient.java
index 9f5ab1ff550a..ca84ae974038 100644
--- a/sdk/healthdataaiservices/azure-health-deidentification/src/main/java/com/azure/health/deidentification/DeidentificationClient.java
+++ b/sdk/healthdataaiservices/azure-health-deidentification/src/main/java/com/azure/health/deidentification/DeidentificationClient.java
@@ -96,7 +96,9 @@ public final class DeidentificationClient {
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return a job containing a batch of documents to de-identify along with {@link Response}.
+     * @return a de-identification job.
+     * 
+     * Resource read operation template along with {@link Response}.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
@@ -489,7 +491,9 @@ public Response deidentifyWithResponse(BinaryData body, RequestOptio
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return a job containing a batch of documents to de-identify.
+     * @return a de-identification job.
+     * 
+     * Resource read operation template.
      */
     @Generated
     @ServiceMethod(returns = ReturnType.SINGLE)
diff --git a/sdk/healthdataaiservices/azure-health-deidentification/src/main/java/com/azure/health/deidentification/implementation/DeidentificationClientImpl.java b/sdk/healthdataaiservices/azure-health-deidentification/src/main/java/com/azure/health/deidentification/implementation/DeidentificationClientImpl.java
index 9e11f1465239..b58490bd4be8 100644
--- a/sdk/healthdataaiservices/azure-health-deidentification/src/main/java/com/azure/health/deidentification/implementation/DeidentificationClientImpl.java
+++ b/sdk/healthdataaiservices/azure-health-deidentification/src/main/java/com/azure/health/deidentification/implementation/DeidentificationClientImpl.java
@@ -173,7 +173,7 @@ public interface DeidentificationClientService {
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getJob(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("name") String name,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/jobs/{name}")
         @ExpectedResponses({ 200 })
@@ -183,7 +183,7 @@ Mono> getJob(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getJobSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("name") String name,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Put("/jobs/{name}")
         @ExpectedResponses({ 200, 201 })
@@ -193,8 +193,8 @@ Response getJobSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> createJob(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("name") String name,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData resource,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData resource, RequestOptions requestOptions, Context context);
 
         @Put("/jobs/{name}")
         @ExpectedResponses({ 200, 201 })
@@ -204,8 +204,8 @@ Mono> createJob(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response createJobSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("name") String name,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData resource,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData resource, RequestOptions requestOptions, Context context);
 
         @Get("/jobs")
         @ExpectedResponses({ 200 })
@@ -214,7 +214,7 @@ Response createJobSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listJobs(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/jobs")
@@ -224,7 +224,7 @@ Mono> listJobs(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listJobsSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/jobs/{name}/documents")
@@ -235,7 +235,7 @@ Response listJobsSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listJobDocuments(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("name") String name,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/jobs/{name}/documents")
         @ExpectedResponses({ 200 })
@@ -245,7 +245,7 @@ Mono> listJobDocuments(@HostParam("endpoint") String endpoi
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listJobDocumentsSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("name") String name,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/jobs/{name}:cancel")
         @ExpectedResponses({ 200 })
@@ -255,7 +255,7 @@ Response listJobDocumentsSync(@HostParam("endpoint") String endpoint
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> cancelJob(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("name") String name,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/jobs/{name}:cancel")
         @ExpectedResponses({ 200 })
@@ -265,7 +265,7 @@ Mono> cancelJob(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response cancelJobSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("name") String name,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/jobs/{name}")
         @ExpectedResponses({ 204 })
@@ -275,7 +275,7 @@ Response cancelJobSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> deleteJob(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("name") String name,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/jobs/{name}")
         @ExpectedResponses({ 204 })
@@ -285,7 +285,7 @@ Mono> deleteJob(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response deleteJobSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("name") String name,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/deid")
         @ExpectedResponses({ 200 })
@@ -294,8 +294,9 @@ Response deleteJobSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> deidentify(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Post("/deid")
         @ExpectedResponses({ 200 })
@@ -304,8 +305,9 @@ Mono> deidentify(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response deidentifySync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -314,7 +316,7 @@ Response deidentifySync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listJobsNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -324,7 +326,7 @@ Mono> listJobsNext(@PathParam(value = "nextLink", encoded =
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listJobsNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -334,7 +336,7 @@ Response listJobsNextSync(@PathParam(value = "nextLink", encoded = t
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listJobDocumentsNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("{nextLink}")
@@ -344,7 +346,7 @@ Mono> listJobDocumentsNext(@PathParam(value = "nextLink", e
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listJobDocumentsNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
     }
 
@@ -403,8 +405,9 @@ Response listJobDocumentsNextSync(@PathParam(value = "nextLink", enc
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return a job containing a batch of documents to de-identify along with {@link Response} on successful completion
-     * of {@link Mono}.
+     * @return a de-identification job.
+     * 
+     * Resource read operation template along with {@link Response} on successful completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getJobWithResponseAsync(String name, RequestOptions requestOptions) {
@@ -468,7 +471,9 @@ public Mono> getJobWithResponseAsync(String name, RequestOp
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return a job containing a batch of documents to de-identify along with {@link Response}.
+     * @return a de-identification job.
+     * 
+     * Resource read operation template along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response getJobWithResponse(String name, RequestOptions requestOptions) {
@@ -584,9 +589,10 @@ public Response getJobWithResponse(String name, RequestOptions reque
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> createJobWithResponseAsync(String name, BinaryData resource,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.createJob(this.getEndpoint(),
-            this.getServiceVersion().getVersion(), name, accept, resource, requestOptions, context));
+            this.getServiceVersion().getVersion(), name, contentType, accept, resource, requestOptions, context));
     }
 
     /**
@@ -695,9 +701,10 @@ private Mono> createJobWithResponseAsync(String name, Binar
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Response createJobWithResponse(String name, BinaryData resource,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.createJobSync(this.getEndpoint(), this.getServiceVersion().getVersion(), name, accept, resource,
-            requestOptions, Context.NONE);
+        return service.createJobSync(this.getEndpoint(), this.getServiceVersion().getVersion(), name, contentType,
+            accept, resource, requestOptions, Context.NONE);
     }
 
     /**
@@ -2001,9 +2008,10 @@ public Response deleteJobWithResponse(String name, RequestOptions requestO
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> deidentifyWithResponseAsync(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.deidentify(this.getEndpoint(),
-            this.getServiceVersion().getVersion(), accept, body, requestOptions, context));
+            this.getServiceVersion().getVersion(), contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -2056,9 +2064,10 @@ public Mono> deidentifyWithResponseAsync(BinaryData body, R
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response deidentifyWithResponse(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.deidentifySync(this.getEndpoint(), this.getServiceVersion().getVersion(), accept, body,
-            requestOptions, Context.NONE);
+        return service.deidentifySync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType, accept,
+            body, requestOptions, Context.NONE);
     }
 
     /**
diff --git a/sdk/healthdataaiservices/azure-health-deidentification/src/main/resources/META-INF/azure-health-deidentification_apiview_properties.json b/sdk/healthdataaiservices/azure-health-deidentification/src/main/resources/META-INF/azure-health-deidentification_apiview_properties.json
index e9858021d010..075d4352f1a6 100644
--- a/sdk/healthdataaiservices/azure-health-deidentification/src/main/resources/META-INF/azure-health-deidentification_apiview_properties.json
+++ b/sdk/healthdataaiservices/azure-health-deidentification/src/main/resources/META-INF/azure-health-deidentification_apiview_properties.json
@@ -1,7 +1,7 @@
 {
   "flavor": "azure", 
   "CrossLanguageDefinitionId": {
-    "com.azure.health.deidentification.DeidentificationAsyncClient": "HealthDataAIServices.DeidServices.DeidentificationClient",
+    "com.azure.health.deidentification.DeidentificationAsyncClient": "HealthDataAIServices.DeidServices",
     "com.azure.health.deidentification.DeidentificationAsyncClient.beginCreateJob": "HealthDataAIServices.DeidServices.createJob",
     "com.azure.health.deidentification.DeidentificationAsyncClient.beginCreateJobWithModel": "HealthDataAIServices.DeidServices.createJob",
     "com.azure.health.deidentification.DeidentificationAsyncClient.cancelJob": "HealthDataAIServices.DeidServices.cancelJob",
@@ -14,7 +14,7 @@
     "com.azure.health.deidentification.DeidentificationAsyncClient.getJobWithResponse": "HealthDataAIServices.DeidServices.getJob",
     "com.azure.health.deidentification.DeidentificationAsyncClient.listJobDocuments": "HealthDataAIServices.DeidServices.listJobDocuments",
     "com.azure.health.deidentification.DeidentificationAsyncClient.listJobs": "HealthDataAIServices.DeidServices.listJobs",
-    "com.azure.health.deidentification.DeidentificationClient": "HealthDataAIServices.DeidServices.DeidentificationClient",
+    "com.azure.health.deidentification.DeidentificationClient": "HealthDataAIServices.DeidServices",
     "com.azure.health.deidentification.DeidentificationClient.beginCreateJob": "HealthDataAIServices.DeidServices.createJob",
     "com.azure.health.deidentification.DeidentificationClient.beginCreateJobWithModel": "HealthDataAIServices.DeidServices.createJob",
     "com.azure.health.deidentification.DeidentificationClient.cancelJob": "HealthDataAIServices.DeidServices.cancelJob",
@@ -27,7 +27,7 @@
     "com.azure.health.deidentification.DeidentificationClient.getJobWithResponse": "HealthDataAIServices.DeidServices.getJob",
     "com.azure.health.deidentification.DeidentificationClient.listJobDocuments": "HealthDataAIServices.DeidServices.listJobDocuments",
     "com.azure.health.deidentification.DeidentificationClient.listJobs": "HealthDataAIServices.DeidServices.listJobs",
-    "com.azure.health.deidentification.DeidentificationClientBuilder": "HealthDataAIServices.DeidServices.DeidentificationClient",
+    "com.azure.health.deidentification.DeidentificationClientBuilder": "HealthDataAIServices.DeidServices",
     "com.azure.health.deidentification.models.DeidentificationContent": "HealthDataAIServices.DeidServices.DeidentificationContent",
     "com.azure.health.deidentification.models.DeidentificationJob": "HealthDataAIServices.DeidServices.DeidentificationJob",
     "com.azure.health.deidentification.models.DeidentificationResult": "HealthDataAIServices.DeidServices.DeidentificationResult",
diff --git a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/main/java/com/azure/resourcemanager/healthdataaiservices/fluent/HealthDataAIServicesClient.java b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/main/java/com/azure/resourcemanager/healthdataaiservices/fluent/HealthDataAIServicesClient.java
index 3a09fe1e79f3..1aaf5549b346 100644
--- a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/main/java/com/azure/resourcemanager/healthdataaiservices/fluent/HealthDataAIServicesClient.java
+++ b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/main/java/com/azure/resourcemanager/healthdataaiservices/fluent/HealthDataAIServicesClient.java
@@ -12,7 +12,7 @@
  */
 public interface HealthDataAIServicesClient {
     /**
-     * Gets Server parameter.
+     * Gets Service host.
      * 
      * @return the endpoint value.
      */
diff --git a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/main/java/com/azure/resourcemanager/healthdataaiservices/implementation/DeidServicesClientImpl.java b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/main/java/com/azure/resourcemanager/healthdataaiservices/implementation/DeidServicesClientImpl.java
index 99c823e8e087..2add7a6fc6b5 100644
--- a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/main/java/com/azure/resourcemanager/healthdataaiservices/implementation/DeidServicesClientImpl.java
+++ b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/main/java/com/azure/resourcemanager/healthdataaiservices/implementation/DeidServicesClientImpl.java
@@ -79,7 +79,7 @@ public interface DeidServicesService {
         Mono> getByResourceGroup(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName,
-            @PathParam("deidServiceName") String deidServiceName, @HeaderParam("accept") String accept,
+            @PathParam("deidServiceName") String deidServiceName, @HeaderParam("Accept") String accept,
             Context context);
 
         @Headers({ "Content-Type: application/json" })
@@ -88,7 +88,7 @@ Mono> getByResourceGroup(@HostParam("endpoint") Strin
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listByResourceGroup(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
-            @PathParam("resourceGroupName") String resourceGroupName, @HeaderParam("accept") String accept,
+            @PathParam("resourceGroupName") String resourceGroupName, @HeaderParam("Accept") String accept,
             Context context);
 
         @Headers({ "Content-Type: application/json" })
@@ -97,27 +97,27 @@ Mono> listByResourceGroup(@HostParam("endpoint")
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> list(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
-        @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HealthDataAIServices/deidServices/{deidServiceName}")
         @ExpectedResponses({ 200, 201 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono>> create(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName,
-            @PathParam("deidServiceName") String deidServiceName, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") DeidServiceInner resource, Context context);
+            @PathParam("deidServiceName") String deidServiceName, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") DeidServiceInner resource,
+            Context context);
 
-        @Headers({ "Content-Type: application/json" })
         @Patch("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HealthDataAIServices/deidServices/{deidServiceName}")
         @ExpectedResponses({ 200, 202 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono>> update(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName,
-            @PathParam("deidServiceName") String deidServiceName, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") DeidUpdate properties, Context context);
+            @PathParam("deidServiceName") String deidServiceName, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") DeidUpdate properties,
+            Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HealthDataAIServices/deidServices/{deidServiceName}")
@@ -126,7 +126,7 @@ Mono>> update(@HostParam("endpoint") String endpoint,
         Mono>> delete(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName,
-            @PathParam("deidServiceName") String deidServiceName, @HeaderParam("accept") String accept,
+            @PathParam("deidServiceName") String deidServiceName, @HeaderParam("Accept") String accept,
             Context context);
 
         @Headers({ "Content-Type: application/json" })
@@ -135,7 +135,7 @@ Mono>> delete(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listByResourceGroupNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
@@ -143,7 +143,7 @@ Mono> listByResourceGroupNext(
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listBySubscriptionNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -540,10 +540,12 @@ private Mono>> createWithResponseAsync(String resource
         } else {
             resource.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.create(this.client.getEndpoint(), this.client.getApiVersion(),
-                this.client.getSubscriptionId(), resourceGroupName, deidServiceName, accept, resource, context))
+                this.client.getSubscriptionId(), resourceGroupName, deidServiceName, contentType, accept, resource,
+                context))
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
@@ -584,10 +586,11 @@ private Mono>> createWithResponseAsync(String resource
         } else {
             resource.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.create(this.client.getEndpoint(), this.client.getApiVersion(), this.client.getSubscriptionId(),
-            resourceGroupName, deidServiceName, accept, resource, context);
+            resourceGroupName, deidServiceName, contentType, accept, resource, context);
     }
 
     /**
@@ -773,10 +776,12 @@ private Mono>> updateWithResponseAsync(String resource
         } else {
             properties.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.update(this.client.getEndpoint(), this.client.getApiVersion(),
-                this.client.getSubscriptionId(), resourceGroupName, deidServiceName, accept, properties, context))
+                this.client.getSubscriptionId(), resourceGroupName, deidServiceName, contentType, accept, properties,
+                context))
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
@@ -817,10 +822,11 @@ private Mono>> updateWithResponseAsync(String resource
         } else {
             properties.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.update(this.client.getEndpoint(), this.client.getApiVersion(), this.client.getSubscriptionId(),
-            resourceGroupName, deidServiceName, accept, properties, context);
+            resourceGroupName, deidServiceName, contentType, accept, properties, context);
     }
 
     /**
@@ -1173,6 +1179,8 @@ public void delete(String resourceGroupName, String deidServiceName, Context con
     }
 
     /**
+     * List DeidService resources by resource group
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -1201,6 +1209,8 @@ private Mono> listByResourceGroupNextSinglePageA
     }
 
     /**
+     * List DeidService resources by resource group
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -1229,6 +1239,8 @@ private Mono> listByResourceGroupNextSinglePageA
     }
 
     /**
+     * List DeidService resources by subscription ID
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -1257,6 +1269,8 @@ private Mono> listBySubscriptionNextSinglePageAs
     }
 
     /**
+     * List DeidService resources by subscription ID
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
diff --git a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/main/java/com/azure/resourcemanager/healthdataaiservices/implementation/HealthDataAIServicesClientBuilder.java b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/main/java/com/azure/resourcemanager/healthdataaiservices/implementation/HealthDataAIServicesClientBuilder.java
index 070bad2df3ba..7f5966343f84 100644
--- a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/main/java/com/azure/resourcemanager/healthdataaiservices/implementation/HealthDataAIServicesClientBuilder.java
+++ b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/main/java/com/azure/resourcemanager/healthdataaiservices/implementation/HealthDataAIServicesClientBuilder.java
@@ -20,12 +20,12 @@
 @ServiceClientBuilder(serviceClients = { HealthDataAIServicesClientImpl.class })
 public final class HealthDataAIServicesClientBuilder {
     /*
-     * Server parameter
+     * Service host
      */
     private String endpoint;
 
     /**
-     * Sets Server parameter.
+     * Sets Service host.
      * 
      * @param endpoint the endpoint value.
      * @return the HealthDataAIServicesClientBuilder.
@@ -121,6 +121,7 @@ public HealthDataAIServicesClientBuilder serializerAdapter(SerializerAdapter ser
      * @return an instance of HealthDataAIServicesClientImpl.
      */
     public HealthDataAIServicesClientImpl buildClient() {
+        String localEndpoint = (endpoint != null) ? endpoint : "https://management.azure.com";
         AzureEnvironment localEnvironment = (environment != null) ? environment : AzureEnvironment.AZURE;
         HttpPipeline localPipeline = (pipeline != null)
             ? pipeline
@@ -131,7 +132,7 @@ public HealthDataAIServicesClientImpl buildClient() {
             ? serializerAdapter
             : SerializerFactory.createDefaultManagementSerializerAdapter();
         HealthDataAIServicesClientImpl client = new HealthDataAIServicesClientImpl(localPipeline,
-            localSerializerAdapter, localDefaultPollInterval, localEnvironment, this.endpoint, this.subscriptionId);
+            localSerializerAdapter, localDefaultPollInterval, localEnvironment, localEndpoint, this.subscriptionId);
         return client;
     }
 }
diff --git a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/main/java/com/azure/resourcemanager/healthdataaiservices/implementation/HealthDataAIServicesClientImpl.java b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/main/java/com/azure/resourcemanager/healthdataaiservices/implementation/HealthDataAIServicesClientImpl.java
index b9aeb2fc5139..2eb39db8ce61 100644
--- a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/main/java/com/azure/resourcemanager/healthdataaiservices/implementation/HealthDataAIServicesClientImpl.java
+++ b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/main/java/com/azure/resourcemanager/healthdataaiservices/implementation/HealthDataAIServicesClientImpl.java
@@ -43,12 +43,12 @@
 @ServiceClient(builder = HealthDataAIServicesClientBuilder.class)
 public final class HealthDataAIServicesClientImpl implements HealthDataAIServicesClient {
     /**
-     * Server parameter.
+     * Service host.
      */
     private final String endpoint;
 
     /**
-     * Gets Server parameter.
+     * Gets Service host.
      * 
      * @return the endpoint value.
      */
@@ -189,7 +189,7 @@ public PrivateLinksClient getPrivateLinks() {
      * @param serializerAdapter The serializer to serialize an object into a string.
      * @param defaultPollInterval The default poll interval for long-running operation.
      * @param environment The Azure environment.
-     * @param endpoint Server parameter.
+     * @param endpoint Service host.
      * @param subscriptionId The ID of the target subscription. The value must be an UUID.
      */
     HealthDataAIServicesClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter,
diff --git a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/main/java/com/azure/resourcemanager/healthdataaiservices/implementation/OperationsClientImpl.java b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/main/java/com/azure/resourcemanager/healthdataaiservices/implementation/OperationsClientImpl.java
index a30b59cd63fc..741349e19fd9 100644
--- a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/main/java/com/azure/resourcemanager/healthdataaiservices/implementation/OperationsClientImpl.java
+++ b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/main/java/com/azure/resourcemanager/healthdataaiservices/implementation/OperationsClientImpl.java
@@ -67,14 +67,14 @@ public interface OperationsService {
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> list(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, Context context);
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -181,6 +181,8 @@ public PagedIterable list(Context context) {
     }
 
     /**
+     * List the operations for the provider
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -207,6 +209,8 @@ private Mono> listNextSinglePageAsync(String nextL
     }
 
     /**
+     * List the operations for the provider
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
diff --git a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/main/java/com/azure/resourcemanager/healthdataaiservices/implementation/PrivateEndpointConnectionsClientImpl.java b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/main/java/com/azure/resourcemanager/healthdataaiservices/implementation/PrivateEndpointConnectionsClientImpl.java
index 87cc07ae5cc6..f3b5da0e57fc 100644
--- a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/main/java/com/azure/resourcemanager/healthdataaiservices/implementation/PrivateEndpointConnectionsClientImpl.java
+++ b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/main/java/com/azure/resourcemanager/healthdataaiservices/implementation/PrivateEndpointConnectionsClientImpl.java
@@ -79,9 +79,8 @@ Mono> get(@HostParam("endpoint"
             @PathParam("resourceGroupName") String resourceGroupName,
             @PathParam("deidServiceName") String deidServiceName,
             @PathParam("privateEndpointConnectionName") String privateEndpointConnectionName,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
-        @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HealthDataAIServices/deidServices/{deidServiceName}/privateEndpointConnections/{privateEndpointConnectionName}")
         @ExpectedResponses({ 200, 201 })
         @UnexpectedResponseExceptionType(ManagementException.class)
@@ -90,7 +89,7 @@ Mono>> create(@HostParam("endpoint") String endpoint,
             @PathParam("resourceGroupName") String resourceGroupName,
             @PathParam("deidServiceName") String deidServiceName,
             @PathParam("privateEndpointConnectionName") String privateEndpointConnectionName,
-            @HeaderParam("accept") String accept,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") PrivateEndpointConnectionResourceInner resource, Context context);
 
         @Headers({ "Content-Type: application/json" })
@@ -102,7 +101,7 @@ Mono>> delete(@HostParam("endpoint") String endpoint,
             @PathParam("resourceGroupName") String resourceGroupName,
             @PathParam("deidServiceName") String deidServiceName,
             @PathParam("privateEndpointConnectionName") String privateEndpointConnectionName,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HealthDataAIServices/deidServices/{deidServiceName}/privateEndpointConnections")
@@ -112,7 +111,7 @@ Mono> listByDeidService(
             @HostParam("endpoint") String endpoint, @QueryParam("api-version") String apiVersion,
             @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName,
-            @PathParam("deidServiceName") String deidServiceName, @HeaderParam("accept") String accept,
+            @PathParam("deidServiceName") String deidServiceName, @HeaderParam("Accept") String accept,
             Context context);
 
         @Headers({ "Content-Type: application/json" })
@@ -121,7 +120,7 @@ Mono> listByDeidService(
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listByDeidServiceNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -308,11 +307,12 @@ private Mono>> createWithResponseAsync(String resource
         } else {
             resource.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.create(this.client.getEndpoint(), this.client.getApiVersion(),
                 this.client.getSubscriptionId(), resourceGroupName, deidServiceName, privateEndpointConnectionName,
-                accept, resource, context))
+                contentType, accept, resource, context))
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
@@ -359,10 +359,11 @@ private Mono>> createWithResponseAsync(String resource
         } else {
             resource.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.create(this.client.getEndpoint(), this.client.getApiVersion(), this.client.getSubscriptionId(),
-            resourceGroupName, deidServiceName, privateEndpointConnectionName, accept, resource, context);
+            resourceGroupName, deidServiceName, privateEndpointConnectionName, contentType, accept, resource, context);
     }
 
     /**
@@ -933,6 +934,8 @@ public PagedIterable listByDeidService(S
     }
 
     /**
+     * List private endpoint connections on the given resource
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -961,6 +964,8 @@ public PagedIterable listByDeidService(S
     }
 
     /**
+     * List private endpoint connections on the given resource
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
diff --git a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/main/java/com/azure/resourcemanager/healthdataaiservices/implementation/PrivateLinksClientImpl.java b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/main/java/com/azure/resourcemanager/healthdataaiservices/implementation/PrivateLinksClientImpl.java
index 0f2340d0a09e..d3deab2298b5 100644
--- a/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/main/java/com/azure/resourcemanager/healthdataaiservices/implementation/PrivateLinksClientImpl.java
+++ b/sdk/healthdataaiservices/azure-resourcemanager-healthdataaiservices/src/main/java/com/azure/resourcemanager/healthdataaiservices/implementation/PrivateLinksClientImpl.java
@@ -69,7 +69,7 @@ public interface PrivateLinksService {
         Mono> listByDeidService(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName,
-            @PathParam("deidServiceName") String deidServiceName, @HeaderParam("accept") String accept,
+            @PathParam("deidServiceName") String deidServiceName, @HeaderParam("Accept") String accept,
             Context context);
 
         @Headers({ "Content-Type: application/json" })
@@ -78,7 +78,7 @@ Mono> listByDeidService(@HostParam("endp
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listByDeidServiceNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -228,6 +228,8 @@ public PagedIterable listByDeidService(String resource
     }
 
     /**
+     * List private links on the given resource
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -255,6 +257,8 @@ private Mono> listByDeidServiceNextSingl
     }
 
     /**
+     * List private links on the given resource
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/RadiologyInsightsAsyncClient.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/RadiologyInsightsAsyncClient.java
index bc4cd3dc1c76..d21584235cdd 100644
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/RadiologyInsightsAsyncClient.java
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/RadiologyInsightsAsyncClient.java
@@ -15,9 +15,12 @@
 import com.azure.core.util.BinaryData;
 import com.azure.core.util.polling.PollerFlux;
 import com.azure.health.insights.radiologyinsights.implementation.RadiologyInsightsClientImpl;
-import com.azure.health.insights.radiologyinsights.models.RadiologyInsightsData;
+import com.azure.health.insights.radiologyinsights.implementation.models.InferRadiologyInsightsRequest;
+import com.azure.health.insights.radiologyinsights.models.PatientRecord;
 import com.azure.health.insights.radiologyinsights.models.RadiologyInsightsInferenceResult;
+import com.azure.health.insights.radiologyinsights.models.RadiologyInsightsModelConfiguration;
 import com.azure.health.insights.radiologyinsights.models.RadiologyInsightsResult;
+import java.util.List;
 
 /**
  * Initializes a new instance of the asynchronous RadiologyInsightsClient type.
@@ -390,7 +393,7 @@ public final class RadiologyInsightsAsyncClient {
      * }
      * }

      *
-     * @param radiologyInsightsData Contains the list of patients, and configuration data.
+     * @param inferRadiologyInsightsRequest The inferRadiologyInsightsRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
@@ -400,9 +403,9 @@ public final class RadiologyInsightsAsyncClient {
      */
     @Generated
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    public PollerFlux beginInferRadiologyInsights(BinaryData radiologyInsightsData,
+    public PollerFlux beginInferRadiologyInsights(BinaryData inferRadiologyInsightsRequest,
         RequestOptions requestOptions) {
-        return this.serviceClient.beginInferRadiologyInsightsAsync(radiologyInsightsData, requestOptions);
+        return this.serviceClient.beginInferRadiologyInsightsAsync(inferRadiologyInsightsRequest, requestOptions);
     }
 
     /**
@@ -410,7 +413,8 @@ public PollerFlux beginInferRadiologyInsights(BinaryData
      *
      * Creates a Radiology Insights job with the given request body.
      *
-     * @param radiologyInsightsData Contains the list of patients, and configuration data.
+     * @param patients The list of patients, including their clinical information and data.
+     * @param configuration Configuration affecting the Radiology Insights model's inference.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
@@ -422,10 +426,37 @@ public PollerFlux beginInferRadiologyInsights(BinaryData
     @Generated
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public PollerFlux
-        beginInferRadiologyInsights(RadiologyInsightsData radiologyInsightsData) {
+        beginInferRadiologyInsights(List patients, RadiologyInsightsModelConfiguration configuration) {
         // Generated convenience method for beginInferRadiologyInsightsWithModel
         RequestOptions requestOptions = new RequestOptions();
-        return serviceClient.beginInferRadiologyInsightsWithModelAsync(BinaryData.fromObject(radiologyInsightsData),
-            requestOptions);
+        InferRadiologyInsightsRequest inferRadiologyInsightsRequestObj
+            = new InferRadiologyInsightsRequest(patients).setConfiguration(configuration);
+        BinaryData inferRadiologyInsightsRequest = BinaryData.fromObject(inferRadiologyInsightsRequestObj);
+        return serviceClient.beginInferRadiologyInsightsWithModelAsync(inferRadiologyInsightsRequest, requestOptions);
+    }
+
+    /**
+     * Create Radiology Insights job
+     *
+     * Creates a Radiology Insights job with the given request body.
+     *
+     * @param patients The list of patients, including their clinical information and data.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws HttpResponseException thrown if the request is rejected by server.
+     * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
+     * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
+     * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link PollerFlux} for polling of provides status details for long running operations.
+     */
+    @Generated
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public PollerFlux
+        beginInferRadiologyInsights(List patients) {
+        // Generated convenience method for beginInferRadiologyInsightsWithModel
+        RequestOptions requestOptions = new RequestOptions();
+        InferRadiologyInsightsRequest inferRadiologyInsightsRequestObj = new InferRadiologyInsightsRequest(patients);
+        BinaryData inferRadiologyInsightsRequest = BinaryData.fromObject(inferRadiologyInsightsRequestObj);
+        return serviceClient.beginInferRadiologyInsightsWithModelAsync(inferRadiologyInsightsRequest, requestOptions);
     }
 }
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/RadiologyInsightsClient.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/RadiologyInsightsClient.java
index 7de41efdfc19..658085ef0a84 100644
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/RadiologyInsightsClient.java
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/RadiologyInsightsClient.java
@@ -15,9 +15,12 @@
 import com.azure.core.util.BinaryData;
 import com.azure.core.util.polling.SyncPoller;
 import com.azure.health.insights.radiologyinsights.implementation.RadiologyInsightsClientImpl;
-import com.azure.health.insights.radiologyinsights.models.RadiologyInsightsData;
+import com.azure.health.insights.radiologyinsights.implementation.models.InferRadiologyInsightsRequest;
+import com.azure.health.insights.radiologyinsights.models.PatientRecord;
 import com.azure.health.insights.radiologyinsights.models.RadiologyInsightsInferenceResult;
+import com.azure.health.insights.radiologyinsights.models.RadiologyInsightsModelConfiguration;
 import com.azure.health.insights.radiologyinsights.models.RadiologyInsightsResult;
+import java.util.List;
 
 /**
  * Initializes a new instance of the synchronous RadiologyInsightsClient type.
@@ -390,7 +393,7 @@ public final class RadiologyInsightsClient {
      * }
      * }

      *
-     * @param radiologyInsightsData Contains the list of patients, and configuration data.
+     * @param inferRadiologyInsightsRequest The inferRadiologyInsightsRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
@@ -400,9 +403,9 @@ public final class RadiologyInsightsClient {
      */
     @Generated
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    public SyncPoller beginInferRadiologyInsights(BinaryData radiologyInsightsData,
+    public SyncPoller beginInferRadiologyInsights(BinaryData inferRadiologyInsightsRequest,
         RequestOptions requestOptions) {
-        return this.serviceClient.beginInferRadiologyInsights(radiologyInsightsData, requestOptions);
+        return this.serviceClient.beginInferRadiologyInsights(inferRadiologyInsightsRequest, requestOptions);
     }
 
     /**
@@ -410,7 +413,8 @@ public SyncPoller beginInferRadiologyInsights(BinaryData
      *
      * Creates a Radiology Insights job with the given request body.
      *
-     * @param radiologyInsightsData Contains the list of patients, and configuration data.
+     * @param patients The list of patients, including their clinical information and data.
+     * @param configuration Configuration affecting the Radiology Insights model's inference.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
@@ -422,10 +426,37 @@ public SyncPoller beginInferRadiologyInsights(BinaryData
     @Generated
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller
-        beginInferRadiologyInsights(RadiologyInsightsData radiologyInsightsData) {
+        beginInferRadiologyInsights(List patients, RadiologyInsightsModelConfiguration configuration) {
         // Generated convenience method for beginInferRadiologyInsightsWithModel
         RequestOptions requestOptions = new RequestOptions();
-        return serviceClient.beginInferRadiologyInsightsWithModel(BinaryData.fromObject(radiologyInsightsData),
-            requestOptions);
+        InferRadiologyInsightsRequest inferRadiologyInsightsRequestObj
+            = new InferRadiologyInsightsRequest(patients).setConfiguration(configuration);
+        BinaryData inferRadiologyInsightsRequest = BinaryData.fromObject(inferRadiologyInsightsRequestObj);
+        return serviceClient.beginInferRadiologyInsightsWithModel(inferRadiologyInsightsRequest, requestOptions);
+    }
+
+    /**
+     * Create Radiology Insights job
+     *
+     * Creates a Radiology Insights job with the given request body.
+     *
+     * @param patients The list of patients, including their clinical information and data.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws HttpResponseException thrown if the request is rejected by server.
+     * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
+     * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
+     * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return the {@link SyncPoller} for polling of provides status details for long running operations.
+     */
+    @Generated
+    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
+    public SyncPoller
+        beginInferRadiologyInsights(List patients) {
+        // Generated convenience method for beginInferRadiologyInsightsWithModel
+        RequestOptions requestOptions = new RequestOptions();
+        InferRadiologyInsightsRequest inferRadiologyInsightsRequestObj = new InferRadiologyInsightsRequest(patients);
+        BinaryData inferRadiologyInsightsRequest = BinaryData.fromObject(inferRadiologyInsightsRequestObj);
+        return serviceClient.beginInferRadiologyInsightsWithModel(inferRadiologyInsightsRequest, requestOptions);
     }
 }
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/implementation/RadiologyInsightsClientImpl.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/implementation/RadiologyInsightsClientImpl.java
index b1b46bfb3bdb..b215e719ba41 100644
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/implementation/RadiologyInsightsClientImpl.java
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/implementation/RadiologyInsightsClientImpl.java
@@ -29,6 +29,7 @@
 import com.azure.core.http.rest.RestProxy;
 import com.azure.core.util.BinaryData;
 import com.azure.core.util.Context;
+import com.azure.core.util.CoreUtils;
 import com.azure.core.util.DateTimeRfc1123;
 import com.azure.core.util.FluxUtil;
 import com.azure.core.util.polling.PollerFlux;
@@ -42,7 +43,6 @@
 import com.azure.health.insights.radiologyinsights.models.RadiologyInsightsResult;
 import java.time.Duration;
 import java.time.OffsetDateTime;
-import java.util.UUID;
 import reactor.core.publisher.Mono;
 
 /**
@@ -170,8 +170,9 @@ public interface RadiologyInsightsClientService {
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> inferRadiologyInsights(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData radiologyInsightsData, RequestOptions requestOptions,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData inferRadiologyInsightsRequest, RequestOptions requestOptions,
             Context context);
 
         @Post("/radiology-insights/jobs")
@@ -181,8 +182,9 @@ Mono> inferRadiologyInsights(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response inferRadiologyInsightsSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData radiologyInsightsData, RequestOptions requestOptions,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData inferRadiologyInsightsRequest, RequestOptions requestOptions,
             Context context);
     }
 
@@ -538,7 +540,7 @@ Response inferRadiologyInsightsSync(@HostParam("endpoint") String en
      * }
      * }

      * 
-     * @param radiologyInsightsData Contains the list of patients, and configuration data.
+     * @param inferRadiologyInsightsRequest The inferRadiologyInsightsRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
@@ -548,26 +550,27 @@ Response inferRadiologyInsightsSync(@HostParam("endpoint") String en
      * of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono> inferRadiologyInsightsWithResponseAsync(BinaryData radiologyInsightsData,
+    private Mono> inferRadiologyInsightsWithResponseAsync(BinaryData inferRadiologyInsightsRequest,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         RequestOptions requestOptionsLocal = requestOptions == null ? new RequestOptions() : requestOptions;
-        String repeatabilityRequestId = UUID.randomUUID().toString();
-        String repeatabilityFirstSent = DateTimeRfc1123.toRfc1123String(OffsetDateTime.now());
         requestOptionsLocal.addRequestCallback(requestLocal -> {
             if (requestLocal.getHeaders().get(HttpHeaderName.fromString("repeatability-request-id")) == null) {
                 requestLocal.getHeaders()
-                    .set(HttpHeaderName.fromString("repeatability-request-id"), repeatabilityRequestId);
+                    .set(HttpHeaderName.fromString("repeatability-request-id"), CoreUtils.randomUuid().toString());
             }
         });
         requestOptionsLocal.addRequestCallback(requestLocal -> {
             if (requestLocal.getHeaders().get(HttpHeaderName.fromString("repeatability-first-sent")) == null) {
                 requestLocal.getHeaders()
-                    .set(HttpHeaderName.fromString("repeatability-first-sent"), repeatabilityFirstSent);
+                    .set(HttpHeaderName.fromString("repeatability-first-sent"),
+                        DateTimeRfc1123.toRfc1123String(OffsetDateTime.now()));
             }
         });
-        return FluxUtil.withContext(context -> service.inferRadiologyInsights(this.getEndpoint(),
-            this.getServiceVersion().getVersion(), accept, radiologyInsightsData, requestOptionsLocal, context));
+        return FluxUtil.withContext(
+            context -> service.inferRadiologyInsights(this.getEndpoint(), this.getServiceVersion().getVersion(),
+                contentType, accept, inferRadiologyInsightsRequest, requestOptionsLocal, context));
     }
 
     /**
@@ -922,7 +925,7 @@ private Mono> inferRadiologyInsightsWithResponseAsync(Binar
      * }
      * }

      * 
-     * @param radiologyInsightsData Contains the list of patients, and configuration data.
+     * @param inferRadiologyInsightsRequest The inferRadiologyInsightsRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
@@ -931,26 +934,26 @@ private Mono> inferRadiologyInsightsWithResponseAsync(Binar
      * @return provides status details for long running operations along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Response inferRadiologyInsightsWithResponse(BinaryData radiologyInsightsData,
+    private Response inferRadiologyInsightsWithResponse(BinaryData inferRadiologyInsightsRequest,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         RequestOptions requestOptionsLocal = requestOptions == null ? new RequestOptions() : requestOptions;
-        String repeatabilityRequestId = UUID.randomUUID().toString();
-        String repeatabilityFirstSent = DateTimeRfc1123.toRfc1123String(OffsetDateTime.now());
         requestOptionsLocal.addRequestCallback(requestLocal -> {
             if (requestLocal.getHeaders().get(HttpHeaderName.fromString("repeatability-request-id")) == null) {
                 requestLocal.getHeaders()
-                    .set(HttpHeaderName.fromString("repeatability-request-id"), repeatabilityRequestId);
+                    .set(HttpHeaderName.fromString("repeatability-request-id"), CoreUtils.randomUuid().toString());
             }
         });
         requestOptionsLocal.addRequestCallback(requestLocal -> {
             if (requestLocal.getHeaders().get(HttpHeaderName.fromString("repeatability-first-sent")) == null) {
                 requestLocal.getHeaders()
-                    .set(HttpHeaderName.fromString("repeatability-first-sent"), repeatabilityFirstSent);
+                    .set(HttpHeaderName.fromString("repeatability-first-sent"),
+                        DateTimeRfc1123.toRfc1123String(OffsetDateTime.now()));
             }
         });
-        return service.inferRadiologyInsightsSync(this.getEndpoint(), this.getServiceVersion().getVersion(), accept,
-            radiologyInsightsData, requestOptionsLocal, Context.NONE);
+        return service.inferRadiologyInsightsSync(this.getEndpoint(), this.getServiceVersion().getVersion(),
+            contentType, accept, inferRadiologyInsightsRequest, requestOptionsLocal, Context.NONE);
     }
 
     /**
@@ -1305,7 +1308,7 @@ private Response inferRadiologyInsightsWithResponse(BinaryData radio
      * }
      * }

      * 
-     * @param radiologyInsightsData Contains the list of patients, and configuration data.
+     * @param inferRadiologyInsightsRequest The inferRadiologyInsightsRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
@@ -1314,10 +1317,10 @@ private Response inferRadiologyInsightsWithResponse(BinaryData radio
      * @return the {@link PollerFlux} for polling of provides status details for long running operations.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    public PollerFlux beginInferRadiologyInsightsAsync(BinaryData radiologyInsightsData,
+    public PollerFlux beginInferRadiologyInsightsAsync(BinaryData inferRadiologyInsightsRequest,
         RequestOptions requestOptions) {
         return PollerFlux.create(Duration.ofSeconds(1),
-            () -> this.inferRadiologyInsightsWithResponseAsync(radiologyInsightsData, requestOptions),
+            () -> this.inferRadiologyInsightsWithResponseAsync(inferRadiologyInsightsRequest, requestOptions),
             new com.azure.health.insights.radiologyinsights.implementation.OperationLocationPollingStrategy<>(
                 new PollingStrategyOptions(this.getHttpPipeline())
                     .setEndpoint("{endpoint}/health-insights".replace("{endpoint}", this.getEndpoint()))
@@ -1681,7 +1684,7 @@ public PollerFlux beginInferRadiologyInsightsAsync(Binar
      * }
      * }

      * 
-     * @param radiologyInsightsData Contains the list of patients, and configuration data.
+     * @param inferRadiologyInsightsRequest The inferRadiologyInsightsRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
@@ -1690,10 +1693,10 @@ public PollerFlux beginInferRadiologyInsightsAsync(Binar
      * @return the {@link SyncPoller} for polling of provides status details for long running operations.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    public SyncPoller beginInferRadiologyInsights(BinaryData radiologyInsightsData,
+    public SyncPoller beginInferRadiologyInsights(BinaryData inferRadiologyInsightsRequest,
         RequestOptions requestOptions) {
         return SyncPoller.createPoller(Duration.ofSeconds(1),
-            () -> this.inferRadiologyInsightsWithResponse(radiologyInsightsData, requestOptions),
+            () -> this.inferRadiologyInsightsWithResponse(inferRadiologyInsightsRequest, requestOptions),
             new com.azure.health.insights.radiologyinsights.implementation.SyncOperationLocationPollingStrategy<>(
                 new PollingStrategyOptions(this.getHttpPipeline())
                     .setEndpoint("{endpoint}/health-insights".replace("{endpoint}", this.getEndpoint()))
@@ -2057,7 +2060,7 @@ public SyncPoller beginInferRadiologyInsights(BinaryData
      * }
      * }

      * 
-     * @param radiologyInsightsData Contains the list of patients, and configuration data.
+     * @param inferRadiologyInsightsRequest The inferRadiologyInsightsRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
@@ -2067,9 +2070,10 @@ public SyncPoller beginInferRadiologyInsights(BinaryData
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public PollerFlux
-        beginInferRadiologyInsightsWithModelAsync(BinaryData radiologyInsightsData, RequestOptions requestOptions) {
+        beginInferRadiologyInsightsWithModelAsync(BinaryData inferRadiologyInsightsRequest,
+            RequestOptions requestOptions) {
         return PollerFlux.create(Duration.ofSeconds(1),
-            () -> this.inferRadiologyInsightsWithResponseAsync(radiologyInsightsData, requestOptions),
+            () -> this.inferRadiologyInsightsWithResponseAsync(inferRadiologyInsightsRequest, requestOptions),
             new com.azure.health.insights.radiologyinsights.implementation.OperationLocationPollingStrategy<>(
                 new PollingStrategyOptions(this.getHttpPipeline())
                     .setEndpoint("{endpoint}/health-insights".replace("{endpoint}", this.getEndpoint()))
@@ -2434,7 +2438,7 @@ public SyncPoller beginInferRadiologyInsights(BinaryData
      * }
      * }

      * 
-     * @param radiologyInsightsData Contains the list of patients, and configuration data.
+     * @param inferRadiologyInsightsRequest The inferRadiologyInsightsRequest parameter.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
@@ -2444,9 +2448,9 @@ public SyncPoller beginInferRadiologyInsights(BinaryData
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller
-        beginInferRadiologyInsightsWithModel(BinaryData radiologyInsightsData, RequestOptions requestOptions) {
+        beginInferRadiologyInsightsWithModel(BinaryData inferRadiologyInsightsRequest, RequestOptions requestOptions) {
         return SyncPoller.createPoller(Duration.ofSeconds(1),
-            () -> this.inferRadiologyInsightsWithResponse(radiologyInsightsData, requestOptions),
+            () -> this.inferRadiologyInsightsWithResponse(inferRadiologyInsightsRequest, requestOptions),
             new com.azure.health.insights.radiologyinsights.implementation.SyncOperationLocationPollingStrategy<>(
                 new PollingStrategyOptions(this.getHttpPipeline())
                     .setEndpoint("{endpoint}/health-insights".replace("{endpoint}", this.getEndpoint()))
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/implementation/models/InferRadiologyInsightsRequest.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/implementation/models/InferRadiologyInsightsRequest.java
new file mode 100644
index 000000000000..f818f7599f68
--- /dev/null
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/implementation/models/InferRadiologyInsightsRequest.java
@@ -0,0 +1,76 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.health.insights.radiologyinsights.implementation.models;
+
+import com.azure.core.annotation.Fluent;
+import com.azure.core.annotation.Generated;
+import com.azure.health.insights.radiologyinsights.models.PatientRecord;
+import com.azure.health.insights.radiologyinsights.models.RadiologyInsightsModelConfiguration;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+
+/**
+ * The InferRadiologyInsightsRequest model.
+ */
+@Fluent
+public final class InferRadiologyInsightsRequest {
+    /*
+     * The list of patients, including their clinical information and data.
+     */
+    @Generated
+    @JsonProperty(value = "patients")
+    private final List patients;
+
+    /*
+     * Configuration affecting the Radiology Insights model's inference.
+     */
+    @Generated
+    @JsonProperty(value = "configuration")
+    private RadiologyInsightsModelConfiguration configuration;
+
+    /**
+     * Creates an instance of InferRadiologyInsightsRequest class.
+     * 
+     * @param patients the patients value to set.
+     */
+    @Generated
+    @JsonCreator
+    public InferRadiologyInsightsRequest(@JsonProperty(value = "patients") List patients) {
+        this.patients = patients;
+    }
+
+    /**
+     * Get the patients property: The list of patients, including their clinical information and data.
+     * 
+     * @return the patients value.
+     */
+    @Generated
+    public List getPatients() {
+        return this.patients;
+    }
+
+    /**
+     * Get the configuration property: Configuration affecting the Radiology Insights model's inference.
+     * 
+     * @return the configuration value.
+     */
+    @Generated
+    public RadiologyInsightsModelConfiguration getConfiguration() {
+        return this.configuration;
+    }
+
+    /**
+     * Set the configuration property: Configuration affecting the Radiology Insights model's inference.
+     * 
+     * @param configuration the configuration value to set.
+     * @return the InferRadiologyInsightsRequest object itself.
+     */
+    @Generated
+    public InferRadiologyInsightsRequest setConfiguration(RadiologyInsightsModelConfiguration configuration) {
+        this.configuration = configuration;
+        return this;
+    }
+}
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/implementation/models/package-info.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/implementation/models/package-info.java
new file mode 100644
index 000000000000..bdd36364a223
--- /dev/null
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/implementation/models/package-info.java
@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+/**
+ * 
+ * Package containing the data models for RadiologyInsights.
+ * Azure AI Health Insights provides an API that serves insight models, specific for Health & Life Sciences, that
+ * perform analysis and provide inferences to be used by a human.
+ * 
+ */
+package com.azure.health.insights.radiologyinsights.implementation.models;
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/module-info.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/module-info.java
index ad70b8fff0f4..948526aea445 100644
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/module-info.java
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/module-info.java
@@ -6,5 +6,6 @@
     requires transitive com.azure.core;
     exports com.azure.health.insights.radiologyinsights;
     exports com.azure.health.insights.radiologyinsights.models;
+    opens com.azure.health.insights.radiologyinsights.implementation.models to com.azure.core, com.fasterxml.jackson.databind;
     opens com.azure.health.insights.radiologyinsights.models to com.azure.core, com.fasterxml.jackson.databind;
 }
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/resources/META-INF/azure-health-insights-radiologyinsights_apiview_properties.json b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/resources/META-INF/azure-health-insights-radiologyinsights_apiview_properties.json
index 5dc1ae409f06..4a2f5d680f68 100644
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/resources/META-INF/azure-health-insights-radiologyinsights_apiview_properties.json
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/resources/META-INF/azure-health-insights-radiologyinsights_apiview_properties.json
@@ -1,13 +1,14 @@
 {
   "flavor": "azure", 
   "CrossLanguageDefinitionId": {
-    "com.azure.health.insights.radiologyinsights.RadiologyInsightsAsyncClient": "AzureHealthInsights.RadiologyInsightsClient",
+    "com.azure.health.insights.radiologyinsights.RadiologyInsightsAsyncClient": "ClientForAzureHealthInsights.RadiologyInsightsClient",
     "com.azure.health.insights.radiologyinsights.RadiologyInsightsAsyncClient.beginInferRadiologyInsights": "ClientForAzureHealthInsights.RadiologyInsightsClient.inferRadiologyInsights",
     "com.azure.health.insights.radiologyinsights.RadiologyInsightsAsyncClient.beginInferRadiologyInsightsWithModel": "ClientForAzureHealthInsights.RadiologyInsightsClient.inferRadiologyInsights",
-    "com.azure.health.insights.radiologyinsights.RadiologyInsightsClient": "AzureHealthInsights.RadiologyInsightsClient",
+    "com.azure.health.insights.radiologyinsights.RadiologyInsightsClient": "ClientForAzureHealthInsights.RadiologyInsightsClient",
     "com.azure.health.insights.radiologyinsights.RadiologyInsightsClient.beginInferRadiologyInsights": "ClientForAzureHealthInsights.RadiologyInsightsClient.inferRadiologyInsights",
     "com.azure.health.insights.radiologyinsights.RadiologyInsightsClient.beginInferRadiologyInsightsWithModel": "ClientForAzureHealthInsights.RadiologyInsightsClient.inferRadiologyInsights",
-    "com.azure.health.insights.radiologyinsights.RadiologyInsightsClientBuilder": "AzureHealthInsights.RadiologyInsightsClient",
+    "com.azure.health.insights.radiologyinsights.RadiologyInsightsClientBuilder": "ClientForAzureHealthInsights.RadiologyInsightsClient",
+    "com.azure.health.insights.radiologyinsights.implementation.models.InferRadiologyInsightsRequest": "inferRadiologyInsights.Request.anonymous",
     "com.azure.health.insights.radiologyinsights.models.AgeMismatchInference": "AzureHealthInsights.AgeMismatchInference",
     "com.azure.health.insights.radiologyinsights.models.ClinicalDocumentType": "AzureHealthInsights.ClinicalDocumentType",
     "com.azure.health.insights.radiologyinsights.models.CompleteOrderDiscrepancyInference": "AzureHealthInsights.CompleteOrderDiscrepancyInference",
@@ -67,7 +68,6 @@
     "com.azure.health.insights.radiologyinsights.models.PatientSex": "AzureHealthInsights.PatientInfoSex",
     "com.azure.health.insights.radiologyinsights.models.ProcedureRecommendation": "AzureHealthInsights.ProcedureRecommendation",
     "com.azure.health.insights.radiologyinsights.models.RadiologyCodeWithTypes": "AzureHealthInsights.RadiologyCodeWithTypes",
-    "com.azure.health.insights.radiologyinsights.models.RadiologyInsightsData": "AzureHealthInsights.RadiologyInsightsData",
     "com.azure.health.insights.radiologyinsights.models.RadiologyInsightsInference": "AzureHealthInsights.RadiologyInsightsInference",
     "com.azure.health.insights.radiologyinsights.models.RadiologyInsightsInferenceOptions": "AzureHealthInsights.RadiologyInsightsInferenceOptions",
     "com.azure.health.insights.radiologyinsights.models.RadiologyInsightsInferenceResult": "AzureHealthInsights.RadiologyInsightsInferenceResult",
diff --git a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/main/java/com/azure/resourcemanager/mongocluster/fluent/DocumentDBClient.java b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/main/java/com/azure/resourcemanager/mongocluster/fluent/DocumentDBClient.java
index 38bdf7114dcf..c59d30e3fab6 100644
--- a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/main/java/com/azure/resourcemanager/mongocluster/fluent/DocumentDBClient.java
+++ b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/main/java/com/azure/resourcemanager/mongocluster/fluent/DocumentDBClient.java
@@ -12,7 +12,7 @@
  */
 public interface DocumentDBClient {
     /**
-     * Gets Server parameter.
+     * Gets Service host.
      * 
      * @return the endpoint value.
      */
diff --git a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/main/java/com/azure/resourcemanager/mongocluster/implementation/DocumentDBClientBuilder.java b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/main/java/com/azure/resourcemanager/mongocluster/implementation/DocumentDBClientBuilder.java
index 899aa78dc126..686a0e2f1269 100644
--- a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/main/java/com/azure/resourcemanager/mongocluster/implementation/DocumentDBClientBuilder.java
+++ b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/main/java/com/azure/resourcemanager/mongocluster/implementation/DocumentDBClientBuilder.java
@@ -20,12 +20,12 @@
 @ServiceClientBuilder(serviceClients = { DocumentDBClientImpl.class })
 public final class DocumentDBClientBuilder {
     /*
-     * Server parameter
+     * Service host
      */
     private String endpoint;
 
     /**
-     * Sets Server parameter.
+     * Sets Service host.
      * 
      * @param endpoint the endpoint value.
      * @return the DocumentDBClientBuilder.
@@ -121,6 +121,7 @@ public DocumentDBClientBuilder serializerAdapter(SerializerAdapter serializerAda
      * @return an instance of DocumentDBClientImpl.
      */
     public DocumentDBClientImpl buildClient() {
+        String localEndpoint = (endpoint != null) ? endpoint : "https://management.azure.com";
         AzureEnvironment localEnvironment = (environment != null) ? environment : AzureEnvironment.AZURE;
         HttpPipeline localPipeline = (pipeline != null)
             ? pipeline
@@ -131,7 +132,7 @@ public DocumentDBClientImpl buildClient() {
             ? serializerAdapter
             : SerializerFactory.createDefaultManagementSerializerAdapter();
         DocumentDBClientImpl client = new DocumentDBClientImpl(localPipeline, localSerializerAdapter,
-            localDefaultPollInterval, localEnvironment, this.endpoint, this.subscriptionId);
+            localDefaultPollInterval, localEnvironment, localEndpoint, this.subscriptionId);
         return client;
     }
 }
diff --git a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/main/java/com/azure/resourcemanager/mongocluster/implementation/DocumentDBClientImpl.java b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/main/java/com/azure/resourcemanager/mongocluster/implementation/DocumentDBClientImpl.java
index 8175c14c61ea..c9102253ca2d 100644
--- a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/main/java/com/azure/resourcemanager/mongocluster/implementation/DocumentDBClientImpl.java
+++ b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/main/java/com/azure/resourcemanager/mongocluster/implementation/DocumentDBClientImpl.java
@@ -44,12 +44,12 @@
 @ServiceClient(builder = DocumentDBClientBuilder.class)
 public final class DocumentDBClientImpl implements DocumentDBClient {
     /**
-     * Server parameter.
+     * Service host.
      */
     private final String endpoint;
 
     /**
-     * Gets Server parameter.
+     * Gets Service host.
      * 
      * @return the endpoint value.
      */
@@ -204,7 +204,7 @@ public PrivateLinksClient getPrivateLinks() {
      * @param serializerAdapter The serializer to serialize an object into a string.
      * @param defaultPollInterval The default poll interval for long-running operation.
      * @param environment The Azure environment.
-     * @param endpoint Server parameter.
+     * @param endpoint Service host.
      * @param subscriptionId The ID of the target subscription. The value must be an UUID.
      */
     DocumentDBClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, Duration defaultPollInterval,
diff --git a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/main/java/com/azure/resourcemanager/mongocluster/implementation/FirewallRulesClientImpl.java b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/main/java/com/azure/resourcemanager/mongocluster/implementation/FirewallRulesClientImpl.java
index 3e134773a758..0ab4462b8ed7 100644
--- a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/main/java/com/azure/resourcemanager/mongocluster/implementation/FirewallRulesClientImpl.java
+++ b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/main/java/com/azure/resourcemanager/mongocluster/implementation/FirewallRulesClientImpl.java
@@ -78,10 +78,9 @@ Mono> get(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName,
             @PathParam("mongoClusterName") String mongoClusterName,
-            @PathParam("firewallRuleName") String firewallRuleName, @HeaderParam("accept") String accept,
+            @PathParam("firewallRuleName") String firewallRuleName, @HeaderParam("Accept") String accept,
             Context context);
 
-        @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DocumentDB/mongoClusters/{mongoClusterName}/firewallRules/{firewallRuleName}")
         @ExpectedResponses({ 200, 201, 202 })
         @UnexpectedResponseExceptionType(ManagementException.class)
@@ -89,8 +88,9 @@ Mono>> createOrUpdate(@HostParam("endpoint") String en
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName,
             @PathParam("mongoClusterName") String mongoClusterName,
-            @PathParam("firewallRuleName") String firewallRuleName, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") FirewallRuleInner resource, Context context);
+            @PathParam("firewallRuleName") String firewallRuleName, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") FirewallRuleInner resource,
+            Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DocumentDB/mongoClusters/{mongoClusterName}/firewallRules/{firewallRuleName}")
@@ -100,7 +100,7 @@ Mono>> delete(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName,
             @PathParam("mongoClusterName") String mongoClusterName,
-            @PathParam("firewallRuleName") String firewallRuleName, @HeaderParam("accept") String accept,
+            @PathParam("firewallRuleName") String firewallRuleName, @HeaderParam("Accept") String accept,
             Context context);
 
         @Headers({ "Content-Type: application/json" })
@@ -110,7 +110,7 @@ Mono>> delete(@HostParam("endpoint") String endpoint,
         Mono> listByMongoCluster(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName,
-            @PathParam("mongoClusterName") String mongoClusterName, @HeaderParam("accept") String accept,
+            @PathParam("mongoClusterName") String mongoClusterName, @HeaderParam("Accept") String accept,
             Context context);
 
         @Headers({ "Content-Type: application/json" })
@@ -119,7 +119,7 @@ Mono> listByMongoCluster(@HostParam("endpoint")
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listByMongoClusterNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -298,11 +298,12 @@ private Mono>> createOrUpdateWithResponseAsync(String
         } else {
             resource.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getApiVersion(),
-                this.client.getSubscriptionId(), resourceGroupName, mongoClusterName, firewallRuleName, accept,
-                resource, context))
+                this.client.getSubscriptionId(), resourceGroupName, mongoClusterName, firewallRuleName, contentType,
+                accept, resource, context))
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
@@ -348,11 +349,12 @@ private Mono>> createOrUpdateWithResponseAsync(String
         } else {
             resource.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getApiVersion(),
-            this.client.getSubscriptionId(), resourceGroupName, mongoClusterName, firewallRuleName, accept, resource,
-            context);
+            this.client.getSubscriptionId(), resourceGroupName, mongoClusterName, firewallRuleName, contentType, accept,
+            resource, context);
     }
 
     /**
@@ -886,6 +888,8 @@ public PagedIterable listByMongoCluster(String resourceGroupN
     }
 
     /**
+     * List all the firewall rules in a given mongo cluster.
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -914,6 +918,8 @@ private Mono> listByMongoClusterNextSinglePageA
     }
 
     /**
+     * List all the firewall rules in a given mongo cluster.
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
diff --git a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/main/java/com/azure/resourcemanager/mongocluster/implementation/MongoClustersClientImpl.java b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/main/java/com/azure/resourcemanager/mongocluster/implementation/MongoClustersClientImpl.java
index a762da85e656..afdea8b37757 100644
--- a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/main/java/com/azure/resourcemanager/mongocluster/implementation/MongoClustersClientImpl.java
+++ b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/main/java/com/azure/resourcemanager/mongocluster/implementation/MongoClustersClientImpl.java
@@ -83,28 +83,28 @@ public interface MongoClustersService {
         Mono> getByResourceGroup(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName,
-            @PathParam("mongoClusterName") String mongoClusterName, @HeaderParam("accept") String accept,
+            @PathParam("mongoClusterName") String mongoClusterName, @HeaderParam("Accept") String accept,
             Context context);
 
-        @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DocumentDB/mongoClusters/{mongoClusterName}")
         @ExpectedResponses({ 200, 201 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono>> createOrUpdate(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName,
-            @PathParam("mongoClusterName") String mongoClusterName, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") MongoClusterInner resource, Context context);
+            @PathParam("mongoClusterName") String mongoClusterName, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") MongoClusterInner resource,
+            Context context);
 
-        @Headers({ "Content-Type: application/json" })
         @Patch("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DocumentDB/mongoClusters/{mongoClusterName}")
         @ExpectedResponses({ 200, 202 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono>> update(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName,
-            @PathParam("mongoClusterName") String mongoClusterName, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") MongoClusterUpdate properties, Context context);
+            @PathParam("mongoClusterName") String mongoClusterName, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") MongoClusterUpdate properties,
+            Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Delete("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DocumentDB/mongoClusters/{mongoClusterName}")
@@ -113,7 +113,7 @@ Mono>> update(@HostParam("endpoint") String endpoint,
         Mono>> delete(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName,
-            @PathParam("mongoClusterName") String mongoClusterName, @HeaderParam("accept") String accept,
+            @PathParam("mongoClusterName") String mongoClusterName, @HeaderParam("Accept") String accept,
             Context context);
 
         @Headers({ "Content-Type: application/json" })
@@ -122,7 +122,7 @@ Mono>> delete(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listByResourceGroup(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
-            @PathParam("resourceGroupName") String resourceGroupName, @HeaderParam("accept") String accept,
+            @PathParam("resourceGroupName") String resourceGroupName, @HeaderParam("Accept") String accept,
             Context context);
 
         @Headers({ "Content-Type: application/json" })
@@ -131,7 +131,7 @@ Mono> listByResourceGroup(@HostParam("endpoint"
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> list(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DocumentDB/mongoClusters/{mongoClusterName}/listConnectionStrings")
@@ -140,17 +140,17 @@ Mono> list(@HostParam("endpoint") String endpoi
         Mono> listConnectionStrings(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName,
-            @PathParam("mongoClusterName") String mongoClusterName, @HeaderParam("accept") String accept,
+            @PathParam("mongoClusterName") String mongoClusterName, @HeaderParam("Accept") String accept,
             Context context);
 
-        @Headers({ "Content-Type: application/json" })
         @Post("/subscriptions/{subscriptionId}/providers/Microsoft.DocumentDB/locations/{location}/checkMongoClusterNameAvailability")
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> checkNameAvailability(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
-            @PathParam("location") String location, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") CheckNameAvailabilityRequest body, Context context);
+            @PathParam("location") String location, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") CheckNameAvailabilityRequest body,
+            Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
@@ -158,14 +158,14 @@ Mono> checkNameAvailability(@HostPa
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listByResourceGroupNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, Context context);
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -324,10 +324,12 @@ private Mono>> createOrUpdateWithResponseAsync(String
         } else {
             resource.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getApiVersion(),
-                this.client.getSubscriptionId(), resourceGroupName, mongoClusterName, accept, resource, context))
+                this.client.getSubscriptionId(), resourceGroupName, mongoClusterName, contentType, accept, resource,
+                context))
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
@@ -368,10 +370,12 @@ private Mono>> createOrUpdateWithResponseAsync(String
         } else {
             resource.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getApiVersion(),
-            this.client.getSubscriptionId(), resourceGroupName, mongoClusterName, accept, resource, context);
+            this.client.getSubscriptionId(), resourceGroupName, mongoClusterName, contentType, accept, resource,
+            context);
     }
 
     /**
@@ -567,10 +571,12 @@ private Mono>> updateWithResponseAsync(String resource
         } else {
             properties.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.update(this.client.getEndpoint(), this.client.getApiVersion(),
-                this.client.getSubscriptionId(), resourceGroupName, mongoClusterName, accept, properties, context))
+                this.client.getSubscriptionId(), resourceGroupName, mongoClusterName, contentType, accept, properties,
+                context))
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
@@ -611,10 +617,11 @@ private Mono>> updateWithResponseAsync(String resource
         } else {
             properties.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.update(this.client.getEndpoint(), this.client.getApiVersion(), this.client.getSubscriptionId(),
-            resourceGroupName, mongoClusterName, accept, properties, context);
+            resourceGroupName, mongoClusterName, contentType, accept, properties, context);
     }
 
     /**
@@ -1371,10 +1378,12 @@ private Mono> checkNameAvailability
         } else {
             body.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil
-            .withContext(context -> service.checkNameAvailability(this.client.getEndpoint(),
-                this.client.getApiVersion(), this.client.getSubscriptionId(), location, accept, body, context))
+            .withContext(
+                context -> service.checkNameAvailability(this.client.getEndpoint(), this.client.getApiVersion(),
+                    this.client.getSubscriptionId(), location, contentType, accept, body, context))
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
@@ -1408,10 +1417,11 @@ private Mono> checkNameAvailability
         } else {
             body.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.checkNameAvailability(this.client.getEndpoint(), this.client.getApiVersion(),
-            this.client.getSubscriptionId(), location, accept, body, context);
+            this.client.getSubscriptionId(), location, contentType, accept, body, context);
     }
 
     /**
@@ -1464,6 +1474,8 @@ public CheckNameAvailabilityResponseInner checkNameAvailability(String location,
     }
 
     /**
+     * List all the mongo clusters in a given resource group.
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -1492,6 +1504,8 @@ private Mono> listByResourceGroupNextSinglePage
     }
 
     /**
+     * List all the mongo clusters in a given resource group.
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -1520,6 +1534,8 @@ private Mono> listByResourceGroupNextSinglePage
     }
 
     /**
+     * List all the mongo clusters in a given subscription.
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -1546,6 +1562,8 @@ private Mono> listNextSinglePageAsync(String ne
     }
 
     /**
+     * List all the mongo clusters in a given subscription.
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
diff --git a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/main/java/com/azure/resourcemanager/mongocluster/implementation/OperationsClientImpl.java b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/main/java/com/azure/resourcemanager/mongocluster/implementation/OperationsClientImpl.java
index ddcad08ab734..40c468a95417 100644
--- a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/main/java/com/azure/resourcemanager/mongocluster/implementation/OperationsClientImpl.java
+++ b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/main/java/com/azure/resourcemanager/mongocluster/implementation/OperationsClientImpl.java
@@ -67,14 +67,14 @@ public interface OperationsService {
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> list(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, Context context);
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -181,6 +181,8 @@ public PagedIterable list(Context context) {
     }
 
     /**
+     * List the operations for the provider
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -207,6 +209,8 @@ private Mono> listNextSinglePageAsync(String nextL
     }
 
     /**
+     * List the operations for the provider
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
diff --git a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/main/java/com/azure/resourcemanager/mongocluster/implementation/PrivateEndpointConnectionsClientImpl.java b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/main/java/com/azure/resourcemanager/mongocluster/implementation/PrivateEndpointConnectionsClientImpl.java
index 277e962a7b36..b8b50600cd2c 100644
--- a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/main/java/com/azure/resourcemanager/mongocluster/implementation/PrivateEndpointConnectionsClientImpl.java
+++ b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/main/java/com/azure/resourcemanager/mongocluster/implementation/PrivateEndpointConnectionsClientImpl.java
@@ -78,7 +78,7 @@ Mono> listByMongoCluster(
             @HostParam("endpoint") String endpoint, @QueryParam("api-version") String apiVersion,
             @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName,
-            @PathParam("mongoClusterName") String mongoClusterName, @HeaderParam("accept") String accept,
+            @PathParam("mongoClusterName") String mongoClusterName, @HeaderParam("Accept") String accept,
             Context context);
 
         @Headers({ "Content-Type: application/json" })
@@ -90,9 +90,8 @@ Mono> get(@HostParam("endpoint"
             @PathParam("resourceGroupName") String resourceGroupName,
             @PathParam("mongoClusterName") String mongoClusterName,
             @PathParam("privateEndpointConnectionName") String privateEndpointConnectionName,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
-        @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DocumentDB/mongoClusters/{mongoClusterName}/privateEndpointConnections/{privateEndpointConnectionName}")
         @ExpectedResponses({ 200, 201, 202 })
         @UnexpectedResponseExceptionType(ManagementException.class)
@@ -101,7 +100,7 @@ Mono>> create(@HostParam("endpoint") String endpoint,
             @PathParam("resourceGroupName") String resourceGroupName,
             @PathParam("mongoClusterName") String mongoClusterName,
             @PathParam("privateEndpointConnectionName") String privateEndpointConnectionName,
-            @HeaderParam("accept") String accept,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") PrivateEndpointConnectionResourceInner resource, Context context);
 
         @Headers({ "Content-Type: application/json" })
@@ -113,7 +112,7 @@ Mono>> delete(@HostParam("endpoint") String endpoint,
             @PathParam("resourceGroupName") String resourceGroupName,
             @PathParam("mongoClusterName") String mongoClusterName,
             @PathParam("privateEndpointConnectionName") String privateEndpointConnectionName,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
@@ -121,7 +120,7 @@ Mono>> delete(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listByMongoClusterNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -459,11 +458,12 @@ private Mono>> createWithResponseAsync(String resource
         } else {
             resource.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.create(this.client.getEndpoint(), this.client.getApiVersion(),
                 this.client.getSubscriptionId(), resourceGroupName, mongoClusterName, privateEndpointConnectionName,
-                accept, resource, context))
+                contentType, accept, resource, context))
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
@@ -509,10 +509,11 @@ private Mono>> createWithResponseAsync(String resource
         } else {
             resource.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.create(this.client.getEndpoint(), this.client.getApiVersion(), this.client.getSubscriptionId(),
-            resourceGroupName, mongoClusterName, privateEndpointConnectionName, accept, resource, context);
+            resourceGroupName, mongoClusterName, privateEndpointConnectionName, contentType, accept, resource, context);
     }
 
     /**
@@ -933,6 +934,8 @@ public void delete(String resourceGroupName, String mongoClusterName, String pri
     }
 
     /**
+     * List existing private connections
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -962,6 +965,8 @@ public void delete(String resourceGroupName, String mongoClusterName, String pri
     }
 
     /**
+     * List existing private connections
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
diff --git a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/main/java/com/azure/resourcemanager/mongocluster/implementation/PrivateLinksClientImpl.java b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/main/java/com/azure/resourcemanager/mongocluster/implementation/PrivateLinksClientImpl.java
index 26b63a75d40c..ec7bc2f2cb8c 100644
--- a/sdk/mongocluster/azure-resourcemanager-mongocluster/src/main/java/com/azure/resourcemanager/mongocluster/implementation/PrivateLinksClientImpl.java
+++ b/sdk/mongocluster/azure-resourcemanager-mongocluster/src/main/java/com/azure/resourcemanager/mongocluster/implementation/PrivateLinksClientImpl.java
@@ -69,7 +69,7 @@ public interface PrivateLinksService {
         Mono> listByMongoCluster(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName,
-            @PathParam("mongoClusterName") String mongoClusterName, @HeaderParam("accept") String accept,
+            @PathParam("mongoClusterName") String mongoClusterName, @HeaderParam("Accept") String accept,
             Context context);
 
         @Headers({ "Content-Type: application/json" })
@@ -78,7 +78,7 @@ Mono> listByMongoCluster(@HostParam("end
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listByMongoClusterNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -229,6 +229,8 @@ public PagedIterable listByMongoCluster(String resourc
     }
 
     /**
+     * list private links on the given resource
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -257,6 +259,8 @@ private Mono> listByMongoClusterNextSing
     }
 
     /**
+     * list private links on the given resource
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
diff --git a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/implementation/AssistantsClientImpl.java b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/implementation/AssistantsClientImpl.java
index 11d232aea5cd..2574bcdd978c 100644
--- a/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/implementation/AssistantsClientImpl.java
+++ b/sdk/openai/azure-ai-openai-assistants/src/main/java/com/azure/ai/openai/assistants/implementation/AssistantsClientImpl.java
@@ -154,8 +154,9 @@ public interface AssistantsClientService {
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> createAssistant(@HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData assistantCreationOptions,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData assistantCreationOptions, RequestOptions requestOptions,
+            Context context);
 
         @Post("/assistants")
         @ExpectedResponses({ 200 })
@@ -164,8 +165,9 @@ Mono> createAssistant(@HostParam("endpoint") String endpoin
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response createAssistantSync(@HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData assistantCreationOptions,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData assistantCreationOptions, RequestOptions requestOptions,
+            Context context);
 
         @Get("/assistants")
         @ExpectedResponses({ 200 })
@@ -174,7 +176,7 @@ Response createAssistantSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listAssistants(@HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/assistants")
         @ExpectedResponses({ 200 })
@@ -183,7 +185,7 @@ Mono> listAssistants(@HostParam("endpoint") String endpoint
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listAssistantsSync(@HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/assistants/{assistantId}")
         @ExpectedResponses({ 200 })
@@ -192,7 +194,7 @@ Response listAssistantsSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getAssistant(@HostParam("endpoint") String endpoint,
-            @PathParam("assistantId") String assistantId, @HeaderParam("accept") String accept,
+            @PathParam("assistantId") String assistantId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/assistants/{assistantId}")
@@ -202,7 +204,7 @@ Mono> getAssistant(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getAssistantSync(@HostParam("endpoint") String endpoint,
-            @PathParam("assistantId") String assistantId, @HeaderParam("accept") String accept,
+            @PathParam("assistantId") String assistantId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Post("/assistants/{assistantId}")
@@ -212,9 +214,9 @@ Response getAssistantSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> updateAssistant(@HostParam("endpoint") String endpoint,
-            @PathParam("assistantId") String assistantId, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData updateAssistantOptions, RequestOptions requestOptions,
-            Context context);
+            @PathParam("assistantId") String assistantId, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData updateAssistantOptions,
+            RequestOptions requestOptions, Context context);
 
         @Post("/assistants/{assistantId}")
         @ExpectedResponses({ 200 })
@@ -223,9 +225,9 @@ Mono> updateAssistant(@HostParam("endpoint") String endpoin
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response updateAssistantSync(@HostParam("endpoint") String endpoint,
-            @PathParam("assistantId") String assistantId, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData updateAssistantOptions, RequestOptions requestOptions,
-            Context context);
+            @PathParam("assistantId") String assistantId, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData updateAssistantOptions,
+            RequestOptions requestOptions, Context context);
 
         @Delete("/assistants/{assistantId}")
         @ExpectedResponses({ 200 })
@@ -234,7 +236,7 @@ Response updateAssistantSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> deleteAssistant(@HostParam("endpoint") String endpoint,
-            @PathParam("assistantId") String assistantId, @HeaderParam("accept") String accept,
+            @PathParam("assistantId") String assistantId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Delete("/assistants/{assistantId}")
@@ -244,7 +246,7 @@ Mono> deleteAssistant(@HostParam("endpoint") String endpoin
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response deleteAssistantSync(@HostParam("endpoint") String endpoint,
-            @PathParam("assistantId") String assistantId, @HeaderParam("accept") String accept,
+            @PathParam("assistantId") String assistantId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Post("/threads")
@@ -254,7 +256,7 @@ Response deleteAssistantSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> createThread(@HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") BinaryData assistantThreadCreationOptions, RequestOptions requestOptions,
             Context context);
 
@@ -265,7 +267,7 @@ Mono> createThread(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response createThreadSync(@HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") BinaryData assistantThreadCreationOptions, RequestOptions requestOptions,
             Context context);
 
@@ -276,7 +278,7 @@ Response createThreadSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getThread(@HostParam("endpoint") String endpoint,
-            @PathParam("threadId") String threadId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("threadId") String threadId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/threads/{threadId}")
@@ -286,7 +288,7 @@ Mono> getThread(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getThreadSync(@HostParam("endpoint") String endpoint,
-            @PathParam("threadId") String threadId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("threadId") String threadId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Post("/threads/{threadId}")
@@ -296,7 +298,8 @@ Response getThreadSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> updateThread(@HostParam("endpoint") String endpoint,
-            @PathParam("threadId") String threadId, @HeaderParam("accept") String accept,
+            @PathParam("threadId") String threadId, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept,
             @BodyParam("application/json") BinaryData updateAssistantThreadOptions, RequestOptions requestOptions,
             Context context);
 
@@ -307,7 +310,8 @@ Mono> updateThread(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response updateThreadSync(@HostParam("endpoint") String endpoint,
-            @PathParam("threadId") String threadId, @HeaderParam("accept") String accept,
+            @PathParam("threadId") String threadId, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept,
             @BodyParam("application/json") BinaryData updateAssistantThreadOptions, RequestOptions requestOptions,
             Context context);
 
@@ -318,7 +322,7 @@ Response updateThreadSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> deleteThread(@HostParam("endpoint") String endpoint,
-            @PathParam("threadId") String threadId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("threadId") String threadId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Delete("/threads/{threadId}")
@@ -328,7 +332,7 @@ Mono> deleteThread(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response deleteThreadSync(@HostParam("endpoint") String endpoint,
-            @PathParam("threadId") String threadId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("threadId") String threadId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Post("/threads/{threadId}/messages")
@@ -338,9 +342,9 @@ Response deleteThreadSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> createMessage(@HostParam("endpoint") String endpoint,
-            @PathParam("threadId") String threadId, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData threadMessageOptions, RequestOptions requestOptions,
-            Context context);
+            @PathParam("threadId") String threadId, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData threadMessageOptions,
+            RequestOptions requestOptions, Context context);
 
         @Post("/threads/{threadId}/messages")
         @ExpectedResponses({ 200 })
@@ -349,9 +353,9 @@ Mono> createMessage(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response createMessageSync(@HostParam("endpoint") String endpoint,
-            @PathParam("threadId") String threadId, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData threadMessageOptions, RequestOptions requestOptions,
-            Context context);
+            @PathParam("threadId") String threadId, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData threadMessageOptions,
+            RequestOptions requestOptions, Context context);
 
         @Get("/threads/{threadId}/messages")
         @ExpectedResponses({ 200 })
@@ -360,7 +364,7 @@ Response createMessageSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listMessages(@HostParam("endpoint") String endpoint,
-            @PathParam("threadId") String threadId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("threadId") String threadId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/threads/{threadId}/messages")
@@ -370,7 +374,7 @@ Mono> listMessages(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listMessagesSync(@HostParam("endpoint") String endpoint,
-            @PathParam("threadId") String threadId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("threadId") String threadId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/threads/{threadId}/messages/{messageId}")
@@ -381,7 +385,7 @@ Response listMessagesSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getMessage(@HostParam("endpoint") String endpoint,
             @PathParam("threadId") String threadId, @PathParam("messageId") String messageId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/threads/{threadId}/messages/{messageId}")
         @ExpectedResponses({ 200 })
@@ -391,7 +395,7 @@ Mono> getMessage(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getMessageSync(@HostParam("endpoint") String endpoint,
             @PathParam("threadId") String threadId, @PathParam("messageId") String messageId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/threads/{threadId}/messages/{messageId}")
         @ExpectedResponses({ 200 })
@@ -401,8 +405,9 @@ Response getMessageSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> updateMessage(@HostParam("endpoint") String endpoint,
             @PathParam("threadId") String threadId, @PathParam("messageId") String messageId,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData updateMessageRequest,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData updateMessageRequest, RequestOptions requestOptions,
+            Context context);
 
         @Post("/threads/{threadId}/messages/{messageId}")
         @ExpectedResponses({ 200 })
@@ -412,8 +417,9 @@ Mono> updateMessage(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response updateMessageSync(@HostParam("endpoint") String endpoint,
             @PathParam("threadId") String threadId, @PathParam("messageId") String messageId,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData updateMessageRequest,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData updateMessageRequest, RequestOptions requestOptions,
+            Context context);
 
         @Post("/threads/{threadId}/runs")
         @ExpectedResponses({ 200 })
@@ -422,8 +428,9 @@ Response updateMessageSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> createRun(@HostParam("endpoint") String endpoint,
-            @PathParam("threadId") String threadId, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData createRunOptions, RequestOptions requestOptions, Context context);
+            @PathParam("threadId") String threadId, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData createRunOptions,
+            RequestOptions requestOptions, Context context);
 
         @Post("/threads/{threadId}/runs")
         @ExpectedResponses({ 200 })
@@ -432,8 +439,9 @@ Mono> createRun(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response createRunSync(@HostParam("endpoint") String endpoint,
-            @PathParam("threadId") String threadId, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData createRunOptions, RequestOptions requestOptions, Context context);
+            @PathParam("threadId") String threadId, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData createRunOptions,
+            RequestOptions requestOptions, Context context);
 
         @Get("/threads/{threadId}/runs")
         @ExpectedResponses({ 200 })
@@ -442,7 +450,7 @@ Response createRunSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listRuns(@HostParam("endpoint") String endpoint,
-            @PathParam("threadId") String threadId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("threadId") String threadId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/threads/{threadId}/runs")
@@ -452,7 +460,7 @@ Mono> listRuns(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listRunsSync(@HostParam("endpoint") String endpoint,
-            @PathParam("threadId") String threadId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("threadId") String threadId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/threads/{threadId}/runs/{runId}")
@@ -463,7 +471,7 @@ Response listRunsSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getRun(@HostParam("endpoint") String endpoint,
             @PathParam("threadId") String threadId, @PathParam("runId") String runId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/threads/{threadId}/runs/{runId}")
         @ExpectedResponses({ 200 })
@@ -472,7 +480,7 @@ Mono> getRun(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getRunSync(@HostParam("endpoint") String endpoint, @PathParam("threadId") String threadId,
-            @PathParam("runId") String runId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("runId") String runId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Post("/threads/{threadId}/runs/{runId}")
@@ -483,8 +491,8 @@ Response getRunSync(@HostParam("endpoint") String endpoint, @PathPar
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> updateRun(@HostParam("endpoint") String endpoint,
             @PathParam("threadId") String threadId, @PathParam("runId") String runId,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData updateRunRequest,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData updateRunRequest, RequestOptions requestOptions, Context context);
 
         @Post("/threads/{threadId}/runs/{runId}")
         @ExpectedResponses({ 200 })
@@ -494,8 +502,8 @@ Mono> updateRun(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response updateRunSync(@HostParam("endpoint") String endpoint,
             @PathParam("threadId") String threadId, @PathParam("runId") String runId,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData updateRunRequest,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData updateRunRequest, RequestOptions requestOptions, Context context);
 
         @Post("/threads/{threadId}/runs/{runId}/submit_tool_outputs")
         @ExpectedResponses({ 200 })
@@ -505,7 +513,7 @@ Response updateRunSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> submitToolOutputsToRun(@HostParam("endpoint") String endpoint,
             @PathParam("threadId") String threadId, @PathParam("runId") String runId,
-            @HeaderParam("accept") String accept,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") BinaryData submitToolOutputsToRunRequest, RequestOptions requestOptions,
             Context context);
 
@@ -517,7 +525,7 @@ Mono> submitToolOutputsToRun(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response submitToolOutputsToRunSync(@HostParam("endpoint") String endpoint,
             @PathParam("threadId") String threadId, @PathParam("runId") String runId,
-            @HeaderParam("accept") String accept,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") BinaryData submitToolOutputsToRunRequest, RequestOptions requestOptions,
             Context context);
 
@@ -529,7 +537,7 @@ Response submitToolOutputsToRunSync(@HostParam("endpoint") String en
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> cancelRun(@HostParam("endpoint") String endpoint,
             @PathParam("threadId") String threadId, @PathParam("runId") String runId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/threads/{threadId}/runs/{runId}/cancel")
         @ExpectedResponses({ 200 })
@@ -539,7 +547,7 @@ Mono> cancelRun(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response cancelRunSync(@HostParam("endpoint") String endpoint,
             @PathParam("threadId") String threadId, @PathParam("runId") String runId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/threads/runs")
         @ExpectedResponses({ 200 })
@@ -548,8 +556,9 @@ Response cancelRunSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> createThreadAndRun(@HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData createAndRunThreadOptions,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData createAndRunThreadOptions, RequestOptions requestOptions,
+            Context context);
 
         @Post("/threads/runs")
         @ExpectedResponses({ 200 })
@@ -558,8 +567,9 @@ Mono> createThreadAndRun(@HostParam("endpoint") String endp
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response createThreadAndRunSync(@HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData createAndRunThreadOptions,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData createAndRunThreadOptions, RequestOptions requestOptions,
+            Context context);
 
         @Get("/threads/{threadId}/runs/{runId}/steps/{stepId}")
         @ExpectedResponses({ 200 })
@@ -569,7 +579,7 @@ Response createThreadAndRunSync(@HostParam("endpoint") String endpoi
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getRunStep(@HostParam("endpoint") String endpoint,
             @PathParam("threadId") String threadId, @PathParam("runId") String runId,
-            @PathParam("stepId") String stepId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("stepId") String stepId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/threads/{threadId}/runs/{runId}/steps/{stepId}")
@@ -580,7 +590,7 @@ Mono> getRunStep(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getRunStepSync(@HostParam("endpoint") String endpoint,
             @PathParam("threadId") String threadId, @PathParam("runId") String runId,
-            @PathParam("stepId") String stepId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("stepId") String stepId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/threads/{threadId}/runs/{runId}/steps")
@@ -591,7 +601,7 @@ Response getRunStepSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listRunSteps(@HostParam("endpoint") String endpoint,
             @PathParam("threadId") String threadId, @PathParam("runId") String runId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/threads/{threadId}/runs/{runId}/steps")
         @ExpectedResponses({ 200 })
@@ -601,7 +611,7 @@ Mono> listRunSteps(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listRunStepsSync(@HostParam("endpoint") String endpoint,
             @PathParam("threadId") String threadId, @PathParam("runId") String runId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/files")
         @ExpectedResponses({ 200 })
@@ -610,7 +620,7 @@ Response listRunStepsSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listFiles(@HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/files")
         @ExpectedResponses({ 200 })
@@ -618,7 +628,7 @@ Mono> listFiles(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 })
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Response listFilesSync(@HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept,
+        Response listFilesSync(@HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         // @Multipart not supported by RestProxy
@@ -629,7 +639,7 @@ Response listFilesSync(@HostParam("endpoint") String endpoint, @Head
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> uploadFile(@HostParam("endpoint") String endpoint,
-            @HeaderParam("content-type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("multipart/form-data") BinaryData uploadFileRequest, RequestOptions requestOptions,
             Context context);
 
@@ -641,7 +651,7 @@ Mono> uploadFile(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response uploadFileSync(@HostParam("endpoint") String endpoint,
-            @HeaderParam("content-type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("multipart/form-data") BinaryData uploadFileRequest, RequestOptions requestOptions,
             Context context);
 
@@ -652,7 +662,7 @@ Response uploadFileSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> deleteFile(@HostParam("endpoint") String endpoint,
-            @PathParam("fileId") String fileId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("fileId") String fileId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Delete("/files/{fileId}")
@@ -662,7 +672,7 @@ Mono> deleteFile(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response deleteFileSync(@HostParam("endpoint") String endpoint, @PathParam("fileId") String fileId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/files/{fileId}")
         @ExpectedResponses({ 200 })
@@ -671,7 +681,7 @@ Response deleteFileSync(@HostParam("endpoint") String endpoint, @Pat
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getFile(@HostParam("endpoint") String endpoint, @PathParam("fileId") String fileId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/files/{fileId}")
         @ExpectedResponses({ 200 })
@@ -680,7 +690,7 @@ Mono> getFile(@HostParam("endpoint") String endpoint, @Path
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getFileSync(@HostParam("endpoint") String endpoint, @PathParam("fileId") String fileId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/files/{fileId}/content")
         @ExpectedResponses({ 200 })
@@ -689,7 +699,7 @@ Response getFileSync(@HostParam("endpoint") String endpoint, @PathPa
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getFileContent(@HostParam("endpoint") String endpoint,
-            @PathParam("fileId") String fileId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("fileId") String fileId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/files/{fileId}/content")
@@ -699,7 +709,7 @@ Mono> getFileContent(@HostParam("endpoint") String endpoint
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getFileContentSync(@HostParam("endpoint") String endpoint,
-            @PathParam("fileId") String fileId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("fileId") String fileId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/vector_stores")
@@ -709,7 +719,7 @@ Response getFileContentSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listVectorStores(@HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/vector_stores")
         @ExpectedResponses({ 200 })
@@ -718,7 +728,7 @@ Mono> listVectorStores(@HostParam("endpoint") String endpoi
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listVectorStoresSync(@HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/vector_stores")
         @ExpectedResponses({ 200 })
@@ -727,8 +737,9 @@ Response listVectorStoresSync(@HostParam("endpoint") String endpoint
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> createVectorStore(@HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData vectorStoreOptions,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData vectorStoreOptions, RequestOptions requestOptions,
+            Context context);
 
         @Post("/vector_stores")
         @ExpectedResponses({ 200 })
@@ -737,8 +748,9 @@ Mono> createVectorStore(@HostParam("endpoint") String endpo
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response createVectorStoreSync(@HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData vectorStoreOptions,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData vectorStoreOptions, RequestOptions requestOptions,
+            Context context);
 
         @Get("/vector_stores/{vectorStoreId}")
         @ExpectedResponses({ 200 })
@@ -747,7 +759,7 @@ Response createVectorStoreSync(@HostParam("endpoint") String endpoin
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getVectorStore(@HostParam("endpoint") String endpoint,
-            @PathParam("vectorStoreId") String vectorStoreId, @HeaderParam("accept") String accept,
+            @PathParam("vectorStoreId") String vectorStoreId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/vector_stores/{vectorStoreId}")
@@ -757,7 +769,7 @@ Mono> getVectorStore(@HostParam("endpoint") String endpoint
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getVectorStoreSync(@HostParam("endpoint") String endpoint,
-            @PathParam("vectorStoreId") String vectorStoreId, @HeaderParam("accept") String accept,
+            @PathParam("vectorStoreId") String vectorStoreId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Post("/vector_stores/{vectorStoreId}")
@@ -767,9 +779,9 @@ Response getVectorStoreSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> modifyVectorStore(@HostParam("endpoint") String endpoint,
-            @PathParam("vectorStoreId") String vectorStoreId, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData vectorStoreUpdateOptions, RequestOptions requestOptions,
-            Context context);
+            @PathParam("vectorStoreId") String vectorStoreId, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData vectorStoreUpdateOptions,
+            RequestOptions requestOptions, Context context);
 
         @Post("/vector_stores/{vectorStoreId}")
         @ExpectedResponses({ 200 })
@@ -778,9 +790,9 @@ Mono> modifyVectorStore(@HostParam("endpoint") String endpo
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response modifyVectorStoreSync(@HostParam("endpoint") String endpoint,
-            @PathParam("vectorStoreId") String vectorStoreId, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData vectorStoreUpdateOptions, RequestOptions requestOptions,
-            Context context);
+            @PathParam("vectorStoreId") String vectorStoreId, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData vectorStoreUpdateOptions,
+            RequestOptions requestOptions, Context context);
 
         @Delete("/vector_stores/{vectorStoreId}")
         @ExpectedResponses({ 200 })
@@ -789,7 +801,7 @@ Response modifyVectorStoreSync(@HostParam("endpoint") String endpoin
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> deleteVectorStore(@HostParam("endpoint") String endpoint,
-            @PathParam("vectorStoreId") String vectorStoreId, @HeaderParam("accept") String accept,
+            @PathParam("vectorStoreId") String vectorStoreId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Delete("/vector_stores/{vectorStoreId}")
@@ -799,7 +811,7 @@ Mono> deleteVectorStore(@HostParam("endpoint") String endpo
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response deleteVectorStoreSync(@HostParam("endpoint") String endpoint,
-            @PathParam("vectorStoreId") String vectorStoreId, @HeaderParam("accept") String accept,
+            @PathParam("vectorStoreId") String vectorStoreId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/vector_stores/{vectorStoreId}/files")
@@ -809,7 +821,7 @@ Response deleteVectorStoreSync(@HostParam("endpoint") String endpoin
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listVectorStoreFiles(@HostParam("endpoint") String endpoint,
-            @PathParam("vectorStoreId") String vectorStoreId, @HeaderParam("accept") String accept,
+            @PathParam("vectorStoreId") String vectorStoreId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/vector_stores/{vectorStoreId}/files")
@@ -819,7 +831,7 @@ Mono> listVectorStoreFiles(@HostParam("endpoint") String en
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listVectorStoreFilesSync(@HostParam("endpoint") String endpoint,
-            @PathParam("vectorStoreId") String vectorStoreId, @HeaderParam("accept") String accept,
+            @PathParam("vectorStoreId") String vectorStoreId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Post("/vector_stores/{vectorStoreId}/files")
@@ -829,7 +841,8 @@ Response listVectorStoreFilesSync(@HostParam("endpoint") String endp
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> createVectorStoreFile(@HostParam("endpoint") String endpoint,
-            @PathParam("vectorStoreId") String vectorStoreId, @HeaderParam("accept") String accept,
+            @PathParam("vectorStoreId") String vectorStoreId, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept,
             @BodyParam("application/json") BinaryData createVectorStoreFileRequest, RequestOptions requestOptions,
             Context context);
 
@@ -840,7 +853,8 @@ Mono> createVectorStoreFile(@HostParam("endpoint") String e
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response createVectorStoreFileSync(@HostParam("endpoint") String endpoint,
-            @PathParam("vectorStoreId") String vectorStoreId, @HeaderParam("accept") String accept,
+            @PathParam("vectorStoreId") String vectorStoreId, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept,
             @BodyParam("application/json") BinaryData createVectorStoreFileRequest, RequestOptions requestOptions,
             Context context);
 
@@ -852,7 +866,7 @@ Response createVectorStoreFileSync(@HostParam("endpoint") String end
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getVectorStoreFile(@HostParam("endpoint") String endpoint,
             @PathParam("vectorStoreId") String vectorStoreId, @PathParam("fileId") String fileId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/vector_stores/{vectorStoreId}/files/{fileId}")
         @ExpectedResponses({ 200 })
@@ -862,7 +876,7 @@ Mono> getVectorStoreFile(@HostParam("endpoint") String endp
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getVectorStoreFileSync(@HostParam("endpoint") String endpoint,
             @PathParam("vectorStoreId") String vectorStoreId, @PathParam("fileId") String fileId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/vector_stores/{vectorStoreId}/files/{fileId}")
         @ExpectedResponses({ 200 })
@@ -872,7 +886,7 @@ Response getVectorStoreFileSync(@HostParam("endpoint") String endpoi
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> deleteVectorStoreFile(@HostParam("endpoint") String endpoint,
             @PathParam("vectorStoreId") String vectorStoreId, @PathParam("fileId") String fileId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/vector_stores/{vectorStoreId}/files/{fileId}")
         @ExpectedResponses({ 200 })
@@ -882,7 +896,7 @@ Mono> deleteVectorStoreFile(@HostParam("endpoint") String e
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response deleteVectorStoreFileSync(@HostParam("endpoint") String endpoint,
             @PathParam("vectorStoreId") String vectorStoreId, @PathParam("fileId") String fileId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/vector_stores/{vectorStoreId}/file_batches")
         @ExpectedResponses({ 200 })
@@ -891,7 +905,8 @@ Response deleteVectorStoreFileSync(@HostParam("endpoint") String end
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> createVectorStoreFileBatch(@HostParam("endpoint") String endpoint,
-            @PathParam("vectorStoreId") String vectorStoreId, @HeaderParam("accept") String accept,
+            @PathParam("vectorStoreId") String vectorStoreId, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept,
             @BodyParam("application/json") BinaryData createVectorStoreFileBatchRequest, RequestOptions requestOptions,
             Context context);
 
@@ -902,7 +917,8 @@ Mono> createVectorStoreFileBatch(@HostParam("endpoint") Str
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response createVectorStoreFileBatchSync(@HostParam("endpoint") String endpoint,
-            @PathParam("vectorStoreId") String vectorStoreId, @HeaderParam("accept") String accept,
+            @PathParam("vectorStoreId") String vectorStoreId, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept,
             @BodyParam("application/json") BinaryData createVectorStoreFileBatchRequest, RequestOptions requestOptions,
             Context context);
 
@@ -914,7 +930,7 @@ Response createVectorStoreFileBatchSync(@HostParam("endpoint") Strin
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getVectorStoreFileBatch(@HostParam("endpoint") String endpoint,
             @PathParam("vectorStoreId") String vectorStoreId, @PathParam("batchId") String batchId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/vector_stores/{vectorStoreId}/file_batches/{batchId}")
         @ExpectedResponses({ 200 })
@@ -924,7 +940,7 @@ Mono> getVectorStoreFileBatch(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getVectorStoreFileBatchSync(@HostParam("endpoint") String endpoint,
             @PathParam("vectorStoreId") String vectorStoreId, @PathParam("batchId") String batchId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/vector_stores/{vectorStoreId}/file_batches/{batchId}/cancel")
         @ExpectedResponses({ 200 })
@@ -934,7 +950,7 @@ Response getVectorStoreFileBatchSync(@HostParam("endpoint") String e
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> cancelVectorStoreFileBatch(@HostParam("endpoint") String endpoint,
             @PathParam("vectorStoreId") String vectorStoreId, @PathParam("batchId") String batchId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/vector_stores/{vectorStoreId}/file_batches/{batchId}/cancel")
         @ExpectedResponses({ 200 })
@@ -944,7 +960,7 @@ Mono> cancelVectorStoreFileBatch(@HostParam("endpoint") Str
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response cancelVectorStoreFileBatchSync(@HostParam("endpoint") String endpoint,
             @PathParam("vectorStoreId") String vectorStoreId, @PathParam("batchId") String batchId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/vector_stores/{vectorStoreId}/file_batches/{batchId}/files")
         @ExpectedResponses({ 200 })
@@ -954,7 +970,7 @@ Response cancelVectorStoreFileBatchSync(@HostParam("endpoint") Strin
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> listVectorStoreFileBatchFiles(@HostParam("endpoint") String endpoint,
             @PathParam("vectorStoreId") String vectorStoreId, @PathParam("batchId") String batchId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/vector_stores/{vectorStoreId}/file_batches/{batchId}/files")
         @ExpectedResponses({ 200 })
@@ -964,7 +980,7 @@ Mono> listVectorStoreFileBatchFiles(@HostParam("endpoint")
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response listVectorStoreFileBatchFilesSync(@HostParam("endpoint") String endpoint,
             @PathParam("vectorStoreId") String vectorStoreId, @PathParam("batchId") String batchId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
     }
 
     /**
@@ -1048,8 +1064,9 @@ Response listVectorStoreFileBatchFilesSync(@HostParam("endpoint") St
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> createAssistantWithResponseAsync(BinaryData assistantCreationOptions,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil.withContext(context -> service.createAssistant(this.getEndpoint(), accept,
+        return FluxUtil.withContext(context -> service.createAssistant(this.getEndpoint(), contentType, accept,
             assistantCreationOptions, requestOptions, context));
     }
 
@@ -1133,9 +1150,10 @@ public Mono> createAssistantWithResponseAsync(BinaryData as
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response createAssistantWithResponse(BinaryData assistantCreationOptions,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.createAssistantSync(this.getEndpoint(), accept, assistantCreationOptions, requestOptions,
-            Context.NONE);
+        return service.createAssistantSync(this.getEndpoint(), contentType, accept, assistantCreationOptions,
+            requestOptions, Context.NONE);
     }
 
     /**
@@ -1488,9 +1506,10 @@ public Response getAssistantWithResponse(String assistantId, Request
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> updateAssistantWithResponseAsync(String assistantId,
         BinaryData updateAssistantOptions, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil.withContext(context -> service.updateAssistant(this.getEndpoint(), assistantId, accept,
-            updateAssistantOptions, requestOptions, context));
+        return FluxUtil.withContext(context -> service.updateAssistant(this.getEndpoint(), assistantId, contentType,
+            accept, updateAssistantOptions, requestOptions, context));
     }
 
     /**
@@ -1578,8 +1597,9 @@ public Mono> updateAssistantWithResponseAsync(String assist
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response updateAssistantWithResponse(String assistantId, BinaryData updateAssistantOptions,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.updateAssistantSync(this.getEndpoint(), assistantId, accept, updateAssistantOptions,
+        return service.updateAssistantSync(this.getEndpoint(), assistantId, contentType, accept, updateAssistantOptions,
             requestOptions, Context.NONE);
     }
 
@@ -1712,8 +1732,9 @@ public Response deleteAssistantWithResponse(String assistantId, Requ
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> createThreadWithResponseAsync(BinaryData assistantThreadCreationOptions,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil.withContext(context -> service.createThread(this.getEndpoint(), accept,
+        return FluxUtil.withContext(context -> service.createThread(this.getEndpoint(), contentType, accept,
             assistantThreadCreationOptions, requestOptions, context));
     }
 
@@ -1790,9 +1811,10 @@ public Mono> createThreadWithResponseAsync(BinaryData assis
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response createThreadWithResponse(BinaryData assistantThreadCreationOptions,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.createThreadSync(this.getEndpoint(), accept, assistantThreadCreationOptions, requestOptions,
-            Context.NONE);
+        return service.createThreadSync(this.getEndpoint(), contentType, accept, assistantThreadCreationOptions,
+            requestOptions, Context.NONE);
     }
 
     /**
@@ -1941,8 +1963,9 @@ public Response getThreadWithResponse(String threadId, RequestOption
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> updateThreadWithResponseAsync(String threadId,
         BinaryData updateAssistantThreadOptions, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil.withContext(context -> service.updateThread(this.getEndpoint(), threadId, accept,
+        return FluxUtil.withContext(context -> service.updateThread(this.getEndpoint(), threadId, contentType, accept,
             updateAssistantThreadOptions, requestOptions, context));
     }
 
@@ -2007,8 +2030,9 @@ public Mono> updateThreadWithResponseAsync(String threadId,
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response updateThreadWithResponse(String threadId, BinaryData updateAssistantThreadOptions,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.updateThreadSync(this.getEndpoint(), threadId, accept, updateAssistantThreadOptions,
+        return service.updateThreadSync(this.getEndpoint(), threadId, contentType, accept, updateAssistantThreadOptions,
             requestOptions, Context.NONE);
     }
 
@@ -2138,8 +2162,9 @@ public Response deleteThreadWithResponse(String threadId, RequestOpt
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> createMessageWithResponseAsync(String threadId, BinaryData threadMessageOptions,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil.withContext(context -> service.createMessage(this.getEndpoint(), threadId, accept,
+        return FluxUtil.withContext(context -> service.createMessage(this.getEndpoint(), threadId, contentType, accept,
             threadMessageOptions, requestOptions, context));
     }
 
@@ -2214,9 +2239,10 @@ public Mono> createMessageWithResponseAsync(String threadId
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response createMessageWithResponse(String threadId, BinaryData threadMessageOptions,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.createMessageSync(this.getEndpoint(), threadId, accept, threadMessageOptions, requestOptions,
-            Context.NONE);
+        return service.createMessageSync(this.getEndpoint(), threadId, contentType, accept, threadMessageOptions,
+            requestOptions, Context.NONE);
     }
 
     /**
@@ -2549,9 +2575,10 @@ public Response getMessageWithResponse(String threadId, String messa
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> updateMessageWithResponseAsync(String threadId, String messageId,
         BinaryData updateMessageRequest, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil.withContext(context -> service.updateMessage(this.getEndpoint(), threadId, messageId, accept,
-            updateMessageRequest, requestOptions, context));
+        return FluxUtil.withContext(context -> service.updateMessage(this.getEndpoint(), threadId, messageId,
+            contentType, accept, updateMessageRequest, requestOptions, context));
     }
 
     /**
@@ -2615,9 +2642,10 @@ public Mono> updateMessageWithResponseAsync(String threadId
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response updateMessageWithResponse(String threadId, String messageId,
         BinaryData updateMessageRequest, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.updateMessageSync(this.getEndpoint(), threadId, messageId, accept, updateMessageRequest,
-            requestOptions, Context.NONE);
+        return service.updateMessageSync(this.getEndpoint(), threadId, messageId, contentType, accept,
+            updateMessageRequest, requestOptions, Context.NONE);
     }
 
     /**
@@ -2749,9 +2777,10 @@ public Response updateMessageWithResponse(String threadId, String me
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> createRunWithResponseAsync(String threadId, BinaryData createRunOptions,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil.withContext(context -> service.createRun(this.getEndpoint(), threadId, accept, createRunOptions,
-            requestOptions, context));
+        return FluxUtil.withContext(context -> service.createRun(this.getEndpoint(), threadId, contentType, accept,
+            createRunOptions, requestOptions, context));
     }
 
     /**
@@ -2882,9 +2911,10 @@ public Mono> createRunWithResponseAsync(String threadId, Bi
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response createRunWithResponse(String threadId, BinaryData createRunOptions,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.createRunSync(this.getEndpoint(), threadId, accept, createRunOptions, requestOptions,
-            Context.NONE);
+        return service.createRunSync(this.getEndpoint(), threadId, contentType, accept, createRunOptions,
+            requestOptions, Context.NONE);
     }
 
     /**
@@ -3289,9 +3319,10 @@ public Response getRunWithResponse(String threadId, String runId, Re
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> updateRunWithResponseAsync(String threadId, String runId,
         BinaryData updateRunRequest, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil.withContext(context -> service.updateRun(this.getEndpoint(), threadId, runId, accept,
-            updateRunRequest, requestOptions, context));
+        return FluxUtil.withContext(context -> service.updateRun(this.getEndpoint(), threadId, runId, contentType,
+            accept, updateRunRequest, requestOptions, context));
     }
 
     /**
@@ -3370,9 +3401,10 @@ public Mono> updateRunWithResponseAsync(String threadId, St
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response updateRunWithResponse(String threadId, String runId, BinaryData updateRunRequest,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.updateRunSync(this.getEndpoint(), threadId, runId, accept, updateRunRequest, requestOptions,
-            Context.NONE);
+        return service.updateRunSync(this.getEndpoint(), threadId, runId, contentType, accept, updateRunRequest,
+            requestOptions, Context.NONE);
     }
 
     /**
@@ -3457,9 +3489,10 @@ public Response updateRunWithResponse(String threadId, String runId,
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> submitToolOutputsToRunWithResponseAsync(String threadId, String runId,
         BinaryData submitToolOutputsToRunRequest, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.submitToolOutputsToRun(this.getEndpoint(), threadId, runId,
-            accept, submitToolOutputsToRunRequest, requestOptions, context));
+            contentType, accept, submitToolOutputsToRunRequest, requestOptions, context));
     }
 
     /**
@@ -3543,8 +3576,9 @@ public Mono> submitToolOutputsToRunWithResponseAsync(String
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response submitToolOutputsToRunWithResponse(String threadId, String runId,
         BinaryData submitToolOutputsToRunRequest, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.submitToolOutputsToRunSync(this.getEndpoint(), threadId, runId, accept,
+        return service.submitToolOutputsToRunSync(this.getEndpoint(), threadId, runId, contentType, accept,
             submitToolOutputsToRunRequest, requestOptions, Context.NONE);
     }
 
@@ -3823,8 +3857,9 @@ public Response cancelRunWithResponse(String threadId, String runId,
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> createThreadAndRunWithResponseAsync(BinaryData createAndRunThreadOptions,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil.withContext(context -> service.createThreadAndRun(this.getEndpoint(), accept,
+        return FluxUtil.withContext(context -> service.createThreadAndRun(this.getEndpoint(), contentType, accept,
             createAndRunThreadOptions, requestOptions, context));
     }
 
@@ -3963,9 +3998,10 @@ public Mono> createThreadAndRunWithResponseAsync(BinaryData
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response createThreadAndRunWithResponse(BinaryData createAndRunThreadOptions,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.createThreadAndRunSync(this.getEndpoint(), accept, createAndRunThreadOptions, requestOptions,
-            Context.NONE);
+        return service.createThreadAndRunSync(this.getEndpoint(), contentType, accept, createAndRunThreadOptions,
+            requestOptions, Context.NONE);
     }
 
     /**
@@ -4751,9 +4787,10 @@ public Response listVectorStoresWithResponse(RequestOptions requestO
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> createVectorStoreWithResponseAsync(BinaryData vectorStoreOptions,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil.withContext(context -> service.createVectorStore(this.getEndpoint(), accept, vectorStoreOptions,
-            requestOptions, context));
+        return FluxUtil.withContext(context -> service.createVectorStore(this.getEndpoint(), contentType, accept,
+            vectorStoreOptions, requestOptions, context));
     }
 
     /**
@@ -4817,9 +4854,10 @@ public Mono> createVectorStoreWithResponseAsync(BinaryData
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response createVectorStoreWithResponse(BinaryData vectorStoreOptions,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.createVectorStoreSync(this.getEndpoint(), accept, vectorStoreOptions, requestOptions,
-            Context.NONE);
+        return service.createVectorStoreSync(this.getEndpoint(), contentType, accept, vectorStoreOptions,
+            requestOptions, Context.NONE);
     }
 
     /**
@@ -4975,9 +5013,10 @@ public Response getVectorStoreWithResponse(String vectorStoreId, Req
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> modifyVectorStoreWithResponseAsync(String vectorStoreId,
         BinaryData vectorStoreUpdateOptions, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil.withContext(context -> service.modifyVectorStore(this.getEndpoint(), vectorStoreId, accept,
-            vectorStoreUpdateOptions, requestOptions, context));
+        return FluxUtil.withContext(context -> service.modifyVectorStore(this.getEndpoint(), vectorStoreId, contentType,
+            accept, vectorStoreUpdateOptions, requestOptions, context));
     }
 
     /**
@@ -5039,9 +5078,10 @@ public Mono> modifyVectorStoreWithResponseAsync(String vect
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response modifyVectorStoreWithResponse(String vectorStoreId, BinaryData vectorStoreUpdateOptions,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.modifyVectorStoreSync(this.getEndpoint(), vectorStoreId, accept, vectorStoreUpdateOptions,
-            requestOptions, Context.NONE);
+        return service.modifyVectorStoreSync(this.getEndpoint(), vectorStoreId, contentType, accept,
+            vectorStoreUpdateOptions, requestOptions, Context.NONE);
     }
 
     /**
@@ -5263,9 +5303,10 @@ public Response listVectorStoreFilesWithResponse(String vectorStoreI
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> createVectorStoreFileWithResponseAsync(String vectorStoreId,
         BinaryData createVectorStoreFileRequest, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil.withContext(context -> service.createVectorStoreFile(this.getEndpoint(), vectorStoreId, accept,
-            createVectorStoreFileRequest, requestOptions, context));
+        return FluxUtil.withContext(context -> service.createVectorStoreFile(this.getEndpoint(), vectorStoreId,
+            contentType, accept, createVectorStoreFileRequest, requestOptions, context));
     }
 
     /**
@@ -5307,8 +5348,9 @@ public Mono> createVectorStoreFileWithResponseAsync(String
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response createVectorStoreFileWithResponse(String vectorStoreId,
         BinaryData createVectorStoreFileRequest, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.createVectorStoreFileSync(this.getEndpoint(), vectorStoreId, accept,
+        return service.createVectorStoreFileSync(this.getEndpoint(), vectorStoreId, contentType, accept,
             createVectorStoreFileRequest, requestOptions, Context.NONE);
     }
 
@@ -5492,9 +5534,10 @@ public Response deleteVectorStoreFileWithResponse(String vectorStore
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> createVectorStoreFileBatchWithResponseAsync(String vectorStoreId,
         BinaryData createVectorStoreFileBatchRequest, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.createVectorStoreFileBatch(this.getEndpoint(), vectorStoreId,
-            accept, createVectorStoreFileBatchRequest, requestOptions, context));
+            contentType, accept, createVectorStoreFileBatchRequest, requestOptions, context));
     }
 
     /**
@@ -5540,8 +5583,9 @@ public Mono> createVectorStoreFileBatchWithResponseAsync(St
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response createVectorStoreFileBatchWithResponse(String vectorStoreId,
         BinaryData createVectorStoreFileBatchRequest, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.createVectorStoreFileBatchSync(this.getEndpoint(), vectorStoreId, accept,
+        return service.createVectorStoreFileBatchSync(this.getEndpoint(), vectorStoreId, contentType, accept,
             createVectorStoreFileBatchRequest, requestOptions, Context.NONE);
     }
 
diff --git a/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/implementation/OpenAIClientImpl.java b/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/implementation/OpenAIClientImpl.java
index 48b58a1ad600..869340dba788 100644
--- a/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/implementation/OpenAIClientImpl.java
+++ b/sdk/openai/azure-ai-openai/src/main/java/com/azure/ai/openai/implementation/OpenAIClientImpl.java
@@ -159,7 +159,7 @@ public interface OpenAIClientService {
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getAudioTranscriptionAsPlainText(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("deploymentId") String deploymentOrModelName,
-            @HeaderParam("content-type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("multipart/form-data") BinaryData audioTranscriptionOptions, RequestOptions requestOptions,
             Context context);
 
@@ -172,7 +172,7 @@ Mono> getAudioTranscriptionAsPlainText(@HostParam("endpoint
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getAudioTranscriptionAsPlainTextSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("deploymentId") String deploymentOrModelName,
-            @HeaderParam("content-type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("multipart/form-data") BinaryData audioTranscriptionOptions, RequestOptions requestOptions,
             Context context);
 
@@ -185,7 +185,7 @@ Response getAudioTranscriptionAsPlainTextSync(@HostParam("endpoint")
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getAudioTranscriptionAsResponseObject(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("deploymentId") String deploymentOrModelName,
-            @HeaderParam("content-type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("multipart/form-data") BinaryData audioTranscriptionOptions, RequestOptions requestOptions,
             Context context);
 
@@ -198,7 +198,7 @@ Mono> getAudioTranscriptionAsResponseObject(@HostParam("end
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getAudioTranscriptionAsResponseObjectSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("deploymentId") String deploymentOrModelName,
-            @HeaderParam("content-type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("multipart/form-data") BinaryData audioTranscriptionOptions, RequestOptions requestOptions,
             Context context);
 
@@ -211,7 +211,7 @@ Response getAudioTranscriptionAsResponseObjectSync(@HostParam("endpo
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getAudioTranslationAsPlainText(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("deploymentId") String deploymentOrModelName,
-            @HeaderParam("content-type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("multipart/form-data") BinaryData audioTranslationOptions, RequestOptions requestOptions,
             Context context);
 
@@ -224,7 +224,7 @@ Mono> getAudioTranslationAsPlainText(@HostParam("endpoint")
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getAudioTranslationAsPlainTextSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("deploymentId") String deploymentOrModelName,
-            @HeaderParam("content-type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("multipart/form-data") BinaryData audioTranslationOptions, RequestOptions requestOptions,
             Context context);
 
@@ -237,7 +237,7 @@ Response getAudioTranslationAsPlainTextSync(@HostParam("endpoint") S
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getAudioTranslationAsResponseObject(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("deploymentId") String deploymentOrModelName,
-            @HeaderParam("content-type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("multipart/form-data") BinaryData audioTranslationOptions, RequestOptions requestOptions,
             Context context);
 
@@ -250,7 +250,7 @@ Mono> getAudioTranslationAsResponseObject(@HostParam("endpo
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getAudioTranslationAsResponseObjectSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("deploymentId") String deploymentOrModelName,
-            @HeaderParam("content-type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("multipart/form-data") BinaryData audioTranslationOptions, RequestOptions requestOptions,
             Context context);
 
@@ -262,8 +262,9 @@ Response getAudioTranslationAsResponseObjectSync(@HostParam("endpoin
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getCompletions(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("deploymentId") String deploymentOrModelName,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData completionsOptions,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData completionsOptions, RequestOptions requestOptions,
+            Context context);
 
         @Post("/deployments/{deploymentId}/completions")
         @ExpectedResponses({ 200 })
@@ -273,8 +274,9 @@ Mono> getCompletions(@HostParam("endpoint") String endpoint
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getCompletionsSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("deploymentId") String deploymentOrModelName,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData completionsOptions,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData completionsOptions, RequestOptions requestOptions,
+            Context context);
 
         @Post("/deployments/{deploymentId}/chat/completions")
         @ExpectedResponses({ 200 })
@@ -284,8 +286,9 @@ Response getCompletionsSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getChatCompletions(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("deploymentId") String deploymentOrModelName,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData chatCompletionsOptions,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData chatCompletionsOptions, RequestOptions requestOptions,
+            Context context);
 
         @Post("/deployments/{deploymentId}/chat/completions")
         @ExpectedResponses({ 200 })
@@ -295,8 +298,9 @@ Mono> getChatCompletions(@HostParam("endpoint") String endp
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getChatCompletionsSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("deploymentId") String deploymentOrModelName,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData chatCompletionsOptions,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData chatCompletionsOptions, RequestOptions requestOptions,
+            Context context);
 
         @Post("/deployments/{deploymentId}/images/generations")
         @ExpectedResponses({ 200 })
@@ -306,8 +310,9 @@ Response getChatCompletionsSync(@HostParam("endpoint") String endpoi
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getImageGenerations(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("deploymentId") String deploymentOrModelName,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData imageGenerationOptions,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData imageGenerationOptions, RequestOptions requestOptions,
+            Context context);
 
         @Post("/deployments/{deploymentId}/images/generations")
         @ExpectedResponses({ 200 })
@@ -317,8 +322,9 @@ Mono> getImageGenerations(@HostParam("endpoint") String end
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getImageGenerationsSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("deploymentId") String deploymentOrModelName,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData imageGenerationOptions,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData imageGenerationOptions, RequestOptions requestOptions,
+            Context context);
 
         @Post("/deployments/{deploymentId}/audio/speech")
         @ExpectedResponses({ 200 })
@@ -328,8 +334,9 @@ Response getImageGenerationsSync(@HostParam("endpoint") String endpo
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> generateSpeechFromText(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("deploymentId") String deploymentOrModelName,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData speechGenerationOptions,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData speechGenerationOptions, RequestOptions requestOptions,
+            Context context);
 
         @Post("/deployments/{deploymentId}/audio/speech")
         @ExpectedResponses({ 200 })
@@ -339,8 +346,9 @@ Mono> generateSpeechFromText(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response generateSpeechFromTextSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("deploymentId") String deploymentOrModelName,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData speechGenerationOptions,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData speechGenerationOptions, RequestOptions requestOptions,
+            Context context);
 
         @Post("/deployments/{deploymentId}/embeddings")
         @ExpectedResponses({ 200 })
@@ -350,8 +358,9 @@ Response generateSpeechFromTextSync(@HostParam("endpoint") String en
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getEmbeddings(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("deploymentId") String deploymentOrModelName,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData embeddingsOptions,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData embeddingsOptions, RequestOptions requestOptions,
+            Context context);
 
         @Post("/deployments/{deploymentId}/embeddings")
         @ExpectedResponses({ 200 })
@@ -361,8 +370,9 @@ Mono> getEmbeddings(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getEmbeddingsSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("deploymentId") String deploymentOrModelName,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData embeddingsOptions,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData embeddingsOptions, RequestOptions requestOptions,
+            Context context);
     }
 
     /**
@@ -389,7 +399,7 @@ Response getEmbeddingsSync(@HostParam("endpoint") String endpoint,
     public Mono> getAudioTranscriptionAsPlainTextWithResponseAsync(String deploymentOrModelName,
         BinaryData audioTranscriptionOptions, RequestOptions requestOptions) {
         final String contentType = "multipart/form-data";
-        final String accept = "text/plain, application/json";
+        final String accept = "text/plain";
         return FluxUtil.withContext(context -> service.getAudioTranscriptionAsPlainText(this.getEndpoint(),
             this.getServiceVersion().getVersion(), deploymentOrModelName, contentType, accept,
             audioTranscriptionOptions, requestOptions, context));
@@ -418,7 +428,7 @@ public Mono> getAudioTranscriptionAsPlainTextWithResponseAs
     public Response getAudioTranscriptionAsPlainTextWithResponse(String deploymentOrModelName,
         BinaryData audioTranscriptionOptions, RequestOptions requestOptions) {
         final String contentType = "multipart/form-data";
-        final String accept = "text/plain, application/json";
+        final String accept = "text/plain";
         return service.getAudioTranscriptionAsPlainTextSync(this.getEndpoint(), this.getServiceVersion().getVersion(),
             deploymentOrModelName, contentType, accept, audioTranscriptionOptions, requestOptions, Context.NONE);
     }
@@ -561,7 +571,7 @@ public Response getAudioTranscriptionAsResponseObjectWithResponse(St
     public Mono> getAudioTranslationAsPlainTextWithResponseAsync(String deploymentOrModelName,
         BinaryData audioTranslationOptions, RequestOptions requestOptions) {
         final String contentType = "multipart/form-data";
-        final String accept = "text/plain, application/json";
+        final String accept = "text/plain";
         return FluxUtil.withContext(
             context -> service.getAudioTranslationAsPlainText(this.getEndpoint(), this.getServiceVersion().getVersion(),
                 deploymentOrModelName, contentType, accept, audioTranslationOptions, requestOptions, context));
@@ -590,7 +600,7 @@ public Mono> getAudioTranslationAsPlainTextWithResponseAsyn
     public Response getAudioTranslationAsPlainTextWithResponse(String deploymentOrModelName,
         BinaryData audioTranslationOptions, RequestOptions requestOptions) {
         final String contentType = "multipart/form-data";
-        final String accept = "text/plain, application/json";
+        final String accept = "text/plain";
         return service.getAudioTranslationAsPlainTextSync(this.getEndpoint(), this.getServiceVersion().getVersion(),
             deploymentOrModelName, contentType, accept, audioTranslationOptions, requestOptions, Context.NONE);
     }
@@ -839,10 +849,11 @@ public Response getAudioTranslationAsResponseObjectWithResponse(Stri
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getCompletionsWithResponseAsync(String deploymentOrModelName,
         BinaryData completionsOptions, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getCompletions(this.getEndpoint(), this.getServiceVersion().getVersion(),
-                deploymentOrModelName, accept, completionsOptions, requestOptions, context));
+                deploymentOrModelName, contentType, accept, completionsOptions, requestOptions, context));
     }
 
     /**
@@ -989,9 +1000,10 @@ public Mono> getCompletionsWithResponseAsync(String deploym
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response getCompletionsWithResponse(String deploymentOrModelName, BinaryData completionsOptions,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return service.getCompletionsSync(this.getEndpoint(), this.getServiceVersion().getVersion(),
-            deploymentOrModelName, accept, completionsOptions, requestOptions, Context.NONE);
+            deploymentOrModelName, contentType, accept, completionsOptions, requestOptions, Context.NONE);
     }
 
     /**
@@ -1242,10 +1254,11 @@ public Response getCompletionsWithResponse(String deploymentOrModelN
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getChatCompletionsWithResponseAsync(String deploymentOrModelName,
         BinaryData chatCompletionsOptions, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(
             context -> service.getChatCompletions(this.getEndpoint(), this.getServiceVersion().getVersion(),
-                deploymentOrModelName, accept, chatCompletionsOptions, requestOptions, context));
+                deploymentOrModelName, contentType, accept, chatCompletionsOptions, requestOptions, context));
     }
 
     /**
@@ -1496,9 +1509,10 @@ public Mono> getChatCompletionsWithResponseAsync(String dep
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response getChatCompletionsWithResponse(String deploymentOrModelName,
         BinaryData chatCompletionsOptions, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return service.getChatCompletionsSync(this.getEndpoint(), this.getServiceVersion().getVersion(),
-            deploymentOrModelName, accept, chatCompletionsOptions, requestOptions, Context.NONE);
+            deploymentOrModelName, contentType, accept, chatCompletionsOptions, requestOptions, Context.NONE);
     }
 
     /**
@@ -1576,10 +1590,11 @@ public Response getChatCompletionsWithResponse(String deploymentOrMo
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getImageGenerationsWithResponseAsync(String deploymentOrModelName,
         BinaryData imageGenerationOptions, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(
             context -> service.getImageGenerations(this.getEndpoint(), this.getServiceVersion().getVersion(),
-                deploymentOrModelName, accept, imageGenerationOptions, requestOptions, context));
+                deploymentOrModelName, contentType, accept, imageGenerationOptions, requestOptions, context));
     }
 
     /**
@@ -1656,9 +1671,10 @@ public Mono> getImageGenerationsWithResponseAsync(String de
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response getImageGenerationsWithResponse(String deploymentOrModelName,
         BinaryData imageGenerationOptions, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return service.getImageGenerationsSync(this.getEndpoint(), this.getServiceVersion().getVersion(),
-            deploymentOrModelName, accept, imageGenerationOptions, requestOptions, Context.NONE);
+            deploymentOrModelName, contentType, accept, imageGenerationOptions, requestOptions, Context.NONE);
     }
 
     /**
@@ -1695,10 +1711,11 @@ public Response getImageGenerationsWithResponse(String deploymentOrM
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> generateSpeechFromTextWithResponseAsync(String deploymentOrModelName,
         BinaryData speechGenerationOptions, RequestOptions requestOptions) {
-        final String accept = "application/octet-stream, application/json";
+        final String contentType = "application/json";
+        final String accept = "application/octet-stream";
         return FluxUtil.withContext(
             context -> service.generateSpeechFromText(this.getEndpoint(), this.getServiceVersion().getVersion(),
-                deploymentOrModelName, accept, speechGenerationOptions, requestOptions, context));
+                deploymentOrModelName, contentType, accept, speechGenerationOptions, requestOptions, context));
     }
 
     /**
@@ -1735,9 +1752,10 @@ public Mono> generateSpeechFromTextWithResponseAsync(String
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response generateSpeechFromTextWithResponse(String deploymentOrModelName,
         BinaryData speechGenerationOptions, RequestOptions requestOptions) {
-        final String accept = "application/octet-stream, application/json";
+        final String contentType = "application/json";
+        final String accept = "application/octet-stream";
         return service.generateSpeechFromTextSync(this.getEndpoint(), this.getServiceVersion().getVersion(),
-            deploymentOrModelName, accept, speechGenerationOptions, requestOptions, Context.NONE);
+            deploymentOrModelName, contentType, accept, speechGenerationOptions, requestOptions, Context.NONE);
     }
 
     /**
@@ -1794,10 +1812,11 @@ public Response generateSpeechFromTextWithResponse(String deployment
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getEmbeddingsWithResponseAsync(String deploymentOrModelName,
         BinaryData embeddingsOptions, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getEmbeddings(this.getEndpoint(), this.getServiceVersion().getVersion(),
-                deploymentOrModelName, accept, embeddingsOptions, requestOptions, context));
+                deploymentOrModelName, contentType, accept, embeddingsOptions, requestOptions, context));
     }
 
     /**
@@ -1853,8 +1872,9 @@ public Mono> getEmbeddingsWithResponseAsync(String deployme
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response getEmbeddingsWithResponse(String deploymentOrModelName, BinaryData embeddingsOptions,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return service.getEmbeddingsSync(this.getEndpoint(), this.getServiceVersion().getVersion(),
-            deploymentOrModelName, accept, embeddingsOptions, requestOptions, Context.NONE);
+            deploymentOrModelName, contentType, accept, embeddingsOptions, requestOptions, Context.NONE);
     }
 }
diff --git a/sdk/openai/azure-ai-openai/src/main/resources/META-INF/azure-ai-openai_apiview_properties.json b/sdk/openai/azure-ai-openai/src/main/resources/META-INF/azure-ai-openai_apiview_properties.json
index 4b3970714a61..f43ca80b14b5 100644
--- a/sdk/openai/azure-ai-openai/src/main/resources/META-INF/azure-ai-openai_apiview_properties.json
+++ b/sdk/openai/azure-ai-openai/src/main/resources/META-INF/azure-ai-openai_apiview_properties.json
@@ -1,7 +1,7 @@
 {
   "flavor": "azure", 
   "CrossLanguageDefinitionId": {
-    "com.azure.ai.openai.OpenAIAsyncClient": "Azure.OpenAI.OpenAIClient",
+    "com.azure.ai.openai.OpenAIAsyncClient": "Client.OpenAIClient",
     "com.azure.ai.openai.OpenAIAsyncClient.generateSpeechFromText": "Client.OpenAIClient.generateSpeechFromText",
     "com.azure.ai.openai.OpenAIAsyncClient.generateSpeechFromTextWithResponse": "Client.OpenAIClient.generateSpeechFromText",
     "com.azure.ai.openai.OpenAIAsyncClient.getAudioTranscriptionAsPlainText": "Client.OpenAIClient.getAudioTranscriptionAsPlainText",
@@ -20,7 +20,7 @@
     "com.azure.ai.openai.OpenAIAsyncClient.getEmbeddingsWithResponse": "Client.OpenAIClient.getEmbeddings",
     "com.azure.ai.openai.OpenAIAsyncClient.getImageGenerations": "Client.OpenAIClient.getImageGenerations",
     "com.azure.ai.openai.OpenAIAsyncClient.getImageGenerationsWithResponse": "Client.OpenAIClient.getImageGenerations",
-    "com.azure.ai.openai.OpenAIClient": "Azure.OpenAI.OpenAIClient",
+    "com.azure.ai.openai.OpenAIClient": "Client.OpenAIClient",
     "com.azure.ai.openai.OpenAIClient.generateSpeechFromText": "Client.OpenAIClient.generateSpeechFromText",
     "com.azure.ai.openai.OpenAIClient.generateSpeechFromTextWithResponse": "Client.OpenAIClient.generateSpeechFromText",
     "com.azure.ai.openai.OpenAIClient.getAudioTranscriptionAsPlainText": "Client.OpenAIClient.getAudioTranscriptionAsPlainText",
@@ -39,7 +39,7 @@
     "com.azure.ai.openai.OpenAIClient.getEmbeddingsWithResponse": "Client.OpenAIClient.getEmbeddings",
     "com.azure.ai.openai.OpenAIClient.getImageGenerations": "Client.OpenAIClient.getImageGenerations",
     "com.azure.ai.openai.OpenAIClient.getImageGenerationsWithResponse": "Client.OpenAIClient.getImageGenerations",
-    "com.azure.ai.openai.OpenAIClientBuilder": "Azure.OpenAI.OpenAIClient",
+    "com.azure.ai.openai.OpenAIClientBuilder": "Client.OpenAIClient",
     "com.azure.ai.openai.implementation.models.FunctionCallPreset": "Azure.OpenAI.FunctionCallPreset",
     "com.azure.ai.openai.models.AudioTaskLabel": "Azure.OpenAI.AudioTaskLabel",
     "com.azure.ai.openai.models.AudioTranscription": "Azure.OpenAI.AudioTranscription",
diff --git a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/implementation/DiscoveriesImpl.java b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/implementation/DiscoveriesImpl.java
index e87aa69a9946..0329f975d214 100644
--- a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/implementation/DiscoveriesImpl.java
+++ b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/implementation/DiscoveriesImpl.java
@@ -76,8 +76,9 @@ public interface DiscoveriesService {
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> query(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Post("/search/query")
         @ExpectedResponses({ 200 })
@@ -86,8 +87,9 @@ Mono> query(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response querySync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Post("/search/suggest")
         @ExpectedResponses({ 200 })
@@ -96,8 +98,9 @@ Response querySync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> suggest(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Post("/search/suggest")
         @ExpectedResponses({ 200 })
@@ -106,8 +109,9 @@ Mono> suggest(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response suggestSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Post("/search/autocomplete")
         @ExpectedResponses({ 200 })
@@ -116,8 +120,9 @@ Response suggestSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> autoComplete(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Post("/search/autocomplete")
         @ExpectedResponses({ 200 })
@@ -126,8 +131,9 @@ Mono> autoComplete(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response autoCompleteSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
     }
 
     /**
@@ -281,9 +287,10 @@ Response autoCompleteSync(@HostParam("endpoint") String endpoint,
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> queryWithResponseAsync(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.query(this.client.getEndpoint(),
-            this.client.getServiceVersion().getVersion(), accept, body, requestOptions, context));
+            this.client.getServiceVersion().getVersion(), contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -437,9 +444,10 @@ public Mono> queryWithResponseAsync(BinaryData body, Reques
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response queryWithResponse(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.querySync(this.client.getEndpoint(), this.client.getServiceVersion().getVersion(), accept, body,
-            requestOptions, Context.NONE);
+        return service.querySync(this.client.getEndpoint(), this.client.getServiceVersion().getVersion(), contentType,
+            accept, body, requestOptions, Context.NONE);
     }
 
     /**
@@ -520,9 +528,10 @@ public Response queryWithResponse(BinaryData body, RequestOptions re
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> suggestWithResponseAsync(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.suggest(this.client.getEndpoint(),
-            this.client.getServiceVersion().getVersion(), accept, body, requestOptions, context));
+            this.client.getServiceVersion().getVersion(), contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -602,9 +611,10 @@ public Mono> suggestWithResponseAsync(BinaryData body, Requ
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response suggestWithResponse(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.suggestSync(this.client.getEndpoint(), this.client.getServiceVersion().getVersion(), accept,
-            body, requestOptions, Context.NONE);
+        return service.suggestSync(this.client.getEndpoint(), this.client.getServiceVersion().getVersion(), contentType,
+            accept, body, requestOptions, Context.NONE);
     }
 
     /**
@@ -642,9 +652,10 @@ public Response suggestWithResponse(BinaryData body, RequestOptions
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> autoCompleteWithResponseAsync(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.autoComplete(this.client.getEndpoint(),
-            this.client.getServiceVersion().getVersion(), accept, body, requestOptions, context));
+            this.client.getServiceVersion().getVersion(), contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -682,8 +693,9 @@ public Mono> autoCompleteWithResponseAsync(BinaryData body,
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response autoCompleteWithResponse(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.autoCompleteSync(this.client.getEndpoint(), this.client.getServiceVersion().getVersion(), accept,
-            body, requestOptions, Context.NONE);
+        return service.autoCompleteSync(this.client.getEndpoint(), this.client.getServiceVersion().getVersion(),
+            contentType, accept, body, requestOptions, Context.NONE);
     }
 }
diff --git a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/implementation/EntitiesImpl.java b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/implementation/EntitiesImpl.java
index 8cc3fc06c754..574a285cded0 100644
--- a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/implementation/EntitiesImpl.java
+++ b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/implementation/EntitiesImpl.java
@@ -83,8 +83,9 @@ public interface EntitiesService {
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> createOrUpdate(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Post("/atlas/v2/entity")
         @ExpectedResponses({ 200 })
@@ -93,8 +94,9 @@ Mono> createOrUpdate(@HostParam("endpoint") String endpoint
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response createOrUpdateSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/entity/bulk")
         @ExpectedResponses({ 200 })
@@ -105,7 +107,7 @@ Response createOrUpdateSync(@HostParam("endpoint") String endpoint,
         Mono> getByIds(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion,
             @QueryParam(value = "guid", multipleQueryParams = true) List guid,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/entity/bulk")
         @ExpectedResponses({ 200 })
@@ -116,7 +118,7 @@ Mono> getByIds(@HostParam("endpoint") String endpoint,
         Response getByIdsSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion,
             @QueryParam(value = "guid", multipleQueryParams = true) List guid,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/atlas/v2/entity/bulk")
         @ExpectedResponses({ 200 })
@@ -125,8 +127,9 @@ Response getByIdsSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> batchCreateOrUpdate(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Post("/atlas/v2/entity/bulk")
         @ExpectedResponses({ 200 })
@@ -135,8 +138,9 @@ Mono> batchCreateOrUpdate(@HostParam("endpoint") String end
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response batchCreateOrUpdateSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Delete("/atlas/v2/entity/bulk")
         @ExpectedResponses({ 200 })
@@ -146,7 +150,7 @@ Response batchCreateOrUpdateSync(@HostParam("endpoint") String endpo
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> batchDelete(@HostParam("endpoint") String endpoint,
             @QueryParam(value = "guid", multipleQueryParams = true) List guid,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/atlas/v2/entity/bulk")
         @ExpectedResponses({ 200 })
@@ -156,7 +160,7 @@ Mono> batchDelete(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response batchDeleteSync(@HostParam("endpoint") String endpoint,
             @QueryParam(value = "guid", multipleQueryParams = true) List guid,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/atlas/v2/entity/bulk/classification")
         @ExpectedResponses({ 204 })
@@ -165,8 +169,8 @@ Response batchDeleteSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> addClassification(@HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Post("/atlas/v2/entity/bulk/classification")
         @ExpectedResponses({ 204 })
@@ -175,8 +179,8 @@ Mono> addClassification(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response addClassificationSync(@HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/entity/guid/{guid}")
         @ExpectedResponses({ 200 })
@@ -185,7 +189,7 @@ Response addClassificationSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> get(@HostParam("endpoint") String endpoint, @PathParam("guid") String guid,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/entity/guid/{guid}")
         @ExpectedResponses({ 200 })
@@ -194,7 +198,7 @@ Mono> get(@HostParam("endpoint") String endpoint, @PathPara
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getSync(@HostParam("endpoint") String endpoint, @PathParam("guid") String guid,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Put("/atlas/v2/entity/guid/{guid}")
         @ExpectedResponses({ 200 })
@@ -203,7 +207,8 @@ Response getSync(@HostParam("endpoint") String endpoint, @PathParam(
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> updateAttributeById(@HostParam("endpoint") String endpoint,
-            @PathParam("guid") String guid, @QueryParam("name") String name, @HeaderParam("accept") String accept,
+            @PathParam("guid") String guid, @QueryParam("name") String name,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Put("/atlas/v2/entity/guid/{guid}")
@@ -213,7 +218,8 @@ Mono> updateAttributeById(@HostParam("endpoint") String end
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response updateAttributeByIdSync(@HostParam("endpoint") String endpoint,
-            @PathParam("guid") String guid, @QueryParam("name") String name, @HeaderParam("accept") String accept,
+            @PathParam("guid") String guid, @QueryParam("name") String name,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Delete("/atlas/v2/entity/guid/{guid}")
@@ -223,7 +229,7 @@ Response updateAttributeByIdSync(@HostParam("endpoint") String endpo
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> delete(@HostParam("endpoint") String endpoint, @PathParam("guid") String guid,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/atlas/v2/entity/guid/{guid}")
         @ExpectedResponses({ 200 })
@@ -232,7 +238,7 @@ Mono> delete(@HostParam("endpoint") String endpoint, @PathP
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response deleteSync(@HostParam("endpoint") String endpoint, @PathParam("guid") String guid,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/entity/guid/{guid}/classification/{classificationName}")
         @ExpectedResponses({ 200 })
@@ -242,7 +248,7 @@ Response deleteSync(@HostParam("endpoint") String endpoint, @PathPar
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getClassification(@HostParam("endpoint") String endpoint,
             @PathParam("guid") String guid, @PathParam("classificationName") String classificationName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/entity/guid/{guid}/classification/{classificationName}")
         @ExpectedResponses({ 200 })
@@ -252,7 +258,7 @@ Mono> getClassification(@HostParam("endpoint") String endpo
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getClassificationSync(@HostParam("endpoint") String endpoint,
             @PathParam("guid") String guid, @PathParam("classificationName") String classificationName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/atlas/v2/entity/guid/{guid}/classification/{classificationName}")
         @ExpectedResponses({ 204 })
@@ -262,7 +268,7 @@ Response getClassificationSync(@HostParam("endpoint") String endpoin
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> removeClassification(@HostParam("endpoint") String endpoint,
             @PathParam("guid") String guid, @PathParam("classificationName") String classificationName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/atlas/v2/entity/guid/{guid}/classification/{classificationName}")
         @ExpectedResponses({ 204 })
@@ -271,7 +277,7 @@ Mono> removeClassification(@HostParam("endpoint") String endpoint
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response removeClassificationSync(@HostParam("endpoint") String endpoint, @PathParam("guid") String guid,
-            @PathParam("classificationName") String classificationName, @HeaderParam("accept") String accept,
+            @PathParam("classificationName") String classificationName, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/entity/guid/{guid}/classifications")
@@ -281,7 +287,7 @@ Response removeClassificationSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getClassifications(@HostParam("endpoint") String endpoint,
-            @PathParam("guid") String guid, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("guid") String guid, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/atlas/v2/entity/guid/{guid}/classifications")
@@ -291,7 +297,7 @@ Mono> getClassifications(@HostParam("endpoint") String endp
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getClassificationsSync(@HostParam("endpoint") String endpoint,
-            @PathParam("guid") String guid, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("guid") String guid, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Post("/atlas/v2/entity/guid/{guid}/classifications")
@@ -301,8 +307,8 @@ Response getClassificationsSync(@HostParam("endpoint") String endpoi
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> addClassifications(@HostParam("endpoint") String endpoint, @PathParam("guid") String guid,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Post("/atlas/v2/entity/guid/{guid}/classifications")
         @ExpectedResponses({ 204 })
@@ -311,8 +317,8 @@ Mono> addClassifications(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response addClassificationsSync(@HostParam("endpoint") String endpoint, @PathParam("guid") String guid,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Put("/atlas/v2/entity/guid/{guid}/classifications")
         @ExpectedResponses({ 204 })
@@ -321,8 +327,9 @@ Response addClassificationsSync(@HostParam("endpoint") String endpoint, @P
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> updateClassifications(@HostParam("endpoint") String endpoint,
-            @PathParam("guid") String guid, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @PathParam("guid") String guid, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Put("/atlas/v2/entity/guid/{guid}/classifications")
         @ExpectedResponses({ 204 })
@@ -331,8 +338,8 @@ Mono> updateClassifications(@HostParam("endpoint") String endpoin
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response updateClassificationsSync(@HostParam("endpoint") String endpoint, @PathParam("guid") String guid,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/entity/uniqueAttribute/type/{typeName}")
         @ExpectedResponses({ 200 })
@@ -341,7 +348,7 @@ Response updateClassificationsSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getByUniqueAttribute(@HostParam("endpoint") String endpoint,
-            @PathParam("typeName") String typeName, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("typeName") String typeName, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/atlas/v2/entity/uniqueAttribute/type/{typeName}")
@@ -351,7 +358,7 @@ Mono> getByUniqueAttribute(@HostParam("endpoint") String en
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getByUniqueAttributeSync(@HostParam("endpoint") String endpoint,
-            @PathParam("typeName") String typeName, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("typeName") String typeName, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Put("/atlas/v2/entity/uniqueAttribute/type/{typeName}")
@@ -361,8 +368,9 @@ Response getByUniqueAttributeSync(@HostParam("endpoint") String endp
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> updateByUniqueAttribute(@HostParam("endpoint") String endpoint,
-            @PathParam("typeName") String typeName, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @PathParam("typeName") String typeName, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Put("/atlas/v2/entity/uniqueAttribute/type/{typeName}")
         @ExpectedResponses({ 200 })
@@ -371,8 +379,9 @@ Mono> updateByUniqueAttribute(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response updateByUniqueAttributeSync(@HostParam("endpoint") String endpoint,
-            @PathParam("typeName") String typeName, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @PathParam("typeName") String typeName, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Delete("/atlas/v2/entity/uniqueAttribute/type/{typeName}")
         @ExpectedResponses({ 200 })
@@ -381,7 +390,7 @@ Response updateByUniqueAttributeSync(@HostParam("endpoint") String e
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> deleteByUniqueAttribute(@HostParam("endpoint") String endpoint,
-            @PathParam("typeName") String typeName, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("typeName") String typeName, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Delete("/atlas/v2/entity/uniqueAttribute/type/{typeName}")
@@ -391,7 +400,7 @@ Mono> deleteByUniqueAttribute(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response deleteByUniqueAttributeSync(@HostParam("endpoint") String endpoint,
-            @PathParam("typeName") String typeName, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("typeName") String typeName, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Delete("/atlas/v2/entity/uniqueAttribute/type/{typeName}/classification/{classificationName}")
@@ -402,7 +411,7 @@ Response deleteByUniqueAttributeSync(@HostParam("endpoint") String e
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> removeClassificationByUniqueAttribute(@HostParam("endpoint") String endpoint,
             @PathParam("typeName") String typeName, @PathParam("classificationName") String classificationName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/atlas/v2/entity/uniqueAttribute/type/{typeName}/classification/{classificationName}")
         @ExpectedResponses({ 204 })
@@ -412,7 +421,7 @@ Mono> removeClassificationByUniqueAttribute(@HostParam("endpoint"
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response removeClassificationByUniqueAttributeSync(@HostParam("endpoint") String endpoint,
             @PathParam("typeName") String typeName, @PathParam("classificationName") String classificationName,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/atlas/v2/entity/uniqueAttribute/type/{typeName}/classifications")
         @ExpectedResponses({ 204 })
@@ -421,8 +430,9 @@ Response removeClassificationByUniqueAttributeSync(@HostParam("endpoint")
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> addClassificationsByUniqueAttribute(@HostParam("endpoint") String endpoint,
-            @PathParam("typeName") String typeName, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @PathParam("typeName") String typeName, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Post("/atlas/v2/entity/uniqueAttribute/type/{typeName}/classifications")
         @ExpectedResponses({ 204 })
@@ -431,8 +441,9 @@ Mono> addClassificationsByUniqueAttribute(@HostParam("endpoint")
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response addClassificationsByUniqueAttributeSync(@HostParam("endpoint") String endpoint,
-            @PathParam("typeName") String typeName, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @PathParam("typeName") String typeName, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Put("/atlas/v2/entity/uniqueAttribute/type/{typeName}/classifications")
         @ExpectedResponses({ 204 })
@@ -441,8 +452,9 @@ Response addClassificationsByUniqueAttributeSync(@HostParam("endpoint") St
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> updateClassificationsUniqueByAttribute(@HostParam("endpoint") String endpoint,
-            @PathParam("typeName") String typeName, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @PathParam("typeName") String typeName, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Put("/atlas/v2/entity/uniqueAttribute/type/{typeName}/classifications")
         @ExpectedResponses({ 204 })
@@ -451,8 +463,9 @@ Mono> updateClassificationsUniqueByAttribute(@HostParam("endpoint
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response updateClassificationsUniqueByAttributeSync(@HostParam("endpoint") String endpoint,
-            @PathParam("typeName") String typeName, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @PathParam("typeName") String typeName, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Post("/atlas/v2/entity/bulk/setClassifications")
         @ExpectedResponses({ 200 })
@@ -461,8 +474,8 @@ Response updateClassificationsUniqueByAttributeSync(@HostParam("endpoint")
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> batchSetClassifications(@HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Post("/atlas/v2/entity/bulk/setClassifications")
         @ExpectedResponses({ 200 })
@@ -471,8 +484,8 @@ Mono> batchSetClassifications(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response batchSetClassificationsSync(@HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/entity/bulk/uniqueAttribute/type/{typeName}")
         @ExpectedResponses({ 200 })
@@ -481,7 +494,7 @@ Response batchSetClassificationsSync(@HostParam("endpoint") String e
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> batchGetByUniqueAttributes(@HostParam("endpoint") String endpoint,
-            @PathParam("typeName") String typeName, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("typeName") String typeName, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/atlas/v2/entity/bulk/uniqueAttribute/type/{typeName}")
@@ -491,7 +504,7 @@ Mono> batchGetByUniqueAttributes(@HostParam("endpoint") Str
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response batchGetByUniqueAttributesSync(@HostParam("endpoint") String endpoint,
-            @PathParam("typeName") String typeName, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("typeName") String typeName, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/atlas/v2/entity/guid/{guid}/header")
@@ -501,7 +514,7 @@ Response batchGetByUniqueAttributesSync(@HostParam("endpoint") Strin
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getHeader(@HostParam("endpoint") String endpoint, @PathParam("guid") String guid,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/entity/guid/{guid}/header")
         @ExpectedResponses({ 200 })
@@ -510,7 +523,7 @@ Mono> getHeader(@HostParam("endpoint") String endpoint, @Pa
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getHeaderSync(@HostParam("endpoint") String endpoint, @PathParam("guid") String guid,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/atlas/v2/entity/guid/{guid}/businessmetadata")
         @ExpectedResponses({ 204 })
@@ -519,8 +532,9 @@ Response getHeaderSync(@HostParam("endpoint") String endpoint, @Path
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> removeBusinessMetadata(@HostParam("endpoint") String endpoint,
-            @PathParam("guid") String guid, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @PathParam("guid") String guid, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Delete("/atlas/v2/entity/guid/{guid}/businessmetadata")
         @ExpectedResponses({ 204 })
@@ -529,8 +543,9 @@ Mono> removeBusinessMetadata(@HostParam("endpoint") String endpoi
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response removeBusinessMetadataSync(@HostParam("endpoint") String endpoint,
-            @PathParam("guid") String guid, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @PathParam("guid") String guid, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Post("/atlas/v2/entity/guid/{guid}/businessmetadata")
         @ExpectedResponses({ 204 })
@@ -539,8 +554,9 @@ Response removeBusinessMetadataSync(@HostParam("endpoint") String endpoint
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> addOrUpdateBusinessMetadata(@HostParam("endpoint") String endpoint,
-            @PathParam("guid") String guid, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @PathParam("guid") String guid, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Post("/atlas/v2/entity/guid/{guid}/businessmetadata")
         @ExpectedResponses({ 204 })
@@ -549,8 +565,9 @@ Mono> addOrUpdateBusinessMetadata(@HostParam("endpoint") String e
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response addOrUpdateBusinessMetadataSync(@HostParam("endpoint") String endpoint,
-            @PathParam("guid") String guid, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @PathParam("guid") String guid, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Delete("/atlas/v2/entity/guid/{guid}/businessmetadata/{businessMetadataName}")
         @ExpectedResponses({ 204 })
@@ -560,8 +577,8 @@ Response addOrUpdateBusinessMetadataSync(@HostParam("endpoint") String end
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> removeBusinessMetadataAttributes(@HostParam("endpoint") String endpoint,
             @PathParam("businessMetadataName") String businessMetadataName, @PathParam("guid") String guid,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Delete("/atlas/v2/entity/guid/{guid}/businessmetadata/{businessMetadataName}")
         @ExpectedResponses({ 204 })
@@ -571,8 +588,8 @@ Mono> removeBusinessMetadataAttributes(@HostParam("endpoint") Str
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response removeBusinessMetadataAttributesSync(@HostParam("endpoint") String endpoint,
             @PathParam("businessMetadataName") String businessMetadataName, @PathParam("guid") String guid,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Post("/atlas/v2/entity/guid/{guid}/businessmetadata/{businessMetadataName}")
         @ExpectedResponses({ 204 })
@@ -582,8 +599,8 @@ Response removeBusinessMetadataAttributesSync(@HostParam("endpoint") Strin
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> addOrUpdateBusinessMetadataAttributes(@HostParam("endpoint") String endpoint,
             @PathParam("businessMetadataName") String businessMetadataName, @PathParam("guid") String guid,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Post("/atlas/v2/entity/guid/{guid}/businessmetadata/{businessMetadataName}")
         @ExpectedResponses({ 204 })
@@ -593,8 +610,8 @@ Mono> addOrUpdateBusinessMetadataAttributes(@HostParam("endpoint"
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response addOrUpdateBusinessMetadataAttributesSync(@HostParam("endpoint") String endpoint,
             @PathParam("businessMetadataName") String businessMetadataName, @PathParam("guid") String guid,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/entity/businessmetadata/import/template")
         @ExpectedResponses({ 200 })
@@ -603,7 +620,7 @@ Response addOrUpdateBusinessMetadataAttributesSync(@HostParam("endpoint")
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getBusinessMetadataTemplate(@HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/entity/businessmetadata/import/template")
         @ExpectedResponses({ 200 })
@@ -612,7 +629,7 @@ Mono> getBusinessMetadataTemplate(@HostParam("endpoint") St
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getBusinessMetadataTemplateSync(@HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         // @Multipart not supported by RestProxy
         @Post("/atlas/v2/entity/businessmetadata/import")
@@ -622,7 +639,7 @@ Response getBusinessMetadataTemplateSync(@HostParam("endpoint") Stri
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> importBusinessMetadata(@HostParam("endpoint") String endpoint,
-            @HeaderParam("content-type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("multipart/form-data") BinaryData body, RequestOptions requestOptions, Context context);
 
         // @Multipart not supported by RestProxy
@@ -633,7 +650,7 @@ Mono> importBusinessMetadata(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response importBusinessMetadataSync(@HostParam("endpoint") String endpoint,
-            @HeaderParam("content-type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("multipart/form-data") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Delete("/atlas/v2/entity/guid/{guid}/labels")
@@ -643,7 +660,7 @@ Response importBusinessMetadataSync(@HostParam("endpoint") String en
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> removeLabels(@HostParam("endpoint") String endpoint, @PathParam("guid") String guid,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/atlas/v2/entity/guid/{guid}/labels")
         @ExpectedResponses({ 204 })
@@ -652,7 +669,7 @@ Mono> removeLabels(@HostParam("endpoint") String endpoint, @PathP
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response removeLabelsSync(@HostParam("endpoint") String endpoint, @PathParam("guid") String guid,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/atlas/v2/entity/guid/{guid}/labels")
         @ExpectedResponses({ 204 })
@@ -661,7 +678,7 @@ Response removeLabelsSync(@HostParam("endpoint") String endpoint, @PathPar
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> setLabels(@HostParam("endpoint") String endpoint, @PathParam("guid") String guid,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Post("/atlas/v2/entity/guid/{guid}/labels")
         @ExpectedResponses({ 204 })
@@ -670,7 +687,7 @@ Mono> setLabels(@HostParam("endpoint") String endpoint, @PathPara
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response setLabelsSync(@HostParam("endpoint") String endpoint, @PathParam("guid") String guid,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Put("/atlas/v2/entity/guid/{guid}/labels")
         @ExpectedResponses({ 204 })
@@ -679,7 +696,7 @@ Response setLabelsSync(@HostParam("endpoint") String endpoint, @PathParam(
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> addLabel(@HostParam("endpoint") String endpoint, @PathParam("guid") String guid,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Put("/atlas/v2/entity/guid/{guid}/labels")
         @ExpectedResponses({ 204 })
@@ -688,7 +705,7 @@ Mono> addLabel(@HostParam("endpoint") String endpoint, @PathParam
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response addLabelSync(@HostParam("endpoint") String endpoint, @PathParam("guid") String guid,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/atlas/v2/entity/uniqueAttribute/type/{typeName}/labels")
         @ExpectedResponses({ 204 })
@@ -697,7 +714,7 @@ Response addLabelSync(@HostParam("endpoint") String endpoint, @PathParam("
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> removeLabelsByUniqueAttribute(@HostParam("endpoint") String endpoint,
-            @PathParam("typeName") String typeName, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("typeName") String typeName, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Delete("/atlas/v2/entity/uniqueAttribute/type/{typeName}/labels")
@@ -707,7 +724,7 @@ Mono> removeLabelsByUniqueAttribute(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response removeLabelsByUniqueAttributeSync(@HostParam("endpoint") String endpoint,
-            @PathParam("typeName") String typeName, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("typeName") String typeName, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Post("/atlas/v2/entity/uniqueAttribute/type/{typeName}/labels")
@@ -717,7 +734,7 @@ Response removeLabelsByUniqueAttributeSync(@HostParam("endpoint") String e
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> setLabelsByUniqueAttribute(@HostParam("endpoint") String endpoint,
-            @PathParam("typeName") String typeName, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("typeName") String typeName, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Post("/atlas/v2/entity/uniqueAttribute/type/{typeName}/labels")
@@ -727,7 +744,7 @@ Mono> setLabelsByUniqueAttribute(@HostParam("endpoint") String en
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response setLabelsByUniqueAttributeSync(@HostParam("endpoint") String endpoint,
-            @PathParam("typeName") String typeName, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("typeName") String typeName, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Put("/atlas/v2/entity/uniqueAttribute/type/{typeName}/labels")
@@ -737,7 +754,7 @@ Response setLabelsByUniqueAttributeSync(@HostParam("endpoint") String endp
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> addLabelsByUniqueAttribute(@HostParam("endpoint") String endpoint,
-            @PathParam("typeName") String typeName, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("typeName") String typeName, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Put("/atlas/v2/entity/uniqueAttribute/type/{typeName}/labels")
@@ -747,7 +764,7 @@ Mono> addLabelsByUniqueAttribute(@HostParam("endpoint") String en
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response addLabelsByUniqueAttributeSync(@HostParam("endpoint") String endpoint,
-            @PathParam("typeName") String typeName, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("typeName") String typeName, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Post("/entity/moveTo")
@@ -758,8 +775,8 @@ Response addLabelsByUniqueAttributeSync(@HostParam("endpoint") String endp
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> moveEntitiesToCollection(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @QueryParam("collectionId") String collectionId,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Post("/entity/moveTo")
         @ExpectedResponses({ 200 })
@@ -769,8 +786,8 @@ Mono> moveEntitiesToCollection(@HostParam("endpoint") Strin
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response moveEntitiesToCollectionSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @QueryParam("collectionId") String collectionId,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
     }
 
     /**
@@ -954,9 +971,10 @@ Response moveEntitiesToCollectionSync(@HostParam("endpoint") String
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> createOrUpdateWithResponseAsync(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.createOrUpdate(this.client.getEndpoint(),
-            this.client.getServiceVersion().getVersion(), accept, body, requestOptions, context));
+            this.client.getServiceVersion().getVersion(), contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -1139,9 +1157,10 @@ public Mono> createOrUpdateWithResponseAsync(BinaryData bod
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response createOrUpdateWithResponse(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return service.createOrUpdateSync(this.client.getEndpoint(), this.client.getServiceVersion().getVersion(),
-            accept, body, requestOptions, Context.NONE);
+            contentType, accept, body, requestOptions, Context.NONE);
     }
 
     /**
@@ -1553,9 +1572,10 @@ public Response getByIdsWithResponse(List guid, RequestOptio
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> batchCreateOrUpdateWithResponseAsync(BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.batchCreateOrUpdate(this.client.getEndpoint(),
-            this.client.getServiceVersion().getVersion(), accept, body, requestOptions, context));
+            this.client.getServiceVersion().getVersion(), contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -1741,9 +1761,10 @@ public Mono> batchCreateOrUpdateWithResponseAsync(BinaryDat
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response batchCreateOrUpdateWithResponse(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return service.batchCreateOrUpdateSync(this.client.getEndpoint(), this.client.getServiceVersion().getVersion(),
-            accept, body, requestOptions, Context.NONE);
+            contentType, accept, body, requestOptions, Context.NONE);
     }
 
     /**
@@ -1961,9 +1982,10 @@ public Response batchDeleteWithResponse(List guid, RequestOp
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> addClassificationWithResponseAsync(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil.withContext(
-            context -> service.addClassification(this.client.getEndpoint(), accept, body, requestOptions, context));
+        return FluxUtil.withContext(context -> service.addClassification(this.client.getEndpoint(), contentType, accept,
+            body, requestOptions, context));
     }
 
     /**
@@ -2005,8 +2027,10 @@ public Mono> addClassificationWithResponseAsync(BinaryData body,
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response addClassificationWithResponse(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.addClassificationSync(this.client.getEndpoint(), accept, body, requestOptions, Context.NONE);
+        return service.addClassificationSync(this.client.getEndpoint(), contentType, accept, body, requestOptions,
+            Context.NONE);
     }
 
     /**
@@ -2320,9 +2344,10 @@ public Response getWithResponse(String guid, RequestOptions requestO
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> updateAttributeByIdWithResponseAsync(String guid, String name, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.updateAttributeById(this.client.getEndpoint(), guid, name,
-            accept, body, requestOptions, context));
+            contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -2419,9 +2444,10 @@ public Mono> updateAttributeByIdWithResponseAsync(String gu
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response updateAttributeByIdWithResponse(String guid, String name, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.updateAttributeByIdSync(this.client.getEndpoint(), guid, name, accept, body, requestOptions,
-            Context.NONE);
+        return service.updateAttributeByIdSync(this.client.getEndpoint(), guid, name, contentType, accept, body,
+            requestOptions, Context.NONE);
     }
 
     /**
@@ -2820,9 +2846,10 @@ public Response getClassificationsWithResponse(String guid, RequestO
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> addClassificationsWithResponseAsync(String guid, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil.withContext(context -> service.addClassifications(this.client.getEndpoint(), guid, accept, body,
-            requestOptions, context));
+        return FluxUtil.withContext(context -> service.addClassifications(this.client.getEndpoint(), guid, contentType,
+            accept, body, requestOptions, context));
     }
 
     /**
@@ -2862,9 +2889,10 @@ public Mono> addClassificationsWithResponseAsync(String guid, Bin
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response addClassificationsWithResponse(String guid, BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.addClassificationsSync(this.client.getEndpoint(), guid, accept, body, requestOptions,
-            Context.NONE);
+        return service.addClassificationsSync(this.client.getEndpoint(), guid, contentType, accept, body,
+            requestOptions, Context.NONE);
     }
 
     /**
@@ -2905,9 +2933,10 @@ public Response addClassificationsWithResponse(String guid, BinaryData bod
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> updateClassificationsWithResponseAsync(String guid, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil.withContext(context -> service.updateClassifications(this.client.getEndpoint(), guid, accept,
-            body, requestOptions, context));
+        return FluxUtil.withContext(context -> service.updateClassifications(this.client.getEndpoint(), guid,
+            contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -2948,9 +2977,10 @@ public Mono> updateClassificationsWithResponseAsync(String guid,
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response updateClassificationsWithResponse(String guid, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.updateClassificationsSync(this.client.getEndpoint(), guid, accept, body, requestOptions,
-            Context.NONE);
+        return service.updateClassificationsSync(this.client.getEndpoint(), guid, contentType, accept, body,
+            requestOptions, Context.NONE);
     }
 
     /**
@@ -3418,9 +3448,10 @@ public Response getByUniqueAttributeWithResponse(String typeName, Re
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> updateByUniqueAttributeWithResponseAsync(String typeName, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.updateByUniqueAttribute(this.client.getEndpoint(), typeName,
-            accept, body, requestOptions, context));
+            contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -3611,9 +3642,10 @@ public Mono> updateByUniqueAttributeWithResponseAsync(Strin
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response updateByUniqueAttributeWithResponse(String typeName, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.updateByUniqueAttributeSync(this.client.getEndpoint(), typeName, accept, body, requestOptions,
-            Context.NONE);
+        return service.updateByUniqueAttributeSync(this.client.getEndpoint(), typeName, contentType, accept, body,
+            requestOptions, Context.NONE);
     }
 
     /**
@@ -3937,9 +3969,10 @@ public Response removeClassificationByUniqueAttributeWithResponse(String t
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> addClassificationsByUniqueAttributeWithResponseAsync(String typeName, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.addClassificationsByUniqueAttribute(this.client.getEndpoint(),
-            typeName, accept, body, requestOptions, context));
+            typeName, contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -3989,9 +4022,10 @@ public Mono> addClassificationsByUniqueAttributeWithResponseAsync
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response addClassificationsByUniqueAttributeWithResponse(String typeName, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.addClassificationsByUniqueAttributeSync(this.client.getEndpoint(), typeName, accept, body,
-            requestOptions, Context.NONE);
+        return service.addClassificationsByUniqueAttributeSync(this.client.getEndpoint(), typeName, contentType, accept,
+            body, requestOptions, Context.NONE);
     }
 
     /**
@@ -4041,9 +4075,10 @@ public Response addClassificationsByUniqueAttributeWithResponse(String typ
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> updateClassificationsUniqueByAttributeWithResponseAsync(String typeName,
         BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.updateClassificationsUniqueByAttribute(this.client.getEndpoint(),
-            typeName, accept, body, requestOptions, context));
+            typeName, contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -4093,9 +4128,10 @@ public Mono> updateClassificationsUniqueByAttributeWithResponseAs
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response updateClassificationsUniqueByAttributeWithResponse(String typeName, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.updateClassificationsUniqueByAttributeSync(this.client.getEndpoint(), typeName, accept, body,
-            requestOptions, Context.NONE);
+        return service.updateClassificationsUniqueByAttributeSync(this.client.getEndpoint(), typeName, contentType,
+            accept, body, requestOptions, Context.NONE);
     }
 
     /**
@@ -4180,9 +4216,10 @@ public Response updateClassificationsUniqueByAttributeWithResponse(String
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> batchSetClassificationsWithResponseAsync(BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil.withContext(context -> service.batchSetClassifications(this.client.getEndpoint(), accept, body,
-            requestOptions, context));
+        return FluxUtil.withContext(context -> service.batchSetClassifications(this.client.getEndpoint(), contentType,
+            accept, body, requestOptions, context));
     }
 
     /**
@@ -4266,8 +4303,9 @@ public Mono> batchSetClassificationsWithResponseAsync(Binar
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response batchSetClassificationsWithResponse(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.batchSetClassificationsSync(this.client.getEndpoint(), accept, body, requestOptions,
+        return service.batchSetClassificationsSync(this.client.getEndpoint(), contentType, accept, body, requestOptions,
             Context.NONE);
     }
 
@@ -4707,9 +4745,10 @@ public Response getHeaderWithResponse(String guid, RequestOptions re
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> removeBusinessMetadataWithResponseAsync(String guid, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil.withContext(context -> service.removeBusinessMetadata(this.client.getEndpoint(), guid, accept,
-            body, requestOptions, context));
+        return FluxUtil.withContext(context -> service.removeBusinessMetadata(this.client.getEndpoint(), guid,
+            contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -4736,9 +4775,10 @@ public Mono> removeBusinessMetadataWithResponseAsync(String guid,
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response removeBusinessMetadataWithResponse(String guid, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.removeBusinessMetadataSync(this.client.getEndpoint(), guid, accept, body, requestOptions,
-            Context.NONE);
+        return service.removeBusinessMetadataSync(this.client.getEndpoint(), guid, contentType, accept, body,
+            requestOptions, Context.NONE);
     }
 
     /**
@@ -4774,9 +4814,10 @@ public Response removeBusinessMetadataWithResponse(String guid, BinaryData
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> addOrUpdateBusinessMetadataWithResponseAsync(String guid, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.addOrUpdateBusinessMetadata(this.client.getEndpoint(), guid,
-            accept, body, requestOptions, context));
+            contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -4812,9 +4853,10 @@ public Mono> addOrUpdateBusinessMetadataWithResponseAsync(String
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response addOrUpdateBusinessMetadataWithResponse(String guid, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.addOrUpdateBusinessMetadataSync(this.client.getEndpoint(), guid, accept, body, requestOptions,
-            Context.NONE);
+        return service.addOrUpdateBusinessMetadataSync(this.client.getEndpoint(), guid, contentType, accept, body,
+            requestOptions, Context.NONE);
     }
 
     /**
@@ -4840,9 +4882,10 @@ public Response addOrUpdateBusinessMetadataWithResponse(String guid, Binar
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> removeBusinessMetadataAttributesWithResponseAsync(String businessMetadataName,
         String guid, BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.removeBusinessMetadataAttributes(this.client.getEndpoint(),
-            businessMetadataName, guid, accept, body, requestOptions, context));
+            businessMetadataName, guid, contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -4868,9 +4911,10 @@ public Mono> removeBusinessMetadataAttributesWithResponseAsync(St
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response removeBusinessMetadataAttributesWithResponse(String businessMetadataName, String guid,
         BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return service.removeBusinessMetadataAttributesSync(this.client.getEndpoint(), businessMetadataName, guid,
-            accept, body, requestOptions, Context.NONE);
+            contentType, accept, body, requestOptions, Context.NONE);
     }
 
     /**
@@ -4896,9 +4940,10 @@ public Response removeBusinessMetadataAttributesWithResponse(String busine
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> addOrUpdateBusinessMetadataAttributesWithResponseAsync(String businessMetadataName,
         String guid, BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.addOrUpdateBusinessMetadataAttributes(this.client.getEndpoint(),
-            businessMetadataName, guid, accept, body, requestOptions, context));
+            businessMetadataName, guid, contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -4924,9 +4969,10 @@ public Mono> addOrUpdateBusinessMetadataAttributesWithResponseAsy
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response addOrUpdateBusinessMetadataAttributesWithResponse(String businessMetadataName, String guid,
         BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return service.addOrUpdateBusinessMetadataAttributesSync(this.client.getEndpoint(), businessMetadataName, guid,
-            accept, body, requestOptions, Context.NONE);
+            contentType, accept, body, requestOptions, Context.NONE);
     }
 
     /**
@@ -4947,7 +4993,7 @@ public Response addOrUpdateBusinessMetadataAttributesWithResponse(String b
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> getBusinessMetadataTemplateWithResponseAsync(RequestOptions requestOptions) {
-        final String accept = "application/octet-stream, application/json";
+        final String accept = "application/octet-stream";
         return FluxUtil.withContext(
             context -> service.getBusinessMetadataTemplate(this.client.getEndpoint(), accept, requestOptions, context));
     }
@@ -4969,7 +5015,7 @@ public Mono> getBusinessMetadataTemplateWithResponseAsync(R
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response getBusinessMetadataTemplateWithResponse(RequestOptions requestOptions) {
-        final String accept = "application/octet-stream, application/json";
+        final String accept = "application/octet-stream";
         return service.getBusinessMetadataTemplateSync(this.client.getEndpoint(), accept, requestOptions, Context.NONE);
     }
 
@@ -5742,9 +5788,11 @@ public Response addLabelsByUniqueAttributeWithResponse(String typeName, Re
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> moveEntitiesToCollectionWithResponseAsync(String collectionId, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.moveEntitiesToCollection(this.client.getEndpoint(),
-            this.client.getServiceVersion().getVersion(), collectionId, accept, body, requestOptions, context));
+            this.client.getServiceVersion().getVersion(), collectionId, contentType, accept, body, requestOptions,
+            context));
     }
 
     /**
@@ -5840,8 +5888,10 @@ public Mono> moveEntitiesToCollectionWithResponseAsync(Stri
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response moveEntitiesToCollectionWithResponse(String collectionId, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return service.moveEntitiesToCollectionSync(this.client.getEndpoint(),
-            this.client.getServiceVersion().getVersion(), collectionId, accept, body, requestOptions, Context.NONE);
+            this.client.getServiceVersion().getVersion(), collectionId, contentType, accept, body, requestOptions,
+            Context.NONE);
     }
 }
diff --git a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/implementation/GlossariesImpl.java b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/implementation/GlossariesImpl.java
index aeb738526f0f..eea2ebd1ba99 100644
--- a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/implementation/GlossariesImpl.java
+++ b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/implementation/GlossariesImpl.java
@@ -80,7 +80,7 @@ public interface GlossariesService {
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> batchGet(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/glossary")
@@ -90,7 +90,7 @@ Mono> batchGet(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response batchGetSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Post("/atlas/v2/glossary")
@@ -99,7 +99,8 @@ Response batchGetSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 })
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Mono> create(@HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept,
+        Mono> create(@HostParam("endpoint") String endpoint,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Post("/atlas/v2/glossary")
@@ -108,7 +109,8 @@ Mono> create(@HostParam("endpoint") String endpoint, @Heade
         @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 })
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Response createSync(@HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept,
+        Response createSync(@HostParam("endpoint") String endpoint,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Post("/atlas/v2/glossary/categories")
@@ -118,8 +120,8 @@ Response createSync(@HostParam("endpoint") String endpoint, @HeaderP
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> createCategories(@HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Post("/atlas/v2/glossary/categories")
         @ExpectedResponses({ 200 })
@@ -128,8 +130,8 @@ Mono> createCategories(@HostParam("endpoint") String endpoi
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response createCategoriesSync(@HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Post("/atlas/v2/glossary/category")
         @ExpectedResponses({ 200 })
@@ -138,8 +140,8 @@ Response createCategoriesSync(@HostParam("endpoint") String endpoint
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> createCategory(@HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Post("/atlas/v2/glossary/category")
         @ExpectedResponses({ 200 })
@@ -148,8 +150,8 @@ Mono> createCategory(@HostParam("endpoint") String endpoint
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response createCategorySync(@HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/glossary/category/{categoryId}")
         @ExpectedResponses({ 200 })
@@ -158,7 +160,7 @@ Response createCategorySync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getCategory(@HostParam("endpoint") String endpoint,
-            @PathParam("categoryId") String categoryId, @HeaderParam("accept") String accept,
+            @PathParam("categoryId") String categoryId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/glossary/category/{categoryId}")
@@ -168,7 +170,7 @@ Mono> getCategory(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getCategorySync(@HostParam("endpoint") String endpoint,
-            @PathParam("categoryId") String categoryId, @HeaderParam("accept") String accept,
+            @PathParam("categoryId") String categoryId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Put("/atlas/v2/glossary/category/{categoryId}")
@@ -178,8 +180,9 @@ Response getCategorySync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> updateCategory(@HostParam("endpoint") String endpoint,
-            @PathParam("categoryId") String categoryId, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @PathParam("categoryId") String categoryId, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Put("/atlas/v2/glossary/category/{categoryId}")
         @ExpectedResponses({ 200 })
@@ -188,8 +191,9 @@ Mono> updateCategory(@HostParam("endpoint") String endpoint
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response updateCategorySync(@HostParam("endpoint") String endpoint,
-            @PathParam("categoryId") String categoryId, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @PathParam("categoryId") String categoryId, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Delete("/atlas/v2/glossary/category/{categoryId}")
         @ExpectedResponses({ 204 })
@@ -198,7 +202,7 @@ Response updateCategorySync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> deleteCategory(@HostParam("endpoint") String endpoint,
-            @PathParam("categoryId") String categoryId, @HeaderParam("accept") String accept,
+            @PathParam("categoryId") String categoryId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Delete("/atlas/v2/glossary/category/{categoryId}")
@@ -208,7 +212,7 @@ Mono> deleteCategory(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response deleteCategorySync(@HostParam("endpoint") String endpoint,
-            @PathParam("categoryId") String categoryId, @HeaderParam("accept") String accept,
+            @PathParam("categoryId") String categoryId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Put("/atlas/v2/glossary/category/{categoryId}/partial")
@@ -218,8 +222,9 @@ Response deleteCategorySync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> partialUpdateCategory(@HostParam("endpoint") String endpoint,
-            @PathParam("categoryId") String categoryId, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @PathParam("categoryId") String categoryId, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Put("/atlas/v2/glossary/category/{categoryId}/partial")
         @ExpectedResponses({ 200 })
@@ -228,8 +233,9 @@ Mono> partialUpdateCategory(@HostParam("endpoint") String e
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response partialUpdateCategorySync(@HostParam("endpoint") String endpoint,
-            @PathParam("categoryId") String categoryId, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @PathParam("categoryId") String categoryId, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/glossary/category/{categoryId}/related")
         @ExpectedResponses({ 200 })
@@ -238,7 +244,7 @@ Response partialUpdateCategorySync(@HostParam("endpoint") String end
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getRelatedCategories(@HostParam("endpoint") String endpoint,
-            @PathParam("categoryId") String categoryId, @HeaderParam("accept") String accept,
+            @PathParam("categoryId") String categoryId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/glossary/category/{categoryId}/related")
@@ -248,7 +254,7 @@ Mono> getRelatedCategories(@HostParam("endpoint") String en
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getRelatedCategoriesSync(@HostParam("endpoint") String endpoint,
-            @PathParam("categoryId") String categoryId, @HeaderParam("accept") String accept,
+            @PathParam("categoryId") String categoryId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/glossary/category/{categoryId}/terms")
@@ -258,7 +264,7 @@ Response getRelatedCategoriesSync(@HostParam("endpoint") String endp
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getCategoryTerms(@HostParam("endpoint") String endpoint,
-            @PathParam("categoryId") String categoryId, @HeaderParam("accept") String accept,
+            @PathParam("categoryId") String categoryId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/glossary/category/{categoryId}/terms")
@@ -268,7 +274,7 @@ Mono> getCategoryTerms(@HostParam("endpoint") String endpoi
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getCategoryTermsSync(@HostParam("endpoint") String endpoint,
-            @PathParam("categoryId") String categoryId, @HeaderParam("accept") String accept,
+            @PathParam("categoryId") String categoryId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Post("/atlas/v2/glossary/term")
@@ -278,8 +284,8 @@ Response getCategoryTermsSync(@HostParam("endpoint") String endpoint
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> createTerm(@HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Post("/atlas/v2/glossary/term")
         @ExpectedResponses({ 200 })
@@ -288,8 +294,8 @@ Mono> createTerm(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response createTermSync(@HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/glossary/term/{termId}")
         @ExpectedResponses({ 200 })
@@ -299,7 +305,7 @@ Response createTermSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getTerm(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("termId") String termId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/glossary/term/{termId}")
         @ExpectedResponses({ 200 })
@@ -309,7 +315,7 @@ Mono> getTerm(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getTermSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("termId") String termId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Put("/atlas/v2/glossary/term/{termId}")
         @ExpectedResponses({ 200 })
@@ -319,8 +325,8 @@ Response getTermSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> updateTerm(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("termId") String termId,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Put("/atlas/v2/glossary/term/{termId}")
         @ExpectedResponses({ 200 })
@@ -330,8 +336,8 @@ Mono> updateTerm(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response updateTermSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("termId") String termId,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Delete("/atlas/v2/glossary/term/{termId}")
         @ExpectedResponses({ 204 })
@@ -340,7 +346,7 @@ Response updateTermSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> deleteTerm(@HostParam("endpoint") String endpoint, @PathParam("termId") String termId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/atlas/v2/glossary/term/{termId}")
         @ExpectedResponses({ 204 })
@@ -349,7 +355,7 @@ Mono> deleteTerm(@HostParam("endpoint") String endpoint, @PathPar
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response deleteTermSync(@HostParam("endpoint") String endpoint, @PathParam("termId") String termId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Put("/atlas/v2/glossary/term/{termId}/partial")
         @ExpectedResponses({ 200 })
@@ -359,8 +365,8 @@ Response deleteTermSync(@HostParam("endpoint") String endpoint, @PathParam
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> partialUpdateTerm(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("termId") String termId,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Put("/atlas/v2/glossary/term/{termId}/partial")
         @ExpectedResponses({ 200 })
@@ -370,8 +376,8 @@ Mono> partialUpdateTerm(@HostParam("endpoint") String endpo
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response partialUpdateTermSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("termId") String termId,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Post("/atlas/v2/glossary/terms")
         @ExpectedResponses({ 200 })
@@ -380,8 +386,9 @@ Response partialUpdateTermSync(@HostParam("endpoint") String endpoin
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> createTerms(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Post("/atlas/v2/glossary/terms")
         @ExpectedResponses({ 200 })
@@ -390,8 +397,9 @@ Mono> createTerms(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response createTermsSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/glossary/terms/{termId}/assignedEntities")
         @ExpectedResponses({ 200 })
@@ -400,7 +408,7 @@ Response createTermsSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getEntitiesAssignedWithTerm(@HostParam("endpoint") String endpoint,
-            @PathParam("termId") String termId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("termId") String termId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/atlas/v2/glossary/terms/{termId}/assignedEntities")
@@ -410,7 +418,7 @@ Mono> getEntitiesAssignedWithTerm(@HostParam("endpoint") St
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getEntitiesAssignedWithTermSync(@HostParam("endpoint") String endpoint,
-            @PathParam("termId") String termId, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("termId") String termId, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Post("/atlas/v2/glossary/terms/{termId}/assignedEntities")
@@ -420,8 +428,9 @@ Response getEntitiesAssignedWithTermSync(@HostParam("endpoint") Stri
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> assignTermToEntities(@HostParam("endpoint") String endpoint,
-            @PathParam("termId") String termId, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @PathParam("termId") String termId, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Post("/atlas/v2/glossary/terms/{termId}/assignedEntities")
         @ExpectedResponses({ 204 })
@@ -430,8 +439,9 @@ Mono> assignTermToEntities(@HostParam("endpoint") String endpoint
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response assignTermToEntitiesSync(@HostParam("endpoint") String endpoint,
-            @PathParam("termId") String termId, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @PathParam("termId") String termId, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Delete("/atlas/v2/glossary/terms/{termId}/assignedEntities")
         @ExpectedResponses({ 204 })
@@ -440,8 +450,9 @@ Response assignTermToEntitiesSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> deleteTermAssignmentFromEntities(@HostParam("endpoint") String endpoint,
-            @PathParam("termId") String termId, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @PathParam("termId") String termId, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Delete("/atlas/v2/glossary/terms/{termId}/assignedEntities")
         @ExpectedResponses({ 204 })
@@ -450,8 +461,9 @@ Mono> deleteTermAssignmentFromEntities(@HostParam("endpoint") Str
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response deleteTermAssignmentFromEntitiesSync(@HostParam("endpoint") String endpoint,
-            @PathParam("termId") String termId, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @PathParam("termId") String termId, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/glossary/terms/{termId}/related")
         @ExpectedResponses({ 200 })
@@ -461,7 +473,7 @@ Response deleteTermAssignmentFromEntitiesSync(@HostParam("endpoint") Strin
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getRelatedTerms(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("termId") String termId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/glossary/terms/{termId}/related")
         @ExpectedResponses({ 200 })
@@ -471,7 +483,7 @@ Mono> getRelatedTerms(@HostParam("endpoint") String endpoin
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getRelatedTermsSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("termId") String termId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/glossary/{glossaryId}")
         @ExpectedResponses({ 200 })
@@ -480,7 +492,7 @@ Response getRelatedTermsSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> get(@HostParam("endpoint") String endpoint,
-            @PathParam("glossaryId") String glossaryId, @HeaderParam("accept") String accept,
+            @PathParam("glossaryId") String glossaryId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/glossary/{glossaryId}")
@@ -490,7 +502,7 @@ Mono> get(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getSync(@HostParam("endpoint") String endpoint, @PathParam("glossaryId") String glossaryId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Put("/atlas/v2/glossary/{glossaryId}")
         @ExpectedResponses({ 200 })
@@ -500,8 +512,8 @@ Response getSync(@HostParam("endpoint") String endpoint, @PathParam(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> update(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("glossaryId") String glossaryId,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Put("/atlas/v2/glossary/{glossaryId}")
         @ExpectedResponses({ 200 })
@@ -511,8 +523,8 @@ Mono> update(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response updateSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("glossaryId") String glossaryId,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Delete("/atlas/v2/glossary/{glossaryId}")
         @ExpectedResponses({ 204 })
@@ -521,7 +533,7 @@ Response updateSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> delete(@HostParam("endpoint") String endpoint, @PathParam("glossaryId") String glossaryId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/atlas/v2/glossary/{glossaryId}")
         @ExpectedResponses({ 204 })
@@ -530,7 +542,7 @@ Mono> delete(@HostParam("endpoint") String endpoint, @PathParam("
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response deleteSync(@HostParam("endpoint") String endpoint, @PathParam("glossaryId") String glossaryId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/glossary/{glossaryId}/categories")
         @ExpectedResponses({ 200 })
@@ -539,7 +551,7 @@ Response deleteSync(@HostParam("endpoint") String endpoint, @PathParam("gl
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getCategories(@HostParam("endpoint") String endpoint,
-            @PathParam("glossaryId") String glossaryId, @HeaderParam("accept") String accept,
+            @PathParam("glossaryId") String glossaryId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/glossary/{glossaryId}/categories")
@@ -549,7 +561,7 @@ Mono> getCategories(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getCategoriesSync(@HostParam("endpoint") String endpoint,
-            @PathParam("glossaryId") String glossaryId, @HeaderParam("accept") String accept,
+            @PathParam("glossaryId") String glossaryId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/glossary/{glossaryId}/categories/headers")
@@ -559,7 +571,7 @@ Response getCategoriesSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getCategoriesHeaders(@HostParam("endpoint") String endpoint,
-            @PathParam("glossaryId") String glossaryId, @HeaderParam("accept") String accept,
+            @PathParam("glossaryId") String glossaryId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/glossary/{glossaryId}/categories/headers")
@@ -569,7 +581,7 @@ Mono> getCategoriesHeaders(@HostParam("endpoint") String en
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getCategoriesHeadersSync(@HostParam("endpoint") String endpoint,
-            @PathParam("glossaryId") String glossaryId, @HeaderParam("accept") String accept,
+            @PathParam("glossaryId") String glossaryId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/glossary/{glossaryId}/detailed")
@@ -580,7 +592,7 @@ Response getCategoriesHeadersSync(@HostParam("endpoint") String endp
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getDetailed(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("glossaryId") String glossaryId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/glossary/{glossaryId}/detailed")
         @ExpectedResponses({ 200 })
@@ -590,7 +602,7 @@ Mono> getDetailed(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getDetailedSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("glossaryId") String glossaryId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Put("/atlas/v2/glossary/{glossaryId}/partial")
         @ExpectedResponses({ 200 })
@@ -600,8 +612,8 @@ Response getDetailedSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> partialUpdate(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("glossaryId") String glossaryId,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Put("/atlas/v2/glossary/{glossaryId}/partial")
         @ExpectedResponses({ 200 })
@@ -611,8 +623,8 @@ Mono> partialUpdate(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response partialUpdateSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("glossaryId") String glossaryId,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/glossary/{glossaryId}/terms")
         @ExpectedResponses({ 200 })
@@ -622,7 +634,7 @@ Response partialUpdateSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getTerms(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("glossaryId") String glossaryId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/glossary/{glossaryId}/terms")
         @ExpectedResponses({ 200 })
@@ -632,7 +644,7 @@ Mono> getTerms(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getTermsSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("glossaryId") String glossaryId,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/glossary/{glossaryId}/terms/headers")
         @ExpectedResponses({ 200 })
@@ -641,7 +653,7 @@ Response getTermsSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getTermHeaders(@HostParam("endpoint") String endpoint,
-            @PathParam("glossaryId") String glossaryId, @HeaderParam("accept") String accept,
+            @PathParam("glossaryId") String glossaryId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/glossary/{glossaryId}/terms/headers")
@@ -651,7 +663,7 @@ Mono> getTermHeaders(@HostParam("endpoint") String endpoint
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getTermHeadersSync(@HostParam("endpoint") String endpoint,
-            @PathParam("glossaryId") String glossaryId, @HeaderParam("accept") String accept,
+            @PathParam("glossaryId") String glossaryId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
     }
 
@@ -961,9 +973,10 @@ public Response batchGetWithResponse(RequestOptions requestOptions)
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> createWithResponseAsync(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil
-            .withContext(context -> service.create(this.client.getEndpoint(), accept, body, requestOptions, context));
+        return FluxUtil.withContext(
+            context -> service.create(this.client.getEndpoint(), contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -1094,8 +1107,9 @@ public Mono> createWithResponseAsync(BinaryData body, Reque
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response createWithResponse(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.createSync(this.client.getEndpoint(), accept, body, requestOptions, Context.NONE);
+        return service.createSync(this.client.getEndpoint(), contentType, accept, body, requestOptions, Context.NONE);
     }
 
     /**
@@ -1239,9 +1253,10 @@ public Response createWithResponse(BinaryData body, RequestOptions r
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> createCategoriesWithResponseAsync(BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil.withContext(
-            context -> service.createCategories(this.client.getEndpoint(), accept, body, requestOptions, context));
+        return FluxUtil.withContext(context -> service.createCategories(this.client.getEndpoint(), contentType, accept,
+            body, requestOptions, context));
     }
 
     /**
@@ -1384,8 +1399,10 @@ public Mono> createCategoriesWithResponseAsync(BinaryData b
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response createCategoriesWithResponse(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.createCategoriesSync(this.client.getEndpoint(), accept, body, requestOptions, Context.NONE);
+        return service.createCategoriesSync(this.client.getEndpoint(), contentType, accept, body, requestOptions,
+            Context.NONE);
     }
 
     /**
@@ -1524,9 +1541,10 @@ public Response createCategoriesWithResponse(BinaryData body, Reques
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> createCategoryWithResponseAsync(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil.withContext(
-            context -> service.createCategory(this.client.getEndpoint(), accept, body, requestOptions, context));
+        return FluxUtil.withContext(context -> service.createCategory(this.client.getEndpoint(), contentType, accept,
+            body, requestOptions, context));
     }
 
     /**
@@ -1665,8 +1683,10 @@ public Mono> createCategoryWithResponseAsync(BinaryData bod
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response createCategoryWithResponse(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.createCategorySync(this.client.getEndpoint(), accept, body, requestOptions, Context.NONE);
+        return service.createCategorySync(this.client.getEndpoint(), contentType, accept, body, requestOptions,
+            Context.NONE);
     }
 
     /**
@@ -1965,9 +1985,10 @@ public Response getCategoryWithResponse(String categoryId, RequestOp
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> updateCategoryWithResponseAsync(String categoryId, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil.withContext(context -> service.updateCategory(this.client.getEndpoint(), categoryId, accept,
-            body, requestOptions, context));
+        return FluxUtil.withContext(context -> service.updateCategory(this.client.getEndpoint(), categoryId,
+            contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -2108,9 +2129,10 @@ public Mono> updateCategoryWithResponseAsync(String categor
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response updateCategoryWithResponse(String categoryId, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.updateCategorySync(this.client.getEndpoint(), categoryId, accept, body, requestOptions,
-            Context.NONE);
+        return service.updateCategorySync(this.client.getEndpoint(), categoryId, contentType, accept, body,
+            requestOptions, Context.NONE);
     }
 
     /**
@@ -2234,9 +2256,10 @@ public Response deleteCategoryWithResponse(String categoryId, RequestOptio
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> partialUpdateCategoryWithResponseAsync(String categoryId, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.partialUpdateCategory(this.client.getEndpoint(), categoryId,
-            accept, body, requestOptions, context));
+            contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -2325,9 +2348,10 @@ public Mono> partialUpdateCategoryWithResponseAsync(String
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response partialUpdateCategoryWithResponse(String categoryId, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.partialUpdateCategorySync(this.client.getEndpoint(), categoryId, accept, body, requestOptions,
-            Context.NONE);
+        return service.partialUpdateCategorySync(this.client.getEndpoint(), categoryId, contentType, accept, body,
+            requestOptions, Context.NONE);
     }
 
     /**
@@ -2849,9 +2873,10 @@ public Response getCategoryTermsWithResponse(String categoryId, Requ
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> createTermWithResponseAsync(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil.withContext(
-            context -> service.createTerm(this.client.getEndpoint(), accept, body, requestOptions, context));
+        return FluxUtil.withContext(context -> service.createTerm(this.client.getEndpoint(), contentType, accept, body,
+            requestOptions, context));
     }
 
     /**
@@ -3199,8 +3224,10 @@ public Mono> createTermWithResponseAsync(BinaryData body, R
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response createTermWithResponse(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.createTermSync(this.client.getEndpoint(), accept, body, requestOptions, Context.NONE);
+        return service.createTermSync(this.client.getEndpoint(), contentType, accept, body, requestOptions,
+            Context.NONE);
     }
 
     /**
@@ -3911,9 +3938,10 @@ public Response getTermWithResponse(String termId, RequestOptions re
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> updateTermWithResponseAsync(String termId, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.updateTerm(this.client.getEndpoint(),
-            this.client.getServiceVersion().getVersion(), termId, accept, body, requestOptions, context));
+            this.client.getServiceVersion().getVersion(), termId, contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -4262,9 +4290,10 @@ public Mono> updateTermWithResponseAsync(String termId, Bin
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response updateTermWithResponse(String termId, BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return service.updateTermSync(this.client.getEndpoint(), this.client.getServiceVersion().getVersion(), termId,
-            accept, body, requestOptions, Context.NONE);
+            contentType, accept, body, requestOptions, Context.NONE);
     }
 
     /**
@@ -4496,9 +4525,10 @@ public Response deleteTermWithResponse(String termId, RequestOptions reque
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> partialUpdateTermWithResponseAsync(String termId, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.partialUpdateTerm(this.client.getEndpoint(),
-            this.client.getServiceVersion().getVersion(), termId, accept, body, requestOptions, context));
+            this.client.getServiceVersion().getVersion(), termId, contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -4695,9 +4725,10 @@ public Mono> partialUpdateTermWithResponseAsync(String term
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response partialUpdateTermWithResponse(String termId, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return service.partialUpdateTermSync(this.client.getEndpoint(), this.client.getServiceVersion().getVersion(),
-            termId, accept, body, requestOptions, Context.NONE);
+            termId, contentType, accept, body, requestOptions, Context.NONE);
     }
 
     /**
@@ -5049,9 +5080,10 @@ public Response partialUpdateTermWithResponse(String termId, BinaryD
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> createTermsWithResponseAsync(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.createTerms(this.client.getEndpoint(),
-            this.client.getServiceVersion().getVersion(), accept, body, requestOptions, context));
+            this.client.getServiceVersion().getVersion(), contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -5403,9 +5435,10 @@ public Mono> createTermsWithResponseAsync(BinaryData body,
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response createTermsWithResponse(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.createTermsSync(this.client.getEndpoint(), this.client.getServiceVersion().getVersion(), accept,
-            body, requestOptions, Context.NONE);
+        return service.createTermsSync(this.client.getEndpoint(), this.client.getServiceVersion().getVersion(),
+            contentType, accept, body, requestOptions, Context.NONE);
     }
 
     /**
@@ -5560,9 +5593,10 @@ public Response getEntitiesAssignedWithTermWithResponse(String termI
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> assignTermToEntitiesWithResponseAsync(String termId, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil.withContext(context -> service.assignTermToEntities(this.client.getEndpoint(), termId, accept,
-            body, requestOptions, context));
+        return FluxUtil.withContext(context -> service.assignTermToEntities(this.client.getEndpoint(), termId,
+            contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -5610,9 +5644,10 @@ public Mono> assignTermToEntitiesWithResponseAsync(String termId,
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response assignTermToEntitiesWithResponse(String termId, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.assignTermToEntitiesSync(this.client.getEndpoint(), termId, accept, body, requestOptions,
-            Context.NONE);
+        return service.assignTermToEntitiesSync(this.client.getEndpoint(), termId, contentType, accept, body,
+            requestOptions, Context.NONE);
     }
 
     /**
@@ -5655,9 +5690,10 @@ public Response assignTermToEntitiesWithResponse(String termId, BinaryData
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> deleteTermAssignmentFromEntitiesWithResponseAsync(String termId, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.deleteTermAssignmentFromEntities(this.client.getEndpoint(),
-            termId, accept, body, requestOptions, context));
+            termId, contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -5700,9 +5736,10 @@ public Mono> deleteTermAssignmentFromEntitiesWithResponseAsync(St
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response deleteTermAssignmentFromEntitiesWithResponse(String termId, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.deleteTermAssignmentFromEntitiesSync(this.client.getEndpoint(), termId, accept, body,
-            requestOptions, Context.NONE);
+        return service.deleteTermAssignmentFromEntitiesSync(this.client.getEndpoint(), termId, contentType, accept,
+            body, requestOptions, Context.NONE);
     }
 
     /**
@@ -6082,9 +6119,11 @@ public Response getWithResponse(String glossaryId, RequestOptions re
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> updateWithResponseAsync(String glossaryId, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil.withContext(context -> service.update(this.client.getEndpoint(),
-            this.client.getServiceVersion().getVersion(), glossaryId, accept, body, requestOptions, context));
+        return FluxUtil.withContext(
+            context -> service.update(this.client.getEndpoint(), this.client.getServiceVersion().getVersion(),
+                glossaryId, contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -6223,9 +6262,10 @@ public Mono> updateWithResponseAsync(String glossaryId, Bin
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response updateWithResponse(String glossaryId, BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return service.updateSync(this.client.getEndpoint(), this.client.getServiceVersion().getVersion(), glossaryId,
-            accept, body, requestOptions, Context.NONE);
+            contentType, accept, body, requestOptions, Context.NONE);
     }
 
     /**
@@ -7113,9 +7153,11 @@ public Response getDetailedWithResponse(String glossaryId, RequestOp
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> partialUpdateWithResponseAsync(String glossaryId, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil.withContext(context -> service.partialUpdate(this.client.getEndpoint(),
-            this.client.getServiceVersion().getVersion(), glossaryId, accept, body, requestOptions, context));
+        return FluxUtil.withContext(
+            context -> service.partialUpdate(this.client.getEndpoint(), this.client.getServiceVersion().getVersion(),
+                glossaryId, contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -7213,9 +7255,10 @@ public Mono> partialUpdateWithResponseAsync(String glossary
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response partialUpdateWithResponse(String glossaryId, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return service.partialUpdateSync(this.client.getEndpoint(), this.client.getServiceVersion().getVersion(),
-            glossaryId, accept, body, requestOptions, Context.NONE);
+            glossaryId, contentType, accept, body, requestOptions, Context.NONE);
     }
 
     /**
diff --git a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/implementation/LineagesImpl.java b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/implementation/LineagesImpl.java
index d6d4026447d9..5f311d34e291 100644
--- a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/implementation/LineagesImpl.java
+++ b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/implementation/LineagesImpl.java
@@ -75,7 +75,7 @@ public interface LineagesService {
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> get(@HostParam("endpoint") String endpoint, @PathParam("guid") String guid,
-            @QueryParam("direction") String direction, @HeaderParam("accept") String accept,
+            @QueryParam("direction") String direction, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/lineage/{guid}")
@@ -85,7 +85,7 @@ Mono> get(@HostParam("endpoint") String endpoint, @PathPara
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getSync(@HostParam("endpoint") String endpoint, @PathParam("guid") String guid,
-            @QueryParam("direction") String direction, @HeaderParam("accept") String accept,
+            @QueryParam("direction") String direction, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/lineage/{guid}/next/")
@@ -96,7 +96,7 @@ Response getSync(@HostParam("endpoint") String endpoint, @PathParam(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getNextPage(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("guid") String guid,
-            @QueryParam("direction") String direction, @HeaderParam("accept") String accept,
+            @QueryParam("direction") String direction, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/lineage/{guid}/next/")
@@ -107,7 +107,7 @@ Mono> getNextPage(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getNextPageSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("guid") String guid,
-            @QueryParam("direction") String direction, @HeaderParam("accept") String accept,
+            @QueryParam("direction") String direction, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/lineage/uniqueAttribute/type/{typeName}")
@@ -118,7 +118,7 @@ Response getNextPageSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getByUniqueAttribute(@HostParam("endpoint") String endpoint,
             @PathParam("typeName") String typeName, @QueryParam("direction") String direction,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/lineage/uniqueAttribute/type/{typeName}")
         @ExpectedResponses({ 200 })
@@ -128,7 +128,7 @@ Mono> getByUniqueAttribute(@HostParam("endpoint") String en
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getByUniqueAttributeSync(@HostParam("endpoint") String endpoint,
             @PathParam("typeName") String typeName, @QueryParam("direction") String direction,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
     }
 
     /**
diff --git a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/implementation/RelationshipsImpl.java b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/implementation/RelationshipsImpl.java
index a7b4c9c74e6f..f5dafd73e858 100644
--- a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/implementation/RelationshipsImpl.java
+++ b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/implementation/RelationshipsImpl.java
@@ -78,7 +78,8 @@ public interface RelationshipsService {
         @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 })
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Mono> create(@HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept,
+        Mono> create(@HostParam("endpoint") String endpoint,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Post("/atlas/v2/relationship")
@@ -87,7 +88,8 @@ Mono> create(@HostParam("endpoint") String endpoint, @Heade
         @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 })
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Response createSync(@HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept,
+        Response createSync(@HostParam("endpoint") String endpoint,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Put("/atlas/v2/relationship")
@@ -96,7 +98,8 @@ Response createSync(@HostParam("endpoint") String endpoint, @HeaderP
         @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 })
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Mono> update(@HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept,
+        Mono> update(@HostParam("endpoint") String endpoint,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Put("/atlas/v2/relationship")
@@ -105,7 +108,8 @@ Mono> update(@HostParam("endpoint") String endpoint, @Heade
         @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 })
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Response updateSync(@HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept,
+        Response updateSync(@HostParam("endpoint") String endpoint,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/relationship/guid/{guid}")
@@ -115,7 +119,7 @@ Response updateSync(@HostParam("endpoint") String endpoint, @HeaderP
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> get(@HostParam("endpoint") String endpoint, @PathParam("guid") String guid,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/relationship/guid/{guid}")
         @ExpectedResponses({ 200 })
@@ -124,7 +128,7 @@ Mono> get(@HostParam("endpoint") String endpoint, @PathPara
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getSync(@HostParam("endpoint") String endpoint, @PathParam("guid") String guid,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/atlas/v2/relationship/guid/{guid}")
         @ExpectedResponses({ 204 })
@@ -133,7 +137,7 @@ Response getSync(@HostParam("endpoint") String endpoint, @PathParam(
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> delete(@HostParam("endpoint") String endpoint, @PathParam("guid") String guid,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/atlas/v2/relationship/guid/{guid}")
         @ExpectedResponses({ 204 })
@@ -142,7 +146,7 @@ Mono> delete(@HostParam("endpoint") String endpoint, @PathParam("
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response deleteSync(@HostParam("endpoint") String endpoint, @PathParam("guid") String guid,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
     }
 
     /**
@@ -217,9 +221,10 @@ Response deleteSync(@HostParam("endpoint") String endpoint, @PathParam("gu
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> createWithResponseAsync(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil
-            .withContext(context -> service.create(this.client.getEndpoint(), accept, body, requestOptions, context));
+        return FluxUtil.withContext(
+            context -> service.create(this.client.getEndpoint(), contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -294,8 +299,9 @@ public Mono> createWithResponseAsync(BinaryData body, Reque
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response createWithResponse(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.createSync(this.client.getEndpoint(), accept, body, requestOptions, Context.NONE);
+        return service.createSync(this.client.getEndpoint(), contentType, accept, body, requestOptions, Context.NONE);
     }
 
     /**
@@ -370,9 +376,10 @@ public Response createWithResponse(BinaryData body, RequestOptions r
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> updateWithResponseAsync(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil
-            .withContext(context -> service.update(this.client.getEndpoint(), accept, body, requestOptions, context));
+        return FluxUtil.withContext(
+            context -> service.update(this.client.getEndpoint(), contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -447,8 +454,9 @@ public Mono> updateWithResponseAsync(BinaryData body, Reque
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response updateWithResponse(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.updateSync(this.client.getEndpoint(), accept, body, requestOptions, Context.NONE);
+        return service.updateSync(this.client.getEndpoint(), contentType, accept, body, requestOptions, Context.NONE);
     }
 
     /**
diff --git a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/implementation/TypeDefinitionsImpl.java b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/implementation/TypeDefinitionsImpl.java
index d06908ddf5c2..ec65a37a95c5 100644
--- a/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/implementation/TypeDefinitionsImpl.java
+++ b/sdk/purview/azure-analytics-purview-datamap/src/main/java/com/azure/analytics/purview/datamap/implementation/TypeDefinitionsImpl.java
@@ -80,7 +80,7 @@ public interface TypeDefinitionsService {
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getBusinessMetadataById(@HostParam("endpoint") String endpoint,
-            @PathParam("guid") String guid, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("guid") String guid, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/atlas/v2/types/businessmetadatadef/guid/{guid}")
@@ -90,7 +90,7 @@ Mono> getBusinessMetadataById(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getBusinessMetadataByIdSync(@HostParam("endpoint") String endpoint,
-            @PathParam("guid") String guid, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("guid") String guid, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/atlas/v2/types/businessmetadatadef/name/{name}")
@@ -100,7 +100,7 @@ Response getBusinessMetadataByIdSync(@HostParam("endpoint") String e
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getBusinessMetadataByName(@HostParam("endpoint") String endpoint,
-            @PathParam("name") String name, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("name") String name, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/atlas/v2/types/businessmetadatadef/name/{name}")
@@ -110,7 +110,7 @@ Mono> getBusinessMetadataByName(@HostParam("endpoint") Stri
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getBusinessMetadataByNameSync(@HostParam("endpoint") String endpoint,
-            @PathParam("name") String name, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("name") String name, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/atlas/v2/types/classificationdef/guid/{guid}")
@@ -120,7 +120,7 @@ Response getBusinessMetadataByNameSync(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getClassificationById(@HostParam("endpoint") String endpoint,
-            @PathParam("guid") String guid, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("guid") String guid, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/atlas/v2/types/classificationdef/guid/{guid}")
@@ -130,7 +130,7 @@ Mono> getClassificationById(@HostParam("endpoint") String e
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getClassificationByIdSync(@HostParam("endpoint") String endpoint,
-            @PathParam("guid") String guid, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("guid") String guid, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/atlas/v2/types/classificationdef/name/{name}")
@@ -140,7 +140,7 @@ Response getClassificationByIdSync(@HostParam("endpoint") String end
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getClassificationByName(@HostParam("endpoint") String endpoint,
-            @PathParam("name") String name, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("name") String name, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/atlas/v2/types/classificationdef/name/{name}")
@@ -150,7 +150,7 @@ Mono> getClassificationByName(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getClassificationByNameSync(@HostParam("endpoint") String endpoint,
-            @PathParam("name") String name, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("name") String name, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/atlas/v2/types/entitydef/guid/{guid}")
@@ -160,7 +160,7 @@ Response getClassificationByNameSync(@HostParam("endpoint") String e
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getEntityById(@HostParam("endpoint") String endpoint, @PathParam("guid") String guid,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/types/entitydef/guid/{guid}")
         @ExpectedResponses({ 200 })
@@ -169,7 +169,7 @@ Mono> getEntityById(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getEntityByIdSync(@HostParam("endpoint") String endpoint, @PathParam("guid") String guid,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/types/entitydef/name/{name}")
         @ExpectedResponses({ 200 })
@@ -178,7 +178,7 @@ Response getEntityByIdSync(@HostParam("endpoint") String endpoint, @
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getEntityByName(@HostParam("endpoint") String endpoint,
-            @PathParam("name") String name, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("name") String name, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/atlas/v2/types/entitydef/name/{name}")
@@ -188,7 +188,7 @@ Mono> getEntityByName(@HostParam("endpoint") String endpoin
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getEntityByNameSync(@HostParam("endpoint") String endpoint, @PathParam("name") String name,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/types/enumdef/guid/{guid}")
         @ExpectedResponses({ 200 })
@@ -197,7 +197,7 @@ Response getEntityByNameSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getEnumById(@HostParam("endpoint") String endpoint, @PathParam("guid") String guid,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/types/enumdef/guid/{guid}")
         @ExpectedResponses({ 200 })
@@ -206,7 +206,7 @@ Mono> getEnumById(@HostParam("endpoint") String endpoint, @
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getEnumByIdSync(@HostParam("endpoint") String endpoint, @PathParam("guid") String guid,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/types/enumdef/name/{name}")
         @ExpectedResponses({ 200 })
@@ -215,7 +215,7 @@ Response getEnumByIdSync(@HostParam("endpoint") String endpoint, @Pa
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getEnumByName(@HostParam("endpoint") String endpoint, @PathParam("name") String name,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/types/enumdef/name/{name}")
         @ExpectedResponses({ 200 })
@@ -224,7 +224,7 @@ Mono> getEnumByName(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getEnumByNameSync(@HostParam("endpoint") String endpoint, @PathParam("name") String name,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/types/relationshipdef/guid/{guid}")
         @ExpectedResponses({ 200 })
@@ -233,7 +233,7 @@ Response getEnumByNameSync(@HostParam("endpoint") String endpoint, @
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getRelationshipById(@HostParam("endpoint") String endpoint,
-            @PathParam("guid") String guid, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("guid") String guid, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/atlas/v2/types/relationshipdef/guid/{guid}")
@@ -243,7 +243,7 @@ Mono> getRelationshipById(@HostParam("endpoint") String end
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getRelationshipByIdSync(@HostParam("endpoint") String endpoint,
-            @PathParam("guid") String guid, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("guid") String guid, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/atlas/v2/types/relationshipdef/name/{name}")
@@ -253,7 +253,7 @@ Response getRelationshipByIdSync(@HostParam("endpoint") String endpo
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getRelationshipByName(@HostParam("endpoint") String endpoint,
-            @PathParam("name") String name, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("name") String name, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/atlas/v2/types/relationshipdef/name/{name}")
@@ -263,7 +263,7 @@ Mono> getRelationshipByName(@HostParam("endpoint") String e
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getRelationshipByNameSync(@HostParam("endpoint") String endpoint,
-            @PathParam("name") String name, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("name") String name, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/atlas/v2/types/structdef/guid/{guid}")
@@ -273,7 +273,7 @@ Response getRelationshipByNameSync(@HostParam("endpoint") String end
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getStructById(@HostParam("endpoint") String endpoint, @PathParam("guid") String guid,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/types/structdef/guid/{guid}")
         @ExpectedResponses({ 200 })
@@ -282,7 +282,7 @@ Mono> getStructById(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getStructByIdSync(@HostParam("endpoint") String endpoint, @PathParam("guid") String guid,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/types/structdef/name/{name}")
         @ExpectedResponses({ 200 })
@@ -291,7 +291,7 @@ Response getStructByIdSync(@HostParam("endpoint") String endpoint, @
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getStructByName(@HostParam("endpoint") String endpoint,
-            @PathParam("name") String name, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @PathParam("name") String name, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
 
         @Get("/atlas/v2/types/structdef/name/{name}")
@@ -301,7 +301,7 @@ Mono> getStructByName(@HostParam("endpoint") String endpoin
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getStructByNameSync(@HostParam("endpoint") String endpoint, @PathParam("name") String name,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/types/typedef/guid/{guid}")
         @ExpectedResponses({ 200 })
@@ -310,7 +310,7 @@ Response getStructByNameSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getById(@HostParam("endpoint") String endpoint, @PathParam("guid") String guid,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/types/typedef/guid/{guid}")
         @ExpectedResponses({ 200 })
@@ -319,7 +319,7 @@ Mono> getById(@HostParam("endpoint") String endpoint, @Path
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getByIdSync(@HostParam("endpoint") String endpoint, @PathParam("guid") String guid,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/types/typedef/name/{name}")
         @ExpectedResponses({ 200 })
@@ -328,7 +328,7 @@ Response getByIdSync(@HostParam("endpoint") String endpoint, @PathPa
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getByName(@HostParam("endpoint") String endpoint, @PathParam("name") String name,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/types/typedef/name/{name}")
         @ExpectedResponses({ 200 })
@@ -337,7 +337,7 @@ Mono> getByName(@HostParam("endpoint") String endpoint, @Pa
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getByNameSync(@HostParam("endpoint") String endpoint, @PathParam("name") String name,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/atlas/v2/types/typedef/name/{name}")
         @ExpectedResponses({ 204 })
@@ -346,7 +346,7 @@ Response getByNameSync(@HostParam("endpoint") String endpoint, @Path
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> delete(@HostParam("endpoint") String endpoint, @PathParam("name") String name,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/atlas/v2/types/typedef/name/{name}")
         @ExpectedResponses({ 204 })
@@ -355,7 +355,7 @@ Mono> delete(@HostParam("endpoint") String endpoint, @PathParam("
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response deleteSync(@HostParam("endpoint") String endpoint, @PathParam("name") String name,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/types/typedefs")
         @ExpectedResponses({ 200 })
@@ -364,7 +364,7 @@ Response deleteSync(@HostParam("endpoint") String endpoint, @PathParam("na
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> get(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/types/typedefs")
@@ -374,7 +374,7 @@ Mono> get(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Post("/atlas/v2/types/typedefs")
@@ -384,8 +384,8 @@ Response getSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> batchCreate(@HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Post("/atlas/v2/types/typedefs")
         @ExpectedResponses({ 200 })
@@ -394,8 +394,8 @@ Mono> batchCreate(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response batchCreateSync(@HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Put("/atlas/v2/types/typedefs")
         @ExpectedResponses({ 200 })
@@ -404,8 +404,8 @@ Response batchCreateSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> batchUpdate(@HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Put("/atlas/v2/types/typedefs")
         @ExpectedResponses({ 200 })
@@ -414,8 +414,8 @@ Mono> batchUpdate(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response batchUpdateSync(@HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Delete("/atlas/v2/types/typedefs")
         @ExpectedResponses({ 204 })
@@ -423,7 +423,8 @@ Response batchUpdateSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 })
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Mono> batchDelete(@HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept,
+        Mono> batchDelete(@HostParam("endpoint") String endpoint,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Delete("/atlas/v2/types/typedefs")
@@ -432,7 +433,8 @@ Mono> batchDelete(@HostParam("endpoint") String endpoint, @Header
         @UnexpectedResponseExceptionType(value = ResourceNotFoundException.class, code = { 404 })
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
-        Response batchDeleteSync(@HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept,
+        Response batchDeleteSync(@HostParam("endpoint") String endpoint,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/types/typedefs/headers")
@@ -442,7 +444,7 @@ Response batchDeleteSync(@HostParam("endpoint") String endpoint, @HeaderPa
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getHeaders(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/atlas/v2/types/typedefs/headers")
@@ -452,7 +454,7 @@ Mono> getHeaders(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getHeadersSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/types/termtemplatedef/guid/{guid}")
@@ -463,7 +465,7 @@ Response getHeadersSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getTermTemplateById(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("guid") String guid,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/types/termtemplatedef/guid/{guid}")
         @ExpectedResponses({ 200 })
@@ -473,7 +475,7 @@ Mono> getTermTemplateById(@HostParam("endpoint") String end
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getTermTemplateByIdSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("guid") String guid,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/types/termtemplatedef/name/{name}")
         @ExpectedResponses({ 200 })
@@ -483,7 +485,7 @@ Response getTermTemplateByIdSync(@HostParam("endpoint") String endpo
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getTermTemplateByName(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("name") String name,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/types/termtemplatedef/name/{name}")
         @ExpectedResponses({ 200 })
@@ -493,7 +495,7 @@ Mono> getTermTemplateByName(@HostParam("endpoint") String e
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getTermTemplateByNameSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("name") String name,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
     }
 
     /**
@@ -4981,9 +4983,10 @@ public Response getWithResponse(RequestOptions requestOptions) {
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> batchCreateWithResponseAsync(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil.withContext(
-            context -> service.batchCreate(this.client.getEndpoint(), accept, body, requestOptions, context));
+        return FluxUtil.withContext(context -> service.batchCreate(this.client.getEndpoint(), contentType, accept, body,
+            requestOptions, context));
     }
 
     /**
@@ -5564,8 +5567,10 @@ public Mono> batchCreateWithResponseAsync(BinaryData body,
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response batchCreateWithResponse(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.batchCreateSync(this.client.getEndpoint(), accept, body, requestOptions, Context.NONE);
+        return service.batchCreateSync(this.client.getEndpoint(), contentType, accept, body, requestOptions,
+            Context.NONE);
     }
 
     /**
@@ -6147,9 +6152,10 @@ public Response batchCreateWithResponse(BinaryData body, RequestOpti
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> batchUpdateWithResponseAsync(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil.withContext(
-            context -> service.batchUpdate(this.client.getEndpoint(), accept, body, requestOptions, context));
+        return FluxUtil.withContext(context -> service.batchUpdate(this.client.getEndpoint(), contentType, accept, body,
+            requestOptions, context));
     }
 
     /**
@@ -6731,8 +6737,10 @@ public Mono> batchUpdateWithResponseAsync(BinaryData body,
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response batchUpdateWithResponse(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.batchUpdateSync(this.client.getEndpoint(), accept, body, requestOptions, Context.NONE);
+        return service.batchUpdateSync(this.client.getEndpoint(), contentType, accept, body, requestOptions,
+            Context.NONE);
     }
 
     /**
@@ -7030,9 +7038,10 @@ public Response batchUpdateWithResponse(BinaryData body, RequestOpti
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> batchDeleteWithResponseAsync(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil.withContext(
-            context -> service.batchDelete(this.client.getEndpoint(), accept, body, requestOptions, context));
+        return FluxUtil.withContext(context -> service.batchDelete(this.client.getEndpoint(), contentType, accept, body,
+            requestOptions, context));
     }
 
     /**
@@ -7330,8 +7339,10 @@ public Mono> batchDeleteWithResponseAsync(BinaryData body, Reques
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response batchDeleteWithResponse(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.batchDeleteSync(this.client.getEndpoint(), accept, body, requestOptions, Context.NONE);
+        return service.batchDeleteSync(this.client.getEndpoint(), contentType, accept, body, requestOptions,
+            Context.NONE);
     }
 
     /**
diff --git a/sdk/purview/azure-analytics-purview-datamap/src/main/resources/META-INF/azure-analytics-purview-datamap_apiview_properties.json b/sdk/purview/azure-analytics-purview-datamap/src/main/resources/META-INF/azure-analytics-purview-datamap_apiview_properties.json
index f415cee9b86a..9f5039c98fa9 100644
--- a/sdk/purview/azure-analytics-purview-datamap/src/main/resources/META-INF/azure-analytics-purview-datamap_apiview_properties.json
+++ b/sdk/purview/azure-analytics-purview-datamap/src/main/resources/META-INF/azure-analytics-purview-datamap_apiview_properties.json
@@ -1,7 +1,7 @@
 {
   "flavor": "azure", 
   "CrossLanguageDefinitionId": {
-    "com.azure.analytics.purview.datamap.DataMapClientBuilder": "PurviewDataMap.DataMapClient",
+    "com.azure.analytics.purview.datamap.DataMapClientBuilder": "Customizations",
     "com.azure.analytics.purview.datamap.DiscoveryAsyncClient": "null",
     "com.azure.analytics.purview.datamap.DiscoveryAsyncClient.autoComplete": "Customizations.Discovery.autoComplete",
     "com.azure.analytics.purview.datamap.DiscoveryAsyncClient.autoCompleteWithResponse": "Customizations.Discovery.autoComplete",
diff --git a/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/fluent/StandbyPoolClient.java b/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/fluent/StandbyPoolClient.java
index 145bb6db7b96..943d29ef9642 100644
--- a/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/fluent/StandbyPoolClient.java
+++ b/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/fluent/StandbyPoolClient.java
@@ -12,7 +12,7 @@
  */
 public interface StandbyPoolClient {
     /**
-     * Gets Server parameter.
+     * Gets Service host.
      * 
      * @return the endpoint value.
      */
diff --git a/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/implementation/OperationsClientImpl.java b/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/implementation/OperationsClientImpl.java
index 9bab365dfef4..b4c9b020a5f1 100644
--- a/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/implementation/OperationsClientImpl.java
+++ b/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/implementation/OperationsClientImpl.java
@@ -67,14 +67,14 @@ public interface OperationsService {
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> list(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listNext(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, Context context);
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -181,6 +181,8 @@ public PagedIterable list(Context context) {
     }
 
     /**
+     * List the operations for the provider
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -207,6 +209,8 @@ private Mono> listNextSinglePageAsync(String nextL
     }
 
     /**
+     * List the operations for the provider
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
diff --git a/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/implementation/StandbyContainerGroupPoolRuntimeViewsClientImpl.java b/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/implementation/StandbyContainerGroupPoolRuntimeViewsClientImpl.java
index fa3a10af8a2b..cacc1e34b04d 100644
--- a/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/implementation/StandbyContainerGroupPoolRuntimeViewsClientImpl.java
+++ b/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/implementation/StandbyContainerGroupPoolRuntimeViewsClientImpl.java
@@ -72,7 +72,7 @@ Mono> get(@HostParam
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName,
             @PathParam("standbyContainerGroupPoolName") String standbyContainerGroupPoolName,
-            @PathParam("runtimeView") String runtimeView, @HeaderParam("accept") String accept, Context context);
+            @PathParam("runtimeView") String runtimeView, @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StandbyPool/standbyContainerGroupPools/{standbyContainerGroupPoolName}/runtimeViews")
@@ -83,7 +83,7 @@ Mono> listBySta
             @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName,
             @PathParam("standbyContainerGroupPoolName") String standbyContainerGroupPoolName,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
@@ -91,7 +91,7 @@ Mono> listBySta
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listByStandbyPoolNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -389,6 +389,8 @@ public PagedIterable listBySt
     }
 
     /**
+     * List StandbyContainerGroupPoolRuntimeViewResource resources by StandbyContainerGroupPoolResource
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -418,6 +420,8 @@ public PagedIterable listBySt
     }
 
     /**
+     * List StandbyContainerGroupPoolRuntimeViewResource resources by StandbyContainerGroupPoolResource
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
diff --git a/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/implementation/StandbyContainerGroupPoolsClientImpl.java b/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/implementation/StandbyContainerGroupPoolsClientImpl.java
index b4b6855b62ac..9bb6e6e4063a 100644
--- a/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/implementation/StandbyContainerGroupPoolsClientImpl.java
+++ b/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/implementation/StandbyContainerGroupPoolsClientImpl.java
@@ -81,9 +81,8 @@ Mono> getByResourceGroup(
             @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName,
             @PathParam("standbyContainerGroupPoolName") String standbyContainerGroupPoolName,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
-        @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StandbyPool/standbyContainerGroupPools/{standbyContainerGroupPoolName}")
         @ExpectedResponses({ 200, 201 })
         @UnexpectedResponseExceptionType(ManagementException.class)
@@ -91,7 +90,7 @@ Mono>> createOrUpdate(@HostParam("endpoint") String en
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName,
             @PathParam("standbyContainerGroupPoolName") String standbyContainerGroupPoolName,
-            @HeaderParam("accept") String accept,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") StandbyContainerGroupPoolResourceInner resource, Context context);
 
         @Headers({ "Content-Type: application/json" })
@@ -102,9 +101,8 @@ Mono>> delete(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName,
             @PathParam("standbyContainerGroupPoolName") String standbyContainerGroupPoolName,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
-        @Headers({ "Content-Type: application/json" })
         @Patch("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StandbyPool/standbyContainerGroupPools/{standbyContainerGroupPoolName}")
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
@@ -112,7 +110,7 @@ Mono> update(@HostParam("endpoi
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName,
             @PathParam("standbyContainerGroupPoolName") String standbyContainerGroupPoolName,
-            @HeaderParam("accept") String accept,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") StandbyContainerGroupPoolResourceUpdate properties, Context context);
 
         @Headers({ "Content-Type: application/json" })
@@ -122,7 +120,7 @@ Mono> update(@HostParam("endpoi
         Mono> listByResourceGroup(
             @HostParam("endpoint") String endpoint, @QueryParam("api-version") String apiVersion,
             @PathParam("subscriptionId") String subscriptionId,
-            @PathParam("resourceGroupName") String resourceGroupName, @HeaderParam("accept") String accept,
+            @PathParam("resourceGroupName") String resourceGroupName, @HeaderParam("Accept") String accept,
             Context context);
 
         @Headers({ "Content-Type: application/json" })
@@ -131,7 +129,7 @@ Mono> listByResourceGroup(
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> list(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
@@ -139,7 +137,7 @@ Mono> list(@HostParam("end
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listByResourceGroupNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
@@ -147,7 +145,7 @@ Mono> listByResourceGroupN
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listBySubscriptionNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -308,11 +306,12 @@ private Mono>> createOrUpdateWithResponseAsync(String
         } else {
             resource.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getApiVersion(),
-                this.client.getSubscriptionId(), resourceGroupName, standbyContainerGroupPoolName, accept, resource,
-                context))
+                this.client.getSubscriptionId(), resourceGroupName, standbyContainerGroupPoolName, contentType, accept,
+                resource, context))
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
@@ -352,11 +351,12 @@ private Mono>> createOrUpdateWithResponseAsync(String
         } else {
             resource.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getApiVersion(),
-            this.client.getSubscriptionId(), resourceGroupName, standbyContainerGroupPoolName, accept, resource,
-            context);
+            this.client.getSubscriptionId(), resourceGroupName, standbyContainerGroupPoolName, contentType, accept,
+            resource, context);
     }
 
     /**
@@ -758,11 +758,12 @@ private Mono> updateWithRespons
         } else {
             properties.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.update(this.client.getEndpoint(), this.client.getApiVersion(),
-                this.client.getSubscriptionId(), resourceGroupName, standbyContainerGroupPoolName, accept, properties,
-                context))
+                this.client.getSubscriptionId(), resourceGroupName, standbyContainerGroupPoolName, contentType, accept,
+                properties, context))
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
@@ -802,10 +803,11 @@ private Mono> updateWithRespons
         } else {
             properties.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.update(this.client.getEndpoint(), this.client.getApiVersion(), this.client.getSubscriptionId(),
-            resourceGroupName, standbyContainerGroupPoolName, accept, properties, context);
+            resourceGroupName, standbyContainerGroupPoolName, contentType, accept, properties, context);
     }
 
     /**
@@ -1112,6 +1114,8 @@ public PagedIterable list(Context contex
     }
 
     /**
+     * List StandbyContainerGroupPoolResource resources by resource group
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -1141,6 +1145,8 @@ public PagedIterable list(Context contex
     }
 
     /**
+     * List StandbyContainerGroupPoolResource resources by resource group
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -1169,6 +1175,8 @@ public PagedIterable list(Context contex
     }
 
     /**
+     * List StandbyContainerGroupPoolResource resources by subscription ID
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -1198,6 +1206,8 @@ public PagedIterable list(Context contex
     }
 
     /**
+     * List StandbyContainerGroupPoolResource resources by subscription ID
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
diff --git a/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/implementation/StandbyPoolClientBuilder.java b/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/implementation/StandbyPoolClientBuilder.java
index a3b885c502d5..9df0fdc8c466 100644
--- a/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/implementation/StandbyPoolClientBuilder.java
+++ b/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/implementation/StandbyPoolClientBuilder.java
@@ -20,12 +20,12 @@
 @ServiceClientBuilder(serviceClients = { StandbyPoolClientImpl.class })
 public final class StandbyPoolClientBuilder {
     /*
-     * Server parameter
+     * Service host
      */
     private String endpoint;
 
     /**
-     * Sets Server parameter.
+     * Sets Service host.
      * 
      * @param endpoint the endpoint value.
      * @return the StandbyPoolClientBuilder.
@@ -121,6 +121,7 @@ public StandbyPoolClientBuilder serializerAdapter(SerializerAdapter serializerAd
      * @return an instance of StandbyPoolClientImpl.
      */
     public StandbyPoolClientImpl buildClient() {
+        String localEndpoint = (endpoint != null) ? endpoint : "https://management.azure.com";
         AzureEnvironment localEnvironment = (environment != null) ? environment : AzureEnvironment.AZURE;
         HttpPipeline localPipeline = (pipeline != null)
             ? pipeline
@@ -131,7 +132,7 @@ public StandbyPoolClientImpl buildClient() {
             ? serializerAdapter
             : SerializerFactory.createDefaultManagementSerializerAdapter();
         StandbyPoolClientImpl client = new StandbyPoolClientImpl(localPipeline, localSerializerAdapter,
-            localDefaultPollInterval, localEnvironment, this.endpoint, this.subscriptionId);
+            localDefaultPollInterval, localEnvironment, localEndpoint, this.subscriptionId);
         return client;
     }
 }
diff --git a/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/implementation/StandbyPoolClientImpl.java b/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/implementation/StandbyPoolClientImpl.java
index b90d0c531848..c1a3e0845627 100644
--- a/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/implementation/StandbyPoolClientImpl.java
+++ b/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/implementation/StandbyPoolClientImpl.java
@@ -45,12 +45,12 @@
 @ServiceClient(builder = StandbyPoolClientBuilder.class)
 public final class StandbyPoolClientImpl implements StandbyPoolClient {
     /**
-     * Server parameter.
+     * Service host.
      */
     private final String endpoint;
 
     /**
-     * Gets Server parameter.
+     * Gets Service host.
      * 
      * @return the endpoint value.
      */
@@ -219,7 +219,7 @@ public StandbyContainerGroupPoolRuntimeViewsClient getStandbyContainerGroupPoolR
      * @param serializerAdapter The serializer to serialize an object into a string.
      * @param defaultPollInterval The default poll interval for long-running operation.
      * @param environment The Azure environment.
-     * @param endpoint Server parameter.
+     * @param endpoint Service host.
      * @param subscriptionId The ID of the target subscription. The value must be an UUID.
      */
     StandbyPoolClientImpl(HttpPipeline httpPipeline, SerializerAdapter serializerAdapter, Duration defaultPollInterval,
diff --git a/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/implementation/StandbyVirtualMachinePoolRuntimeViewsClientImpl.java b/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/implementation/StandbyVirtualMachinePoolRuntimeViewsClientImpl.java
index 48c309ccc52c..8a567e99ab2b 100644
--- a/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/implementation/StandbyVirtualMachinePoolRuntimeViewsClientImpl.java
+++ b/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/implementation/StandbyVirtualMachinePoolRuntimeViewsClientImpl.java
@@ -72,7 +72,7 @@ Mono> get(@HostParam
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName,
             @PathParam("standbyVirtualMachinePoolName") String standbyVirtualMachinePoolName,
-            @PathParam("runtimeView") String runtimeView, @HeaderParam("accept") String accept, Context context);
+            @PathParam("runtimeView") String runtimeView, @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StandbyPool/standbyVirtualMachinePools/{standbyVirtualMachinePoolName}/runtimeViews")
@@ -83,7 +83,7 @@ Mono> listBySta
             @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName,
             @PathParam("standbyVirtualMachinePoolName") String standbyVirtualMachinePoolName,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
@@ -91,7 +91,7 @@ Mono> listBySta
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listByStandbyPoolNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -389,6 +389,8 @@ public PagedIterable listBySt
     }
 
     /**
+     * List StandbyVirtualMachinePoolRuntimeViewResource resources by StandbyVirtualMachinePoolResource
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -418,6 +420,8 @@ public PagedIterable listBySt
     }
 
     /**
+     * List StandbyVirtualMachinePoolRuntimeViewResource resources by StandbyVirtualMachinePoolResource
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
diff --git a/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/implementation/StandbyVirtualMachinePoolsClientImpl.java b/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/implementation/StandbyVirtualMachinePoolsClientImpl.java
index ab113536a91d..6702480211cf 100644
--- a/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/implementation/StandbyVirtualMachinePoolsClientImpl.java
+++ b/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/implementation/StandbyVirtualMachinePoolsClientImpl.java
@@ -81,9 +81,8 @@ Mono> getByResourceGroup(
             @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName,
             @PathParam("standbyVirtualMachinePoolName") String standbyVirtualMachinePoolName,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
-        @Headers({ "Content-Type: application/json" })
         @Put("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StandbyPool/standbyVirtualMachinePools/{standbyVirtualMachinePoolName}")
         @ExpectedResponses({ 200, 201 })
         @UnexpectedResponseExceptionType(ManagementException.class)
@@ -91,7 +90,7 @@ Mono>> createOrUpdate(@HostParam("endpoint") String en
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName,
             @PathParam("standbyVirtualMachinePoolName") String standbyVirtualMachinePoolName,
-            @HeaderParam("accept") String accept,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") StandbyVirtualMachinePoolResourceInner resource, Context context);
 
         @Headers({ "Content-Type: application/json" })
@@ -102,9 +101,8 @@ Mono>> delete(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName,
             @PathParam("standbyVirtualMachinePoolName") String standbyVirtualMachinePoolName,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
-        @Headers({ "Content-Type: application/json" })
         @Patch("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StandbyPool/standbyVirtualMachinePools/{standbyVirtualMachinePoolName}")
         @ExpectedResponses({ 200 })
         @UnexpectedResponseExceptionType(ManagementException.class)
@@ -112,7 +110,7 @@ Mono> update(@HostParam("endpoi
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName,
             @PathParam("standbyVirtualMachinePoolName") String standbyVirtualMachinePoolName,
-            @HeaderParam("accept") String accept,
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("application/json") StandbyVirtualMachinePoolResourceUpdate properties, Context context);
 
         @Headers({ "Content-Type: application/json" })
@@ -122,7 +120,7 @@ Mono> update(@HostParam("endpoi
         Mono> listByResourceGroup(
             @HostParam("endpoint") String endpoint, @QueryParam("api-version") String apiVersion,
             @PathParam("subscriptionId") String subscriptionId,
-            @PathParam("resourceGroupName") String resourceGroupName, @HeaderParam("accept") String accept,
+            @PathParam("resourceGroupName") String resourceGroupName, @HeaderParam("Accept") String accept,
             Context context);
 
         @Headers({ "Content-Type: application/json" })
@@ -131,7 +129,7 @@ Mono> listByResourceGroup(
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> list(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("subscriptionId") String subscriptionId,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
@@ -139,7 +137,7 @@ Mono> list(@HostParam("end
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listByResourceGroupNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
@@ -147,7 +145,7 @@ Mono> listByResourceGroupN
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listBySubscriptionNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -308,11 +306,12 @@ private Mono>> createOrUpdateWithResponseAsync(String
         } else {
             resource.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), this.client.getApiVersion(),
-                this.client.getSubscriptionId(), resourceGroupName, standbyVirtualMachinePoolName, accept, resource,
-                context))
+                this.client.getSubscriptionId(), resourceGroupName, standbyVirtualMachinePoolName, contentType, accept,
+                resource, context))
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
@@ -352,11 +351,12 @@ private Mono>> createOrUpdateWithResponseAsync(String
         } else {
             resource.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), this.client.getApiVersion(),
-            this.client.getSubscriptionId(), resourceGroupName, standbyVirtualMachinePoolName, accept, resource,
-            context);
+            this.client.getSubscriptionId(), resourceGroupName, standbyVirtualMachinePoolName, contentType, accept,
+            resource, context);
     }
 
     /**
@@ -758,11 +758,12 @@ private Mono> updateWithRespons
         } else {
             properties.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.update(this.client.getEndpoint(), this.client.getApiVersion(),
-                this.client.getSubscriptionId(), resourceGroupName, standbyVirtualMachinePoolName, accept, properties,
-                context))
+                this.client.getSubscriptionId(), resourceGroupName, standbyVirtualMachinePoolName, contentType, accept,
+                properties, context))
             .contextWrite(context -> context.putAll(FluxUtil.toReactorContext(this.client.getContext()).readOnly()));
     }
 
@@ -802,10 +803,11 @@ private Mono> updateWithRespons
         } else {
             properties.validate();
         }
+        final String contentType = "application/json";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.update(this.client.getEndpoint(), this.client.getApiVersion(), this.client.getSubscriptionId(),
-            resourceGroupName, standbyVirtualMachinePoolName, accept, properties, context);
+            resourceGroupName, standbyVirtualMachinePoolName, contentType, accept, properties, context);
     }
 
     /**
@@ -1112,6 +1114,8 @@ public PagedIterable list(Context contex
     }
 
     /**
+     * List StandbyVirtualMachinePoolResource resources by resource group
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -1141,6 +1145,8 @@ public PagedIterable list(Context contex
     }
 
     /**
+     * List StandbyVirtualMachinePoolResource resources by resource group
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -1169,6 +1175,8 @@ public PagedIterable list(Context contex
     }
 
     /**
+     * List StandbyVirtualMachinePoolResource resources by subscription ID
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -1198,6 +1206,8 @@ public PagedIterable list(Context contex
     }
 
     /**
+     * List StandbyVirtualMachinePoolResource resources by subscription ID
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
diff --git a/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/implementation/StandbyVirtualMachinesClientImpl.java b/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/implementation/StandbyVirtualMachinesClientImpl.java
index f5798201851a..02da9f264ca3 100644
--- a/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/implementation/StandbyVirtualMachinesClientImpl.java
+++ b/sdk/standbypool/azure-resourcemanager-standbypool/src/main/java/com/azure/resourcemanager/standbypool/implementation/StandbyVirtualMachinesClientImpl.java
@@ -71,7 +71,7 @@ Mono> get(@HostParam("endpoint") St
             @PathParam("resourceGroupName") String resourceGroupName,
             @PathParam("standbyVirtualMachinePoolName") String standbyVirtualMachinePoolName,
             @PathParam("standbyVirtualMachineName") String standbyVirtualMachineName,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.StandbyPool/standbyVirtualMachinePools/{standbyVirtualMachinePoolName}/standbyVirtualMachines")
@@ -82,7 +82,7 @@ Mono> listByStandbyVirtualMach
             @PathParam("subscriptionId") String subscriptionId,
             @PathParam("resourceGroupName") String resourceGroupName,
             @PathParam("standbyVirtualMachinePoolName") String standbyVirtualMachinePoolName,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
 
         @Headers({ "Content-Type: application/json" })
         @Get("{nextLink}")
@@ -90,7 +90,7 @@ Mono> listByStandbyVirtualMach
         @UnexpectedResponseExceptionType(ManagementException.class)
         Mono> listByStandbyVirtualMachinePoolResourceNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, Context context);
+            @HeaderParam("Accept") String accept, Context context);
     }
 
     /**
@@ -392,6 +392,8 @@ public PagedIterable listByStandbyVirtualMac
     }
 
     /**
+     * List StandbyVirtualMachineResource resources by StandbyVirtualMachinePoolResource
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
@@ -421,6 +423,8 @@ public PagedIterable listByStandbyVirtualMac
     }
 
     /**
+     * List StandbyVirtualMachineResource resources by StandbyVirtualMachinePoolResource
+     * 
      * Get the next page of items.
      * 
      * @param nextLink The URL to get the next list of items.
diff --git a/sdk/translation/azure-ai-translation-document/src/main/java/com/azure/ai/translation/document/implementation/DocumentTranslationClientImpl.java b/sdk/translation/azure-ai-translation-document/src/main/java/com/azure/ai/translation/document/implementation/DocumentTranslationClientImpl.java
index be5dfa0ea098..4678aa4aac27 100644
--- a/sdk/translation/azure-ai-translation-document/src/main/java/com/azure/ai/translation/document/implementation/DocumentTranslationClientImpl.java
+++ b/sdk/translation/azure-ai-translation-document/src/main/java/com/azure/ai/translation/document/implementation/DocumentTranslationClientImpl.java
@@ -178,9 +178,9 @@ public interface DocumentTranslationClientService {
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> startTranslation(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData startTranslationDetails, RequestOptions requestOptions,
-            Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData startTranslationDetails,
+            RequestOptions requestOptions, Context context);
 
         @Post("/document/batches")
         @ExpectedResponses({ 202 })
@@ -189,9 +189,9 @@ Mono> startTranslation(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response startTranslationSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData startTranslationDetails, RequestOptions requestOptions,
-            Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData startTranslationDetails,
+            RequestOptions requestOptions, Context context);
 
         @Get("/document/batches")
         @ExpectedResponses({ 200 })
@@ -200,7 +200,7 @@ Response startTranslationSync(@HostParam("endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getTranslationsStatus(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/document/batches")
@@ -210,7 +210,7 @@ Mono> getTranslationsStatus(@HostParam("endpoint") String e
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getTranslationsStatusSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/document/batches/{id}/documents/{documentId}")
@@ -221,7 +221,7 @@ Response getTranslationsStatusSync(@HostParam("endpoint") String end
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getDocumentStatus(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("id") String id,
-            @PathParam("documentId") String documentId, @HeaderParam("accept") String accept,
+            @PathParam("documentId") String documentId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/document/batches/{id}/documents/{documentId}")
@@ -232,7 +232,7 @@ Mono> getDocumentStatus(@HostParam("endpoint") String endpo
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getDocumentStatusSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("id") String id,
-            @PathParam("documentId") String documentId, @HeaderParam("accept") String accept,
+            @PathParam("documentId") String documentId, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/document/batches/{id}")
@@ -243,7 +243,7 @@ Response getDocumentStatusSync(@HostParam("endpoint") String endpoin
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getTranslationStatus(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("id") String id,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/document/batches/{id}")
         @ExpectedResponses({ 200 })
@@ -253,7 +253,7 @@ Mono> getTranslationStatus(@HostParam("endpoint") String en
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getTranslationStatusSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("id") String id,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/document/batches/{id}")
         @ExpectedResponses({ 200 })
@@ -263,7 +263,7 @@ Response getTranslationStatusSync(@HostParam("endpoint") String endp
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> cancelTranslation(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("id") String id,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Delete("/document/batches/{id}")
         @ExpectedResponses({ 200 })
@@ -273,7 +273,7 @@ Mono> cancelTranslation(@HostParam("endpoint") String endpo
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response cancelTranslationSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("id") String id,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/document/batches/{id}/documents")
         @ExpectedResponses({ 200 })
@@ -283,7 +283,7 @@ Response cancelTranslationSync(@HostParam("endpoint") String endpoin
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getDocumentsStatus(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("id") String id,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/document/batches/{id}/documents")
         @ExpectedResponses({ 200 })
@@ -293,7 +293,7 @@ Mono> getDocumentsStatus(@HostParam("endpoint") String endp
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getDocumentsStatusSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @PathParam("id") String id,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("/document/formats")
         @ExpectedResponses({ 200 })
@@ -302,7 +302,7 @@ Response getDocumentsStatusSync(@HostParam("endpoint") String endpoi
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getSupportedFormats(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/document/formats")
@@ -312,7 +312,7 @@ Mono> getSupportedFormats(@HostParam("endpoint") String end
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getSupportedFormatsSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
@@ -323,7 +323,7 @@ Response getSupportedFormatsSync(@HostParam("endpoint") String endpo
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getTranslationsStatusNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -333,7 +333,7 @@ Mono> getTranslationsStatusNext(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getTranslationsStatusNextSync(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -343,7 +343,7 @@ Response getTranslationsStatusNextSync(
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getDocumentsStatusNext(
             @PathParam(value = "nextLink", encoded = true) String nextLink, @HostParam("endpoint") String endpoint,
-            @HeaderParam("accept") String accept, RequestOptions requestOptions, Context context);
+            @HeaderParam("Accept") String accept, RequestOptions requestOptions, Context context);
 
         @Get("{nextLink}")
         @ExpectedResponses({ 200 })
@@ -352,7 +352,7 @@ Mono> getDocumentsStatusNext(
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getDocumentsStatusNextSync(@PathParam(value = "nextLink", encoded = true) String nextLink,
-            @HostParam("endpoint") String endpoint, @HeaderParam("accept") String accept, RequestOptions requestOptions,
+            @HostParam("endpoint") String endpoint, @HeaderParam("Accept") String accept, RequestOptions requestOptions,
             Context context);
     }
 
@@ -426,9 +426,11 @@ Response getDocumentsStatusNextSync(@PathParam(value = "nextLink", e
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Mono> startTranslationWithResponseAsync(BinaryData startTranslationDetails,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil.withContext(context -> service.startTranslation(this.getEndpoint(),
-            this.getServiceVersion().getVersion(), accept, startTranslationDetails, requestOptions, context));
+        return FluxUtil
+            .withContext(context -> service.startTranslation(this.getEndpoint(), this.getServiceVersion().getVersion(),
+                contentType, accept, startTranslationDetails, requestOptions, context));
     }
 
     /**
@@ -501,9 +503,10 @@ private Mono> startTranslationWithResponseAsync(BinaryData startT
     @ServiceMethod(returns = ReturnType.SINGLE)
     private Response startTranslationWithResponse(BinaryData startTranslationDetails,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.startTranslationSync(this.getEndpoint(), this.getServiceVersion().getVersion(), accept,
-            startTranslationDetails, requestOptions, Context.NONE);
+        return service.startTranslationSync(this.getEndpoint(), this.getServiceVersion().getVersion(), contentType,
+            accept, startTranslationDetails, requestOptions, Context.NONE);
     }
 
     /**
diff --git a/sdk/translation/azure-ai-translation-document/src/main/java/com/azure/ai/translation/document/implementation/SingleDocumentTranslationClientImpl.java b/sdk/translation/azure-ai-translation-document/src/main/java/com/azure/ai/translation/document/implementation/SingleDocumentTranslationClientImpl.java
index 9402ef21f61f..93dddbb4fc2b 100644
--- a/sdk/translation/azure-ai-translation-document/src/main/java/com/azure/ai/translation/document/implementation/SingleDocumentTranslationClientImpl.java
+++ b/sdk/translation/azure-ai-translation-document/src/main/java/com/azure/ai/translation/document/implementation/SingleDocumentTranslationClientImpl.java
@@ -161,7 +161,7 @@ public interface SingleDocumentTranslationClientService {
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> documentTranslate(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @QueryParam("targetLanguage") String targetLanguage,
-            @HeaderParam("content-type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("multipart/form-data") BinaryData documentTranslateContent, RequestOptions requestOptions,
             Context context);
 
@@ -174,7 +174,7 @@ Mono> documentTranslate(@HostParam("endpoint") String endpo
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response documentTranslateSync(@HostParam("endpoint") String endpoint,
             @QueryParam("api-version") String apiVersion, @QueryParam("targetLanguage") String targetLanguage,
-            @HeaderParam("content-type") String contentType, @HeaderParam("accept") String accept,
+            @HeaderParam("content-type") String contentType, @HeaderParam("Accept") String accept,
             @BodyParam("multipart/form-data") BinaryData documentTranslateContent, RequestOptions requestOptions,
             Context context);
     }
@@ -220,7 +220,7 @@ Response documentTranslateSync(@HostParam("endpoint") String endpoin
     public Mono> documentTranslateWithResponseAsync(String targetLanguage,
         BinaryData documentTranslateContent, RequestOptions requestOptions) {
         final String contentType = "multipart/form-data";
-        final String accept = "application/octet-stream, application/json";
+        final String accept = "application/octet-stream";
         return FluxUtil
             .withContext(context -> service.documentTranslate(this.getEndpoint(), this.getServiceVersion().getVersion(),
                 targetLanguage, contentType, accept, documentTranslateContent, requestOptions, context));
@@ -267,7 +267,7 @@ public Mono> documentTranslateWithResponseAsync(String targ
     public Response documentTranslateWithResponse(String targetLanguage,
         BinaryData documentTranslateContent, RequestOptions requestOptions) {
         final String contentType = "multipart/form-data";
-        final String accept = "application/octet-stream, application/json";
+        final String accept = "application/octet-stream";
         return service.documentTranslateSync(this.getEndpoint(), this.getServiceVersion().getVersion(), targetLanguage,
             contentType, accept, documentTranslateContent, requestOptions, Context.NONE);
     }
diff --git a/sdk/translation/azure-ai-translation-document/src/main/resources/META-INF/azure-ai-translation-document_apiview_properties.json b/sdk/translation/azure-ai-translation-document/src/main/resources/META-INF/azure-ai-translation-document_apiview_properties.json
index 38f421b4468a..c7c7e18a2e90 100644
--- a/sdk/translation/azure-ai-translation-document/src/main/resources/META-INF/azure-ai-translation-document_apiview_properties.json
+++ b/sdk/translation/azure-ai-translation-document/src/main/resources/META-INF/azure-ai-translation-document_apiview_properties.json
@@ -1,7 +1,7 @@
 {
   "flavor": "azure", 
   "CrossLanguageDefinitionId": {
-    "com.azure.ai.translation.document.DocumentTranslationAsyncClient": "DocumentTranslation.DocumentTranslationClient",
+    "com.azure.ai.translation.document.DocumentTranslationAsyncClient": "ClientCustomizations.DocumentTranslationClient",
     "com.azure.ai.translation.document.DocumentTranslationAsyncClient.beginStartTranslation": "ClientCustomizations.DocumentTranslationClient.startTranslation",
     "com.azure.ai.translation.document.DocumentTranslationAsyncClient.beginStartTranslationWithModel": "ClientCustomizations.DocumentTranslationClient.startTranslation",
     "com.azure.ai.translation.document.DocumentTranslationAsyncClient.cancelTranslation": "ClientCustomizations.DocumentTranslationClient.cancelTranslation",
@@ -14,7 +14,7 @@
     "com.azure.ai.translation.document.DocumentTranslationAsyncClient.getTranslationStatus": "ClientCustomizations.DocumentTranslationClient.getTranslationStatus",
     "com.azure.ai.translation.document.DocumentTranslationAsyncClient.getTranslationStatusWithResponse": "ClientCustomizations.DocumentTranslationClient.getTranslationStatus",
     "com.azure.ai.translation.document.DocumentTranslationAsyncClient.getTranslationsStatus": "ClientCustomizations.DocumentTranslationClient.getTranslationsStatus",
-    "com.azure.ai.translation.document.DocumentTranslationClient": "DocumentTranslation.DocumentTranslationClient",
+    "com.azure.ai.translation.document.DocumentTranslationClient": "ClientCustomizations.DocumentTranslationClient",
     "com.azure.ai.translation.document.DocumentTranslationClient.beginStartTranslation": "ClientCustomizations.DocumentTranslationClient.startTranslation",
     "com.azure.ai.translation.document.DocumentTranslationClient.beginStartTranslationWithModel": "ClientCustomizations.DocumentTranslationClient.startTranslation",
     "com.azure.ai.translation.document.DocumentTranslationClient.cancelTranslation": "ClientCustomizations.DocumentTranslationClient.cancelTranslation",
@@ -27,14 +27,14 @@
     "com.azure.ai.translation.document.DocumentTranslationClient.getTranslationStatus": "ClientCustomizations.DocumentTranslationClient.getTranslationStatus",
     "com.azure.ai.translation.document.DocumentTranslationClient.getTranslationStatusWithResponse": "ClientCustomizations.DocumentTranslationClient.getTranslationStatus",
     "com.azure.ai.translation.document.DocumentTranslationClient.getTranslationsStatus": "ClientCustomizations.DocumentTranslationClient.getTranslationsStatus",
-    "com.azure.ai.translation.document.DocumentTranslationClientBuilder": "DocumentTranslation.DocumentTranslationClient",
-    "com.azure.ai.translation.document.SingleDocumentTranslationAsyncClient": "DocumentTranslation.SingleDocumentTranslationClient",
+    "com.azure.ai.translation.document.DocumentTranslationClientBuilder": "ClientCustomizations.DocumentTranslationClient",
+    "com.azure.ai.translation.document.SingleDocumentTranslationAsyncClient": "ClientCustomizations.SingleDocumentTranslationClient",
     "com.azure.ai.translation.document.SingleDocumentTranslationAsyncClient.documentTranslate": "ClientCustomizations.SingleDocumentTranslationClient.documentTranslate",
     "com.azure.ai.translation.document.SingleDocumentTranslationAsyncClient.documentTranslateWithResponse": "ClientCustomizations.SingleDocumentTranslationClient.documentTranslate",
-    "com.azure.ai.translation.document.SingleDocumentTranslationClient": "DocumentTranslation.SingleDocumentTranslationClient",
+    "com.azure.ai.translation.document.SingleDocumentTranslationClient": "ClientCustomizations.SingleDocumentTranslationClient",
     "com.azure.ai.translation.document.SingleDocumentTranslationClient.documentTranslate": "ClientCustomizations.SingleDocumentTranslationClient.documentTranslate",
     "com.azure.ai.translation.document.SingleDocumentTranslationClient.documentTranslateWithResponse": "ClientCustomizations.SingleDocumentTranslationClient.documentTranslate",
-    "com.azure.ai.translation.document.SingleDocumentTranslationClientBuilder": "DocumentTranslation.SingleDocumentTranslationClient",
+    "com.azure.ai.translation.document.SingleDocumentTranslationClientBuilder": "ClientCustomizations.SingleDocumentTranslationClient",
     "com.azure.ai.translation.document.models.BatchRequest": "DocumentTranslation.BatchRequest",
     "com.azure.ai.translation.document.models.DocumentFileDetails": "null",
     "com.azure.ai.translation.document.models.DocumentFilter": "DocumentTranslation.DocumentFilter",
diff --git a/sdk/translation/azure-ai-translation-text/src/main/java/com/azure/ai/translation/text/implementation/TextTranslationClientImpl.java b/sdk/translation/azure-ai-translation-text/src/main/java/com/azure/ai/translation/text/implementation/TextTranslationClientImpl.java
index b300b4df26d4..8c55aae7d876 100644
--- a/sdk/translation/azure-ai-translation-text/src/main/java/com/azure/ai/translation/text/implementation/TextTranslationClientImpl.java
+++ b/sdk/translation/azure-ai-translation-text/src/main/java/com/azure/ai/translation/text/implementation/TextTranslationClientImpl.java
@@ -163,7 +163,7 @@ public interface TextTranslationClientService {
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> getSupportedLanguages(@HostParam("Endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Get("/languages")
@@ -173,7 +173,7 @@ Mono> getSupportedLanguages(@HostParam("Endpoint") String e
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response getSupportedLanguagesSync(@HostParam("Endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Accept") String accept,
             RequestOptions requestOptions, Context context);
 
         @Post("/translate")
@@ -184,8 +184,9 @@ Response getSupportedLanguagesSync(@HostParam("Endpoint") String end
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> translate(@HostParam("Endpoint") String endpoint,
             @QueryParam(value = "to", multipleQueryParams = true) List targetLanguages,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Post("/translate")
         @ExpectedResponses({ 200 })
@@ -195,8 +196,9 @@ Mono> translate(@HostParam("Endpoint") String endpoint,
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response translateSync(@HostParam("Endpoint") String endpoint,
             @QueryParam(value = "to", multipleQueryParams = true) List targetLanguages,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Post("/transliterate")
         @ExpectedResponses({ 200 })
@@ -207,8 +209,8 @@ Response translateSync(@HostParam("Endpoint") String endpoint,
         Mono> transliterate(@HostParam("Endpoint") String endpoint,
             @QueryParam("language") String language, @QueryParam("fromScript") String sourceLanguageScript,
             @QueryParam("toScript") String targetLanguageScript, @QueryParam("api-version") String apiVersion,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Post("/transliterate")
         @ExpectedResponses({ 200 })
@@ -219,8 +221,8 @@ Mono> transliterate(@HostParam("Endpoint") String endpoint,
         Response transliterateSync(@HostParam("Endpoint") String endpoint,
             @QueryParam("language") String language, @QueryParam("fromScript") String sourceLanguageScript,
             @QueryParam("toScript") String targetLanguageScript, @QueryParam("api-version") String apiVersion,
-            @HeaderParam("accept") String accept, @BodyParam("application/json") BinaryData body,
-            RequestOptions requestOptions, Context context);
+            @HeaderParam("Content-Type") String contentType, @HeaderParam("Accept") String accept,
+            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
 
         @Post("/breaksentence")
         @ExpectedResponses({ 200 })
@@ -229,8 +231,9 @@ Response transliterateSync(@HostParam("Endpoint") String endpoint,
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> findSentenceBoundaries(@HostParam("Endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Post("/breaksentence")
         @ExpectedResponses({ 200 })
@@ -239,8 +242,9 @@ Mono> findSentenceBoundaries(@HostParam("Endpoint") String
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response findSentenceBoundariesSync(@HostParam("Endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Post("/dictionary/lookup")
         @ExpectedResponses({ 200 })
@@ -250,8 +254,9 @@ Response findSentenceBoundariesSync(@HostParam("Endpoint") String en
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> lookupDictionaryEntries(@HostParam("Endpoint") String endpoint,
             @QueryParam("from") String sourceLanguage, @QueryParam("to") String targetLanguage,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Post("/dictionary/lookup")
         @ExpectedResponses({ 200 })
@@ -261,8 +266,9 @@ Mono> lookupDictionaryEntries(@HostParam("Endpoint") String
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response lookupDictionaryEntriesSync(@HostParam("Endpoint") String endpoint,
             @QueryParam("from") String sourceLanguage, @QueryParam("to") String targetLanguage,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Post("/dictionary/examples")
         @ExpectedResponses({ 200 })
@@ -272,8 +278,9 @@ Response lookupDictionaryEntriesSync(@HostParam("Endpoint") String e
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> lookupDictionaryExamples(@HostParam("Endpoint") String endpoint,
             @QueryParam("from") String sourceLanguage, @QueryParam("to") String targetLanguage,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
 
         @Post("/dictionary/examples")
         @ExpectedResponses({ 200 })
@@ -283,8 +290,9 @@ Mono> lookupDictionaryExamples(@HostParam("Endpoint") Strin
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response lookupDictionaryExamplesSync(@HostParam("Endpoint") String endpoint,
             @QueryParam("from") String sourceLanguage, @QueryParam("to") String targetLanguage,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
-            @BodyParam("application/json") BinaryData body, RequestOptions requestOptions, Context context);
+            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
+            @HeaderParam("Accept") String accept, @BodyParam("application/json") BinaryData body,
+            RequestOptions requestOptions, Context context);
     }
 
     /**
@@ -607,11 +615,12 @@ public Response getSupportedLanguagesWithResponse(RequestOptions req
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> translateWithResponseAsync(List targetLanguages, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         List targetLanguagesConverted
             = targetLanguages.stream().map(item -> Objects.toString(item, "")).collect(Collectors.toList());
         return FluxUtil.withContext(context -> service.translate(this.getEndpoint(), targetLanguagesConverted,
-            this.getServiceVersion().getVersion(), accept, body, requestOptions, context));
+            this.getServiceVersion().getVersion(), contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -736,11 +745,12 @@ public Mono> translateWithResponseAsync(List target
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response translateWithResponse(List targetLanguages, BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         List targetLanguagesConverted
             = targetLanguages.stream().map(item -> Objects.toString(item, "")).collect(Collectors.toList());
         return service.translateSync(this.getEndpoint(), targetLanguagesConverted,
-            this.getServiceVersion().getVersion(), accept, body, requestOptions, Context.NONE);
+            this.getServiceVersion().getVersion(), contentType, accept, body, requestOptions, Context.NONE);
     }
 
     /**
@@ -794,9 +804,11 @@ public Response translateWithResponse(List targetLanguages,
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> transliterateWithResponseAsync(String language, String sourceLanguageScript,
         String targetLanguageScript, BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return FluxUtil.withContext(context -> service.transliterate(this.getEndpoint(), language, sourceLanguageScript,
-            targetLanguageScript, this.getServiceVersion().getVersion(), accept, body, requestOptions, context));
+        return FluxUtil.withContext(
+            context -> service.transliterate(this.getEndpoint(), language, sourceLanguageScript, targetLanguageScript,
+                this.getServiceVersion().getVersion(), contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -850,9 +862,10 @@ public Mono> transliterateWithResponseAsync(String language
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response transliterateWithResponse(String language, String sourceLanguageScript,
         String targetLanguageScript, BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return service.transliterateSync(this.getEndpoint(), language, sourceLanguageScript, targetLanguageScript,
-            this.getServiceVersion().getVersion(), accept, body, requestOptions, Context.NONE);
+            this.getServiceVersion().getVersion(), contentType, accept, body, requestOptions, Context.NONE);
     }
 
     /**
@@ -912,9 +925,10 @@ public Response transliterateWithResponse(String language, String so
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> findSentenceBoundariesWithResponseAsync(BinaryData body,
         RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.findSentenceBoundaries(this.getEndpoint(),
-            this.getServiceVersion().getVersion(), accept, body, requestOptions, context));
+            this.getServiceVersion().getVersion(), contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -973,9 +987,10 @@ public Mono> findSentenceBoundariesWithResponseAsync(Binary
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response findSentenceBoundariesWithResponse(BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
-        return service.findSentenceBoundariesSync(this.getEndpoint(), this.getServiceVersion().getVersion(), accept,
-            body, requestOptions, Context.NONE);
+        return service.findSentenceBoundariesSync(this.getEndpoint(), this.getServiceVersion().getVersion(),
+            contentType, accept, body, requestOptions, Context.NONE);
     }
 
     /**
@@ -1041,9 +1056,10 @@ public Response findSentenceBoundariesWithResponse(BinaryData body,
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> lookupDictionaryEntriesWithResponseAsync(String sourceLanguage,
         String targetLanguage, BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.lookupDictionaryEntries(this.getEndpoint(), sourceLanguage,
-            targetLanguage, this.getServiceVersion().getVersion(), accept, body, requestOptions, context));
+            targetLanguage, this.getServiceVersion().getVersion(), contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -1109,9 +1125,10 @@ public Mono> lookupDictionaryEntriesWithResponseAsync(Strin
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response lookupDictionaryEntriesWithResponse(String sourceLanguage, String targetLanguage,
         BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return service.lookupDictionaryEntriesSync(this.getEndpoint(), sourceLanguage, targetLanguage,
-            this.getServiceVersion().getVersion(), accept, body, requestOptions, Context.NONE);
+            this.getServiceVersion().getVersion(), contentType, accept, body, requestOptions, Context.NONE);
     }
 
     /**
@@ -1171,9 +1188,10 @@ public Response lookupDictionaryEntriesWithResponse(String sourceLan
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono> lookupDictionaryExamplesWithResponseAsync(String sourceLanguage,
         String targetLanguage, BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return FluxUtil.withContext(context -> service.lookupDictionaryExamples(this.getEndpoint(), sourceLanguage,
-            targetLanguage, this.getServiceVersion().getVersion(), accept, body, requestOptions, context));
+            targetLanguage, this.getServiceVersion().getVersion(), contentType, accept, body, requestOptions, context));
     }
 
     /**
@@ -1233,8 +1251,9 @@ public Mono> lookupDictionaryExamplesWithResponseAsync(Stri
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response lookupDictionaryExamplesWithResponse(String sourceLanguage, String targetLanguage,
         BinaryData body, RequestOptions requestOptions) {
+        final String contentType = "application/json";
         final String accept = "application/json";
         return service.lookupDictionaryExamplesSync(this.getEndpoint(), sourceLanguage, targetLanguage,
-            this.getServiceVersion().getVersion(), accept, body, requestOptions, Context.NONE);
+            this.getServiceVersion().getVersion(), contentType, accept, body, requestOptions, Context.NONE);
     }
 }

From 50156accf81bc22b086f515750c526079ad6c042 Mon Sep 17 00:00:00 2001
From: Haoling Dong 
Date: Wed, 28 Aug 2024 16:48:02 +0800
Subject: [PATCH 2/3] update assets.json

---
 sdk/batch/azure-compute-batch/assets.json                       | 2 +-
 .../azure-ai-documentintelligence/assets.json                   | 2 +-
 sdk/openai/azure-ai-openai/assets.json                          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sdk/batch/azure-compute-batch/assets.json b/sdk/batch/azure-compute-batch/assets.json
index 2682b077ab00..98da5da699f4 100644
--- a/sdk/batch/azure-compute-batch/assets.json
+++ b/sdk/batch/azure-compute-batch/assets.json
@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "java",
   "TagPrefix": "java/batch/azure-compute-batch",
-  "Tag": "java/batch/azure-compute-batch_70c93036ed"
+  "Tag": "java/batch/azure-compute-batch_f58320abba"
 }
diff --git a/sdk/documentintelligence/azure-ai-documentintelligence/assets.json b/sdk/documentintelligence/azure-ai-documentintelligence/assets.json
index 039b7e35f674..f54124562677 100644
--- a/sdk/documentintelligence/azure-ai-documentintelligence/assets.json
+++ b/sdk/documentintelligence/azure-ai-documentintelligence/assets.json
@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "java",
   "TagPrefix": "java/documentintelligence/azure-ai-documentintelligence",
-  "Tag": "java/documentintelligence/azure-ai-documentintelligence_32bf8db3b0"
+  "Tag": "java/documentintelligence/azure-ai-documentintelligence_f9f065f444"
 }
diff --git a/sdk/openai/azure-ai-openai/assets.json b/sdk/openai/azure-ai-openai/assets.json
index 325caff17304..f77c86800ba5 100644
--- a/sdk/openai/azure-ai-openai/assets.json
+++ b/sdk/openai/azure-ai-openai/assets.json
@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "java",
   "TagPrefix": "java/openai/azure-ai-openai",
-  "Tag": "java/openai/azure-ai-openai_6aab94ce2d"
+  "Tag": "java/openai/azure-ai-openai_2a0196dd29"
 }

From 20be4e48d58b755b9ee6d784d5ace887e217c4eb Mon Sep 17 00:00:00 2001
From: Haoling Dong 
Date: Wed, 28 Aug 2024 16:59:08 +0800
Subject: [PATCH 3/3] revert healthinsights changes

---
 .../RadiologyInsightsAsyncClient.java         | 47 ++----------
 .../RadiologyInsightsClient.java              | 47 ++----------
 .../RadiologyInsightsClientImpl.java          | 70 ++++++++---------
 .../models/InferRadiologyInsightsRequest.java | 76 -------------------
 .../implementation/models/package-info.java   | 12 ---
 .../src/main/java/module-info.java            |  1 -
 ...-radiologyinsights_apiview_properties.json |  8 +-
 7 files changed, 53 insertions(+), 208 deletions(-)
 delete mode 100644 sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/implementation/models/InferRadiologyInsightsRequest.java
 delete mode 100644 sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/implementation/models/package-info.java

diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/RadiologyInsightsAsyncClient.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/RadiologyInsightsAsyncClient.java
index d21584235cdd..bc4cd3dc1c76 100644
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/RadiologyInsightsAsyncClient.java
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/RadiologyInsightsAsyncClient.java
@@ -15,12 +15,9 @@
 import com.azure.core.util.BinaryData;
 import com.azure.core.util.polling.PollerFlux;
 import com.azure.health.insights.radiologyinsights.implementation.RadiologyInsightsClientImpl;
-import com.azure.health.insights.radiologyinsights.implementation.models.InferRadiologyInsightsRequest;
-import com.azure.health.insights.radiologyinsights.models.PatientRecord;
+import com.azure.health.insights.radiologyinsights.models.RadiologyInsightsData;
 import com.azure.health.insights.radiologyinsights.models.RadiologyInsightsInferenceResult;
-import com.azure.health.insights.radiologyinsights.models.RadiologyInsightsModelConfiguration;
 import com.azure.health.insights.radiologyinsights.models.RadiologyInsightsResult;
-import java.util.List;
 
 /**
  * Initializes a new instance of the asynchronous RadiologyInsightsClient type.
@@ -393,7 +390,7 @@ public final class RadiologyInsightsAsyncClient {
      * }
      * }

      *
-     * @param inferRadiologyInsightsRequest The inferRadiologyInsightsRequest parameter.
+     * @param radiologyInsightsData Contains the list of patients, and configuration data.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
@@ -403,9 +400,9 @@ public final class RadiologyInsightsAsyncClient {
      */
     @Generated
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    public PollerFlux beginInferRadiologyInsights(BinaryData inferRadiologyInsightsRequest,
+    public PollerFlux beginInferRadiologyInsights(BinaryData radiologyInsightsData,
         RequestOptions requestOptions) {
-        return this.serviceClient.beginInferRadiologyInsightsAsync(inferRadiologyInsightsRequest, requestOptions);
+        return this.serviceClient.beginInferRadiologyInsightsAsync(radiologyInsightsData, requestOptions);
     }
 
     /**
@@ -413,8 +410,7 @@ public PollerFlux beginInferRadiologyInsights(BinaryData
      *
      * Creates a Radiology Insights job with the given request body.
      *
-     * @param patients The list of patients, including their clinical information and data.
-     * @param configuration Configuration affecting the Radiology Insights model's inference.
+     * @param radiologyInsightsData Contains the list of patients, and configuration data.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
@@ -426,37 +422,10 @@ public PollerFlux beginInferRadiologyInsights(BinaryData
     @Generated
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public PollerFlux
-        beginInferRadiologyInsights(List patients, RadiologyInsightsModelConfiguration configuration) {
+        beginInferRadiologyInsights(RadiologyInsightsData radiologyInsightsData) {
         // Generated convenience method for beginInferRadiologyInsightsWithModel
         RequestOptions requestOptions = new RequestOptions();
-        InferRadiologyInsightsRequest inferRadiologyInsightsRequestObj
-            = new InferRadiologyInsightsRequest(patients).setConfiguration(configuration);
-        BinaryData inferRadiologyInsightsRequest = BinaryData.fromObject(inferRadiologyInsightsRequestObj);
-        return serviceClient.beginInferRadiologyInsightsWithModelAsync(inferRadiologyInsightsRequest, requestOptions);
-    }
-
-    /**
-     * Create Radiology Insights job
-     *
-     * Creates a Radiology Insights job with the given request body.
-     *
-     * @param patients The list of patients, including their clinical information and data.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
-     * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
-     * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link PollerFlux} for polling of provides status details for long running operations.
-     */
-    @Generated
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    public PollerFlux
-        beginInferRadiologyInsights(List patients) {
-        // Generated convenience method for beginInferRadiologyInsightsWithModel
-        RequestOptions requestOptions = new RequestOptions();
-        InferRadiologyInsightsRequest inferRadiologyInsightsRequestObj = new InferRadiologyInsightsRequest(patients);
-        BinaryData inferRadiologyInsightsRequest = BinaryData.fromObject(inferRadiologyInsightsRequestObj);
-        return serviceClient.beginInferRadiologyInsightsWithModelAsync(inferRadiologyInsightsRequest, requestOptions);
+        return serviceClient.beginInferRadiologyInsightsWithModelAsync(BinaryData.fromObject(radiologyInsightsData),
+            requestOptions);
     }
 }
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/RadiologyInsightsClient.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/RadiologyInsightsClient.java
index 658085ef0a84..7de41efdfc19 100644
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/RadiologyInsightsClient.java
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/RadiologyInsightsClient.java
@@ -15,12 +15,9 @@
 import com.azure.core.util.BinaryData;
 import com.azure.core.util.polling.SyncPoller;
 import com.azure.health.insights.radiologyinsights.implementation.RadiologyInsightsClientImpl;
-import com.azure.health.insights.radiologyinsights.implementation.models.InferRadiologyInsightsRequest;
-import com.azure.health.insights.radiologyinsights.models.PatientRecord;
+import com.azure.health.insights.radiologyinsights.models.RadiologyInsightsData;
 import com.azure.health.insights.radiologyinsights.models.RadiologyInsightsInferenceResult;
-import com.azure.health.insights.radiologyinsights.models.RadiologyInsightsModelConfiguration;
 import com.azure.health.insights.radiologyinsights.models.RadiologyInsightsResult;
-import java.util.List;
 
 /**
  * Initializes a new instance of the synchronous RadiologyInsightsClient type.
@@ -393,7 +390,7 @@ public final class RadiologyInsightsClient {
      * }
      * }

      *
-     * @param inferRadiologyInsightsRequest The inferRadiologyInsightsRequest parameter.
+     * @param radiologyInsightsData Contains the list of patients, and configuration data.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
@@ -403,9 +400,9 @@ public final class RadiologyInsightsClient {
      */
     @Generated
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    public SyncPoller beginInferRadiologyInsights(BinaryData inferRadiologyInsightsRequest,
+    public SyncPoller beginInferRadiologyInsights(BinaryData radiologyInsightsData,
         RequestOptions requestOptions) {
-        return this.serviceClient.beginInferRadiologyInsights(inferRadiologyInsightsRequest, requestOptions);
+        return this.serviceClient.beginInferRadiologyInsights(radiologyInsightsData, requestOptions);
     }
 
     /**
@@ -413,8 +410,7 @@ public SyncPoller beginInferRadiologyInsights(BinaryData
      *
      * Creates a Radiology Insights job with the given request body.
      *
-     * @param patients The list of patients, including their clinical information and data.
-     * @param configuration Configuration affecting the Radiology Insights model's inference.
+     * @param radiologyInsightsData Contains the list of patients, and configuration data.
      * @throws IllegalArgumentException thrown if parameters fail the validation.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
@@ -426,37 +422,10 @@ public SyncPoller beginInferRadiologyInsights(BinaryData
     @Generated
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller
-        beginInferRadiologyInsights(List patients, RadiologyInsightsModelConfiguration configuration) {
+        beginInferRadiologyInsights(RadiologyInsightsData radiologyInsightsData) {
         // Generated convenience method for beginInferRadiologyInsightsWithModel
         RequestOptions requestOptions = new RequestOptions();
-        InferRadiologyInsightsRequest inferRadiologyInsightsRequestObj
-            = new InferRadiologyInsightsRequest(patients).setConfiguration(configuration);
-        BinaryData inferRadiologyInsightsRequest = BinaryData.fromObject(inferRadiologyInsightsRequestObj);
-        return serviceClient.beginInferRadiologyInsightsWithModel(inferRadiologyInsightsRequest, requestOptions);
-    }
-
-    /**
-     * Create Radiology Insights job
-     *
-     * Creates a Radiology Insights job with the given request body.
-     *
-     * @param patients The list of patients, including their clinical information and data.
-     * @throws IllegalArgumentException thrown if parameters fail the validation.
-     * @throws HttpResponseException thrown if the request is rejected by server.
-     * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
-     * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
-     * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
-     * @return the {@link SyncPoller} for polling of provides status details for long running operations.
-     */
-    @Generated
-    @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    public SyncPoller
-        beginInferRadiologyInsights(List patients) {
-        // Generated convenience method for beginInferRadiologyInsightsWithModel
-        RequestOptions requestOptions = new RequestOptions();
-        InferRadiologyInsightsRequest inferRadiologyInsightsRequestObj = new InferRadiologyInsightsRequest(patients);
-        BinaryData inferRadiologyInsightsRequest = BinaryData.fromObject(inferRadiologyInsightsRequestObj);
-        return serviceClient.beginInferRadiologyInsightsWithModel(inferRadiologyInsightsRequest, requestOptions);
+        return serviceClient.beginInferRadiologyInsightsWithModel(BinaryData.fromObject(radiologyInsightsData),
+            requestOptions);
     }
 }
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/implementation/RadiologyInsightsClientImpl.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/implementation/RadiologyInsightsClientImpl.java
index b215e719ba41..b1b46bfb3bdb 100644
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/implementation/RadiologyInsightsClientImpl.java
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/implementation/RadiologyInsightsClientImpl.java
@@ -29,7 +29,6 @@
 import com.azure.core.http.rest.RestProxy;
 import com.azure.core.util.BinaryData;
 import com.azure.core.util.Context;
-import com.azure.core.util.CoreUtils;
 import com.azure.core.util.DateTimeRfc1123;
 import com.azure.core.util.FluxUtil;
 import com.azure.core.util.polling.PollerFlux;
@@ -43,6 +42,7 @@
 import com.azure.health.insights.radiologyinsights.models.RadiologyInsightsResult;
 import java.time.Duration;
 import java.time.OffsetDateTime;
+import java.util.UUID;
 import reactor.core.publisher.Mono;
 
 /**
@@ -170,9 +170,8 @@ public interface RadiologyInsightsClientService {
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Mono> inferRadiologyInsights(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
-            @HeaderParam("Accept") String accept,
-            @BodyParam("application/json") BinaryData inferRadiologyInsightsRequest, RequestOptions requestOptions,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @BodyParam("application/json") BinaryData radiologyInsightsData, RequestOptions requestOptions,
             Context context);
 
         @Post("/radiology-insights/jobs")
@@ -182,9 +181,8 @@ Mono> inferRadiologyInsights(@HostParam("endpoint") String
         @UnexpectedResponseExceptionType(value = ResourceModifiedException.class, code = { 409 })
         @UnexpectedResponseExceptionType(HttpResponseException.class)
         Response inferRadiologyInsightsSync(@HostParam("endpoint") String endpoint,
-            @QueryParam("api-version") String apiVersion, @HeaderParam("Content-Type") String contentType,
-            @HeaderParam("Accept") String accept,
-            @BodyParam("application/json") BinaryData inferRadiologyInsightsRequest, RequestOptions requestOptions,
+            @QueryParam("api-version") String apiVersion, @HeaderParam("accept") String accept,
+            @BodyParam("application/json") BinaryData radiologyInsightsData, RequestOptions requestOptions,
             Context context);
     }
 
@@ -540,7 +538,7 @@ Response inferRadiologyInsightsSync(@HostParam("endpoint") String en
      * }
      * }

      * 
-     * @param inferRadiologyInsightsRequest The inferRadiologyInsightsRequest parameter.
+     * @param radiologyInsightsData Contains the list of patients, and configuration data.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
@@ -550,27 +548,26 @@ Response inferRadiologyInsightsSync(@HostParam("endpoint") String en
      * of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Mono> inferRadiologyInsightsWithResponseAsync(BinaryData inferRadiologyInsightsRequest,
+    private Mono> inferRadiologyInsightsWithResponseAsync(BinaryData radiologyInsightsData,
         RequestOptions requestOptions) {
-        final String contentType = "application/json";
         final String accept = "application/json";
         RequestOptions requestOptionsLocal = requestOptions == null ? new RequestOptions() : requestOptions;
+        String repeatabilityRequestId = UUID.randomUUID().toString();
+        String repeatabilityFirstSent = DateTimeRfc1123.toRfc1123String(OffsetDateTime.now());
         requestOptionsLocal.addRequestCallback(requestLocal -> {
             if (requestLocal.getHeaders().get(HttpHeaderName.fromString("repeatability-request-id")) == null) {
                 requestLocal.getHeaders()
-                    .set(HttpHeaderName.fromString("repeatability-request-id"), CoreUtils.randomUuid().toString());
+                    .set(HttpHeaderName.fromString("repeatability-request-id"), repeatabilityRequestId);
             }
         });
         requestOptionsLocal.addRequestCallback(requestLocal -> {
             if (requestLocal.getHeaders().get(HttpHeaderName.fromString("repeatability-first-sent")) == null) {
                 requestLocal.getHeaders()
-                    .set(HttpHeaderName.fromString("repeatability-first-sent"),
-                        DateTimeRfc1123.toRfc1123String(OffsetDateTime.now()));
+                    .set(HttpHeaderName.fromString("repeatability-first-sent"), repeatabilityFirstSent);
             }
         });
-        return FluxUtil.withContext(
-            context -> service.inferRadiologyInsights(this.getEndpoint(), this.getServiceVersion().getVersion(),
-                contentType, accept, inferRadiologyInsightsRequest, requestOptionsLocal, context));
+        return FluxUtil.withContext(context -> service.inferRadiologyInsights(this.getEndpoint(),
+            this.getServiceVersion().getVersion(), accept, radiologyInsightsData, requestOptionsLocal, context));
     }
 
     /**
@@ -925,7 +922,7 @@ private Mono> inferRadiologyInsightsWithResponseAsync(Binar
      * }
      * }

      * 
-     * @param inferRadiologyInsightsRequest The inferRadiologyInsightsRequest parameter.
+     * @param radiologyInsightsData Contains the list of patients, and configuration data.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
@@ -934,26 +931,26 @@ private Mono> inferRadiologyInsightsWithResponseAsync(Binar
      * @return provides status details for long running operations along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
-    private Response inferRadiologyInsightsWithResponse(BinaryData inferRadiologyInsightsRequest,
+    private Response inferRadiologyInsightsWithResponse(BinaryData radiologyInsightsData,
         RequestOptions requestOptions) {
-        final String contentType = "application/json";
         final String accept = "application/json";
         RequestOptions requestOptionsLocal = requestOptions == null ? new RequestOptions() : requestOptions;
+        String repeatabilityRequestId = UUID.randomUUID().toString();
+        String repeatabilityFirstSent = DateTimeRfc1123.toRfc1123String(OffsetDateTime.now());
         requestOptionsLocal.addRequestCallback(requestLocal -> {
             if (requestLocal.getHeaders().get(HttpHeaderName.fromString("repeatability-request-id")) == null) {
                 requestLocal.getHeaders()
-                    .set(HttpHeaderName.fromString("repeatability-request-id"), CoreUtils.randomUuid().toString());
+                    .set(HttpHeaderName.fromString("repeatability-request-id"), repeatabilityRequestId);
             }
         });
         requestOptionsLocal.addRequestCallback(requestLocal -> {
             if (requestLocal.getHeaders().get(HttpHeaderName.fromString("repeatability-first-sent")) == null) {
                 requestLocal.getHeaders()
-                    .set(HttpHeaderName.fromString("repeatability-first-sent"),
-                        DateTimeRfc1123.toRfc1123String(OffsetDateTime.now()));
+                    .set(HttpHeaderName.fromString("repeatability-first-sent"), repeatabilityFirstSent);
             }
         });
-        return service.inferRadiologyInsightsSync(this.getEndpoint(), this.getServiceVersion().getVersion(),
-            contentType, accept, inferRadiologyInsightsRequest, requestOptionsLocal, Context.NONE);
+        return service.inferRadiologyInsightsSync(this.getEndpoint(), this.getServiceVersion().getVersion(), accept,
+            radiologyInsightsData, requestOptionsLocal, Context.NONE);
     }
 
     /**
@@ -1308,7 +1305,7 @@ private Response inferRadiologyInsightsWithResponse(BinaryData infer
      * }
      * }

      * 
-     * @param inferRadiologyInsightsRequest The inferRadiologyInsightsRequest parameter.
+     * @param radiologyInsightsData Contains the list of patients, and configuration data.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
@@ -1317,10 +1314,10 @@ private Response inferRadiologyInsightsWithResponse(BinaryData infer
      * @return the {@link PollerFlux} for polling of provides status details for long running operations.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    public PollerFlux beginInferRadiologyInsightsAsync(BinaryData inferRadiologyInsightsRequest,
+    public PollerFlux beginInferRadiologyInsightsAsync(BinaryData radiologyInsightsData,
         RequestOptions requestOptions) {
         return PollerFlux.create(Duration.ofSeconds(1),
-            () -> this.inferRadiologyInsightsWithResponseAsync(inferRadiologyInsightsRequest, requestOptions),
+            () -> this.inferRadiologyInsightsWithResponseAsync(radiologyInsightsData, requestOptions),
             new com.azure.health.insights.radiologyinsights.implementation.OperationLocationPollingStrategy<>(
                 new PollingStrategyOptions(this.getHttpPipeline())
                     .setEndpoint("{endpoint}/health-insights".replace("{endpoint}", this.getEndpoint()))
@@ -1684,7 +1681,7 @@ public PollerFlux beginInferRadiologyInsightsAsync(Binar
      * }
      * }

      * 
-     * @param inferRadiologyInsightsRequest The inferRadiologyInsightsRequest parameter.
+     * @param radiologyInsightsData Contains the list of patients, and configuration data.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
@@ -1693,10 +1690,10 @@ public PollerFlux beginInferRadiologyInsightsAsync(Binar
      * @return the {@link SyncPoller} for polling of provides status details for long running operations.
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
-    public SyncPoller beginInferRadiologyInsights(BinaryData inferRadiologyInsightsRequest,
+    public SyncPoller beginInferRadiologyInsights(BinaryData radiologyInsightsData,
         RequestOptions requestOptions) {
         return SyncPoller.createPoller(Duration.ofSeconds(1),
-            () -> this.inferRadiologyInsightsWithResponse(inferRadiologyInsightsRequest, requestOptions),
+            () -> this.inferRadiologyInsightsWithResponse(radiologyInsightsData, requestOptions),
             new com.azure.health.insights.radiologyinsights.implementation.SyncOperationLocationPollingStrategy<>(
                 new PollingStrategyOptions(this.getHttpPipeline())
                     .setEndpoint("{endpoint}/health-insights".replace("{endpoint}", this.getEndpoint()))
@@ -2060,7 +2057,7 @@ public SyncPoller beginInferRadiologyInsights(BinaryData
      * }
      * }

      * 
-     * @param inferRadiologyInsightsRequest The inferRadiologyInsightsRequest parameter.
+     * @param radiologyInsightsData Contains the list of patients, and configuration data.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
@@ -2070,10 +2067,9 @@ public SyncPoller beginInferRadiologyInsights(BinaryData
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public PollerFlux
-        beginInferRadiologyInsightsWithModelAsync(BinaryData inferRadiologyInsightsRequest,
-            RequestOptions requestOptions) {
+        beginInferRadiologyInsightsWithModelAsync(BinaryData radiologyInsightsData, RequestOptions requestOptions) {
         return PollerFlux.create(Duration.ofSeconds(1),
-            () -> this.inferRadiologyInsightsWithResponseAsync(inferRadiologyInsightsRequest, requestOptions),
+            () -> this.inferRadiologyInsightsWithResponseAsync(radiologyInsightsData, requestOptions),
             new com.azure.health.insights.radiologyinsights.implementation.OperationLocationPollingStrategy<>(
                 new PollingStrategyOptions(this.getHttpPipeline())
                     .setEndpoint("{endpoint}/health-insights".replace("{endpoint}", this.getEndpoint()))
@@ -2438,7 +2434,7 @@ public SyncPoller beginInferRadiologyInsights(BinaryData
      * }
      * }

      * 
-     * @param inferRadiologyInsightsRequest The inferRadiologyInsightsRequest parameter.
+     * @param radiologyInsightsData Contains the list of patients, and configuration data.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
@@ -2448,9 +2444,9 @@ public SyncPoller beginInferRadiologyInsights(BinaryData
      */
     @ServiceMethod(returns = ReturnType.LONG_RUNNING_OPERATION)
     public SyncPoller
-        beginInferRadiologyInsightsWithModel(BinaryData inferRadiologyInsightsRequest, RequestOptions requestOptions) {
+        beginInferRadiologyInsightsWithModel(BinaryData radiologyInsightsData, RequestOptions requestOptions) {
         return SyncPoller.createPoller(Duration.ofSeconds(1),
-            () -> this.inferRadiologyInsightsWithResponse(inferRadiologyInsightsRequest, requestOptions),
+            () -> this.inferRadiologyInsightsWithResponse(radiologyInsightsData, requestOptions),
             new com.azure.health.insights.radiologyinsights.implementation.SyncOperationLocationPollingStrategy<>(
                 new PollingStrategyOptions(this.getHttpPipeline())
                     .setEndpoint("{endpoint}/health-insights".replace("{endpoint}", this.getEndpoint()))
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/implementation/models/InferRadiologyInsightsRequest.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/implementation/models/InferRadiologyInsightsRequest.java
deleted file mode 100644
index f818f7599f68..000000000000
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/implementation/models/InferRadiologyInsightsRequest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) TypeSpec Code Generator.
-
-package com.azure.health.insights.radiologyinsights.implementation.models;
-
-import com.azure.core.annotation.Fluent;
-import com.azure.core.annotation.Generated;
-import com.azure.health.insights.radiologyinsights.models.PatientRecord;
-import com.azure.health.insights.radiologyinsights.models.RadiologyInsightsModelConfiguration;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import java.util.List;
-
-/**
- * The InferRadiologyInsightsRequest model.
- */
-@Fluent
-public final class InferRadiologyInsightsRequest {
-    /*
-     * The list of patients, including their clinical information and data.
-     */
-    @Generated
-    @JsonProperty(value = "patients")
-    private final List patients;
-
-    /*
-     * Configuration affecting the Radiology Insights model's inference.
-     */
-    @Generated
-    @JsonProperty(value = "configuration")
-    private RadiologyInsightsModelConfiguration configuration;
-
-    /**
-     * Creates an instance of InferRadiologyInsightsRequest class.
-     * 
-     * @param patients the patients value to set.
-     */
-    @Generated
-    @JsonCreator
-    public InferRadiologyInsightsRequest(@JsonProperty(value = "patients") List patients) {
-        this.patients = patients;
-    }
-
-    /**
-     * Get the patients property: The list of patients, including their clinical information and data.
-     * 
-     * @return the patients value.
-     */
-    @Generated
-    public List getPatients() {
-        return this.patients;
-    }
-
-    /**
-     * Get the configuration property: Configuration affecting the Radiology Insights model's inference.
-     * 
-     * @return the configuration value.
-     */
-    @Generated
-    public RadiologyInsightsModelConfiguration getConfiguration() {
-        return this.configuration;
-    }
-
-    /**
-     * Set the configuration property: Configuration affecting the Radiology Insights model's inference.
-     * 
-     * @param configuration the configuration value to set.
-     * @return the InferRadiologyInsightsRequest object itself.
-     */
-    @Generated
-    public InferRadiologyInsightsRequest setConfiguration(RadiologyInsightsModelConfiguration configuration) {
-        this.configuration = configuration;
-        return this;
-    }
-}
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/implementation/models/package-info.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/implementation/models/package-info.java
deleted file mode 100644
index bdd36364a223..000000000000
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/com/azure/health/insights/radiologyinsights/implementation/models/package-info.java
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-// Code generated by Microsoft (R) TypeSpec Code Generator.
-
-/**
- * 
- * Package containing the data models for RadiologyInsights.
- * Azure AI Health Insights provides an API that serves insight models, specific for Health & Life Sciences, that
- * perform analysis and provide inferences to be used by a human.
- * 
- */
-package com.azure.health.insights.radiologyinsights.implementation.models;
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/module-info.java b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/module-info.java
index 948526aea445..ad70b8fff0f4 100644
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/module-info.java
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/java/module-info.java
@@ -6,6 +6,5 @@
     requires transitive com.azure.core;
     exports com.azure.health.insights.radiologyinsights;
     exports com.azure.health.insights.radiologyinsights.models;
-    opens com.azure.health.insights.radiologyinsights.implementation.models to com.azure.core, com.fasterxml.jackson.databind;
     opens com.azure.health.insights.radiologyinsights.models to com.azure.core, com.fasterxml.jackson.databind;
 }
diff --git a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/resources/META-INF/azure-health-insights-radiologyinsights_apiview_properties.json b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/resources/META-INF/azure-health-insights-radiologyinsights_apiview_properties.json
index 4a2f5d680f68..5dc1ae409f06 100644
--- a/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/resources/META-INF/azure-health-insights-radiologyinsights_apiview_properties.json
+++ b/sdk/healthinsights/azure-health-insights-radiologyinsights/src/main/resources/META-INF/azure-health-insights-radiologyinsights_apiview_properties.json
@@ -1,14 +1,13 @@
 {
   "flavor": "azure", 
   "CrossLanguageDefinitionId": {
-    "com.azure.health.insights.radiologyinsights.RadiologyInsightsAsyncClient": "ClientForAzureHealthInsights.RadiologyInsightsClient",
+    "com.azure.health.insights.radiologyinsights.RadiologyInsightsAsyncClient": "AzureHealthInsights.RadiologyInsightsClient",
     "com.azure.health.insights.radiologyinsights.RadiologyInsightsAsyncClient.beginInferRadiologyInsights": "ClientForAzureHealthInsights.RadiologyInsightsClient.inferRadiologyInsights",
     "com.azure.health.insights.radiologyinsights.RadiologyInsightsAsyncClient.beginInferRadiologyInsightsWithModel": "ClientForAzureHealthInsights.RadiologyInsightsClient.inferRadiologyInsights",
-    "com.azure.health.insights.radiologyinsights.RadiologyInsightsClient": "ClientForAzureHealthInsights.RadiologyInsightsClient",
+    "com.azure.health.insights.radiologyinsights.RadiologyInsightsClient": "AzureHealthInsights.RadiologyInsightsClient",
     "com.azure.health.insights.radiologyinsights.RadiologyInsightsClient.beginInferRadiologyInsights": "ClientForAzureHealthInsights.RadiologyInsightsClient.inferRadiologyInsights",
     "com.azure.health.insights.radiologyinsights.RadiologyInsightsClient.beginInferRadiologyInsightsWithModel": "ClientForAzureHealthInsights.RadiologyInsightsClient.inferRadiologyInsights",
-    "com.azure.health.insights.radiologyinsights.RadiologyInsightsClientBuilder": "ClientForAzureHealthInsights.RadiologyInsightsClient",
-    "com.azure.health.insights.radiologyinsights.implementation.models.InferRadiologyInsightsRequest": "inferRadiologyInsights.Request.anonymous",
+    "com.azure.health.insights.radiologyinsights.RadiologyInsightsClientBuilder": "AzureHealthInsights.RadiologyInsightsClient",
     "com.azure.health.insights.radiologyinsights.models.AgeMismatchInference": "AzureHealthInsights.AgeMismatchInference",
     "com.azure.health.insights.radiologyinsights.models.ClinicalDocumentType": "AzureHealthInsights.ClinicalDocumentType",
     "com.azure.health.insights.radiologyinsights.models.CompleteOrderDiscrepancyInference": "AzureHealthInsights.CompleteOrderDiscrepancyInference",
@@ -68,6 +67,7 @@
     "com.azure.health.insights.radiologyinsights.models.PatientSex": "AzureHealthInsights.PatientInfoSex",
     "com.azure.health.insights.radiologyinsights.models.ProcedureRecommendation": "AzureHealthInsights.ProcedureRecommendation",
     "com.azure.health.insights.radiologyinsights.models.RadiologyCodeWithTypes": "AzureHealthInsights.RadiologyCodeWithTypes",
+    "com.azure.health.insights.radiologyinsights.models.RadiologyInsightsData": "AzureHealthInsights.RadiologyInsightsData",
     "com.azure.health.insights.radiologyinsights.models.RadiologyInsightsInference": "AzureHealthInsights.RadiologyInsightsInference",
     "com.azure.health.insights.radiologyinsights.models.RadiologyInsightsInferenceOptions": "AzureHealthInsights.RadiologyInsightsInferenceOptions",
     "com.azure.health.insights.radiologyinsights.models.RadiologyInsightsInferenceResult": "AzureHealthInsights.RadiologyInsightsInferenceResult",