diff --git a/arm/Microsoft.KeyVault/vaults/deploy.bicep b/arm/Microsoft.KeyVault/vaults/deploy.bicep
index cfe932e206..3de15da486 100644
--- a/arm/Microsoft.KeyVault/vaults/deploy.bicep
+++ b/arm/Microsoft.KeyVault/vaults/deploy.bicep
@@ -210,7 +210,7 @@ resource keyVault_diagnosticSettings 'Microsoft.Insights/diagnosticsettings@2017
 }
 
 module keyVault_accessPolicies 'accessPolicies/deploy.bicep' = if (!empty(accessPolicies)) {
-  name: '${uniqueString(deployment().name, location)}-AccessPolicies'
+  name: '${uniqueString(deployment().name, location)}-KeyVault-AccessPolicies'
   params: {
     keyVaultName: keyVault.name
     accessPolicies: formattedAccessPolicies
@@ -218,7 +218,7 @@ module keyVault_accessPolicies 'accessPolicies/deploy.bicep' = if (!empty(access
 }
 
 module keyVault_secrets 'secrets/deploy.bicep' = [for (secret, index) in secrets: {
-  name: '${uniqueString(deployment().name, location)}-Secret-${index}'
+  name: '${uniqueString(deployment().name, location)}-KeyVault-Secret-${index}'
   params: {
     name: secret.name
     value: secret.value
@@ -233,7 +233,7 @@ module keyVault_secrets 'secrets/deploy.bicep' = [for (secret, index) in secrets
 }]
 
 module keyVault_keys 'keys/deploy.bicep' = [for (key, index) in keys: {
-  name: '${uniqueString(deployment().name, location)}-Key-${index}'
+  name: '${uniqueString(deployment().name, location)}-KeyVault-Key-${index}'
   params: {
     name: key.name
     keyVaultName: keyVault.name
@@ -250,7 +250,7 @@ module keyVault_keys 'keys/deploy.bicep' = [for (key, index) in keys: {
 }]
 
 module keyVault_privateEndpoints '.bicep/nested_privateEndpoint.bicep' = [for (privateEndpoint, index) in privateEndpoints: {
-  name: '${uniqueString(deployment().name, location)}-PrivateEndpoint-${index}'
+  name: '${uniqueString(deployment().name, location)}-KeyVault-PrivateEndpoint-${index}'
   params: {
     privateEndpointResourceId: keyVault.id
     privateEndpointVnetLocation: (empty(privateEndpoints) ? 'dummy' : reference(split(privateEndpoint.subnetResourceId, '/subnets/')[0], '2020-06-01', 'Full').location)
@@ -260,7 +260,7 @@ module keyVault_privateEndpoints '.bicep/nested_privateEndpoint.bicep' = [for (p
 }]
 
 module keyVault_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: {
-  name: '${deployment().name}-rbac-${index}'
+  name: '${uniqueString(deployment().name, location)}-KeyVault-Rbac-${index}'
   params: {
     principalIds: roleAssignment.principalIds
     roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName
@@ -268,14 +268,14 @@ module keyVault_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) i
   }
 }]
 
-@description('The Resource ID of the Key Vault.')
+@description('The resource ID of the key vault.')
 output keyVaultResourceId string = keyVault.id
 
-@description('The name of the Resource Group the Key Vault was created in.')
+@description('The name of the resource group the key vault was created in.')
 output keyVaultResourceGroup string = resourceGroup().name
 
-@description('The Name of the Key Vault.')
+@description('The name of the key vault.')
 output keyVaultName string = keyVault.name
 
-@description('The URL of the Key Vault.')
-output keyVaultUrl string = reference(keyVault.id, '2016-10-01').vaultUri
+@description('The URL of the key vault.')
+output keyVaultUrl string = keyVault.properties.vaultUri
diff --git a/arm/Microsoft.KeyVault/vaults/keys/deploy.bicep b/arm/Microsoft.KeyVault/vaults/keys/deploy.bicep
index 8a34081c3c..323472a0a4 100644
--- a/arm/Microsoft.KeyVault/vaults/keys/deploy.bicep
+++ b/arm/Microsoft.KeyVault/vaults/keys/deploy.bicep
@@ -82,7 +82,7 @@ resource key 'Microsoft.KeyVault/vaults/keys@2019-09-01' = {
 }
 
 module key_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: {
-  name: '${deployment().name}-rbac-${index}'
+  name: '${deployment().name}-Rbac-${index}'
   params: {
     principalIds: roleAssignment.principalIds
     roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName
diff --git a/arm/Microsoft.KeyVault/vaults/readme.md b/arm/Microsoft.KeyVault/vaults/readme.md
index 82dc0db1ec..dd0ca57f15 100644
--- a/arm/Microsoft.KeyVault/vaults/readme.md
+++ b/arm/Microsoft.KeyVault/vaults/readme.md
@@ -179,10 +179,10 @@ To use Private Endpoint the following dependencies must be deployed:
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `keyVaultName` | string | The Name of the Key Vault. |
-| `keyVaultResourceGroup` | string | The name of the Resource Group the Key Vault was created in. |
-| `keyVaultResourceId` | string | The Resource ID of the Key Vault. |
-| `keyVaultUrl` | string | The URL of the Key Vault. |
+| `keyVaultName` | string | The name of the key vault. |
+| `keyVaultResourceGroup` | string | The name of the resource group the key vault was created in. |
+| `keyVaultResourceId` | string | The resource ID of the key vault. |
+| `keyVaultUrl` | string | The URL of the key vault. |
 
 ## Template references
 
diff --git a/arm/Microsoft.KeyVault/vaults/secrets/deploy.bicep b/arm/Microsoft.KeyVault/vaults/secrets/deploy.bicep
index 92d414b57f..c074035a49 100644
--- a/arm/Microsoft.KeyVault/vaults/secrets/deploy.bicep
+++ b/arm/Microsoft.KeyVault/vaults/secrets/deploy.bicep
@@ -55,7 +55,7 @@ resource secret 'Microsoft.KeyVault/vaults/secrets@2019-09-01' = {
 }
 
 module secret_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: {
-  name: '${deployment().name}-rbac-${index}'
+  name: '${deployment().name}-Rbac-${index}'
   params: {
     principalIds: roleAssignment.principalIds
     roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName