diff --git a/cosmosdb/resource-manager/v2015_04_08/pom.xml b/cosmosdb/resource-manager/v2015_04_08/pom.xml
index 7cc67dbfebec1..03fa4a662c433 100644
--- a/cosmosdb/resource-manager/v2015_04_08/pom.xml
+++ b/cosmosdb/resource-manager/v2015_04_08/pom.xml
@@ -14,11 +14,11 @@
         <version>0.0.3-beta</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
-    <artifactId>azure-mgmt-documentdb</artifactId>
+    <artifactId>azure-mgmt-cosmosdb</artifactId>
     <version>1.0.0-beta</version>
     <packaging>jar</packaging>
-    <name>Microsoft Azure SDK for DocumentDB Management</name>
-    <description>This package contains Microsoft DocumentDB Management SDK.</description>
+    <name>Microsoft Azure SDK for CosmosDB Management</name>
+    <description>This package contains Microsoft CosmosDB Management SDK.</description>
     <url>https://github.com/Azure/azure-sdk-for-java</url>
     <licenses>
         <license>
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/CassandraKeyspace.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/CassandraKeyspace.java
index 2251b52f3cd65..c67f335d7cbd0 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/CassandraKeyspace.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/CassandraKeyspace.java
@@ -15,13 +15,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.cosmosdb.v2015_04_08.implementation.DocumentDBManager;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.CosmosDBManager;
 import java.util.Map;
 
 /**
  * Type representing CassandraKeyspace.
  */
