diff --git a/packages/@azure/arm-eventhub/LICENSE.txt b/packages/@azure/arm-eventhub/LICENSE.txt
index a70e8cf66038..5431ba98b936 100644
--- a/packages/@azure/arm-eventhub/LICENSE.txt
+++ b/packages/@azure/arm-eventhub/LICENSE.txt
@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2018 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
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2018 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
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/packages/@azure/arm-eventhub/README.md b/packages/@azure/arm-eventhub/README.md
index 81150c926a73..202472e30d39 100644
--- a/packages/@azure/arm-eventhub/README.md
+++ b/packages/@azure/arm-eventhub/README.md
@@ -1,96 +1,77 @@
-## Azure EventHubManagementClient SDK for JavaScript
-
-This package contains an isomorphic SDK for EventHubManagementClient.
-
-### Currently supported environments
-
-- Node.js version 6.x.x or higher
-- Browser JavaScript
-
-### How to Install
-
-```
-npm install @azure/arm-eventhub
-```
-
-### How to use
-
-#### nodejs - Authentication, client creation and list operations as an example written in TypeScript.
-
-##### Install @azure/ms-rest-nodeauth
-
-```
-npm install @azure/ms-rest-nodeauth
-```
-
-##### Sample code
-
-```ts
-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 { EventHubManagementClient, EventHubManagementModels, EventHubManagementMappers } from "@azure/arm-eventhub";
-const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];
-
-msRestNodeAuth.interactiveLogin().then((creds) => {
-  const client = new EventHubManagementClient(creds, subscriptionId);
-  client.operations.list().then((result) => {
-    console.log("The result is:");
-    console.log(result);
-  });
-}).catch((err) => {
-  console.error(err);
-});
-```
-
-#### browser - Authentication, client creation and list operations as an example written in JavaScript.
-
-##### Install @azure/ms-rest-browserauth
-
-```
-npm install @azure/ms-rest-browserauth
-```
-
-##### Sample code
-
-See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to Azure in the browser.
-
-- index.html
-```html
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <title>@azure/arm-eventhub sample</title>
-    <script src="node_modules/@azure/ms-rest-js/dist/msRest.browser.js"></script>
-    <script src="node_modules/@azure/ms-rest-azure-js/dist/msRestAzure.js"></script>
-    <script src="node_modules/@azure/ms-rest-browserauth/dist/msAuth.js"></script>
-    <script src="node_modules/@azure/arm-eventhub/dist/arm-eventhub.js"></script>
-    <script type="text/javascript">
-      const subscriptionId = "<Subscription_Id>";
-      const authManager = new msAuth.AuthManager({
-        clientId: "<client id for your Azure AD app>",
-        tenant: "<optional tenant for your organization>"
-      });
-      authManager.finalizeLogin().then((res) => {
-        if (!res.isLoggedIn) {
-          // may cause redirects
-          authManager.login();
-        }
-        const client = new Azure.ArmEventhub.EventHubManagementClient(res.creds, subscriptionId);
-        client.operations.list().then((result) => {
-          console.log("The result is:");
-          console.log(result);
-        }).catch((err) => {
-          console.log("An error occurred:");
-          console.error(err);
-        });
-      });
-    </script>
-  </head>
-  <body></body>
-</html>
-```
-
-## Related projects
-
-- [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js)
+# Azure EventHubManagementClient SDK for JavaScript
+This package contains an isomorphic SDK for EventHubManagementClient.
+
+## Currently supported environments
+- Node.js version 6.x.x or higher
+- Browser JavaScript
+
+## How to Install
+```
+npm install @azure/arm-eventhub
+```
+
+
+## How to use
+
+### nodejs - Authentication, client creation and list operations as an example written in TypeScript.
+
+```ts
+import * as msRest from "ms-rest-js";
+import * as msRestAzure from "ms-rest-azure-js";
+import * as msRestNodeAuth from "ms-rest-nodeauth";
+import { EventHubManagementClient, EventHubManagementModels, EventHubManagementMappers } from "@azure/arm-eventhub";
+const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];
+
+msRestNodeAuth.interactiveLogin().then((creds) => {
+  const client = new EventHubManagementClient(creds, subscriptionId);
+  client.operations.list().then((result) => {
+    console.log("The result is:");
+    console.log(result);
+  });
+}).catch((err) => {
+  console.error(err);
+});
+```
+
+### browser - Authentication, client creation and list operations as an example written in JavaScript.
+See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to Azure in the browser.
+
+- index.html
+```html
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <title>@azure/arm-eventhub sample</title>
+    <script src="node_modules/ms-rest-js/dist/msRest.browser.js"></script>
+    <script src="node_modules/ms-rest-azure-js/dist/msRestAzure.js"></script>
+    <script src="node_modules/ms-rest-browserauth/dist/msAuth.js"></script>
+    <script src="node_modules/@azure/arm-eventhub/dist/arm-eventhub.js"></script>
+    <script>
+      const subscriptionId = "<Subscription_Id>";
+      const authManager = new msAuth.AuthManager({
+        clientId: "<client id for your Azure AD app>",
+        tenant: "<optional tenant for your organization>"
+      });
+      authManager.finalizeLogin().then((res) => {
+        if (!res.isLoggedIn) {
+          // may cause redirects
+          authManager.login();
+        }
+        const client = new Azure.ArmEventhub.EventHubManagementClient(res.creds, subscriptionId);
+        client.operations.list().then((result) => {
+          console.log("The result is:");
+          console.log(result);
+        }).catch((err) => {
+          console.log("An error occurred:");
+          console.error(err);
+        });
+      });
+    </script>
+  </head>
+  <body>
+  </body>
+</html>
+```
+
+# Related projects
+ - [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js)
diff --git a/packages/@azure/arm-eventhub/lib/eventHubManagementClient.ts b/packages/@azure/arm-eventhub/lib/eventHubManagementClient.ts
index 259d5c8b7d79..49c84e54b6d3 100644
--- a/packages/@azure/arm-eventhub/lib/eventHubManagementClient.ts
+++ b/packages/@azure/arm-eventhub/lib/eventHubManagementClient.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as msRest from "ms-rest-js";
 import * as Models from "./models";
 import * as Mappers from "./models/mappers";
 import * as operations from "./operations";
