Updated outputs for namespaces starting with [r], [o]

arm/Microsoft.OperationalInsights/workspaces/.bicep/nested_solutions.bicep

@@ -23,8 +23,10 @@ resource solution 'Microsoft.OperationsManagement/solutions@2015-11-01-preview'
 }
 
 @description('The resource ID of the deployed solution')
-output solutionResourceId string = solution.id
+output resourceId string = solution.id
+
 @description('The resource group where the solution will be deployed')
-output solutionResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
+
 @description('The name of the deployed solution')
-output solutionName string = solution.name
+output name string = solution.name

arm/Microsoft.OperationalInsights/workspaces/dataSources/deploy.bicep

@@ -86,10 +86,10 @@ resource dataSource 'Microsoft.OperationalInsights/workspaces/dataSources@2020-0
 }
 
 @description('The resource ID of the deployed data source')
-output dataSourceResourceId string = dataSource.id
+output resourceId string = dataSource.id
 
 @description('The resource group where the data source is deployed')
-output dataSourceResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
 
 @description('The name of the deployed data source')
-output dataSourceName string = dataSource.name
+output name string = dataSource.name

arm/Microsoft.OperationalInsights/workspaces/dataSources/readme.md

@@ -50,9 +50,9 @@ Tag names and tag values can be provided as needed. A tag can be left without a
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `dataSourceName` | string | The name of the deployed data source |
-| `dataSourceResourceGroup` | string | The resource group where the data source is deployed |
-| `dataSourceResourceId` | string | The resource ID of the deployed data source |
+| `name` | string | The name of the deployed data source |
+| `resourceGroupName` | string | The resource group where the data source is deployed |
+| `resourceId` | string | The resource ID of the deployed data source |
 
 ## Template references
 

arm/Microsoft.OperationalInsights/workspaces/deploy.bicep

@@ -249,13 +249,13 @@ module logAnalyticsWorkspace_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignm
 }]
 
 @description('The resource ID of the deployed log analytics workspace')
-output logAnalyticsResourceId string = logAnalyticsWorkspace.id
+output resourceId string = logAnalyticsWorkspace.id
 
 @description('The resource group of the deployed log analytics workspace')
-output logAnalyticsResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
 
 @description('The name of the deployed log analytics workspace')
-output logAnalyticsName string = logAnalyticsWorkspace.name
+output name string = logAnalyticsWorkspace.name
 
 @description('The ID associated with the workspace')
 output logAnalyticsWorkspaceId string = logAnalyticsWorkspace.properties.customerId

arm/Microsoft.OperationalInsights/workspaces/linkedServices/deploy.bicep

@@ -36,10 +36,10 @@ resource linkedService 'Microsoft.OperationalInsights/workspaces/linkedServices@
 }
 
 @description('The resource ID of the deployed linked service')
-output linkedServiceResourceId string = linkedService.id
+output resourceId string = linkedService.id
 
 @description('The resource group where the linked service is deployed')
-output linkedServiceResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
 
 @description('The name of the deployed linked service')
-output linkedServiceName string = linkedService.name
+output name string = linkedService.name

arm/Microsoft.OperationalInsights/workspaces/linkedServices/readme.md

@@ -40,9 +40,9 @@ Tag names and tag values can be provided as needed. A tag can be left without a
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `linkedServiceName` | string | The name of the deployed linked service |
-| `linkedServiceResourceGroup` | string | The resource group where the linked service is deployed |
-| `linkedServiceResourceId` | string | The resource ID of the deployed linked service |
+| `name` | string | The name of the deployed linked service |
+| `resourceGroupName` | string | The resource group where the linked service is deployed |
+| `resourceId` | string | The resource ID of the deployed linked service |
 
 ## Template references
 

arm/Microsoft.OperationalInsights/workspaces/readme.md

@@ -122,16 +122,16 @@ Tag names and tag values can be provided as needed. A tag can be left without a
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `logAnalyticsName` | string | The name of the deployed log analytics workspace |
-| `logAnalyticsResourceGroup` | string | The resource group of the deployed log analytics workspace |
-| `logAnalyticsResourceId` | string | The resource ID of the deployed log analytics workspace |
 | `logAnalyticsWorkspaceId` | string | The ID associated with the workspace |
+| `name` | string | The name of the deployed log analytics workspace |
+| `resourceGroupName` | string | The resource group of the deployed log analytics workspace |
+| `resourceId` | string | The resource ID of the deployed log analytics workspace |
 
 ## 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)
