Updated outputs for namespace [c], [d], [e], [h]

arm/Microsoft.CognitiveServices/accounts/deploy.bicep

@@ -222,16 +222,16 @@ module cognitiveServices_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment,
 }]
 
 @description('The name of the cognitive services account')
-output cognitiveServicesName string = cognitiveServices.name
+output name string = cognitiveServices.name
 
 @description('The resource ID of the cognitive services account')
-output cognitiveServicesResourceId string = cognitiveServices.id
+output resourceId string = cognitiveServices.id
 
 @description('The resource group the cognitive services account was deployed into')
-output cognitiveServicesResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
 
 @description('The service endpoint of the cognitive services account')
-output cognitiveServicesEndpoint string = cognitiveServices.properties.endpoint
+output endpoint string = cognitiveServices.properties.endpoint
 
 @description('The principal ID of the system assigned identity.')
 output systemAssignedPrincipalId string = systemAssignedIdentity && contains(cognitiveServices.identity, 'principalId') ? cognitiveServices.identity.principalId : ''

arm/Microsoft.CognitiveServices/accounts/readme.md

@@ -187,10 +187,10 @@ You can specify multiple user assigned identities to a resource by providing add
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `cognitiveServicesEndpoint` | string | The service endpoint of the cognitive services account |
-| `cognitiveServicesName` | string | The name of the cognitive services account |
-| `cognitiveServicesResourceGroup` | string | The resource group the cognitive services account was deployed into |
-| `cognitiveServicesResourceId` | string | The resource ID of the cognitive services account |
+| `endpoint` | string | The service endpoint of the cognitive services account |
+| `name` | string | The name of the cognitive services account |
+| `resourceGroupName` | string | The resource group the cognitive services account was deployed into |
+| `resourceId` | string | The resource ID of the cognitive services account |
 | `systemAssignedPrincipalId` | string | The principal ID of the system assigned identity. |
 
 ## Considerations
@@ -205,4 +205,4 @@ You can specify multiple user assigned identities to a resource by providing add
 - [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks)
 - [Privateendpoints](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-05-01/privateEndpoints)
 - [Privateendpoints/Privatednszonegroups](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-02-01/privateEndpoints/privateDnsZoneGroups)
-- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments)
+- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments)

arm/Microsoft.Compute/availabilitySets/deploy.bicep

@@ -71,10 +71,10 @@ module availabilitySet_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, i
 }]
 
 @description('The resource group the availability set was deployed into')
-output availabilitySetResourceName string = availabilitySet.name
+output name string = availabilitySet.name
 
 @description('The resource ID of the availability set')
-output availabilitySetResourceId string = availabilitySet.id
+output resourceId string = availabilitySet.id
 
 @description('The name of the availability set')
-output availabilitySetResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name

arm/Microsoft.Compute/availabilitySets/readme.md

@@ -68,12 +68,12 @@ Tag names and tag values can be provided as needed. A tag can be left without a
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `availabilitySetResourceGroup` | string | The name of the availability set |
-| `availabilitySetResourceId` | string | The resource ID of the availability set |
-| `availabilitySetResourceName` | string | The resource group the availability set was deployed into |
+| `name` | string | The resource group the availability set was deployed into |
+| `resourceGroupName` | string | The name of the availability set |
+| `resourceId` | string | The resource ID of the availability set |
 
 ## Template references
 
 - [Availabilitysets](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Compute/2021-04-01/availabilitySets)
 - [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks)
-- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments)
+- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments)

arm/Microsoft.Compute/diskEncryptionSets/.bicep/nested_kvAccessPolicy.bicep

@@ -27,10 +27,10 @@ resource policies 'Microsoft.KeyVault/vaults/accessPolicies@2021-06-01-preview'
 }
 
 @description('The name of the resource group the access policies assignment was created in.')
-output accessPolicyResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
 
 @description('The name of the access policies assignment')
-output accessPolicyName string = policies.name
+output name string = policies.name
 
 @description('The resource ID of the access policies assignment')
-output accessPolicyResourceId string = policies.id
+output resourceId string = policies.id

