diff --git a/azure-keyvault/azure/keyvault/__init__.py b/azure-keyvault/azure/keyvault/__init__.py
index 1b62621a32b1..a4e5bcb0bd8d 100644
--- a/azure-keyvault/azure/keyvault/__init__.py
+++ b/azure-keyvault/azure/keyvault/__init__.py
@@ -12,7 +12,7 @@
 from .custom import http_bearer_challenge_cache as HttpBearerChallengeCache
 from .custom.http_bearer_challenge import HttpBearerChallenge
 from .custom.http_challenge import HttpChallenge
-from .custom.key_vault_client import CustomKeyVaultClient as KeyVaultClient
+from .custom.key_vault_client import KeyVaultClient
 from .custom.key_vault_id import (KeyVaultId,
                                   KeyId,
                                   SecretId,
diff --git a/azure-keyvault/azure/keyvault/custom/key_vault_client.py b/azure-keyvault/azure/keyvault/custom/key_vault_client.py
index a35a091f3ebc..08bfb163297c 100644
--- a/azure-keyvault/azure/keyvault/custom/key_vault_client.py
+++ b/azure-keyvault/azure/keyvault/custom/key_vault_client.py
@@ -12,7 +12,7 @@
 from msrest.authentication import BasicTokenAuthentication
 
 
-class CustomKeyVaultClient(KeyVaultClientBase):
+class KeyVaultClient(KeyVaultClientBase):
 
     def __init__(self, credentials):
         """The key vault client performs cryptographic key operations and vault operations against the Key Vault service.
@@ -32,7 +32,7 @@ def __init__(self, credentials):
             # wrap the supplied credentials with a KeyVaultAuthentication instance. Use that for the credentials supplied to the base client
             credentials = KeyVaultAuthentication(credentials=credentials)
 
-        super(CustomKeyVaultClient, self).__init__(credentials)
+        super(KeyVaultClient, self).__init__(credentials)
 
     def get_pending_certificate_signing_request(self, vault_base_url, certificate_name, custom_headers=None, raw=False, **operation_config):
         """Gets the Base64 pending certificate signing request (PKCS-10).
diff --git a/doc/ref/azure.keyvault.generated.models.rst b/doc/ref/azure.keyvault.generated.models.rst
deleted file mode 100644
index 45fb3b909772..000000000000
--- a/doc/ref/azure.keyvault.generated.models.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-azure.keyvault.generated.models module
-===========================================
-
-.. automodule:: azure.keyvault.generated.models
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/doc/ref/azure.keyvault.generated.rst b/doc/ref/azure.keyvault.generated.rst
deleted file mode 100644
index 702d90ca1848..000000000000
--- a/doc/ref/azure.keyvault.generated.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-azure.keyvault.generated package
-================================
-
-Submodules
-----------
-
-.. toctree::
-
-   azure.keyvault.generated.models
-
-Module contents
----------------
-
-.. automodule:: azure.keyvault.generated
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/doc/ref/azure.keyvault.key_vault_id.rst b/doc/ref/azure.keyvault.key_vault_id.rst
deleted file mode 100644
index 70a3f0518f53..000000000000
--- a/doc/ref/azure.keyvault.key_vault_id.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-azure.keyvault.key_vault_id module
-==================================
-
-Module contents
----------------
-
-.. automodule:: azure.keyvault.key_vault_id
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/doc/ref/azure.keyvault.operations.rst b/doc/ref/azure.keyvault.operations.rst
deleted file mode 100644
index d4b1471ff292..000000000000
--- a/doc/ref/azure.keyvault.operations.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-azure.keyvault.operations module
-================================
-
-.. automodule:: azure.keyvault.operations
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/doc/ref/azure.keyvault.rst b/doc/ref/azure.keyvault.rst
index 8ca1f00a2e67..67ca6bafcbba 100644
--- a/doc/ref/azure.keyvault.rst
+++ b/doc/ref/azure.keyvault.rst
@@ -7,12 +7,14 @@ Submodules
 .. toctree::
 
    azure.keyvault.models
-   azure.keyvault.operations
 
 Module contents
 ---------------
 
+    
 .. automodule:: azure.keyvault
     :members:
     :undoc-members:
     :show-inheritance:
+    :inherited-members:
+