diff --git a/packages/@azure/arm-eventhub/lib/eventHubManagementClientContext.ts b/packages/@azure/arm-eventhub/lib/eventHubManagementClientContext.ts
index 7685b7591d5a..51a8e45a02c7 100644
--- a/packages/@azure/arm-eventhub/lib/eventHubManagementClientContext.ts
+++ b/packages/@azure/arm-eventhub/lib/eventHubManagementClientContext.ts
@@ -9,8 +9,8 @@
  */
 
 import * as Models from "./models";
-import * as msRest from "@azure/ms-rest-js";
-import * as msRestAzure from "@azure/ms-rest-azure-js";
+import * as msRest from "ms-rest-js";
+import * as msRestAzure from "ms-rest-azure-js";
 
 const packageName = "@azure/arm-eventhub";
 const packageVersion = "0.1.0";
diff --git a/packages/@azure/arm-eventhub/lib/models/index.ts b/packages/@azure/arm-eventhub/lib/models/index.ts
index a98848bc66bc..fc81d268f905 100644
--- a/packages/@azure/arm-eventhub/lib/models/index.ts
+++ b/packages/@azure/arm-eventhub/lib/models/index.ts
@@ -8,8 +8,8 @@
  * regenerated.
  */
 
-import { BaseResource, CloudError, AzureServiceClientOptions } from "@azure/ms-rest-azure-js";
-import * as msRest from "@azure/ms-rest-js";
+import { BaseResource, CloudError, AzureServiceClientOptions } from "ms-rest-azure-js";
+import * as msRest from "ms-rest-js";
 
 export { BaseResource, CloudError };
 