arm/Microsoft.Compute/diskEncryptionSets/deploy.bicep

@@ -87,13 +87,13 @@ module diskEncryptionSet_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment,
 }]
 
 @description('The resource ID of the disk encryption set')
-output diskEncryptionSetResourceId string = diskEncryptionSet.id
+output resourceId string = diskEncryptionSet.id
 
 @description('The name of the disk encryption set')
-output diskEncryptionSetName string = diskEncryptionSet.name
+output name string = diskEncryptionSet.name
 
 @description('The resource group the disk encryption set was deployed into')
-output diskEncryptionResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
 
 @description('The principal ID of the disk encryption set')
 output systemAssignedPrincipalId string = diskEncryptionSet.identity.principalId

arm/Microsoft.Compute/diskEncryptionSets/readme.md

@@ -67,14 +67,14 @@ Tag names and tag values can be provided as needed. A tag can be left without a
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `diskEncryptionResourceGroup` | string | The resource group the disk encryption set was deployed into |
-| `diskEncryptionSetName` | string | The name of the disk encryption set |
-| `diskEncryptionSetResourceId` | string | The resource ID of the disk encryption set |
 | `keyVaultName` | string | The name of the key vault with the disk encryption key |
+| `name` | string | The name of the disk encryption set |
+| `resourceGroupName` | string | The resource group the disk encryption set was deployed into |
+| `resourceId` | string | The resource ID of the disk encryption set |
 | `systemAssignedPrincipalId` | string | The principal ID of the disk encryption set |
 
 ## Template references
 
 - [Diskencryptionsets](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Compute/2021-04-01/diskEncryptionSets)
-- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments)
+- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments)
 - [Vaults/Accesspolicies](https://docs.microsoft.com/en-us/azure/templates/Microsoft.KeyVault/2021-06-01-preview/vaults/accessPolicies)

arm/Microsoft.Compute/galleries/deploy.bicep

@@ -92,10 +92,10 @@ module galleries_images 'images/deploy.bicep' = [for (image, index) in images: {
 }]
 
 @description('The resource ID of the deployed image gallery')
-output galleryResourceId string = gallery.id
+output resourceId string = gallery.id
 
 @description('The resource group of the deployed image gallery')
-output galleryResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
 
 @description('The name of the deployed image gallery')
-output galleryName string = gallery.name
+output name string = gallery.name

arm/Microsoft.Compute/galleries/images/deploy.bicep

@@ -153,10 +153,10 @@ module galleryImage_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, inde
 }]
 
 @description('The resource group the image was deployed into')
-output imageResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
 
 @description('The resource ID of the image')
-output imageResourceId string = image.id
+output resourceId string = image.id
 
 @description('The name of the image')
-output imageName string = image.name
+output name string = image.name

arm/Microsoft.Compute/galleries/images/readme.md

@@ -82,11 +82,11 @@ Tag names and tag values can be provided as needed. A tag can be left without a
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `imageName` | string | The name of the image |
-| `imageResourceGroup` | string | The resource group the image was deployed into |
-| `imageResourceId` | string | The resource ID of the image |
+| `name` | string | The name of the image |
+| `resourceGroupName` | string | The resource group the image was deployed into |
+| `resourceId` | string | The resource ID of the image |
 
 ## Template references
 
 - [Galleries/Images](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Compute/2020-09-30/galleries/images)
-- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments)
+- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments)

arm/Microsoft.Compute/galleries/readme.md

@@ -67,13 +67,13 @@ Tag names and tag values can be provided as needed. A tag can be left without a
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `galleryName` | string | The name of the deployed image gallery |
-| `galleryResourceGroup` | string | The resource group of the deployed image gallery |
-| `galleryResourceId` | string | The resource ID of the deployed image gallery |
+| `name` | string | The name of the deployed image gallery |
+| `resourceGroupName` | string | The resource group of the deployed image gallery |
+| `resourceId` | string | The resource ID of the deployed image gallery |
 
 ## Template references
 
 - [Galleries](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Compute/2020-09-30/galleries)
 - [Galleries/Images](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Compute/2020-09-30/galleries/images)
 - [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks)
-- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments)
+- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments)

arm/Microsoft.Compute/images/deploy.bicep

@@ -65,10 +65,10 @@ module image_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in r
 }]
 
 @description('The resource ID of the image')
-output imageResourceId string = image.id
+output resourceId string = image.id
 
 @description('The resource group the image was deployed into')
-output imageResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
 
 @description('The name of the image')
-output imageName string = image.name
+output name string = image.name

arm/Microsoft.Compute/images/readme.md

@@ -68,11 +68,11 @@ Tag names and tag values can be provided as needed. A tag can be left without a
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `imageName` | string | The name of the image |
-| `imageResourceGroup` | string | The resource group the image was deployed into |
-| `imageResourceId` | string | The resource ID of the image |
+| `name` | string | The name of the image |
+| `resourceGroupName` | string | The resource group the image was deployed into |
+| `resourceId` | string | The resource ID of the image |
 
 ## Template references
 
 - [Images](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Compute/2021-04-01/images)
-- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments)
+- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments)

arm/Microsoft.Compute/proximityPlacementGroups/deploy.bicep

@@ -61,10 +61,10 @@ module proximityPlacementGroup_rbac '.bicep/nested_rbac.bicep' = [for (roleAssig
 }]
 
 @description('The name of the proximity placement group')
-output proximityPlacementGroupName string = proximityPlacementGroup.name
+output name string = proximityPlacementGroup.name
 
 @description('The resourceId the proximity placement group')
-output proximityPlacementGroupResourceId string = proximityPlacementGroup.id
+output resourceId string = proximityPlacementGroup.id
 
 @description('The resource group the proximity placement group was deployed into')
-output proximityPlacementGroupResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name

arm/Microsoft.Compute/proximityPlacementGroups/readme.md

@@ -65,12 +65,12 @@ Tag names and tag values can be provided as needed. A tag can be left without a
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `proximityPlacementGroupName` | string | The name of the proximity placement group |
-| `proximityPlacementGroupResourceGroup` | string | The resource group the proximity placement group was deployed into |
-| `proximityPlacementGroupResourceId` | string | The resourceId the proximity placement group |
+| `name` | string | The name of the proximity placement group |
+| `resourceGroupName` | string | The resource group the proximity placement group was deployed into |
+| `resourceId` | string | The resourceId the proximity placement group |
 
 ## Template references
 
 - [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks)
 - [Proximityplacementgroups](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Compute/2021-04-01/proximityPlacementGroups)
-- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments)
+- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments)

arm/Microsoft.Compute/virtualMachineScaleSets/deploy.bicep

