diff --git a/sdk/healthcareapis/arm-healthcareapis/README.md b/sdk/healthcareapis/arm-healthcareapis/README.md
index dd046321d2bd..d3573d32e5b2 100644
--- a/sdk/healthcareapis/arm-healthcareapis/README.md
+++ b/sdk/healthcareapis/arm-healthcareapis/README.md
@@ -15,7 +15,7 @@ npm install @azure/arm-healthcareapis
 
 ### How to use
 
-#### nodejs - Authentication, client creation and get services as an example written in TypeScript.
+#### nodejs - client creation and get services as an example written in TypeScript.
 
 ##### Install @azure/ms-rest-nodeauth
 
@@ -26,11 +26,10 @@ npm install @azure/ms-rest-nodeauth@"^3.0.0"
 
 ##### Sample code
 
+While the below sample uses the interactive login, other authentication options can be found in the [README.md file of @azure/ms-rest-nodeauth](https://www.npmjs.com/package/@azure/ms-rest-nodeauth) package
 ```typescript
-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 { HealthcareApisManagementClient, HealthcareApisManagementModels, HealthcareApisManagementMappers } from "@azure/arm-healthcareapis";
+const msRestNodeAuth = require("@azure/ms-rest-nodeauth");
+const { HealthcareApisManagementClient } = require("@azure/arm-healthcareapis");
 const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];
 
 msRestNodeAuth.interactiveLogin().then((creds) => {
diff --git a/sdk/healthcareapis/arm-healthcareapis/rollup.config.js b/sdk/healthcareapis/arm-healthcareapis/rollup.config.js
index 555d5fa9f225..7e9f56a8f51a 100644
--- a/sdk/healthcareapis/arm-healthcareapis/rollup.config.js
+++ b/sdk/healthcareapis/arm-healthcareapis/rollup.config.js
@@ -21,8 +21,8 @@ const config = {
       "@azure/ms-rest-azure-js": "msRestAzure"
     },
     banner: `/*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
+ * 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.
diff --git a/sdk/healthcareapis/arm-healthcareapis/src/healthcareApisManagementClient.ts b/sdk/healthcareapis/arm-healthcareapis/src/healthcareApisManagementClient.ts
index 1668cc0472e3..93f222f9a535 100644
--- a/sdk/healthcareapis/arm-healthcareapis/src/healthcareApisManagementClient.ts
+++ b/sdk/healthcareapis/arm-healthcareapis/src/healthcareApisManagementClient.ts
@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * 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
diff --git a/sdk/healthcareapis/arm-healthcareapis/src/healthcareApisManagementClientContext.ts b/sdk/healthcareapis/arm-healthcareapis/src/healthcareApisManagementClientContext.ts
index 6cf3bdaf6488..b7bef3d79a3e 100644
--- a/sdk/healthcareapis/arm-healthcareapis/src/healthcareApisManagementClientContext.ts
+++ b/sdk/healthcareapis/arm-healthcareapis/src/healthcareApisManagementClientContext.ts
@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * 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
diff --git a/sdk/healthcareapis/arm-healthcareapis/src/models/index.ts b/sdk/healthcareapis/arm-healthcareapis/src/models/index.ts
index 6ac837aab5a7..a3958b98db82 100644
--- a/sdk/healthcareapis/arm-healthcareapis/src/models/index.ts
+++ b/sdk/healthcareapis/arm-healthcareapis/src/models/index.ts
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
+ * 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.
@@ -121,11 +121,12 @@ export interface PrivateLinkServiceConnectionState {
 }
 
 /**
- * An interface representing Resource.
+ * Common fields that are returned in the response for all Azure Resource Manager resources
+ * @summary Resource
  */
 export interface Resource extends BaseResource {
   /**
-   * Fully qualified resource Id for the resource. Ex -
+   * 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.**
    */
@@ -136,8 +137,8 @@ export interface Resource extends BaseResource {
    */
   readonly name?: string;
   /**
-   * The type of the resource. Ex- Microsoft.Compute/virtualMachines or
-   * Microsoft.Storage/storageAccounts.
+   * 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;
@@ -434,14 +435,17 @@ export interface OperationResultsDescription {
 }
 
 /**
- * The resource model definition for a ARM proxy resource. It will have everything other than
- * required location and tags
+ * The resource model definition for a Azure Resource Manager proxy resource. It will not have tags
+ * and a location
+ * @summary Proxy Resource
  */
 export interface ProxyResource extends Resource {
 }
 
 /**
- * The resource model definition for a ARM tracked top level resource
+ * The resource model definition for an Azure Resource Manager tracked top level resource which has
+ * 'tags' and a 'location'
+ * @summary Tracked Resource
  */
 export interface TrackedResource extends Resource {
   /**
@@ -455,7 +459,8 @@ export interface TrackedResource extends Resource {
 }
 
 /**
- * The resource model definition for a Azure Resource Manager resource with an etag.
+ * The resource model definition for an Azure Resource Manager resource with an etag.
+ * @summary Entity Resource
  */
 export interface AzureEntityResource extends Resource {
   /**
diff --git a/sdk/healthcareapis/arm-healthcareapis/src/models/mappers.ts b/sdk/healthcareapis/arm-healthcareapis/src/models/mappers.ts
index d94e8ac1a5e4..08717b36ef2f 100644
--- a/sdk/healthcareapis/arm-healthcareapis/src/models/mappers.ts
+++ b/sdk/healthcareapis/arm-healthcareapis/src/models/mappers.ts
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
+ * 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.
diff --git a/sdk/healthcareapis/arm-healthcareapis/src/models/operationResultsMappers.ts b/sdk/healthcareapis/arm-healthcareapis/src/models/operationResultsMappers.ts
index dbd5e7895407..73acc940a0c0 100644
--- a/sdk/healthcareapis/arm-healthcareapis/src/models/operationResultsMappers.ts
+++ b/sdk/healthcareapis/arm-healthcareapis/src/models/operationResultsMappers.ts
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
+ * 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.
diff --git a/sdk/healthcareapis/arm-healthcareapis/src/models/operationsMappers.ts b/sdk/healthcareapis/arm-healthcareapis/src/models/operationsMappers.ts
index dad157b4e8d6..5e62831140e1 100644
--- a/sdk/healthcareapis/arm-healthcareapis/src/models/operationsMappers.ts
+++ b/sdk/healthcareapis/arm-healthcareapis/src/models/operationsMappers.ts
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
+ * 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.
diff --git a/sdk/healthcareapis/arm-healthcareapis/src/models/parameters.ts b/sdk/healthcareapis/arm-healthcareapis/src/models/parameters.ts
index f4873eee85e3..b84e5bb05576 100644
--- a/sdk/healthcareapis/arm-healthcareapis/src/models/parameters.ts
+++ b/sdk/healthcareapis/arm-healthcareapis/src/models/parameters.ts
@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * 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
diff --git a/sdk/healthcareapis/arm-healthcareapis/src/models/privateEndpointConnectionsMappers.ts b/sdk/healthcareapis/arm-healthcareapis/src/models/privateEndpointConnectionsMappers.ts
index f87561bab5c5..e3abc2352a9b 100644
--- a/sdk/healthcareapis/arm-healthcareapis/src/models/privateEndpointConnectionsMappers.ts
+++ b/sdk/healthcareapis/arm-healthcareapis/src/models/privateEndpointConnectionsMappers.ts
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
+ * 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.
diff --git a/sdk/healthcareapis/arm-healthcareapis/src/models/privateLinkResourcesMappers.ts b/sdk/healthcareapis/arm-healthcareapis/src/models/privateLinkResourcesMappers.ts
index 704670297f75..06c3a2eaf618 100644
--- a/sdk/healthcareapis/arm-healthcareapis/src/models/privateLinkResourcesMappers.ts
+++ b/sdk/healthcareapis/arm-healthcareapis/src/models/privateLinkResourcesMappers.ts
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
+ * 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.
diff --git a/sdk/healthcareapis/arm-healthcareapis/src/models/servicesMappers.ts b/sdk/healthcareapis/arm-healthcareapis/src/models/servicesMappers.ts
index 0de63e86f6f6..6b4a4cec795e 100644
--- a/sdk/healthcareapis/arm-healthcareapis/src/models/servicesMappers.ts
+++ b/sdk/healthcareapis/arm-healthcareapis/src/models/servicesMappers.ts
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for license information.
+ * 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.
diff --git a/sdk/healthcareapis/arm-healthcareapis/src/operations/index.ts b/sdk/healthcareapis/arm-healthcareapis/src/operations/index.ts
index 0e8ba668f2c1..b03e6c10c240 100644
--- a/sdk/healthcareapis/arm-healthcareapis/src/operations/index.ts
+++ b/sdk/healthcareapis/arm-healthcareapis/src/operations/index.ts
@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * 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
diff --git a/sdk/healthcareapis/arm-healthcareapis/src/operations/operationResults.ts b/sdk/healthcareapis/arm-healthcareapis/src/operations/operationResults.ts
index 8e3c2e4a5ada..f4317442b288 100644
--- a/sdk/healthcareapis/arm-healthcareapis/src/operations/operationResults.ts
+++ b/sdk/healthcareapis/arm-healthcareapis/src/operations/operationResults.ts
@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * 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
diff --git a/sdk/healthcareapis/arm-healthcareapis/src/operations/operations.ts b/sdk/healthcareapis/arm-healthcareapis/src/operations/operations.ts
index 385220df48d1..a783959767ed 100644
--- a/sdk/healthcareapis/arm-healthcareapis/src/operations/operations.ts
+++ b/sdk/healthcareapis/arm-healthcareapis/src/operations/operations.ts
@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * 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
@@ -108,6 +107,9 @@ const listNextOperationSpec: msRest.OperationSpec = {
   urlParameters: [
     Parameters.nextPageLink
   ],
+  queryParameters: [
+    Parameters.apiVersion
+  ],
   headerParameters: [
     Parameters.acceptLanguage
   ],
diff --git a/sdk/healthcareapis/arm-healthcareapis/src/operations/privateEndpointConnections.ts b/sdk/healthcareapis/arm-healthcareapis/src/operations/privateEndpointConnections.ts
index 315539d3c21c..db07bfc18d65 100644
--- a/sdk/healthcareapis/arm-healthcareapis/src/operations/privateEndpointConnections.ts
+++ b/sdk/healthcareapis/arm-healthcareapis/src/operations/privateEndpointConnections.ts
@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * 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
diff --git a/sdk/healthcareapis/arm-healthcareapis/src/operations/privateLinkResources.ts b/sdk/healthcareapis/arm-healthcareapis/src/operations/privateLinkResources.ts
index 499a9f923909..74b372b6b1d2 100644
--- a/sdk/healthcareapis/arm-healthcareapis/src/operations/privateLinkResources.ts
+++ b/sdk/healthcareapis/arm-healthcareapis/src/operations/privateLinkResources.ts
@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * 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
diff --git a/sdk/healthcareapis/arm-healthcareapis/src/operations/services.ts b/sdk/healthcareapis/arm-healthcareapis/src/operations/services.ts
index b019fdd021ca..b22e3adaa90f 100644
--- a/sdk/healthcareapis/arm-healthcareapis/src/operations/services.ts
+++ b/sdk/healthcareapis/arm-healthcareapis/src/operations/services.ts
@@ -1,7 +1,6 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * 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
@@ -497,6 +496,9 @@ const listNextOperationSpec: msRest.OperationSpec = {
   urlParameters: [
     Parameters.nextPageLink
   ],
+  queryParameters: [
+    Parameters.apiVersion
+  ],
   headerParameters: [
     Parameters.acceptLanguage
   ],
@@ -518,6 +520,9 @@ const listByResourceGroupNextOperationSpec: msRest.OperationSpec = {
   urlParameters: [
     Parameters.nextPageLink
   ],
+  queryParameters: [
+    Parameters.apiVersion
+  ],
   headerParameters: [
     Parameters.acceptLanguage
   ],