diff --git a/postgresql/resource-manager/v2017_12_01_preview/pom.xml b/postgresql/resource-manager/v2017_12_01_preview/pom.xml
index b587a3e0f43e..034e9a686c58 100644
--- a/postgresql/resource-manager/v2017_12_01_preview/pom.xml
+++ b/postgresql/resource-manager/v2017_12_01_preview/pom.xml
@@ -11,10 +11,10 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.1.0</version>
-        <relativePath>../../../pom.management.xml</relativePath>
+        <version>0.0.3-beta</version>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
-    <artifactId>azure-mgmt-postgresql</artifactId>
+    <artifactId>azure-mgmt-dbforpostgresql</artifactId>
     <version>1.0.0-beta</version>
     <packaging>jar</packaging>
     <name>Microsoft Azure SDK for DBforPostgreSQL Management</name>
diff --git a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/Configuration.java b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/Configuration.java
index 6fee6d1c98d3..124e749d9cd8 100644
--- a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/Configuration.java
+++ b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/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_preview.implementation.PostgreSQLManager;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.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.
      */
diff --git a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/Database.java b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/Database.java
index 7b0ca1515493..da31dfcfd949 100644
--- a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/Database.java
+++ b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/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_preview.implementation.PostgreSQLManager;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.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.
      */
diff --git a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/FirewallRule.java b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/FirewallRule.java
index 4398beeacb83..3f407b3c6a39 100644
--- a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/FirewallRule.java
+++ b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/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_preview.implementation.PostgreSQLManager;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.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.
      */
diff --git a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/LogFile.java b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/LogFile.java
index d1dfc05ba0d2..bb7e582aa39e 100644
--- a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/LogFile.java
+++ b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/LogFile.java
@@ -11,13 +11,13 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.LogFileInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.PostgreSQLManager;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.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/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/NameAvailability.java b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/NameAvailability.java
index c6d2bb868600..885fd8c8840d 100644
--- a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/NameAvailability.java
+++ b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/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_preview.implementation.PostgreSQLManager;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.DBforPostgreSQLManager;
 import com.microsoft.azure.management.postgresql.v2017_12_01_preview.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/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/OperationListResult.java b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/OperationListResult.java
index f85e4fc6d7fd..4548703c92c1 100644
--- a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/OperationListResult.java
+++ b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/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_preview.implementation.PostgreSQLManager;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.DBforPostgreSQLManager;
 import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.OperationListResultInner;
 import com.microsoft.azure.management.postgresql.v2017_12_01_preview.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/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/PerformanceTierProperties.java b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/PerformanceTierProperties.java
index 96e5b561c016..d16d54b8425d 100644
--- a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/PerformanceTierProperties.java
+++ b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/PerformanceTierProperties.java
@@ -11,13 +11,13 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.PerformanceTierPropertiesInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.PostgreSQLManager;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.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/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/Server.java b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/Server.java
index 86d16a3e36d5..171a972ef7ac 100644
--- a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/Server.java
+++ b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/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_preview.implementation.PostgreSQLManager;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.DBforPostgreSQLManager;
 import org.joda.time.DateTime;
 import com.microsoft.azure.management.postgresql.v2017_12_01_preview.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/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerSecurityAlertPolicy.java b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerSecurityAlertPolicy.java
index a5339386f6dc..2beaad24bd0f 100644
--- a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerSecurityAlertPolicy.java
+++ b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/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_preview.implementation.PostgreSQLManager;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.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.
      */
diff --git a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerServer.java b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerServer.java
index 87a6c18619bb..c4c319ceb8d7 100644
--- a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerServer.java
+++ b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/ServerServer.java
@@ -11,14 +11,14 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.ServerInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.postgresql.v2017_12_01_preview.implementation.PostgreSQLManager;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.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/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/VirtualNetworkRule.java b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/VirtualNetworkRule.java
index 86ca46074630..e88c6162c26e 100644
--- a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/VirtualNetworkRule.java
+++ b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/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_preview.implementation.PostgreSQLManager;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.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.
      */
diff --git a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/CheckNameAvailabilitysImpl.java b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/CheckNameAvailabilitysImpl.java
index 3efd848712e1..1b0430de8362 100644
--- a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/CheckNameAvailabilitysImpl.java
+++ b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/CheckNameAvailabilitysImpl.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.management.postgresql.v2017_12_01_preview.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/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ConfigurationImpl.java b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ConfigurationImpl.java
index 5797fc860ef2..b678883daad3 100644
--- a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ConfigurationImpl.java
+++ b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/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/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ConfigurationsImpl.java b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ConfigurationsImpl.java
index 4521c0962d57..63b3bef0cb9d 100644
--- a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ConfigurationsImpl.java
+++ b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ConfigurationsImpl.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.management.postgresql.v2017_12_01_preview.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;
     }
 
diff --git a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/DBforPostgreSQLManager.java b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/DBforPostgreSQLManager.java
new file mode 100644
index 000000000000..6ee3eefd0ade
--- /dev/null
+++ b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/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_preview.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_preview.Servers;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.Replicas;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.FirewallRules;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.VirtualNetworkRules;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.Databases;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.Configurations;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.LogFiles;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.LocationBasedPerformanceTiers;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.CheckNameAvailabilitys;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.ServerSecurityAlertPolicies;
+import com.microsoft.azure.management.postgresql.v2017_12_01_preview.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/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/DatabaseImpl.java b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/DatabaseImpl.java
index 232cdf57c94e..2285abb344e7 100644
--- a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/DatabaseImpl.java
+++ b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/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/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/DatabasesImpl.java b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/DatabasesImpl.java
index 534bd7a4e216..2d96cda9cfc4 100644
--- a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/DatabasesImpl.java
+++ b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/DatabasesImpl.java
@@ -18,14 +18,14 @@
 import com.microsoft.azure.management.postgresql.v2017_12_01_preview.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;
     }
 
