diff --git a/packages/@azure/arm-keyvault/LICENSE.txt b/packages/@azure/arm-keyvault/LICENSE.txt
index a70e8cf66038..5431ba98b936 100644
--- a/packages/@azure/arm-keyvault/LICENSE.txt
+++ b/packages/@azure/arm-keyvault/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-keyvault/lib/keyVaultManagementClient.ts b/packages/@azure/arm-keyvault/lib/keyVaultManagementClient.ts
index f0901b1beb26..6536973f399d 100644
--- a/packages/@azure/arm-keyvault/lib/keyVaultManagementClient.ts
+++ b/packages/@azure/arm-keyvault/lib/keyVaultManagementClient.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-keyvault/lib/keyVaultManagementClientContext.ts b/packages/@azure/arm-keyvault/lib/keyVaultManagementClientContext.ts
index da7d701b6734..553ec58e4d4b 100644
--- a/packages/@azure/arm-keyvault/lib/keyVaultManagementClientContext.ts
+++ b/packages/@azure/arm-keyvault/lib/keyVaultManagementClientContext.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-keyvault";
 const packageVersion = "0.1.0";
diff --git a/packages/@azure/arm-keyvault/lib/models/index.ts b/packages/@azure/arm-keyvault/lib/models/index.ts
index d0e8f333d28c..11a08aa6aa79 100644
--- a/packages/@azure/arm-keyvault/lib/models/index.ts
+++ b/packages/@azure/arm-keyvault/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 };
 
@@ -89,7 +89,7 @@ export interface AccessPolicyEntry {
 /**
  * @interface
  * An interface representing IPRule.
- * A rule governing the accesibility of a vault from a specific ip address or
+ * A rule governing the accessibility of a vault from a specific ip address or
  * ip range.
  *
  */
@@ -105,7 +105,7 @@ export interface IPRule {
 /**
  * @interface
  * An interface representing VirtualNetworkRule.
- * A rule governing the accesibility of a vault from a specific virtual
+ * A rule governing the accessibility of a vault from a specific virtual
  * network.
  *
  */
@@ -417,7 +417,7 @@ export interface VaultAccessPolicyParameters extends BaseResource {
    */
   readonly type?: string;
   /**
-   * @member {string} [location] The resource type of the the access policy.
+   * @member {string} [location] The resource type of the access policy.
    * **NOTE: This property will not be serialized. It can only be populated by
    * the server.**
    */
@@ -516,7 +516,7 @@ export interface DeletedVault {
 /**
  * @interface
  * An interface representing VaultCheckNameAvailabilityParameters.
- * The parameters used to check the availabity of the vault name.
+ * The parameters used to check the availability of the vault name.
  *
  */
 export interface VaultCheckNameAvailabilityParameters {
@@ -579,7 +579,7 @@ export interface OperationDisplay {
    */
   operation?: string;
   /**
-   * @member {string} [description] Decription of operation.
+   * @member {string} [description] Description of operation.
    */
   description?: string;
 }
diff --git a/packages/@azure/arm-keyvault/lib/models/mappers.ts b/packages/@azure/arm-keyvault/lib/models/mappers.ts
index 710cdcb20447..784253b02f10 100644
--- a/packages/@azure/arm-keyvault/lib/models/mappers.ts
+++ b/packages/@azure/arm-keyvault/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-keyvault/lib/models/parameters.ts b/packages/@azure/arm-keyvault/lib/models/parameters.ts
index df134cdbf885..6e34add7aa9c 100644
--- a/packages/@azure/arm-keyvault/lib/models/parameters.ts
+++ b/packages/@azure/arm-keyvault/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-keyvault/lib/operations/operations.ts b/packages/@azure/arm-keyvault/lib/operations/operations.ts
index 56cd43eb33ca..9c979969e4fb 100644
--- a/packages/@azure/arm-keyvault/lib/operations/operations.ts
+++ b/packages/@azure/arm-keyvault/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-keyvault/lib/operations/vaults.ts b/packages/@azure/arm-keyvault/lib/operations/vaults.ts
index c6ee4218f7c4..123839ec8986 100644
--- a/packages/@azure/arm-keyvault/lib/operations/vaults.ts
+++ b/packages/@azure/arm-keyvault/lib/operations/vaults.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/vaultsMappers";
 import * as Parameters from "../models/parameters";
diff --git a/packages/@azure/arm-keyvault/package.json b/packages/@azure/arm-keyvault/package.json
index 501f186e99d3..542b3bd01892 100644
--- a/packages/@azure/arm-keyvault/package.json
+++ b/packages/@azure/arm-keyvault/package.json
@@ -4,8 +4,8 @@
   "description": "KeyVaultManagementClient 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-keyvault/rollup.config.js b/packages/@azure/arm-keyvault/rollup.config.js
index d882e87bb7db..bdcae9ccfc01 100644
--- a/packages/@azure/arm-keyvault/rollup.config.js
+++ b/packages/@azure/arm-keyvault/rollup.config.js
@@ -4,15 +4,15 @@ import nodeResolve from "rollup-plugin-node-resolve";
  */
 const config = {
   input: './esm/keyVaultManagementClient.js',
-  external: ["@azure/ms-rest-js", "@azure/ms-rest-azure-js"],
+  external: ["ms-rest-js", "ms-rest-azure-js"],
   output: {
     file: "./dist/arm-keyvault.js",
     format: "umd",
     name: "Azure.ArmKeyvault",
     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-keyvault/tsconfig.json b/packages/@azure/arm-keyvault/tsconfig.json
index 51ea90961ce5..f32d1664f320 100644
--- a/packages/@azure/arm-keyvault/tsconfig.json
+++ b/packages/@azure/arm-keyvault/tsconfig.json
@@ -14,6 +14,6 @@
     "outDir": "./esm",
     "importHelpers": true
   },
-  "include": ["./lib/**/*.ts"],
+  "include": ["./lib/**/*"],
   "exclude": ["node_modules"]
 }