diff --git a/arm/Microsoft.AnalysisServices/servers/deploy.bicep b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
index c8f76e244a..a49d21a2f0 100644
--- a/arm/Microsoft.AnalysisServices/servers/deploy.bicep
+++ b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
@@ -143,10 +143,10 @@ module server_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in
 }]
 
 @description('The name of the analysis service')
-output analysisServicesName string = server.name
+output name string = server.name
 
 @description('The resource ID of the analysis service')
-output analysisServicesResourceId string = server.id
+output resourceId string = server.id
 
 @description('The resource group the analysis service was deployed into')
-output analysisServicesResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
diff --git a/arm/Microsoft.AnalysisServices/servers/readme.md b/arm/Microsoft.AnalysisServices/servers/readme.md
index f20a0be96b..30acd43aac 100644
--- a/arm/Microsoft.AnalysisServices/servers/readme.md
+++ b/arm/Microsoft.AnalysisServices/servers/readme.md
@@ -81,9 +81,9 @@ Tag names and tag values can be provided as needed. A tag can be left without a
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `analysisServicesName` | string | The name of the analysis service |
-| `analysisServicesResourceGroup` | string | The resource group the analysis service was deployed into |
-| `analysisServicesResourceId` | string | The resource ID of the analysis service |
+| `name` | string | The name of the analysis service |
+| `resourceGroupName` | string | The resource group the analysis service was deployed into |
+| `resourceId` | string | The resource ID of the analysis service |
 
 ## Template references
 
diff --git a/arm/Microsoft.ApiManagement/service/.bicep/nested_authorizationServers.bicep b/arm/Microsoft.ApiManagement/service/.bicep/nested_authorizationServers.bicep
index c0dc584e85..f8766ec1f6 100644
--- a/arm/Microsoft.ApiManagement/service/.bicep/nested_authorizationServers.bicep
+++ b/arm/Microsoft.ApiManagement/service/.bicep/nested_authorizationServers.bicep
@@ -100,10 +100,10 @@ module authorizationServer '../authorizationServers/deploy.bicep' = {
 }
 
 @description('The name of the API management service authorization server')
-output authorizationServerName string = authorizationServer.outputs.authorizationServerName
+output name string = authorizationServer.outputs.name
 
 @description('The resource ID of the API management service authorization server')
-output authorizationServerResourceId string = authorizationServer.outputs.authorizationServerResourceId
+output resourceId string = authorizationServer.outputs.resourceId
 
 @description('The resource group the API management service authorization server was deployed into')
-output authorizationServerResourceGroup string = authorizationServer.outputs.authorizationServerResourceGroup
+output resourceGroupName string = authorizationServer.outputs.resourceGroupName
diff --git a/arm/Microsoft.ApiManagement/service/apiVersionSets/deploy.bicep b/arm/Microsoft.ApiManagement/service/apiVersionSets/deploy.bicep
index 9cd80c64a0..b2cc5b3bb2 100644
--- a/arm/Microsoft.ApiManagement/service/apiVersionSets/deploy.bicep
+++ b/arm/Microsoft.ApiManagement/service/apiVersionSets/deploy.bicep
@@ -26,10 +26,10 @@ resource apiVersionSet 'Microsoft.ApiManagement/service/apiVersionSets@2021-08-0
 }
 
 @description('The resource ID of the API Version set')
-output apiVersionSetResourceId string = apiVersionSet.id
+output resourceId string = apiVersionSet.id
 
 @description('The name of the API Version set')
-output apiVersionSetName string = apiVersionSet.name
+output name string = apiVersionSet.name
 
 @description('The resource group the API Version set was deployed into')
-output apiVersionSetResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
diff --git a/arm/Microsoft.ApiManagement/service/apiVersionSets/readme.md b/arm/Microsoft.ApiManagement/service/apiVersionSets/readme.md
index d945c9e91f..9d2cb15f27 100644
--- a/arm/Microsoft.ApiManagement/service/apiVersionSets/readme.md
+++ b/arm/Microsoft.ApiManagement/service/apiVersionSets/readme.md
@@ -21,9 +21,9 @@ This module deploys API Management Service APIs Version Set.
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `apiVersionSetName` | string | The name of the API Version set |
-| `apiVersionSetResourceGroup` | string | The resource group the API Version set was deployed into |
-| `apiVersionSetResourceId` | string | The resource ID of the API Version set |
+| `name` | string | The name of the API Version set |
+| `resourceGroupName` | string | The resource group the API Version set was deployed into |
+| `resourceId` | string | The resource ID of the API Version set |
 
 ## Template references
 
