diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/aio/client.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/aio/client.py
index 0508529ee695..253e71a79009 100644
--- a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/aio/client.py
+++ b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/aio/client.py
@@ -25,7 +25,7 @@
 )
 from ._polling_async import CreateCertificatePollerAsync
 from .._shared import AsyncKeyVaultClientBase
-from .._shared.exceptions import error_map
+from .._shared.exceptions import error_map as _error_map
 
 
 class CertificateClient(AsyncKeyVaultClientBase):
@@ -126,7 +126,7 @@ async def get_certificate_with_policy(self, name: str, **kwargs: "**Any") -> Cer
                 :dedent: 8
         """
         bundle = await self._client.get_certificate(
-            vault_base_url=self.vault_url, certificate_name=name, certificate_version="", error_map=error_map, **kwargs
+            vault_base_url=self.vault_url, certificate_name=name, certificate_version="", error_map=_error_map, **kwargs
         )
         return Certificate._from_certificate_bundle(certificate_bundle=bundle)
 
@@ -157,7 +157,7 @@ async def get_certificate(self, name: str, version: str, **kwargs: "**Any") -> C
             vault_base_url=self.vault_url,
             certificate_name=name,
             certificate_version=version,
-            error_map=error_map,
+            error_map=_error_map,
             **kwargs
         )
         return Certificate._from_certificate_bundle(certificate_bundle=bundle)
@@ -187,7 +187,7 @@ async def delete_certificate(self, name: str, **kwargs: "**Any") -> DeletedCerti
                 :dedent: 8
         """
         bundle = await self._client.delete_certificate(
-            vault_base_url=self.vault_url, certificate_name=name, error_map=error_map, **kwargs
+            vault_base_url=self.vault_url, certificate_name=name, error_map=_error_map, **kwargs
         )
         return DeletedCertificate._from_deleted_certificate_bundle(deleted_certificate_bundle=bundle)
 
@@ -216,7 +216,7 @@ async def get_deleted_certificate(self, name: str, **kwargs: "**Any") -> Deleted
                 :dedent: 8
         """
         bundle = await self._client.get_deleted_certificate(
-            vault_base_url=self.vault_url, certificate_name=name, error_map=error_map, **kwargs
+            vault_base_url=self.vault_url, certificate_name=name, error_map=_error_map, **kwargs
         )
         return DeletedCertificate._from_deleted_certificate_bundle(deleted_certificate_bundle=bundle)
 
@@ -425,7 +425,7 @@ async def backup_certificate(self, name: str, **kwargs: "**Any") -> bytes:
                 :dedent: 8
         """
         backup_result = await self._client.backup_certificate(
-            vault_base_url=self.vault_url, certificate_name=name, error_map=error_map, **kwargs
+            vault_base_url=self.vault_url, certificate_name=name, error_map=_error_map, **kwargs
         )
         return backup_result.value
 
@@ -654,7 +654,7 @@ async def get_certificate_operation(self, name: str, **kwargs: "**Any") -> Certi
         """
 
         bundle = await self._client.get_certificate_operation(
-            vault_base_url=self.vault_url, certificate_name=name, error_map=error_map, **kwargs
+            vault_base_url=self.vault_url, certificate_name=name, error_map=_error_map, **kwargs
         )
         return CertificateOperation._from_certificate_operation_bundle(certificate_operation_bundle=bundle)
 
@@ -674,7 +674,7 @@ async def delete_certificate_operation(self, name: str, **kwargs: "**Any") -> Ce
             :class:`~azure.core.exceptions.HttpResponseError` for other errors
         """
         bundle = await self._client.delete_certificate_operation(
-            vault_base_url=self.vault_url, certificate_name=name, error_map=error_map, **kwargs
+            vault_base_url=self.vault_url, certificate_name=name, error_map=_error_map, **kwargs
         )
         return CertificateOperation._from_certificate_operation_bundle(certificate_operation_bundle=bundle)
 
