diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
index a09de01d5d0d..d778d1fbfc8a 100644
--- a/common/config/rush/pnpm-lock.yaml
+++ b/common/config/rush/pnpm-lock.yaml
@@ -8883,7 +8883,7 @@ packages:
     dev: false
 
   file:projects/ai-text-analytics.tgz:
-    resolution: {integrity: sha512-o7nTFUp/He8mxChlJgVsEQGvMSgBwZ3Q0cA3IwYAEgFxksGNGDqirKVX14ixCFXZ4WccvZ7N4k7cRVsDsLJO4g==, tarball: file:projects/ai-text-analytics.tgz}
+    resolution: {integrity: sha512-negpkvINfMedZMo/5L1bUc1Jurs3pGS6PuodsviCc+XynPV3SHz+/TtOJD49pu7VzkDnSKEU7Yz1DpaV083KQQ==, tarball: file:projects/ai-text-analytics.tgz}
     name: '@rush-temp/ai-text-analytics'
     version: 0.0.0
     dependencies:
@@ -8929,7 +8929,6 @@ packages:
       - '@swc/wasm'
       - bufferutil
       - debug
-      - encoding
       - supports-color
       - utf-8-validate
     dev: false
@@ -10165,21 +10164,22 @@ packages:
     dev: false
 
   file:projects/arm-extendedlocation.tgz:
-    resolution: {integrity: sha512-Q9qi2xRxouCk96mfIqaCEYAYvieqWGHMWgXm/p78dTRsuddqf9KBP+lneCCJj62aB9lU7TU5O2OTlbJvz4PMBQ==, tarball: file:projects/arm-extendedlocation.tgz}
+    resolution: {integrity: sha512-mK3nkW3dnVR8PupDqgvBDak+Rs2FXyCoafE4XAL8cnuchnsVnCMHPWU79MgeMP4gsl5+MGR768CEPEZfodPFvw==, tarball: file:projects/arm-extendedlocation.tgz}
     name: '@rush-temp/arm-extendedlocation'
     version: 0.0.0
     dependencies:
       '@azure-tools/test-recorder': 1.0.2
       '@microsoft/api-extractor': 7.19.4
-      '@rollup/plugin-commonjs': 21.0.1_rollup@2.67.1
-      '@rollup/plugin-json': 4.1.0_rollup@2.67.1
-      '@rollup/plugin-multi-entry': 3.0.1_rollup@2.67.1
-      '@rollup/plugin-node-resolve': 8.4.0_rollup@2.67.1
+      '@rollup/plugin-commonjs': 11.0.2_rollup@1.32.1
+      '@rollup/plugin-json': 4.1.0_rollup@1.32.1
+      '@rollup/plugin-multi-entry': 3.0.1_rollup@1.32.1
+      '@rollup/plugin-node-resolve': 8.4.0_rollup@1.32.1
       cross-env: 7.0.3
       mkdirp: 1.0.4
       mocha: 7.2.0
-      rollup: 2.67.1
-      rollup-plugin-sourcemaps: 0.4.2_rollup@2.67.1
+      rimraf: 3.0.2
+      rollup: 1.32.1
+      rollup-plugin-sourcemaps: 0.4.2_rollup@1.32.1
       tslib: 2.3.1
       typescript: 4.2.4
       uglify-js: 3.15.1
diff --git a/sdk/extendedlocation/arm-extendedlocation/CHANGELOG.md b/sdk/extendedlocation/arm-extendedlocation/CHANGELOG.md
index 5c48ad8e64aa..9a7bc325faa2 100644
--- a/sdk/extendedlocation/arm-extendedlocation/CHANGELOG.md
+++ b/sdk/extendedlocation/arm-extendedlocation/CHANGELOG.md
@@ -1,15 +1,5 @@
-## Release History
+# Release History
+    
+## 1.0.0 (2022-02-20)
 