diff --git a/arm/Microsoft.ApiManagement/service/apis/deploy.bicep b/arm/Microsoft.ApiManagement/service/apis/deploy.bicep
index d21f2a9b0c..49dad325db 100644
--- a/arm/Microsoft.ApiManagement/service/apis/deploy.bicep
+++ b/arm/Microsoft.ApiManagement/service/apis/deploy.bicep
@@ -141,10 +141,10 @@ module policy 'policies/deploy.bicep' = [for (policy, index) in policies: {
 }]
 
 @description('The name of the API management service API')
-output apiName string = api.name
+output name string = api.name
 
 @description('The resource ID of the API management service API')
-output apiResourceId string = api.id
+output resourceId string = api.id
 
 @description('The resource group the API management service API was deployed to')
-output apiResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
diff --git a/arm/Microsoft.ApiManagement/service/apis/policies/deploy.bicep b/arm/Microsoft.ApiManagement/service/apis/policies/deploy.bicep
index e435a91976..a232bba149 100644
--- a/arm/Microsoft.ApiManagement/service/apis/policies/deploy.bicep
+++ b/arm/Microsoft.ApiManagement/service/apis/policies/deploy.bicep
@@ -45,10 +45,10 @@ resource policy 'Microsoft.ApiManagement/service/apis/policies@2021-08-01' = {
 }
 
 @description('The resource ID of the API policy')
-output policyResourceId string = policy.id
+output resourceId string = policy.id
 
 @description('The name of the API policy')
-output policyName string = policy.name
+output name string = policy.name
 
 @description('The resource group the API policy was deployed into')
-output policyResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
diff --git a/arm/Microsoft.ApiManagement/service/apis/policies/readme.md b/arm/Microsoft.ApiManagement/service/apis/policies/readme.md
index 49ec350e8c..d78e1f54d9 100644
--- a/arm/Microsoft.ApiManagement/service/apis/policies/readme.md
+++ b/arm/Microsoft.ApiManagement/service/apis/policies/readme.md
@@ -23,9 +23,9 @@ This module deploys API Management Service APIs policies.
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `policyName` | string | The name of the API policy |
-| `policyResourceGroup` | string | The resource group the API policy was deployed into |
-| `policyResourceId` | string | The resource ID of the API policy |
+| `name` | string | The name of the API policy |
+| `resourceGroupName` | string | The resource group the API policy was deployed into |
+| `resourceId` | string | The resource ID of the API policy |
 
 ## Template references
 
diff --git a/arm/Microsoft.ApiManagement/service/apis/readme.md b/arm/Microsoft.ApiManagement/service/apis/readme.md
index 1650c52887..b57b0cc3c9 100644
--- a/arm/Microsoft.ApiManagement/service/apis/readme.md
+++ b/arm/Microsoft.ApiManagement/service/apis/readme.md
@@ -65,9 +65,9 @@ The following resources are required to be able to deploy this resource.
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `apiName` | string | The name of the API management service API |
-| `apiResourceGroup` | string | The resource group the API management service API was deployed to |
-| `apiResourceId` | string | The resource ID of the API management service API |
+| `name` | string | The name of the API management service API |
+| `resourceGroupName` | string | The resource group the API management service API was deployed to |
+| `resourceId` | string | The resource ID of the API management service API |
 
 ## Template references
 
diff --git a/arm/Microsoft.ApiManagement/service/authorizationServers/deploy.bicep b/arm/Microsoft.ApiManagement/service/authorizationServers/deploy.bicep
index aab8579631..4296f8108d 100644
--- a/arm/Microsoft.ApiManagement/service/authorizationServers/deploy.bicep
+++ b/arm/Microsoft.ApiManagement/service/authorizationServers/deploy.bicep
@@ -98,10 +98,10 @@ resource authorizationServer 'Microsoft.ApiManagement/service/authorizationServe
 }
 
 @description('The name of the API management service authorization server')
-output authorizationServerName string = authorizationServer.name
+output name string = authorizationServer.name
 
 @description('The resource ID of the API management service authorization server')
-output authorizationServerResourceId string = authorizationServer.id
+output resourceId string = authorizationServer.id
 
 @description('The resource group the API management service authorization server was deployed into')
