diff --git a/lib/services/cosmosdbManagement/lib/cosmosDBManagementClient.d.ts b/lib/services/cosmosdbManagement/lib/cosmosDBManagementClient.d.ts
index db8bbbb85e..fa38c8fcfd 100644
--- a/lib/services/cosmosdbManagement/lib/cosmosDBManagementClient.d.ts
+++ b/lib/services/cosmosdbManagement/lib/cosmosDBManagementClient.d.ts
@@ -10,9 +10,10 @@
 
 import { ServiceClientCredentials } from 'ms-rest';
 import { AzureServiceClient, AzureServiceClientOptions } from 'ms-rest-azure';
+import * as models from "./models";
 import * as operations from "./operations";
 
-declare class CosmosDBManagementClient extends AzureServiceClient {
+export default class CosmosDBManagementClient extends AzureServiceClient {
   /**
    * Initializes a new instance of the CosmosDBManagementClient class.
    * @constructor
@@ -70,4 +71,4 @@ declare class CosmosDBManagementClient extends AzureServiceClient {
   partitionKeyRangeIdRegion: operations.PartitionKeyRangeIdRegion;
 }
 
-export = CosmosDBManagementClient;
+export { CosmosDBManagementClient, models as CosmosDBManagementModels };
diff --git a/lib/services/cosmosdbManagement/lib/cosmosDBManagementClient.js b/lib/services/cosmosdbManagement/lib/cosmosDBManagementClient.js
index 7f50bf02f6..cdecaec4e3 100644
--- a/lib/services/cosmosdbManagement/lib/cosmosDBManagementClient.js
+++ b/lib/services/cosmosdbManagement/lib/cosmosDBManagementClient.js
@@ -92,3 +92,6 @@ class CosmosDBManagementClient extends ServiceClient {
 }
 
 module.exports = CosmosDBManagementClient;
+module.exports['default'] = CosmosDBManagementClient;
+module.exports.CosmosDBManagementClient = CosmosDBManagementClient;
+module.exports.CosmosDBManagementModels = models;
diff --git a/lib/services/cosmosdbManagement/lib/models/capability.js b/lib/services/cosmosdbManagement/lib/models/capability.js
index fbc6913c4c..e27c125fb7 100644
--- a/lib/services/cosmosdbManagement/lib/models/capability.js
+++ b/lib/services/cosmosdbManagement/lib/models/capability.js
@@ -17,7 +17,9 @@
 class Capability {
   /**
    * Create a Capability.
-   * @member {string} [name] Name of the Cosmos DB capability
+   * @member {string} [name] Name of the Cosmos DB capability. For example,
+   * "name": "EnableCassandra". Current values also include "EnableTable" and
+   * "EnableGremlin".
    */
   constructor() {
   }
diff --git a/lib/services/cosmosdbManagement/lib/models/index.d.ts b/lib/services/cosmosdbManagement/lib/models/index.d.ts
index 72522d0068..eed218fe12 100644
--- a/lib/services/cosmosdbManagement/lib/models/index.d.ts
+++ b/lib/services/cosmosdbManagement/lib/models/index.d.ts
@@ -46,7 +46,9 @@ export interface ConsistencyPolicy {
  * @constructor
  * Cosmos DB capability object
  *
- * @member {string} [name] Name of the Cosmos DB capability
+ * @member {string} [name] Name of the Cosmos DB capability. For example,
+ * "name": "EnableCassandra". Current values also include "EnableTable" and
+ * "EnableGremlin".
  */
 export interface Capability {
   name?: string;