From 78ac531b15d3d3a3a04d8ccb47e32eaf4352a803 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Thu, 20 Jan 2022 23:50:33 +0100
Subject: [PATCH 1/4] Updated outputs for namespace [m], [l], [k], [i]

---
 .../platform.dependencies.yml                 |  2 +-
 .github/workflows/platform.dependencies.yml   | 10 ++++-----
 .../actionGroups/deploy.bicep                 |  6 ++---
 arm/Microsoft.Insights/actionGroups/readme.md |  8 +++----
 .../activityLogAlerts/deploy.bicep            |  6 ++---
 .../activityLogAlerts/readme.md               |  8 +++----
 .../components/deploy.bicep                   |  8 +++----
 arm/Microsoft.Insights/components/readme.md   | 10 ++++-----
 .../diagnosticSettings/deploy.bicep           |  4 ++--
 .../diagnosticSettings/readme.md              |  4 ++--
 .../metricAlerts/deploy.bicep                 |  6 ++---
 arm/Microsoft.Insights/metricAlerts/readme.md |  8 +++----
 .../privateLinkScopes/deploy.bicep            |  6 ++---
 .../privateLinkScopes/readme.md               |  8 +++----
 .../scopedResources/deploy.bicep              |  6 ++---
 .../scopedResources/readme.md                 |  6 ++---
 .../scheduledQueryRules/deploy.bicep          |  6 ++---
 .../scheduledQueryRules/readme.md             |  8 +++----
 .../vaults/accessPolicies/deploy.bicep        |  6 ++---
 .../vaults/accessPolicies/readme.md           |  6 ++---
 arm/Microsoft.KeyVault/vaults/deploy.bicep    | 10 ++++-----
 .../vaults/keys/deploy.bicep                  |  6 ++---
 arm/Microsoft.KeyVault/vaults/keys/readme.md  |  8 +++----
 arm/Microsoft.KeyVault/vaults/readme.md       | 22 +++++++++----------
 .../vaults/secrets/deploy.bicep               |  6 ++---
 .../vaults/secrets/readme.md                  |  8 +++----
 arm/Microsoft.Logic/workflows/deploy.bicep    |  6 ++---
 arm/Microsoft.Logic/workflows/readme.md       |  8 +++----
 .../workspaces/deploy.bicep                   |  6 ++---
 .../workspaces/readme.md                      |  8 +++----
 .../userAssignedIdentities/deploy.bicep       |  8 +++----
 .../userAssignedIdentities/readme.md          | 10 ++++-----
 .../nested_registrationAssignment.bicep       |  5 +++--
 .../registrationDefinitions/deploy.bicep      |  8 +++----
 .../registrationDefinitions/readme.md         |  6 ++---
 .../managementGroups/deploy.bicep             |  6 ++---
 .../managementGroups/readme.md                |  6 ++---
 37 files changed, 135 insertions(+), 134 deletions(-)

diff --git a/.azuredevops/platformPipelines/platform.dependencies.yml b/.azuredevops/platformPipelines/platform.dependencies.yml
index b53d38722b..8aa81a8448 100644
--- a/.azuredevops/platformPipelines/platform.dependencies.yml
+++ b/.azuredevops/platformPipelines/platform.dependencies.yml
@@ -77,7 +77,7 @@ stages:
               pwsh: true
               script: |
                 # Write-Verbose $(deploymentOutput) -Verbose
-                $msiPrincipalId = (ConvertFrom-Json '$(deploymentOutput)').msiPrincipalId
+                $msiPrincipalId = (ConvertFrom-Json '$(deploymentOutput)').principalId
                 Write-Verbose "msiPrincipalId: $msiPrincipalId" -Verbose
                 Write-Output ('##vso[task.setvariable variable={0};isOutput=true]{1}' -f 'msiPrincipalId', $msiPrincipalId)
 
diff --git a/.github/workflows/platform.dependencies.yml b/.github/workflows/platform.dependencies.yml
index 83c4d0778f..907b0c5ab9 100644
--- a/.github/workflows/platform.dependencies.yml
+++ b/.github/workflows/platform.dependencies.yml
@@ -63,7 +63,7 @@ jobs:
     needs:
       - job_deploy_rg
     outputs:
-      msiPrincipalId: ${{ steps.print_msi_prinId.outputs.msiPrincipalId }}
+      msiPrincipalId: ${{ steps.print_msi_prinId.outputs.principalId }}
     strategy:
       fail-fast: false
       matrix:
@@ -605,7 +605,7 @@ jobs:
           subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
           managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'
           removeDeployment: '${{ env.removeDeployment }}'
-          customParameterFileTokens: '[{"Name":"msiPrincipalId","Value":"${{ needs.job_deploy_msi.outputs.msiPrincipalId }}"}]'
+          customParameterFileTokens: '[{"Name":"msiPrincipalId","Value":"${{ needs.job_deploy_msi.outputs.principalId }}"}]'
 
   job_deploy_kv:
     runs-on: ubuntu-20.04
@@ -636,7 +636,7 @@ jobs:
           subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
           managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'
           removeDeployment: '${{ env.removeDeployment }}'
-          customParameterFileTokens: '[{"Name":"msiPrincipalId","Value":"${{ needs.job_deploy_msi.outputs.msiPrincipalId }}"}]'
+          customParameterFileTokens: '[{"Name":"msiPrincipalId","Value":"${{ needs.job_deploy_msi.outputs.principalId }}"}]'
 
   job_deploy_kv_secrets:
     runs-on: ubuntu-20.04
@@ -750,7 +750,7 @@ jobs:
           subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
           managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'
           removeDeployment: '${{ env.removeDeployment }}'
-          customParameterFileTokens: '[{"Name":"msiPrincipalId","Value":"${{ needs.job_deploy_msi.outputs.msiPrincipalId }}"}]'
+          customParameterFileTokens: '[{"Name":"msiPrincipalId","Value":"${{ needs.job_deploy_msi.outputs.principalId }}"}]'
 
   job_deploy_sqlmi_kv_secrets:
     runs-on: ubuntu-20.04
@@ -871,7 +871,7 @@ jobs:
           subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
           managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'
           removeDeployment: '${{ env.removeDeployment }}'