-- [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)
 - [Solutions](https://docs.microsoft.com/en-us/azure/templates/Microsoft.OperationsManagement/2015-11-01-preview/solutions)
 - [Workspaces](https://docs.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2020-08-01/workspaces)
 - [Workspaces/Datasources](https://docs.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2020-08-01/workspaces/dataSources)

arm/Microsoft.OperationalInsights/workspaces/savedSearches/deploy.bicep

@@ -52,10 +52,10 @@ resource savedSearch 'Microsoft.OperationalInsights/workspaces/savedSearches@202
 }
 
 @description('The resource ID of the deployed saved search')
-output savedSearchResourceId string = savedSearch.id
+output resourceId string = savedSearch.id
 
 @description('The resource group where the saved search is deployed')
-output savedSearchResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
 
 @description('The name of the deployed saved search')
-output savedSearchName string = savedSearch.name
+output name string = savedSearch.name

arm/Microsoft.OperationalInsights/workspaces/savedSearches/readme.md

@@ -44,9 +44,9 @@ Tag names and tag values can be provided as needed. A tag can be left without a
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `savedSearchName` | string | The name of the deployed saved search |
-| `savedSearchResourceGroup` | string | The resource group where the saved search is deployed |
-| `savedSearchResourceId` | string | The resource ID of the deployed saved search |
+| `name` | string | The name of the deployed saved search |
+| `resourceGroupName` | string | The resource group where the saved search is deployed |
+| `resourceId` | string | The resource ID of the deployed saved search |
 
 ## Template references
 

arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/deploy.bicep

@@ -47,10 +47,10 @@ resource storageinsightconfig 'Microsoft.OperationalInsights/workspaces/storageI
 }
 
 @description('The resource ID of the deployed storage insights configuration')
-output storageinsightconfigResourceId string = storageinsightconfig.id
+output resourceId string = storageinsightconfig.id
 
 @description('The resource group where the storage insight configuration is deployed')
-output storageinsightconfigResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
 
 @description('The name of the storage insights configuration')
-output storageinsightconfigName string = storageinsightconfig.name
+output name string = storageinsightconfig.name

arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/readme.md

@@ -41,9 +41,9 @@ Tag names and tag values can be provided as needed. A tag can be left without a
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `storageinsightconfigName` | string | The name of the storage insights configuration |
-| `storageinsightconfigResourceGroup` | string | The resource group where the storage insight configuration is deployed |
-| `storageinsightconfigResourceId` | string | The resource ID of the deployed storage insights configuration |
+| `name` | string | The name of the storage insights configuration |
+| `resourceGroupName` | string | The resource group where the storage insight configuration is deployed |
+| `resourceId` | string | The resource ID of the deployed storage insights configuration |
 
 ## Template references
 

arm/Microsoft.RecoveryServices/vaults/backupConfig/deploy.bicep

@@ -72,10 +72,10 @@ resource backupConfig 'Microsoft.RecoveryServices/vaults/backupconfig@2021-10-01
 }
 
 @description('The name of the backup config')
-output backupConfigName string = backupConfig.name
+output name string = backupConfig.name
 
 @description('The resource ID of the backup config')
-output backupConfigResourceId string = backupConfig.id
+output resourceId string = backupConfig.id
 
 @description('The name of the resource group the backup config was created in.')
-output backupConfigResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name

arm/Microsoft.RecoveryServices/vaults/backupConfig/readme.md

@@ -26,10 +26,10 @@ This module deploys recovery services vault backup config.
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `backupConfigName` | string | The name of the backup config |
-| `backupConfigResourceGroup` | string | The name of the resource group the backup config was created in. |
-| `backupConfigResourceId` | string | The resource ID of the backup config |
+| `name` | string | The name of the backup config |
+| `resourceGroupName` | string | The name of the resource group the backup config was created in. |
+| `resourceId` | string | The resource ID of the backup config |
 
 ## Template references
 
