diff --git a/sdk/vmware/arm-vmware/README.md b/sdk/vmware/arm-vmware/README.md
index 0e88439dad74..8064930fea82 100644
--- a/sdk/vmware/arm-vmware/README.md
+++ b/sdk/vmware/arm-vmware/README.md
@@ -1,6 +1,6 @@
-## Azure AzureVMwareSolutionAPI SDK for JavaScript
+## Azure AVSClient SDK for JavaScript
 
-This package contains an isomorphic SDK for AzureVMwareSolutionAPI.
+This package contains an isomorphic SDK for AVSClient.
 
 ### Currently supported environments
 
@@ -30,11 +30,11 @@ npm install @azure/ms-rest-nodeauth@"^3.0.0"
 import * as msRest from "@azure/ms-rest-js";
 import * as msRestAzure from "@azure/ms-rest-azure-js";
 import * as msRestNodeAuth from "@azure/ms-rest-nodeauth";
-import { AzureVMwareSolutionAPI, AzureVMwareSolutionAPIModels, AzureVMwareSolutionAPIMappers } from "@azure/arm-vmware";
+import { AVSClient, AVSModels, AVSMappers } from "@azure/arm-vmware";
 const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];
 
 msRestNodeAuth.interactiveLogin().then((creds) => {
-  const client = new AzureVMwareSolutionAPI(creds, subscriptionId);
+  const client = new AVSClient(creds, subscriptionId);
   client.operations.list().then((result) => {
     console.log("The result is:");
     console.log(result);
@@ -77,7 +77,7 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to
           // may cause redirects
           authManager.login();
         }
-        const client = new Azure.ArmVmware.AzureVMwareSolutionAPI(res.creds, subscriptionId);
+        const client = new Azure.ArmVmware.AVSClient(res.creds, subscriptionId);
         client.operations.list().then((result) => {
           console.log("The result is:");
           console.log(result);
diff --git a/sdk/vmware/arm-vmware/package.json b/sdk/vmware/arm-vmware/package.json
index b917694afb40..fc0dfbcfe56c 100644
--- a/sdk/vmware/arm-vmware/package.json
+++ b/sdk/vmware/arm-vmware/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@azure/arm-vmware",
   "author": "Microsoft Corporation",
-  "description": "AzureVMwareSolutionAPI Library with typescript type definitions for node.js and browser.",
+  "description": "AVSClient Library with typescript type definitions for node.js and browser.",
   "version": "0.1.0",
   "dependencies": {
     "@azure/ms-rest-azure-js": "^2.0.1",
@@ -17,8 +17,8 @@
   ],
   "license": "MIT",
   "main": "./dist/arm-vmware.js",
-  "module": "./esm/azureVMwareSolutionAPI.js",
-  "types": "./esm/azureVMwareSolutionAPI.d.ts",
+  "module": "./esm/aVSClient.js",
+  "types": "./esm/aVSClient.d.ts",
   "devDependencies": {
     "typescript": "^3.5.3",
     "rollup": "^1.18.0",
diff --git a/sdk/vmware/arm-vmware/rollup.config.js b/sdk/vmware/arm-vmware/rollup.config.js
index 427a27954019..761f66e99cd8 100644
--- a/sdk/vmware/arm-vmware/rollup.config.js
+++ b/sdk/vmware/arm-vmware/rollup.config.js
@@ -6,7 +6,7 @@ import sourcemaps from "rollup-plugin-sourcemaps";
  * @type {rollup.RollupFileOptions}
  */
 const config = {
-  input: "./esm/azureVMwareSolutionAPI.js",
+  input: "./esm/aVSClient.js",
   external: [
     "@azure/ms-rest-js",
     "@azure/ms-rest-azure-js"
diff --git a/sdk/vmware/arm-vmware/src/azureVMwareSolutionAPI.ts b/sdk/vmware/arm-vmware/src/aVSClient.ts
similarity index 74%
rename from sdk/vmware/arm-vmware/src/azureVMwareSolutionAPI.ts
rename to sdk/vmware/arm-vmware/src/aVSClient.ts
index 1a9894cbdd9e..2e9c779ba8a2 100644
--- a/sdk/vmware/arm-vmware/src/azureVMwareSolutionAPI.ts
+++ b/sdk/vmware/arm-vmware/src/aVSClient.ts
@@ -12,10 +12,10 @@ import * as msRest from "@azure/ms-rest-js";
 import * as Models from "./models";
 import * as Mappers from "./models/mappers";
 import * as operations from "./operations";
-import { AzureVMwareSolutionAPIContext } from "./azureVMwareSolutionAPIContext";
+import { AVSClientContext } from "./aVSClientContext";
 
 
-class AzureVMwareSolutionAPI extends AzureVMwareSolutionAPIContext {
+class AVSClient extends AVSClientContext {
   // Operation groups
   operations: operations.Operations;
   locations: operations.Locations;
@@ -23,12 +23,12 @@ class AzureVMwareSolutionAPI extends AzureVMwareSolutionAPIContext {
   clusters: operations.Clusters;
 
   /**
-   * Initializes a new instance of the AzureVMwareSolutionAPI class.
+   * Initializes a new instance of the AVSClient class.
    * @param credentials Credentials needed for the client to connect to Azure.
    * @param subscriptionId Unique identifier for the Azure subscription
    * @param [options] The parameter options
    */
-  constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.AzureVMwareSolutionAPIOptions) {
+  constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.AVSClientOptions) {
     super(credentials, subscriptionId, options);
     this.operations = new operations.Operations(this);
     this.locations = new operations.Locations(this);
@@ -40,9 +40,9 @@ class AzureVMwareSolutionAPI extends AzureVMwareSolutionAPIContext {
 // Operation Specifications
 
 export {
-  AzureVMwareSolutionAPI,
-  AzureVMwareSolutionAPIContext,
-  Models as AzureVMwareSolutionAPIModels,
-  Mappers as AzureVMwareSolutionAPIMappers
+  AVSClient,
+  AVSClientContext,
+  Models as AVSModels,
+  Mappers as AVSMappers
 };
 export * from "./operations";
diff --git a/sdk/vmware/arm-vmware/src/azureVMwareSolutionAPIContext.ts b/sdk/vmware/arm-vmware/src/aVSClientContext.ts
similarity index 90%
rename from sdk/vmware/arm-vmware/src/azureVMwareSolutionAPIContext.ts
rename to sdk/vmware/arm-vmware/src/aVSClientContext.ts
index f61e107429f7..5cb0387b6c9b 100644
--- a/sdk/vmware/arm-vmware/src/azureVMwareSolutionAPIContext.ts
+++ b/sdk/vmware/arm-vmware/src/aVSClientContext.ts
@@ -15,18 +15,18 @@ import * as msRestAzure from "@azure/ms-rest-azure-js";
 const packageName = "@azure/arm-vmware";
 const packageVersion = "0.1.0";
 
-export class AzureVMwareSolutionAPIContext extends msRestAzure.AzureServiceClient {
+export class AVSClientContext extends msRestAzure.AzureServiceClient {
   credentials: msRest.ServiceClientCredentials;
   subscriptionId: string;
   apiVersion?: string;
 
   /**
-   * Initializes a new instance of the AzureVMwareSolutionAPI class.
+   * Initializes a new instance of the AVSClient class.
    * @param credentials Credentials needed for the client to connect to Azure.
    * @param subscriptionId Unique identifier for the Azure subscription
    * @param [options] The parameter options
    */
-  constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.AzureVMwareSolutionAPIOptions) {
+  constructor(credentials: msRest.ServiceClientCredentials, subscriptionId: string, options?: Models.AVSClientOptions) {
     if (credentials == undefined) {
       throw new Error('\'credentials\' cannot be null.');
     }
diff --git a/sdk/vmware/arm-vmware/src/models/index.ts b/sdk/vmware/arm-vmware/src/models/index.ts
index b9bc5a250dc6..d99fef1b74f1 100644
--- a/sdk/vmware/arm-vmware/src/models/index.ts
+++ b/sdk/vmware/arm-vmware/src/models/index.ts
@@ -469,9 +469,9 @@ export interface ClustersBeginUpdateOptionalParams extends msRest.RequestOptions
 }
 
 /**
- * An interface representing AzureVMwareSolutionAPIOptions.
+ * An interface representing AVSClientOptions.
  */
-export interface AzureVMwareSolutionAPIOptions extends AzureServiceClientOptions {
+export interface AVSClientOptions extends AzureServiceClientOptions {
   baseUri?: string;
 }
 
diff --git a/sdk/vmware/arm-vmware/src/operations/clusters.ts b/sdk/vmware/arm-vmware/src/operations/clusters.ts
index 9c940a946dae..68940c3312b4 100644
--- a/sdk/vmware/arm-vmware/src/operations/clusters.ts
+++ b/sdk/vmware/arm-vmware/src/operations/clusters.ts
@@ -13,17 +13,17 @@ import * as msRestAzure from "@azure/ms-rest-azure-js";
 import * as Models from "../models";
 import * as Mappers from "../models/clustersMappers";
 import * as Parameters from "../models/parameters";
-import { AzureVMwareSolutionAPIContext } from "../azureVMwareSolutionAPIContext";
+import { AVSClientContext } from "../aVSClientContext";
 
 /** Class representing a Clusters. */
 export class Clusters {
-  private readonly client: AzureVMwareSolutionAPIContext;
+  private readonly client: AVSClientContext;
 
   /**
    * Create a Clusters.
-   * @param {AzureVMwareSolutionAPIContext} client Reference to the service client.
+   * @param {AVSClientContext} client Reference to the service client.
    */
-  constructor(client: AzureVMwareSolutionAPIContext) {
+  constructor(client: AVSClientContext) {
     this.client = client;
   }
 
diff --git a/sdk/vmware/arm-vmware/src/operations/locations.ts b/sdk/vmware/arm-vmware/src/operations/locations.ts
index c2a8b8e8f930..6d71a0bee6a7 100644
--- a/sdk/vmware/arm-vmware/src/operations/locations.ts
+++ b/sdk/vmware/arm-vmware/src/operations/locations.ts
@@ -12,17 +12,17 @@ import * as msRest from "@azure/ms-rest-js";
 import * as Models from "../models";
 import * as Mappers from "../models/locationsMappers";
 import * as Parameters from "../models/parameters";
-import { AzureVMwareSolutionAPIContext } from "../azureVMwareSolutionAPIContext";
+import { AVSClientContext } from "../aVSClientContext";
 
 /** Class representing a Locations. */
 export class Locations {
-  private readonly client: AzureVMwareSolutionAPIContext;
+  private readonly client: AVSClientContext;
 
   /**
    * Create a Locations.
-   * @param {AzureVMwareSolutionAPIContext} client Reference to the service client.
+   * @param {AVSClientContext} client Reference to the service client.
    */
-  constructor(client: AzureVMwareSolutionAPIContext) {
+  constructor(client: AVSClientContext) {
     this.client = client;
   }
 
diff --git a/sdk/vmware/arm-vmware/src/operations/operations.ts b/sdk/vmware/arm-vmware/src/operations/operations.ts
index 372ef6b9bce5..190f2ab5edef 100644
--- a/sdk/vmware/arm-vmware/src/operations/operations.ts
+++ b/sdk/vmware/arm-vmware/src/operations/operations.ts
@@ -12,17 +12,17 @@ import * as msRest from "@azure/ms-rest-js";
 import * as Models from "../models";
 import * as Mappers from "../models/operationsMappers";
 import * as Parameters from "../models/parameters";
-import { AzureVMwareSolutionAPIContext } from "../azureVMwareSolutionAPIContext";
+import { AVSClientContext } from "../aVSClientContext";
 
 /** Class representing a Operations. */
 export class Operations {
-  private readonly client: AzureVMwareSolutionAPIContext;
+  private readonly client: AVSClientContext;
 
   /**
    * Create a Operations.
-   * @param {AzureVMwareSolutionAPIContext} client Reference to the service client.
+   * @param {AVSClientContext} client Reference to the service client.
    */
-  constructor(client: AzureVMwareSolutionAPIContext) {
+  constructor(client: AVSClientContext) {
     this.client = client;
   }
 
diff --git a/sdk/vmware/arm-vmware/src/operations/privateClouds.ts b/sdk/vmware/arm-vmware/src/operations/privateClouds.ts
index 9a1a1445eaf1..e7b140a10159 100644
--- a/sdk/vmware/arm-vmware/src/operations/privateClouds.ts
+++ b/sdk/vmware/arm-vmware/src/operations/privateClouds.ts
@@ -13,17 +13,17 @@ import * as msRestAzure from "@azure/ms-rest-azure-js";
 import * as Models from "../models";
 import * as Mappers from "../models/privateCloudsMappers";
 import * as Parameters from "../models/parameters";
-import { AzureVMwareSolutionAPIContext } from "../azureVMwareSolutionAPIContext";
+import { AVSClientContext } from "../aVSClientContext";
 
 /** Class representing a PrivateClouds. */
 export class PrivateClouds {
-  private readonly client: AzureVMwareSolutionAPIContext;
+  private readonly client: AVSClientContext;
 
   /**
    * Create a PrivateClouds.
-   * @param {AzureVMwareSolutionAPIContext} client Reference to the service client.
+   * @param {AVSClientContext} client Reference to the service client.
    */
-  constructor(client: AzureVMwareSolutionAPIContext) {
+  constructor(client: AVSClientContext) {
     this.client = client;
   }