diff --git a/packages/@azure/arm-postgresql/LICENSE.txt b/packages/@azure/arm-postgresql/LICENSE.txt
index a70e8cf66038..5431ba98b936 100644
--- a/packages/@azure/arm-postgresql/LICENSE.txt
+++ b/packages/@azure/arm-postgresql/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-postgresql/README.md b/packages/@azure/arm-postgresql/README.md
index 9ffdcbd0624d..07a91c5af016 100644
--- a/packages/@azure/arm-postgresql/README.md
+++ b/packages/@azure/arm-postgresql/README.md
@@ -1,100 +1,81 @@
-## Azure PostgreSQLManagementClient SDK for JavaScript
-
-This package contains an isomorphic SDK for PostgreSQLManagementClient.
-
-### Currently supported environments
-
-- Node.js version 6.x.x or higher
-- Browser JavaScript
-
-### How to Install
-
-```
-npm install @azure/arm-postgresql
-```
-
-### How to use
-
-#### nodejs - Authentication, client creation and get servers 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 { PostgreSQLManagementClient, PostgreSQLManagementModels, PostgreSQLManagementMappers } from "@azure/arm-postgresql";
-const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];
-
-msRestNodeAuth.interactiveLogin().then((creds) => {
-  const client = new PostgreSQLManagementClient(creds, subscriptionId);
-  const resourceGroupName = "testresourceGroupName";
-  const serverName = "testserverName";
-  client.servers.get(resourceGroupName, serverName).then((result) => {
-    console.log("The result is:");
-    console.log(result);
-  });
-}).catch((err) => {
-  console.error(err);
-});
-```
-
-#### browser - Authentication, client creation and get servers 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-postgresql 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-postgresql/dist/arm-postgresql.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.ArmPostgresql.PostgreSQLManagementClient(res.creds, subscriptionId);
-        const resourceGroupName = "testresourceGroupName";
-        const serverName = "testserverName";
-        client.servers.get(resourceGroupName, serverName).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 PostgreSQLManagementClient SDK for JavaScript
+This package contains an isomorphic SDK for PostgreSQLManagementClient.
+
+## Currently supported environments
+- Node.js version 6.x.x or higher
+- Browser JavaScript
+
+## How to Install
+```
+npm install @azure/arm-postgresql
+```
+
+
+## How to use
+
+### nodejs - Authentication, client creation and get servers 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 { PostgreSQLManagementClient, PostgreSQLManagementModels, PostgreSQLManagementMappers } from "@azure/arm-postgresql";
+const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];
+
+msRestNodeAuth.interactiveLogin().then((creds) => {
+  const client = new PostgreSQLManagementClient(creds, subscriptionId);
+  const resourceGroupName = "testresourceGroupName";
+  const serverName = "testserverName";
+  client.servers.get(resourceGroupName, serverName).then((result) => {
+    console.log("The result is:");
+    console.log(result);
+  });
+}).catch((err) => {
+  console.error(err);
+});
+```
+
+### browser - Authentication, client creation and get servers 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-postgresql 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-postgresql/dist/arm-postgresql.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.ArmPostgresql.PostgreSQLManagementClient(res.creds, subscriptionId);
+        const resourceGroupName = "testresourceGroupName";
+        const serverName = "testserverName";
+        client.servers.get(resourceGroupName, serverName).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-postgresql/lib/models/index.ts b/packages/@azure/arm-postgresql/lib/models/index.ts
index dd3a47bcacb0..55cbd687ab2e 100644
--- a/packages/@azure/arm-postgresql/lib/models/index.ts
+++ b/packages/@azure/arm-postgresql/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 };
 
