From 90c7b8ec5aa494af7fb140eb7da5c84d451614ce Mon Sep 17 00:00:00 2001
From: SDK Automation <sdkautomation@microsoft.com>
Date: Tue, 25 Feb 2020 09:52:50 +0000
Subject: [PATCH] Generated from eabb7abfd9dc8eb4776e023aeb206415235b2f12

remove  and update description
---
 sdk/postgresql/mgmt-v2017_12_01/pom.xml       |   8 +-
 .../v2017_12_01/AzureEntityResource.java      |  34 +++
 .../postgresql/v2017_12_01/Configuration.java |   6 +-
 .../v2017_12_01/Configurations.java           |   4 +-
 .../postgresql/v2017_12_01/Database.java      |   6 +-
 .../postgresql/v2017_12_01/Databases.java     |   6 +-
 .../v2017_12_01/ErrorAdditionalInfo.java      |  47 ++++
 .../postgresql/v2017_12_01/ErrorResponse.java |  93 ++++++++
 .../postgresql/v2017_12_01/FirewallRule.java  |   6 +-
 .../postgresql/v2017_12_01/FirewallRules.java |   6 +-
 .../postgresql/v2017_12_01/LogFile.java       |   4 +-
 .../postgresql/v2017_12_01/LogFiles.java      |   2 +-
 .../v2017_12_01/NameAvailability.java         |   4 +-
 .../v2017_12_01/OperationListResult.java      |   4 +-
 .../PerformanceTierProperties.java            |   4 +-
 .../postgresql/v2017_12_01/Replicas.java      |   2 +-
 .../postgresql/v2017_12_01/Server.java        |   4 +-
 .../ServerPropertiesForCreate.java            |   2 +-
 .../ServerPropertiesForDefaultCreate.java     |   2 +-
 .../ServerPropertiesForGeoRestore.java        |   2 +-
 .../ServerPropertiesForReplica.java           |   2 +-
 .../ServerPropertiesForRestore.java           |   2 +-
 .../ServerSecurityAlertPolicies.java          |   2 +-
 .../ServerSecurityAlertPolicy.java            |   6 +-
 .../postgresql/v2017_12_01/ServerServer.java  |   4 +-
 .../postgresql/v2017_12_01/Servers.java       |   2 +-
 .../v2017_12_01/VirtualNetworkRule.java       |   6 +-
 .../v2017_12_01/VirtualNetworkRules.java      |   6 +-
 .../CheckNameAvailabilitysImpl.java           |   6 +-
 .../implementation/ConfigurationImpl.java     |   8 +-
 .../implementation/ConfigurationsImpl.java    |  16 +-
 .../implementation/ConfigurationsInner.java   |  32 +--
 .../DBforPostgreSQLManager.java               | 219 ++++++++++++++++++
 .../implementation/DatabaseImpl.java          |   8 +-
 .../implementation/DatabasesImpl.java         |  16 +-
 .../implementation/DatabasesInner.java        |  48 ++--
 .../implementation/FirewallRuleImpl.java      |   8 +-
 .../implementation/FirewallRulesImpl.java     |  16 +-
 .../implementation/FirewallRulesInner.java    |  48 ++--
 .../LocationBasedPerformanceTiersImpl.java    |   6 +-
 .../implementation/LogFileImpl.java           |   6 +-
 .../implementation/LogFilesImpl.java          |   6 +-
 .../implementation/LogFilesInner.java         |   8 +-
 .../implementation/NameAvailabilityImpl.java  |   6 +-
 .../OperationListResultImpl.java              |   6 +-
 .../implementation/OperationsImpl.java        |   6 +-
 .../PerformanceTierPropertiesImpl.java        |   6 +-
 .../PostgreSQLManagementClientImpl.java       |  30 +--
 .../implementation/ReplicasImpl.java          |   6 +-
 .../implementation/ReplicasInner.java         |   8 +-
 .../implementation/ServerImpl.java            |   4 +-
 .../ServerSecurityAlertPoliciesImpl.java      |  16 +-
 .../ServerSecurityAlertPoliciesInner.java     |  24 +-
 .../ServerSecurityAlertPolicyImpl.java        |   8 +-
 .../implementation/ServerServerImpl.java      |   6 +-
 .../implementation/ServersImpl.java           |   4 +-
 .../implementation/ServersInner.java          |  80 +++----
 .../VirtualNetworkRuleImpl.java               |   8 +-
 .../VirtualNetworkRulesImpl.java              |  16 +-
 .../VirtualNetworkRulesInner.java             |  50 ++--
 60 files changed, 713 insertions(+), 298 deletions(-)
 create mode 100644 sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/AzureEntityResource.java
 create mode 100644 sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ErrorAdditionalInfo.java
 create mode 100644 sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ErrorResponse.java
 create mode 100644 sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/DBforPostgreSQLManager.java

diff --git a/sdk/postgresql/mgmt-v2017_12_01/pom.xml b/sdk/postgresql/mgmt-v2017_12_01/pom.xml
index 86c0ab7eed48..416f71d8eb73 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/pom.xml
+++ b/sdk/postgresql/mgmt-v2017_12_01/pom.xml
@@ -11,11 +11,11 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.2.0</version>
+        <version>1.1.0</version>
         <relativePath>../../../pom.management.xml</relativePath>
     </parent>
-    <artifactId>azure-mgmt-postgresql</artifactId>
-    <version>1.0.0-beta-5</version>
+    <artifactId>azure-mgmt-dbforpostgresql</artifactId>
+    <version>1.0.0-beta</version>
     <packaging>jar</packaging>
     <name>Microsoft Azure SDK for DBforPostgreSQL Management</name>
     <description>This package contains Microsoft DBforPostgreSQL Management SDK.</description>
@@ -71,6 +71,8 @@
             <artifactId>azure-arm-client-runtime</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
+            <!--Below version for test jar needs to be removed, this will be done as part of v1-runtime 1.6.7-->
+            <version>1.6.5</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/AzureEntityResource.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/AzureEntityResource.java
new file mode 100644
index 000000000000..a42374ae05ce
--- /dev/null
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/AzureEntityResource.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.postgresql.v2017_12_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.microsoft.azure.ProxyResource;
+
+/**
+ * The resource model definition for a Azure Resource Manager resource with an
+ * etag.
+ */
+public class AzureEntityResource extends ProxyResource {
+    /**
+     * Resource Etag.
+     */
+    @JsonProperty(value = "etag", access = JsonProperty.Access.WRITE_ONLY)
+    private String etag;
+
+    /**
+     * Get resource Etag.
+     *
+     * @return the etag value
+     */
+    public String etag() {
+        return this.etag;
+    }
+
+}
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/Configuration.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/Configuration.java
index 68d01b3453a6..74557102f9f8 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/Configuration.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/Configuration.java
@@ -16,12 +16,12 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.postgresql.v2017_12_01.implementation.PostgreSQLManager;
+import com.microsoft.azure.management.postgresql.v2017_12_01.implementation.DBforPostgreSQLManager;
 
 /**
  * Type representing Configuration.
  */