-### 1.0.0-beta.2 (Unreleased)
-
-#### Features Added
-
-#### Breaking Changes
-
-#### Bugs Fixed
-
-#### Other Changes
-
-### 1.0.0-beta.1 (2021-10-08)
-
-  - Initial Release
+The package of @azure/arm-extendedlocation is using our next generation design principles. To learn more, please refer to our documentation [Quick Start](https://aka.ms/js-track2-quickstart).
diff --git a/sdk/extendedlocation/arm-extendedlocation/LICENSE b/sdk/extendedlocation/arm-extendedlocation/LICENSE
index ccb63b166732..5d1d36e0af80 100644
--- a/sdk/extendedlocation/arm-extendedlocation/LICENSE
+++ b/sdk/extendedlocation/arm-extendedlocation/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2021 Microsoft
+Copyright (c) 2022 Microsoft
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/sdk/extendedlocation/arm-extendedlocation/README.md b/sdk/extendedlocation/arm-extendedlocation/README.md
index d456bf3db43b..cb912bc730c6 100644
--- a/sdk/extendedlocation/arm-extendedlocation/README.md
+++ b/sdk/extendedlocation/arm-extendedlocation/README.md
@@ -1,6 +1,6 @@
-# Azure customLocationsManagement client library for JavaScript
+# Azure CustomLocationsManagement client library for JavaScript
 
-This package contains an isomorphic SDK (runs both in Node.js and in browsers) for Azure customLocationsManagement client.
+This package contains an isomorphic SDK (runs both in Node.js and in browsers) for Azure CustomLocationsManagement client.
 
 The customLocations Rest API spec.
 
@@ -22,7 +22,7 @@ The customLocations Rest API spec.
 
 ### Install the `@azure/arm-extendedlocation` package
 
-Install the Azure customLocationsManagement client library for JavaScript with `npm`:
+Install the Azure CustomLocationsManagement client library for JavaScript with `npm`:
 
 ```bash
 npm install @azure/arm-extendedlocation
@@ -30,8 +30,8 @@ npm install @azure/arm-extendedlocation
 
 ### Create and authenticate a `CustomLocationsManagementClient`
 
-To create a client object to access the Azure customLocationsManagement API, you will need the `endpoint` of your Azure customLocationsManagement resource and a `credential`. The Azure customLocationsManagement client can use Azure Active Directory credentials to authenticate.
-You can find the endpoint for your Azure customLocationsManagement resource in the [Azure Portal][azure_portal].
+To create a client object to access the Azure CustomLocationsManagement API, you will need the `endpoint` of your Azure CustomLocationsManagement resource and a `credential`. The Azure CustomLocationsManagement client can use Azure Active Directory credentials to authenticate.
+You can find the endpoint for your Azure CustomLocationsManagement resource in the [Azure Portal][azure_portal].
 
 You can authenticate with Azure Active Directory using a credential from the [@azure/identity][azure_identity] library or [an existing AAD Token](https://github.com/Azure/azure-sdk-for-js/blob/master/sdk/identity/identity/samples/AzureIdentityExamples.md#authenticating-with-a-pre-fetched-access-token).
 
@@ -41,7 +41,7 @@ To use the [DefaultAzureCredential][defaultazurecredential] provider shown below
 npm install @azure/identity
 ```
 
-You will also need to **register a new AAD application and grant access to Azure customLocationsManagement** by assigning the suitable role to your service principal (note: roles such as `"Owner"` will not grant the necessary permissions).
+You will also need to **register a new AAD application and grant access to Azure CustomLocationsManagement** by assigning the suitable role to your service principal (note: roles such as `"Owner"` will not grant the necessary permissions).
 Set the values of the client ID, tenant ID, and client secret of the AAD application as environment variables: `AZURE_CLIENT_ID`, `AZURE_TENANT_ID`, `AZURE_CLIENT_SECRET`.
 
 For more information about how to create an Azure AD Application check out [this guide](https://docs.microsoft.com/azure/active-directory/develop/howto-create-service-principal-portal).
@@ -53,11 +53,15 @@ const subscriptionId = "00000000-0000-0000-0000-000000000000";
 const client = new CustomLocationsManagementClient(new DefaultAzureCredential(), subscriptionId);
 ```
 
+
+### JavaScript Bundle
+To use this client library in the browser, first you need to use a bundler. For details on how to do this, please refer to our [bundling documentation](https://aka.ms/AzureSDKBundling).
+
 ## Key concepts
 
 ### CustomLocationsManagementClient
 
-`CustomLocationsManagementClient` is the primary interface for developers using the Azure customLocationsManagement client library. Explore the methods on this client object to understand the different features of the Azure customLocationsManagement service that you can access.
+`CustomLocationsManagementClient` is the primary interface for developers using the Azure CustomLocationsManagement client library. Explore the methods on this client object to understand the different features of the Azure CustomLocationsManagement service that you can access.
 
 ## Troubleshooting
 
diff --git a/sdk/extendedlocation/arm-extendedlocation/_meta.json b/sdk/extendedlocation/arm-extendedlocation/_meta.json
index 02b0295fadcf..3731e6cc7ff4 100644
--- a/sdk/extendedlocation/arm-extendedlocation/_meta.json
+++ b/sdk/extendedlocation/arm-extendedlocation/_meta.json
@@ -1,7 +1,7 @@
 {
-  "commit": "5cf3e4a0c30ad5167088ac839453578b2e8e9afc",
+  "commit": "4c40cb3c587f3f4db7163e4b5d4b2ac02fe90d36",
   "readme": "specification/extendedlocation/resource-manager/readme.md",
-  "autorest_command": "autorest --version=3.1.3 --typescript --modelerfour.lenient-model-deduplication --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=D:\\mydev\\azure-sdk-for-js ../azure-rest-api-specs/specification/extendedlocation/resource-manager/readme.md --use=@autorest/typescript@6.0.0-beta.13",
+  "autorest_command": "autorest --version=3.7.3 --typescript --modelerfour.lenient-model-deduplication --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-js ../azure-rest-api-specs/specification/extendedlocation/resource-manager/readme.md --use=@autorest/typescript@6.0.0-alpha.16.20220105.1",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs.git",
-  "use": "@autorest/typescript@6.0.0-beta.13"
+  "use": "@autorest/typescript@6.0.0-alpha.16.20220105.1"
 }
\ No newline at end of file
diff --git a/sdk/extendedlocation/arm-extendedlocation/api-extractor.json b/sdk/extendedlocation/arm-extendedlocation/api-extractor.json
index 8cc49dab445d..b8c5959ce3b5 100644
--- a/sdk/extendedlocation/arm-extendedlocation/api-extractor.json
+++ b/sdk/extendedlocation/arm-extendedlocation/api-extractor.json
@@ -1,18 +1,31 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
   "mainEntryPointFilePath": "./dist-esm/src/index.d.ts",
-  "docModel": { "enabled": true },
-  "apiReport": { "enabled": true, "reportFolder": "./review" },
+  "docModel": {
+    "enabled": true
+  },
+  "apiReport": {
+    "enabled": true,
+    "reportFolder": "./review"
+  },
   "dtsRollup": {
     "enabled": true,
     "untrimmedFilePath": "",
     "publicTrimmedFilePath": "./types/arm-extendedlocation.d.ts"
   },
   "messages": {
-    "tsdocMessageReporting": { "default": { "logLevel": "none" } },
+    "tsdocMessageReporting": {
+      "default": {
+        "logLevel": "none"
+      }
+    },
     "extractorMessageReporting": {
-      "ae-missing-release-tag": { "logLevel": "none" },
-      "ae-unresolved-link": { "logLevel": "none" }
+      "ae-missing-release-tag": {
+        "logLevel": "none"
+      },
+      "ae-unresolved-link": {
+        "logLevel": "none"
+      }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/sdk/extendedlocation/arm-extendedlocation/package.json b/sdk/extendedlocation/arm-extendedlocation/package.json
index e3156490eb76..9881f2b7e301 100644
--- a/sdk/extendedlocation/arm-extendedlocation/package.json
+++ b/sdk/extendedlocation/arm-extendedlocation/package.json
@@ -3,14 +3,14 @@
   "sdk-type": "mgmt",
   "author": "Microsoft Corporation",
   "description": "A generated SDK for CustomLocationsManagementClient.",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.1",
   "engines": {
     "node": ">=12.0.0"
   },
   "dependencies": {
     "@azure/core-lro": "^2.2.0",
     "@azure/abort-controller": "^1.0.0",
-    "@azure/core-paging": "^1.1.1",
+    "@azure/core-paging": "^1.2.0",
     "@azure/core-client": "^1.0.0",
     "@azure/core-auth": "^1.3.0",
     "@azure/core-rest-pipeline": "^1.1.0",
@@ -29,15 +29,16 @@
   "types": "./types/arm-extendedlocation.d.ts",
   "devDependencies": {
     "@microsoft/api-extractor": "^7.18.11",
-    "@rollup/plugin-commonjs": "^21.0.1",
+    "@rollup/plugin-commonjs": "11.0.2",
     "@rollup/plugin-json": "^4.0.0",
     "@rollup/plugin-multi-entry": "^3.0.0",
     "@rollup/plugin-node-resolve": "^8.0.0",
     "mkdirp": "^1.0.4",
-    "rollup": "^2.0.0",
+    "rollup": "^1.16.3",
     "rollup-plugin-sourcemaps": "^0.4.2",
     "typescript": "~4.2.0",
     "uglify-js": "^3.4.9",
+    "rimraf": "^3.0.0",
     "@azure/identity": "^2.0.1",
     "@azure-tools/test-recorder": "^1.0.0",
     "mocha": "^7.1.1",
@@ -70,14 +71,14 @@
     "types/*"
   ],
   "scripts": {
-    "build": "tsc && rollup -c 2>&1 && npm run minify && mkdirp ./review && npm run extract-api",
+    "build": "npm run clean && tsc && rollup -c 2>&1 && npm run minify && mkdirp ./review && npm run extract-api",
     "minify": "uglifyjs -c -m --comments --source-map \"content='./dist/index.js.map'\" -o ./dist/index.min.js ./dist/index.js",
     "prepack": "npm run build",
     "pack": "npm pack 2>&1",
     "extract-api": "api-extractor run --local",
     "lint": "echo skipped",
     "audit": "echo skipped",
-    "clean": "echo skipped",
+    "clean": "rimraf dist dist-browser dist-esm test-dist temp types *.tgz *.log",
     "build:node": "echo skipped",
     "build:browser": "echo skipped",
     "build:test": "echo skipped",
@@ -86,17 +87,16 @@
     "execute:samples": "echo skipped",
     "format": "echo skipped",
     "test": "npm run integration-test",
-    "prebuild": "echo skipped",
     "test:node": "echo skipped",
     "test:browser": "echo skipped",
     "unit-test": "npm run unit-test:node && npm run unit-test:browser",
     "unit-test:node": "cross-env TEST_MODE=playback npm run integration-test:node",
     "unit-test:browser": "echo skipped",
     "integration-test": "npm run integration-test:node && npm run integration-test:browser",
-    "integration-test:node": "mocha -r esm --require ts-node/register --timeout 1200000 --full-trace test/*.ts",
+    "integration-test:node": "mocha -r esm --require ts-node/register --timeout 1200000 --full-trace test/*.ts --reporter ../../../common/tools/mocha-multi-reporter.js",
     "integration-test:browser": "echo skipped",
     "docs": "echo skipped"
   },
   "sideEffects": false,
   "autoPublish": true
-}
+}
\ No newline at end of file
diff --git a/sdk/extendedlocation/arm-extendedlocation/review/arm-extendedlocation.api.md b/sdk/extendedlocation/arm-extendedlocation/review/arm-extendedlocation.api.md
index 6cb1f216dbe1..0e31232f1f7c 100644
--- a/sdk/extendedlocation/arm-extendedlocation/review/arm-extendedlocation.api.md
+++ b/sdk/extendedlocation/arm-extendedlocation/review/arm-extendedlocation.api.md
@@ -148,20 +148,15 @@ export interface CustomLocationsListOperationsOptionalParams extends coreClient.
 export type CustomLocationsListOperationsResponse = CustomLocationOperationsList;
 
 // @public (undocumented)
-export class CustomLocationsManagementClient extends CustomLocationsManagementClientContext {
-    constructor(credentials: coreAuth.TokenCredential, subscriptionId: string, options?: CustomLocationsManagementClientOptionalParams);
-    // (undocumented)
-    customLocations: CustomLocations;
-}
-
-// @public (undocumented)
-export class CustomLocationsManagementClientContext extends coreClient.ServiceClient {
+export class CustomLocationsManagementClient extends coreClient.ServiceClient {
     // (undocumented)
     $host: string;
     constructor(credentials: coreAuth.TokenCredential, subscriptionId: string, options?: CustomLocationsManagementClientOptionalParams);
     // (undocumented)
     apiVersion: string;
     // (undocumented)
+    customLocations: CustomLocations;
+    // (undocumented)
     subscriptionId: string;
 }
 
@@ -313,7 +308,6 @@ export type TrackedResource = Resource & {
     location: string;
 };
 
-
 // (No @packageDocumentation comment for this package)
 
 ```
diff --git a/sdk/extendedlocation/arm-extendedlocation/src/customLocationsManagementClient.ts b/sdk/extendedlocation/arm-extendedlocation/src/customLocationsManagementClient.ts
index 1a9cc4dbbec9..4394879ec050 100644
--- a/sdk/extendedlocation/arm-extendedlocation/src/customLocationsManagementClient.ts
+++ b/sdk/extendedlocation/arm-extendedlocation/src/customLocationsManagementClient.ts
@@ -6,13 +6,17 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
+import * as coreClient from "@azure/core-client";
 import * as coreAuth from "@azure/core-auth";
 import { CustomLocationsImpl } from "./operations";
 import { CustomLocations } from "./operationsInterfaces";
-import { CustomLocationsManagementClientContext } from "./customLocationsManagementClientContext";
 import { CustomLocationsManagementClientOptionalParams } from "./models";
 
-export class CustomLocationsManagementClient extends CustomLocationsManagementClientContext {
+export class CustomLocationsManagementClient extends coreClient.ServiceClient {
+  $host: string;
+  apiVersion: string;
+  subscriptionId: string;
+
   /**
    * Initializes a new instance of the CustomLocationsManagementClient class.
    * @param credentials Subscription credentials which uniquely identify client subscription.
@@ -24,7 +28,46 @@ export class CustomLocationsManagementClient extends CustomLocationsManagementCl
     subscriptionId: string,
     options?: CustomLocationsManagementClientOptionalParams
   ) {
-    super(credentials, subscriptionId, options);
+    if (credentials === undefined) {
+      throw new Error("'credentials' cannot be null");
+    }
+    if (subscriptionId === undefined) {
+      throw new Error("'subscriptionId' cannot be null");
+    }
+
+    // Initializing default values for options
+    if (!options) {
+      options = {};
+    }
+    const defaults: CustomLocationsManagementClientOptionalParams = {
+      requestContentType: "application/json; charset=utf-8",
+      credential: credentials
+    };
+
+    const packageDetails = `azsdk-js-arm-extendedlocation/1.0.0`;
+    const userAgentPrefix =
+      options.userAgentOptions && options.userAgentOptions.userAgentPrefix
+        ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
+        : `${packageDetails}`;
+
+    if (!options.credentialScopes) {
+      options.credentialScopes = ["https://management.azure.com/.default"];
+    }
+    const optionsWithDefaults = {
+      ...defaults,
+      ...options,
+      userAgentOptions: {
+        userAgentPrefix
+      },
+      baseUri: options.endpoint || "https://management.azure.com"
+    };
+    super(optionsWithDefaults);
+    // Parameter assignments
+    this.subscriptionId = subscriptionId;
+
+    // Assigning values to Constant parameters
+    this.$host = options.$host || "https://management.azure.com";
+    this.apiVersion = options.apiVersion || "2021-08-15";
     this.customLocations = new CustomLocationsImpl(this);
   }
 
diff --git a/sdk/extendedlocation/arm-extendedlocation/src/customLocationsManagementClientContext.ts b/sdk/extendedlocation/arm-extendedlocation/src/customLocationsManagementClientContext.ts
deleted file mode 100644
index a3bc19cc2289..000000000000
--- a/sdk/extendedlocation/arm-extendedlocation/src/customLocationsManagementClientContext.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- * Licensed under the MIT License.
- *
- * Code generated by Microsoft (R) AutoRest Code Generator.
- * Changes may cause incorrect behavior and will be lost if the code is regenerated.
- */
-
-import * as coreClient from "@azure/core-client";
-import * as coreAuth from "@azure/core-auth";
-import { CustomLocationsManagementClientOptionalParams } from "./models";
-
-export class CustomLocationsManagementClientContext extends coreClient.ServiceClient {
-  $host: string;
-  apiVersion: string;
-  subscriptionId: string;
-
-  /**
-   * Initializes a new instance of the CustomLocationsManagementClientContext class.
-   * @param credentials Subscription credentials which uniquely identify client subscription.
-   * @param subscriptionId The ID of the target subscription.
-   * @param options The parameter options
-   */
-  constructor(
-    credentials: coreAuth.TokenCredential,
-    subscriptionId: string,
-    options?: CustomLocationsManagementClientOptionalParams
-  ) {
-    if (credentials === undefined) {
-      throw new Error("'credentials' cannot be null");
-    }
-    if (subscriptionId === undefined) {
-      throw new Error("'subscriptionId' cannot be null");
-    }
-
-    // Initializing default values for options
-    if (!options) {
-      options = {};
-    }
-    const defaults: CustomLocationsManagementClientOptionalParams = {
-      requestContentType: "application/json; charset=utf-8",
-      credential: credentials
-    };
-
-    const packageDetails = `azsdk-js-arm-extendedlocation/1.0.0-beta.1`;
-    const userAgentPrefix =
-      options.userAgentOptions && options.userAgentOptions.userAgentPrefix
-        ? `${options.userAgentOptions.userAgentPrefix} ${packageDetails}`
-        : `${packageDetails}`;
-
-    if (!options.credentialScopes) {
-      options.credentialScopes = ["https://management.azure.com/.default"];
-    }
-    const optionsWithDefaults = {
-      ...defaults,
-      ...options,
-      userAgentOptions: {
-        userAgentPrefix
-      },
-      baseUri: options.endpoint || "https://management.azure.com"
-    };
-    super(optionsWithDefaults);
-    // Parameter assignments
-    this.subscriptionId = subscriptionId;
-
-    // Assigning values to Constant parameters
-    this.$host = options.$host || "https://management.azure.com";
-    this.apiVersion = options.apiVersion || "2021-08-15";
-  }
-}
diff --git a/sdk/extendedlocation/arm-extendedlocation/src/index.ts b/sdk/extendedlocation/arm-extendedlocation/src/index.ts
index 91e3a313133c..7e494646f202 100644
--- a/sdk/extendedlocation/arm-extendedlocation/src/index.ts
+++ b/sdk/extendedlocation/arm-extendedlocation/src/index.ts
@@ -9,5 +9,4 @@
 /// <reference lib="esnext.asynciterable" />
 export * from "./models";
 export { CustomLocationsManagementClient } from "./customLocationsManagementClient";
-export { CustomLocationsManagementClientContext } from "./customLocationsManagementClientContext";
 export * from "./operationsInterfaces";
diff --git a/sdk/extendedlocation/arm-extendedlocation/src/models/index.ts b/sdk/extendedlocation/arm-extendedlocation/src/models/index.ts
index 83de0a370d8f..88b92b7ef882 100644
--- a/sdk/extendedlocation/arm-extendedlocation/src/models/index.ts
+++ b/sdk/extendedlocation/arm-extendedlocation/src/models/index.ts
@@ -118,25 +118,6 @@ export interface CustomLocationListResult {
   readonly value?: CustomLocation[];
 }
 
-/** Common fields that are returned in the response for all Azure Resource Manager resources */
-export interface Resource {
-  /**
-   * Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly id?: string;
-  /**
-   * The name of the resource
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly name?: string;
-  /**
-   * The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts"
-   * NOTE: This property will not be serialized. It can only be populated by the server.
-   */
-  readonly type?: string;
-}
-
 /** Identity for the resource. */
 export interface Identity {
   /**
@@ -177,6 +158,25 @@ export interface SystemData {
   lastModifiedAt?: Date;
 }
 
+/** Common fields that are returned in the response for all Azure Resource Manager resources */
+export interface Resource {
+  /**
+   * Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}
+   * NOTE: This property will not be serialized. It can only be populated by the server.
+   */
+  readonly id?: string;
+  /**
+   * The name of the resource
+   * NOTE: This property will not be serialized. It can only be populated by the server.
+   */
+  readonly name?: string;
+  /**
+   * The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts"
+   * NOTE: This property will not be serialized. It can only be populated by the server.
+   */
+  readonly type?: string;
+}
+
 /** The Custom Locations patchable resource definition. */
 export interface PatchableCustomLocations {
   /** Identity for the resource. */
diff --git a/sdk/extendedlocation/arm-extendedlocation/src/models/mappers.ts b/sdk/extendedlocation/arm-extendedlocation/src/models/mappers.ts
index 032c9879f617..568b207d6d25 100644
--- a/sdk/extendedlocation/arm-extendedlocation/src/models/mappers.ts
+++ b/sdk/extendedlocation/arm-extendedlocation/src/models/mappers.ts
@@ -219,36 +219,6 @@ export const CustomLocationListResult: coreClient.CompositeMapper = {
   }
 };
 
-export const Resource: coreClient.CompositeMapper = {
-  type: {
-    name: "Composite",
-    className: "Resource",
-    modelProperties: {
-      id: {
-        serializedName: "id",
-        readOnly: true,
-        type: {
-          name: "String"
-        }
-      },
-      name: {
-        serializedName: "name",
-        readOnly: true,
-        type: {
-          name: "String"
-        }
-      },
-      type: {
-        serializedName: "type",
-        readOnly: true,
-        type: {
-          name: "String"
-        }
-      }
-    }
-  }
-};
-
 export const Identity: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
@@ -344,6 +314,36 @@ export const SystemData: coreClient.CompositeMapper = {
   }
 };
 
+export const Resource: coreClient.CompositeMapper = {
+  type: {
+    name: "Composite",
+    className: "Resource",
+    modelProperties: {
+      id: {
+        serializedName: "id",
+        readOnly: true,
+        type: {
+          name: "String"
+        }
+      },
+      name: {
+        serializedName: "name",
+        readOnly: true,
+        type: {
+          name: "String"
+        }
+      },
+      type: {
+        serializedName: "type",
+        readOnly: true,
+        type: {
+          name: "String"
+        }
+      }
+    }
+  }
+};
+
 export const PatchableCustomLocations: coreClient.CompositeMapper = {
   type: {
     name: "Composite",
diff --git a/sdk/extendedlocation/arm-extendedlocation/src/operations/customLocations.ts b/sdk/extendedlocation/arm-extendedlocation/src/operations/customLocations.ts
index e25a2f1fed07..0ec2eadc0f3d 100644
--- a/sdk/extendedlocation/arm-extendedlocation/src/operations/customLocations.ts
+++ b/sdk/extendedlocation/arm-extendedlocation/src/operations/customLocations.ts
@@ -11,7 +11,7 @@ import { CustomLocations } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
 import * as Parameters from "../models/parameters";
-import { CustomLocationsManagementClientContext } from "../customLocationsManagementClientContext";
+import { CustomLocationsManagementClient } from "../customLocationsManagementClient";
 import { PollerLike, PollOperationState, LroEngine } from "@azure/core-lro";
 import { LroImpl } from "../lroImpl";
 import {
@@ -46,13 +46,13 @@ import {
 /// <reference lib="esnext.asynciterable" />
 /** Class containing CustomLocations operations. */
 export class CustomLocationsImpl implements CustomLocations {
-  private readonly client: CustomLocationsManagementClientContext;
+  private readonly client: CustomLocationsManagementClient;
 
   /**
    * Initialize a new instance of the class CustomLocations class.
    * @param client Reference to the service client
    */
-  constructor(client: CustomLocationsManagementClientContext) {
+  constructor(client: CustomLocationsManagementClient) {
     this.client = client;
   }
 
diff --git a/sdk/extendedlocation/arm-extendedlocation/tsconfig.json b/sdk/extendedlocation/arm-extendedlocation/tsconfig.json
index 6e3251194117..3e6ae96443f3 100644
--- a/sdk/extendedlocation/arm-extendedlocation/tsconfig.json
+++ b/sdk/extendedlocation/arm-extendedlocation/tsconfig.json
@@ -9,11 +9,19 @@
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
     "forceConsistentCasingInFileNames": true,
-    "lib": ["es6", "dom"],
+    "lib": [
+      "es6",
+      "dom"
+    ],
     "declaration": true,
     "outDir": "./dist-esm",
     "importHelpers": true
   },
-  "include": ["./src/**/*.ts", "./test/**/*.ts"],
-  "exclude": ["node_modules"]
-}
+  "include": [
+    "./src/**/*.ts",
+    "./test/**/*.ts"
+  ],
+  "exclude": [
+    "node_modules"
+  ]
+}
\ No newline at end of file