-- [Vaults/Backupconfig](https://docs.microsoft.com/en-us/azure/templates/Microsoft.RecoveryServices/2021-08-01/vaults/backupconfig)
+- [Vaults/Backupconfig](https://docs.microsoft.com/en-us/azure/templates/Microsoft.RecoveryServices/2021-10-01/vaults/backupconfig)

arm/Microsoft.RecoveryServices/vaults/backupPolicies/deploy.bicep

@@ -26,10 +26,10 @@ resource backupPolicy 'Microsoft.RecoveryServices/vaults/backupPolicies@2021-08-
 }
 
 @description('The name of the backup policy')
-output backupPolicyName string = backupPolicy.name
+output name string = backupPolicy.name
 
 @description('The resource ID of the backup policy')
-output backupPolicyResourceId string = backupPolicy.id
+output resourceId string = backupPolicy.id
 
 @description('The name of the resource group the backup policy was created in.')
-output backupPolicyResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name

arm/Microsoft.RecoveryServices/vaults/backupPolicies/readme.md

@@ -109,9 +109,9 @@ Object continaining the configuration for backup policies. It needs to be proper
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `backupPolicyName` | string | The name of the backup policy |
-| `backupPolicyResourceGroup` | string | The name of the resource group the backup policy was created in. |
-| `backupPolicyResourceId` | string | The resource ID of the backup policy |
+| `name` | string | The name of the backup policy |
+| `resourceGroupName` | string | The name of the resource group the backup policy was created in. |
+| `resourceId` | string | The resource ID of the backup policy |
 
 ## Template references
 

arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/deploy.bicep

@@ -38,10 +38,10 @@ resource backupStorageConfig 'Microsoft.RecoveryServices/vaults/backupstoragecon
 }
 
 @description('The name of the backup storage config')
-output backupStorageConfigName string = backupStorageConfig.name
+output name string = backupStorageConfig.name
 
 @description('The resource ID of the backup storage config')
-output backupStorageConfigResourceId string = backupStorageConfig.id
+output resourceId string = backupStorageConfig.id
 
 @description('The name of the Resource Group the backup storage configuration was created in.')
-output backupStorageConfigResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name

arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/readme.md

@@ -22,9 +22,9 @@ This module deploys the Backup Storage Configuration for the Recovery Service Va
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `backupStorageConfigName` | string | The name of the backup storage config |
-| `backupStorageConfigResourceGroup` | string | The name of the Resource Group the backup storage configuration was created in. |
-| `backupStorageConfigResourceId` | string | The resource ID of the backup storage config |
+| `name` | string | The name of the backup storage config |
+| `resourceGroupName` | string | The name of the Resource Group the backup storage configuration was created in. |
+| `resourceId` | string | The resource ID of the backup storage config |
 
 ## Template references
 

arm/Microsoft.RecoveryServices/vaults/deploy.bicep

@@ -218,13 +218,13 @@ module rsv_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in rol
 }]
 
 @description('The resource ID of the recovery services vault')
-output recoveryServicesVaultResourceId string = rsv.id
+output resourceId string = rsv.id
 
 @description('The name of the resource group the recovery services vault was created in')
-output recoveryServicesVaultResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
 
 @description('The Name of the recovery services vault')
-output recoveryServicesVaultName string = rsv.name
+output name string = rsv.name
 
 @description('The principal ID of the system assigned identity.')
 output systemAssignedPrincipalId string = systemAssignedIdentity && contains(rsv.identity, 'principalId') ? rsv.identity.principalId : ''

arm/Microsoft.RecoveryServices/vaults/protectionContainers/deploy.bicep

@@ -59,10 +59,10 @@ resource protectionContainer 'Microsoft.RecoveryServices/vaults/backupFabrics/pr
 }
 
 @description('The name of the Resource Group the Protection Container was created in.')
-output protectionContainerResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
 
 @description('The resource ID of the Protection Container.')
-output protectionContainerResourceId string = protectionContainer.id
+output resourceId string = protectionContainer.id
 
 @description('The Name of the Protection Container.')
-output protectionContainerName string = protectionContainer.name
+output name string = protectionContainer.name

arm/Microsoft.RecoveryServices/vaults/protectionContainers/readme.md

@@ -24,9 +24,9 @@ This module deploys a Protection Container for a Recovery Services Vault
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `protectionContainerName` | string | The Name of the Protection Container. |
-| `protectionContainerResourceGroup` | string | The name of the Resource Group the Protection Container was created in. |
-| `protectionContainerResourceId` | string | The resource ID of the Protection Container. |
+| `name` | string | The Name of the Protection Container. |
+| `resourceGroupName` | string | The name of the Resource Group the Protection Container was created in. |
+| `resourceId` | string | The resource ID of the Protection Container. |
 
 ## Template references
 

arm/Microsoft.RecoveryServices/vaults/readme.md

@@ -10,7 +10,7 @@ This module deploys a recovery service vault.
 | `Microsoft.Authorization/roleAssignments` | 2021-04-01-preview |
 | `Microsoft.Insights/diagnosticSettings` | 2021-05-01-preview |
 | `Microsoft.RecoveryServices/vaults` | 2021-12-01 |