-output authorizationServerResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
diff --git a/arm/Microsoft.ApiManagement/service/authorizationServers/readme.md b/arm/Microsoft.ApiManagement/service/authorizationServers/readme.md
index 92f269c74c..17429c386c 100644
--- a/arm/Microsoft.ApiManagement/service/authorizationServers/readme.md
+++ b/arm/Microsoft.ApiManagement/service/authorizationServers/readme.md
@@ -41,9 +41,9 @@ The following resources are required to be able to deploy this resource.
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `authorizationServerName` | string | The name of the API management service authorization server |
-| `authorizationServerResourceGroup` | string | The resource group the API management service authorization server was deployed into |
-| `authorizationServerResourceId` | string | The resource ID of the API management service authorization server |
+| `name` | string | The name of the API management service authorization server |
+| `resourceGroupName` | string | The resource group the API management service authorization server was deployed into |
+| `resourceId` | string | The resource ID of the API management service authorization server |
 
 ## Template references
 
diff --git a/arm/Microsoft.ApiManagement/service/backends/deploy.bicep b/arm/Microsoft.ApiManagement/service/backends/deploy.bicep
index f10995efdc..f588942adf 100644
--- a/arm/Microsoft.ApiManagement/service/backends/deploy.bicep
+++ b/arm/Microsoft.ApiManagement/service/backends/deploy.bicep
@@ -65,10 +65,10 @@ resource backend 'Microsoft.ApiManagement/service/backends@2021-08-01' = {
 }
 
 @description('The resource ID of the API management service backend')
-output backendResourceId string = backend.id
+output resourceId string = backend.id
 
 @description('The name of the API management service backend')
-output backendName string = backend.name
+output name string = backend.name
 
 @description('The resource group the API management service backend was deployed into')
-output backendResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
diff --git a/arm/Microsoft.ApiManagement/service/backends/readme.md b/arm/Microsoft.ApiManagement/service/backends/readme.md
index 60afde975a..fcb1eb25d3 100644
--- a/arm/Microsoft.ApiManagement/service/backends/readme.md
+++ b/arm/Microsoft.ApiManagement/service/backends/readme.md
@@ -122,9 +122,9 @@ The following resources are required to be able to deploy this resource.
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `backendName` | string | The name of the API management service backend |
-| `backendResourceGroup` | string | The resource group the API management service backend was deployed into |
-| `backendResourceId` | string | The resource ID of the API management service backend |
+| `name` | string | The name of the API management service backend |
+| `resourceGroupName` | string | The resource group the API management service backend was deployed into |
+| `resourceId` | string | The resource ID of the API management service backend |
 
 ## Template references
 
diff --git a/arm/Microsoft.ApiManagement/service/caches/deploy.bicep b/arm/Microsoft.ApiManagement/service/caches/deploy.bicep
index 6e7328ae67..d3cd881472 100644
--- a/arm/Microsoft.ApiManagement/service/caches/deploy.bicep
+++ b/arm/Microsoft.ApiManagement/service/caches/deploy.bicep
@@ -40,10 +40,10 @@ resource cache 'Microsoft.ApiManagement/service/caches@2021-08-01' = {
 }
 
 @description('The resource ID of the API management service cache')
-output cacheResourceId string = cache.id
+output resourceId string = cache.id
 
 @description('The name of the API management service cache')
-output cacheResourceName string = cache.name
+output name string = cache.name
 
 @description('The resource group the API management service cache was deployed into')
-output cacheResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
diff --git a/arm/Microsoft.ApiManagement/service/caches/readme.md b/arm/Microsoft.ApiManagement/service/caches/readme.md
index 29903f89b7..78f948c8f0 100644
--- a/arm/Microsoft.ApiManagement/service/caches/readme.md
+++ b/arm/Microsoft.ApiManagement/service/caches/readme.md
@@ -30,9 +30,9 @@ The following resources are required to be able to deploy this resource.
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `cacheResourceGroup` | string | The resource group the API management service cache was deployed into |
-| `cacheResourceId` | string | The resource ID of the API management service cache |
-| `cacheResourceName` | string | The name of the API management service cache |
+| `name` | string | The name of the API management service cache |
+| `resourceGroupName` | string | The resource group the API management service cache was deployed into |
+| `resourceId` | string | The resource ID of the API management service cache |
 
 ## Template references
 