-public interface CassandraKeyspace extends HasInner<CassandraKeyspaceInner>, Indexable, Updatable<CassandraKeyspace.Update>, HasManager<DocumentDBManager> {
+public interface CassandraKeyspace extends HasInner<CassandraKeyspaceInner>, Indexable, Updatable<CassandraKeyspace.Update>, HasManager<CosmosDBManager> {
     /**
      * @return the cassandraKeyspaceId value.
      */
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/CassandraTable.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/CassandraTable.java
index ac9e74069ab8b..7057423db00fd 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/CassandraTable.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/CassandraTable.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.DocumentDBManager;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.CosmosDBManager;
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.CassandraTableInner;
 import java.util.Map;
 
 /**
  * Type representing CassandraTable.
  */
-public interface CassandraTable extends HasInner<CassandraTableInner>, HasManager<DocumentDBManager> {
+public interface CassandraTable extends HasInner<CassandraTableInner>, HasManager<CosmosDBManager> {
     /**
      * @return the cassandraTableId value.
      */
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/CollectionDatabasisDatabaseAccountMetric.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/CollectionDatabasisDatabaseAccountMetric.java
index c66ba45a57a7e..f810406137647 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/CollectionDatabasisDatabaseAccountMetric.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/CollectionDatabasisDatabaseAccountMetric.java
@@ -11,14 +11,14 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.MetricInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.DocumentDBManager;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.CosmosDBManager;
 import org.joda.time.DateTime;
 import java.util.List;
 
 /**
  * Type representing CollectionDatabasisDatabaseAccountMetric.
  */
-public interface CollectionDatabasisDatabaseAccountMetric extends HasInner<MetricInner>, HasManager<DocumentDBManager> {
+public interface CollectionDatabasisDatabaseAccountMetric extends HasInner<MetricInner>, HasManager<CosmosDBManager> {
     /**
      * @return the endTime value.
      */
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/CollectionDatabasisDatabaseAccountMetricDefinition.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/CollectionDatabasisDatabaseAccountMetricDefinition.java
index 40fd314c0d95a..5253f6b6fc18a 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/CollectionDatabasisDatabaseAccountMetricDefinition.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/CollectionDatabasisDatabaseAccountMetricDefinition.java
@@ -11,13 +11,13 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.MetricDefinitionInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.DocumentDBManager;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.CosmosDBManager;
 import java.util.List;
 
 /**
  * Type representing CollectionDatabasisDatabaseAccountMetricDefinition.
  */
-public interface CollectionDatabasisDatabaseAccountMetricDefinition extends HasInner<MetricDefinitionInner>, HasManager<DocumentDBManager> {
+public interface CollectionDatabasisDatabaseAccountMetricDefinition extends HasInner<MetricDefinitionInner>, HasManager<CosmosDBManager> {
     /**
      * @return the metricAvailabilities value.
      */
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/CollectionDatabasisDatabaseAccountMetricModel.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/CollectionDatabasisDatabaseAccountMetricModel.java
index 4888a071fa38e..627840565ec27 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/CollectionDatabasisDatabaseAccountMetricModel.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/CollectionDatabasisDatabaseAccountMetricModel.java
@@ -11,14 +11,14 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.MetricInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.DocumentDBManager;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.CosmosDBManager;
 import org.joda.time.DateTime;
 import java.util.List;
 
 /**
  * Type representing CollectionDatabasisDatabaseAccountMetricModel.
  */
-public interface CollectionDatabasisDatabaseAccountMetricModel extends HasInner<MetricInner>, HasManager<DocumentDBManager> {
+public interface CollectionDatabasisDatabaseAccountMetricModel extends HasInner<MetricInner>, HasManager<CosmosDBManager> {
     /**
      * @return the endTime value.
      */
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/CollectionDatabasisDatabaseAccountUsage.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/CollectionDatabasisDatabaseAccountUsage.java
index 1591f221890f8..1ad433e3a8cc1 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/CollectionDatabasisDatabaseAccountUsage.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/CollectionDatabasisDatabaseAccountUsage.java
@@ -11,12 +11,12 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.UsageInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.DocumentDBManager;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.CosmosDBManager;
 
 /**
  * Type representing CollectionDatabasisDatabaseAccountUsage.
  */
-public interface CollectionDatabasisDatabaseAccountUsage extends HasInner<UsageInner>, HasManager<DocumentDBManager> {
+public interface CollectionDatabasisDatabaseAccountUsage extends HasInner<UsageInner>, HasManager<CosmosDBManager> {
     /**
      * @return the currentValue value.
      */
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabaseAccount.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabaseAccount.java
index 882b094268b50..be9c08fbd3bbd 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabaseAccount.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabaseAccount.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.cosmosdb.v2015_04_08.implementation.DocumentDBManager;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.CosmosDBManager;
 import java.util.List;
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.DatabaseAccountInner;
 
 /**
  * Type representing DatabaseAccount.
  */
-public interface DatabaseAccount extends HasInner<DatabaseAccountInner>, Resource, GroupableResourceCore<DocumentDBManager, DatabaseAccountInner>, HasResourceGroup, Refreshable<DatabaseAccount>, Updatable<DatabaseAccount.Update>, HasManager<DocumentDBManager> {
+public interface DatabaseAccount extends HasInner<DatabaseAccountInner>, Resource, GroupableResourceCore<CosmosDBManager, DatabaseAccountInner>, HasResourceGroup, Refreshable<DatabaseAccount>, Updatable<DatabaseAccount.Update>, HasManager<CosmosDBManager> {
     /**
      * @return the capabilities value.
      */
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabaseAccountListConnectionStringsResult.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabaseAccountListConnectionStringsResult.java
index 255389aeb63ca..65bbe6cb9199f 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabaseAccountListConnectionStringsResult.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabaseAccountListConnectionStringsResult.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.DocumentDBManager;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.CosmosDBManager;
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.DatabaseAccountListConnectionStringsResultInner;
 import java.util.List;
 
 /**
  * Type representing DatabaseAccountListConnectionStringsResult.
  */
-public interface DatabaseAccountListConnectionStringsResult extends HasInner<DatabaseAccountListConnectionStringsResultInner>, HasManager<DocumentDBManager> {
+public interface DatabaseAccountListConnectionStringsResult extends HasInner<DatabaseAccountListConnectionStringsResultInner>, HasManager<CosmosDBManager> {
     /**
      * @return the connectionStrings value.
      */
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabaseAccountListKeysResult.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabaseAccountListKeysResult.java
index 08a891e075703..b0c705cad2846 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabaseAccountListKeysResult.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabaseAccountListKeysResult.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.cosmosdb.v2015_04_08.implementation.DocumentDBManager;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.CosmosDBManager;
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.DatabaseAccountListKeysResultInner;
 
 /**
  * Type representing DatabaseAccountListKeysResult.
  */
-public interface DatabaseAccountListKeysResult extends HasInner<DatabaseAccountListKeysResultInner>, HasManager<DocumentDBManager> {
+public interface DatabaseAccountListKeysResult extends HasInner<DatabaseAccountListKeysResultInner>, HasManager<CosmosDBManager> {
     /**
      * @return the primaryMasterKey value.
      */
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabaseAccountListReadOnlyKeysResult.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabaseAccountListReadOnlyKeysResult.java
index 7494d93590132..613b002ed9ee4 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabaseAccountListReadOnlyKeysResult.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabaseAccountListReadOnlyKeysResult.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.cosmosdb.v2015_04_08.implementation.DocumentDBManager;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.CosmosDBManager;
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.DatabaseAccountListReadOnlyKeysResultInner;
 
 /**
  * Type representing DatabaseAccountListReadOnlyKeysResult.
  */
-public interface DatabaseAccountListReadOnlyKeysResult extends HasInner<DatabaseAccountListReadOnlyKeysResultInner>, HasManager<DocumentDBManager> {
+public interface DatabaseAccountListReadOnlyKeysResult extends HasInner<DatabaseAccountListReadOnlyKeysResultInner>, HasManager<CosmosDBManager> {
     /**
      * @return the primaryReadonlyMasterKey value.
      */
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabaseAccountMetric.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabaseAccountMetric.java
index 0b7368ff0045a..e2b422e5cdc06 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabaseAccountMetric.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabaseAccountMetric.java
@@ -11,14 +11,14 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.MetricInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.DocumentDBManager;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.CosmosDBManager;
 import org.joda.time.DateTime;
 import java.util.List;
 
 /**
  * Type representing DatabaseAccountMetric.
  */
-public interface DatabaseAccountMetric extends HasInner<MetricInner>, HasManager<DocumentDBManager> {
+public interface DatabaseAccountMetric extends HasInner<MetricInner>, HasManager<CosmosDBManager> {
     /**
      * @return the endTime value.
      */
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabaseAccountMetricDefinition.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabaseAccountMetricDefinition.java
index 706f921065bef..c2256d7c4028a 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabaseAccountMetricDefinition.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabaseAccountMetricDefinition.java
@@ -11,13 +11,13 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.MetricDefinitionInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.DocumentDBManager;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.CosmosDBManager;
 import java.util.List;
 
 /**
  * Type representing DatabaseAccountMetricDefinition.
  */
-public interface DatabaseAccountMetricDefinition extends HasInner<MetricDefinitionInner>, HasManager<DocumentDBManager> {
+public interface DatabaseAccountMetricDefinition extends HasInner<MetricDefinitionInner>, HasManager<CosmosDBManager> {
     /**
      * @return the metricAvailabilities value.
      */
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabaseAccountUsage.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabaseAccountUsage.java
index 370396418cfcd..0b34841eb8cc8 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabaseAccountUsage.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabaseAccountUsage.java
@@ -11,12 +11,12 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.UsageInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.DocumentDBManager;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.CosmosDBManager;
 
 /**
  * Type representing DatabaseAccountUsage.
  */
-public interface DatabaseAccountUsage extends HasInner<UsageInner>, HasManager<DocumentDBManager> {
+public interface DatabaseAccountUsage extends HasInner<UsageInner>, HasManager<CosmosDBManager> {
     /**
      * @return the currentValue value.
      */
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabasisDatabaseAccountMetric.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabasisDatabaseAccountMetric.java
index 9afba95e1fc0c..ae60f081859b9 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabasisDatabaseAccountMetric.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabasisDatabaseAccountMetric.java
@@ -11,14 +11,14 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.MetricInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.DocumentDBManager;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.CosmosDBManager;
 import org.joda.time.DateTime;
 import java.util.List;
 
 /**
  * Type representing DatabasisDatabaseAccountMetric.
  */
-public interface DatabasisDatabaseAccountMetric extends HasInner<MetricInner>, HasManager<DocumentDBManager> {
+public interface DatabasisDatabaseAccountMetric extends HasInner<MetricInner>, HasManager<CosmosDBManager> {
     /**
      * @return the endTime value.
      */
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabasisDatabaseAccountMetricDefinition.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabasisDatabaseAccountMetricDefinition.java
index afdc01b240101..402b93eaec630 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabasisDatabaseAccountMetricDefinition.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabasisDatabaseAccountMetricDefinition.java
@@ -11,13 +11,13 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.MetricDefinitionInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.DocumentDBManager;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.CosmosDBManager;
 import java.util.List;
 
 /**
  * Type representing DatabasisDatabaseAccountMetricDefinition.
  */
-public interface DatabasisDatabaseAccountMetricDefinition extends HasInner<MetricDefinitionInner>, HasManager<DocumentDBManager> {
+public interface DatabasisDatabaseAccountMetricDefinition extends HasInner<MetricDefinitionInner>, HasManager<CosmosDBManager> {
     /**
      * @return the metricAvailabilities value.
      */
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabasisDatabaseAccountUsage.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabasisDatabaseAccountUsage.java
index 8c76812216647..c3e19ca660f15 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabasisDatabaseAccountUsage.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/DatabasisDatabaseAccountUsage.java
@@ -11,12 +11,12 @@
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.UsageInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.DocumentDBManager;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.CosmosDBManager;
 
 /**
  * Type representing DatabasisDatabaseAccountUsage.
  */
-public interface DatabasisDatabaseAccountUsage extends HasInner<UsageInner>, HasManager<DocumentDBManager> {
+public interface DatabasisDatabaseAccountUsage extends HasInner<UsageInner>, HasManager<CosmosDBManager> {
     /**
      * @return the currentValue value.
      */
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/GremlinDatabase.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/GremlinDatabase.java
index 8ff9b3af01588..b8c32d3663936 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/GremlinDatabase.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/GremlinDatabase.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.DocumentDBManager;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.CosmosDBManager;
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.GremlinDatabaseInner;
 import java.util.Map;
 
 /**
  * Type representing GremlinDatabase.
  */
-public interface GremlinDatabase extends HasInner<GremlinDatabaseInner>, HasManager<DocumentDBManager> {
+public interface GremlinDatabase extends HasInner<GremlinDatabaseInner>, HasManager<CosmosDBManager> {
     /**
      * @return the _etag value.
      */
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/GremlinGraph.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/GremlinGraph.java
index 414994b9ce599..e14a006984bcf 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/GremlinGraph.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/GremlinGraph.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.cosmosdb.v2015_04_08.implementation.DocumentDBManager;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.CosmosDBManager;
 import java.util.Map;
 
 /**
  * Type representing GremlinGraph.
  */
-public interface GremlinGraph extends HasInner<GremlinGraphInner>, Indexable, Refreshable<GremlinGraph>, Updatable<GremlinGraph.Update>, HasManager<DocumentDBManager> {
+public interface GremlinGraph extends HasInner<GremlinGraphInner>, Indexable, Refreshable<GremlinGraph>, Updatable<GremlinGraph.Update>, HasManager<CosmosDBManager> {
     /**
      * @return the _etag value.
      */
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/MongoDBCollection.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/MongoDBCollection.java
index b4ea34cf10af3..58c275266a0a9 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/MongoDBCollection.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/MongoDBCollection.java
@@ -16,14 +16,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.cosmosdb.v2015_04_08.implementation.DocumentDBManager;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.CosmosDBManager;
 import java.util.Map;
 import java.util.List;
 
 /**
  * Type representing MongoDBCollection.
  */
-public interface MongoDBCollection extends HasInner<MongoDBCollectionInner>, Indexable, Refreshable<MongoDBCollection>, Updatable<MongoDBCollection.Update>, HasManager<DocumentDBManager> {
+public interface MongoDBCollection extends HasInner<MongoDBCollectionInner>, Indexable, Refreshable<MongoDBCollection>, Updatable<MongoDBCollection.Update>, HasManager<CosmosDBManager> {
     /**
      * @return the id value.
      */
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/MongoDBDatabase.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/MongoDBDatabase.java
index d1be5a7efe2aa..bb3b51f8538f3 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/MongoDBDatabase.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/MongoDBDatabase.java
@@ -10,14 +10,14 @@
 
 import com.microsoft.azure.arm.model.HasInner;
 import com.microsoft.azure.arm.resources.models.HasManager;
-import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.DocumentDBManager;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.CosmosDBManager;
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.MongoDBDatabaseInner;
 import java.util.Map;
 
 /**
  * Type representing MongoDBDatabase.
  */
-public interface MongoDBDatabase extends HasInner<MongoDBDatabaseInner>, HasManager<DocumentDBManager> {
+public interface MongoDBDatabase extends HasInner<MongoDBDatabaseInner>, HasManager<CosmosDBManager> {
     /**
      * @return the id value.
      */
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/Operation.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/Operation.java
index 5e818fbdb5554..e7b6d0f15616d 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/Operation.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/Operation.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.cosmosdb.v2015_04_08.implementation.DocumentDBManager;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.CosmosDBManager;
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.OperationInner;
 
 /**
  * Type representing Operation.
  */
-public interface Operation extends HasInner<OperationInner>, HasManager<DocumentDBManager> {
+public interface Operation extends HasInner<OperationInner>, HasManager<CosmosDBManager> {
     /**
      * @return the display value.
      */
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/PartitionMetric.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/PartitionMetric.java
index 11bc2c53eabe0..f71b2da26643c 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/PartitionMetric.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/PartitionMetric.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.cosmosdb.v2015_04_08.implementation.DocumentDBManager;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.CosmosDBManager;
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.PartitionMetricInner;
 import org.joda.time.DateTime;
 import java.util.List;
@@ -18,7 +18,7 @@
 /**
  * Type representing PartitionMetric.
  */
-public interface PartitionMetric extends HasInner<PartitionMetricInner>, HasManager<DocumentDBManager> {
+public interface PartitionMetric extends HasInner<PartitionMetricInner>, HasManager<CosmosDBManager> {
     /**
      * @return the endTime value.
      */
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/PartitionUsage.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/PartitionUsage.java
index 847e364e86b7b..4539c8a466f44 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/PartitionUsage.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/PartitionUsage.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.cosmosdb.v2015_04_08.implementation.DocumentDBManager;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.CosmosDBManager;
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.PartitionUsageInner;
 
 /**
  * Type representing PartitionUsage.
  */
-public interface PartitionUsage extends HasInner<PartitionUsageInner>, HasManager<DocumentDBManager> {
+public interface PartitionUsage extends HasInner<PartitionUsageInner>, HasManager<CosmosDBManager> {
     /**
      * @return the currentValue value.
      */
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/PercentileMetric.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/PercentileMetric.java
index 7f2d36d579713..68e2b873d3ae7 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/PercentileMetric.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/PercentileMetric.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.cosmosdb.v2015_04_08.implementation.DocumentDBManager;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.CosmosDBManager;
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.PercentileMetricInner;
 import org.joda.time.DateTime;
 import java.util.List;
@@ -18,7 +18,7 @@
 /**
  * Type representing PercentileMetric.
  */
-public interface PercentileMetric extends HasInner<PercentileMetricInner>, HasManager<DocumentDBManager> {
+public interface PercentileMetric extends HasInner<PercentileMetricInner>, HasManager<CosmosDBManager> {
     /**
      * @return the endTime value.
      */
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/SqlContainer.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/SqlContainer.java
index dfec6b5c39774..8aa6050c80c1c 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/SqlContainer.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/SqlContainer.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.cosmosdb.v2015_04_08.implementation.DocumentDBManager;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.CosmosDBManager;
 import java.util.Map;
 
 /**
  * Type representing SqlContainer.
  */
-public interface SqlContainer extends HasInner<SqlContainerInner>, Indexable, Refreshable<SqlContainer>, Updatable<SqlContainer.Update>, HasManager<DocumentDBManager> {
+public interface SqlContainer extends HasInner<SqlContainerInner>, Indexable, Refreshable<SqlContainer>, Updatable<SqlContainer.Update>, HasManager<CosmosDBManager> {
     /**
      * @return the _etag value.
      */
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/SqlDatabase.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/SqlDatabase.java
index e1d40076484a3..d397725febaaf 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/SqlDatabase.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/SqlDatabase.java
@@ -15,13 +15,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.cosmosdb.v2015_04_08.implementation.DocumentDBManager;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.CosmosDBManager;
 import java.util.Map;
 
 /**
  * Type representing SqlDatabase.
  */
-public interface SqlDatabase extends HasInner<SqlDatabaseInner>, Indexable, Updatable<SqlDatabase.Update>, HasManager<DocumentDBManager> {
+public interface SqlDatabase extends HasInner<SqlDatabaseInner>, Indexable, Updatable<SqlDatabase.Update>, HasManager<CosmosDBManager> {
     /**
      * @return the _colls value.
      */
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/Table.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/Table.java
index b38bf4062b6e1..cf4de75027932 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/Table.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/Table.java
@@ -15,13 +15,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.cosmosdb.v2015_04_08.implementation.DocumentDBManager;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation.CosmosDBManager;
 import java.util.Map;
 
 /**
  * Type representing Table.
  */
-public interface Table extends HasInner<TableInner>, Indexable, Updatable<Table.Update>, HasManager<DocumentDBManager> {
+public interface Table extends HasInner<TableInner>, Indexable, Updatable<Table.Update>, HasManager<CosmosDBManager> {
     /**
      * @return the id value.
      */
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CassandraKeyspaceImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CassandraKeyspaceImpl.java
index 818c2db031e89..f4d1d9eea2958 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CassandraKeyspaceImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CassandraKeyspaceImpl.java
@@ -17,13 +17,13 @@
 import rx.functions.Func1;
 
 class CassandraKeyspaceImpl extends CreatableUpdatableImpl<CassandraKeyspace, CassandraKeyspaceInner, CassandraKeyspaceImpl> implements CassandraKeyspace, CassandraKeyspace.Definition, CassandraKeyspace.Update {
-    private final DocumentDBManager manager;
+    private final CosmosDBManager manager;
     private String resourceGroupName;
     private String accountName;
     private String keyspaceName;
     private CassandraKeyspaceCreateUpdateParameters createOrUpdateParameter;
 
-    CassandraKeyspaceImpl(String name, DocumentDBManager manager) {
+    CassandraKeyspaceImpl(String name, CosmosDBManager manager) {
         super(name, new CassandraKeyspaceInner());
         this.manager = manager;
         // Set resource name
@@ -32,7 +32,7 @@ class CassandraKeyspaceImpl extends CreatableUpdatableImpl<CassandraKeyspace, Ca
         this.createOrUpdateParameter = new CassandraKeyspaceCreateUpdateParameters();
     }
 
-    CassandraKeyspaceImpl(CassandraKeyspaceInner inner, DocumentDBManager manager) {
+    CassandraKeyspaceImpl(CassandraKeyspaceInner inner, CosmosDBManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -46,7 +46,7 @@ class CassandraKeyspaceImpl extends CreatableUpdatableImpl<CassandraKeyspace, Ca
     }
 
     @Override
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CassandraTableImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CassandraTableImpl.java
index da23e8adbeaf7..ffca343b0776c 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CassandraTableImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CassandraTableImpl.java
@@ -14,14 +14,14 @@
 import java.util.Map;
 
 class CassandraTableImpl extends WrapperImpl<CassandraTableInner> implements CassandraTable {
-    private final DocumentDBManager manager;
-    CassandraTableImpl(CassandraTableInner inner, DocumentDBManager manager) {
+    private final CosmosDBManager manager;
+    CassandraTableImpl(CassandraTableInner inner, CosmosDBManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionDatabasisDatabaseAccountMetricDefinitionImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionDatabasisDatabaseAccountMetricDefinitionImpl.java
index 9740d4454a4f2..02371675fc109 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionDatabasisDatabaseAccountMetricDefinitionImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionDatabasisDatabaseAccountMetricDefinitionImpl.java
@@ -18,15 +18,15 @@
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.UnitType;
 
 class CollectionDatabasisDatabaseAccountMetricDefinitionImpl extends WrapperImpl<MetricDefinitionInner> implements CollectionDatabasisDatabaseAccountMetricDefinition {
-    private final DocumentDBManager manager;
+    private final CosmosDBManager manager;
 
-    CollectionDatabasisDatabaseAccountMetricDefinitionImpl(MetricDefinitionInner inner,  DocumentDBManager manager) {
+    CollectionDatabasisDatabaseAccountMetricDefinitionImpl(MetricDefinitionInner inner,  CosmosDBManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionDatabasisDatabaseAccountMetricImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionDatabasisDatabaseAccountMetricImpl.java
index 4da43274b3ce3..7466fb10b2b54 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionDatabasisDatabaseAccountMetricImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionDatabasisDatabaseAccountMetricImpl.java
@@ -18,15 +18,15 @@
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.UnitType;
 
 class CollectionDatabasisDatabaseAccountMetricImpl extends WrapperImpl<MetricInner> implements CollectionDatabasisDatabaseAccountMetric {
-    private final DocumentDBManager manager;
+    private final CosmosDBManager manager;
 
-    CollectionDatabasisDatabaseAccountMetricImpl(MetricInner inner,  DocumentDBManager manager) {
+    CollectionDatabasisDatabaseAccountMetricImpl(MetricInner inner,  CosmosDBManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionDatabasisDatabaseAccountMetricModelImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionDatabasisDatabaseAccountMetricModelImpl.java
index e4eb3cabfc6cc..5f815efff1d99 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionDatabasisDatabaseAccountMetricModelImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionDatabasisDatabaseAccountMetricModelImpl.java
@@ -18,15 +18,15 @@
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.UnitType;
 
 class CollectionDatabasisDatabaseAccountMetricModelImpl extends WrapperImpl<MetricInner> implements CollectionDatabasisDatabaseAccountMetricModel {
-    private final DocumentDBManager manager;
+    private final CosmosDBManager manager;
 
-    CollectionDatabasisDatabaseAccountMetricModelImpl(MetricInner inner,  DocumentDBManager manager) {
+    CollectionDatabasisDatabaseAccountMetricModelImpl(MetricInner inner,  CosmosDBManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionDatabasisDatabaseAccountUsageImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionDatabasisDatabaseAccountUsageImpl.java
index 772bde1ba255d..58bff3568d7d7 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionDatabasisDatabaseAccountUsageImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionDatabasisDatabaseAccountUsageImpl.java
@@ -15,15 +15,15 @@
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.UnitType;
 
 class CollectionDatabasisDatabaseAccountUsageImpl extends WrapperImpl<UsageInner> implements CollectionDatabasisDatabaseAccountUsage {
-    private final DocumentDBManager manager;
+    private final CosmosDBManager manager;
 
-    CollectionDatabasisDatabaseAccountUsageImpl(UsageInner inner,  DocumentDBManager manager) {
+    CollectionDatabasisDatabaseAccountUsageImpl(UsageInner inner,  CosmosDBManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionPartitionRegionsImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionPartitionRegionsImpl.java
index d01841ba96419..6609614351cef 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionPartitionRegionsImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionPartitionRegionsImpl.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.PartitionMetric;
 
 class CollectionPartitionRegionsImpl extends WrapperImpl<CollectionPartitionRegionsInner> implements CollectionPartitionRegions {
-    private final DocumentDBManager manager;
+    private final CosmosDBManager manager;
 
-    CollectionPartitionRegionsImpl(DocumentDBManager manager) {
+    CollectionPartitionRegionsImpl(CosmosDBManager manager) {
         super(manager.inner().collectionPartitionRegions());
         this.manager = manager;
     }
 
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionPartitionsImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionPartitionsImpl.java
index b5d97383a1db1..339fc60ee5b25 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionPartitionsImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionPartitionsImpl.java
@@ -18,14 +18,14 @@
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.PartitionUsage;
 
 class CollectionPartitionsImpl extends WrapperImpl<CollectionPartitionsInner> implements CollectionPartitions {
-    private final DocumentDBManager manager;
+    private final CosmosDBManager manager;
 
-    CollectionPartitionsImpl(DocumentDBManager manager) {
+    CollectionPartitionsImpl(CosmosDBManager manager) {
         super(manager.inner().collectionPartitions());
         this.manager = manager;
     }
 
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionRegionsImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionRegionsImpl.java
index 4a336d95fd423..137254e531a34 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionRegionsImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionRegionsImpl.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.CollectionDatabasisDatabaseAccountMetricModel;
 
 class CollectionRegionsImpl extends WrapperImpl<CollectionRegionsInner> implements CollectionRegions {
-    private final DocumentDBManager manager;
+    private final CosmosDBManager manager;
 
-    CollectionRegionsImpl(DocumentDBManager manager) {
+    CollectionRegionsImpl(CosmosDBManager manager) {
         super(manager.inner().collectionRegions());
         this.manager = manager;
     }
 
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionsImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionsImpl.java
index 30fd87c48f14f..60accebd7f345 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionsImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionsImpl.java
@@ -19,14 +19,14 @@
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.CollectionDatabasisDatabaseAccountUsage;
 
 class CollectionsImpl extends WrapperImpl<CollectionsInner> implements Collections {
-    private final DocumentDBManager manager;
+    private final CosmosDBManager manager;
 
-    CollectionsImpl(DocumentDBManager manager) {
+    CollectionsImpl(CosmosDBManager manager) {
         super(manager.inner().collections());
         this.manager = manager;
     }
 
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CosmosDBManager.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CosmosDBManager.java
new file mode 100644
index 0000000000000..942623450e845
--- /dev/null
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CosmosDBManager.java
@@ -0,0 +1,243 @@
+/**
+ * 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.cosmosdb.v2015_04_08.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.cosmosdb.v2015_04_08.DatabaseAccounts;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.Operations;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.Databases;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.Collections;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.CollectionRegions;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.DatabaseAccountRegions;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.PercentileSourceTargets;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.PercentileTargets;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.Percentiles;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.CollectionPartitionRegions;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.CollectionPartitions;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.PartitionKeyRangeIds;
+import com.microsoft.azure.management.cosmosdb.v2015_04_08.PartitionKeyRangeIdRegions;
+import com.microsoft.azure.arm.resources.implementation.AzureConfigurableCoreImpl;
+import com.microsoft.azure.arm.resources.implementation.ManagerCore;
+
+/**
+ * Entry point to Azure CosmosDB resource management.
+ */
+public final class CosmosDBManager extends ManagerCore<CosmosDBManager, CosmosDBImpl> {
+    private DatabaseAccounts databaseAccounts;
+    private Operations operations;
+    private Databases databases;
+    private Collections collections;
+    private CollectionRegions collectionRegions;
+    private DatabaseAccountRegions databaseAccountRegions;
+    private PercentileSourceTargets percentileSourceTargets;
+    private PercentileTargets percentileTargets;
+    private Percentiles percentiles;
+    private CollectionPartitionRegions collectionPartitionRegions;
+    private CollectionPartitions collectionPartitions;
+    private PartitionKeyRangeIds partitionKeyRangeIds;
+    private PartitionKeyRangeIdRegions partitionKeyRangeIdRegions;
+    /**
+    * Get a Configurable instance that can be used to create CosmosDBManager with optional configuration.
+    *
+    * @return the instance allowing configurations
+    */
+    public static Configurable configure() {
+        return new CosmosDBManager.ConfigurableImpl();
+    }
+    /**
+    * Creates an instance of CosmosDBManager that exposes CosmosDB resource management API entry points.
+    *
+    * @param credentials the credentials to use
+    * @param subscriptionId the subscription UUID
+    * @return the CosmosDBManager
+    */
+    public static CosmosDBManager authenticate(AzureTokenCredentials credentials, String subscriptionId) {
+        return new CosmosDBManager(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 CosmosDBManager that exposes CosmosDB resource management API entry points.
+    *
+    * @param restClient the RestClient to be used for API calls.
+    * @param subscriptionId the subscription UUID
+    * @return the CosmosDBManager
+    */
+    public static CosmosDBManager authenticate(RestClient restClient, String subscriptionId) {
+        return new CosmosDBManager(restClient, subscriptionId);
+    }
+    /**
+    * The interface allowing configurations to be set.
+    */
+    public interface Configurable extends AzureConfigurable<Configurable> {
+        /**
+        * Creates an instance of CosmosDBManager that exposes CosmosDB management API entry points.
+        *
+        * @param credentials the credentials to use
+        * @param subscriptionId the subscription UUID
+        * @return the interface exposing CosmosDB management API entry points that work across subscriptions
+        */
+        CosmosDBManager authenticate(AzureTokenCredentials credentials, String subscriptionId);
+    }
+
+    /**
+     * @return Entry point to manage DatabaseAccounts.
+     */
+    public DatabaseAccounts databaseAccounts() {
+        if (this.databaseAccounts == null) {
+            this.databaseAccounts = new DatabaseAccountsImpl(this);
+        }
+        return this.databaseAccounts;
+    }
+
+    /**
+     * @return Entry point to manage Operations.
+     */
+    public Operations operations() {
+        if (this.operations == null) {
+            this.operations = new OperationsImpl(this);
+        }
+        return this.operations;
+    }
+
+    /**
+     * @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 Collections.
+     */
+    public Collections collections() {
+        if (this.collections == null) {
+            this.collections = new CollectionsImpl(this);
+        }
+        return this.collections;
+    }
+
+    /**
+     * @return Entry point to manage CollectionRegions.
+     */
+    public CollectionRegions collectionRegions() {
+        if (this.collectionRegions == null) {
+            this.collectionRegions = new CollectionRegionsImpl(this);
+        }
+        return this.collectionRegions;
+    }
+
+    /**
+     * @return Entry point to manage DatabaseAccountRegions.
+     */
+    public DatabaseAccountRegions databaseAccountRegions() {
+        if (this.databaseAccountRegions == null) {
+            this.databaseAccountRegions = new DatabaseAccountRegionsImpl(this);
+        }
+        return this.databaseAccountRegions;
+    }
+
+    /**
+     * @return Entry point to manage PercentileSourceTargets.
+     */
+    public PercentileSourceTargets percentileSourceTargets() {
+        if (this.percentileSourceTargets == null) {
+            this.percentileSourceTargets = new PercentileSourceTargetsImpl(this);
+        }
+        return this.percentileSourceTargets;
+    }
+
+    /**
+     * @return Entry point to manage PercentileTargets.
+     */
+    public PercentileTargets percentileTargets() {
+        if (this.percentileTargets == null) {
+            this.percentileTargets = new PercentileTargetsImpl(this);
+        }
+        return this.percentileTargets;
+    }
+
+    /**
+     * @return Entry point to manage Percentiles.
+     */
+    public Percentiles percentiles() {
+        if (this.percentiles == null) {
+            this.percentiles = new PercentilesImpl(this);
+        }
+        return this.percentiles;
+    }
+
+    /**
+     * @return Entry point to manage CollectionPartitionRegions.
+     */
+    public CollectionPartitionRegions collectionPartitionRegions() {
+        if (this.collectionPartitionRegions == null) {
+            this.collectionPartitionRegions = new CollectionPartitionRegionsImpl(this);
+        }
+        return this.collectionPartitionRegions;
+    }
+
+    /**
+     * @return Entry point to manage CollectionPartitions.
+     */
+    public CollectionPartitions collectionPartitions() {
+        if (this.collectionPartitions == null) {
+            this.collectionPartitions = new CollectionPartitionsImpl(this);
+        }
+        return this.collectionPartitions;
+    }
+
+    /**
+     * @return Entry point to manage PartitionKeyRangeIds.
+     */
+    public PartitionKeyRangeIds partitionKeyRangeIds() {
+        if (this.partitionKeyRangeIds == null) {
+            this.partitionKeyRangeIds = new PartitionKeyRangeIdsImpl(this);
+        }
+        return this.partitionKeyRangeIds;
+    }
+
+    /**
+     * @return Entry point to manage PartitionKeyRangeIdRegions.
+     */
+    public PartitionKeyRangeIdRegions partitionKeyRangeIdRegions() {
+        if (this.partitionKeyRangeIdRegions == null) {
+            this.partitionKeyRangeIdRegions = new PartitionKeyRangeIdRegionsImpl(this);
+        }
+        return this.partitionKeyRangeIdRegions;
+    }
+
+    /**
+    * The implementation for Configurable interface.
+    */
+    private static final class ConfigurableImpl extends AzureConfigurableCoreImpl<Configurable> implements Configurable {
+        public CosmosDBManager authenticate(AzureTokenCredentials credentials, String subscriptionId) {
+           return CosmosDBManager.authenticate(buildRestClient(credentials), subscriptionId);
+        }
+     }
+    private CosmosDBManager(RestClient restClient, String subscriptionId) {
+        super(
+            restClient,
+            subscriptionId,
+            new CosmosDBImpl(restClient).withSubscriptionId(subscriptionId));
+    }
+}
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountImpl.java
index 74ee363edc434..e5a46bd84c6eb 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountImpl.java
@@ -23,10 +23,10 @@
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.VirtualNetworkRule;
 import rx.functions.Func1;
 
-class DatabaseAccountImpl extends GroupableResourceCoreImpl<DatabaseAccount, DatabaseAccountInner, DatabaseAccountImpl, DocumentDBManager> implements DatabaseAccount, DatabaseAccount.Definition, DatabaseAccount.Update {
+class DatabaseAccountImpl extends GroupableResourceCoreImpl<DatabaseAccount, DatabaseAccountInner, DatabaseAccountImpl, CosmosDBManager> implements DatabaseAccount, DatabaseAccount.Definition, DatabaseAccount.Update {
     private DatabaseAccountCreateUpdateParameters createParameter;
     private DatabaseAccountPatchParameters updateParameter;
-    DatabaseAccountImpl(String name, DatabaseAccountInner inner, DocumentDBManager manager) {
+    DatabaseAccountImpl(String name, DatabaseAccountInner inner, CosmosDBManager manager) {
         super(name, inner, manager);
         this.createParameter = new DatabaseAccountCreateUpdateParameters();
         this.updateParameter = new DatabaseAccountPatchParameters();
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountListConnectionStringsResultImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountListConnectionStringsResultImpl.java
index 3bc077a6f365d..83f0407ab3386 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountListConnectionStringsResultImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountListConnectionStringsResultImpl.java
@@ -14,14 +14,14 @@
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.DatabaseAccountConnectionString;
 
 class DatabaseAccountListConnectionStringsResultImpl extends WrapperImpl<DatabaseAccountListConnectionStringsResultInner> implements DatabaseAccountListConnectionStringsResult {
-    private final DocumentDBManager manager;
-    DatabaseAccountListConnectionStringsResultImpl(DatabaseAccountListConnectionStringsResultInner inner, DocumentDBManager manager) {
+    private final CosmosDBManager manager;
+    DatabaseAccountListConnectionStringsResultImpl(DatabaseAccountListConnectionStringsResultInner inner, CosmosDBManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountListKeysResultImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountListKeysResultImpl.java
index a9978ee957c98..294216cd35b88 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountListKeysResultImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountListKeysResultImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class DatabaseAccountListKeysResultImpl extends WrapperImpl<DatabaseAccountListKeysResultInner> implements DatabaseAccountListKeysResult {
-    private final DocumentDBManager manager;
-    DatabaseAccountListKeysResultImpl(DatabaseAccountListKeysResultInner inner, DocumentDBManager manager) {
+    private final CosmosDBManager manager;
+    DatabaseAccountListKeysResultImpl(DatabaseAccountListKeysResultInner inner, CosmosDBManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountListReadOnlyKeysResultImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountListReadOnlyKeysResultImpl.java
index 81c368b8aed14..1a7772993789c 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountListReadOnlyKeysResultImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountListReadOnlyKeysResultImpl.java
@@ -12,14 +12,14 @@
 import com.microsoft.azure.arm.model.implementation.WrapperImpl;
 
 class DatabaseAccountListReadOnlyKeysResultImpl extends WrapperImpl<DatabaseAccountListReadOnlyKeysResultInner> implements DatabaseAccountListReadOnlyKeysResult {
-    private final DocumentDBManager manager;
-    DatabaseAccountListReadOnlyKeysResultImpl(DatabaseAccountListReadOnlyKeysResultInner inner, DocumentDBManager manager) {
+    private final CosmosDBManager manager;
+    DatabaseAccountListReadOnlyKeysResultImpl(DatabaseAccountListReadOnlyKeysResultInner inner, CosmosDBManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountMetricDefinitionImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountMetricDefinitionImpl.java
index da1772d332678..297f16c946b8e 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountMetricDefinitionImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountMetricDefinitionImpl.java
@@ -18,15 +18,15 @@
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.UnitType;
 
 class DatabaseAccountMetricDefinitionImpl extends WrapperImpl<MetricDefinitionInner> implements DatabaseAccountMetricDefinition {
-    private final DocumentDBManager manager;
+    private final CosmosDBManager manager;
 
-    DatabaseAccountMetricDefinitionImpl(MetricDefinitionInner inner,  DocumentDBManager manager) {
+    DatabaseAccountMetricDefinitionImpl(MetricDefinitionInner inner,  CosmosDBManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountMetricImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountMetricImpl.java
index 0e8a5a3c5fd35..fcb8ff3099235 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountMetricImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountMetricImpl.java
@@ -18,15 +18,15 @@
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.UnitType;
 
 class DatabaseAccountMetricImpl extends WrapperImpl<MetricInner> implements DatabaseAccountMetric {
-    private final DocumentDBManager manager;
+    private final CosmosDBManager manager;
 
-    DatabaseAccountMetricImpl(MetricInner inner,  DocumentDBManager manager) {
+    DatabaseAccountMetricImpl(MetricInner inner,  CosmosDBManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountRegionsImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountRegionsImpl.java
index 7b398f3405108..560a33bc75085 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountRegionsImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountRegionsImpl.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.DatabaseAccountMetric;
 
 class DatabaseAccountRegionsImpl extends WrapperImpl<DatabaseAccountRegionsInner> implements DatabaseAccountRegions {
-    private final DocumentDBManager manager;
+    private final CosmosDBManager manager;
 
-    DatabaseAccountRegionsImpl(DocumentDBManager manager) {
+    DatabaseAccountRegionsImpl(CosmosDBManager manager) {
         super(manager.inner().databaseAccountRegions());
         this.manager = manager;
     }
 
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountUsageImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountUsageImpl.java
index 7d159d974fd60..3a6d51e296e86 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountUsageImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountUsageImpl.java
@@ -15,15 +15,15 @@
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.UnitType;
 
 class DatabaseAccountUsageImpl extends WrapperImpl<UsageInner> implements DatabaseAccountUsage {
-    private final DocumentDBManager manager;
+    private final CosmosDBManager manager;
 
-    DatabaseAccountUsageImpl(UsageInner inner,  DocumentDBManager manager) {
+    DatabaseAccountUsageImpl(UsageInner inner,  CosmosDBManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountsImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountsImpl.java
index 610eb59322959..0de3c02ab87d0 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountsImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountsImpl.java
@@ -44,8 +44,8 @@
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.CassandraKeyspace;
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.GremlinGraph;
 
-class DatabaseAccountsImpl extends GroupableResourcesCoreImpl<DatabaseAccount, DatabaseAccountImpl, DatabaseAccountInner, DatabaseAccountsInner, DocumentDBManager>  implements DatabaseAccounts {
-    protected DatabaseAccountsImpl(DocumentDBManager manager) {
+class DatabaseAccountsImpl extends GroupableResourcesCoreImpl<DatabaseAccount, DatabaseAccountImpl, DatabaseAccountInner, DatabaseAccountsInner, CosmosDBManager>  implements DatabaseAccounts {
+    protected DatabaseAccountsImpl(CosmosDBManager manager) {
         super(manager.inner().databaseAccounts(), manager);
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabasesImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabasesImpl.java
index e5b21154941db..86ccc275852a6 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabasesImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabasesImpl.java
@@ -19,14 +19,14 @@
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.DatabasisDatabaseAccountUsage;
 
 class DatabasesImpl extends WrapperImpl<DatabasesInner> implements Databases {
-    private final DocumentDBManager manager;
+    private final CosmosDBManager manager;
 
-    DatabasesImpl(DocumentDBManager manager) {
+    DatabasesImpl(CosmosDBManager manager) {
         super(manager.inner().databases());
         this.manager = manager;
     }
 
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabasisDatabaseAccountMetricDefinitionImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabasisDatabaseAccountMetricDefinitionImpl.java
index 7d6c5a841a40b..05e098cd68e59 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabasisDatabaseAccountMetricDefinitionImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabasisDatabaseAccountMetricDefinitionImpl.java
@@ -18,15 +18,15 @@
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.UnitType;
 
 class DatabasisDatabaseAccountMetricDefinitionImpl extends WrapperImpl<MetricDefinitionInner> implements DatabasisDatabaseAccountMetricDefinition {
-    private final DocumentDBManager manager;
+    private final CosmosDBManager manager;
 
-    DatabasisDatabaseAccountMetricDefinitionImpl(MetricDefinitionInner inner,  DocumentDBManager manager) {
+    DatabasisDatabaseAccountMetricDefinitionImpl(MetricDefinitionInner inner,  CosmosDBManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabasisDatabaseAccountMetricImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabasisDatabaseAccountMetricImpl.java
index f29785238ed8b..a2f6f4182cd08 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabasisDatabaseAccountMetricImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabasisDatabaseAccountMetricImpl.java
@@ -18,15 +18,15 @@
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.UnitType;
 
 class DatabasisDatabaseAccountMetricImpl extends WrapperImpl<MetricInner> implements DatabasisDatabaseAccountMetric {
-    private final DocumentDBManager manager;
+    private final CosmosDBManager manager;
 
-    DatabasisDatabaseAccountMetricImpl(MetricInner inner,  DocumentDBManager manager) {
+    DatabasisDatabaseAccountMetricImpl(MetricInner inner,  CosmosDBManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabasisDatabaseAccountUsageImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabasisDatabaseAccountUsageImpl.java
index 3c1283141c68e..992b9bc38146e 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabasisDatabaseAccountUsageImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabasisDatabaseAccountUsageImpl.java
@@ -15,15 +15,15 @@
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.UnitType;
 
 class DatabasisDatabaseAccountUsageImpl extends WrapperImpl<UsageInner> implements DatabasisDatabaseAccountUsage {
-    private final DocumentDBManager manager;
+    private final CosmosDBManager manager;
 
-    DatabasisDatabaseAccountUsageImpl(UsageInner inner,  DocumentDBManager manager) {
+    DatabasisDatabaseAccountUsageImpl(UsageInner inner,  CosmosDBManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/GremlinDatabaseImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/GremlinDatabaseImpl.java
index 8358e8438942a..94e71b5facea2 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/GremlinDatabaseImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/GremlinDatabaseImpl.java
@@ -13,14 +13,14 @@
 import java.util.Map;
 
 class GremlinDatabaseImpl extends WrapperImpl<GremlinDatabaseInner> implements GremlinDatabase {
-    private final DocumentDBManager manager;
-    GremlinDatabaseImpl(GremlinDatabaseInner inner, DocumentDBManager manager) {
+    private final CosmosDBManager manager;
+    GremlinDatabaseImpl(GremlinDatabaseInner inner, CosmosDBManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/GremlinGraphImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/GremlinGraphImpl.java
index 2b6e8be9d7d45..f0868d22076b9 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/GremlinGraphImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/GremlinGraphImpl.java
@@ -21,14 +21,14 @@
 import rx.functions.Func1;
 
 class GremlinGraphImpl extends CreatableUpdatableImpl<GremlinGraph, GremlinGraphInner, GremlinGraphImpl> implements GremlinGraph, GremlinGraph.Definition, GremlinGraph.Update {
-    private final DocumentDBManager manager;
+    private final CosmosDBManager manager;
     private String resourceGroupName;
     private String accountName;
     private String databaseName;
     private String graphName;
     private GremlinGraphCreateUpdateParameters createOrUpdateParameter;
 
-    GremlinGraphImpl(String name, DocumentDBManager manager) {
+    GremlinGraphImpl(String name, CosmosDBManager manager) {
         super(name, new GremlinGraphInner());
         this.manager = manager;
         // Set resource name
@@ -37,7 +37,7 @@ class GremlinGraphImpl extends CreatableUpdatableImpl<GremlinGraph, GremlinGraph
         this.createOrUpdateParameter = new GremlinGraphCreateUpdateParameters();
     }
 
-    GremlinGraphImpl(GremlinGraphInner inner, DocumentDBManager manager) {
+    GremlinGraphImpl(GremlinGraphInner inner, CosmosDBManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -52,7 +52,7 @@ class GremlinGraphImpl extends CreatableUpdatableImpl<GremlinGraph, GremlinGraph
     }
 
     @Override
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/MongoDBCollectionImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/MongoDBCollectionImpl.java
index 22b6ec9ba7892..9f26a216a38ff 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/MongoDBCollectionImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/MongoDBCollectionImpl.java
@@ -19,14 +19,14 @@
 import rx.functions.Func1;
 
 class MongoDBCollectionImpl extends CreatableUpdatableImpl<MongoDBCollection, MongoDBCollectionInner, MongoDBCollectionImpl> implements MongoDBCollection, MongoDBCollection.Definition, MongoDBCollection.Update {
-    private final DocumentDBManager manager;
+    private final CosmosDBManager manager;
     private String resourceGroupName;
     private String accountName;
     private String databaseName;
     private String collectionName;
     private MongoDBCollectionCreateUpdateParameters createOrUpdateParameter;
 
-    MongoDBCollectionImpl(String name, DocumentDBManager manager) {
+    MongoDBCollectionImpl(String name, CosmosDBManager manager) {
         super(name, new MongoDBCollectionInner());
         this.manager = manager;
         // Set resource name
@@ -35,7 +35,7 @@ class MongoDBCollectionImpl extends CreatableUpdatableImpl<MongoDBCollection, Mo
         this.createOrUpdateParameter = new MongoDBCollectionCreateUpdateParameters();
     }
 
-    MongoDBCollectionImpl(MongoDBCollectionInner inner, DocumentDBManager manager) {
+    MongoDBCollectionImpl(MongoDBCollectionInner inner, CosmosDBManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -50,7 +50,7 @@ class MongoDBCollectionImpl extends CreatableUpdatableImpl<MongoDBCollection, Mo
     }
 
     @Override
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/MongoDBDatabaseImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/MongoDBDatabaseImpl.java
index 9bd0df609ca85..9f96c24199566 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/MongoDBDatabaseImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/MongoDBDatabaseImpl.java
@@ -13,14 +13,14 @@
 import java.util.Map;
 
 class MongoDBDatabaseImpl extends WrapperImpl<MongoDBDatabaseInner> implements MongoDBDatabase {
-    private final DocumentDBManager manager;
-    MongoDBDatabaseImpl(MongoDBDatabaseInner inner, DocumentDBManager manager) {
+    private final CosmosDBManager manager;
+    MongoDBDatabaseImpl(MongoDBDatabaseInner inner, CosmosDBManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/OperationImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/OperationImpl.java
index 550c33b0418d4..92705bb3a8194 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/OperationImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/OperationImpl.java
@@ -13,14 +13,14 @@
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.OperationDisplay;
 
 class OperationImpl extends WrapperImpl<OperationInner> implements Operation {
-    private final DocumentDBManager manager;
-    OperationImpl(OperationInner inner, DocumentDBManager manager) {
+    private final CosmosDBManager manager;
+    OperationImpl(OperationInner inner, CosmosDBManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/OperationsImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/OperationsImpl.java
index ae9786bb288b9..ebcf8a99937c2 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/OperationsImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/OperationsImpl.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.Operation;
 
 class OperationsImpl extends WrapperImpl<OperationsInner> implements Operations {
-    private final DocumentDBManager manager;
+    private final CosmosDBManager manager;
 
-    OperationsImpl(DocumentDBManager manager) {
+    OperationsImpl(CosmosDBManager manager) {
         super(manager.inner().operations());
         this.manager = manager;
     }
 
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PartitionKeyRangeIdRegionsImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PartitionKeyRangeIdRegionsImpl.java
index e753bafabd99b..fd0068a47c6f1 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PartitionKeyRangeIdRegionsImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PartitionKeyRangeIdRegionsImpl.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.PartitionMetric;
 
 class PartitionKeyRangeIdRegionsImpl extends WrapperImpl<PartitionKeyRangeIdRegionsInner> implements PartitionKeyRangeIdRegions {
-    private final DocumentDBManager manager;
+    private final CosmosDBManager manager;
 
-    PartitionKeyRangeIdRegionsImpl(DocumentDBManager manager) {
+    PartitionKeyRangeIdRegionsImpl(CosmosDBManager manager) {
         super(manager.inner().partitionKeyRangeIdRegions());
         this.manager = manager;
     }
 
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PartitionKeyRangeIdsImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PartitionKeyRangeIdsImpl.java
index a6815041b84fc..be051ff6fe025 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PartitionKeyRangeIdsImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PartitionKeyRangeIdsImpl.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.PartitionMetric;
 
 class PartitionKeyRangeIdsImpl extends WrapperImpl<PartitionKeyRangeIdsInner> implements PartitionKeyRangeIds {
-    private final DocumentDBManager manager;
+    private final CosmosDBManager manager;
 
-    PartitionKeyRangeIdsImpl(DocumentDBManager manager) {
+    PartitionKeyRangeIdsImpl(CosmosDBManager manager) {
         super(manager.inner().partitionKeyRangeIds());
         this.manager = manager;
     }
 
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PartitionMetricImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PartitionMetricImpl.java
index 790f44c151608..b0995ebe92556 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PartitionMetricImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PartitionMetricImpl.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.UnitType;
 
 class PartitionMetricImpl extends WrapperImpl<PartitionMetricInner> implements PartitionMetric {
-    private final DocumentDBManager manager;
-    PartitionMetricImpl(PartitionMetricInner inner, DocumentDBManager manager) {
+    private final CosmosDBManager manager;
+    PartitionMetricImpl(PartitionMetricInner inner, CosmosDBManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PartitionUsageImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PartitionUsageImpl.java
index fdda8002b2e65..e984f444aea25 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PartitionUsageImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PartitionUsageImpl.java
@@ -14,14 +14,14 @@
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.UnitType;
 
 class PartitionUsageImpl extends WrapperImpl<PartitionUsageInner> implements PartitionUsage {
-    private final DocumentDBManager manager;
-    PartitionUsageImpl(PartitionUsageInner inner, DocumentDBManager manager) {
+    private final CosmosDBManager manager;
+    PartitionUsageImpl(PartitionUsageInner inner, CosmosDBManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PercentileMetricImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PercentileMetricImpl.java
index 2b9e11c151f59..1b0d1c08a5c43 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PercentileMetricImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PercentileMetricImpl.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.UnitType;
 
 class PercentileMetricImpl extends WrapperImpl<PercentileMetricInner> implements PercentileMetric {
-    private final DocumentDBManager manager;
-    PercentileMetricImpl(PercentileMetricInner inner, DocumentDBManager manager) {
+    private final CosmosDBManager manager;
+    PercentileMetricImpl(PercentileMetricInner inner, CosmosDBManager manager) {
         super(inner);
         this.manager = manager;
     }
 
     @Override
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PercentileSourceTargetsImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PercentileSourceTargetsImpl.java
index 19d0ab4226739..cf82c2e6e028e 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PercentileSourceTargetsImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PercentileSourceTargetsImpl.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.PercentileMetric;
 
 class PercentileSourceTargetsImpl extends WrapperImpl<PercentileSourceTargetsInner> implements PercentileSourceTargets {
-    private final DocumentDBManager manager;
+    private final CosmosDBManager manager;
 
-    PercentileSourceTargetsImpl(DocumentDBManager manager) {
+    PercentileSourceTargetsImpl(CosmosDBManager manager) {
         super(manager.inner().percentileSourceTargets());
         this.manager = manager;
     }
 
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PercentileTargetsImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PercentileTargetsImpl.java
index 58c07391e84e0..41e9fd238e5e2 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PercentileTargetsImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PercentileTargetsImpl.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.PercentileMetric;
 
 class PercentileTargetsImpl extends WrapperImpl<PercentileTargetsInner> implements PercentileTargets {
-    private final DocumentDBManager manager;
+    private final CosmosDBManager manager;
 
-    PercentileTargetsImpl(DocumentDBManager manager) {
+    PercentileTargetsImpl(CosmosDBManager manager) {
         super(manager.inner().percentileTargets());
         this.manager = manager;
     }
 
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PercentilesImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PercentilesImpl.java
index c37191178553b..003a11bf0f6de 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PercentilesImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PercentilesImpl.java
@@ -17,14 +17,14 @@
 import com.microsoft.azure.management.cosmosdb.v2015_04_08.PercentileMetric;
 
 class PercentilesImpl extends WrapperImpl<PercentilesInner> implements Percentiles {
-    private final DocumentDBManager manager;
+    private final CosmosDBManager manager;
 
-    PercentilesImpl(DocumentDBManager manager) {
+    PercentilesImpl(CosmosDBManager manager) {
         super(manager.inner().percentiles());
         this.manager = manager;
     }
 
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/SqlContainerImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/SqlContainerImpl.java
index bca9984cbfe46..c782512855d3b 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/SqlContainerImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/SqlContainerImpl.java
@@ -21,14 +21,14 @@
 import rx.functions.Func1;
 
 class SqlContainerImpl extends CreatableUpdatableImpl<SqlContainer, SqlContainerInner, SqlContainerImpl> implements SqlContainer, SqlContainer.Definition, SqlContainer.Update {
-    private final DocumentDBManager manager;
+    private final CosmosDBManager manager;
     private String resourceGroupName;
     private String accountName;
     private String databaseName;
     private String containerName;
     private SqlContainerCreateUpdateParameters createOrUpdateParameter;
 
-    SqlContainerImpl(String name, DocumentDBManager manager) {
+    SqlContainerImpl(String name, CosmosDBManager manager) {
         super(name, new SqlContainerInner());
         this.manager = manager;
         // Set resource name
@@ -37,7 +37,7 @@ class SqlContainerImpl extends CreatableUpdatableImpl<SqlContainer, SqlContainer
         this.createOrUpdateParameter = new SqlContainerCreateUpdateParameters();
     }
 
-    SqlContainerImpl(SqlContainerInner inner, DocumentDBManager manager) {
+    SqlContainerImpl(SqlContainerInner inner, CosmosDBManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -52,7 +52,7 @@ class SqlContainerImpl extends CreatableUpdatableImpl<SqlContainer, SqlContainer
     }
 
     @Override
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/SqlDatabaseImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/SqlDatabaseImpl.java
index 878d8bbc0e759..b0175978d2105 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/SqlDatabaseImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/SqlDatabaseImpl.java
@@ -17,13 +17,13 @@
 import rx.functions.Func1;
 
 class SqlDatabaseImpl extends CreatableUpdatableImpl<SqlDatabase, SqlDatabaseInner, SqlDatabaseImpl> implements SqlDatabase, SqlDatabase.Definition, SqlDatabase.Update {
-    private final DocumentDBManager manager;
+    private final CosmosDBManager manager;
     private String resourceGroupName;
     private String accountName;
     private String databaseName;
     private SqlDatabaseCreateUpdateParameters createOrUpdateParameter;
 
-    SqlDatabaseImpl(String name, DocumentDBManager manager) {
+    SqlDatabaseImpl(String name, CosmosDBManager manager) {
         super(name, new SqlDatabaseInner());
         this.manager = manager;
         // Set resource name
@@ -32,7 +32,7 @@ class SqlDatabaseImpl extends CreatableUpdatableImpl<SqlDatabase, SqlDatabaseInn
         this.createOrUpdateParameter = new SqlDatabaseCreateUpdateParameters();
     }
 
-    SqlDatabaseImpl(SqlDatabaseInner inner, DocumentDBManager manager) {
+    SqlDatabaseImpl(SqlDatabaseInner inner, CosmosDBManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -46,7 +46,7 @@ class SqlDatabaseImpl extends CreatableUpdatableImpl<SqlDatabase, SqlDatabaseInn
     }
 
     @Override
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }
 
diff --git a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/TableImpl.java b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/TableImpl.java
index 2a5d70bd819e4..68d3cf4f1bcda 100644
--- a/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/TableImpl.java
+++ b/cosmosdb/resource-manager/v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/TableImpl.java
@@ -17,13 +17,13 @@
 import rx.functions.Func1;
 
 class TableImpl extends CreatableUpdatableImpl<Table, TableInner, TableImpl> implements Table, Table.Definition, Table.Update {
-    private final DocumentDBManager manager;
+    private final CosmosDBManager manager;
     private String resourceGroupName;
     private String accountName;
     private String tableName;
     private TableCreateUpdateParameters createOrUpdateParameter;
 
-    TableImpl(String name, DocumentDBManager manager) {
+    TableImpl(String name, CosmosDBManager manager) {
         super(name, new TableInner());
         this.manager = manager;
         // Set resource name
@@ -32,7 +32,7 @@ class TableImpl extends CreatableUpdatableImpl<Table, TableInner, TableImpl> imp
         this.createOrUpdateParameter = new TableCreateUpdateParameters();
     }
 
-    TableImpl(TableInner inner, DocumentDBManager manager) {
+    TableImpl(TableInner inner, CosmosDBManager manager) {
         super(inner.name(), inner);
         this.manager = manager;
         // Set resource name
@@ -46,7 +46,7 @@ class TableImpl extends CreatableUpdatableImpl<Table, TableInner, TableImpl> imp
     }
 
     @Override
-    public DocumentDBManager manager() {
+    public CosmosDBManager manager() {
         return this.manager;
     }