@@ -737,7 +737,7 @@ async def get_pending_certificate_signing_request(
         response = pipeline_response.http_response
 
         if response.status_code not in [200]:
-            self._client.map_error(status_code=response.status_code, response=response, error_map=error_map)
+            self._client.map_error(status_code=response.status_code, response=response, error_map=_error_map)
             raise self._client.models.KeyVaultErrorException(response, self._client._deserialize)
 
         deserialized = None
@@ -811,7 +811,7 @@ async def get_issuer(self, name: str, **kwargs: "**Any") -> Issuer:
                 :dedent: 8
         """
         issuer_bundle = await self._client.get_certificate_issuer(
-            vault_base_url=self.vault_url, issuer_name=name, error_map=error_map, **kwargs
+            vault_base_url=self.vault_url, issuer_name=name, error_map=_error_map, **kwargs
         )
         return Issuer._from_issuer_bundle(issuer_bundle=issuer_bundle)
 
diff --git a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/aio/client.py b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/aio/client.py
index ce9bfd3f8762..c432a2428dc2 100644
--- a/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/aio/client.py
+++ b/sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/aio/client.py
@@ -231,7 +231,7 @@ async def delete_key(self, name: str, **kwargs: "**Any") -> DeletedKey:
                 :caption: Delete a key
                 :dedent: 8
         """
-        bundle = await self._client.delete_key(self.vault_url, name, _error_map=_error_map, **kwargs)
+        bundle = await self._client.delete_key(self.vault_url, name, error_map=_error_map, **kwargs)
         return DeletedKey._from_deleted_key_bundle(bundle)
 
     @distributed_trace_async
@@ -257,7 +257,7 @@ async def get_key(self, name: str, version: Optional[str] = None, **kwargs: "**A
         if version is None:
             version = ""
 
-        bundle = await self._client.get_key(self.vault_url, name, version, _error_map=_error_map, **kwargs)
+        bundle = await self._client.get_key(self.vault_url, name, version, error_map=_error_map, **kwargs)
         return Key._from_key_bundle(bundle)
 
     @distributed_trace_async
@@ -280,7 +280,7 @@ async def get_deleted_key(self, name: str, **kwargs: "**Any") -> DeletedKey:
                 :caption: Get a deleted key
                 :dedent: 8
         """
-        bundle = await self._client.get_deleted_key(self.vault_url, name, _error_map=_error_map, **kwargs)
+        bundle = await self._client.get_deleted_key(self.vault_url, name, error_map=_error_map, **kwargs)
         return DeletedKey._from_deleted_key_bundle(bundle)
 
     @distributed_trace
@@ -449,7 +449,7 @@ async def update_key_properties(
             key_ops=key_operations,
             tags=tags,
             key_attributes=attributes,
-            _error_map=_error_map,
+            error_map=_error_map,
             **kwargs,
         )
         return Key._from_key_bundle(bundle)
@@ -477,7 +477,7 @@ async def backup_key(self, name: str, **kwargs: "**Any") -> bytes:
                 :caption: Get a key backup
                 :dedent: 8
         """
-        backup_result = await self._client.backup_key(self.vault_url, name, _error_map=_error_map, **kwargs)
+        backup_result = await self._client.backup_key(self.vault_url, name, error_map=_error_map, **kwargs)
         return backup_result.value
 
     @distributed_trace_async
@@ -503,7 +503,7 @@ async def restore_key(self, backup: bytes, **kwargs: "**Any") -> Key:
                 :caption: Restore a key backup
                 :dedent: 8
         """
-        bundle = await self._client.restore_key(self.vault_url, backup, _error_map=_error_map, **kwargs)
+        bundle = await self._client.restore_key(self.vault_url, backup, error_map=_error_map, **kwargs)
         return Key._from_key_bundle(bundle)
 
     @distributed_trace_async