diff --git a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/FirewallRuleImpl.java b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/FirewallRuleImpl.java
index d077940aa779..c49be29bdfc5 100644
--- a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/FirewallRuleImpl.java
+++ b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/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/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/FirewallRulesImpl.java b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/FirewallRulesImpl.java
index 901ac58004cd..c17678c9fa24 100644
--- a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/FirewallRulesImpl.java
+++ b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/FirewallRulesImpl.java
@@ -18,14 +18,14 @@
 import com.microsoft.azure.management.postgresql.v2017_12_01_preview.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;
     }
 
diff --git a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/LocationBasedPerformanceTiersImpl.java b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/LocationBasedPerformanceTiersImpl.java
index bb1715b7c2dd..321af7ef8ed6 100644
--- a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/LocationBasedPerformanceTiersImpl.java
+++ b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/LocationBasedPerformanceTiersImpl.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.management.postgresql.v2017_12_01_preview.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/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/LogFileImpl.java b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/LogFileImpl.java
index 7b7f0d6a2957..d61a563596a9 100644
--- a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/LogFileImpl.java
+++ b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/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/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/LogFilesImpl.java b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/LogFilesImpl.java
index 97eefa1b6136..309d0344c16f 100644
--- a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/LogFilesImpl.java
+++ b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/LogFilesImpl.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.management.postgresql.v2017_12_01_preview.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/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/NameAvailabilityImpl.java b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/NameAvailabilityImpl.java
index f9a48025c369..53ff13d2adaf 100644
--- a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/NameAvailabilityImpl.java
+++ b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/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/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/OperationListResultImpl.java b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/OperationListResultImpl.java
index e699189ad89c..1b67e0f83432 100644
--- a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/OperationListResultImpl.java
+++ b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/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/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/OperationsImpl.java b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/OperationsImpl.java
index 65f024003a52..37106fa8aa57 100644
--- a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/OperationsImpl.java
+++ b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/OperationsImpl.java
@@ -16,14 +16,14 @@
 import com.microsoft.azure.management.postgresql.v2017_12_01_preview.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/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/PerformanceTierPropertiesImpl.java b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/PerformanceTierPropertiesImpl.java
index 87dceb2f6148..7f51ed8b9d78 100644
--- a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/PerformanceTierPropertiesImpl.java
+++ b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/PerformanceTierPropertiesImpl.java
@@ -15,15 +15,15 @@
 import com.microsoft.azure.management.postgresql.v2017_12_01_preview.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/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ReplicasImpl.java b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ReplicasImpl.java
index 4c3ed2ded43d..f7a603b4c6db 100644
--- a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ReplicasImpl.java
+++ b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ReplicasImpl.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.management.postgresql.v2017_12_01_preview.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/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ServerImpl.java b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ServerImpl.java
index d596fccc1c1d..e795fe19edd1 100644
--- a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ServerImpl.java
+++ b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ServerImpl.java
@@ -22,10 +22,10 @@
 import com.microsoft.azure.management.postgresql.v2017_12_01_preview.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/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ServerSecurityAlertPoliciesImpl.java b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ServerSecurityAlertPoliciesImpl.java
index 0066b19bcca4..7cb8bd8bad87 100644
--- a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ServerSecurityAlertPoliciesImpl.java
+++ b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ServerSecurityAlertPoliciesImpl.java
@@ -16,14 +16,14 @@
 import com.microsoft.azure.management.postgresql.v2017_12_01_preview.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;
     }
 
diff --git a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ServerSecurityAlertPolicyImpl.java b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ServerSecurityAlertPolicyImpl.java
index 5f877139b138..e3704ed55b71 100644
--- a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ServerSecurityAlertPolicyImpl.java
+++ b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/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/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ServerServerImpl.java b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ServerServerImpl.java
index b69a54c388b7..c7c788ed79f1 100644
--- a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ServerServerImpl.java
+++ b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ServerServerImpl.java
@@ -20,15 +20,15 @@
 import com.microsoft.azure.management.postgresql.v2017_12_01_preview.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/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ServersImpl.java b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ServersImpl.java
index a324de4d6f93..e7455b863aa5 100644
--- a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/ServersImpl.java
+++ b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/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/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/VirtualNetworkRuleImpl.java b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/VirtualNetworkRuleImpl.java
index b734dfa0b8b8..c44a1518c560 100644
--- a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/VirtualNetworkRuleImpl.java
+++ b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/VirtualNetworkRuleImpl.java
@@ -14,12 +14,12 @@
 import com.microsoft.azure.management.postgresql.v2017_12_01_preview.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/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/VirtualNetworkRulesImpl.java b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/VirtualNetworkRulesImpl.java
index cf064f9be85a..556499c7354f 100644
--- a/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/VirtualNetworkRulesImpl.java
+++ b/postgresql/resource-manager/v2017_12_01_preview/src/main/java/com/microsoft/azure/management/postgresql/v2017_12_01_preview/implementation/VirtualNetworkRulesImpl.java
@@ -18,14 +18,14 @@
 import com.microsoft.azure.management.postgresql.v2017_12_01_preview.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;
     }