diff --git a/sdk/cosmos/mgmt-v2015_04_08/pom.xml b/sdk/cosmos/mgmt-v2015_04_08/pom.xml
index 22f32741b7be3..64718249a5346 100644
--- a/sdk/cosmos/mgmt-v2015_04_08/pom.xml
+++ b/sdk/cosmos/mgmt-v2015_04_08/pom.xml
@@ -11,11 +11,11 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.2.0</version>
-        <relativePath>../../parents/azure-arm-parent</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-cosmosdb</artifactId>
-    <version>1.0.0-beta-3</version>
+    <version>1.0.0-beta</version>
     <packaging>jar</packaging>
     <name>Microsoft Azure SDK for CosmosDB Management</name>
     <description>This package contains Microsoft CosmosDB Management SDK.</description>
diff --git a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/PrimaryAggregationType.java b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/PrimaryAggregationType.java
index aba1691e99d94..86f2e8b13bd26 100644
--- a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/PrimaryAggregationType.java
+++ b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/PrimaryAggregationType.java
@@ -25,8 +25,8 @@ public final class PrimaryAggregationType extends ExpandableStringEnum<PrimaryAg
     /** Static value Total for PrimaryAggregationType. */
     public static final PrimaryAggregationType TOTAL = fromString("Total");
 
-    /** Static value Minimimum for PrimaryAggregationType. */
-    public static final PrimaryAggregationType MINIMIMUM = fromString("Minimimum");
+    /** Static value Minimum for PrimaryAggregationType. */
+    public static final PrimaryAggregationType MINIMUM = fromString("Minimum");
 
     /** Static value Maximum for PrimaryAggregationType. */
     public static final PrimaryAggregationType MAXIMUM = fromString("Maximum");