-| `Microsoft.RecoveryServices/vaults/backupconfig` | 2021-08-01 |
+| `Microsoft.RecoveryServices/vaults/backupconfig` | 2021-10-01 |
 | `Microsoft.RecoveryServices/vaults/backupFabrics/protectionContainers` | 2021-08-01 |
 | `Microsoft.RecoveryServices/vaults/backupPolicies` | 2021-08-01 |
 | `Microsoft.RecoveryServices/vaults/backupstorageconfig` | 2021-08-01 |
@@ -348,18 +348,18 @@ You can specify multiple user assigned identities to a resource by providing add
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `recoveryServicesVaultName` | string | The Name of the recovery services vault |
-| `recoveryServicesVaultResourceGroup` | string | The name of the resource group the recovery services vault was created in |
-| `recoveryServicesVaultResourceId` | string | The resource ID of the recovery services vault |
+| `name` | string | The Name of the recovery services vault |
+| `resourceGroupName` | string | The name of the resource group the recovery services vault was created in |
+| `resourceId` | string | The resource ID of the recovery services vault |
 | `systemAssignedPrincipalId` | string | The principal ID of the system assigned identity. |
 
 ## 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)
-- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments)
-- [Vaults](https://docs.microsoft.com/en-us/azure/templates/Microsoft.RecoveryServices/2021-08-01/vaults)
-- [Vaults/Backupconfig](https://docs.microsoft.com/en-us/azure/templates/Microsoft.RecoveryServices/2021-08-01/vaults/backupconfig)
+- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments)
+- [Vaults](https://docs.microsoft.com/en-us/azure/templates/Microsoft.RecoveryServices/vaults)
+- [Vaults/Backupconfig](https://docs.microsoft.com/en-us/azure/templates/Microsoft.RecoveryServices/2021-10-01/vaults/backupconfig)
 - [Vaults/Backupfabrics/Protectioncontainers](https://docs.microsoft.com/en-us/azure/templates/Microsoft.RecoveryServices/2021-08-01/vaults/backupFabrics/protectionContainers)
 - [Vaults/Backuppolicies](https://docs.microsoft.com/en-us/azure/templates/Microsoft.RecoveryServices/2021-08-01/vaults/backupPolicies)
 - [Vaults/Backupstorageconfig](https://docs.microsoft.com/en-us/azure/templates/Microsoft.RecoveryServices/2021-08-01/vaults/backupstorageconfig)

arm/Microsoft.Resources/deploymentScripts/deploy.bicep

@@ -120,10 +120,10 @@ resource deploymentScript_lock 'Microsoft.Authorization/locks@2017-04-01' = if (
 }
 
 @description('The resource ID of the deployment script')
-output deploymentScriptResourceId string = deploymentScript.id
+output resourceId string = deploymentScript.id
 
 @description('The resource group the deployment script was deployed into')
-output deploymentScriptResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
 
 @description('The name of the deployment script')
-output deploymentScriptName string = deploymentScript.name
+output name string = deploymentScript.name

arm/Microsoft.Resources/deploymentScripts/readme.md

@@ -68,9 +68,9 @@ You can specify multiple user assigned identities to a resource by providing add
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `deploymentScriptName` | string | The name of the deployment script |
-| `deploymentScriptResourceGroup` | string | The resource group the deployment script was deployed into |
-| `deploymentScriptResourceId` | string | The resource ID of the deployment script |
+| `name` | string | The name of the deployment script |
+| `resourceGroupName` | string | The resource group the deployment script was deployed into |
+| `resourceId` | string | The resource ID of the deployment script |
 
 ## Considerations
 

arm/Microsoft.Resources/resourceGroups/.bicep/nested_lock.bicep

@@ -25,6 +25,7 @@ resource lock 'Microsoft.Authorization/locks@2017-04-01' = if (level != 'NotSpec
 }
 
 @description('The resource ID of the lock')
-output lockResourceId string = lock.id
+output resourceId string = lock.id
+
 @description('The name of the lock')
-output lockName string = lock.name
+output name string = lock.name

arm/Microsoft.Resources/resourceGroups/deploy.bicep

@@ -47,7 +47,7 @@ module resourceGroup_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, ind
 }]
 
 @description('The name of the resource group')
-output resourceGroupName string = resourceGroup.name
+output name string = resourceGroup.name
 
 @description('The resource ID of the resource group')
-output resourceGroupResourceId string = resourceGroup.id
+output resourceId string = resourceGroup.id