diff --git a/arm/Microsoft.ApiManagement/service/deploy.bicep b/arm/Microsoft.ApiManagement/service/deploy.bicep
index 5a12eba217..3472721152 100644
--- a/arm/Microsoft.ApiManagement/service/deploy.bicep
+++ b/arm/Microsoft.ApiManagement/service/deploy.bicep
@@ -428,13 +428,13 @@ module apiManagementService_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignme
 }]
 
 @description('The name of the API management service')
-output serviceName string = apiManagementService.name
+output name string = apiManagementService.name
 
 @description('The resource ID of the API management service')
-output serviceResourceId string = apiManagementService.id
+output resourceId string = apiManagementService.id
 
 @description('The resource group the API management service was deployed into')
-output serviceResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
 
 @description('The principal ID of the system assigned identity.')
 output systemAssignedPrincipalId string = systemAssignedIdentity && contains(apiManagementService.identity, 'principalId') ? apiManagementService.identity.principalId : ''
diff --git a/arm/Microsoft.ApiManagement/service/identityProviders/deploy.bicep b/arm/Microsoft.ApiManagement/service/identityProviders/deploy.bicep
index 9cd37e5f2e..d872e9ac08 100644
--- a/arm/Microsoft.ApiManagement/service/identityProviders/deploy.bicep
+++ b/arm/Microsoft.ApiManagement/service/identityProviders/deploy.bicep
@@ -78,10 +78,10 @@ resource identityProvider 'Microsoft.ApiManagement/service/identityProviders@202
 }
 
 @description('The resource ID of the API management service identity provider')
-output identityProviderResourceId string = identityProvider.id
+output resourceId string = identityProvider.id
 
 @description('The name of the API management service identity provider')
-output identityProviderName string = identityProvider.name
+output name string = identityProvider.name
 
 @description('The resource group the API management service identity provider was deployed into')
-output identityProviderResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
diff --git a/arm/Microsoft.ApiManagement/service/identityProviders/readme.md b/arm/Microsoft.ApiManagement/service/identityProviders/readme.md
index 1ff0d0ada5..3f24fd36d2 100644
--- a/arm/Microsoft.ApiManagement/service/identityProviders/readme.md
+++ b/arm/Microsoft.ApiManagement/service/identityProviders/readme.md
@@ -31,9 +31,9 @@ This module deploys API Management Service Identity Provider.
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `identityProviderName` | string | The name of the API management service identity provider |
-| `identityProviderResourceGroup` | string | The resource group the API management service identity provider was deployed into |
-| `identityProviderResourceId` | string | The resource ID of the API management service identity provider |
+| `name` | string | The name of the API management service identity provider |
+| `resourceGroupName` | string | The resource group the API management service identity provider was deployed into |
+| `resourceId` | string | The resource ID of the API management service identity provider |
 
 ## Template references
 
diff --git a/arm/Microsoft.ApiManagement/service/namedValues/deploy.bicep b/arm/Microsoft.ApiManagement/service/namedValues/deploy.bicep
index 7ac51b1365..2de7ec2747 100644
--- a/arm/Microsoft.ApiManagement/service/namedValues/deploy.bicep
+++ b/arm/Microsoft.ApiManagement/service/namedValues/deploy.bicep
@@ -46,10 +46,10 @@ resource namedValue 'Microsoft.ApiManagement/service/namedValues@2021-08-01' = {
 }
 
 @description('The resource ID of the named value')
-output namedValueResourceId string = namedValue.id
+output resourceId string = namedValue.id
 
 @description('The name of the named value')
-output namedValueName string = namedValue.name
+output name string = namedValue.name
 
 @description('The resource group the named value was deployed into')
-output namedValueResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
diff --git a/arm/Microsoft.ApiManagement/service/namedValues/readme.md b/arm/Microsoft.ApiManagement/service/namedValues/readme.md
index 23895a82f0..5d46abade1 100644
--- a/arm/Microsoft.ApiManagement/service/namedValues/readme.md
+++ b/arm/Microsoft.ApiManagement/service/namedValues/readme.md
@@ -42,9 +42,9 @@ The following resources are required to be able to deploy this resource.
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `namedValueName` | string | The name of the named value |
-| `namedValueResourceGroup` | string | The resource group the named value was deployed into |
-| `namedValueResourceId` | string | The resource ID of the named value |
+| `name` | string | The name of the named value |
+| `resourceGroupName` | string | The resource group the named value was deployed into |
+| `resourceId` | string | The resource ID of the named value |
 
 ## Template references
 
diff --git a/arm/Microsoft.ApiManagement/service/policies/deploy.bicep b/arm/Microsoft.ApiManagement/service/policies/deploy.bicep
index ebebcd144d..727aa22ed3 100644
--- a/arm/Microsoft.ApiManagement/service/policies/deploy.bicep
+++ b/arm/Microsoft.ApiManagement/service/policies/deploy.bicep
@@ -38,10 +38,10 @@ resource policy 'Microsoft.ApiManagement/service/policies@2021-08-01' = {
 }
 
 @description('The resource ID of the API management service policy')
-output policyResourceId string = policy.id
+output resourceId string = policy.id
 
 @description('The name of the API management service policy')
-output policyName string = policy.name
+output name string = policy.name
 
 @description('The resource group the API management service policy was deployed into')
-output policyResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
diff --git a/arm/Microsoft.ApiManagement/service/policies/readme.md b/arm/Microsoft.ApiManagement/service/policies/readme.md
index 9f7c2ac389..b6cefab6ce 100644
--- a/arm/Microsoft.ApiManagement/service/policies/readme.md
+++ b/arm/Microsoft.ApiManagement/service/policies/readme.md
@@ -22,9 +22,9 @@ This module deploys API Management Service Policy.
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `policyName` | string | The name of the API management service policy |
-| `policyResourceGroup` | string | The resource group the API management service policy was deployed into |
-| `policyResourceId` | string | The resource ID of the API management service policy |
+| `name` | string | The name of the API management service policy |
+| `resourceGroupName` | string | The resource group the API management service policy was deployed into |
+| `resourceId` | string | The resource ID of the API management service policy |
 
 ## Template references
 
diff --git a/arm/Microsoft.ApiManagement/service/portalsettings/deploy.bicep b/arm/Microsoft.ApiManagement/service/portalsettings/deploy.bicep
index da385b7dc2..63b3f8255d 100644
--- a/arm/Microsoft.ApiManagement/service/portalsettings/deploy.bicep
+++ b/arm/Microsoft.ApiManagement/service/portalsettings/deploy.bicep
@@ -31,10 +31,10 @@ resource portalSetting 'Microsoft.ApiManagement/service/portalsettings@2021-08-0
 }
 
 @description('The resource ID of the API management service portal setting')
-output portalSettingsResourceId string = portalSetting.id
+output resourceId string = portalSetting.id
 
 @description('The name of the API management service portal setting')
-output portalSettingsName string = portalSetting.name
+output name string = portalSetting.name
 
 @description('The resource group the API management service portal setting was deployed into')
-output portalSettingsResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
diff --git a/arm/Microsoft.ApiManagement/service/portalsettings/readme.md b/arm/Microsoft.ApiManagement/service/portalsettings/readme.md
index a1e6fa0659..912d8918b3 100644
--- a/arm/Microsoft.ApiManagement/service/portalsettings/readme.md
+++ b/arm/Microsoft.ApiManagement/service/portalsettings/readme.md
@@ -21,9 +21,9 @@ This module deploys API Management Service Portal Setting.
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `portalSettingsName` | string | The name of the API management service portal setting |
-| `portalSettingsResourceGroup` | string | The resource group the API management service portal setting was deployed into |
-| `portalSettingsResourceId` | string | The resource ID of the API management service portal setting |
+| `name` | string | The name of the API management service portal setting |
+| `resourceGroupName` | string | The resource group the API management service portal setting was deployed into |
+| `resourceId` | string | The resource ID of the API management service portal setting |
 
 ## Template references
 
diff --git a/arm/Microsoft.ApiManagement/service/products/apis/deploy.bicep b/arm/Microsoft.ApiManagement/service/products/apis/deploy.bicep
index 41beac09f7..416285c153 100644
--- a/arm/Microsoft.ApiManagement/service/products/apis/deploy.bicep
+++ b/arm/Microsoft.ApiManagement/service/products/apis/deploy.bicep
@@ -29,10 +29,10 @@ resource api 'Microsoft.ApiManagement/service/products/apis@2021-08-01' = {
 }
 
 @description('The resource ID of the product API')
-output apiResourceId string = api.id
+output resourceId string = api.id
 
 @description('The name of the product API')