-public interface Configuration extends HasInner<ConfigurationInner>, Indexable, Refreshable<Configuration>, Updatable<Configuration.Update>, HasManager<PostgreSQLManager> {
+public interface Configuration extends HasInner<ConfigurationInner>, Indexable, Refreshable<Configuration>, Updatable<Configuration.Update>, HasManager<DBforPostgreSQLManager> {
     /**
      * @return the allowedValues value.
      */
@@ -89,7 +89,7 @@ interface Blank extends WithServer {
         interface WithServer {
            /**
             * Specifies resourceGroupName, serverName.
-            * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal
+            * @param resourceGroupName The name of the resource group. The name is case insensitive
             * @param serverName The name of the server
             * @return the next definition stage
             */
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/Configurations.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/Configurations.java
index ec195eb0adde..04b17e667949 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/Configurations.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/Configurations.java
@@ -20,7 +20,7 @@ public interface Configurations extends SupportsCreating<Configuration.Definitio
     /**
      * Gets information about a configuration of server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param configurationName The name of the server configuration.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -31,7 +31,7 @@ public interface Configurations extends SupportsCreating<Configuration.Definitio
     /**
      * List all the configurations in a given server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/Database.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/Database.java
index b809c7b3b0d6..879d200ca458 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/Database.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/Database.java
@@ -16,12 +16,12 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.postgresql.v2017_12_01.implementation.PostgreSQLManager;
+import com.microsoft.azure.management.postgresql.v2017_12_01.implementation.DBforPostgreSQLManager;
 
 /**
  * Type representing Database.
  */
-public interface Database extends HasInner<DatabaseInner>, Indexable, Refreshable<Database>, Updatable<Database.Update>, HasManager<PostgreSQLManager> {
+public interface Database extends HasInner<DatabaseInner>, Indexable, Refreshable<Database>, Updatable<Database.Update>, HasManager<DBforPostgreSQLManager> {
     /**
      * @return the charset value.
      */
@@ -69,7 +69,7 @@ interface Blank extends WithServer {
         interface WithServer {
            /**
             * Specifies resourceGroupName, serverName.
-            * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal
+            * @param resourceGroupName The name of the resource group. The name is case insensitive
             * @param serverName The name of the server
             * @return the next definition stage
             */
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/Databases.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/Databases.java
index bb7813fa4cb9..d647770d8c4c 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/Databases.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/Databases.java
@@ -21,7 +21,7 @@ public interface Databases extends SupportsCreating<Database.DefinitionStages.Bl
     /**
      * Gets information about a database.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param databaseName The name of the database.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -32,7 +32,7 @@ public interface Databases extends SupportsCreating<Database.DefinitionStages.Bl
     /**
      * List all the databases in a given server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
@@ -42,7 +42,7 @@ public interface Databases extends SupportsCreating<Database.DefinitionStages.Bl
     /**
      * Deletes a database.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param databaseName The name of the database.
      * @throws IllegalArgumentException thrown if parameters fail the validation
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ErrorAdditionalInfo.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ErrorAdditionalInfo.java
new file mode 100644
index 000000000000..8a7bda1e09f3
--- /dev/null
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ErrorAdditionalInfo.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.postgresql.v2017_12_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The resource management error additional info.
+ */
+public class ErrorAdditionalInfo {
+    /**
+     * The additional info type.
+     */
+    @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
+    private String type;
+
+    /**
+     * The additional info.
+     */
+    @JsonProperty(value = "info", access = JsonProperty.Access.WRITE_ONLY)
+    private Object info;
+
+    /**
+     * Get the additional info type.
+     *
+     * @return the type value
+     */
+    public String type() {
+        return this.type;
+    }
+
+    /**
+     * Get the additional info.
+     *
+     * @return the info value
+     */
+    public Object info() {
+        return this.info;
+    }
+
+}
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ErrorResponse.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ErrorResponse.java
new file mode 100644
index 000000000000..983e0a05fe3d
--- /dev/null
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ErrorResponse.java
@@ -0,0 +1,93 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.postgresql.v2017_12_01;
+
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The resource management error response.
+ */
+public class ErrorResponse {
+    /**
+     * The error code.
+     */
+    @JsonProperty(value = "code", access = JsonProperty.Access.WRITE_ONLY)
+    private String code;
+
+    /**
+     * The error message.
+     */
+    @JsonProperty(value = "message", access = JsonProperty.Access.WRITE_ONLY)
+    private String message;
+
+    /**
+     * The error target.
+     */
+    @JsonProperty(value = "target", access = JsonProperty.Access.WRITE_ONLY)
+    private String target;
+
+    /**
+     * The error details.
+     */
+    @JsonProperty(value = "details", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ErrorResponse> details;
+
+    /**
+     * The error additional info.
+     */
+    @JsonProperty(value = "additionalInfo", access = JsonProperty.Access.WRITE_ONLY)
+    private List<ErrorAdditionalInfo> additionalInfo;
+
+    /**
+     * Get the error code.
+     *
+     * @return the code value
+     */
+    public String code() {
+        return this.code;
+    }
+
+    /**
+     * Get the error message.
+     *
+     * @return the message value
+     */
+    public String message() {
+        return this.message;
+    }
+
+    /**
+     * Get the error target.
+     *
+     * @return the target value
+     */
+    public String target() {
+        return this.target;
+    }
+
+    /**
+     * Get the error details.
+     *
+     * @return the details value
+     */
+    public List<ErrorResponse> details() {
+        return this.details;
+    }
+
+    /**
+     * Get the error additional info.
+     *
+     * @return the additionalInfo value
+     */
+    public List<ErrorAdditionalInfo> additionalInfo() {
+        return this.additionalInfo;
+    }
+
+}
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/FirewallRule.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/FirewallRule.java
index d2588e34947f..ac4fca2ba1ed 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/FirewallRule.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/FirewallRule.java
@@ -16,12 +16,12 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.postgresql.v2017_12_01.implementation.PostgreSQLManager;
+import com.microsoft.azure.management.postgresql.v2017_12_01.implementation.DBforPostgreSQLManager;
 
 /**
  * Type representing FirewallRule.
  */
-public interface FirewallRule extends HasInner<FirewallRuleInner>, Indexable, Refreshable<FirewallRule>, Updatable<FirewallRule.Update>, HasManager<PostgreSQLManager> {
+public interface FirewallRule extends HasInner<FirewallRuleInner>, Indexable, Refreshable<FirewallRule>, Updatable<FirewallRule.Update>, HasManager<DBforPostgreSQLManager> {
     /**
      * @return the endIpAddress value.
      */
@@ -69,7 +69,7 @@ interface Blank extends WithServer {
         interface WithServer {
            /**
             * Specifies resourceGroupName, serverName.
-            * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal
+            * @param resourceGroupName The name of the resource group. The name is case insensitive
             * @param serverName The name of the server
             * @return the next definition stage
             */
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/FirewallRules.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/FirewallRules.java
index d6eebf8ff0b5..389a673765de 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/FirewallRules.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/FirewallRules.java
@@ -21,7 +21,7 @@ public interface FirewallRules extends SupportsCreating<FirewallRule.DefinitionS
     /**
      * Gets information about a server firewall rule.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param firewallRuleName The name of the server firewall rule.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -32,7 +32,7 @@ public interface FirewallRules extends SupportsCreating<FirewallRule.DefinitionS
     /**
      * List all the firewall rules in a given server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
@@ -42,7 +42,7 @@ public interface FirewallRules extends SupportsCreating<FirewallRule.DefinitionS
     /**
      * Deletes a server firewall rule.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param firewallRuleName The name of the server firewall rule.
      * @throws IllegalArgumentException thrown if parameters fail the validation
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/LogFile.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/LogFile.java
index a4c07d1bc807..f84c9d2b40ba 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/LogFile.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/LogFile.java
@@ -11,13 +11,13 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.postgresql.v2017_12_01.implementation.LogFileInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.postgresql.v2017_12_01.implementation.PostgreSQLManager;
+import com.microsoft.azure.management.postgresql.v2017_12_01.implementation.DBforPostgreSQLManager;
 import org.joda.time.DateTime;
 
 /**
  * Type representing LogFile.
  */
-public interface LogFile extends HasInner<LogFileInner>, HasManager<PostgreSQLManager> {
+public interface LogFile extends HasInner<LogFileInner>, HasManager<DBforPostgreSQLManager> {
     /**
      * @return the createdTime value.
      */
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/LogFiles.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/LogFiles.java
index 8015306ab192..3395e34a70b3 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/LogFiles.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/LogFiles.java
@@ -19,7 +19,7 @@ public interface LogFiles extends HasInner<LogFilesInner> {
     /**
      * List all the log files in a given server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/NameAvailability.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/NameAvailability.java
index 797ec2d3ec18..e01bc613cc85 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/NameAvailability.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/NameAvailability.java
@@ -10,13 +10,13 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.postgresql.v2017_12_01.implementation.PostgreSQLManager;
+import com.microsoft.azure.management.postgresql.v2017_12_01.implementation.DBforPostgreSQLManager;
 import com.microsoft.azure.management.postgresql.v2017_12_01.implementation.NameAvailabilityInner;
 
 /**
  * Type representing NameAvailability.
  */
-public interface NameAvailability extends HasInner<NameAvailabilityInner>, HasManager<PostgreSQLManager> {
+public interface NameAvailability extends HasInner<NameAvailabilityInner>, HasManager<DBforPostgreSQLManager> {
     /**
      * @return the message value.
      */
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/OperationListResult.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/OperationListResult.java
index e43de78f4a82..2c5c4a198fcc 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/OperationListResult.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/OperationListResult.java
@@ -10,7 +10,7 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.postgresql.v2017_12_01.implementation.PostgreSQLManager;
+import com.microsoft.azure.management.postgresql.v2017_12_01.implementation.DBforPostgreSQLManager;
 import com.microsoft.azure.management.postgresql.v2017_12_01.implementation.OperationListResultInner;
 import com.microsoft.azure.management.postgresql.v2017_12_01.implementation.OperationInner;
 import java.util.List;
@@ -18,7 +18,7 @@
 /**
  * Type representing OperationListResult.
  */
-public interface OperationListResult extends HasInner<OperationListResultInner>, HasManager<PostgreSQLManager> {
+public interface OperationListResult extends HasInner<OperationListResultInner>, HasManager<DBforPostgreSQLManager> {
     /**
      * @return the value value.
      */
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/PerformanceTierProperties.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/PerformanceTierProperties.java
index 0ca553cacd74..7401e1757615 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/PerformanceTierProperties.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/PerformanceTierProperties.java
@@ -11,13 +11,13 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.postgresql.v2017_12_01.implementation.PerformanceTierPropertiesInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.postgresql.v2017_12_01.implementation.PostgreSQLManager;
+import com.microsoft.azure.management.postgresql.v2017_12_01.implementation.DBforPostgreSQLManager;
 import java.util.List;
 
 /**
  * Type representing PerformanceTierProperties.
  */
-public interface PerformanceTierProperties extends HasInner<PerformanceTierPropertiesInner>, HasManager<PostgreSQLManager> {
+public interface PerformanceTierProperties extends HasInner<PerformanceTierPropertiesInner>, HasManager<DBforPostgreSQLManager> {
     /**
      * @return the id value.
      */
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/Replicas.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/Replicas.java
index 5bae123d8f12..24459ef4e42e 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/Replicas.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/Replicas.java
@@ -19,7 +19,7 @@ public interface Replicas extends HasInner<ReplicasInner> {
     /**
      * List all the replicas for a given server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/Server.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/Server.java
index 66c552810533..655933830d94 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/Server.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/Server.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.postgresql.v2017_12_01.implementation.PostgreSQLManager;
+import com.microsoft.azure.management.postgresql.v2017_12_01.implementation.DBforPostgreSQLManager;
 import org.joda.time.DateTime;
 import com.microsoft.azure.management.postgresql.v2017_12_01.implementation.ServerInner;
 
 /**
  * Type representing Server.
  */
-public interface Server extends HasInner<ServerInner>, Resource, GroupableResourceCore<PostgreSQLManager, ServerInner>, HasResourceGroup, Refreshable<Server>, Updatable<Server.Update>, HasManager<PostgreSQLManager> {
+public interface Server extends HasInner<ServerInner>, Resource, GroupableResourceCore<DBforPostgreSQLManager, ServerInner>, HasResourceGroup, Refreshable<Server>, Updatable<Server.Update>, HasManager<DBforPostgreSQLManager> {
     /**
      * @return the administratorLogin value.
      */
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ServerPropertiesForCreate.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ServerPropertiesForCreate.java
index 163e9594bd55..541353aec766 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ServerPropertiesForCreate.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ServerPropertiesForCreate.java
@@ -16,7 +16,7 @@
 /**
  * The properties used to create a new server.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "createMode")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "createMode", defaultImpl = ServerPropertiesForCreate.class)
 @JsonTypeName("ServerPropertiesForCreate")
 @JsonSubTypes({
     @JsonSubTypes.Type(name = "Default", value = ServerPropertiesForDefaultCreate.class),
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ServerPropertiesForDefaultCreate.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ServerPropertiesForDefaultCreate.java
index 5b2697dea953..29dcf2549a85 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ServerPropertiesForDefaultCreate.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ServerPropertiesForDefaultCreate.java
@@ -15,7 +15,7 @@
 /**
  * The properties used to create a new server.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "createMode")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "createMode", defaultImpl = ServerPropertiesForDefaultCreate.class)
 @JsonTypeName("Default")
 public class ServerPropertiesForDefaultCreate extends ServerPropertiesForCreate {
     /**
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ServerPropertiesForGeoRestore.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ServerPropertiesForGeoRestore.java
index 20a3aa3f2c6d..f9068de1ca1c 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ServerPropertiesForGeoRestore.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ServerPropertiesForGeoRestore.java
@@ -16,7 +16,7 @@
  * The properties used to create a new server by restoring to a different
  * region from a geo replicated backup.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "createMode")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "createMode", defaultImpl = ServerPropertiesForGeoRestore.class)
 @JsonTypeName("GeoRestore")
 public class ServerPropertiesForGeoRestore extends ServerPropertiesForCreate {
     /**
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ServerPropertiesForReplica.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ServerPropertiesForReplica.java
index 2b98358f9839..059cd327bd13 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ServerPropertiesForReplica.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ServerPropertiesForReplica.java
@@ -15,7 +15,7 @@
 /**
  * The properties to create a new replica.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "createMode")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "createMode", defaultImpl = ServerPropertiesForReplica.class)
 @JsonTypeName("Replica")
 public class ServerPropertiesForReplica extends ServerPropertiesForCreate {
     /**
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ServerPropertiesForRestore.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ServerPropertiesForRestore.java
index c41f547a8675..c4bcf2cde965 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ServerPropertiesForRestore.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ServerPropertiesForRestore.java
@@ -16,7 +16,7 @@
 /**
  * The properties used to create a new server by restoring from a backup.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "createMode")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "createMode", defaultImpl = ServerPropertiesForRestore.class)
 @JsonTypeName("PointInTimeRestore")
 public class ServerPropertiesForRestore extends ServerPropertiesForCreate {
     /**
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ServerSecurityAlertPolicies.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ServerSecurityAlertPolicies.java
index fa6541dc00a1..99ac1c7441b5 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ServerSecurityAlertPolicies.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ServerSecurityAlertPolicies.java
@@ -20,7 +20,7 @@ public interface ServerSecurityAlertPolicies extends SupportsCreating<ServerSecu
     /**
      * Get a server's security alert policy.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ServerSecurityAlertPolicy.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ServerSecurityAlertPolicy.java
index a259aee80716..c2b0d89b8dfd 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ServerSecurityAlertPolicy.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ServerSecurityAlertPolicy.java
@@ -16,13 +16,13 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.postgresql.v2017_12_01.implementation.PostgreSQLManager;
+import com.microsoft.azure.management.postgresql.v2017_12_01.implementation.DBforPostgreSQLManager;
 import java.util.List;
 
 /**
  * Type representing ServerSecurityAlertPolicy.
  */
-public interface ServerSecurityAlertPolicy extends HasInner<ServerSecurityAlertPolicyInner>, Indexable, Refreshable<ServerSecurityAlertPolicy>, Updatable<ServerSecurityAlertPolicy.Update>, HasManager<PostgreSQLManager> {
+public interface ServerSecurityAlertPolicy extends HasInner<ServerSecurityAlertPolicyInner>, Indexable, Refreshable<ServerSecurityAlertPolicy>, Updatable<ServerSecurityAlertPolicy.Update>, HasManager<DBforPostgreSQLManager> {
     /**
      * @return the disabledAlerts value.
      */
@@ -95,7 +95,7 @@ interface Blank extends WithServer {
         interface WithServer {
            /**
             * Specifies resourceGroupName, serverName.
-            * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal
+            * @param resourceGroupName The name of the resource group. The name is case insensitive
             * @param serverName The name of the server
             * @return the next definition stage
             */
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ServerServer.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ServerServer.java
index de3a6fc65ca0..c8b60f255a2c 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ServerServer.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/ServerServer.java
@@ -11,14 +11,14 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.postgresql.v2017_12_01.implementation.ServerInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.postgresql.v2017_12_01.implementation.PostgreSQLManager;
+import com.microsoft.azure.management.postgresql.v2017_12_01.implementation.DBforPostgreSQLManager;
 import org.joda.time.DateTime;
 import java.util.Map;
 
 /**
  * Type representing ServerServer.
  */
-public interface ServerServer extends HasInner<ServerInner>, HasManager<PostgreSQLManager> {
+public interface ServerServer extends HasInner<ServerInner>, HasManager<DBforPostgreSQLManager> {
     /**
      * @return the administratorLogin value.
      */
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/Servers.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/Servers.java
index 029487e4aff9..7b8de27f3778 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/Servers.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/Servers.java
@@ -26,7 +26,7 @@ public interface Servers extends SupportsCreating<Server.DefinitionStages.Blank>
     /**
      * Restarts a server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/VirtualNetworkRule.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/VirtualNetworkRule.java
index 8de0220e8bcb..46dd0dfd581e 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/VirtualNetworkRule.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/VirtualNetworkRule.java
@@ -16,12 +16,12 @@
 import com.microsoft.azure.arm.model.Appliable;
 import com.microsoft.azure.arm.model.Creatable;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.postgresql.v2017_12_01.implementation.PostgreSQLManager;
+import com.microsoft.azure.management.postgresql.v2017_12_01.implementation.DBforPostgreSQLManager;
 
 /**
  * Type representing VirtualNetworkRule.
  */
-public interface VirtualNetworkRule extends HasInner<VirtualNetworkRuleInner>, Indexable, Refreshable<VirtualNetworkRule>, Updatable<VirtualNetworkRule.Update>, HasManager<PostgreSQLManager> {
+public interface VirtualNetworkRule extends HasInner<VirtualNetworkRuleInner>, Indexable, Refreshable<VirtualNetworkRule>, Updatable<VirtualNetworkRule.Update>, HasManager<DBforPostgreSQLManager> {
     /**
      * @return the id value.
      */
@@ -74,7 +74,7 @@ interface Blank extends WithServer {
         interface WithServer {
            /**
             * Specifies resourceGroupName, serverName.
-            * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal
+            * @param resourceGroupName The name of the resource group. The name is case insensitive
             * @param serverName The name of the server
             * @return the next definition stage
             */
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/VirtualNetworkRules.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/VirtualNetworkRules.java
index 3b533e11bcd7..8d5d5771882b 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/VirtualNetworkRules.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/VirtualNetworkRules.java
@@ -21,7 +21,7 @@ public interface VirtualNetworkRules extends SupportsCreating<VirtualNetworkRule
     /**
      * Gets a virtual network rule.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param virtualNetworkRuleName The name of the virtual network rule.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -32,7 +32,7 @@ public interface VirtualNetworkRules extends SupportsCreating<VirtualNetworkRule
     /**
      * Gets a list of virtual network rules in a server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
@@ -42,7 +42,7 @@ public interface VirtualNetworkRules extends SupportsCreating<VirtualNetworkRule
     /**
      * Deletes the virtual network rule with the given name.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param virtualNetworkRuleName The name of the virtual network rule.
      * @throws IllegalArgumentException thrown if parameters fail the validation
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/CheckNameAvailabilitysImpl.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/CheckNameAvailabilitysImpl.java
index c8350885862e..0b6241d5bde9 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/CheckNameAvailabilitysImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/CheckNameAvailabilitysImpl.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.management.postgresql.v2017_12_01.NameAvailabilityRequest;
 
 class CheckNameAvailabilitysImpl extends WrapperImpl<CheckNameAvailabilitysInner> implements CheckNameAvailabilitys {
-    private final PostgreSQLManager manager;
+    private final DBforPostgreSQLManager manager;
 
-    CheckNameAvailabilitysImpl(PostgreSQLManager manager) {
+    CheckNameAvailabilitysImpl(DBforPostgreSQLManager manager) {
         super(manager.inner().checkNameAvailabilitys());
         this.manager = manager;
     }
 
-    public PostgreSQLManager manager() {
+    public DBforPostgreSQLManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ConfigurationImpl.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ConfigurationImpl.java
index e5f9762c46e6..623dc799b8d3 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ConfigurationImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ConfigurationImpl.java
@@ -13,12 +13,12 @@
 import rx.Observable;
 
 class ConfigurationImpl extends CreatableUpdatableImpl<Configuration, ConfigurationInner, ConfigurationImpl> implements Configuration, Configuration.Definition, Configuration.Update {
-    private final PostgreSQLManager manager;
+    private final DBforPostgreSQLManager manager;
     private String resourceGroupName;
     private String serverName;
     private String configurationName;
 
-    ConfigurationImpl(String name, PostgreSQLManager manager) {
+    ConfigurationImpl(String name, DBforPostgreSQLManager manager) {
         super(name, new ConfigurationInner());
         this.manager = manager;
         // Set resource name
@@ -26,7 +26,7 @@ class ConfigurationImpl extends CreatableUpdatableImpl<Configuration, Configurat
         //
     }
 
-    ConfigurationImpl(ConfigurationInner inner, PostgreSQLManager manager) {
+    ConfigurationImpl(ConfigurationInner inner, DBforPostgreSQLManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -39,7 +39,7 @@ class ConfigurationImpl extends CreatableUpdatableImpl<Configuration, Configurat
     }
 
     @Override
-    public PostgreSQLManager manager() {
+    public DBforPostgreSQLManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ConfigurationsImpl.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ConfigurationsImpl.java
index a26e970cb43c..133c0c90c32e 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ConfigurationsImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ConfigurationsImpl.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.management.postgresql.v2017_12_01.Configuration;
 
 class ConfigurationsImpl extends WrapperImpl<ConfigurationsInner> implements Configurations {
-    private final PostgreSQLManager manager;
+    private final DBforPostgreSQLManager manager;
 
-    ConfigurationsImpl(PostgreSQLManager manager) {
+    ConfigurationsImpl(DBforPostgreSQLManager manager) {
         super(manager.inner().configurations());
         this.manager = manager;
     }
 
-    public PostgreSQLManager manager() {
+    public DBforPostgreSQLManager manager() {
         return this.manager;
     }
 
@@ -63,10 +63,14 @@ public Configuration call(ConfigurationInner inner) {
     public Observable<Configuration> getAsync(String resourceGroupName, String serverName, String configurationName) {
         ConfigurationsInner client = this.inner();
         return client.getAsync(resourceGroupName, serverName, configurationName)
-        .map(new Func1<ConfigurationInner, Configuration>() {
+        .flatMap(new Func1<ConfigurationInner, Observable<Configuration>>() {
             @Override
-            public Configuration call(ConfigurationInner inner) {
-                return wrapModel(inner);
+            public Observable<Configuration> call(ConfigurationInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((Configuration)wrapModel(inner));
+                }
             }
        });
     }
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ConfigurationsInner.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ConfigurationsInner.java
index cf2ebf4e18ad..348054c0a77f 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ConfigurationsInner.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ConfigurationsInner.java
@@ -76,7 +76,7 @@ interface ConfigurationsService {
     /**
      * Updates a configuration of a server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param configurationName The name of the server configuration.
      * @param parameters The required parameters for updating a server configuration.
@@ -92,7 +92,7 @@ public ConfigurationInner createOrUpdate(String resourceGroupName, String server
     /**
      * Updates a configuration of a server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param configurationName The name of the server configuration.
      * @param parameters The required parameters for updating a server configuration.
@@ -107,7 +107,7 @@ public ServiceFuture<ConfigurationInner> createOrUpdateAsync(String resourceGrou
     /**
      * Updates a configuration of a server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param configurationName The name of the server configuration.
      * @param parameters The required parameters for updating a server configuration.
@@ -126,7 +126,7 @@ public ConfigurationInner call(ServiceResponse<ConfigurationInner> response) {
     /**
      * Updates a configuration of a server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param configurationName The name of the server configuration.
      * @param parameters The required parameters for updating a server configuration.
@@ -160,7 +160,7 @@ public Observable<ServiceResponse<ConfigurationInner>> createOrUpdateWithService
     /**
      * Updates a configuration of a server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param configurationName The name of the server configuration.
      * @param parameters The required parameters for updating a server configuration.
@@ -176,7 +176,7 @@ public ConfigurationInner beginCreateOrUpdate(String resourceGroupName, String s
     /**
      * Updates a configuration of a server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param configurationName The name of the server configuration.
      * @param parameters The required parameters for updating a server configuration.
@@ -191,7 +191,7 @@ public ServiceFuture<ConfigurationInner> beginCreateOrUpdateAsync(String resourc
     /**
      * Updates a configuration of a server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param configurationName The name of the server configuration.
      * @param parameters The required parameters for updating a server configuration.
@@ -210,7 +210,7 @@ public ConfigurationInner call(ServiceResponse<ConfigurationInner> response) {
     /**
      * Updates a configuration of a server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param configurationName The name of the server configuration.
      * @param parameters The required parameters for updating a server configuration.
@@ -262,7 +262,7 @@ private ServiceResponse<ConfigurationInner> beginCreateOrUpdateDelegate(Response
     /**
      * Gets information about a configuration of server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param configurationName The name of the server configuration.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -277,7 +277,7 @@ public ConfigurationInner get(String resourceGroupName, String serverName, Strin
     /**
      * Gets information about a configuration of server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param configurationName The name of the server configuration.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
@@ -291,7 +291,7 @@ public ServiceFuture<ConfigurationInner> getAsync(String resourceGroupName, Stri
     /**
      * Gets information about a configuration of server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param configurationName The name of the server configuration.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -309,7 +309,7 @@ public ConfigurationInner call(ServiceResponse<ConfigurationInner> response) {
     /**
      * Gets information about a configuration of server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param configurationName The name of the server configuration.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -355,7 +355,7 @@ private ServiceResponse<ConfigurationInner> getDelegate(Response<ResponseBody> r
     /**
      * List all the configurations in a given server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws CloudException thrown if the request is rejected by server
@@ -369,7 +369,7 @@ public List<ConfigurationInner> listByServer(String resourceGroupName, String se
     /**
      * List all the configurations in a given server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -382,7 +382,7 @@ public ServiceFuture<List<ConfigurationInner>> listByServerAsync(String resource
     /**
      * List all the configurations in a given server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the List&lt;ConfigurationInner&gt; object
@@ -399,7 +399,7 @@ public List<ConfigurationInner> call(ServiceResponse<List<ConfigurationInner>> r
     /**
      * List all the configurations in a given server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the List&lt;ConfigurationInner&gt; object
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/DBforPostgreSQLManager.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/DBforPostgreSQLManager.java
new file mode 100644
index 000000000000..bb2ddf5fc9af
--- /dev/null
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/DBforPostgreSQLManager.java
@@ -0,0 +1,219 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.postgresql.v2017_12_01.implementation;
+
+import com.microsoft.azure.AzureEnvironment;
+import com.microsoft.azure.AzureResponseBuilder;
+import com.microsoft.azure.credentials.AzureTokenCredentials;
+import com.microsoft.azure.management.apigeneration.Beta;
+import com.microsoft.azure.management.apigeneration.Beta.SinceVersion;
+import com.microsoft.azure.arm.resources.AzureConfigurable;
+import com.microsoft.azure.serializer.AzureJacksonAdapter;
+import com.microsoft.rest.RestClient;
+import com.microsoft.azure.management.postgresql.v2017_12_01.Servers;
+import com.microsoft.azure.management.postgresql.v2017_12_01.Replicas;
+import com.microsoft.azure.management.postgresql.v2017_12_01.FirewallRules;
+import com.microsoft.azure.management.postgresql.v2017_12_01.VirtualNetworkRules;
+import com.microsoft.azure.management.postgresql.v2017_12_01.Databases;
+import com.microsoft.azure.management.postgresql.v2017_12_01.Configurations;
+import com.microsoft.azure.management.postgresql.v2017_12_01.LogFiles;
+import com.microsoft.azure.management.postgresql.v2017_12_01.LocationBasedPerformanceTiers;
+import com.microsoft.azure.management.postgresql.v2017_12_01.CheckNameAvailabilitys;
+import com.microsoft.azure.management.postgresql.v2017_12_01.ServerSecurityAlertPolicies;
+import com.microsoft.azure.management.postgresql.v2017_12_01.Operations;
+import com.microsoft.azure.arm.resources.implementation.AzureConfigurableCoreImpl;
+import com.microsoft.azure.arm.resources.implementation.ManagerCore;
+
+/**
+ * Entry point to Azure DBforPostgreSQL resource management.
+ */
+public final class DBforPostgreSQLManager extends ManagerCore<DBforPostgreSQLManager, PostgreSQLManagementClientImpl> {
+    private Servers servers;
+    private Replicas replicas;
+    private FirewallRules firewallRules;
+    private VirtualNetworkRules virtualNetworkRules;
+    private Databases databases;
+    private Configurations configurations;
+    private LogFiles logFiles;
+    private LocationBasedPerformanceTiers locationBasedPerformanceTiers;
+    private CheckNameAvailabilitys checkNameAvailabilitys;
+    private ServerSecurityAlertPolicies serverSecurityAlertPolicies;
+    private Operations operations;
+    /**
+    * Get a Configurable instance that can be used to create DBforPostgreSQLManager with optional configuration.
+    *
+    * @return the instance allowing configurations
+    */
+    public static Configurable configure() {
+        return new DBforPostgreSQLManager.ConfigurableImpl();
+    }
+    /**
+    * Creates an instance of DBforPostgreSQLManager that exposes DBforPostgreSQL resource management API entry points.
+    *
+    * @param credentials the credentials to use
+    * @param subscriptionId the subscription UUID
+    * @return the DBforPostgreSQLManager
+    */
+    public static DBforPostgreSQLManager authenticate(AzureTokenCredentials credentials, String subscriptionId) {
+        return new DBforPostgreSQLManager(new RestClient.Builder()
+            .withBaseUrl(credentials.environment(), AzureEnvironment.Endpoint.RESOURCE_MANAGER)
+            .withCredentials(credentials)
+            .withSerializerAdapter(new AzureJacksonAdapter())
+            .withResponseBuilderFactory(new AzureResponseBuilder.Factory())
+            .build(), subscriptionId);
+    }
+    /**
+    * Creates an instance of DBforPostgreSQLManager that exposes DBforPostgreSQL resource management API entry points.
+    *
+    * @param restClient the RestClient to be used for API calls.
+    * @param subscriptionId the subscription UUID
+    * @return the DBforPostgreSQLManager
+    */
+    public static DBforPostgreSQLManager authenticate(RestClient restClient, String subscriptionId) {
+        return new DBforPostgreSQLManager(restClient, subscriptionId);
+    }
+    /**
+    * The interface allowing configurations to be set.
+    */
+    public interface Configurable extends AzureConfigurable<Configurable> {
+        /**
+        * Creates an instance of DBforPostgreSQLManager that exposes DBforPostgreSQL management API entry points.
+        *
+        * @param credentials the credentials to use
+        * @param subscriptionId the subscription UUID
+        * @return the interface exposing DBforPostgreSQL management API entry points that work across subscriptions
+        */
+        DBforPostgreSQLManager authenticate(AzureTokenCredentials credentials, String subscriptionId);
+    }
+
+    /**
+     * @return Entry point to manage Servers.
+     */
+    public Servers servers() {
+        if (this.servers == null) {
+            this.servers = new ServersImpl(this);
+        }
+        return this.servers;
+    }
+
+    /**
+     * @return Entry point to manage Replicas.
+     */
+    public Replicas replicas() {
+        if (this.replicas == null) {
+            this.replicas = new ReplicasImpl(this);
+        }
+        return this.replicas;
+    }
+
+    /**
+     * @return Entry point to manage FirewallRules.
+     */
+    public FirewallRules firewallRules() {
+        if (this.firewallRules == null) {
+            this.firewallRules = new FirewallRulesImpl(this);
+        }
+        return this.firewallRules;
+    }
+
+    /**
+     * @return Entry point to manage VirtualNetworkRules.
+     */
+    public VirtualNetworkRules virtualNetworkRules() {
+        if (this.virtualNetworkRules == null) {
+            this.virtualNetworkRules = new VirtualNetworkRulesImpl(this);
+        }
+        return this.virtualNetworkRules;
+    }
+
+    /**
+     * @return Entry point to manage Databases.
+     */
+    public Databases databases() {
+        if (this.databases == null) {
+            this.databases = new DatabasesImpl(this);
+        }
+        return this.databases;
+    }
+
+    /**
+     * @return Entry point to manage Configurations.
+     */
+    public Configurations configurations() {
+        if (this.configurations == null) {
+            this.configurations = new ConfigurationsImpl(this);
+        }
+        return this.configurations;
+    }
+
+    /**
+     * @return Entry point to manage LogFiles.
+     */
+    public LogFiles logFiles() {
+        if (this.logFiles == null) {
+            this.logFiles = new LogFilesImpl(this);
+        }
+        return this.logFiles;
+    }
+
+    /**
+     * @return Entry point to manage LocationBasedPerformanceTiers.
+     */
+    public LocationBasedPerformanceTiers locationBasedPerformanceTiers() {
+        if (this.locationBasedPerformanceTiers == null) {
+            this.locationBasedPerformanceTiers = new LocationBasedPerformanceTiersImpl(this);
+        }
+        return this.locationBasedPerformanceTiers;
+    }
+
+    /**
+     * @return Entry point to manage CheckNameAvailabilitys.
+     */
+    public CheckNameAvailabilitys checkNameAvailabilitys() {
+        if (this.checkNameAvailabilitys == null) {
+            this.checkNameAvailabilitys = new CheckNameAvailabilitysImpl(this);
+        }
+        return this.checkNameAvailabilitys;
+    }
+
+    /**
+     * @return Entry point to manage ServerSecurityAlertPolicies.
+     */
+    public ServerSecurityAlertPolicies serverSecurityAlertPolicies() {
+        if (this.serverSecurityAlertPolicies == null) {
+            this.serverSecurityAlertPolicies = new ServerSecurityAlertPoliciesImpl(this);
+        }
+        return this.serverSecurityAlertPolicies;
+    }
+
+    /**
+     * @return Entry point to manage Operations.
+     */
+    public Operations operations() {
+        if (this.operations == null) {
+            this.operations = new OperationsImpl(this);
+        }
+        return this.operations;
+    }
+
+    /**
+    * The implementation for Configurable interface.
+    */
+    private static final class ConfigurableImpl extends AzureConfigurableCoreImpl<Configurable> implements Configurable {
+        public DBforPostgreSQLManager authenticate(AzureTokenCredentials credentials, String subscriptionId) {
+           return DBforPostgreSQLManager.authenticate(buildRestClient(credentials), subscriptionId);
+        }
+     }
+    private DBforPostgreSQLManager(RestClient restClient, String subscriptionId) {
+        super(
+            restClient,
+            subscriptionId,
+            new PostgreSQLManagementClientImpl(restClient).withSubscriptionId(subscriptionId));
+    }
+}
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/DatabaseImpl.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/DatabaseImpl.java
index e4695c6d8c47..1c07005458fd 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/DatabaseImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/DatabaseImpl.java
@@ -13,12 +13,12 @@
 import rx.Observable;
 
 class DatabaseImpl extends CreatableUpdatableImpl<Database, DatabaseInner, DatabaseImpl> implements Database, Database.Definition, Database.Update {
-    private final PostgreSQLManager manager;
+    private final DBforPostgreSQLManager manager;
     private String resourceGroupName;
     private String serverName;
     private String databaseName;
 
-    DatabaseImpl(String name, PostgreSQLManager manager) {
+    DatabaseImpl(String name, DBforPostgreSQLManager manager) {
         super(name, new DatabaseInner());
         this.manager = manager;
         // Set resource name
@@ -26,7 +26,7 @@ class DatabaseImpl extends CreatableUpdatableImpl<Database, DatabaseInner, Datab
         //
     }
 
-    DatabaseImpl(DatabaseInner inner, PostgreSQLManager manager) {
+    DatabaseImpl(DatabaseInner inner, DBforPostgreSQLManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -39,7 +39,7 @@ class DatabaseImpl extends CreatableUpdatableImpl<Database, DatabaseInner, Datab
     }
 
     @Override
-    public PostgreSQLManager manager() {
+    public DBforPostgreSQLManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/DatabasesImpl.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/DatabasesImpl.java
index 7e33be68d5f8..7d730f504324 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/DatabasesImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/DatabasesImpl.java
@@ -18,14 +18,14 @@
 import com.microsoft.azure.management.postgresql.v2017_12_01.Database;
 
 class DatabasesImpl extends WrapperImpl<DatabasesInner> implements Databases {
-    private final PostgreSQLManager manager;
+    private final DBforPostgreSQLManager manager;
 
-    DatabasesImpl(PostgreSQLManager manager) {
+    DatabasesImpl(DBforPostgreSQLManager manager) {
         super(manager.inner().databases());
         this.manager = manager;
     }
 
-    public PostgreSQLManager manager() {
+    public DBforPostgreSQLManager manager() {
         return this.manager;
     }
 
@@ -64,10 +64,14 @@ public Database call(DatabaseInner inner) {
     public Observable<Database> getAsync(String resourceGroupName, String serverName, String databaseName) {
         DatabasesInner client = this.inner();
         return client.getAsync(resourceGroupName, serverName, databaseName)
-        .map(new Func1<DatabaseInner, Database>() {
+        .flatMap(new Func1<DatabaseInner, Observable<Database>>() {
             @Override
-            public Database call(DatabaseInner inner) {
-                return wrapModel(inner);
+            public Observable<Database> call(DatabaseInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((Database)wrapModel(inner));
+                }
             }
        });
     }
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/DatabasesInner.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/DatabasesInner.java
index 767935723992..0c1e5c45ae3c 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/DatabasesInner.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/DatabasesInner.java
@@ -85,7 +85,7 @@ interface DatabasesService {
     /**
      * Creates a new database or updates an existing database.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param databaseName The name of the database.
      * @param parameters The required parameters for creating or updating a database.
@@ -101,7 +101,7 @@ public DatabaseInner createOrUpdate(String resourceGroupName, String serverName,
     /**
      * Creates a new database or updates an existing database.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param databaseName The name of the database.
      * @param parameters The required parameters for creating or updating a database.
@@ -116,7 +116,7 @@ public ServiceFuture<DatabaseInner> createOrUpdateAsync(String resourceGroupName
     /**
      * Creates a new database or updates an existing database.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param databaseName The name of the database.
      * @param parameters The required parameters for creating or updating a database.
@@ -135,7 +135,7 @@ public DatabaseInner call(ServiceResponse<DatabaseInner> response) {
     /**
      * Creates a new database or updates an existing database.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param databaseName The name of the database.
      * @param parameters The required parameters for creating or updating a database.
@@ -169,7 +169,7 @@ public Observable<ServiceResponse<DatabaseInner>> createOrUpdateWithServiceRespo
     /**
      * Creates a new database or updates an existing database.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param databaseName The name of the database.
      * @param parameters The required parameters for creating or updating a database.
@@ -185,7 +185,7 @@ public DatabaseInner beginCreateOrUpdate(String resourceGroupName, String server
     /**
      * Creates a new database or updates an existing database.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param databaseName The name of the database.
      * @param parameters The required parameters for creating or updating a database.
@@ -200,7 +200,7 @@ public ServiceFuture<DatabaseInner> beginCreateOrUpdateAsync(String resourceGrou
     /**
      * Creates a new database or updates an existing database.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param databaseName The name of the database.
      * @param parameters The required parameters for creating or updating a database.
@@ -219,7 +219,7 @@ public DatabaseInner call(ServiceResponse<DatabaseInner> response) {
     /**
      * Creates a new database or updates an existing database.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param databaseName The name of the database.
      * @param parameters The required parameters for creating or updating a database.
@@ -272,7 +272,7 @@ private ServiceResponse<DatabaseInner> beginCreateOrUpdateDelegate(Response<Resp
     /**
      * Deletes a database.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param databaseName The name of the database.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -286,7 +286,7 @@ public void delete(String resourceGroupName, String serverName, String databaseN
     /**
      * Deletes a database.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param databaseName The name of the database.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
@@ -300,7 +300,7 @@ public ServiceFuture<Void> deleteAsync(String resourceGroupName, String serverNa
     /**
      * Deletes a database.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param databaseName The name of the database.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -318,7 +318,7 @@ public Void call(ServiceResponse<Void> response) {
     /**
      * Deletes a database.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param databaseName The name of the database.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -347,7 +347,7 @@ public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String r
     /**
      * Deletes a database.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param databaseName The name of the database.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -361,7 +361,7 @@ public void beginDelete(String resourceGroupName, String serverName, String data
     /**
      * Deletes a database.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param databaseName The name of the database.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
@@ -375,7 +375,7 @@ public ServiceFuture<Void> beginDeleteAsync(String resourceGroupName, String ser
     /**
      * Deletes a database.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param databaseName The name of the database.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -393,7 +393,7 @@ public Void call(ServiceResponse<Void> response) {
     /**
      * Deletes a database.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param databaseName The name of the database.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -441,7 +441,7 @@ private ServiceResponse<Void> beginDeleteDelegate(Response<ResponseBody> respons
     /**
      * Gets information about a database.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param databaseName The name of the database.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -456,7 +456,7 @@ public DatabaseInner get(String resourceGroupName, String serverName, String dat
     /**
      * Gets information about a database.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param databaseName The name of the database.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
@@ -470,7 +470,7 @@ public ServiceFuture<DatabaseInner> getAsync(String resourceGroupName, String se
     /**
      * Gets information about a database.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param databaseName The name of the database.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -488,7 +488,7 @@ public DatabaseInner call(ServiceResponse<DatabaseInner> response) {
     /**
      * Gets information about a database.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param databaseName The name of the database.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -534,7 +534,7 @@ private ServiceResponse<DatabaseInner> getDelegate(Response<ResponseBody> respon
     /**
      * List all the databases in a given server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws CloudException thrown if the request is rejected by server
@@ -548,7 +548,7 @@ public List<DatabaseInner> listByServer(String resourceGroupName, String serverN
     /**
      * List all the databases in a given server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -561,7 +561,7 @@ public ServiceFuture<List<DatabaseInner>> listByServerAsync(String resourceGroup
     /**
      * List all the databases in a given server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the List&lt;DatabaseInner&gt; object
@@ -578,7 +578,7 @@ public List<DatabaseInner> call(ServiceResponse<List<DatabaseInner>> response) {
     /**
      * List all the databases in a given server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the List&lt;DatabaseInner&gt; object
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/FirewallRuleImpl.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/FirewallRuleImpl.java
index a11cb966bf85..d0201aca53aa 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/FirewallRuleImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/FirewallRuleImpl.java
@@ -13,12 +13,12 @@
 import rx.Observable;
 
 class FirewallRuleImpl extends CreatableUpdatableImpl<FirewallRule, FirewallRuleInner, FirewallRuleImpl> implements FirewallRule, FirewallRule.Definition, FirewallRule.Update {
-    private final PostgreSQLManager manager;
+    private final DBforPostgreSQLManager manager;
     private String resourceGroupName;
     private String serverName;
     private String firewallRuleName;
 
-    FirewallRuleImpl(String name, PostgreSQLManager manager) {
+    FirewallRuleImpl(String name, DBforPostgreSQLManager manager) {
         super(name, new FirewallRuleInner());
         this.manager = manager;
         // Set resource name
@@ -26,7 +26,7 @@ class FirewallRuleImpl extends CreatableUpdatableImpl<FirewallRule, FirewallRule
         //
     }
 
-    FirewallRuleImpl(FirewallRuleInner inner, PostgreSQLManager manager) {
+    FirewallRuleImpl(FirewallRuleInner inner, DBforPostgreSQLManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -39,7 +39,7 @@ class FirewallRuleImpl extends CreatableUpdatableImpl<FirewallRule, FirewallRule
     }
 
     @Override
-    public PostgreSQLManager manager() {
+    public DBforPostgreSQLManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/FirewallRulesImpl.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/FirewallRulesImpl.java
index a9c95337216a..20bddabdd27a 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/FirewallRulesImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/FirewallRulesImpl.java
@@ -18,14 +18,14 @@
 import com.microsoft.azure.management.postgresql.v2017_12_01.FirewallRule;
 
 class FirewallRulesImpl extends WrapperImpl<FirewallRulesInner> implements FirewallRules {
-    private final PostgreSQLManager manager;
+    private final DBforPostgreSQLManager manager;
 
-    FirewallRulesImpl(PostgreSQLManager manager) {
+    FirewallRulesImpl(DBforPostgreSQLManager manager) {
         super(manager.inner().firewallRules());
         this.manager = manager;
     }
 
-    public PostgreSQLManager manager() {
+    public DBforPostgreSQLManager manager() {
         return this.manager;
     }
 
@@ -64,10 +64,14 @@ public FirewallRule call(FirewallRuleInner inner) {
     public Observable<FirewallRule> getAsync(String resourceGroupName, String serverName, String firewallRuleName) {
         FirewallRulesInner client = this.inner();
         return client.getAsync(resourceGroupName, serverName, firewallRuleName)
-        .map(new Func1<FirewallRuleInner, FirewallRule>() {
+        .flatMap(new Func1<FirewallRuleInner, Observable<FirewallRule>>() {
             @Override
-            public FirewallRule call(FirewallRuleInner inner) {
-                return wrapModel(inner);
+            public Observable<FirewallRule> call(FirewallRuleInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((FirewallRule)wrapModel(inner));
+                }
             }
        });
     }
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/FirewallRulesInner.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/FirewallRulesInner.java
index 684cac0c0c33..50346b22f79b 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/FirewallRulesInner.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/FirewallRulesInner.java
@@ -85,7 +85,7 @@ interface FirewallRulesService {
     /**
      * Creates a new firewall rule or updates an existing firewall rule.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param firewallRuleName The name of the server firewall rule.
      * @param parameters The required parameters for creating or updating a firewall rule.
@@ -101,7 +101,7 @@ public FirewallRuleInner createOrUpdate(String resourceGroupName, String serverN
     /**
      * Creates a new firewall rule or updates an existing firewall rule.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param firewallRuleName The name of the server firewall rule.
      * @param parameters The required parameters for creating or updating a firewall rule.
@@ -116,7 +116,7 @@ public ServiceFuture<FirewallRuleInner> createOrUpdateAsync(String resourceGroup
     /**
      * Creates a new firewall rule or updates an existing firewall rule.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param firewallRuleName The name of the server firewall rule.
      * @param parameters The required parameters for creating or updating a firewall rule.
@@ -135,7 +135,7 @@ public FirewallRuleInner call(ServiceResponse<FirewallRuleInner> response) {
     /**
      * Creates a new firewall rule or updates an existing firewall rule.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param firewallRuleName The name of the server firewall rule.
      * @param parameters The required parameters for creating or updating a firewall rule.
@@ -169,7 +169,7 @@ public Observable<ServiceResponse<FirewallRuleInner>> createOrUpdateWithServiceR
     /**
      * Creates a new firewall rule or updates an existing firewall rule.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param firewallRuleName The name of the server firewall rule.
      * @param parameters The required parameters for creating or updating a firewall rule.
@@ -185,7 +185,7 @@ public FirewallRuleInner beginCreateOrUpdate(String resourceGroupName, String se
     /**
      * Creates a new firewall rule or updates an existing firewall rule.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param firewallRuleName The name of the server firewall rule.
      * @param parameters The required parameters for creating or updating a firewall rule.
@@ -200,7 +200,7 @@ public ServiceFuture<FirewallRuleInner> beginCreateOrUpdateAsync(String resource
     /**
      * Creates a new firewall rule or updates an existing firewall rule.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param firewallRuleName The name of the server firewall rule.
      * @param parameters The required parameters for creating or updating a firewall rule.
@@ -219,7 +219,7 @@ public FirewallRuleInner call(ServiceResponse<FirewallRuleInner> response) {
     /**
      * Creates a new firewall rule or updates an existing firewall rule.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param firewallRuleName The name of the server firewall rule.
      * @param parameters The required parameters for creating or updating a firewall rule.
@@ -272,7 +272,7 @@ private ServiceResponse<FirewallRuleInner> beginCreateOrUpdateDelegate(Response<
     /**
      * Deletes a server firewall rule.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param firewallRuleName The name of the server firewall rule.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -286,7 +286,7 @@ public void delete(String resourceGroupName, String serverName, String firewallR
     /**
      * Deletes a server firewall rule.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param firewallRuleName The name of the server firewall rule.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
@@ -300,7 +300,7 @@ public ServiceFuture<Void> deleteAsync(String resourceGroupName, String serverNa
     /**
      * Deletes a server firewall rule.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param firewallRuleName The name of the server firewall rule.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -318,7 +318,7 @@ public Void call(ServiceResponse<Void> response) {
     /**
      * Deletes a server firewall rule.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param firewallRuleName The name of the server firewall rule.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -347,7 +347,7 @@ public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String r
     /**
      * Deletes a server firewall rule.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param firewallRuleName The name of the server firewall rule.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -361,7 +361,7 @@ public void beginDelete(String resourceGroupName, String serverName, String fire
     /**
      * Deletes a server firewall rule.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param firewallRuleName The name of the server firewall rule.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
@@ -375,7 +375,7 @@ public ServiceFuture<Void> beginDeleteAsync(String resourceGroupName, String ser
     /**
      * Deletes a server firewall rule.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param firewallRuleName The name of the server firewall rule.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -393,7 +393,7 @@ public Void call(ServiceResponse<Void> response) {
     /**
      * Deletes a server firewall rule.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param firewallRuleName The name of the server firewall rule.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -441,7 +441,7 @@ private ServiceResponse<Void> beginDeleteDelegate(Response<ResponseBody> respons
     /**
      * Gets information about a server firewall rule.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param firewallRuleName The name of the server firewall rule.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -456,7 +456,7 @@ public FirewallRuleInner get(String resourceGroupName, String serverName, String
     /**
      * Gets information about a server firewall rule.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param firewallRuleName The name of the server firewall rule.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
@@ -470,7 +470,7 @@ public ServiceFuture<FirewallRuleInner> getAsync(String resourceGroupName, Strin
     /**
      * Gets information about a server firewall rule.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param firewallRuleName The name of the server firewall rule.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -488,7 +488,7 @@ public FirewallRuleInner call(ServiceResponse<FirewallRuleInner> response) {
     /**
      * Gets information about a server firewall rule.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param firewallRuleName The name of the server firewall rule.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -534,7 +534,7 @@ private ServiceResponse<FirewallRuleInner> getDelegate(Response<ResponseBody> re
     /**
      * List all the firewall rules in a given server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws CloudException thrown if the request is rejected by server
@@ -548,7 +548,7 @@ public List<FirewallRuleInner> listByServer(String resourceGroupName, String ser
     /**
      * List all the firewall rules in a given server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -561,7 +561,7 @@ public ServiceFuture<List<FirewallRuleInner>> listByServerAsync(String resourceG
     /**
      * List all the firewall rules in a given server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the List&lt;FirewallRuleInner&gt; object
@@ -578,7 +578,7 @@ public List<FirewallRuleInner> call(ServiceResponse<List<FirewallRuleInner>> res
     /**
      * List all the firewall rules in a given server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the List&lt;FirewallRuleInner&gt; object
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/LocationBasedPerformanceTiersImpl.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/LocationBasedPerformanceTiersImpl.java
index 740c4f297820..f48b7849ae25 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/LocationBasedPerformanceTiersImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/LocationBasedPerformanceTiersImpl.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.management.postgresql.v2017_12_01.PerformanceTierProperties;
 
 class LocationBasedPerformanceTiersImpl extends WrapperImpl<LocationBasedPerformanceTiersInner> implements LocationBasedPerformanceTiers {
-    private final PostgreSQLManager manager;
+    private final DBforPostgreSQLManager manager;
 
-    LocationBasedPerformanceTiersImpl(PostgreSQLManager manager) {
+    LocationBasedPerformanceTiersImpl(DBforPostgreSQLManager manager) {
         super(manager.inner().locationBasedPerformanceTiers());
         this.manager = manager;
     }
 
-    public PostgreSQLManager manager() {
+    public DBforPostgreSQLManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/LogFileImpl.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/LogFileImpl.java
index aa3761713391..60299e57be75 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/LogFileImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/LogFileImpl.java
@@ -14,15 +14,15 @@
 import org.joda.time.DateTime;
 
 class LogFileImpl extends WrapperImpl<LogFileInner> implements LogFile {
-    private final PostgreSQLManager manager;
+    private final DBforPostgreSQLManager manager;
 
-    LogFileImpl(LogFileInner inner,  PostgreSQLManager manager) {
+    LogFileImpl(LogFileInner inner,  DBforPostgreSQLManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public PostgreSQLManager manager() {
+    public DBforPostgreSQLManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/LogFilesImpl.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/LogFilesImpl.java
index 01f79a20f69d..a1cd08897cee 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/LogFilesImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/LogFilesImpl.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.management.postgresql.v2017_12_01.LogFile;
 
 class LogFilesImpl extends WrapperImpl<LogFilesInner> implements LogFiles {
-    private final PostgreSQLManager manager;
+    private final DBforPostgreSQLManager manager;
 
-    LogFilesImpl(PostgreSQLManager manager) {
+    LogFilesImpl(DBforPostgreSQLManager manager) {
         super(manager.inner().logFiles());
         this.manager = manager;
     }
 
-    public PostgreSQLManager manager() {
+    public DBforPostgreSQLManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/LogFilesInner.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/LogFilesInner.java
index 401a66be6840..ea71b9b58b40 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/LogFilesInner.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/LogFilesInner.java
@@ -61,7 +61,7 @@ interface LogFilesService {
     /**
      * List all the log files in a given server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws CloudException thrown if the request is rejected by server
@@ -75,7 +75,7 @@ public List<LogFileInner> listByServer(String resourceGroupName, String serverNa
     /**
      * List all the log files in a given server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -88,7 +88,7 @@ public ServiceFuture<List<LogFileInner>> listByServerAsync(String resourceGroupN
     /**
      * List all the log files in a given server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the List&lt;LogFileInner&gt; object
@@ -105,7 +105,7 @@ public List<LogFileInner> call(ServiceResponse<List<LogFileInner>> response) {
     /**
      * List all the log files in a given server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the List&lt;LogFileInner&gt; object
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/NameAvailabilityImpl.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/NameAvailabilityImpl.java
index 1d91316227c8..07b77b43a018 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/NameAvailabilityImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/NameAvailabilityImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class NameAvailabilityImpl extends WrapperImpl<NameAvailabilityInner> implements NameAvailability {
-    private final PostgreSQLManager manager;
-    NameAvailabilityImpl(NameAvailabilityInner inner, PostgreSQLManager manager) {
+    private final DBforPostgreSQLManager manager;
+    NameAvailabilityImpl(NameAvailabilityInner inner, DBforPostgreSQLManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public PostgreSQLManager manager() {
+    public DBforPostgreSQLManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/OperationListResultImpl.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/OperationListResultImpl.java
index 705229de03d4..43a96b5d8a59 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/OperationListResultImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/OperationListResultImpl.java
@@ -13,14 +13,14 @@
 import java.util.List;
 
 class OperationListResultImpl extends WrapperImpl<OperationListResultInner> implements OperationListResult {
-    private final PostgreSQLManager manager;
-    OperationListResultImpl(OperationListResultInner inner, PostgreSQLManager manager) {
+    private final DBforPostgreSQLManager manager;
+    OperationListResultImpl(OperationListResultInner inner, DBforPostgreSQLManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public PostgreSQLManager manager() {
+    public DBforPostgreSQLManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/OperationsImpl.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/OperationsImpl.java
index ace4ab563aab..81cefe5f7540 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/OperationsImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/OperationsImpl.java
@@ -16,14 +16,14 @@
 import com.microsoft.azure.management.postgresql.v2017_12_01.OperationListResult;
 
 class OperationsImpl extends WrapperImpl<OperationsInner> implements Operations {
-    private final PostgreSQLManager manager;
+    private final DBforPostgreSQLManager manager;
 
-    OperationsImpl(PostgreSQLManager manager) {
+    OperationsImpl(DBforPostgreSQLManager manager) {
         super(manager.inner().operations());
         this.manager = manager;
     }
 
-    public PostgreSQLManager manager() {
+    public DBforPostgreSQLManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/PerformanceTierPropertiesImpl.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/PerformanceTierPropertiesImpl.java
index c5fabcd2e411..3978c2c8da7b 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/PerformanceTierPropertiesImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/PerformanceTierPropertiesImpl.java
@@ -15,15 +15,15 @@
 import com.microsoft.azure.management.postgresql.v2017_12_01.PerformanceTierServiceLevelObjectives;
 
 class PerformanceTierPropertiesImpl extends WrapperImpl<PerformanceTierPropertiesInner> implements PerformanceTierProperties {
-    private final PostgreSQLManager manager;
+    private final DBforPostgreSQLManager manager;
 
-    PerformanceTierPropertiesImpl(PerformanceTierPropertiesInner inner,  PostgreSQLManager manager) {
+    PerformanceTierPropertiesImpl(PerformanceTierPropertiesInner inner,  DBforPostgreSQLManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public PostgreSQLManager manager() {
+    public DBforPostgreSQLManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/PostgreSQLManagementClientImpl.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/PostgreSQLManagementClientImpl.java
index c60909483ca4..e8dcab51051d 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/PostgreSQLManagementClientImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/PostgreSQLManagementClientImpl.java
@@ -28,11 +28,23 @@ public AzureClient getAzureClient() {
         return this.azureClient;
     }
 
-    /** The subscription ID that identifies an Azure subscription. */
+    /** The API version to use for this operation. */
+    private String apiVersion;
+
+    /**
+     * Gets The API version to use for this operation.
+     *
+     * @return the apiVersion value.
+     */
+    public String apiVersion() {
+        return this.apiVersion;
+    }
+
+    /** The ID of the target subscription. */
     private String subscriptionId;
 
     /**
-     * Gets The subscription ID that identifies an Azure subscription.
+     * Gets The ID of the target subscription.
      *
      * @return the subscriptionId value.
      */
@@ -41,7 +53,7 @@ public String subscriptionId() {
     }
 
     /**
-     * Sets The subscription ID that identifies an Azure subscription.
+     * Sets The ID of the target subscription.
      *
      * @param subscriptionId the subscriptionId value.
      * @return the service client itself
@@ -51,18 +63,6 @@ public PostgreSQLManagementClientImpl withSubscriptionId(String subscriptionId)
         return this;
     }
 
-    /** The API version to use for the request. */
-    private String apiVersion;
-
-    /**
-     * Gets The API version to use for the request.
-     *
-     * @return the apiVersion value.
-     */
-    public String apiVersion() {
-        return this.apiVersion;
-    }
-
     /** The preferred language for the response. */
     private String acceptLanguage;
 
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ReplicasImpl.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ReplicasImpl.java
index 1f484c79bb53..fe616043d546 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ReplicasImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ReplicasImpl.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.management.postgresql.v2017_12_01.ServerServer;
 
 class ReplicasImpl extends WrapperImpl<ReplicasInner> implements Replicas {
-    private final PostgreSQLManager manager;
+    private final DBforPostgreSQLManager manager;
 
-    ReplicasImpl(PostgreSQLManager manager) {
+    ReplicasImpl(DBforPostgreSQLManager manager) {
         super(manager.inner().replicas());
         this.manager = manager;
     }
 
-    public PostgreSQLManager manager() {
+    public DBforPostgreSQLManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ReplicasInner.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ReplicasInner.java
index 87fe8d9b4ba8..3044714c1883 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ReplicasInner.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ReplicasInner.java
@@ -61,7 +61,7 @@ interface ReplicasService {
     /**
      * List all the replicas for a given server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws CloudException thrown if the request is rejected by server
@@ -75,7 +75,7 @@ public List<ServerInner> listByServer(String resourceGroupName, String serverNam
     /**
      * List all the replicas for a given server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -88,7 +88,7 @@ public ServiceFuture<List<ServerInner>> listByServerAsync(String resourceGroupNa
     /**
      * List all the replicas for a given server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the List&lt;ServerInner&gt; object
@@ -105,7 +105,7 @@ public List<ServerInner> call(ServiceResponse<List<ServerInner>> response) {
     /**
      * List all the replicas for a given server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the List&lt;ServerInner&gt; object
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ServerImpl.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ServerImpl.java
index ee08f521343c..9ccdabe9c6c4 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ServerImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ServerImpl.java
@@ -22,10 +22,10 @@
 import com.microsoft.azure.management.postgresql.v2017_12_01.ServerPropertiesForCreate;
 import rx.functions.Func1;
 
-class ServerImpl extends GroupableResourceCoreImpl<Server, ServerInner, ServerImpl, PostgreSQLManager> implements Server, Server.Definition, Server.Update {
+class ServerImpl extends GroupableResourceCoreImpl<Server, ServerInner, ServerImpl, DBforPostgreSQLManager> implements Server, Server.Definition, Server.Update {
     private ServerForCreate createParameter;
     private ServerUpdateParameters updateParameter;
-    ServerImpl(String name, ServerInner inner, PostgreSQLManager manager) {
+    ServerImpl(String name, ServerInner inner, DBforPostgreSQLManager manager) {
         super(name, inner, manager);
         this.createParameter = new ServerForCreate();
         this.updateParameter = new ServerUpdateParameters();
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ServerSecurityAlertPoliciesImpl.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ServerSecurityAlertPoliciesImpl.java
index 27006681348f..df6e10de7f42 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ServerSecurityAlertPoliciesImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ServerSecurityAlertPoliciesImpl.java
@@ -16,14 +16,14 @@
 import com.microsoft.azure.management.postgresql.v2017_12_01.ServerSecurityAlertPolicy;
 
 class ServerSecurityAlertPoliciesImpl extends WrapperImpl<ServerSecurityAlertPoliciesInner> implements ServerSecurityAlertPolicies {
-    private final PostgreSQLManager manager;
+    private final DBforPostgreSQLManager manager;
 
-    ServerSecurityAlertPoliciesImpl(PostgreSQLManager manager) {
+    ServerSecurityAlertPoliciesImpl(DBforPostgreSQLManager manager) {
         super(manager.inner().serverSecurityAlertPolicies());
         this.manager = manager;
     }
 
-    public PostgreSQLManager manager() {
+    public DBforPostgreSQLManager manager() {
         return this.manager;
     }
 
@@ -44,10 +44,14 @@ private ServerSecurityAlertPolicyImpl wrapModel(String name) {
     public Observable<ServerSecurityAlertPolicy> getAsync(String resourceGroupName, String serverName) {
         ServerSecurityAlertPoliciesInner client = this.inner();
         return client.getAsync(resourceGroupName, serverName)
-        .map(new Func1<ServerSecurityAlertPolicyInner, ServerSecurityAlertPolicy>() {
+        .flatMap(new Func1<ServerSecurityAlertPolicyInner, Observable<ServerSecurityAlertPolicy>>() {
             @Override
-            public ServerSecurityAlertPolicy call(ServerSecurityAlertPolicyInner inner) {
-                return wrapModel(inner);
+            public Observable<ServerSecurityAlertPolicy> call(ServerSecurityAlertPolicyInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((ServerSecurityAlertPolicy)wrapModel(inner));
+                }
             }
        });
     }
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ServerSecurityAlertPoliciesInner.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ServerSecurityAlertPoliciesInner.java
index 27b30f79bb53..75c3a16469ad 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ServerSecurityAlertPoliciesInner.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ServerSecurityAlertPoliciesInner.java
@@ -71,7 +71,7 @@ interface ServerSecurityAlertPoliciesService {
     /**
      * Get a server's security alert policy.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws CloudException thrown if the request is rejected by server
@@ -85,7 +85,7 @@ public ServerSecurityAlertPolicyInner get(String resourceGroupName, String serve
     /**
      * Get a server's security alert policy.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -98,7 +98,7 @@ public ServiceFuture<ServerSecurityAlertPolicyInner> getAsync(String resourceGro
     /**
      * Get a server's security alert policy.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the ServerSecurityAlertPolicyInner object
@@ -115,7 +115,7 @@ public ServerSecurityAlertPolicyInner call(ServiceResponse<ServerSecurityAlertPo
     /**
      * Get a server's security alert policy.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the ServerSecurityAlertPolicyInner object
@@ -158,7 +158,7 @@ private ServiceResponse<ServerSecurityAlertPolicyInner> getDelegate(Response<Res
     /**
      * Creates or updates a threat detection policy.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param parameters The server security alert policy.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -173,7 +173,7 @@ public ServerSecurityAlertPolicyInner createOrUpdate(String resourceGroupName, S
     /**
      * Creates or updates a threat detection policy.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param parameters The server security alert policy.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
@@ -187,7 +187,7 @@ public ServiceFuture<ServerSecurityAlertPolicyInner> createOrUpdateAsync(String
     /**
      * Creates or updates a threat detection policy.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param parameters The server security alert policy.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -205,7 +205,7 @@ public ServerSecurityAlertPolicyInner call(ServiceResponse<ServerSecurityAlertPo
     /**
      * Creates or updates a threat detection policy.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param parameters The server security alert policy.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -236,7 +236,7 @@ public Observable<ServiceResponse<ServerSecurityAlertPolicyInner>> createOrUpdat
     /**
      * Creates or updates a threat detection policy.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param parameters The server security alert policy.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -251,7 +251,7 @@ public ServerSecurityAlertPolicyInner beginCreateOrUpdate(String resourceGroupNa
     /**
      * Creates or updates a threat detection policy.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param parameters The server security alert policy.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
@@ -265,7 +265,7 @@ public ServiceFuture<ServerSecurityAlertPolicyInner> beginCreateOrUpdateAsync(St
     /**
      * Creates or updates a threat detection policy.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param parameters The server security alert policy.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -283,7 +283,7 @@ public ServerSecurityAlertPolicyInner call(ServiceResponse<ServerSecurityAlertPo
     /**
      * Creates or updates a threat detection policy.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param parameters The server security alert policy.
      * @throws IllegalArgumentException thrown if parameters fail the validation
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ServerSecurityAlertPolicyImpl.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ServerSecurityAlertPolicyImpl.java
index 5a945cef3492..11a2a38161a4 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ServerSecurityAlertPolicyImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ServerSecurityAlertPolicyImpl.java
@@ -15,11 +15,11 @@
 import java.util.List;
 
 class ServerSecurityAlertPolicyImpl extends CreatableUpdatableImpl<ServerSecurityAlertPolicy, ServerSecurityAlertPolicyInner, ServerSecurityAlertPolicyImpl> implements ServerSecurityAlertPolicy, ServerSecurityAlertPolicy.Definition, ServerSecurityAlertPolicy.Update {
-    private final PostgreSQLManager manager;
+    private final DBforPostgreSQLManager manager;
     private String resourceGroupName;
     private String serverName;
 
-    ServerSecurityAlertPolicyImpl(String name, PostgreSQLManager manager) {
+    ServerSecurityAlertPolicyImpl(String name, DBforPostgreSQLManager manager) {
         super(name, new ServerSecurityAlertPolicyInner());
         this.manager = manager;
         // Set resource name
@@ -27,7 +27,7 @@ class ServerSecurityAlertPolicyImpl extends CreatableUpdatableImpl<ServerSecurit
         //
     }
 
-    ServerSecurityAlertPolicyImpl(ServerSecurityAlertPolicyInner inner, PostgreSQLManager manager) {
+    ServerSecurityAlertPolicyImpl(ServerSecurityAlertPolicyInner inner, DBforPostgreSQLManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -39,7 +39,7 @@ class ServerSecurityAlertPolicyImpl extends CreatableUpdatableImpl<ServerSecurit
     }
 
     @Override
-    public PostgreSQLManager manager() {
+    public DBforPostgreSQLManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ServerServerImpl.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ServerServerImpl.java
index c892c43fa3f5..a34c3a99d89a 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ServerServerImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ServerServerImpl.java
@@ -20,15 +20,15 @@
 import com.microsoft.azure.management.postgresql.v2017_12_01.ServerVersion;
 
 class ServerServerImpl extends WrapperImpl<ServerInner> implements ServerServer {
-    private final PostgreSQLManager manager;
+    private final DBforPostgreSQLManager manager;
 
-    ServerServerImpl(ServerInner inner,  PostgreSQLManager manager) {
+    ServerServerImpl(ServerInner inner,  DBforPostgreSQLManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public PostgreSQLManager manager() {
+    public DBforPostgreSQLManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ServersImpl.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ServersImpl.java
index e8837ac3f052..fb6351dc69d1 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ServersImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ServersImpl.java
@@ -23,8 +23,8 @@
 import com.microsoft.azure.PagedList;
 import com.microsoft.azure.Page;
 
-class ServersImpl extends GroupableResourcesCoreImpl<Server, ServerImpl, ServerInner, ServersInner, PostgreSQLManager>  implements Servers {
-    protected ServersImpl(PostgreSQLManager manager) {
+class ServersImpl extends GroupableResourcesCoreImpl<Server, ServerImpl, ServerInner, ServersInner, DBforPostgreSQLManager>  implements Servers {
+    protected ServersImpl(DBforPostgreSQLManager manager) {
         super(manager.inner().servers(), manager);
     }
 
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ServersInner.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ServersInner.java
index 32eca0cdefb1..a404a44ffb6b 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ServersInner.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/ServersInner.java
@@ -114,7 +114,7 @@ interface ServersService {
     /**
      * Creates a new server, or will overwrite an existing server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param parameters The required parameters for creating or updating a server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -129,7 +129,7 @@ public ServerInner create(String resourceGroupName, String serverName, ServerFor
     /**
      * Creates a new server, or will overwrite an existing server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param parameters The required parameters for creating or updating a server.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
@@ -143,7 +143,7 @@ public ServiceFuture<ServerInner> createAsync(String resourceGroupName, String s
     /**
      * Creates a new server, or will overwrite an existing server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param parameters The required parameters for creating or updating a server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -161,7 +161,7 @@ public ServerInner call(ServiceResponse<ServerInner> response) {
     /**
      * Creates a new server, or will overwrite an existing server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param parameters The required parameters for creating or updating a server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -191,7 +191,7 @@ public Observable<ServiceResponse<ServerInner>> createWithServiceResponseAsync(S
     /**
      * Creates a new server, or will overwrite an existing server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param parameters The required parameters for creating or updating a server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -206,7 +206,7 @@ public ServerInner beginCreate(String resourceGroupName, String serverName, Serv
     /**
      * Creates a new server, or will overwrite an existing server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param parameters The required parameters for creating or updating a server.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
@@ -220,7 +220,7 @@ public ServiceFuture<ServerInner> beginCreateAsync(String resourceGroupName, Str
     /**
      * Creates a new server, or will overwrite an existing server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param parameters The required parameters for creating or updating a server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -238,7 +238,7 @@ public ServerInner call(ServiceResponse<ServerInner> response) {
     /**
      * Creates a new server, or will overwrite an existing server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param parameters The required parameters for creating or updating a server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -287,7 +287,7 @@ private ServiceResponse<ServerInner> beginCreateDelegate(Response<ResponseBody>
     /**
      * Updates an existing server. The request body can contain one to many of the properties present in the normal server definition.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param parameters The required parameters for updating a server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -302,7 +302,7 @@ public ServerInner update(String resourceGroupName, String serverName, ServerUpd
     /**
      * Updates an existing server. The request body can contain one to many of the properties present in the normal server definition.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param parameters The required parameters for updating a server.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
@@ -316,7 +316,7 @@ public ServiceFuture<ServerInner> updateAsync(String resourceGroupName, String s
     /**
      * Updates an existing server. The request body can contain one to many of the properties present in the normal server definition.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param parameters The required parameters for updating a server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -334,7 +334,7 @@ public ServerInner call(ServiceResponse<ServerInner> response) {
     /**
      * Updates an existing server. The request body can contain one to many of the properties present in the normal server definition.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param parameters The required parameters for updating a server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -364,7 +364,7 @@ public Observable<ServiceResponse<ServerInner>> updateWithServiceResponseAsync(S
     /**
      * Updates an existing server. The request body can contain one to many of the properties present in the normal server definition.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param parameters The required parameters for updating a server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -379,7 +379,7 @@ public ServerInner beginUpdate(String resourceGroupName, String serverName, Serv
     /**
      * Updates an existing server. The request body can contain one to many of the properties present in the normal server definition.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param parameters The required parameters for updating a server.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
@@ -393,7 +393,7 @@ public ServiceFuture<ServerInner> beginUpdateAsync(String resourceGroupName, Str
     /**
      * Updates an existing server. The request body can contain one to many of the properties present in the normal server definition.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param parameters The required parameters for updating a server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -411,7 +411,7 @@ public ServerInner call(ServiceResponse<ServerInner> response) {
     /**
      * Updates an existing server. The request body can contain one to many of the properties present in the normal server definition.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param parameters The required parameters for updating a server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -459,7 +459,7 @@ private ServiceResponse<ServerInner> beginUpdateDelegate(Response<ResponseBody>
     /**
      * Deletes a server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws CloudException thrown if the request is rejected by server
@@ -472,7 +472,7 @@ public void delete(String resourceGroupName, String serverName) {
     /**
      * Deletes a server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -485,7 +485,7 @@ public ServiceFuture<Void> deleteAsync(String resourceGroupName, String serverNa
     /**
      * Deletes a server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
@@ -502,7 +502,7 @@ public Void call(ServiceResponse<Void> response) {
     /**
      * Deletes a server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
@@ -527,7 +527,7 @@ public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String r
     /**
      * Deletes a server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws CloudException thrown if the request is rejected by server
@@ -540,7 +540,7 @@ public void beginDelete(String resourceGroupName, String serverName) {
     /**
      * Deletes a server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -553,7 +553,7 @@ public ServiceFuture<Void> beginDeleteAsync(String resourceGroupName, String ser
     /**
      * Deletes a server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceResponse} object if successful.
@@ -570,7 +570,7 @@ public Void call(ServiceResponse<Void> response) {
     /**
      * Deletes a server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceResponse} object if successful.
@@ -614,7 +614,7 @@ private ServiceResponse<Void> beginDeleteDelegate(Response<ResponseBody> respons
     /**
      * Gets information about a server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws CloudException thrown if the request is rejected by server
@@ -628,7 +628,7 @@ public ServerInner getByResourceGroup(String resourceGroupName, String serverNam
     /**
      * Gets information about a server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -641,7 +641,7 @@ public ServiceFuture<ServerInner> getByResourceGroupAsync(String resourceGroupNa
     /**
      * Gets information about a server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the ServerInner object
@@ -658,7 +658,7 @@ public ServerInner call(ServiceResponse<ServerInner> response) {
     /**
      * Gets information about a server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the ServerInner object
@@ -700,7 +700,7 @@ private ServiceResponse<ServerInner> getByResourceGroupDelegate(Response<Respons
     /**
      * List all the servers in a given resource group.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @return the PagedList<ServerInner> object if successful.
      */
     public PagedList<ServerInner> listByResourceGroup(String resourceGroupName) {
@@ -718,7 +718,7 @@ public Page<ServerInner> nextPage(String nextPageLink) {
     /**
      * List all the servers in a given resource group.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @return the {@link ServiceFuture} object
      */
@@ -729,7 +729,7 @@ public ServiceFuture<List<ServerInner>> listByResourceGroupAsync(String resource
     /**
      * List all the servers in a given resource group.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @return the observable to the List&lt;ServerInner&gt; object
      */
     public Observable<Page<ServerInner>> listByResourceGroupAsync(String resourceGroupName) {
@@ -746,7 +746,7 @@ public Page<ServerInner> call(ServiceResponse<List<ServerInner>> response) {
     /**
      * List all the servers in a given resource group.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @return the observable to the List&lt;ServerInner&gt; object
      */
     public Observable<ServiceResponse<List<ServerInner>>> listByResourceGroupWithServiceResponseAsync(String resourceGroupName) {
@@ -869,7 +869,7 @@ private ServiceResponse<PageImpl<ServerInner>> listDelegate(Response<ResponseBod
     /**
      * Restarts a server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws CloudException thrown if the request is rejected by server
@@ -882,7 +882,7 @@ public void restart(String resourceGroupName, String serverName) {
     /**
      * Restarts a server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -895,7 +895,7 @@ public ServiceFuture<Void> restartAsync(String resourceGroupName, String serverN
     /**
      * Restarts a server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
@@ -912,7 +912,7 @@ public Void call(ServiceResponse<Void> response) {
     /**
      * Restarts a server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
@@ -937,7 +937,7 @@ public Observable<ServiceResponse<Void>> restartWithServiceResponseAsync(String
     /**
      * Restarts a server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws CloudException thrown if the request is rejected by server
@@ -950,7 +950,7 @@ public void beginRestart(String resourceGroupName, String serverName) {
     /**
      * Restarts a server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -963,7 +963,7 @@ public ServiceFuture<Void> beginRestartAsync(String resourceGroupName, String se
     /**
      * Restarts a server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceResponse} object if successful.
@@ -980,7 +980,7 @@ public Void call(ServiceResponse<Void> response) {
     /**
      * Restarts a server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceResponse} object if successful.
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/VirtualNetworkRuleImpl.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/VirtualNetworkRuleImpl.java
index f4a6eb2ef49b..87312511c33f 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/VirtualNetworkRuleImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/VirtualNetworkRuleImpl.java
@@ -14,12 +14,12 @@
 import com.microsoft.azure.management.postgresql.v2017_12_01.VirtualNetworkRuleState;
 
 class VirtualNetworkRuleImpl extends CreatableUpdatableImpl<VirtualNetworkRule, VirtualNetworkRuleInner, VirtualNetworkRuleImpl> implements VirtualNetworkRule, VirtualNetworkRule.Definition, VirtualNetworkRule.Update {
-    private final PostgreSQLManager manager;
+    private final DBforPostgreSQLManager manager;
     private String resourceGroupName;
     private String serverName;
     private String virtualNetworkRuleName;
 
-    VirtualNetworkRuleImpl(String name, PostgreSQLManager manager) {
+    VirtualNetworkRuleImpl(String name, DBforPostgreSQLManager manager) {
         super(name, new VirtualNetworkRuleInner());
         this.manager = manager;
         // Set resource name
@@ -27,7 +27,7 @@ class VirtualNetworkRuleImpl extends CreatableUpdatableImpl<VirtualNetworkRule,
         //
     }
 
-    VirtualNetworkRuleImpl(VirtualNetworkRuleInner inner, PostgreSQLManager manager) {
+    VirtualNetworkRuleImpl(VirtualNetworkRuleInner inner, DBforPostgreSQLManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -40,7 +40,7 @@ class VirtualNetworkRuleImpl extends CreatableUpdatableImpl<VirtualNetworkRule,
     }
 
     @Override
-    public PostgreSQLManager manager() {
+    public DBforPostgreSQLManager manager() {
         return this.manager;
     }
 
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/VirtualNetworkRulesImpl.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/VirtualNetworkRulesImpl.java
index c09f1166cb80..9feb43148e75 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/VirtualNetworkRulesImpl.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/VirtualNetworkRulesImpl.java
@@ -18,14 +18,14 @@
 import com.microsoft.azure.management.postgresql.v2017_12_01.VirtualNetworkRule;
 
 class VirtualNetworkRulesImpl extends WrapperImpl<VirtualNetworkRulesInner> implements VirtualNetworkRules {
-    private final PostgreSQLManager manager;
+    private final DBforPostgreSQLManager manager;
 
-    VirtualNetworkRulesImpl(PostgreSQLManager manager) {
+    VirtualNetworkRulesImpl(DBforPostgreSQLManager manager) {
         super(manager.inner().virtualNetworkRules());
         this.manager = manager;
     }
 
-    public PostgreSQLManager manager() {
+    public DBforPostgreSQLManager manager() {
         return this.manager;
     }
 
@@ -64,10 +64,14 @@ public VirtualNetworkRule call(VirtualNetworkRuleInner inner) {
     public Observable<VirtualNetworkRule> getAsync(String resourceGroupName, String serverName, String virtualNetworkRuleName) {
         VirtualNetworkRulesInner client = this.inner();
         return client.getAsync(resourceGroupName, serverName, virtualNetworkRuleName)
-        .map(new Func1<VirtualNetworkRuleInner, VirtualNetworkRule>() {
+        .flatMap(new Func1<VirtualNetworkRuleInner, Observable<VirtualNetworkRule>>() {
             @Override
-            public VirtualNetworkRule call(VirtualNetworkRuleInner inner) {
-                return wrapModel(inner);
+            public Observable<VirtualNetworkRule> call(VirtualNetworkRuleInner inner) {
+                if (inner == null) {
+                    return Observable.empty();
+                } else {
+                    return Observable.just((VirtualNetworkRule)wrapModel(inner));
+                }
             }
        });
     }
diff --git a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/VirtualNetworkRulesInner.java b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/VirtualNetworkRulesInner.java
index 851e49b39093..60e3df4d8d67 100644
--- a/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/VirtualNetworkRulesInner.java
+++ b/sdk/postgresql/mgmt-v2017_12_01/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01/implementation/VirtualNetworkRulesInner.java
@@ -94,7 +94,7 @@ interface VirtualNetworkRulesService {
     /**
      * Gets a virtual network rule.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param virtualNetworkRuleName The name of the virtual network rule.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -109,7 +109,7 @@ public VirtualNetworkRuleInner get(String resourceGroupName, String serverName,
     /**
      * Gets a virtual network rule.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param virtualNetworkRuleName The name of the virtual network rule.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
@@ -123,7 +123,7 @@ public ServiceFuture<VirtualNetworkRuleInner> getAsync(String resourceGroupName,
     /**
      * Gets a virtual network rule.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param virtualNetworkRuleName The name of the virtual network rule.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -141,7 +141,7 @@ public VirtualNetworkRuleInner call(ServiceResponse<VirtualNetworkRuleInner> res
     /**
      * Gets a virtual network rule.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param virtualNetworkRuleName The name of the virtual network rule.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -187,7 +187,7 @@ private ServiceResponse<VirtualNetworkRuleInner> getDelegate(Response<ResponseBo
     /**
      * Creates or updates an existing virtual network rule.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param virtualNetworkRuleName The name of the virtual network rule.
      * @param parameters The requested virtual Network Rule Resource state.
@@ -203,7 +203,7 @@ public VirtualNetworkRuleInner createOrUpdate(String resourceGroupName, String s
     /**
      * Creates or updates an existing virtual network rule.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param virtualNetworkRuleName The name of the virtual network rule.
      * @param parameters The requested virtual Network Rule Resource state.
@@ -218,7 +218,7 @@ public ServiceFuture<VirtualNetworkRuleInner> createOrUpdateAsync(String resourc
     /**
      * Creates or updates an existing virtual network rule.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param virtualNetworkRuleName The name of the virtual network rule.
      * @param parameters The requested virtual Network Rule Resource state.
@@ -237,7 +237,7 @@ public VirtualNetworkRuleInner call(ServiceResponse<VirtualNetworkRuleInner> res
     /**
      * Creates or updates an existing virtual network rule.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param virtualNetworkRuleName The name of the virtual network rule.
      * @param parameters The requested virtual Network Rule Resource state.
@@ -271,7 +271,7 @@ public Observable<ServiceResponse<VirtualNetworkRuleInner>> createOrUpdateWithSe
     /**
      * Creates or updates an existing virtual network rule.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param virtualNetworkRuleName The name of the virtual network rule.
      * @param parameters The requested virtual Network Rule Resource state.
@@ -287,7 +287,7 @@ public VirtualNetworkRuleInner beginCreateOrUpdate(String resourceGroupName, Str
     /**
      * Creates or updates an existing virtual network rule.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param virtualNetworkRuleName The name of the virtual network rule.
      * @param parameters The requested virtual Network Rule Resource state.
@@ -302,7 +302,7 @@ public ServiceFuture<VirtualNetworkRuleInner> beginCreateOrUpdateAsync(String re
     /**
      * Creates or updates an existing virtual network rule.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param virtualNetworkRuleName The name of the virtual network rule.
      * @param parameters The requested virtual Network Rule Resource state.
@@ -321,7 +321,7 @@ public VirtualNetworkRuleInner call(ServiceResponse<VirtualNetworkRuleInner> res
     /**
      * Creates or updates an existing virtual network rule.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param virtualNetworkRuleName The name of the virtual network rule.
      * @param parameters The requested virtual Network Rule Resource state.
@@ -374,7 +374,7 @@ private ServiceResponse<VirtualNetworkRuleInner> beginCreateOrUpdateDelegate(Res
     /**
      * Deletes the virtual network rule with the given name.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param virtualNetworkRuleName The name of the virtual network rule.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -388,7 +388,7 @@ public void delete(String resourceGroupName, String serverName, String virtualNe
     /**
      * Deletes the virtual network rule with the given name.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param virtualNetworkRuleName The name of the virtual network rule.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
@@ -402,7 +402,7 @@ public ServiceFuture<Void> deleteAsync(String resourceGroupName, String serverNa
     /**
      * Deletes the virtual network rule with the given name.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param virtualNetworkRuleName The name of the virtual network rule.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -420,7 +420,7 @@ public Void call(ServiceResponse<Void> response) {
     /**
      * Deletes the virtual network rule with the given name.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param virtualNetworkRuleName The name of the virtual network rule.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -449,7 +449,7 @@ public Observable<ServiceResponse<Void>> deleteWithServiceResponseAsync(String r
     /**
      * Deletes the virtual network rule with the given name.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param virtualNetworkRuleName The name of the virtual network rule.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -463,7 +463,7 @@ public void beginDelete(String resourceGroupName, String serverName, String virt
     /**
      * Deletes the virtual network rule with the given name.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param virtualNetworkRuleName The name of the virtual network rule.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
@@ -477,7 +477,7 @@ public ServiceFuture<Void> beginDeleteAsync(String resourceGroupName, String ser
     /**
      * Deletes the virtual network rule with the given name.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param virtualNetworkRuleName The name of the virtual network rule.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -495,7 +495,7 @@ public Void call(ServiceResponse<Void> response) {
     /**
      * Deletes the virtual network rule with the given name.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param virtualNetworkRuleName The name of the virtual network rule.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -543,7 +543,7 @@ private ServiceResponse<Void> beginDeleteDelegate(Response<ResponseBody> respons
     /**
      * Gets a list of virtual network rules in a server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws CloudException thrown if the request is rejected by server
@@ -563,7 +563,7 @@ public Page<VirtualNetworkRuleInner> nextPage(String nextPageLink) {
     /**
      * Gets a list of virtual network rules in a server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @param serviceCallback the async ServiceCallback to handle successful and failed responses.
      * @throws IllegalArgumentException thrown if parameters fail the validation
@@ -584,7 +584,7 @@ public Observable<ServiceResponse<Page<VirtualNetworkRuleInner>>> call(String ne
     /**
      * Gets a list of virtual network rules in a server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;VirtualNetworkRuleInner&gt; object
@@ -602,7 +602,7 @@ public Page<VirtualNetworkRuleInner> call(ServiceResponse<Page<VirtualNetworkRul
     /**
      * Gets a list of virtual network rules in a server.
      *
-     * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
      * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the PagedList&lt;VirtualNetworkRuleInner&gt; object
@@ -624,7 +624,7 @@ public Observable<ServiceResponse<Page<VirtualNetworkRuleInner>>> call(ServiceRe
     /**
      * Gets a list of virtual network rules in a server.
      *
-    ServiceResponse<PageImpl1<VirtualNetworkRuleInner>> * @param resourceGroupName The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.
+    ServiceResponse<PageImpl1<VirtualNetworkRuleInner>> * @param resourceGroupName The name of the resource group. The name is case insensitive.
     ServiceResponse<PageImpl1<VirtualNetworkRuleInner>> * @param serverName The name of the server.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the PagedList&lt;VirtualNetworkRuleInner&gt; object wrapped in {@link ServiceResponse} if successful.