-          customParameterFileTokens: '[{"Name":"msiPrincipalId","Value":"${{ needs.job_deploy_msi.outputs.msiPrincipalId }}"}]'
+          customParameterFileTokens: '[{"Name":"msiPrincipalId","Value":"${{ needs.job_deploy_msi.outputs.principalId }}"}]'
 
   job_deploy_vnet:
     runs-on: ubuntu-20.04
diff --git a/arm/Microsoft.Insights/actionGroups/deploy.bicep b/arm/Microsoft.Insights/actionGroups/deploy.bicep
index 08c650ab9b..010a09821b 100644
--- a/arm/Microsoft.Insights/actionGroups/deploy.bicep
+++ b/arm/Microsoft.Insights/actionGroups/deploy.bicep
@@ -84,10 +84,10 @@ module actionGroup_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index
 }]
 
 @description('The resource group the action group was deployed into')
-output actionGroupResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
 
 @description('The name of the action group ')
-output actionGroupName string = actionGroup.name
+output name string = actionGroup.name
 
 @description('The resource ID of the action group ')
-output actionGroupResourceId string = actionGroup.id
+output resourceId string = actionGroup.id
diff --git a/arm/Microsoft.Insights/actionGroups/readme.md b/arm/Microsoft.Insights/actionGroups/readme.md
index a301e71892..4cbad20879 100644
--- a/arm/Microsoft.Insights/actionGroups/readme.md
+++ b/arm/Microsoft.Insights/actionGroups/readme.md
@@ -118,11 +118,11 @@ Tag names and tag values can be provided as needed. A tag can be left without a
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `actionGroupName` | string | The name of the action group  |
-| `actionGroupResourceGroup` | string | The resource group the action group was deployed into |
-| `actionGroupResourceId` | string | The resource ID of the action group  |
+| `name` | string | The name of the action group  |
+| `resourceGroupName` | string | The resource group the action group was deployed into |
+| `resourceId` | string | The resource ID of the action group  |
 
 ## Template references
 
 - [Actiongroups](https://docs.microsoft.com/en-us/azure/templates/microsoft.insights/2019-06-01/actionGroups)
-- [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)
diff --git a/arm/Microsoft.Insights/activityLogAlerts/deploy.bicep b/arm/Microsoft.Insights/activityLogAlerts/deploy.bicep
index 404c0d8f50..9fdbed41e5 100644
--- a/arm/Microsoft.Insights/activityLogAlerts/deploy.bicep
+++ b/arm/Microsoft.Insights/activityLogAlerts/deploy.bicep
@@ -67,10 +67,10 @@ module activityLogAlert_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment,
 }]
 
 @description('The name of the activity log alert')
-output activityLogAlertName string = activityLogAlert.name
+output name string = activityLogAlert.name
 
 @description('The resource ID of the activity log alert')
-output activityLogAlertResourceId string = activityLogAlert.id
+output resourceId string = activityLogAlert.id
 
 @description('The resource group the activity log alert was deployed into')
-output activityLogAlertResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
diff --git a/arm/Microsoft.Insights/activityLogAlerts/readme.md b/arm/Microsoft.Insights/activityLogAlerts/readme.md
index ffcfad8963..a996e325b5 100644
--- a/arm/Microsoft.Insights/activityLogAlerts/readme.md
+++ b/arm/Microsoft.Insights/activityLogAlerts/readme.md
@@ -172,11 +172,11 @@ Tag names and tag values can be provided as needed. A tag can be left without a
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `activityLogAlertName` | string | The name of the activity log alert |
-| `activityLogAlertResourceGroup` | string | The resource group the activity log alert was deployed into |
-| `activityLogAlertResourceId` | string | The resource ID of the activity log alert |
+| `name` | string | The name of the activity log alert |
+| `resourceGroupName` | string | The resource group the activity log alert was deployed into |
+| `resourceId` | string | The resource ID of the activity log alert |
 
 ## Template references
 
 - [Activitylogalerts](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Insights/2020-10-01/activityLogAlerts)
-- [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)
diff --git a/arm/Microsoft.Insights/components/deploy.bicep b/arm/Microsoft.Insights/components/deploy.bicep
index a9fac14def..6844ab2b97 100644
--- a/arm/Microsoft.Insights/components/deploy.bicep
+++ b/arm/Microsoft.Insights/components/deploy.bicep
@@ -68,13 +68,13 @@ module appInsights_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index
 }]
 
 @description('The name of the application insights component')
-output appInsightsName string = appInsights.name
+output name string = appInsights.name
 
 @description('The resource ID of the application insights component')
-output appInsightsResourceId string = appInsights.id
+output resourceId string = appInsights.id
 
 @description('The resource group the application insights component was deployed into')
-output appInsightsResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
 
 @description('The application ID of the application insights component')
-output appInsightsAppId string = appInsights.properties.AppId
+output applicationId string = appInsights.properties.AppId
diff --git a/arm/Microsoft.Insights/components/readme.md b/arm/Microsoft.Insights/components/readme.md
index 191215ecfa..0c8b70780e 100644
--- a/arm/Microsoft.Insights/components/readme.md
+++ b/arm/Microsoft.Insights/components/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 |
 | :-- | :-- | :-- |
-| `appInsightsAppId` | string | The application ID of the application insights component |
-| `appInsightsName` | string | The name of the application insights component |
-| `appInsightsResourceGroup` | string | The resource group the application insights component was deployed into |
-| `appInsightsResourceId` | string | The resource ID of the application insights component |
+| `applicationId` | string | The application ID of the application insights component |
+| `name` | string | The name of the application insights component |
+| `resourceGroupName` | string | The resource group the application insights component was deployed into |
+| `resourceId` | string | The resource ID of the application insights component |
 
 ## Template references
 
 - [Components](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Insights/2020-02-02/components)
-- [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)
diff --git a/arm/Microsoft.Insights/diagnosticSettings/deploy.bicep b/arm/Microsoft.Insights/diagnosticSettings/deploy.bicep
index f6f196b51b..71d8eb855c 100644
--- a/arm/Microsoft.Insights/diagnosticSettings/deploy.bicep
+++ b/arm/Microsoft.Insights/diagnosticSettings/deploy.bicep
@@ -65,10 +65,10 @@ resource diagnosticSetting 'Microsoft.Insights/diagnosticSettings@2021-05-01-pre
 }
 
 @description('The name of the diagnostic settings')
-output diagnosticsName string = diagnosticSetting.name
+output name string = diagnosticSetting.name
 
 @description('The resource ID of the diagnostic settings')
-output diagnosticResourceId string = diagnosticSetting.id
+output resourceId string = diagnosticSetting.id
 
 @description('The name of the subscription to deploy into')
 output subscriptionName string = subscription().displayName
diff --git a/arm/Microsoft.Insights/diagnosticSettings/readme.md b/arm/Microsoft.Insights/diagnosticSettings/readme.md
index 9939c4d2fa..f225ac5394 100644
--- a/arm/Microsoft.Insights/diagnosticSettings/readme.md
+++ b/arm/Microsoft.Insights/diagnosticSettings/readme.md
@@ -24,8 +24,8 @@ This module deploys a subscription wide export of the activity log.
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `diagnosticResourceId` | string | The resource ID of the diagnostic settings |
-| `diagnosticsName` | string | The name of the diagnostic settings |
+| `name` | string | The name of the diagnostic settings |
+| `resourceId` | string | The resource ID of the diagnostic settings |
 | `subscriptionName` | string | The name of the subscription to deploy into |
 
 ## Template references
diff --git a/arm/Microsoft.Insights/metricAlerts/deploy.bicep b/arm/Microsoft.Insights/metricAlerts/deploy.bicep
index 47e9428de0..091a04e707 100644
--- a/arm/Microsoft.Insights/metricAlerts/deploy.bicep
+++ b/arm/Microsoft.Insights/metricAlerts/deploy.bicep
@@ -122,10 +122,10 @@ module metricAlert_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index
 }]
 
 @description('The resource group the metric alert was deployed into')
-output metricAlertResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
 
 @description('The name of the metric alert')
-output metricAlertName string = metricAlert.name
+output name string = metricAlert.name
 
 @description('The resource ID of the metric alert')
-output metricAlertResourceId string = metricAlert.id
+output resourceId string = metricAlert.id
diff --git a/arm/Microsoft.Insights/metricAlerts/readme.md b/arm/Microsoft.Insights/metricAlerts/readme.md
index 8861c251bc..e8f7b4c2b4 100644
--- a/arm/Microsoft.Insights/metricAlerts/readme.md
+++ b/arm/Microsoft.Insights/metricAlerts/readme.md
@@ -162,11 +162,11 @@ Tag names and tag values can be provided as needed. A tag can be left without a
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `metricAlertName` | string | The name of the metric alert |
-| `metricAlertResourceGroup` | string | The resource group the metric alert was deployed into |
-| `metricAlertResourceId` | string | The resource ID of the metric alert |
+| `name` | string | The name of the metric alert |
+| `resourceGroupName` | string | The resource group the metric alert was deployed into |
+| `resourceId` | string | The resource ID of the metric alert |
 
 ## Template references
 
 - [Metricalerts](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Insights/2018-03-01/metricAlerts)
-- [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)
diff --git a/arm/Microsoft.Insights/privateLinkScopes/deploy.bicep b/arm/Microsoft.Insights/privateLinkScopes/deploy.bicep
index 7b0bb19c61..b07aa6c908 100644
--- a/arm/Microsoft.Insights/privateLinkScopes/deploy.bicep
+++ b/arm/Microsoft.Insights/privateLinkScopes/deploy.bicep
@@ -78,10 +78,10 @@ module privateLinkScope_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment,
 }]
 
 @description('The name of the private link scope')
-output privateLinkScopeName string = privateLinkScope.name
+output name string = privateLinkScope.name
 
 @description('The resource ID of the private link scope')
-output privateLinkScopeResourceId string = privateLinkScope.id
+output resourceId string = privateLinkScope.id
 
 @description('The resource group the private link scope was deployed into')
-output privateLinkScopeResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
diff --git a/arm/Microsoft.Insights/privateLinkScopes/readme.md b/arm/Microsoft.Insights/privateLinkScopes/readme.md
index 3ac8cedf31..5e03af8ea4 100644
--- a/arm/Microsoft.Insights/privateLinkScopes/readme.md
+++ b/arm/Microsoft.Insights/privateLinkScopes/readme.md
@@ -105,9 +105,9 @@ Tag names and tag values can be provided as needed. A tag can be left without a
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `privateLinkScopeName` | string | The name of the private link scope |
-| `privateLinkScopeResourceGroup` | string | The resource group the private link scope was deployed into |
-| `privateLinkScopeResourceId` | string | The resource ID of the private link scope |
+| `name` | string | The name of the private link scope |
+| `resourceGroupName` | string | The resource group the private link scope was deployed into |
+| `resourceId` | string | The resource ID of the private link scope |
 
 ## Template references
 
@@ -116,4 +116,4 @@ Tag names and tag values can be provided as needed. A tag can be left without a
 - [Privateendpoints/Privatednszonegroups](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-05-01/privateEndpoints/privateDnsZoneGroups)
 - [Privatelinkscopes](https://docs.microsoft.com/en-us/azure/templates/microsoft.insights/2019-10-17-preview/privateLinkScopes)
 - [Privatelinkscopes/Scopedresources](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-07-01-preview/privateLinkScopes/scopedResources)
-- [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)
diff --git a/arm/Microsoft.Insights/privateLinkScopes/scopedResources/deploy.bicep b/arm/Microsoft.Insights/privateLinkScopes/scopedResources/deploy.bicep
index cfa305476a..edfe4ddec1 100644
--- a/arm/Microsoft.Insights/privateLinkScopes/scopedResources/deploy.bicep
+++ b/arm/Microsoft.Insights/privateLinkScopes/scopedResources/deploy.bicep
@@ -30,10 +30,10 @@ resource scopedResource 'Microsoft.Insights/privateLinkScopes/scopedResources@20
 }
 
 @description('The name of the resource group where the resource has been deployed')
-output scopedResourceResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
 
 @description('The resource ID of the deployed scopedResource')
-output scopedResourceResourceId string = scopedResource.id
+output resourceId string = scopedResource.id
 
 @description('The full name of the deployed Scoped Resource')
-output scopedResourceName string = scopedResource.name
+output name string = scopedResource.name
diff --git a/arm/Microsoft.Insights/privateLinkScopes/scopedResources/readme.md b/arm/Microsoft.Insights/privateLinkScopes/scopedResources/readme.md
index efaa3a8276..dda21bef8b 100644
--- a/arm/Microsoft.Insights/privateLinkScopes/scopedResources/readme.md
+++ b/arm/Microsoft.Insights/privateLinkScopes/scopedResources/readme.md
@@ -21,9 +21,9 @@ This module deploys Insights PrivateLinkScopes ScopedResources.
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `scopedResourceName` | string | The full name of the deployed Scoped Resource |
-| `scopedResourceResourceGroup` | string | The name of the resource group where the resource has been deployed |
-| `scopedResourceResourceId` | string | The resource ID of the deployed scopedResource |
+| `name` | string | The full name of the deployed Scoped Resource |
+| `resourceGroupName` | string | The name of the resource group where the resource has been deployed |
+| `resourceId` | string | The resource ID of the deployed scopedResource |
 
 ## Template references
 
diff --git a/arm/Microsoft.Insights/scheduledQueryRules/deploy.bicep b/arm/Microsoft.Insights/scheduledQueryRules/deploy.bicep
index 6dbc6368bc..6922ff77e8 100644
--- a/arm/Microsoft.Insights/scheduledQueryRules/deploy.bicep
+++ b/arm/Microsoft.Insights/scheduledQueryRules/deploy.bicep
@@ -108,10 +108,10 @@ module queryRule_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index)
 }]
 
 @description('The Name of the created query rule.')
-output queryAlertName string = queryRule.name
+output name string = queryRule.name
 
 @description('The resource ID of the created query rule.')
-output queryAlertResourceId string = queryRule.id
+output resourceId string = queryRule.id
 
 @description('The Resource Group of the created query rule.')
-output deploymentResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
diff --git a/arm/Microsoft.Insights/scheduledQueryRules/readme.md b/arm/Microsoft.Insights/scheduledQueryRules/readme.md
index f9ae5440d7..d7d16e2873 100644
--- a/arm/Microsoft.Insights/scheduledQueryRules/readme.md
+++ b/arm/Microsoft.Insights/scheduledQueryRules/readme.md
@@ -76,11 +76,11 @@ Tag names and tag values can be provided as needed. A tag can be left without a
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `deploymentResourceGroup` | string | The Resource Group of the created query rule. |
-| `queryAlertName` | string | The Name of the created query rule. |
-| `queryAlertResourceId` | string | The resource ID of the created query rule. |
+| `name` | string | The Name of the created query rule. |
+| `resourceGroupName` | string | The Resource Group of the created query rule. |
+| `resourceId` | string | The resource ID of the created query rule. |
 
 ## Template references
 
-- [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)
 - [Scheduledqueryrules](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-02-01-preview/scheduledQueryRules)
diff --git a/arm/Microsoft.KeyVault/vaults/accessPolicies/deploy.bicep b/arm/Microsoft.KeyVault/vaults/accessPolicies/deploy.bicep
index c650718230..fa3db9a840 100644
--- a/arm/Microsoft.KeyVault/vaults/accessPolicies/deploy.bicep
+++ b/arm/Microsoft.KeyVault/vaults/accessPolicies/deploy.bicep
@@ -35,10 +35,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
diff --git a/arm/Microsoft.KeyVault/vaults/accessPolicies/readme.md b/arm/Microsoft.KeyVault/vaults/accessPolicies/readme.md
index 89d2ae20bc..57066308e7 100644
--- a/arm/Microsoft.KeyVault/vaults/accessPolicies/readme.md
+++ b/arm/Microsoft.KeyVault/vaults/accessPolicies/readme.md
@@ -47,9 +47,9 @@ This module deploys key vault access policies.
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `accessPolicyName` | string | The name of the access policies assignment |
-| `accessPolicyResourceGroup` | string | The name of the resource group the access policies assignment was created in. |
-| `accessPolicyResourceId` | string | The resource ID of the access policies assignment |
+| `name` | string | The name of the access policies assignment |
+| `resourceGroupName` | string | The name of the resource group the access policies assignment was created in. |
+| `resourceId` | string | The resource ID of the access policies assignment |
 
 ## Template references
 
diff --git a/arm/Microsoft.KeyVault/vaults/deploy.bicep b/arm/Microsoft.KeyVault/vaults/deploy.bicep
index d653d587fc..07e568443c 100644
--- a/arm/Microsoft.KeyVault/vaults/deploy.bicep
+++ b/arm/Microsoft.KeyVault/vaults/deploy.bicep
@@ -269,13 +269,13 @@ module keyVault_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) i
 }]
 
 @description('The resource ID of the key vault.')
-output keyVaultResourceId string = keyVault.id
+output resourceId string = keyVault.id
 
 @description('The name of the resource group the key vault was created in.')
-output keyVaultResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
 
 @description('The name of the key vault.')
-output keyVaultName string = keyVault.name
+output name string = keyVault.name
 
-@description('The URL of the key vault.')
-output keyVaultUrl string = keyVault.properties.vaultUri
+@description('The URI of the key vault.')
+output uri string = keyVault.properties.vaultUri
diff --git a/arm/Microsoft.KeyVault/vaults/keys/deploy.bicep b/arm/Microsoft.KeyVault/vaults/keys/deploy.bicep
index cb311bd70b..4f4a215167 100644
--- a/arm/Microsoft.KeyVault/vaults/keys/deploy.bicep
+++ b/arm/Microsoft.KeyVault/vaults/keys/deploy.bicep
@@ -91,10 +91,10 @@ module key_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in rol
 }]
 
 @description('The name of the key.')
-output keyName string = key.name
+output name string = key.name
 
 @description('The resource ID of the key.')
-output keyResourceId string = key.id
+output resourceId string = key.id
 
 @description('The name of the resource group the key was created in.')
-output keyResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
diff --git a/arm/Microsoft.KeyVault/vaults/keys/readme.md b/arm/Microsoft.KeyVault/vaults/keys/readme.md
index 2d282e9348..1c24f0ee89 100644
--- a/arm/Microsoft.KeyVault/vaults/keys/readme.md
+++ b/arm/Microsoft.KeyVault/vaults/keys/readme.md
@@ -69,11 +69,11 @@ Tag names and tag values can be provided as needed. A tag can be left without a
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `keyName` | string | The name of the key. |
-| `keyResourceGroup` | string | The name of the resource group the key was created in. |
-| `keyResourceId` | string | The resource ID of the key. |
+| `name` | string | The name of the key. |
+| `resourceGroupName` | string | The name of the resource group the key was created in. |
+| `resourceId` | string | The resource ID of the key. |
 
 ## Template references
 
-- [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/Keys](https://docs.microsoft.com/en-us/azure/templates/Microsoft.KeyVault/2019-09-01/vaults/keys)
diff --git a/arm/Microsoft.KeyVault/vaults/readme.md b/arm/Microsoft.KeyVault/vaults/readme.md
index 5720a1dbd4..242feb7214 100644
--- a/arm/Microsoft.KeyVault/vaults/readme.md
+++ b/arm/Microsoft.KeyVault/vaults/readme.md
@@ -24,11 +24,11 @@ This module deploys a key vault and it's child resources.
 | `baseTime` | string | `[utcNow('u')]` |  | Generated. Do not provide a value! This date value is used to generate a SAS token to access the modules. |
 | `createMode` | string | `default` |  | Optional. The vault's create mode to indicate whether the vault need to be recovered or not. - recover or default. |
 | `cuaId` | string |  |  | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered |
-| `diagnosticEventHubAuthorizationRuleId` | string |  |  | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. |
-| `diagnosticEventHubName` | string |  |  | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. For security reasons, it is recommended to set diagnostic settings to send data to either storage account, log analytics workspace or event hub.  |
+| `diagnosticEventHubAuthorizationRuleId` | string |  |  | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to.  |
+| `diagnosticEventHubName` | string |  |  | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. For security reasons, it is recommended to set diagnostic settings to send data to either storage account, log analytics workspace or event hub |
 | `diagnosticLogsRetentionInDays` | int | `365` |  | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. |
-| `diagnosticStorageAccountId` | string |  |  | Optional. Resource ID of the diagnostic storage account. For security reasons, it is recommended to set diagnostic settings to send data to either storage account, log analytics workspace or event hub.  |
-| `diagnosticWorkspaceId` | string |  |  | Optional. Resource ID of the diagnostic log analytics workspace. For security reasons, it is recommended to set diagnostic settings to send data to either storage account, log analytics workspace or event hub.  |
+| `diagnosticStorageAccountId` | string |  |  | Optional. Resource ID of the diagnostic storage account. For security reasons, it is recommended to set diagnostic settings to send data to either storage account, log analytics workspace or event hub |
+| `diagnosticWorkspaceId` | string |  |  | Optional. Resource ID of the diagnostic log analytics workspace. For security reasons, it is recommended to set diagnostic settings to send data to either storage account, log analytics workspace or event hub |
 | `enablePurgeProtection` | bool |  |  | Optional. Provide 'true' to enable Key Vault's purge protection feature. |
 | `enableRbacAuthorization` | bool |  |  | Optional. Property that controls how data actions are authorized. When true, the key vault will use Role Based Access Control (RBAC) for authorization of data actions, and the access policies specified in vault properties will be ignored (warning: this is a preview feature). When false, the key vault will use the access policies specified in vault properties, and any policy stored on Azure Resource Manager will be ignored. If null or not specified, the vault is created with the default value of false. Note that management actions are always authorized with RBAC. |
 | `enableSoftDelete` | bool | `True` |  | Optional. Switch to enable/disable Key Vault's soft delete feature. |
@@ -41,8 +41,8 @@ This module deploys a key vault and it's child resources.
 | `logsToEnable` | array | `[AuditEvent]` | `[AuditEvent]` | Optional. The name of logs that will be streamed. |
 | `metricsToEnable` | array | `[AllMetrics]` | `[AllMetrics]` | Optional. The name of metrics that will be streamed. |
 | `name` | string |  |  | Optional. Name of the Key Vault. If no name is provided, then unique name will be created. |
-| `networkAcls` | object | `{object}` |  | Optional. Service endpoint object information. For security reasons, it is recommended to set the DefaultAction `Deny` |
-| `privateEndpoints` | array | `[]` |  | Optional. Configuration Details for private endpoints. For security reasons, it is recommended to use private endpoints whenever possible.  |
+| `networkAcls` | object | `{object}` |  | Optional. Service endpoint object information. For security reasons, it is recommended to set the DefaultAction Deny |
+| `privateEndpoints` | array | `[]` |  | Optional. Configuration Details for private endpoints. For security reasons, it is recommended to use private endpoints whenever possible |
 | `roleAssignments` | array | `[]` |  | Optional. Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11' |
 | `secrets` | _[secrets](secrets/readme.md)_ array | `[]` |  | Optional. All secrets to create |
 | `softDeleteRetentionInDays` | int | `90` |  | Optional. softDelete data retention days. It accepts >=7 and <=90. |
@@ -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. |
+| `name` | string | The name of the key vault. |
+| `resourceGroupName` | string | The name of the resource group the key vault was created in. |
+| `resourceId` | string | The resource ID of the key vault. |
+| `uri` | string | The URI of the key vault. |
 
 ## Template references
 
@@ -190,7 +190,7 @@ To use Private Endpoint the following dependencies must be deployed:
 - [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)
 - [Vaults](https://docs.microsoft.com/en-us/azure/templates/Microsoft.KeyVault/2019-09-01/vaults)
 - [Vaults/Accesspolicies](https://docs.microsoft.com/en-us/azure/templates/Microsoft.KeyVault/2021-06-01-preview/vaults/accessPolicies)
 - [Vaults/Keys](https://docs.microsoft.com/en-us/azure/templates/Microsoft.KeyVault/2019-09-01/vaults/keys)
diff --git a/arm/Microsoft.KeyVault/vaults/secrets/deploy.bicep b/arm/Microsoft.KeyVault/vaults/secrets/deploy.bicep
index 00620edcda..88ab876bbf 100644
--- a/arm/Microsoft.KeyVault/vaults/secrets/deploy.bicep
+++ b/arm/Microsoft.KeyVault/vaults/secrets/deploy.bicep
@@ -64,10 +64,10 @@ module secret_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in
 }]
 
 @description('The name of the secret.')
-output secretName string = secret.name
+output name string = secret.name
 
 @description('The resource ID of the secret.')
-output secretResourceId string = secret.id
+output resourceId string = secret.id
 
 @description('The name of the resource group the secret was created in.')
-output secretResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
diff --git a/arm/Microsoft.KeyVault/vaults/secrets/readme.md b/arm/Microsoft.KeyVault/vaults/secrets/readme.md
index 63559535de..ff4a955c90 100644
--- a/arm/Microsoft.KeyVault/vaults/secrets/readme.md
+++ b/arm/Microsoft.KeyVault/vaults/secrets/readme.md
@@ -67,11 +67,11 @@ Tag names and tag values can be provided as needed. A tag can be left without a
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `secretName` | string | The name of the secret. |
-| `secretResourceGroup` | string | The name of the resource group the secret was created in. |
-| `secretResourceId` | string | The resource ID of the secret. |
+| `name` | string | The name of the secret. |
+| `resourceGroupName` | string | The name of the resource group the secret was created in. |
+| `resourceId` | string | The resource ID of the secret. |
 
 ## Template references
 
-- [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/Secrets](https://docs.microsoft.com/en-us/azure/templates/Microsoft.KeyVault/2019-09-01/vaults/secrets)
diff --git a/arm/Microsoft.Logic/workflows/deploy.bicep b/arm/Microsoft.Logic/workflows/deploy.bicep
index c6c733e8b9..bf21c125f5 100644
--- a/arm/Microsoft.Logic/workflows/deploy.bicep
+++ b/arm/Microsoft.Logic/workflows/deploy.bicep
@@ -212,13 +212,13 @@ module logicApp_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) i
 }]
 
 @description('The name of the logic app')