@@ -347,7 +347,9 @@ resource vmss 'Microsoft.Compute/virtualMachineScaleSets@2021-04-01' = {
   identity: identity
   zones: availabilityZones
   properties: {
-    proximityPlacementGroup: !empty(proximityPlacementGroupName) ? json('{"id":"${resourceId('Microsoft.Compute/proximityPlacementGroups', proximityPlacementGroup.name)}"}') : null
+    proximityPlacementGroup: !empty(proximityPlacementGroupName) ? {
+      id: az.resourceId('Microsoft.Compute/proximityPlacementGroups', proximityPlacementGroup.name)
+    } : null
     upgradePolicy: {
       mode: upgradePolicyMode
       rollingUpgradePolicy: {
@@ -615,13 +617,13 @@ module vmss_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in ro
 }]
 
 @description('The resource ID of the virtual machine scale set')
-output vmssResourceIds string = vmss.id
+output resourceId string = vmss.id
 
 @description('The resource group of the virtual machine scale set')
-output vmssResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
 
 @description('The name of the virtual machine scale set')
-output vmssName string = vmss.name
+output name string = vmss.name
 
 @description('The principal ID of the system assigned identity.')
 output systemAssignedPrincipalId string = systemAssignedIdentity && contains(vmss.identity, 'principalId') ? vmss.identity.principalId : ''

arm/Microsoft.Compute/virtualMachineScaleSets/extensions/deploy.bicep

@@ -61,10 +61,10 @@ resource extension 'Microsoft.Compute/virtualMachineScaleSets/extensions@2021-07
 }
 
 @description('The name of the extension')
-output extensionName string = extension.name
+output name string = extension.name
 
 @description('The ResourceId of the extension')
-output extensionResourceId string = extension.id
+output resourceId string = extension.id
 
 @description('The name of the Resource Group the extension was created in.')
-output extensionResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name

arm/Microsoft.Compute/virtualMachineScaleSets/extensions/readme.md

@@ -29,9 +29,9 @@ This module deploys a virtual machine scale set extension.
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `extensionName` | string | The name of the extension |
-| `extensionResourceGroup` | string | The name of the Resource Group the extension was created in. |
-| `extensionResourceId` | string | The Resource ID of the extension |
+| `name` | string | The name of the extension |
+| `resourceGroupName` | string | The name of the Resource Group the extension was created in. |
+| `resourceId` | string | The ResourceId of the extension |
 
 ## Template references
 

arm/Microsoft.Compute/virtualMachineScaleSets/readme.md

@@ -416,16 +416,16 @@ You can specify multiple user assigned identities to a resource by providing add
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
+| `name` | string | The name of the virtual machine scale set |
+| `resourceGroupName` | string | The resource group of the virtual machine scale set |
+| `resourceId` | string | The resource ID of the virtual machine scale set |
 | `systemAssignedPrincipalId` | string | The principal ID of the system assigned identity. |
-| `vmssName` | string | The name of the virtual machine scale set |
-| `vmssResourceGroup` | string | The resource group of the virtual machine scale set |
-| `vmssResourceIds` | string | The resource ID of the virtual machine scale set |
 
 ## Template references
 
 - [Diagnosticsettings](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-05-01-preview/diagnosticSettings)
 - [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks)
 - [Proximityplacementgroups](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Compute/2021-04-01/proximityPlacementGroups)
-- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments)
+- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments)
 - [Virtualmachinescalesets](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Compute/2021-04-01/virtualMachineScaleSets)
 - [Virtualmachinescalesets/Extensions](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Compute/2021-07-01/virtualMachineScaleSets/extensions)

arm/Microsoft.Consumption/budgets/deploy.bicep

@@ -80,10 +80,10 @@ resource budget 'Microsoft.Consumption/budgets@2019-05-01' = {
 }
 
 @description('The name of the budget')
-output budgetName string = budget.name
+output name string = budget.name
 
 @description('The resource ID of the budget')
-output budgetResourceId string = budget.id
+output resourceId string = budget.id
 
 @description('The subscription the budget was deployed into')
 output subscriptionName string = subscription().displayName

arm/Microsoft.Consumption/budgets/readme.md

@@ -27,8 +27,8 @@ This module deploys budgets for subscriptions.
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `budgetName` | string | The name of the budget |
-| `budgetResourceId` | string | The resource ID of the budget |
+| `name` | string | The name of the budget |
+| `resourceId` | string | The resource ID of the budget |
 | `subscriptionName` | string | The subscription the budget was deployed into |
 
 ## Template references

arm/Microsoft.ContainerInstance/containerGroups/deploy.bicep

@@ -114,16 +114,16 @@ resource containergroup_lock 'Microsoft.Authorization/locks@2017-04-01' = if (lo
 }
 
 @description('The name of the container group')
-output containerGroupName string = containergroup.name
+output name string = containergroup.name
 
 @description('The resource ID of the container group')
-output containerGroupResourceId string = containergroup.id
+output resourceId string = containergroup.id
 
 @description('The resource group the container group was deployed into')
-output containerGroupResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
 
 @description('The IPv4 address of the container group')
-output containerGroupIPv4Address string = containergroup.properties.ipAddress.ip
+output iPv4Address string = containergroup.properties.ipAddress.ip
 
 @description('The principal ID of the system assigned identity.')
 output systemAssignedPrincipalId string = systemAssignedIdentity && contains(containergroup.identity, 'principalId') ? containergroup.identity.principalId : ''