@@ -78,7 +78,7 @@ export interface Sku {
    */
   tier?: SkuTier;
   /**
-   * @member {number} [capacity] The Event Hubs throughput units, vaule should
+   * @member {number} [capacity] The Event Hubs throughput units, value should
    * be 0 to 20 throughput units.
    */
   capacity?: number;
@@ -134,7 +134,7 @@ export interface EHNamespace extends TrackedResource {
   isAutoInflateEnabled?: boolean;
   /**
    * @member {number} [maximumThroughputUnits] Upper limit of throughput units
-   * when AutoInflate is enabled, vaule should be within 0 to 20 throughput
+   * when AutoInflate is enabled, value should be within 0 to 20 throughput
    * units. ( '0' if AutoInflateEnabled = true)
    */
   maximumThroughputUnits?: number;
@@ -220,7 +220,7 @@ export interface AccessKeys {
  * @interface
  * An interface representing RegenerateAccessKeyParameters.
  * Parameters supplied to the Regenerate Authorization Rule operation,
- * specifies which key neeeds to be reset.
+ * specifies which key needs to be reset.
  *
  */
 export interface RegenerateAccessKeyParameters {
@@ -376,7 +376,7 @@ export interface ConsumerGroup extends Resource {
    */
   readonly updatedAt?: Date;
   /**
-   * @member {string} [userMetadata] Usermetadata is a placeholder to store
+   * @member {string} [userMetadata] User Metadata is a placeholder to store
    * user-defined string data with maximum length 1024. e.g. it can be used to
    * store descriptive data, such as list of teams and their contact
    * information also user-defined configuration settings can be stored.
@@ -476,8 +476,8 @@ export interface Operation {
 /**
  * @interface
  * An interface representing ErrorResponse.
- * Error reponse indicates EventHub service is not able to process the incoming
- * request. The reason is provided in the error message.
+ * Error response indicates EventHub service is not able to process the
+ * incoming request. The reason is provided in the error message.
  *
  */
 export interface ErrorResponse {
@@ -511,7 +511,7 @@ export interface ArmDisasterRecovery extends Resource {
   readonly provisioningState?: ProvisioningStateDR;
   /**
    * @member {string} [partnerNamespace] ARM Id of the Primary/Secondary
-   * eventhub namespace name, which is part of GEO DR pairning
+   * eventhub namespace name, which is part of GEO DR pairing
    */
   partnerNamespace?: string;
   /**
diff --git a/packages/@azure/arm-eventhub/lib/models/mappers.ts b/packages/@azure/arm-eventhub/lib/models/mappers.ts
index 70b18eb73b1c..c04ac03cce79 100644
--- a/packages/@azure/arm-eventhub/lib/models/mappers.ts
+++ b/packages/@azure/arm-eventhub/lib/models/mappers.ts
@@ -8,8 +8,8 @@
  * regenerated.
  */
 
-import { CloudErrorMapper, BaseResourceMapper } from "@azure/ms-rest-azure-js";
-import * as msRest from "@azure/ms-rest-js";
+import { CloudErrorMapper, BaseResourceMapper } from "ms-rest-azure-js";
+import * as msRest from "ms-rest-js";
 
 export const CloudError = CloudErrorMapper;
 export const BaseResource = BaseResourceMapper;
diff --git a/packages/@azure/arm-eventhub/lib/models/parameters.ts b/packages/@azure/arm-eventhub/lib/models/parameters.ts
index f3cc023b3e66..eeadc06dbd26 100644
--- a/packages/@azure/arm-eventhub/lib/models/parameters.ts
+++ b/packages/@azure/arm-eventhub/lib/models/parameters.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as msRest from "ms-rest-js";
 
 export const acceptLanguage: msRest.OperationParameter = {
   parameterPath: "acceptLanguage",
diff --git a/packages/@azure/arm-eventhub/lib/operations/consumerGroups.ts b/packages/@azure/arm-eventhub/lib/operations/consumerGroups.ts
index fe20df49c3b8..6d3e38ceb593 100644
--- a/packages/@azure/arm-eventhub/lib/operations/consumerGroups.ts
+++ b/packages/@azure/arm-eventhub/lib/operations/consumerGroups.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as msRest from "ms-rest-js";
 import * as Models from "../models";
 import * as Mappers from "../models/consumerGroupsMappers";
 import * as Parameters from "../models/parameters";
diff --git a/packages/@azure/arm-eventhub/lib/operations/disasterRecoveryConfigs.ts b/packages/@azure/arm-eventhub/lib/operations/disasterRecoveryConfigs.ts
index 0034c8278220..3ea56fd74b66 100644
--- a/packages/@azure/arm-eventhub/lib/operations/disasterRecoveryConfigs.ts
+++ b/packages/@azure/arm-eventhub/lib/operations/disasterRecoveryConfigs.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as msRest from "ms-rest-js";
 import * as Models from "../models";
 import * as Mappers from "../models/disasterRecoveryConfigsMappers";
 import * as Parameters from "../models/parameters";
@@ -244,7 +244,7 @@ export class DisasterRecoveryConfigs {
   }
 
   /**
-   * envokes GEO DR failover and reconfigure the alias to point to the secondary namespace
+   * Invokes GEO DR failover and reconfigure the alias to point to the secondary namespace
    * @param resourceGroupName Name of the resource group within the azure subscription.
    * @param namespaceName The Namespace name
    * @param alias The Disaster Recovery configuration name
diff --git a/packages/@azure/arm-eventhub/lib/operations/eventHubs.ts b/packages/@azure/arm-eventhub/lib/operations/eventHubs.ts
index ffd4672511f1..2be4286f8e7a 100644
--- a/packages/@azure/arm-eventhub/lib/operations/eventHubs.ts
+++ b/packages/@azure/arm-eventhub/lib/operations/eventHubs.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as msRest from "ms-rest-js";
 import * as Models from "../models";
 import * as Mappers from "../models/eventHubsMappers";
 import * as Parameters from "../models/parameters";
diff --git a/packages/@azure/arm-eventhub/lib/operations/namespaces.ts b/packages/@azure/arm-eventhub/lib/operations/namespaces.ts
index a0deb092c75c..2a7226437dac 100644
--- a/packages/@azure/arm-eventhub/lib/operations/namespaces.ts
+++ b/packages/@azure/arm-eventhub/lib/operations/namespaces.ts
@@ -8,8 +8,8 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
-import * as msRestAzure from "@azure/ms-rest-azure-js";
+import * as msRest from "ms-rest-js";
+import * as msRestAzure from "ms-rest-azure-js";
 import * as Models from "../models";
 import * as Mappers from "../models/namespacesMappers";
 import * as Parameters from "../models/parameters";
diff --git a/packages/@azure/arm-eventhub/lib/operations/operations.ts b/packages/@azure/arm-eventhub/lib/operations/operations.ts
index 6597c772dd23..fb5762a1463e 100644
--- a/packages/@azure/arm-eventhub/lib/operations/operations.ts
+++ b/packages/@azure/arm-eventhub/lib/operations/operations.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as msRest from "ms-rest-js";
 import * as Models from "../models";
 import * as Mappers from "../models/operationsMappers";
 import * as Parameters from "../models/parameters";
diff --git a/packages/@azure/arm-eventhub/lib/operations/regions.ts b/packages/@azure/arm-eventhub/lib/operations/regions.ts
index ef0fb7026bd9..861b13b570a1 100644
--- a/packages/@azure/arm-eventhub/lib/operations/regions.ts
+++ b/packages/@azure/arm-eventhub/lib/operations/regions.ts
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
+import * as msRest from "ms-rest-js";
 import * as Models from "../models";
 import * as Mappers from "../models/regionsMappers";
 import * as Parameters from "../models/parameters";
diff --git a/packages/@azure/arm-eventhub/package.json b/packages/@azure/arm-eventhub/package.json
index 741fcea91655..2a1d33abf284 100644
--- a/packages/@azure/arm-eventhub/package.json
+++ b/packages/@azure/arm-eventhub/package.json
@@ -4,8 +4,8 @@
   "description": "EventHubManagementClient Library with typescript type definitions for node.js and browser.",
   "version": "0.1.0",
   "dependencies": {
-    "@azure/ms-rest-azure-js": "^1.1.0",
-    "@azure/ms-rest-js": "^1.1.0",
+    "ms-rest-azure-js": "^1.0.181",
+    "ms-rest-js": "^1.0.460",
     "tslib": "^1.9.3"
   },
   "keywords": [
diff --git a/packages/@azure/arm-eventhub/rollup.config.js b/packages/@azure/arm-eventhub/rollup.config.js
index d807ecd55a44..9a7d744d0aac 100644
--- a/packages/@azure/arm-eventhub/rollup.config.js
+++ b/packages/@azure/arm-eventhub/rollup.config.js
@@ -4,15 +4,15 @@ import nodeResolve from "rollup-plugin-node-resolve";
  */
 const config = {
   input: './esm/eventHubManagementClient.js',
-  external: ["@azure/ms-rest-js", "@azure/ms-rest-azure-js"],
+  external: ["ms-rest-js", "ms-rest-azure-js"],
   output: {
     file: "./dist/arm-eventhub.js",
     format: "umd",
     name: "Azure.ArmEventhub",
     sourcemap: true,
     globals: {
-      "@azure/ms-rest-js": "msRest",
-      "@azure/ms-rest-azure-js": "msRestAzure"
+      "ms-rest-js": "msRest",
+      "ms-rest-azure-js": "msRestAzure"
     },
     banner: `/*
  * Copyright (c) Microsoft Corporation. All rights reserved.
diff --git a/packages/@azure/arm-eventhub/tsconfig.json b/packages/@azure/arm-eventhub/tsconfig.json
index 51ea90961ce5..f32d1664f320 100644
--- a/packages/@azure/arm-eventhub/tsconfig.json
+++ b/packages/@azure/arm-eventhub/tsconfig.json
@@ -14,6 +14,6 @@
     "outDir": "./esm",
     "importHelpers": true
   },
-  "include": ["./lib/**/*.ts"],
+  "include": ["./lib/**/*"],
   "exclude": ["node_modules"]
 }