diff --git a/sdk/eventgrid/eventgrid/package.json b/sdk/eventgrid/eventgrid/package.json
index 2bab3114d7a7..0a2b75a92b8a 100644
--- a/sdk/eventgrid/eventgrid/package.json
+++ b/sdk/eventgrid/eventgrid/package.json
@@ -60,7 +60,7 @@
   },
   "scripts": {
     "audit": "node ../../../common/scripts/rush-audit.js && rimraf node_modules package-lock.json && npm i --package-lock-only 2>&1 && npm audit",
-    "build:autorest": "autorest ./swagger/README.md --typescript --v3",
+    "build:autorest": "autorest ./swagger/README.md --typescript --v3 && node ./scripts/setPathToEmpty.js",
     "build:browser": "tsc -p . && cross-env ONLY_BROWSER=true rollup -c 2>&1",
     "build:node": "tsc -p . && cross-env ONLY_NODE=true rollup -c 2>&1",
     "build:samples": "echo Obsolete",
diff --git a/sdk/eventgrid/eventgrid/scripts/setPathToEmpty.js b/sdk/eventgrid/eventgrid/scripts/setPathToEmpty.js
new file mode 100644
index 000000000000..2b2c812937df
--- /dev/null
+++ b/sdk/eventgrid/eventgrid/scripts/setPathToEmpty.js
@@ -0,0 +1,12 @@
+"use strict";
+const fs = require("fs");
+
+// The "endpoint" shown in the portal and CLI for an Azure Event Grid includes the "/api/events"
+// path parameter. We need to ensure that we don't add another "/api/events" suffix, but there
+// is not a way to express this in swagger. So, we post process the generated client to ensure
+// that the operation spec we build has the empty string for the path to append.
+console.log("Updating ./scr/generate/generateClient.ts path entries");
+let data = fs.readFileSync("./src/generated/generatedClient.ts", "utf8");
+data = data.replace(new RegExp('path: "/api/events"', "g"), 'path: ""');
+fs.writeFileSync("./src/generated/generatedClient.ts", data, "utf8");
+console.log("Done Updating ./scr/generate/generateClient.ts path entries");
diff --git a/sdk/eventgrid/eventgrid/src/generated/generatedClient.ts b/sdk/eventgrid/eventgrid/src/generated/generatedClient.ts
index 3c1bfb6c8472..cc90a7648b68 100644
--- a/sdk/eventgrid/eventgrid/src/generated/generatedClient.ts
+++ b/sdk/eventgrid/eventgrid/src/generated/generatedClient.ts
@@ -6,13 +6,20 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-import { OperationOptions, OperationSpec, createSerializer } from "@azure/core-client";
+import * as coreClient from "@azure/core-client";
 import * as Parameters from "./models/parameters";
 import * as Mappers from "./models/mappers";
 import { GeneratedClientContext } from "./generatedClientContext";
-import { GeneratedClientOptionalParams, EventGridEvent, CloudEvent } from "./models";
+import {
+  GeneratedClientOptionalParams,
+  EventGridEvent,
+  GeneratedClientPublishEventsOptionalParams,
+  CloudEvent,
+  GeneratedClientPublishCloudEventEventsOptionalParams,
+  GeneratedClientPublishCustomEventEventsOptionalParams
+} from "./models";
 
-/** @hidden */
+/** @internal */
 export class GeneratedClient extends GeneratedClientContext {
   /**
    * Initializes a new instance of the GeneratedClient class.
@@ -31,9 +38,9 @@ export class GeneratedClient extends GeneratedClientContext {
   publishEvents(
     topicHostname: string,
     events: EventGridEvent[],
-    options?: OperationOptions
+    options?: GeneratedClientPublishEventsOptionalParams
   ): Promise<void> {
-    return this.sendOperationRequest<void>(
+    return this.sendOperationRequest(
       { topicHostname, events, options },
       publishEventsOperationSpec
     );
@@ -48,9 +55,9 @@ export class GeneratedClient extends GeneratedClientContext {
   publishCloudEventEvents(
     topicHostname: string,
     events: CloudEvent[],
-    options?: OperationOptions
+    options?: GeneratedClientPublishCloudEventEventsOptionalParams
   ): Promise<void> {
-    return this.sendOperationRequest<void>(
+    return this.sendOperationRequest(
       { topicHostname, events, options },
       publishCloudEventEventsOperationSpec
     );
@@ -65,19 +72,18 @@ export class GeneratedClient extends GeneratedClientContext {
   publishCustomEventEvents(
     topicHostname: string,
     events: any[],
-    options?: OperationOptions
+    options?: GeneratedClientPublishCustomEventEventsOptionalParams
   ): Promise<void> {
-    return this.sendOperationRequest<void>(
+    return this.sendOperationRequest(
       { topicHostname, events, options },
       publishCustomEventEventsOperationSpec
     );
   }
 }
 // Operation Specifications
+const serializer = coreClient.createSerializer(Mappers, /* isXml */ false);
 
-const serializer = createSerializer(Mappers, /* isXml */ false);
-
-const publishEventsOperationSpec: OperationSpec = {
+const publishEventsOperationSpec: coreClient.OperationSpec = {
   path: "",
   httpMethod: "POST",
   responses: { 200: {}, default: {} },
@@ -88,7 +94,7 @@ const publishEventsOperationSpec: OperationSpec = {
   mediaType: "json",
   serializer
 };
-const publishCloudEventEventsOperationSpec: OperationSpec = {
+const publishCloudEventEventsOperationSpec: coreClient.OperationSpec = {
   path: "",
   httpMethod: "POST",
   responses: { 200: {}, default: {} },
@@ -99,7 +105,7 @@ const publishCloudEventEventsOperationSpec: OperationSpec = {
   mediaType: "json",
   serializer
 };
-const publishCustomEventEventsOperationSpec: OperationSpec = {
+const publishCustomEventEventsOperationSpec: coreClient.OperationSpec = {
   path: "",
   httpMethod: "POST",
   responses: { 200: {}, default: {} },
diff --git a/sdk/eventgrid/eventgrid/src/generated/generatedClientContext.ts b/sdk/eventgrid/eventgrid/src/generated/generatedClientContext.ts
index e54dccb52e98..5e7b468d4700 100644
--- a/sdk/eventgrid/eventgrid/src/generated/generatedClientContext.ts
+++ b/sdk/eventgrid/eventgrid/src/generated/generatedClientContext.ts
@@ -6,32 +6,43 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-import { ServiceClient } from "@azure/core-client";
+import * as coreClient from "@azure/core-client";
 import { GeneratedClientOptionalParams } from "./models";
 
-export class GeneratedClientContext extends ServiceClient {
+/** @internal */
+export class GeneratedClientContext extends coreClient.ServiceClient {
   apiVersion: string;
 
   /**
    * Initializes a new instance of the GeneratedClientContext class.
    * @param options The parameter options
    */
-  constructor(options: GeneratedClientOptionalParams = {}) {
+  constructor(options?: GeneratedClientOptionalParams) {
+    // Initializing default values for options
+    if (!options) {
+      options = {};
+    }
     const defaults: GeneratedClientOptionalParams = {
       requestContentType: "application/json; charset=utf-8"
     };
 
-    const { endpoint, apiVersion, ...restOptions } = options;
+    const packageDetails = `azsdk-js-eventgrid/4.3.1`;
+    const userAgentPrefix =
+      options.userAgentOptions && options.userAgentOptions.userAgentPrefix
+        ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
+        : `${packageDetails}`;
 
-    const optionsWithDefaults: GeneratedClientOptionalParams = {
+    const optionsWithDefaults = {
       ...defaults,
-      ...restOptions,
-      baseUri: endpoint || "{topicHostname}"
+      ...options,
+      userAgentOptions: {
+        userAgentPrefix
+      },
+      baseUri: options.endpoint || "{topicHostname}"
     };
-
     super(optionsWithDefaults);
 
     // Assigning values to Constant parameters
-    this.apiVersion = apiVersion || "2018-01-01";
+    this.apiVersion = options.apiVersion || "2018-01-01";
   }
 }
diff --git a/sdk/eventgrid/eventgrid/src/generated/models/index.ts b/sdk/eventgrid/eventgrid/src/generated/models/index.ts
index d13295545ec5..3fe8c0c9cb64 100644
--- a/sdk/eventgrid/eventgrid/src/generated/models/index.ts
+++ b/sdk/eventgrid/eventgrid/src/generated/models/index.ts
@@ -5,7 +5,8 @@
  * Code generated by Microsoft (R) AutoRest Code Generator.
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
-import { ServiceClientOptions } from "@azure/core-client";
+
+import * as coreClient from "@azure/core-client";
 
 export type MediaJobOutputUnion = MediaJobOutput | MediaJobOutputAsset;
 
@@ -2369,7 +2370,7 @@ export const enum KnownAppAction {
  * Defines values for AppAction. \
  * {@link KnownAppAction} can be used interchangeably with AppAction,
  *  this enum contains the known values that the service supports.
- * ### Know values supported by the service
+ * ### Known values supported by the service
  * **Restarted**: Web app was restarted. \
  * **Stopped**: Web app was stopped. \
  * **ChangedAppSettings**: There was an operation to change app setting on the web app. \
@@ -2393,7 +2394,7 @@ export const enum KnownStampKind {
  * Defines values for StampKind. \
  * {@link KnownStampKind} can be used interchangeably with StampKind,
  *  this enum contains the known values that the service supports.
- * ### Know values supported by the service
+ * ### Known values supported by the service
  * **Public**: App Service Plan is running on a public stamp. \
  * **AseV1**: App Service Plan is running on an App Service Environment V1. \
  * **AseV2**: App Service Plan is running on an App Service Environment V2.
@@ -2410,7 +2411,7 @@ export const enum KnownAppServicePlanAction {
  * Defines values for AppServicePlanAction. \
  * {@link KnownAppServicePlanAction} can be used interchangeably with AppServicePlanAction,
  *  this enum contains the known values that the service supports.
- * ### Know values supported by the service
+ * ### Known values supported by the service
  * **Updated**: App Service plan is being updated.
  */
 export type AppServicePlanAction = string;
@@ -2429,7 +2430,7 @@ export const enum KnownAsyncStatus {
  * Defines values for AsyncStatus. \
  * {@link KnownAsyncStatus} can be used interchangeably with AsyncStatus,
  *  this enum contains the known values that the service supports.
- * ### Know values supported by the service
+ * ### Known values supported by the service
  * **Started**: Async operation has started. \
  * **Completed**: Async operation has completed. \
  * **Failed**: Async operation failed to complete.
@@ -2447,7 +2448,7 @@ export const enum KnownCommunicationCloudEnvironmentModel {
  * Defines values for CommunicationCloudEnvironmentModel. \
  * {@link KnownCommunicationCloudEnvironmentModel} can be used interchangeably with CommunicationCloudEnvironmentModel,
  *  this enum contains the known values that the service supports.
- * ### Know values supported by the service
+ * ### Known values supported by the service
  * **public** \
  * **dod** \
  * **gcch**
@@ -2484,7 +2485,20 @@ export type MediaJobErrorCategory =
 export type MediaJobRetry = "DoNotRetry" | "MayRetry";
 
 /** Optional parameters. */
-export interface GeneratedClientOptionalParams extends ServiceClientOptions {
+export interface GeneratedClientPublishEventsOptionalParams
+  extends coreClient.OperationOptions {}
+
+/** Optional parameters. */
+export interface GeneratedClientPublishCloudEventEventsOptionalParams
+  extends coreClient.OperationOptions {}
+
+/** Optional parameters. */
+export interface GeneratedClientPublishCustomEventEventsOptionalParams
+  extends coreClient.OperationOptions {}
+
+/** Optional parameters. */
+export interface GeneratedClientOptionalParams
+  extends coreClient.ServiceClientOptions {
   /** Api Version */
   apiVersion?: string;
   /** Overrides client endpoint. */
diff --git a/sdk/eventgrid/eventgrid/src/generated/models/mappers.ts b/sdk/eventgrid/eventgrid/src/generated/models/mappers.ts
index bd0ce68f509a..0fa5418fabe0 100644
--- a/sdk/eventgrid/eventgrid/src/generated/models/mappers.ts
+++ b/sdk/eventgrid/eventgrid/src/generated/models/mappers.ts
@@ -6,9 +6,9 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-import { CompositeMapper } from "@azure/core-client";
+import * as coreClient from "@azure/core-client";
 
-export const EventGridEvent: CompositeMapper = {
+export const EventGridEvent: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "EventGridEvent",
@@ -72,7 +72,7 @@ export const EventGridEvent: CompositeMapper = {
   }
 };
 
-export const CloudEvent: CompositeMapper = {
+export const CloudEvent: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "CloudEvent",
@@ -146,7 +146,7 @@ export const CloudEvent: CompositeMapper = {
   }
 };
 
-export const StorageBlobCreatedEventData: CompositeMapper = {
+export const StorageBlobCreatedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "StorageBlobCreatedEventData",
@@ -239,7 +239,7 @@ export const StorageBlobCreatedEventData: CompositeMapper = {
   }
 };
 
-export const StorageBlobDeletedEventData: CompositeMapper = {
+export const StorageBlobDeletedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "StorageBlobDeletedEventData",
@@ -311,7 +311,7 @@ export const StorageBlobDeletedEventData: CompositeMapper = {
   }
 };
 
-export const StorageDirectoryCreatedEventData: CompositeMapper = {
+export const StorageDirectoryCreatedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "StorageDirectoryCreatedEventData",
@@ -376,7 +376,7 @@ export const StorageDirectoryCreatedEventData: CompositeMapper = {
   }
 };
 
-export const StorageDirectoryDeletedEventData: CompositeMapper = {
+export const StorageDirectoryDeletedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "StorageDirectoryDeletedEventData",
@@ -441,7 +441,7 @@ export const StorageDirectoryDeletedEventData: CompositeMapper = {
   }
 };
 
-export const StorageBlobRenamedEventData: CompositeMapper = {
+export const StorageBlobRenamedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "StorageBlobRenamedEventData",
@@ -506,7 +506,7 @@ export const StorageBlobRenamedEventData: CompositeMapper = {
   }
 };
 
-export const StorageDirectoryRenamedEventData: CompositeMapper = {
+export const StorageDirectoryRenamedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "StorageDirectoryRenamedEventData",
@@ -571,7 +571,7 @@ export const StorageDirectoryRenamedEventData: CompositeMapper = {
   }
 };
 
-export const StorageLifecyclePolicyCompletedEventData: CompositeMapper = {
+export const StorageLifecyclePolicyCompletedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "StorageLifecyclePolicyCompletedEventData",
@@ -608,7 +608,7 @@ export const StorageLifecyclePolicyCompletedEventData: CompositeMapper = {
   }
 };
 
-export const StorageLifecyclePolicyActionSummaryDetail: CompositeMapper = {
+export const StorageLifecyclePolicyActionSummaryDetail: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "StorageLifecyclePolicyActionSummaryDetail",
@@ -638,7 +638,7 @@ export const StorageLifecyclePolicyActionSummaryDetail: CompositeMapper = {
   }
 };
 
-export const StorageBlobTierChangedEventData: CompositeMapper = {
+export const StorageBlobTierChangedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "StorageBlobTierChangedEventData",
@@ -717,7 +717,7 @@ export const StorageBlobTierChangedEventData: CompositeMapper = {
   }
 };
 
-export const StorageAsyncOperationInitiatedEventData: CompositeMapper = {
+export const StorageAsyncOperationInitiatedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "StorageAsyncOperationInitiatedEventData",
@@ -796,7 +796,7 @@ export const StorageAsyncOperationInitiatedEventData: CompositeMapper = {
   }
 };
 
-export const StorageBlobInventoryPolicyCompletedEventData: CompositeMapper = {
+export const StorageBlobInventoryPolicyCompletedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "StorageBlobInventoryPolicyCompletedEventData",
@@ -854,7 +854,7 @@ export const StorageBlobInventoryPolicyCompletedEventData: CompositeMapper = {
   }
 };
 
-export const EventHubCaptureFileCreatedEventData: CompositeMapper = {
+export const EventHubCaptureFileCreatedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "EventHubCaptureFileCreatedEventData",
@@ -926,7 +926,7 @@ export const EventHubCaptureFileCreatedEventData: CompositeMapper = {
   }
 };
 
-export const ResourceWriteSuccessEventData: CompositeMapper = {
+export const ResourceWriteSuccessEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "ResourceWriteSuccessEventData",
@@ -1012,7 +1012,7 @@ export const ResourceWriteSuccessEventData: CompositeMapper = {
   }
 };
 
-export const ResourceWriteFailureEventData: CompositeMapper = {
+export const ResourceWriteFailureEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "ResourceWriteFailureEventData",
@@ -1098,7 +1098,7 @@ export const ResourceWriteFailureEventData: CompositeMapper = {
   }
 };
 
-export const ResourceWriteCancelEventData: CompositeMapper = {
+export const ResourceWriteCancelEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "ResourceWriteCancelEventData",
@@ -1184,7 +1184,7 @@ export const ResourceWriteCancelEventData: CompositeMapper = {
   }
 };
 
-export const ResourceDeleteSuccessEventData: CompositeMapper = {
+export const ResourceDeleteSuccessEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "ResourceDeleteSuccessEventData",
@@ -1270,7 +1270,7 @@ export const ResourceDeleteSuccessEventData: CompositeMapper = {
   }
 };
 
-export const ResourceDeleteFailureEventData: CompositeMapper = {
+export const ResourceDeleteFailureEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "ResourceDeleteFailureEventData",
@@ -1356,7 +1356,7 @@ export const ResourceDeleteFailureEventData: CompositeMapper = {
   }
 };
 
-export const ResourceDeleteCancelEventData: CompositeMapper = {
+export const ResourceDeleteCancelEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "ResourceDeleteCancelEventData",
@@ -1442,7 +1442,7 @@ export const ResourceDeleteCancelEventData: CompositeMapper = {
   }
 };
 
-export const ResourceActionSuccessEventData: CompositeMapper = {
+export const ResourceActionSuccessEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "ResourceActionSuccessEventData",
@@ -1528,7 +1528,7 @@ export const ResourceActionSuccessEventData: CompositeMapper = {
   }
 };
 
-export const ResourceActionFailureEventData: CompositeMapper = {
+export const ResourceActionFailureEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "ResourceActionFailureEventData",
@@ -1614,7 +1614,7 @@ export const ResourceActionFailureEventData: CompositeMapper = {
   }
 };
 
-export const ResourceActionCancelEventData: CompositeMapper = {
+export const ResourceActionCancelEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "ResourceActionCancelEventData",
@@ -1700,7 +1700,7 @@ export const ResourceActionCancelEventData: CompositeMapper = {
   }
 };
 
-export const SubscriptionValidationEventData: CompositeMapper = {
+export const SubscriptionValidationEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "SubscriptionValidationEventData",
@@ -1725,7 +1725,7 @@ export const SubscriptionValidationEventData: CompositeMapper = {
   }
 };
 
-export const SubscriptionValidationResponse: CompositeMapper = {
+export const SubscriptionValidationResponse: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "SubscriptionValidationResponse",
@@ -1741,7 +1741,7 @@ export const SubscriptionValidationResponse: CompositeMapper = {
   }
 };
 
-export const SubscriptionDeletedEventData: CompositeMapper = {
+export const SubscriptionDeletedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "SubscriptionDeletedEventData",
@@ -1758,7 +1758,7 @@ export const SubscriptionDeletedEventData: CompositeMapper = {
   }
 };
 
-export const DeviceLifeCycleEvent: CompositeMapper = {
+export const DeviceLifeCycleEvent: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "DeviceLifeCycleEvent",
@@ -1788,7 +1788,7 @@ export const DeviceLifeCycleEvent: CompositeMapper = {
   }
 };
 
-export const DeviceTwinInfo: CompositeMapper = {
+export const DeviceTwinInfo: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "DeviceTwinInfo",
@@ -1874,7 +1874,7 @@ export const DeviceTwinInfo: CompositeMapper = {
   }
 };
 
-export const DeviceTwinInfoProperties: CompositeMapper = {
+export const DeviceTwinInfoProperties: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "DeviceTwinInfoProperties",
@@ -1897,7 +1897,7 @@ export const DeviceTwinInfoProperties: CompositeMapper = {
   }
 };
 
-export const DeviceTwin: CompositeMapper = {
+export const DeviceTwin: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "DeviceTwin",
@@ -1920,7 +1920,7 @@ export const DeviceTwin: CompositeMapper = {
   }
 };
 
-export const DeviceTwinMetadata: CompositeMapper = {
+export const DeviceTwinMetadata: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "DeviceTwinMetadata",
@@ -1936,7 +1936,7 @@ export const DeviceTwinMetadata: CompositeMapper = {
   }
 };
 
-export const DeviceTwinInfoX509Thumbprint: CompositeMapper = {
+export const DeviceTwinInfoX509Thumbprint: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "DeviceTwinInfoX509Thumbprint",
@@ -1957,7 +1957,7 @@ export const DeviceTwinInfoX509Thumbprint: CompositeMapper = {
   }
 };
 
-export const DeviceConnectionStateEvent: CompositeMapper = {
+export const DeviceConnectionStateEvent: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "DeviceConnectionStateEvent",
@@ -1994,7 +1994,7 @@ export const DeviceConnectionStateEvent: CompositeMapper = {
   }
 };
 
-export const DeviceConnectionStateEventInfo: CompositeMapper = {
+export const DeviceConnectionStateEventInfo: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "DeviceConnectionStateEventInfo",
@@ -2010,7 +2010,7 @@ export const DeviceConnectionStateEventInfo: CompositeMapper = {
   }
 };
 
-export const DeviceTelemetryEvent: CompositeMapper = {
+export const DeviceTelemetryEvent: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "DeviceTelemetryEvent",
@@ -2042,7 +2042,7 @@ export const DeviceTelemetryEvent: CompositeMapper = {
   }
 };
 
-export const ContainerRegistryEventData: CompositeMapper = {
+export const ContainerRegistryEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "ContainerRegistryEventData",
@@ -2100,7 +2100,7 @@ export const ContainerRegistryEventData: CompositeMapper = {
   }
 };
 
-export const ContainerRegistryEventTarget: CompositeMapper = {
+export const ContainerRegistryEventTarget: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "ContainerRegistryEventTarget",
@@ -2158,7 +2158,7 @@ export const ContainerRegistryEventTarget: CompositeMapper = {
   }
 };
 
-export const ContainerRegistryEventRequest: CompositeMapper = {
+export const ContainerRegistryEventRequest: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "ContainerRegistryEventRequest",
@@ -2202,7 +2202,7 @@ export const ContainerRegistryEventRequest: CompositeMapper = {
   }
 };
 
-export const ContainerRegistryEventActor: CompositeMapper = {
+export const ContainerRegistryEventActor: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "ContainerRegistryEventActor",
@@ -2218,7 +2218,7 @@ export const ContainerRegistryEventActor: CompositeMapper = {
   }
 };
 
-export const ContainerRegistryEventSource: CompositeMapper = {
+export const ContainerRegistryEventSource: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "ContainerRegistryEventSource",
@@ -2241,7 +2241,7 @@ export const ContainerRegistryEventSource: CompositeMapper = {
   }
 };
 
-export const ContainerRegistryArtifactEventData: CompositeMapper = {
+export const ContainerRegistryArtifactEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "ContainerRegistryArtifactEventData",
@@ -2278,7 +2278,7 @@ export const ContainerRegistryArtifactEventData: CompositeMapper = {
   }
 };
 
-export const ContainerRegistryArtifactEventTarget: CompositeMapper = {
+export const ContainerRegistryArtifactEventTarget: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "ContainerRegistryArtifactEventTarget",
@@ -2336,7 +2336,7 @@ export const ContainerRegistryArtifactEventTarget: CompositeMapper = {
   }
 };
 
-export const ServiceBusActiveMessagesAvailableWithNoListenersEventData: CompositeMapper = {
+export const ServiceBusActiveMessagesAvailableWithNoListenersEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "ServiceBusActiveMessagesAvailableWithNoListenersEventData",
@@ -2387,7 +2387,7 @@ export const ServiceBusActiveMessagesAvailableWithNoListenersEventData: Composit
   }
 };
 
-export const ServiceBusDeadletterMessagesAvailableWithNoListenersEventData: CompositeMapper = {
+export const ServiceBusDeadletterMessagesAvailableWithNoListenersEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "ServiceBusDeadletterMessagesAvailableWithNoListenersEventData",
@@ -2438,7 +2438,7 @@ export const ServiceBusDeadletterMessagesAvailableWithNoListenersEventData: Comp
   }
 };
 
-export const ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData: CompositeMapper = {
+export const ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className:
@@ -2490,7 +2490,7 @@ export const ServiceBusActiveMessagesAvailablePeriodicNotificationsEventData: Co
   }
 };
 
-export const ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData: CompositeMapper = {
+export const ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className:
@@ -2542,7 +2542,7 @@ export const ServiceBusDeadletterMessagesAvailablePeriodicNotificationsEventData
   }
 };
 
-export const MediaJobStateChangeEventData: CompositeMapper = {
+export const MediaJobStateChangeEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "MediaJobStateChangeEventData",
@@ -2593,7 +2593,7 @@ export const MediaJobStateChangeEventData: CompositeMapper = {
   }
 };
 
-export const MediaJobError: CompositeMapper = {
+export const MediaJobError: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "MediaJobError",
@@ -2667,7 +2667,7 @@ export const MediaJobError: CompositeMapper = {
   }
 };
 
-export const MediaJobErrorDetail: CompositeMapper = {
+export const MediaJobErrorDetail: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "MediaJobErrorDetail",
@@ -2692,7 +2692,7 @@ export const MediaJobErrorDetail: CompositeMapper = {
   }
 };
 
-export const MediaJobOutput: CompositeMapper = {
+export const MediaJobOutput: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "MediaJobOutput",
@@ -2749,7 +2749,7 @@ export const MediaJobOutput: CompositeMapper = {
   }
 };
 
-export const MediaJobOutputProgressEventData: CompositeMapper = {
+export const MediaJobOutputProgressEventData: coreClient.CompositeMapper = {
   serializedName: "#Microsoft.Media.JobOutputProgress",
   type: {
     name: "Composite",
@@ -2781,7 +2781,7 @@ export const MediaJobOutputProgressEventData: CompositeMapper = {
   }
 };
 
-export const MediaJobOutputStateChangeEventData: CompositeMapper = {
+export const MediaJobOutputStateChangeEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "MediaJobOutputStateChangeEventData",
@@ -2822,7 +2822,7 @@ export const MediaJobOutputStateChangeEventData: CompositeMapper = {
   }
 };
 
-export const MediaLiveEventEncoderConnectedEventData: CompositeMapper = {
+export const MediaLiveEventEncoderConnectedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "MediaLiveEventEncoderConnectedEventData",
@@ -2863,7 +2863,7 @@ export const MediaLiveEventEncoderConnectedEventData: CompositeMapper = {
   }
 };
 
-export const MediaLiveEventConnectionRejectedEventData: CompositeMapper = {
+export const MediaLiveEventConnectionRejectedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "MediaLiveEventConnectionRejectedEventData",
@@ -2912,7 +2912,7 @@ export const MediaLiveEventConnectionRejectedEventData: CompositeMapper = {
   }
 };
 
-export const MediaLiveEventEncoderDisconnectedEventData: CompositeMapper = {
+export const MediaLiveEventEncoderDisconnectedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "MediaLiveEventEncoderDisconnectedEventData",
@@ -2961,7 +2961,7 @@ export const MediaLiveEventEncoderDisconnectedEventData: CompositeMapper = {
   }
 };
 
-export const MediaLiveEventIncomingStreamReceivedEventData: CompositeMapper = {
+export const MediaLiveEventIncomingStreamReceivedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "MediaLiveEventIncomingStreamReceivedEventData",
@@ -3042,7 +3042,7 @@ export const MediaLiveEventIncomingStreamReceivedEventData: CompositeMapper = {
   }
 };
 
-export const MediaLiveEventIncomingStreamsOutOfSyncEventData: CompositeMapper = {
+export const MediaLiveEventIncomingStreamsOutOfSyncEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "MediaLiveEventIncomingStreamsOutOfSyncEventData",
@@ -3099,7 +3099,7 @@ export const MediaLiveEventIncomingStreamsOutOfSyncEventData: CompositeMapper =
   }
 };
 
-export const MediaLiveEventIncomingVideoStreamsOutOfSyncEventData: CompositeMapper = {
+export const MediaLiveEventIncomingVideoStreamsOutOfSyncEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "MediaLiveEventIncomingVideoStreamsOutOfSyncEventData",
@@ -3148,7 +3148,7 @@ export const MediaLiveEventIncomingVideoStreamsOutOfSyncEventData: CompositeMapp
   }
 };
 
-export const MediaLiveEventIncomingDataChunkDroppedEventData: CompositeMapper = {
+export const MediaLiveEventIncomingDataChunkDroppedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "MediaLiveEventIncomingDataChunkDroppedEventData",
@@ -3205,7 +3205,7 @@ export const MediaLiveEventIncomingDataChunkDroppedEventData: CompositeMapper =
   }
 };
 
-export const MediaLiveEventIngestHeartbeatEventData: CompositeMapper = {
+export const MediaLiveEventIngestHeartbeatEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "MediaLiveEventIngestHeartbeatEventData",
@@ -3310,7 +3310,7 @@ export const MediaLiveEventIngestHeartbeatEventData: CompositeMapper = {
   }
 };
 
-export const MediaLiveEventTrackDiscontinuityDetectedEventData: CompositeMapper = {
+export const MediaLiveEventTrackDiscontinuityDetectedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "MediaLiveEventTrackDiscontinuityDetectedEventData",
@@ -3375,7 +3375,7 @@ export const MediaLiveEventTrackDiscontinuityDetectedEventData: CompositeMapper
   }
 };
 
-export const MapsGeofenceEvent: CompositeMapper = {
+export const MapsGeofenceEvent: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "MapsGeofenceEvent",
@@ -3428,7 +3428,7 @@ export const MapsGeofenceEvent: CompositeMapper = {
   }
 };
 
-export const MapsGeofenceGeometry: CompositeMapper = {
+export const MapsGeofenceGeometry: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "MapsGeofenceGeometry",
@@ -3479,7 +3479,7 @@ export const MapsGeofenceGeometry: CompositeMapper = {
   }
 };
 
-export const AppConfigurationKeyValueModifiedEventData: CompositeMapper = {
+export const AppConfigurationKeyValueModifiedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AppConfigurationKeyValueModifiedEventData",
@@ -3516,7 +3516,7 @@ export const AppConfigurationKeyValueModifiedEventData: CompositeMapper = {
   }
 };
 
-export const AppConfigurationKeyValueDeletedEventData: CompositeMapper = {
+export const AppConfigurationKeyValueDeletedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AppConfigurationKeyValueDeletedEventData",
@@ -3553,7 +3553,7 @@ export const AppConfigurationKeyValueDeletedEventData: CompositeMapper = {
   }
 };
 
-export const SignalRServiceClientConnectionConnectedEventData: CompositeMapper = {
+export const SignalRServiceClientConnectionConnectedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "SignalRServiceClientConnectionConnectedEventData",
@@ -3590,7 +3590,7 @@ export const SignalRServiceClientConnectionConnectedEventData: CompositeMapper =
   }
 };
 
-export const SignalRServiceClientConnectionDisconnectedEventData: CompositeMapper = {
+export const SignalRServiceClientConnectionDisconnectedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "SignalRServiceClientConnectionDisconnectedEventData",
@@ -3634,7 +3634,7 @@ export const SignalRServiceClientConnectionDisconnectedEventData: CompositeMappe
   }
 };
 
-export const KeyVaultCertificateNewVersionCreatedEventData: CompositeMapper = {
+export const KeyVaultCertificateNewVersionCreatedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "KeyVaultCertificateNewVersionCreatedEventData",
@@ -3692,7 +3692,7 @@ export const KeyVaultCertificateNewVersionCreatedEventData: CompositeMapper = {
   }
 };
 
-export const KeyVaultCertificateNearExpiryEventData: CompositeMapper = {
+export const KeyVaultCertificateNearExpiryEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "KeyVaultCertificateNearExpiryEventData",
@@ -3750,7 +3750,7 @@ export const KeyVaultCertificateNearExpiryEventData: CompositeMapper = {
   }
 };
 
-export const KeyVaultCertificateExpiredEventData: CompositeMapper = {
+export const KeyVaultCertificateExpiredEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "KeyVaultCertificateExpiredEventData",
@@ -3808,7 +3808,7 @@ export const KeyVaultCertificateExpiredEventData: CompositeMapper = {
   }
 };
 
-export const KeyVaultKeyNewVersionCreatedEventData: CompositeMapper = {
+export const KeyVaultKeyNewVersionCreatedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "KeyVaultKeyNewVersionCreatedEventData",
@@ -3866,7 +3866,7 @@ export const KeyVaultKeyNewVersionCreatedEventData: CompositeMapper = {
   }
 };
 
-export const KeyVaultKeyNearExpiryEventData: CompositeMapper = {
+export const KeyVaultKeyNearExpiryEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "KeyVaultKeyNearExpiryEventData",
@@ -3924,7 +3924,7 @@ export const KeyVaultKeyNearExpiryEventData: CompositeMapper = {
   }
 };
 
-export const KeyVaultKeyExpiredEventData: CompositeMapper = {
+export const KeyVaultKeyExpiredEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "KeyVaultKeyExpiredEventData",
@@ -3982,7 +3982,7 @@ export const KeyVaultKeyExpiredEventData: CompositeMapper = {
   }
 };
 
-export const KeyVaultSecretNewVersionCreatedEventData: CompositeMapper = {
+export const KeyVaultSecretNewVersionCreatedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "KeyVaultSecretNewVersionCreatedEventData",
@@ -4040,7 +4040,7 @@ export const KeyVaultSecretNewVersionCreatedEventData: CompositeMapper = {
   }
 };
 
-export const KeyVaultSecretNearExpiryEventData: CompositeMapper = {
+export const KeyVaultSecretNearExpiryEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "KeyVaultSecretNearExpiryEventData",
@@ -4098,7 +4098,7 @@ export const KeyVaultSecretNearExpiryEventData: CompositeMapper = {
   }
 };
 
-export const KeyVaultSecretExpiredEventData: CompositeMapper = {
+export const KeyVaultSecretExpiredEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "KeyVaultSecretExpiredEventData",
@@ -4156,7 +4156,7 @@ export const KeyVaultSecretExpiredEventData: CompositeMapper = {
   }
 };
 
-export const KeyVaultAccessPolicyChangedEventData: CompositeMapper = {
+export const KeyVaultAccessPolicyChangedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "KeyVaultAccessPolicyChangedEventData",
@@ -4214,7 +4214,7 @@ export const KeyVaultAccessPolicyChangedEventData: CompositeMapper = {
   }
 };
 
-export const MachineLearningServicesModelRegisteredEventData: CompositeMapper = {
+export const MachineLearningServicesModelRegisteredEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "MachineLearningServicesModelRegisteredEventData",
@@ -4251,7 +4251,7 @@ export const MachineLearningServicesModelRegisteredEventData: CompositeMapper =
   }
 };
 
-export const MachineLearningServicesModelDeployedEventData: CompositeMapper = {
+export const MachineLearningServicesModelDeployedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "MachineLearningServicesModelDeployedEventData",
@@ -4295,7 +4295,7 @@ export const MachineLearningServicesModelDeployedEventData: CompositeMapper = {
   }
 };
 
-export const MachineLearningServicesRunCompletedEventData: CompositeMapper = {
+export const MachineLearningServicesRunCompletedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "MachineLearningServicesRunCompletedEventData",
@@ -4346,7 +4346,7 @@ export const MachineLearningServicesRunCompletedEventData: CompositeMapper = {
   }
 };
 
-export const MachineLearningServicesDatasetDriftDetectedEventData: CompositeMapper = {
+export const MachineLearningServicesDatasetDriftDetectedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "MachineLearningServicesDatasetDriftDetectedEventData",
@@ -4411,7 +4411,7 @@ export const MachineLearningServicesDatasetDriftDetectedEventData: CompositeMapp
   }
 };
 
-export const MachineLearningServicesRunStatusChangedEventData: CompositeMapper = {
+export const MachineLearningServicesRunStatusChangedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "MachineLearningServicesRunStatusChangedEventData",
@@ -4469,7 +4469,7 @@ export const MachineLearningServicesRunStatusChangedEventData: CompositeMapper =
   }
 };
 
-export const RedisPatchingCompletedEventData: CompositeMapper = {
+export const RedisPatchingCompletedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "RedisPatchingCompletedEventData",
@@ -4499,7 +4499,7 @@ export const RedisPatchingCompletedEventData: CompositeMapper = {
   }
 };
 
-export const RedisScalingCompletedEventData: CompositeMapper = {
+export const RedisScalingCompletedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "RedisScalingCompletedEventData",
@@ -4529,7 +4529,7 @@ export const RedisScalingCompletedEventData: CompositeMapper = {
   }
 };
 
-export const RedisExportRDBCompletedEventData: CompositeMapper = {
+export const RedisExportRDBCompletedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "RedisExportRDBCompletedEventData",
@@ -4559,7 +4559,7 @@ export const RedisExportRDBCompletedEventData: CompositeMapper = {
   }
 };
 
-export const RedisImportRDBCompletedEventData: CompositeMapper = {
+export const RedisImportRDBCompletedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "RedisImportRDBCompletedEventData",
@@ -4589,7 +4589,7 @@ export const RedisImportRDBCompletedEventData: CompositeMapper = {
   }
 };
 
-export const WebAppUpdatedEventData: CompositeMapper = {
+export const WebAppUpdatedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "WebAppUpdatedEventData",
@@ -4647,7 +4647,7 @@ export const WebAppUpdatedEventData: CompositeMapper = {
   }
 };
 
-export const AppEventTypeDetail: CompositeMapper = {
+export const AppEventTypeDetail: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AppEventTypeDetail",
@@ -4663,7 +4663,7 @@ export const AppEventTypeDetail: CompositeMapper = {
   }
 };
 
-export const WebBackupOperationStartedEventData: CompositeMapper = {
+export const WebBackupOperationStartedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "WebBackupOperationStartedEventData",
@@ -4721,7 +4721,7 @@ export const WebBackupOperationStartedEventData: CompositeMapper = {
   }
 };
 
-export const WebBackupOperationCompletedEventData: CompositeMapper = {
+export const WebBackupOperationCompletedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "WebBackupOperationCompletedEventData",
@@ -4779,7 +4779,7 @@ export const WebBackupOperationCompletedEventData: CompositeMapper = {
   }
 };
 
-export const WebBackupOperationFailedEventData: CompositeMapper = {
+export const WebBackupOperationFailedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "WebBackupOperationFailedEventData",
@@ -4837,7 +4837,7 @@ export const WebBackupOperationFailedEventData: CompositeMapper = {
   }
 };
 
-export const WebRestoreOperationStartedEventData: CompositeMapper = {
+export const WebRestoreOperationStartedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "WebRestoreOperationStartedEventData",
@@ -4895,7 +4895,7 @@ export const WebRestoreOperationStartedEventData: CompositeMapper = {
   }
 };
 
-export const WebRestoreOperationCompletedEventData: CompositeMapper = {
+export const WebRestoreOperationCompletedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "WebRestoreOperationCompletedEventData",
@@ -4953,7 +4953,7 @@ export const WebRestoreOperationCompletedEventData: CompositeMapper = {
   }
 };
 
-export const WebRestoreOperationFailedEventData: CompositeMapper = {
+export const WebRestoreOperationFailedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "WebRestoreOperationFailedEventData",
@@ -5011,7 +5011,7 @@ export const WebRestoreOperationFailedEventData: CompositeMapper = {
   }
 };
 
-export const WebSlotSwapStartedEventData: CompositeMapper = {
+export const WebSlotSwapStartedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "WebSlotSwapStartedEventData",
@@ -5069,7 +5069,7 @@ export const WebSlotSwapStartedEventData: CompositeMapper = {
   }
 };
 
-export const WebSlotSwapCompletedEventData: CompositeMapper = {
+export const WebSlotSwapCompletedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "WebSlotSwapCompletedEventData",
@@ -5127,7 +5127,7 @@ export const WebSlotSwapCompletedEventData: CompositeMapper = {
   }
 };
 
-export const WebSlotSwapFailedEventData: CompositeMapper = {
+export const WebSlotSwapFailedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "WebSlotSwapFailedEventData",
@@ -5185,7 +5185,7 @@ export const WebSlotSwapFailedEventData: CompositeMapper = {
   }
 };
 
-export const WebSlotSwapWithPreviewStartedEventData: CompositeMapper = {
+export const WebSlotSwapWithPreviewStartedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "WebSlotSwapWithPreviewStartedEventData",
@@ -5243,7 +5243,7 @@ export const WebSlotSwapWithPreviewStartedEventData: CompositeMapper = {
   }
 };
 
-export const WebSlotSwapWithPreviewCancelledEventData: CompositeMapper = {
+export const WebSlotSwapWithPreviewCancelledEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "WebSlotSwapWithPreviewCancelledEventData",
@@ -5301,7 +5301,7 @@ export const WebSlotSwapWithPreviewCancelledEventData: CompositeMapper = {
   }
 };
 
-export const WebAppServicePlanUpdatedEventData: CompositeMapper = {
+export const WebAppServicePlanUpdatedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "WebAppServicePlanUpdatedEventData",
@@ -5366,7 +5366,7 @@ export const WebAppServicePlanUpdatedEventData: CompositeMapper = {
   }
 };
 
-export const AppServicePlanEventTypeDetail: CompositeMapper = {
+export const AppServicePlanEventTypeDetail: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AppServicePlanEventTypeDetail",
@@ -5396,7 +5396,7 @@ export const AppServicePlanEventTypeDetail: CompositeMapper = {
   }
 };
 
-export const WebAppServicePlanUpdatedEventDataSku: CompositeMapper = {
+export const WebAppServicePlanUpdatedEventDataSku: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "WebAppServicePlanUpdatedEventDataSku",
@@ -5435,7 +5435,7 @@ export const WebAppServicePlanUpdatedEventDataSku: CompositeMapper = {
   }
 };
 
-export const CommunicationIdentifierModel: CompositeMapper = {
+export const CommunicationIdentifierModel: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "CommunicationIdentifierModel",
@@ -5472,7 +5472,7 @@ export const CommunicationIdentifierModel: CompositeMapper = {
   }
 };
 
-export const CommunicationUserIdentifierModel: CompositeMapper = {
+export const CommunicationUserIdentifierModel: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "CommunicationUserIdentifierModel",
@@ -5488,7 +5488,7 @@ export const CommunicationUserIdentifierModel: CompositeMapper = {
   }
 };
 
-export const PhoneNumberIdentifierModel: CompositeMapper = {
+export const PhoneNumberIdentifierModel: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "PhoneNumberIdentifierModel",
@@ -5504,7 +5504,7 @@ export const PhoneNumberIdentifierModel: CompositeMapper = {
   }
 };
 
-export const MicrosoftTeamsUserIdentifierModel: CompositeMapper = {
+export const MicrosoftTeamsUserIdentifierModel: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "MicrosoftTeamsUserIdentifierModel",
@@ -5532,7 +5532,7 @@ export const MicrosoftTeamsUserIdentifierModel: CompositeMapper = {
   }
 };
 
-export const AcsChatEventBase: CompositeMapper = {
+export const AcsChatEventBase: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AcsChatEventBase",
@@ -5562,7 +5562,7 @@ export const AcsChatEventBase: CompositeMapper = {
   }
 };
 
-export const AcsChatEventInThreadBase: CompositeMapper = {
+export const AcsChatEventInThreadBase: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AcsChatEventInThreadBase",
@@ -5585,7 +5585,7 @@ export const AcsChatEventInThreadBase: CompositeMapper = {
   }
 };
 
-export const AcsChatThreadParticipant: CompositeMapper = {
+export const AcsChatThreadParticipant: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AcsChatThreadParticipant",
@@ -5608,7 +5608,7 @@ export const AcsChatThreadParticipant: CompositeMapper = {
   }
 };
 
-export const AcsSmsDeliveryAttempt: CompositeMapper = {
+export const AcsSmsDeliveryAttempt: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AcsSmsDeliveryAttempt",
@@ -5638,7 +5638,7 @@ export const AcsSmsDeliveryAttempt: CompositeMapper = {
   }
 };
 
-export const AcsSmsEventBase: CompositeMapper = {
+export const AcsSmsEventBase: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AcsSmsEventBase",
@@ -5668,7 +5668,7 @@ export const AcsSmsEventBase: CompositeMapper = {
   }
 };
 
-export const AcsRecordingFileStatusUpdatedEventData: CompositeMapper = {
+export const AcsRecordingFileStatusUpdatedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AcsRecordingFileStatusUpdatedEventData",
@@ -5705,7 +5705,7 @@ export const AcsRecordingFileStatusUpdatedEventData: CompositeMapper = {
   }
 };
 
-export const AcsRecordingStorageInfo: CompositeMapper = {
+export const AcsRecordingStorageInfo: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AcsRecordingStorageInfo",
@@ -5727,7 +5727,7 @@ export const AcsRecordingStorageInfo: CompositeMapper = {
   }
 };
 
-export const AcsRecordingChunkInfo: CompositeMapper = {
+export const AcsRecordingChunkInfo: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AcsRecordingChunkInfo",
@@ -5771,7 +5771,7 @@ export const AcsRecordingChunkInfo: CompositeMapper = {
   }
 };
 
-export const PolicyInsightsPolicyStateCreatedEventData: CompositeMapper = {
+export const PolicyInsightsPolicyStateCreatedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "PolicyInsightsPolicyStateCreatedEventData",
@@ -5829,7 +5829,7 @@ export const PolicyInsightsPolicyStateCreatedEventData: CompositeMapper = {
   }
 };
 
-export const PolicyInsightsPolicyStateChangedEventData: CompositeMapper = {
+export const PolicyInsightsPolicyStateChangedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "PolicyInsightsPolicyStateChangedEventData",
@@ -5887,7 +5887,7 @@ export const PolicyInsightsPolicyStateChangedEventData: CompositeMapper = {
   }
 };
 
-export const PolicyInsightsPolicyStateDeletedEventData: CompositeMapper = {
+export const PolicyInsightsPolicyStateDeletedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "PolicyInsightsPolicyStateDeletedEventData",
@@ -5945,7 +5945,7 @@ export const PolicyInsightsPolicyStateDeletedEventData: CompositeMapper = {
   }
 };
 
-export const IotHubDeviceCreatedEventData: CompositeMapper = {
+export const IotHubDeviceCreatedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "IotHubDeviceCreatedEventData",
@@ -5955,7 +5955,7 @@ export const IotHubDeviceCreatedEventData: CompositeMapper = {
   }
 };
 
-export const IotHubDeviceDeletedEventData: CompositeMapper = {
+export const IotHubDeviceDeletedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "IotHubDeviceDeletedEventData",
@@ -5965,7 +5965,7 @@ export const IotHubDeviceDeletedEventData: CompositeMapper = {
   }
 };
 
-export const IotHubDeviceConnectedEventData: CompositeMapper = {
+export const IotHubDeviceConnectedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "IotHubDeviceConnectedEventData",
@@ -5975,7 +5975,7 @@ export const IotHubDeviceConnectedEventData: CompositeMapper = {
   }
 };
 
-export const IotHubDeviceDisconnectedEventData: CompositeMapper = {
+export const IotHubDeviceDisconnectedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "IotHubDeviceDisconnectedEventData",
@@ -5985,7 +5985,7 @@ export const IotHubDeviceDisconnectedEventData: CompositeMapper = {
   }
 };
 
-export const IotHubDeviceTelemetryEventData: CompositeMapper = {
+export const IotHubDeviceTelemetryEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "IotHubDeviceTelemetryEventData",
@@ -5995,7 +5995,7 @@ export const IotHubDeviceTelemetryEventData: CompositeMapper = {
   }
 };
 
-export const ContainerRegistryImagePushedEventData: CompositeMapper = {
+export const ContainerRegistryImagePushedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "ContainerRegistryImagePushedEventData",
@@ -6005,7 +6005,7 @@ export const ContainerRegistryImagePushedEventData: CompositeMapper = {
   }
 };
 
-export const ContainerRegistryImageDeletedEventData: CompositeMapper = {
+export const ContainerRegistryImageDeletedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "ContainerRegistryImageDeletedEventData",
@@ -6015,7 +6015,7 @@ export const ContainerRegistryImageDeletedEventData: CompositeMapper = {
   }
 };
 
-export const ContainerRegistryChartPushedEventData: CompositeMapper = {
+export const ContainerRegistryChartPushedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "ContainerRegistryChartPushedEventData",
@@ -6025,7 +6025,7 @@ export const ContainerRegistryChartPushedEventData: CompositeMapper = {
   }
 };
 
-export const ContainerRegistryChartDeletedEventData: CompositeMapper = {
+export const ContainerRegistryChartDeletedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "ContainerRegistryChartDeletedEventData",
@@ -6035,7 +6035,7 @@ export const ContainerRegistryChartDeletedEventData: CompositeMapper = {
   }
 };
 
-export const MediaJobScheduledEventData: CompositeMapper = {
+export const MediaJobScheduledEventData: coreClient.CompositeMapper = {
   serializedName: "#Microsoft.Media.JobScheduled",
   type: {
     name: "Composite",
@@ -6046,7 +6046,7 @@ export const MediaJobScheduledEventData: CompositeMapper = {
   }
 };
 
-export const MediaJobProcessingEventData: CompositeMapper = {
+export const MediaJobProcessingEventData: coreClient.CompositeMapper = {
   serializedName: "#Microsoft.Media.JobProcessing",
   type: {
     name: "Composite",
@@ -6057,7 +6057,7 @@ export const MediaJobProcessingEventData: CompositeMapper = {
   }
 };
 
-export const MediaJobCancelingEventData: CompositeMapper = {
+export const MediaJobCancelingEventData: coreClient.CompositeMapper = {
   serializedName: "#Microsoft.Media.JobCanceling",
   type: {
     name: "Composite",
@@ -6068,7 +6068,7 @@ export const MediaJobCancelingEventData: CompositeMapper = {
   }
 };
 
-export const MediaJobFinishedEventData: CompositeMapper = {
+export const MediaJobFinishedEventData: coreClient.CompositeMapper = {
   serializedName: "#Microsoft.Media.JobFinished",
   type: {
     name: "Composite",
@@ -6092,7 +6092,7 @@ export const MediaJobFinishedEventData: CompositeMapper = {
   }
 };
 
-export const MediaJobCanceledEventData: CompositeMapper = {
+export const MediaJobCanceledEventData: coreClient.CompositeMapper = {
   serializedName: "#Microsoft.Media.JobCanceled",
   type: {
     name: "Composite",
@@ -6116,7 +6116,7 @@ export const MediaJobCanceledEventData: CompositeMapper = {
   }
 };
 
-export const MediaJobErroredEventData: CompositeMapper = {
+export const MediaJobErroredEventData: coreClient.CompositeMapper = {
   serializedName: "#Microsoft.Media.JobErrored",
   type: {
     name: "Composite",
@@ -6140,7 +6140,7 @@ export const MediaJobErroredEventData: CompositeMapper = {
   }
 };
 
-export const MediaJobOutputAsset: CompositeMapper = {
+export const MediaJobOutputAsset: coreClient.CompositeMapper = {
   serializedName: "#Microsoft.Media.JobOutputAsset",
   type: {
     name: "Composite",
@@ -6160,7 +6160,7 @@ export const MediaJobOutputAsset: CompositeMapper = {
   }
 };
 
-export const MediaJobOutputCanceledEventData: CompositeMapper = {
+export const MediaJobOutputCanceledEventData: coreClient.CompositeMapper = {
   serializedName: "#Microsoft.Media.JobOutputCanceled",
   type: {
     name: "Composite",
@@ -6171,7 +6171,7 @@ export const MediaJobOutputCanceledEventData: CompositeMapper = {
   }
 };
 
-export const MediaJobOutputCancelingEventData: CompositeMapper = {
+export const MediaJobOutputCancelingEventData: coreClient.CompositeMapper = {
   serializedName: "#Microsoft.Media.JobOutputCanceling",
   type: {
     name: "Composite",
@@ -6182,7 +6182,7 @@ export const MediaJobOutputCancelingEventData: CompositeMapper = {
   }
 };
 
-export const MediaJobOutputErroredEventData: CompositeMapper = {
+export const MediaJobOutputErroredEventData: coreClient.CompositeMapper = {
   serializedName: "#Microsoft.Media.JobOutputErrored",
   type: {
     name: "Composite",
@@ -6193,7 +6193,7 @@ export const MediaJobOutputErroredEventData: CompositeMapper = {
   }
 };
 
-export const MediaJobOutputFinishedEventData: CompositeMapper = {
+export const MediaJobOutputFinishedEventData: coreClient.CompositeMapper = {
   serializedName: "#Microsoft.Media.JobOutputFinished",
   type: {
     name: "Composite",
@@ -6204,7 +6204,7 @@ export const MediaJobOutputFinishedEventData: CompositeMapper = {
   }
 };
 
-export const MediaJobOutputProcessingEventData: CompositeMapper = {
+export const MediaJobOutputProcessingEventData: coreClient.CompositeMapper = {
   serializedName: "#Microsoft.Media.JobOutputProcessing",
   type: {
     name: "Composite",
@@ -6215,7 +6215,7 @@ export const MediaJobOutputProcessingEventData: CompositeMapper = {
   }
 };
 
-export const MediaJobOutputScheduledEventData: CompositeMapper = {
+export const MediaJobOutputScheduledEventData: coreClient.CompositeMapper = {
   serializedName: "#Microsoft.Media.JobOutputScheduled",
   type: {
     name: "Composite",
@@ -6226,7 +6226,7 @@ export const MediaJobOutputScheduledEventData: CompositeMapper = {
   }
 };
 
-export const MapsGeofenceEnteredEventData: CompositeMapper = {
+export const MapsGeofenceEnteredEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "MapsGeofenceEnteredEventData",
@@ -6236,7 +6236,7 @@ export const MapsGeofenceEnteredEventData: CompositeMapper = {
   }
 };
 
-export const MapsGeofenceExitedEventData: CompositeMapper = {
+export const MapsGeofenceExitedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "MapsGeofenceExitedEventData",
@@ -6246,7 +6246,7 @@ export const MapsGeofenceExitedEventData: CompositeMapper = {
   }
 };
 
-export const MapsGeofenceResultEventData: CompositeMapper = {
+export const MapsGeofenceResultEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "MapsGeofenceResultEventData",
@@ -6256,7 +6256,7 @@ export const MapsGeofenceResultEventData: CompositeMapper = {
   }
 };
 
-export const AcsChatMessageEventBase: CompositeMapper = {
+export const AcsChatMessageEventBase: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AcsChatMessageEventBase",
@@ -6308,7 +6308,7 @@ export const AcsChatMessageEventBase: CompositeMapper = {
   }
 };
 
-export const AcsChatThreadEventBase: CompositeMapper = {
+export const AcsChatThreadEventBase: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AcsChatThreadEventBase",
@@ -6332,7 +6332,7 @@ export const AcsChatThreadEventBase: CompositeMapper = {
   }
 };
 
-export const AcsChatMessageEventInThreadBase: CompositeMapper = {
+export const AcsChatMessageEventInThreadBase: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AcsChatMessageEventInThreadBase",
@@ -6384,7 +6384,7 @@ export const AcsChatMessageEventInThreadBase: CompositeMapper = {
   }
 };
 
-export const AcsChatThreadEventInThreadBase: CompositeMapper = {
+export const AcsChatThreadEventInThreadBase: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AcsChatThreadEventInThreadBase",
@@ -6408,7 +6408,7 @@ export const AcsChatThreadEventInThreadBase: CompositeMapper = {
   }
 };
 
-export const AcsChatParticipantAddedToThreadEventData: CompositeMapper = {
+export const AcsChatParticipantAddedToThreadEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AcsChatParticipantAddedToThreadEventData",
@@ -6446,7 +6446,7 @@ export const AcsChatParticipantAddedToThreadEventData: CompositeMapper = {
   }
 };
 
-export const AcsChatParticipantRemovedFromThreadEventData: CompositeMapper = {
+export const AcsChatParticipantRemovedFromThreadEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AcsChatParticipantRemovedFromThreadEventData",
@@ -6484,7 +6484,7 @@ export const AcsChatParticipantRemovedFromThreadEventData: CompositeMapper = {
   }
 };
 
-export const AcsSmsDeliveryReportReceivedEventData: CompositeMapper = {
+export const AcsSmsDeliveryReportReceivedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AcsSmsDeliveryReportReceivedEventData",
@@ -6535,7 +6535,7 @@ export const AcsSmsDeliveryReportReceivedEventData: CompositeMapper = {
   }
 };
 
-export const AcsSmsReceivedEventData: CompositeMapper = {
+export const AcsSmsReceivedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AcsSmsReceivedEventData",
@@ -6559,7 +6559,7 @@ export const AcsSmsReceivedEventData: CompositeMapper = {
   }
 };
 
-export const AcsChatMessageReceivedEventData: CompositeMapper = {
+export const AcsChatMessageReceivedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AcsChatMessageReceivedEventData",
@@ -6576,7 +6576,7 @@ export const AcsChatMessageReceivedEventData: CompositeMapper = {
   }
 };
 
-export const AcsChatMessageEditedEventData: CompositeMapper = {
+export const AcsChatMessageEditedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AcsChatMessageEditedEventData",
@@ -6600,7 +6600,7 @@ export const AcsChatMessageEditedEventData: CompositeMapper = {
   }
 };
 
-export const AcsChatMessageDeletedEventData: CompositeMapper = {
+export const AcsChatMessageDeletedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AcsChatMessageDeletedEventData",
@@ -6617,7 +6617,7 @@ export const AcsChatMessageDeletedEventData: CompositeMapper = {
   }
 };
 
-export const AcsChatThreadCreatedWithUserEventData: CompositeMapper = {
+export const AcsChatThreadCreatedWithUserEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AcsChatThreadCreatedWithUserEventData",
@@ -6655,7 +6655,7 @@ export const AcsChatThreadCreatedWithUserEventData: CompositeMapper = {
   }
 };
 
-export const AcsChatThreadWithUserDeletedEventData: CompositeMapper = {
+export const AcsChatThreadWithUserDeletedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AcsChatThreadWithUserDeletedEventData",
@@ -6679,7 +6679,7 @@ export const AcsChatThreadWithUserDeletedEventData: CompositeMapper = {
   }
 };
 
-export const AcsChatThreadPropertiesUpdatedPerUserEventData: CompositeMapper = {
+export const AcsChatThreadPropertiesUpdatedPerUserEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AcsChatThreadPropertiesUpdatedPerUserEventData",
@@ -6711,7 +6711,7 @@ export const AcsChatThreadPropertiesUpdatedPerUserEventData: CompositeMapper = {
   }
 };
 
-export const AcsChatParticipantAddedToThreadWithUserEventData: CompositeMapper = {
+export const AcsChatParticipantAddedToThreadWithUserEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AcsChatParticipantAddedToThreadWithUserEventData",
@@ -6742,7 +6742,7 @@ export const AcsChatParticipantAddedToThreadWithUserEventData: CompositeMapper =
   }
 };
 
-export const AcsChatParticipantRemovedFromThreadWithUserEventData: CompositeMapper = {
+export const AcsChatParticipantRemovedFromThreadWithUserEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AcsChatParticipantRemovedFromThreadWithUserEventData",
@@ -6773,7 +6773,7 @@ export const AcsChatParticipantRemovedFromThreadWithUserEventData: CompositeMapp
   }
 };
 
-export const AcsChatMessageReceivedInThreadEventData: CompositeMapper = {
+export const AcsChatMessageReceivedInThreadEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AcsChatMessageReceivedInThreadEventData",
@@ -6790,7 +6790,7 @@ export const AcsChatMessageReceivedInThreadEventData: CompositeMapper = {
   }
 };
 
-export const AcsChatMessageEditedInThreadEventData: CompositeMapper = {
+export const AcsChatMessageEditedInThreadEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AcsChatMessageEditedInThreadEventData",
@@ -6814,7 +6814,7 @@ export const AcsChatMessageEditedInThreadEventData: CompositeMapper = {
   }
 };
 
-export const AcsChatMessageDeletedInThreadEventData: CompositeMapper = {
+export const AcsChatMessageDeletedInThreadEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AcsChatMessageDeletedInThreadEventData",
@@ -6831,7 +6831,7 @@ export const AcsChatMessageDeletedInThreadEventData: CompositeMapper = {
   }
 };
 
-export const AcsChatThreadCreatedEventData: CompositeMapper = {
+export const AcsChatThreadCreatedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AcsChatThreadCreatedEventData",
@@ -6869,7 +6869,7 @@ export const AcsChatThreadCreatedEventData: CompositeMapper = {
   }
 };
 
-export const AcsChatThreadDeletedEventData: CompositeMapper = {
+export const AcsChatThreadDeletedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AcsChatThreadDeletedEventData",
@@ -6893,7 +6893,7 @@ export const AcsChatThreadDeletedEventData: CompositeMapper = {
   }
 };
 
-export const AcsChatThreadPropertiesUpdatedEventData: CompositeMapper = {
+export const AcsChatThreadPropertiesUpdatedEventData: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
     className: "AcsChatThreadPropertiesUpdatedEventData",
diff --git a/sdk/eventgrid/eventgrid/swagger/README.md b/sdk/eventgrid/eventgrid/swagger/README.md
index 2fb0bd6c5eff..6945165d38d8 100644
--- a/sdk/eventgrid/eventgrid/swagger/README.md
+++ b/sdk/eventgrid/eventgrid/swagger/README.md
@@ -16,16 +16,27 @@ license-header: MICROSOFT_MIT_NO_VERSION
 output-folder: ../
 save-inputs: true
 source-code-folder-path: ./src/generated
-use-extension:
-  "@autorest/typescript": "6.0.0-dev.20210121.2"
+typescript: true
 hide-clients: true
 ```
 
 ## Customizations
 
-### Mark a descriminator property as "required"
+### Don't force a scheme
 
-Newer versions of AutoRest complain during validation about the descriminator property being required
+The endpoint URL will already have a scheme, don't add yet another one.
+
+```yaml
+directive:
+  - from: swagger-document
+    where: $["x-ms-parameterized-host"]
+    transform: >
+      $.useSchemePrefix = false;
+```
+
+### Mark a discriminator property as "required"
+
+Newer versions of AutoRest complain during validation about the discriminator property being required
 
 ```yaml
 directive:
@@ -101,11 +112,14 @@ directive:
         if ($[definition].properties && $[definition].required === undefined) {
           const properties = Object.keys($[definition].properties);
           if (properties.length > 0) {
-            $[definition].required = properties;
+            switch (definition) {
+              case "CommunicationIdentifierModel":
+                $[definition].required = ["rawId"];
+                break;
+              default:
+                $[definition].required = properties;
+            }
           }
         }
       }
-
-      // Fix up CommunicationIdentifierModel where this huristic is wrong.
-      $["CommunicationIdentifierModel"].required = ["rawId"];
 ```