-output logicAppName string = logicApp.name
+output name string = logicApp.name
 
 @description('The resource group the logic app was deployed into')
-output logicAppResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
 
 @description('The resource ID of the logic app')
-output logicAppResourceId string = logicApp.id
+output resourceId string = logicApp.id
 
 @description('The principal ID of the system assigned identity.')
 output systemAssignedPrincipalId string = systemAssignedIdentity && contains(logicApp.identity, 'principalId') ? logicApp.identity.principalId : ''
diff --git a/arm/Microsoft.Logic/workflows/readme.md b/arm/Microsoft.Logic/workflows/readme.md
index 3fc1d99cd2..59db820620 100644
--- a/arm/Microsoft.Logic/workflows/readme.md
+++ b/arm/Microsoft.Logic/workflows/readme.md
@@ -155,14 +155,14 @@ You can specify multiple user assigned identities to a resource by providing add
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `logicAppName` | string | The name of the logic app |
-| `logicAppResourceGroup` | string | The resource group the logic app was deployed into |
-| `logicAppResourceId` | string | The resource ID of the logic app |
+| `name` | string | The name of the logic app |
+| `resourceGroupName` | string | The resource group the logic app was deployed into |
+| `resourceId` | string | The resource ID of the logic app |
 | `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)
+- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments)
 - [Workflows](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Logic/2019-05-01/workflows)
diff --git a/arm/Microsoft.MachineLearningServices/workspaces/deploy.bicep b/arm/Microsoft.MachineLearningServices/workspaces/deploy.bicep
index 623c8886d6..e3be568b33 100644
--- a/arm/Microsoft.MachineLearningServices/workspaces/deploy.bicep
+++ b/arm/Microsoft.MachineLearningServices/workspaces/deploy.bicep
@@ -185,13 +185,13 @@ module workspace_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index)
 }]
 
 @description('The resource ID of the machine learning service')
-output machineLearningServiceResourceId string = workspace.id
+output resourceId string = workspace.id
 
 @description('The resource group the machine learning service was deployed into')
-output machineLearningServiceResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
 
 @description('The name of the machine learning service')
-output machineLearningServiceName string = workspace.name
+output name string = workspace.name
 
 @description('The principal ID of the system assigned identity.')
 output principalId string = systemAssignedIdentity ? workspace.identity.principalId : ''
diff --git a/arm/Microsoft.MachineLearningServices/workspaces/readme.md b/arm/Microsoft.MachineLearningServices/workspaces/readme.md
index fe3f8eae40..9d6c8348d9 100644
--- a/arm/Microsoft.MachineLearningServices/workspaces/readme.md
+++ b/arm/Microsoft.MachineLearningServices/workspaces/readme.md
@@ -119,10 +119,10 @@ To use Private Endpoint the following dependencies must be deployed:
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `machineLearningServiceName` | string | The name of the machine learning service |
-| `machineLearningServiceResourceGroup` | string | The resource group the machine learning service was deployed into |
-| `machineLearningServiceResourceId` | string | The resource ID of the machine learning service |
+| `name` | string | The name of the machine learning service |
 | `principalId` | string | The principal ID of the system assigned identity. |
+| `resourceGroupName` | string | The resource group the machine learning service was deployed into |
+| `resourceId` | string | The resource ID of the machine learning service |
 
 ## Template references
 
@@ -130,5 +130,5 @@ To use Private Endpoint the following dependencies must be deployed:
 - [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)
 - [Workspaces](https://docs.microsoft.com/en-us/azure/templates/Microsoft.MachineLearningServices/2021-04-01/workspaces)
diff --git a/arm/Microsoft.ManagedIdentity/userAssignedIdentities/deploy.bicep b/arm/Microsoft.ManagedIdentity/userAssignedIdentities/deploy.bicep
index 67b1c9e825..1ca5887958 100644
--- a/arm/Microsoft.ManagedIdentity/userAssignedIdentities/deploy.bicep
+++ b/arm/Microsoft.ManagedIdentity/userAssignedIdentities/deploy.bicep
@@ -51,13 +51,13 @@ module userMsi_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in
 }]
 
 @description('The name of the user assigned identity')
-output msiName string = userMsi.name
+output name string = userMsi.name
 
 @description('The resource ID of the user assigned identity')
-output msiResourceId string = userMsi.id
+output resourceId string = userMsi.id
 
 @description('The principal ID of the user assigned identity')
-output msiPrincipalId string = userMsi.properties.principalId
+output principalId string = userMsi.properties.principalId
 
 @description('The resource group the user assigned identity was deployed into')
-output msiResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
diff --git a/arm/Microsoft.ManagedIdentity/userAssignedIdentities/readme.md b/arm/Microsoft.ManagedIdentity/userAssignedIdentities/readme.md
index 00be0e27d8..72a336d18b 100644
--- a/arm/Microsoft.ManagedIdentity/userAssignedIdentities/readme.md
+++ b/arm/Microsoft.ManagedIdentity/userAssignedIdentities/readme.md
@@ -64,13 +64,13 @@ Tag names and tag values can be provided as needed. A tag can be left without a
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `msiName` | string | The name of the user assigned identity |
-| `msiPrincipalId` | string | The principal ID of the user assigned identity |
-| `msiResourceGroup` | string | The resource group the user assigned identity was deployed into |
-| `msiResourceId` | string | The resource ID of the user assigned identity |
+| `name` | string | The name of the user assigned identity |
+| `principalId` | string | The principal ID of the user assigned identity |
+| `resourceGroupName` | string | The resource group the user assigned identity was deployed into |
+| `resourceId` | string | The resource ID of the user assigned identity |
 
 ## Template references
 
 - [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)
 - [Userassignedidentities](https://docs.microsoft.com/en-us/azure/templates/Microsoft.ManagedIdentity/2018-11-30/userAssignedIdentities)
diff --git a/arm/Microsoft.ManagedServices/registrationDefinitions/.bicep/nested_registrationAssignment.bicep b/arm/Microsoft.ManagedServices/registrationDefinitions/.bicep/nested_registrationAssignment.bicep
index 573e5dd697..7bfca49e97 100644
--- a/arm/Microsoft.ManagedServices/registrationDefinitions/.bicep/nested_registrationAssignment.bicep
+++ b/arm/Microsoft.ManagedServices/registrationDefinitions/.bicep/nested_registrationAssignment.bicep
@@ -9,6 +9,7 @@ resource registrationAssignment 'Microsoft.ManagedServices/registrationAssignmen
 }
 
 @description('The name of the registration assignment')
-output registrationAssignmentName string = registrationAssignment.name
+output name string = registrationAssignment.name
+
 @description('The resource ID of the registration assignment')
-output registrationAssignmentId string = registrationAssignment.id
+output resourceId string = registrationAssignment.id
diff --git a/arm/Microsoft.ManagedServices/registrationDefinitions/deploy.bicep b/arm/Microsoft.ManagedServices/registrationDefinitions/deploy.bicep
index b71de60547..9a59e29ef9 100644
--- a/arm/Microsoft.ManagedServices/registrationDefinitions/deploy.bicep
+++ b/arm/Microsoft.ManagedServices/registrationDefinitions/deploy.bicep
@@ -44,13 +44,13 @@ module registrationAssignment_rg '.bicep/nested_registrationAssignment.bicep' =
 }
 
 @description('The name of the registration definition')
-output registrationDefinitionName string = registrationDefinition.name
+output name string = registrationDefinition.name
 
 @description('The resource ID of the registration definition')
-output registrationDefinitionResourceId string = registrationDefinition.id
+output resourceId string = registrationDefinition.id
 
 @description('The subscription the registration definition was deployed into')
-output registrationDefinitionSubscription string = subscription().displayName
+output subscriptionName string = subscription().displayName
 
 @description('The registration assignment resource ID')
-output registrationAssignmentId string = empty(resourceGroupName) ? registrationAssignment_sub.id : registrationAssignment_rg.outputs.registrationAssignmentId
+output registrationAssignmentId string = empty(resourceGroupName) ? registrationAssignment_sub.id : registrationAssignment_rg.outputs.resourceId
diff --git a/arm/Microsoft.ManagedServices/registrationDefinitions/readme.md b/arm/Microsoft.ManagedServices/registrationDefinitions/readme.md
index ec82f66d1a..0dcdcac28b 100644
--- a/arm/Microsoft.ManagedServices/registrationDefinitions/readme.md
+++ b/arm/Microsoft.ManagedServices/registrationDefinitions/readme.md
@@ -59,10 +59,10 @@ remote/managing tenant.
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
+| `name` | string | The name of the registration definition |
 | `registrationAssignmentId` | string | The registration assignment resource ID |
-| `registrationDefinitionName` | string | The name of the registration definition |
-| `registrationDefinitionResourceId` | string | The resource ID of the registration definition |
-| `registrationDefinitionSubscription` | string | The subscription the registration definition was deployed into |
+| `resourceId` | string | The resource ID of the registration definition |
+| `subscriptionName` | string | The subscription the registration definition was deployed into |
 
 ## Considerations
 
diff --git a/arm/Microsoft.Management/managementGroups/deploy.bicep b/arm/Microsoft.Management/managementGroups/deploy.bicep
index fa8d2ec11e..b85783a471 100644
--- a/arm/Microsoft.Management/managementGroups/deploy.bicep
+++ b/arm/Microsoft.Management/managementGroups/deploy.bicep
@@ -36,7 +36,7 @@ module managementGroup_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, i
 }]
 
 @description('The name of the management group')
-output managementGroupName string = managementGroup.name
+output name string = managementGroup.name
 
-@description('The group ID of the management group')
-output managementGroupId string = managementGroup.id
+@description('The resource ID of the management group')
+output resourceId string = managementGroup.id
diff --git a/arm/Microsoft.Management/managementGroups/readme.md b/arm/Microsoft.Management/managementGroups/readme.md
index 75055c0aa5..66d0c227ac 100644
--- a/arm/Microsoft.Management/managementGroups/readme.md
+++ b/arm/Microsoft.Management/managementGroups/readme.md
@@ -49,8 +49,8 @@ This module has some known **limitations**:
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `managementGroupId` | string | The group ID of the management group |
-| `managementGroupName` | string | The name of the management group |
+| `name` | string | The name of the management group |
+| `resourceId` | string | The resource ID of the management group |
 
 ## Considerations
 
@@ -73,4 +73,4 @@ New-AzRoleAssignment -ObjectId $PrincipalID -Scope "/providers/Microsoft.Managem
 ## Template references
 
 - [Managementgroups](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Management/2021-04-01/managementGroups)
-- [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)

From c25bae88575c4056dfe7470c06c610d4d2a29434 Mon Sep 17 00:00:00 2001
From: MrMCake <asehr@hotmail.de>
Date: Fri, 21 Jan 2022 09:30:38 +0100
Subject: [PATCH 2/4] Fixed MSI output reference

---
 .github/workflows/platform.dependencies.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/platform.dependencies.yml b/.github/workflows/platform.dependencies.yml
index 907b0c5ab9..174187ae5e 100644
--- a/.github/workflows/platform.dependencies.yml
+++ b/.github/workflows/platform.dependencies.yml
@@ -63,7 +63,7 @@ jobs:
     needs:
       - job_deploy_rg
     outputs:
-      msiPrincipalId: ${{ steps.print_msi_prinId.outputs.principalId }}
+      msiPrincipalId: ${{ steps.print_msi_prinId.outputs.msiPrincipalId }}
     strategy:
       fail-fast: false
       matrix:
@@ -90,7 +90,8 @@ jobs:
         with:
           inlineScript: |
             $deploymentOutput = '${{ steps.deploy_msi.outputs.deploymentOutput }}'
-            $msiPrincipalId = (ConvertFrom-Json $deploymentOutput).msiPrincipalId
+            $msiPrincipalId = (ConvertFrom-Json $deploymentOutput).principalId
+            Write-Verbose "msiPrincipalId: $msiPrincipalId" -Verbose
             Write-Output ('::set-output name={0}::{1}' -f 'msiPrincipalId', $msiPrincipalId)
           azPSVersion: 'latest'
 
@@ -605,7 +606,7 @@ jobs:
           subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
           managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'
           removeDeployment: '${{ env.removeDeployment }}'
-          customParameterFileTokens: '[{"Name":"msiPrincipalId","Value":"${{ needs.job_deploy_msi.outputs.principalId }}"}]'
+          customParameterFileTokens: '[{"Name":"msiPrincipalId","Value":"${{ needs.job_deploy_msi.outputs.msiPrincipalId }}"}]'
 
   job_deploy_kv:
     runs-on: ubuntu-20.04
@@ -636,7 +637,7 @@ jobs:
           subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
           managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'
           removeDeployment: '${{ env.removeDeployment }}'
-          customParameterFileTokens: '[{"Name":"msiPrincipalId","Value":"${{ needs.job_deploy_msi.outputs.principalId }}"}]'
+          customParameterFileTokens: '[{"Name":"msiPrincipalId","Value":"${{ needs.job_deploy_msi.outputs.msiPrincipalId }}"}]'
 
   job_deploy_kv_secrets:
     runs-on: ubuntu-20.04
@@ -750,7 +751,7 @@ jobs:
           subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
           managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'
           removeDeployment: '${{ env.removeDeployment }}'
-          customParameterFileTokens: '[{"Name":"msiPrincipalId","Value":"${{ needs.job_deploy_msi.outputs.principalId }}"}]'
+          customParameterFileTokens: '[{"Name":"msiPrincipalId","Value":"${{ needs.job_deploy_msi.outputs.msiPrincipalId }}"}]'
 
   job_deploy_sqlmi_kv_secrets:
     runs-on: ubuntu-20.04
@@ -871,7 +872,7 @@ jobs:
           subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
           managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'
           removeDeployment: '${{ env.removeDeployment }}'
-          customParameterFileTokens: '[{"Name":"msiPrincipalId","Value":"${{ needs.job_deploy_msi.outputs.principalId }}"}]'
+          customParameterFileTokens: '[{"Name":"msiPrincipalId","Value":"${{ needs.job_deploy_msi.outputs.msiPrincipalId }}"}]'
 
   job_deploy_vnet:
     runs-on: ubuntu-20.04

From 67976bdf7b0fe140cdc1fdf40b9d79809bc2aec4 Mon Sep 17 00:00:00 2001
From: Alexander Sehr <ASehr@hotmail.de>
Date: Mon, 24 Jan 2022 10:44:58 +0100
Subject: [PATCH 3/4] Update
 arm/Microsoft.ManagedServices/registrationDefinitions/deploy.bicep

Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com>
---
 .../registrationDefinitions/deploy.bicep                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arm/Microsoft.ManagedServices/registrationDefinitions/deploy.bicep b/arm/Microsoft.ManagedServices/registrationDefinitions/deploy.bicep
index 9a59e29ef9..eccdce1f0b 100644
--- a/arm/Microsoft.ManagedServices/registrationDefinitions/deploy.bicep
+++ b/arm/Microsoft.ManagedServices/registrationDefinitions/deploy.bicep
@@ -53,4 +53,4 @@ output resourceId string = registrationDefinition.id
 output subscriptionName string = subscription().displayName
 
 @description('The registration assignment resource ID')
-output registrationAssignmentId string = empty(resourceGroupName) ? registrationAssignment_sub.id : registrationAssignment_rg.outputs.resourceId
+output assignmentResourceId string = empty(resourceGroupName) ? registrationAssignment_sub.id : registrationAssignment_rg.outputs.resourceId

From e2571d411f156d4cab80611a4a9a68fc40f14c4a Mon Sep 17 00:00:00 2001
From: Alexander Sehr <ASehr@hotmail.de>
Date: Mon, 24 Jan 2022 10:45:04 +0100
Subject: [PATCH 4/4] Update
 arm/Microsoft.ManagedServices/registrationDefinitions/readme.md

Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com>
---
 arm/Microsoft.ManagedServices/registrationDefinitions/readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arm/Microsoft.ManagedServices/registrationDefinitions/readme.md b/arm/Microsoft.ManagedServices/registrationDefinitions/readme.md
index 0dcdcac28b..54e148c0f4 100644
--- a/arm/Microsoft.ManagedServices/registrationDefinitions/readme.md
+++ b/arm/Microsoft.ManagedServices/registrationDefinitions/readme.md
@@ -60,7 +60,7 @@ remote/managing tenant.
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
 | `name` | string | The name of the registration definition |
-| `registrationAssignmentId` | string | The registration assignment resource ID |
+| `assignmentResourceId` | string | The registration assignment resource ID |
 | `resourceId` | string | The resource ID of the registration definition |
 | `subscriptionName` | string | The subscription the registration definition was deployed into |