diff --git a/sdk/marketplaceordering/arm-marketplaceordering/README.md b/sdk/marketplaceordering/arm-marketplaceordering/README.md
index 3a43a4a5cfcb..6542e1564936 100644
--- a/sdk/marketplaceordering/arm-marketplaceordering/README.md
+++ b/sdk/marketplaceordering/arm-marketplaceordering/README.md
@@ -15,7 +15,7 @@ npm install @azure/arm-marketplaceordering
 
 ### How to use
 
-#### nodejs - Authentication, client creation and get marketplaceAgreements as an example written in TypeScript.
+#### nodejs - client creation and get marketplaceAgreements 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 { MarketplaceOrderingAgreements, MarketplaceOrderingAgreementsModels, MarketplaceOrderingAgreementsMappers } from "@azure/arm-marketplaceordering";
+const msRestNodeAuth = require("@azure/ms-rest-nodeauth");
+const { MarketplaceOrderingAgreements } = require("@azure/arm-marketplaceordering");
 const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];
 
 msRestNodeAuth.interactiveLogin().then((creds) => {
diff --git a/sdk/marketplaceordering/arm-marketplaceordering/rollup.config.js b/sdk/marketplaceordering/arm-marketplaceordering/rollup.config.js
index 8bcf52f6116f..c04d21687542 100644
--- a/sdk/marketplaceordering/arm-marketplaceordering/rollup.config.js
+++ b/sdk/marketplaceordering/arm-marketplaceordering/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/marketplaceordering/arm-marketplaceordering/src/marketplaceOrderingAgreements.ts b/sdk/marketplaceordering/arm-marketplaceordering/src/marketplaceOrderingAgreements.ts
index 3c7a63b3770e..5865e7074265 100644
--- a/sdk/marketplaceordering/arm-marketplaceordering/src/marketplaceOrderingAgreements.ts
+++ b/sdk/marketplaceordering/arm-marketplaceordering/src/marketplaceOrderingAgreements.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/marketplaceordering/arm-marketplaceordering/src/marketplaceOrderingAgreementsContext.ts b/sdk/marketplaceordering/arm-marketplaceordering/src/marketplaceOrderingAgreementsContext.ts
index 75ba980477a6..a92d6cccec02 100644
--- a/sdk/marketplaceordering/arm-marketplaceordering/src/marketplaceOrderingAgreementsContext.ts
+++ b/sdk/marketplaceordering/arm-marketplaceordering/src/marketplaceOrderingAgreementsContext.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/marketplaceordering/arm-marketplaceordering/src/models/index.ts b/sdk/marketplaceordering/arm-marketplaceordering/src/models/index.ts
index 2c310d323eef..90aef904093a 100644
--- a/sdk/marketplaceordering/arm-marketplaceordering/src/models/index.ts
+++ b/sdk/marketplaceordering/arm-marketplaceordering/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.
diff --git a/sdk/marketplaceordering/arm-marketplaceordering/src/models/mappers.ts b/sdk/marketplaceordering/arm-marketplaceordering/src/models/mappers.ts
index f5702ff6034c..471048b86575 100644
--- a/sdk/marketplaceordering/arm-marketplaceordering/src/models/mappers.ts
+++ b/sdk/marketplaceordering/arm-marketplaceordering/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/marketplaceordering/arm-marketplaceordering/src/models/marketplaceAgreementsMappers.ts b/sdk/marketplaceordering/arm-marketplaceordering/src/models/marketplaceAgreementsMappers.ts
index 10d9ac850590..e939bca2e2e9 100644
--- a/sdk/marketplaceordering/arm-marketplaceordering/src/models/marketplaceAgreementsMappers.ts
+++ b/sdk/marketplaceordering/arm-marketplaceordering/src/models/marketplaceAgreementsMappers.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.
@@ -9,7 +9,6 @@
 export {
   AgreementTerms,
   BaseResource,
-  CloudError,
   ErrorResponse,
   ErrorResponseError,
   Resource
diff --git a/sdk/marketplaceordering/arm-marketplaceordering/src/models/operationsMappers.ts b/sdk/marketplaceordering/arm-marketplaceordering/src/models/operationsMappers.ts
index f95be41b77a7..ba8142bc9cac 100644
--- a/sdk/marketplaceordering/arm-marketplaceordering/src/models/operationsMappers.ts
+++ b/sdk/marketplaceordering/arm-marketplaceordering/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/marketplaceordering/arm-marketplaceordering/src/models/parameters.ts b/sdk/marketplaceordering/arm-marketplaceordering/src/models/parameters.ts
index 2462ce8c76ff..754d990b3e44 100644
--- a/sdk/marketplaceordering/arm-marketplaceordering/src/models/parameters.ts
+++ b/sdk/marketplaceordering/arm-marketplaceordering/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/marketplaceordering/arm-marketplaceordering/src/operations/index.ts b/sdk/marketplaceordering/arm-marketplaceordering/src/operations/index.ts
index 075720543718..cf7b4ef68238 100644
--- a/sdk/marketplaceordering/arm-marketplaceordering/src/operations/index.ts
+++ b/sdk/marketplaceordering/arm-marketplaceordering/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/marketplaceordering/arm-marketplaceordering/src/operations/marketplaceAgreements.ts b/sdk/marketplaceordering/arm-marketplaceordering/src/operations/marketplaceAgreements.ts
index bbedaac653da..80d7ff6b0112 100644
--- a/sdk/marketplaceordering/arm-marketplaceordering/src/operations/marketplaceAgreements.ts
+++ b/sdk/marketplaceordering/arm-marketplaceordering/src/operations/marketplaceAgreements.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
@@ -258,7 +257,7 @@ const getOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.AgreementTerms
     },
     default: {
-      bodyMapper: Mappers.CloudError
+      bodyMapper: Mappers.ErrorResponse
     }
   },
   serializer
@@ -370,7 +369,7 @@ const getAgreementOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.AgreementTerms
     },
     default: {
-      bodyMapper: Mappers.CloudError
+      bodyMapper: Mappers.ErrorResponse
     }
   },
   serializer
@@ -404,7 +403,7 @@ const listOperationSpec: msRest.OperationSpec = {
       }
     },
     default: {
-      bodyMapper: Mappers.CloudError
+      bodyMapper: Mappers.ErrorResponse
     }
   },
   serializer
diff --git a/sdk/marketplaceordering/arm-marketplaceordering/src/operations/operations.ts b/sdk/marketplaceordering/arm-marketplaceordering/src/operations/operations.ts
index ddcbbe2cc097..2e2824bb6c4a 100644
--- a/sdk/marketplaceordering/arm-marketplaceordering/src/operations/operations.ts
+++ b/sdk/marketplaceordering/arm-marketplaceordering/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
   ],