@@ -334,7 +334,7 @@ export interface ServerForCreate {
 /**
  * @interface
  * An interface representing ServerUpdateParameters.
- * Parameters allowd to update for a server.
+ * Parameters allowed to update for a server.
  *
  */
 export interface ServerUpdateParameters {
diff --git a/packages/@azure/arm-postgresql/lib/models/mappers.ts b/packages/@azure/arm-postgresql/lib/models/mappers.ts
index 7a77c8b1d358..d05b1bcd9fe7 100644
--- a/packages/@azure/arm-postgresql/lib/models/mappers.ts
+++ b/packages/@azure/arm-postgresql/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;
@@ -347,6 +347,11 @@ export const ServerForCreate: msRest.CompositeMapper = {
         serializedName: "properties",
         type: {
           name: "Composite",
+          polymorphicDiscriminator: {
+            serializedName: "createMode",
+            clientName: "createMode"
+          },
+          uberParent: "ServerPropertiesForCreate",
           className: "ServerPropertiesForCreate"
         }
       },
diff --git a/packages/@azure/arm-postgresql/lib/models/parameters.ts b/packages/@azure/arm-postgresql/lib/models/parameters.ts
index 7dbc0227f6c5..51e8cfb5905e 100644
--- a/packages/@azure/arm-postgresql/lib/models/parameters.ts
+++ b/packages/@azure/arm-postgresql/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-postgresql/lib/operations/checkNameAvailability.ts b/packages/@azure/arm-postgresql/lib/operations/checkNameAvailability.ts
index 8ddb6f96a6d5..71f83955b0a7 100644
--- a/packages/@azure/arm-postgresql/lib/operations/checkNameAvailability.ts
+++ b/packages/@azure/arm-postgresql/lib/operations/checkNameAvailability.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/checkNameAvailabilityMappers";
 import * as Parameters from "../models/parameters";
diff --git a/packages/@azure/arm-postgresql/lib/operations/configurations.ts b/packages/@azure/arm-postgresql/lib/operations/configurations.ts
index d1688cb39378..5f9d5bb21673 100644
--- a/packages/@azure/arm-postgresql/lib/operations/configurations.ts
+++ b/packages/@azure/arm-postgresql/lib/operations/configurations.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/configurationsMappers";
 import * as Parameters from "../models/parameters";
diff --git a/packages/@azure/arm-postgresql/lib/operations/databases.ts b/packages/@azure/arm-postgresql/lib/operations/databases.ts
index 9b26db382ac7..8d4bb0a17237 100644
--- a/packages/@azure/arm-postgresql/lib/operations/databases.ts
+++ b/packages/@azure/arm-postgresql/lib/operations/databases.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/databasesMappers";
 import * as Parameters from "../models/parameters";
diff --git a/packages/@azure/arm-postgresql/lib/operations/firewallRules.ts b/packages/@azure/arm-postgresql/lib/operations/firewallRules.ts
index 196dffcb5a14..cf5d97f82642 100644
--- a/packages/@azure/arm-postgresql/lib/operations/firewallRules.ts
+++ b/packages/@azure/arm-postgresql/lib/operations/firewallRules.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/firewallRulesMappers";
 import * as Parameters from "../models/parameters";
diff --git a/packages/@azure/arm-postgresql/lib/operations/locationBasedPerformanceTier.ts b/packages/@azure/arm-postgresql/lib/operations/locationBasedPerformanceTier.ts
index ffad11ea8a12..b05305727449 100644
--- a/packages/@azure/arm-postgresql/lib/operations/locationBasedPerformanceTier.ts
+++ b/packages/@azure/arm-postgresql/lib/operations/locationBasedPerformanceTier.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/locationBasedPerformanceTierMappers";
 import * as Parameters from "../models/parameters";
diff --git a/packages/@azure/arm-postgresql/lib/operations/logFiles.ts b/packages/@azure/arm-postgresql/lib/operations/logFiles.ts
index 41825964612d..46246d9c1412 100644
--- a/packages/@azure/arm-postgresql/lib/operations/logFiles.ts
+++ b/packages/@azure/arm-postgresql/lib/operations/logFiles.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/logFilesMappers";
 import * as Parameters from "../models/parameters";
diff --git a/packages/@azure/arm-postgresql/lib/operations/operations.ts b/packages/@azure/arm-postgresql/lib/operations/operations.ts
index 01da20b0f66b..2ff8f94ad8fe 100644
--- a/packages/@azure/arm-postgresql/lib/operations/operations.ts
+++ b/packages/@azure/arm-postgresql/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-postgresql/lib/operations/serverSecurityAlertPolicies.ts b/packages/@azure/arm-postgresql/lib/operations/serverSecurityAlertPolicies.ts
index 392b70c4f449..57f28fa5ac47 100644
--- a/packages/@azure/arm-postgresql/lib/operations/serverSecurityAlertPolicies.ts
+++ b/packages/@azure/arm-postgresql/lib/operations/serverSecurityAlertPolicies.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/serverSecurityAlertPoliciesMappers";
 import * as Parameters from "../models/parameters";
diff --git a/packages/@azure/arm-postgresql/lib/operations/servers.ts b/packages/@azure/arm-postgresql/lib/operations/servers.ts
index 6d1b01cbab95..0d14143502cd 100644
--- a/packages/@azure/arm-postgresql/lib/operations/servers.ts
+++ b/packages/@azure/arm-postgresql/lib/operations/servers.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/serversMappers";
 import * as Parameters from "../models/parameters";
diff --git a/packages/@azure/arm-postgresql/lib/operations/virtualNetworkRules.ts b/packages/@azure/arm-postgresql/lib/operations/virtualNetworkRules.ts
index 882b3641cbc0..9e6160e5d1f6 100644
--- a/packages/@azure/arm-postgresql/lib/operations/virtualNetworkRules.ts
+++ b/packages/@azure/arm-postgresql/lib/operations/virtualNetworkRules.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/virtualNetworkRulesMappers";
 import * as Parameters from "../models/parameters";
diff --git a/packages/@azure/arm-postgresql/lib/postgreSQLManagementClient.ts b/packages/@azure/arm-postgresql/lib/postgreSQLManagementClient.ts
index 958382b59f6f..c6099b1c7648 100644
--- a/packages/@azure/arm-postgresql/lib/postgreSQLManagementClient.ts
+++ b/packages/@azure/arm-postgresql/lib/postgreSQLManagementClient.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-postgresql/lib/postgreSQLManagementClientContext.ts b/packages/@azure/arm-postgresql/lib/postgreSQLManagementClientContext.ts
index c1f9727325a1..afed0453a3c2 100644
--- a/packages/@azure/arm-postgresql/lib/postgreSQLManagementClientContext.ts
+++ b/packages/@azure/arm-postgresql/lib/postgreSQLManagementClientContext.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-postgresql";
 const packageVersion = "0.1.0";
diff --git a/packages/@azure/arm-postgresql/package.json b/packages/@azure/arm-postgresql/package.json
index 3b4962ebe7d1..a33bbe42acd8 100644
--- a/packages/@azure/arm-postgresql/package.json
+++ b/packages/@azure/arm-postgresql/package.json
@@ -4,8 +4,8 @@
   "description": "PostgreSQLManagementClient 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-postgresql/rollup.config.js b/packages/@azure/arm-postgresql/rollup.config.js
index 937fe4e3e6f2..6c570d4534c1 100644
--- a/packages/@azure/arm-postgresql/rollup.config.js
+++ b/packages/@azure/arm-postgresql/rollup.config.js
@@ -4,15 +4,15 @@ import nodeResolve from "rollup-plugin-node-resolve";
  */
 const config = {
   input: './esm/postgreSQLManagementClient.js',
-  external: ["@azure/ms-rest-js", "@azure/ms-rest-azure-js"],
+  external: ["ms-rest-js", "ms-rest-azure-js"],
   output: {
     file: "./dist/arm-postgresql.js",
     format: "umd",
     name: "Azure.ArmPostgresql",
     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-postgresql/tsconfig.json b/packages/@azure/arm-postgresql/tsconfig.json
index 51ea90961ce5..f32d1664f320 100644
--- a/packages/@azure/arm-postgresql/tsconfig.json
+++ b/packages/@azure/arm-postgresql/tsconfig.json
@@ -14,6 +14,6 @@
     "outDir": "./esm",
     "importHelpers": true
   },
-  "include": ["./lib/**/*.ts"],
+  "include": ["./lib/**/*"],
   "exclude": ["node_modules"]
 }