diff --git a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionPartitionRegionsInner.java b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionPartitionRegionsInner.java
index 5dd569cf55c56..2ee7249e37e59 100644
--- a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionPartitionRegionsInner.java
+++ b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionPartitionRegionsInner.java
@@ -34,7 +34,7 @@ public class CollectionPartitionRegionsInner {
     /** The Retrofit service to perform REST calls. */
     private CollectionPartitionRegionsService service;
     /** The service client containing this operation class. */
-    private CosmosDBImpl client;
+    private CosmosDBManagementClientImpl client;
 
     /**
      * Initializes an instance of CollectionPartitionRegionsInner.
@@ -42,7 +42,7 @@ public class CollectionPartitionRegionsInner {
      * @param retrofit the Retrofit instance built from a Retrofit Builder.
      * @param client the instance of the service client containing this operation class.
      */
-    public CollectionPartitionRegionsInner(Retrofit retrofit, CosmosDBImpl client) {
+    public CollectionPartitionRegionsInner(Retrofit retrofit, CosmosDBManagementClientImpl client) {
         this.service = retrofit.create(CollectionPartitionRegionsService.class);
         this.client = client;
     }
diff --git a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionPartitionsInner.java b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionPartitionsInner.java
index 63bbfab8579a3..29a4e976a9c65 100644
--- a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionPartitionsInner.java
+++ b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionPartitionsInner.java
@@ -34,7 +34,7 @@ public class CollectionPartitionsInner {
     /** The Retrofit service to perform REST calls. */
     private CollectionPartitionsService service;
     /** The service client containing this operation class. */
-    private CosmosDBImpl client;
+    private CosmosDBManagementClientImpl client;
 
     /**
      * Initializes an instance of CollectionPartitionsInner.
@@ -42,7 +42,7 @@ public class CollectionPartitionsInner {
      * @param retrofit the Retrofit instance built from a Retrofit Builder.
      * @param client the instance of the service client containing this operation class.
      */
-    public CollectionPartitionsInner(Retrofit retrofit, CosmosDBImpl client) {
+    public CollectionPartitionsInner(Retrofit retrofit, CosmosDBManagementClientImpl client) {
         this.service = retrofit.create(CollectionPartitionsService.class);
         this.client = client;
     }
diff --git a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionRegionsInner.java b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionRegionsInner.java
index ef2a84b32636c..71378a30029b9 100644
--- a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionRegionsInner.java
+++ b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionRegionsInner.java
@@ -34,7 +34,7 @@ public class CollectionRegionsInner {
     /** The Retrofit service to perform REST calls. */
     private CollectionRegionsService service;
     /** The service client containing this operation class. */
-    private CosmosDBImpl client;
+    private CosmosDBManagementClientImpl client;
 
     /**
      * Initializes an instance of CollectionRegionsInner.
@@ -42,7 +42,7 @@ public class CollectionRegionsInner {
      * @param retrofit the Retrofit instance built from a Retrofit Builder.
      * @param client the instance of the service client containing this operation class.
      */
-    public CollectionRegionsInner(Retrofit retrofit, CosmosDBImpl client) {
+    public CollectionRegionsInner(Retrofit retrofit, CosmosDBManagementClientImpl client) {
         this.service = retrofit.create(CollectionRegionsService.class);
         this.client = client;
     }
diff --git a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionsInner.java b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionsInner.java
index ab97fe3d5c45e..8e9e260abc996 100644
--- a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionsInner.java
+++ b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CollectionsInner.java
@@ -34,7 +34,7 @@ public class CollectionsInner {
     /** The Retrofit service to perform REST calls. */
     private CollectionsService service;
     /** The service client containing this operation class. */
-    private CosmosDBImpl client;
+    private CosmosDBManagementClientImpl client;
 
     /**
      * Initializes an instance of CollectionsInner.
@@ -42,7 +42,7 @@ public class CollectionsInner {
      * @param retrofit the Retrofit instance built from a Retrofit Builder.
      * @param client the instance of the service client containing this operation class.
      */
-    public CollectionsInner(Retrofit retrofit, CosmosDBImpl client) {
+    public CollectionsInner(Retrofit retrofit, CosmosDBManagementClientImpl client) {
         this.service = retrofit.create(CollectionsService.class);
         this.client = client;
     }
diff --git a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CosmosDBManagementClientImpl.java b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CosmosDBManagementClientImpl.java
new file mode 100644
index 0000000000000..dd58a7cc54dc2
--- /dev/null
+++ b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CosmosDBManagementClientImpl.java
@@ -0,0 +1,364 @@
+/**
+ * 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.AzureClient;
+import com.microsoft.azure.AzureServiceClient;
+import com.microsoft.rest.credentials.ServiceClientCredentials;
+import com.microsoft.rest.RestClient;
+
+/**
+ * Initializes a new instance of the CosmosDBManagementClientImpl class.
+ */
+public class CosmosDBManagementClientImpl extends AzureServiceClient {
+    /** the {@link AzureClient} used for long running operations. */
+    private AzureClient azureClient;
+
+    /**
+     * Gets the {@link AzureClient} used for long running operations.
+     * @return the azure client;
+     */
+    public AzureClient getAzureClient() {
+        return this.azureClient;
+    }
+
+    /** Azure subscription ID. */
+    private String subscriptionId;
+
+    /**
+     * Gets Azure subscription ID.
+     *
+     * @return the subscriptionId value.
+     */
+    public String subscriptionId() {
+        return this.subscriptionId;
+    }
+
+    /**
+     * Sets Azure subscription ID.
+     *
+     * @param subscriptionId the subscriptionId value.
+     * @return the service client itself
+     */
+    public CosmosDBManagementClientImpl withSubscriptionId(String subscriptionId) {
+        this.subscriptionId = subscriptionId;
+        return this;
+    }
+
+    /** Version of the API to be used with the client request. The current version is 2015-04-08. */
+    private String apiVersion;
+
+    /**
+     * Gets Version of the API to be used with the client request. The current version is 2015-04-08.
+     *
+     * @return the apiVersion value.
+     */
+    public String apiVersion() {
+        return this.apiVersion;
+    }
+
+    /** The preferred language for the response. */
+    private String acceptLanguage;
+
+    /**
+     * Gets The preferred language for the response.
+     *
+     * @return the acceptLanguage value.
+     */
+    public String acceptLanguage() {
+        return this.acceptLanguage;
+    }
+
+    /**
+     * Sets The preferred language for the response.
+     *
+     * @param acceptLanguage the acceptLanguage value.
+     * @return the service client itself
+     */
+    public CosmosDBManagementClientImpl withAcceptLanguage(String acceptLanguage) {
+        this.acceptLanguage = acceptLanguage;
+        return this;
+    }
+
+    /** The retry timeout in seconds for Long Running Operations. Default value is 30. */
+    private int longRunningOperationRetryTimeout;
+
+    /**
+     * Gets The retry timeout in seconds for Long Running Operations. Default value is 30.
+     *
+     * @return the longRunningOperationRetryTimeout value.
+     */
+    public int longRunningOperationRetryTimeout() {
+        return this.longRunningOperationRetryTimeout;
+    }
+
+    /**
+     * Sets The retry timeout in seconds for Long Running Operations. Default value is 30.
+     *
+     * @param longRunningOperationRetryTimeout the longRunningOperationRetryTimeout value.
+     * @return the service client itself
+     */
+    public CosmosDBManagementClientImpl withLongRunningOperationRetryTimeout(int longRunningOperationRetryTimeout) {
+        this.longRunningOperationRetryTimeout = longRunningOperationRetryTimeout;
+        return this;
+    }
+
+    /** Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true. */
+    private boolean generateClientRequestId;
+
+    /**
+     * Gets Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
+     *
+     * @return the generateClientRequestId value.
+     */
+    public boolean generateClientRequestId() {
+        return this.generateClientRequestId;
+    }
+
+    /**
+     * Sets Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
+     *
+     * @param generateClientRequestId the generateClientRequestId value.
+     * @return the service client itself
+     */
+    public CosmosDBManagementClientImpl withGenerateClientRequestId(boolean generateClientRequestId) {
+        this.generateClientRequestId = generateClientRequestId;
+        return this;
+    }
+
+    /**
+     * The DatabaseAccountsInner object to access its operations.
+     */
+    private DatabaseAccountsInner databaseAccounts;
+
+    /**
+     * Gets the DatabaseAccountsInner object to access its operations.
+     * @return the DatabaseAccountsInner object.
+     */
+    public DatabaseAccountsInner databaseAccounts() {
+        return this.databaseAccounts;
+    }
+
+    /**
+     * The OperationsInner object to access its operations.
+     */
+    private OperationsInner operations;
+
+    /**
+     * Gets the OperationsInner object to access its operations.
+     * @return the OperationsInner object.
+     */
+    public OperationsInner operations() {
+        return this.operations;
+    }
+
+    /**
+     * The DatabasesInner object to access its operations.
+     */
+    private DatabasesInner databases;
+
+    /**
+     * Gets the DatabasesInner object to access its operations.
+     * @return the DatabasesInner object.
+     */
+    public DatabasesInner databases() {
+        return this.databases;
+    }
+
+    /**
+     * The CollectionsInner object to access its operations.
+     */
+    private CollectionsInner collections;
+
+    /**
+     * Gets the CollectionsInner object to access its operations.
+     * @return the CollectionsInner object.
+     */
+    public CollectionsInner collections() {
+        return this.collections;
+    }
+
+    /**
+     * The CollectionRegionsInner object to access its operations.
+     */
+    private CollectionRegionsInner collectionRegions;
+
+    /**
+     * Gets the CollectionRegionsInner object to access its operations.
+     * @return the CollectionRegionsInner object.
+     */
+    public CollectionRegionsInner collectionRegions() {
+        return this.collectionRegions;
+    }
+
+    /**
+     * The DatabaseAccountRegionsInner object to access its operations.
+     */
+    private DatabaseAccountRegionsInner databaseAccountRegions;
+
+    /**
+     * Gets the DatabaseAccountRegionsInner object to access its operations.
+     * @return the DatabaseAccountRegionsInner object.
+     */
+    public DatabaseAccountRegionsInner databaseAccountRegions() {
+        return this.databaseAccountRegions;
+    }
+
+    /**
+     * The PercentileSourceTargetsInner object to access its operations.
+     */
+    private PercentileSourceTargetsInner percentileSourceTargets;
+
+    /**
+     * Gets the PercentileSourceTargetsInner object to access its operations.
+     * @return the PercentileSourceTargetsInner object.
+     */
+    public PercentileSourceTargetsInner percentileSourceTargets() {
+        return this.percentileSourceTargets;
+    }
+
+    /**
+     * The PercentileTargetsInner object to access its operations.
+     */
+    private PercentileTargetsInner percentileTargets;
+
+    /**
+     * Gets the PercentileTargetsInner object to access its operations.
+     * @return the PercentileTargetsInner object.
+     */
+    public PercentileTargetsInner percentileTargets() {
+        return this.percentileTargets;
+    }
+
+    /**
+     * The PercentilesInner object to access its operations.
+     */
+    private PercentilesInner percentiles;
+
+    /**
+     * Gets the PercentilesInner object to access its operations.
+     * @return the PercentilesInner object.
+     */
+    public PercentilesInner percentiles() {
+        return this.percentiles;
+    }
+
+    /**
+     * The CollectionPartitionRegionsInner object to access its operations.
+     */
+    private CollectionPartitionRegionsInner collectionPartitionRegions;
+
+    /**
+     * Gets the CollectionPartitionRegionsInner object to access its operations.
+     * @return the CollectionPartitionRegionsInner object.
+     */
+    public CollectionPartitionRegionsInner collectionPartitionRegions() {
+        return this.collectionPartitionRegions;
+    }
+
+    /**
+     * The CollectionPartitionsInner object to access its operations.
+     */
+    private CollectionPartitionsInner collectionPartitions;
+
+    /**
+     * Gets the CollectionPartitionsInner object to access its operations.
+     * @return the CollectionPartitionsInner object.
+     */
+    public CollectionPartitionsInner collectionPartitions() {
+        return this.collectionPartitions;
+    }
+
+    /**
+     * The PartitionKeyRangeIdsInner object to access its operations.
+     */
+    private PartitionKeyRangeIdsInner partitionKeyRangeIds;
+
+    /**
+     * Gets the PartitionKeyRangeIdsInner object to access its operations.
+     * @return the PartitionKeyRangeIdsInner object.
+     */
+    public PartitionKeyRangeIdsInner partitionKeyRangeIds() {
+        return this.partitionKeyRangeIds;
+    }
+
+    /**
+     * The PartitionKeyRangeIdRegionsInner object to access its operations.
+     */
+    private PartitionKeyRangeIdRegionsInner partitionKeyRangeIdRegions;
+
+    /**
+     * Gets the PartitionKeyRangeIdRegionsInner object to access its operations.
+     * @return the PartitionKeyRangeIdRegionsInner object.
+     */
+    public PartitionKeyRangeIdRegionsInner partitionKeyRangeIdRegions() {
+        return this.partitionKeyRangeIdRegions;
+    }
+
+    /**
+     * Initializes an instance of CosmosDBManagementClient client.
+     *
+     * @param credentials the management credentials for Azure
+     */
+    public CosmosDBManagementClientImpl(ServiceClientCredentials credentials) {
+        this("https://management.azure.com", credentials);
+    }
+
+    /**
+     * Initializes an instance of CosmosDBManagementClient client.
+     *
+     * @param baseUrl the base URL of the host
+     * @param credentials the management credentials for Azure
+     */
+    public CosmosDBManagementClientImpl(String baseUrl, ServiceClientCredentials credentials) {
+        super(baseUrl, credentials);
+        initialize();
+    }
+
+    /**
+     * Initializes an instance of CosmosDBManagementClient client.
+     *
+     * @param restClient the REST client to connect to Azure.
+     */
+    public CosmosDBManagementClientImpl(RestClient restClient) {
+        super(restClient);
+        initialize();
+    }
+
+    protected void initialize() {
+        this.apiVersion = "2015-04-08";
+        this.acceptLanguage = "en-US";
+        this.longRunningOperationRetryTimeout = 30;
+        this.generateClientRequestId = true;
+        this.databaseAccounts = new DatabaseAccountsInner(restClient().retrofit(), this);
+        this.operations = new OperationsInner(restClient().retrofit(), this);
+        this.databases = new DatabasesInner(restClient().retrofit(), this);
+        this.collections = new CollectionsInner(restClient().retrofit(), this);
+        this.collectionRegions = new CollectionRegionsInner(restClient().retrofit(), this);
+        this.databaseAccountRegions = new DatabaseAccountRegionsInner(restClient().retrofit(), this);
+        this.percentileSourceTargets = new PercentileSourceTargetsInner(restClient().retrofit(), this);
+        this.percentileTargets = new PercentileTargetsInner(restClient().retrofit(), this);
+        this.percentiles = new PercentilesInner(restClient().retrofit(), this);
+        this.collectionPartitionRegions = new CollectionPartitionRegionsInner(restClient().retrofit(), this);
+        this.collectionPartitions = new CollectionPartitionsInner(restClient().retrofit(), this);
+        this.partitionKeyRangeIds = new PartitionKeyRangeIdsInner(restClient().retrofit(), this);
+        this.partitionKeyRangeIdRegions = new PartitionKeyRangeIdRegionsInner(restClient().retrofit(), this);
+        this.azureClient = new AzureClient(this);
+    }
+
+    /**
+     * Gets the User-Agent header for the client.
+     *
+     * @return the user agent string.
+     */
+    @Override
+    public String userAgent() {
+        return String.format("%s (%s, %s, auto-generated)", super.userAgent(), "CosmosDBManagementClient", "2015-04-08");
+    }
+}
diff --git a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CosmosDBManager.java b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CosmosDBManager.java
index 942623450e845..69f8b0a61757f 100644
--- a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CosmosDBManager.java
+++ b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/CosmosDBManager.java
@@ -35,7 +35,7 @@
 /**
  * Entry point to Azure CosmosDB resource management.
  */
-public final class CosmosDBManager extends ManagerCore<CosmosDBManager, CosmosDBImpl> {
+public final class CosmosDBManager extends ManagerCore<CosmosDBManager, CosmosDBManagementClientImpl> {
     private DatabaseAccounts databaseAccounts;
     private Operations operations;
     private Databases databases;
@@ -238,6 +238,6 @@ private CosmosDBManager(RestClient restClient, String subscriptionId) {
         super(
             restClient,
             subscriptionId,
-            new CosmosDBImpl(restClient).withSubscriptionId(subscriptionId));
+            new CosmosDBManagementClientImpl(restClient).withSubscriptionId(subscriptionId));
     }
 }
diff --git a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountRegionsInner.java b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountRegionsInner.java
index ba17a18123cb3..b6093dd5b9f8b 100644
--- a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountRegionsInner.java
+++ b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountRegionsInner.java
@@ -34,7 +34,7 @@ public class DatabaseAccountRegionsInner {
     /** The Retrofit service to perform REST calls. */
     private DatabaseAccountRegionsService service;
     /** The service client containing this operation class. */
-    private CosmosDBImpl client;
+    private CosmosDBManagementClientImpl client;
 
     /**
      * Initializes an instance of DatabaseAccountRegionsInner.
@@ -42,7 +42,7 @@ public class DatabaseAccountRegionsInner {
      * @param retrofit the Retrofit instance built from a Retrofit Builder.
      * @param client the instance of the service client containing this operation class.
      */
-    public DatabaseAccountRegionsInner(Retrofit retrofit, CosmosDBImpl client) {
+    public DatabaseAccountRegionsInner(Retrofit retrofit, CosmosDBManagementClientImpl client) {
         this.service = retrofit.create(DatabaseAccountRegionsService.class);
         this.client = client;
     }
diff --git a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountsInner.java b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountsInner.java
index 8cc3413ca963d..0e7475fd2179e 100644
--- a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountsInner.java
+++ b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabaseAccountsInner.java
@@ -65,7 +65,7 @@ public class DatabaseAccountsInner implements InnerSupportsGet<DatabaseAccountIn
     /** The Retrofit service to perform REST calls. */
     private DatabaseAccountsService service;
     /** The service client containing this operation class. */
-    private CosmosDBImpl client;
+    private CosmosDBManagementClientImpl client;
 
     /**
      * Initializes an instance of DatabaseAccountsInner.
@@ -73,7 +73,7 @@ public class DatabaseAccountsInner implements InnerSupportsGet<DatabaseAccountIn
      * @param retrofit the Retrofit instance built from a Retrofit Builder.
      * @param client the instance of the service client containing this operation class.
      */
-    public DatabaseAccountsInner(Retrofit retrofit, CosmosDBImpl client) {
+    public DatabaseAccountsInner(Retrofit retrofit, CosmosDBManagementClientImpl client) {
         this.service = retrofit.create(DatabaseAccountsService.class);
         this.client = client;
     }
diff --git a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabasesInner.java b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabasesInner.java
index b8da1c5963a8e..22b156491d14a 100644
--- a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabasesInner.java
+++ b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/DatabasesInner.java
@@ -34,7 +34,7 @@ public class DatabasesInner {
     /** The Retrofit service to perform REST calls. */
     private DatabasesService service;
     /** The service client containing this operation class. */
-    private CosmosDBImpl client;
+    private CosmosDBManagementClientImpl client;
 
     /**
      * Initializes an instance of DatabasesInner.
@@ -42,7 +42,7 @@ public class DatabasesInner {
      * @param retrofit the Retrofit instance built from a Retrofit Builder.
      * @param client the instance of the service client containing this operation class.
      */
-    public DatabasesInner(Retrofit retrofit, CosmosDBImpl client) {
+    public DatabasesInner(Retrofit retrofit, CosmosDBManagementClientImpl client) {
         this.service = retrofit.create(DatabasesService.class);
         this.client = client;
     }
diff --git a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/MetricDefinitionInner.java b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/MetricDefinitionInner.java
index 1a15e2346bb6f..a7bb924097902 100644
--- a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/MetricDefinitionInner.java
+++ b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/MetricDefinitionInner.java
@@ -27,7 +27,7 @@ public class MetricDefinitionInner {
 
     /**
      * The primary aggregation type of the metric. Possible values include:
-     * 'None', 'Average', 'Total', 'Minimimum', 'Maximum', 'Last'.
+     * 'None', 'Average', 'Total', 'Minimum', 'Maximum', 'Last'.
      */
     @JsonProperty(value = "primaryAggregationType", access = JsonProperty.Access.WRITE_ONLY)
     private PrimaryAggregationType primaryAggregationType;
@@ -62,7 +62,7 @@ public List<MetricAvailability> metricAvailabilities() {
     }
 
     /**
-     * Get the primary aggregation type of the metric. Possible values include: 'None', 'Average', 'Total', 'Minimimum', 'Maximum', 'Last'.
+     * Get the primary aggregation type of the metric. Possible values include: 'None', 'Average', 'Total', 'Minimum', 'Maximum', 'Last'.
      *
      * @return the primaryAggregationType value
      */
diff --git a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/OperationsInner.java b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/OperationsInner.java
index a8c1c32f32e18..ff83fbd5761eb 100644
--- a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/OperationsInner.java
+++ b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/OperationsInner.java
@@ -37,7 +37,7 @@ public class OperationsInner {
     /** The Retrofit service to perform REST calls. */
     private OperationsService service;
     /** The service client containing this operation class. */
-    private CosmosDBImpl client;
+    private CosmosDBManagementClientImpl client;
 
     /**
      * Initializes an instance of OperationsInner.
@@ -45,7 +45,7 @@ public class OperationsInner {
      * @param retrofit the Retrofit instance built from a Retrofit Builder.
      * @param client the instance of the service client containing this operation class.
      */
-    public OperationsInner(Retrofit retrofit, CosmosDBImpl client) {
+    public OperationsInner(Retrofit retrofit, CosmosDBManagementClientImpl client) {
         this.service = retrofit.create(OperationsService.class);
         this.client = client;
     }
diff --git a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PartitionKeyRangeIdRegionsInner.java b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PartitionKeyRangeIdRegionsInner.java
index bf16342dc947d..558556f7f6f19 100644
--- a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PartitionKeyRangeIdRegionsInner.java
+++ b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PartitionKeyRangeIdRegionsInner.java
@@ -34,7 +34,7 @@ public class PartitionKeyRangeIdRegionsInner {
     /** The Retrofit service to perform REST calls. */
     private PartitionKeyRangeIdRegionsService service;
     /** The service client containing this operation class. */
-    private CosmosDBImpl client;
+    private CosmosDBManagementClientImpl client;
 
     /**
      * Initializes an instance of PartitionKeyRangeIdRegionsInner.
@@ -42,7 +42,7 @@ public class PartitionKeyRangeIdRegionsInner {
      * @param retrofit the Retrofit instance built from a Retrofit Builder.
      * @param client the instance of the service client containing this operation class.
      */
-    public PartitionKeyRangeIdRegionsInner(Retrofit retrofit, CosmosDBImpl client) {
+    public PartitionKeyRangeIdRegionsInner(Retrofit retrofit, CosmosDBManagementClientImpl client) {
         this.service = retrofit.create(PartitionKeyRangeIdRegionsService.class);
         this.client = client;
     }
diff --git a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PartitionKeyRangeIdsInner.java b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PartitionKeyRangeIdsInner.java
index 4d1283dbf94d4..f1778387c96e1 100644
--- a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PartitionKeyRangeIdsInner.java
+++ b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PartitionKeyRangeIdsInner.java
@@ -34,7 +34,7 @@ public class PartitionKeyRangeIdsInner {
     /** The Retrofit service to perform REST calls. */
     private PartitionKeyRangeIdsService service;
     /** The service client containing this operation class. */
-    private CosmosDBImpl client;
+    private CosmosDBManagementClientImpl client;
 
     /**
      * Initializes an instance of PartitionKeyRangeIdsInner.
@@ -42,7 +42,7 @@ public class PartitionKeyRangeIdsInner {
      * @param retrofit the Retrofit instance built from a Retrofit Builder.
      * @param client the instance of the service client containing this operation class.
      */
-    public PartitionKeyRangeIdsInner(Retrofit retrofit, CosmosDBImpl client) {
+    public PartitionKeyRangeIdsInner(Retrofit retrofit, CosmosDBManagementClientImpl client) {
         this.service = retrofit.create(PartitionKeyRangeIdsService.class);
         this.client = client;
     }
diff --git a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PercentileSourceTargetsInner.java b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PercentileSourceTargetsInner.java
index 1a8b0e0539247..67f71344a222c 100644
--- a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PercentileSourceTargetsInner.java
+++ b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PercentileSourceTargetsInner.java
@@ -34,7 +34,7 @@ public class PercentileSourceTargetsInner {
     /** The Retrofit service to perform REST calls. */
     private PercentileSourceTargetsService service;
     /** The service client containing this operation class. */
-    private CosmosDBImpl client;
+    private CosmosDBManagementClientImpl client;
 
     /**
      * Initializes an instance of PercentileSourceTargetsInner.
@@ -42,7 +42,7 @@ public class PercentileSourceTargetsInner {
      * @param retrofit the Retrofit instance built from a Retrofit Builder.
      * @param client the instance of the service client containing this operation class.
      */
-    public PercentileSourceTargetsInner(Retrofit retrofit, CosmosDBImpl client) {
+    public PercentileSourceTargetsInner(Retrofit retrofit, CosmosDBManagementClientImpl client) {
         this.service = retrofit.create(PercentileSourceTargetsService.class);
         this.client = client;
     }
diff --git a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PercentileTargetsInner.java b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PercentileTargetsInner.java
index da29ac207b0d3..8ef7c42c04c4f 100644
--- a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PercentileTargetsInner.java
+++ b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PercentileTargetsInner.java
@@ -34,7 +34,7 @@ public class PercentileTargetsInner {
     /** The Retrofit service to perform REST calls. */
     private PercentileTargetsService service;
     /** The service client containing this operation class. */
-    private CosmosDBImpl client;
+    private CosmosDBManagementClientImpl client;
 
     /**
      * Initializes an instance of PercentileTargetsInner.
@@ -42,7 +42,7 @@ public class PercentileTargetsInner {
      * @param retrofit the Retrofit instance built from a Retrofit Builder.
      * @param client the instance of the service client containing this operation class.
      */
-    public PercentileTargetsInner(Retrofit retrofit, CosmosDBImpl client) {
+    public PercentileTargetsInner(Retrofit retrofit, CosmosDBManagementClientImpl client) {
         this.service = retrofit.create(PercentileTargetsService.class);
         this.client = client;
     }
diff --git a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PercentilesInner.java b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PercentilesInner.java
index a20483800e8ad..fc9d65cc1e7a3 100644
--- a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PercentilesInner.java
+++ b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/PercentilesInner.java
@@ -34,7 +34,7 @@ public class PercentilesInner {
     /** The Retrofit service to perform REST calls. */
     private PercentilesService service;
     /** The service client containing this operation class. */
-    private CosmosDBImpl client;
+    private CosmosDBManagementClientImpl client;
 
     /**
      * Initializes an instance of PercentilesInner.
@@ -42,7 +42,7 @@ public class PercentilesInner {
      * @param retrofit the Retrofit instance built from a Retrofit Builder.
      * @param client the instance of the service client containing this operation class.
      */
-    public PercentilesInner(Retrofit retrofit, CosmosDBImpl client) {
+    public PercentilesInner(Retrofit retrofit, CosmosDBManagementClientImpl client) {
         this.service = retrofit.create(PercentilesService.class);
         this.client = client;
     }
diff --git a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/package-info.java b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/package-info.java
index 9c76d08e321c3..0ea175666c9c7 100644
--- a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/package-info.java
+++ b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/implementation/package-info.java
@@ -5,7 +5,7 @@
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
 /**
- * This package contains the implementation classes for CosmosDB.
+ * This package contains the implementation classes for CosmosDBManagementClient.
  * Azure Cosmos DB Database Service Resource Provider REST API.
  */
 package com.microsoft.azure.management.cosmosdb.v2015_04_08.implementation;
diff --git a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/package-info.java b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/package-info.java
index 046adf5ad5b45..1a3068f98e34d 100644
--- a/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/package-info.java
+++ b/sdk/cosmos/mgmt-v2015_04_08/src/main/java/com/microsoft/azure/management/cosmosdb/v2015_04_08/package-info.java
@@ -5,7 +5,7 @@
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
 /**
- * This package contains the classes for CosmosDB.
+ * This package contains the classes for CosmosDBManagementClient.
  * Azure Cosmos DB Database Service Resource Provider REST API.
  */
 package com.microsoft.azure.management.cosmosdb.v2015_04_08;