-output apiName string = api.name
+output name string = api.name
 
 @description('The resource group the product API was deployed into')
-output apiResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
diff --git a/arm/Microsoft.ApiManagement/service/products/apis/readme.md b/arm/Microsoft.ApiManagement/service/products/apis/readme.md
index 6e53faecf2..ff50366e0e 100644
--- a/arm/Microsoft.ApiManagement/service/products/apis/readme.md
+++ b/arm/Microsoft.ApiManagement/service/products/apis/readme.md
@@ -21,9 +21,9 @@ This module deploys API Management Service Product APIs.
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `apiName` | string | The name of the product API |
-| `apiResourceGroup` | string | The resource group the product API was deployed into |
-| `apiResourceId` | string | The resource ID of the product API |
+| `name` | string | The name of the product API |
+| `resourceGroupName` | string | The resource group the product API was deployed into |
+| `resourceId` | string | The resource ID of the product API |
 
 ## Template references
 
diff --git a/arm/Microsoft.ApiManagement/service/products/deploy.bicep b/arm/Microsoft.ApiManagement/service/products/deploy.bicep
index 317351f5b0..6c5fd141af 100644
--- a/arm/Microsoft.ApiManagement/service/products/deploy.bicep
+++ b/arm/Microsoft.ApiManagement/service/products/deploy.bicep
@@ -54,7 +54,7 @@ resource product 'Microsoft.ApiManagement/service/products@2021-08-01' = {
   }
 }
 
-module api 'apis/deploy.bicep' = [for (api, index) in apis: {
+module product_apis 'apis/deploy.bicep' = [for (api, index) in apis: {
   name: '${deployment().name}-Api-${index}'
   params: {
     apiManagementServiceName: apiManagementServiceName
@@ -63,7 +63,7 @@ module api 'apis/deploy.bicep' = [for (api, index) in apis: {
   }
 }]
 
-module group 'groups/deploy.bicep' = [for (group, index) in groups: {
+module product_groups 'groups/deploy.bicep' = [for (group, index) in groups: {
   name: '${deployment().name}-Group-${index}'
   params: {
     apiManagementServiceName: apiManagementServiceName
@@ -73,16 +73,16 @@ module group 'groups/deploy.bicep' = [for (group, index) in groups: {
 }]
 
 @description('The resource ID of the API management service product')
-output productResourceId string = product.id
+output resourceId string = product.id
 
 @description('The name of the API management service product')
-output productName string = product.name
+output name string = product.name
 
 @description('The resource group the API management service product was deployed into')
-output productResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
 
 @description('The Resources IDs of the API management service product APIs')
-output productApisResourceIds array = [for productApi in apis: resourceId('Microsoft.ApiManagement/service/products/apis', apiManagementServiceName, name, productApi.name)]
+output apiResourceIds array = [for index in range(0, length(apis)): product_apis[index].outputs.resourceId]
 
 @description('The Resources IDs of the API management service product groups')
-output productGroupsResourceIds array = [for productGroup in groups: resourceId('Microsoft.ApiManagement/service/products/groups', apiManagementServiceName, name, productGroup.name)]
+output groupResourceIds array = [for index in range(0, length(groups)): product_groups[index].outputs.resourceId]
diff --git a/arm/Microsoft.ApiManagement/service/products/groups/deploy.bicep b/arm/Microsoft.ApiManagement/service/products/groups/deploy.bicep
index 8a61338bef..e654096377 100644
--- a/arm/Microsoft.ApiManagement/service/products/groups/deploy.bicep
+++ b/arm/Microsoft.ApiManagement/service/products/groups/deploy.bicep
@@ -29,10 +29,10 @@ resource group 'Microsoft.ApiManagement/service/products/groups@2021-08-01' = {
 }
 
 @description('The resource ID of the product group')
-output groupResourceId string = group.id
+output resourceId string = group.id
 
 @description('The name of the product group')
-output groupName string = group.name
+output name string = group.name
 
 @description('The resource group the product group was deployed into')
-output groupResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
diff --git a/arm/Microsoft.ApiManagement/service/products/groups/readme.md b/arm/Microsoft.ApiManagement/service/products/groups/readme.md
index 247b3edd54..63ea7a7238 100644
--- a/arm/Microsoft.ApiManagement/service/products/groups/readme.md
+++ b/arm/Microsoft.ApiManagement/service/products/groups/readme.md
@@ -21,9 +21,9 @@ This module deploys API Management Service Product Groups.
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `groupName` | string | The name of the product group |
-| `groupResourceGroup` | string | The resource group the product group was deployed into |
-| `groupResourceId` | string | The resource ID of the product group |
+| `name` | string | The name of the product group |
+| `resourceGroupName` | string | The resource group the product group was deployed into |
+| `resourceId` | string | The resource ID of the product group |
 
 ## Template references
 
diff --git a/arm/Microsoft.ApiManagement/service/products/readme.md b/arm/Microsoft.ApiManagement/service/products/readme.md
index d2c6a186b5..9026f639fb 100644
--- a/arm/Microsoft.ApiManagement/service/products/readme.md
+++ b/arm/Microsoft.ApiManagement/service/products/readme.md
@@ -36,11 +36,11 @@ The following resources are required to be able to deploy this resource.
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `productApisResourceIds` | array | The Resources IDs of the API management service product APIs |
-| `productGroupsResourceIds` | array | The Resources IDs of the API management service product groups |
-| `productName` | string | The name of the API management service product |
-| `productResourceGroup` | string | The resource group the API management service product was deployed into |
-| `productResourceId` | string | The resource ID of the API management service product |
+| `apiResourceIds` | array | The Resources IDs of the API management service product APIs |
+| `groupResourceIds` | array | The Resources IDs of the API management service product groups |
+| `name` | string | The name of the API management service product |
+| `resourceGroupName` | string | The resource group the API management service product was deployed into |
+| `resourceId` | string | The resource ID of the API management service product |
 
 ## Template references
 
diff --git a/arm/Microsoft.ApiManagement/service/readme.md b/arm/Microsoft.ApiManagement/service/readme.md
index 2017224728..24cdb6fca8 100644
--- a/arm/Microsoft.ApiManagement/service/readme.md
+++ b/arm/Microsoft.ApiManagement/service/readme.md
@@ -140,9 +140,9 @@ You can specify multiple user assigned identities to a resource by providing add
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `serviceName` | string | The name of the API management service |
-| `serviceResourceGroup` | string | The resource group the API management service was deployed into |
-| `serviceResourceId` | string | The resource ID of the API management service |
+| `name` | string | The name of the API management service |
+| `resourceGroupName` | string | The resource group the API management service was deployed into |
+| `resourceId` | string | The resource ID of the API management service |
 | `systemAssignedPrincipalId` | string | The principal ID of the system assigned identity. |
 
 ## Considerations
diff --git a/arm/Microsoft.ApiManagement/service/subscriptions/deploy.bicep b/arm/Microsoft.ApiManagement/service/subscriptions/deploy.bicep
index 47fed49e8d..0c7d4cc819 100644
--- a/arm/Microsoft.ApiManagement/service/subscriptions/deploy.bicep
+++ b/arm/Microsoft.ApiManagement/service/subscriptions/deploy.bicep
@@ -49,10 +49,10 @@ resource subscription 'Microsoft.ApiManagement/service/subscriptions@2021-08-01'
 }
 
 @description('The resource ID of the API management service subscription')
-output subscriptionResourceId string = subscription.id
+output resourceId string = subscription.id
 
 @description('The name of the API management service subscription')
-output subscriptionName string = subscription.name
+output name string = subscription.name
 
 @description('The resource group the API management service subscription was deployed into')
-output subscriptionResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
diff --git a/arm/Microsoft.ApiManagement/service/subscriptions/readme.md b/arm/Microsoft.ApiManagement/service/subscriptions/readme.md
index cd86527a4f..9b3bd64143 100644
--- a/arm/Microsoft.ApiManagement/service/subscriptions/readme.md
+++ b/arm/Microsoft.ApiManagement/service/subscriptions/readme.md
@@ -32,9 +32,9 @@ The following resources are required to be able to deploy this resource.
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `subscriptionName` | string | The name of the API management service subscription |
-| `subscriptionResourceGroup` | string | The resource group the API management service subscription was deployed into |
-| `subscriptionResourceId` | string | The resource ID of the API management service subscription |
+| `name` | string | The name of the API management service subscription |
+| `resourceGroupName` | string | The resource group the API management service subscription was deployed into |
+| `resourceId` | string | The resource ID of the API management service subscription |
 
 ## Template references