Updated outputs of namespace starting with [n]

arm/Microsoft.NetApp/netAppAccounts/capacityPools/deploy.bicep

@@ -91,10 +91,10 @@ module capacityPool_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, inde
 }]
 
 @description('The name of the Capacity Pool.')
-output capacityPoolName string = capacityPool.name
+output name string = capacityPool.name
 
 @description('The resource ID of the Capacity Pool.')
-output capacityPoolResourceId string = capacityPool.id
+output resourceId string = capacityPool.id
 
 @description('The name of the Resource Group the Capacity Pool was created in.')
-output capacityPoolResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name

arm/Microsoft.NetApp/netAppAccounts/capacityPools/readme.md

@@ -69,12 +69,12 @@ Tag names and tag values can be provided as needed. A tag can be left without a
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `capacityPoolName` | string | The name of the Capacity Pool. |
-| `capacityPoolResourceGroup` | string | The name of the Resource Group the Capacity Pool was created in. |
-| `capacityPoolResourceId` | string | The resource ID of the Capacity Pool. |
+| `name` | string | The name of the Capacity Pool. |
+| `resourceGroupName` | string | The name of the Resource Group the Capacity Pool was created in. |
+| `resourceId` | string | The resource ID of the Capacity Pool. |
 
 ## Template references
 
 - [Netappaccounts/Capacitypools](https://docs.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2021-06-01/netAppAccounts/capacityPools)
 - [Netappaccounts/Capacitypools/Volumes](https://docs.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2021-06-01/netAppAccounts/capacityPools/volumes)
-- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments)
+- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments)

arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/deploy.bicep

@@ -79,10 +79,10 @@ module volume_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in
 }]
 
 @description('The name of the Volume.')
-output volumeName string = volume.name
+output name string = volume.name
 
 @description('The Resource ID of the Volume.')
-output volumeResourceId string = volume.id
+output resourceId string = volume.id
 
 @description('The name of the Resource Group the Volume was created in.')
-output volumeResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name

arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/readme.md

@@ -52,11 +52,11 @@ This template deploys volumes in a capacity pool of an Azure NetApp files.
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `volumeName` | string | The name of the Volume. |
-| `volumeResourceGroup` | string | The name of the Resource Group the Volume was created in. |
-| `volumeResourceId` | string | The Resource ID of the Volume. |
+| `name` | string | The name of the Volume. |
+| `resourceGroupName` | string | The name of the Resource Group the Volume was created in. |
+| `resourceId` | string | The Resource ID of the Volume. |
 
 ## Template references
 
 - [Netappaccounts/Capacitypools/Volumes](https://docs.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2021-06-01/netAppAccounts/capacityPools/volumes)
-- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments)
+- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments)

arm/Microsoft.NetApp/netAppAccounts/deploy.bicep

@@ -103,10 +103,10 @@ module netAppAccount_capacityPools 'capacityPools/deploy.bicep' = [for (capacity
 }]
 
 @description('The name of the NetApp account.')
-output netAppAccountName string = netAppAccount.name
+output name string = netAppAccount.name
 
 @description('The Resource ID of the NetApp account.')
-output netAppAccountResourceId string = netAppAccount.id
+output resourceId string = netAppAccount.id
 
 @description('The name of the Resource Group the NetApp account was created in.')
-output netAppAccountResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name

arm/Microsoft.NetApp/netAppAccounts/readme.md

@@ -73,14 +73,14 @@ Tag names and tag values can be provided as needed. A tag can be left without a
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `netAppAccountName` | string | The name of the NetApp account. |
-| `netAppAccountResourceGroup` | string | The name of the Resource Group the NetApp account was created in. |
-| `netAppAccountResourceId` | string | The Resource ID of the NetApp account. |
+| `name` | string | The name of the NetApp account. |
+| `resourceGroupName` | string | The name of the Resource Group the NetApp account was created in. |
+| `resourceId` | string | The Resource ID of the NetApp account. |
 
 ## Template references
 
 - [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks)
 - [Netappaccounts](https://docs.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2021-04-01/netAppAccounts)
 - [Netappaccounts/Capacitypools](https://docs.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2021-06-01/netAppAccounts/capacityPools)
 - [Netappaccounts/Capacitypools/Volumes](https://docs.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2021-06-01/netAppAccounts/capacityPools/volumes)
-- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments)
+- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments)

arm/Microsoft.Network/applicationGateways/deploy.bicep

@@ -151,8 +151,8 @@ var diagnosticsMetrics = [for metric in metricsToEnable: {
   }
 }]
 
-var applicationGatewayResourceId = resourceId('Microsoft.Network/applicationGateways', name)
-var subnetResourceId = resourceId(vNetSubscriptionId, vNetResourceGroup, 'Microsoft.Network/virtualNetworks/subnets', vNetName, subnetName)
+var applicationGatewayResourceId = az.resourceId('Microsoft.Network/applicationGateways', name)
+var subnetResourceId = az.resourceId(vNetSubscriptionId, vNetResourceGroup, 'Microsoft.Network/virtualNetworks/subnets', vNetName, subnetName)
 var frontendPublicIPConfigurationName = 'public'
 var frontendPrivateIPConfigurationName = 'private'
 var frontendPrivateIPDynamicConfiguration = {
@@ -423,10 +423,10 @@ module applicationGateway_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment
 }]
 
 @description('The name of the application gateway')
-output applicationGatewayName string = applicationGateway.name
+output name string = applicationGateway.name
 
 @description('The resource ID of the application gateway')
-output applicationGatewayResourceId string = applicationGateway.id
+output resourceId string = applicationGateway.id
 
 @description('The resource group the application gateway was deployed into')
-output applicationGatewayResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name

arm/Microsoft.Network/applicationGateways/readme.md

@@ -235,13 +235,13 @@ You can specify multiple user assigned identities to a resource by providing add
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `applicationGatewayName` | string | The name of the application gateway |
-| `applicationGatewayResourceGroup` | string | The resource group the application gateway was deployed into |
-| `applicationGatewayResourceId` | string | The resource ID of the application gateway |
+| `name` | string | The name of the application gateway |
+| `resourceGroupName` | string | The resource group the application gateway was deployed into |
+| `resourceId` | string | The resource ID of the application gateway |
 
 ## Template references
 
 - [Applicationgateways](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-03-01/applicationGateways)
 - [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)

arm/Microsoft.Network/applicationSecurityGroups/deploy.bicep

@@ -52,10 +52,10 @@ module applicationSecurityGroup_rbac '.bicep/nested_rbac.bicep' = [for (roleAssi
 }]
 
 @description('The resource group the application security group was deployed into')
-output applicationSecurityGroupResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
 
 @description('The resource ID of the application security group')
-output applicationSecurityGroupResourceId string = applicationSecurityGroup.id
+output resourceId string = applicationSecurityGroup.id
 
 @description('The name of the application security group')
-output applicationSecurityGroupName string = applicationSecurityGroup.name
+output name string = applicationSecurityGroup.name

arm/Microsoft.Network/applicationSecurityGroups/readme.md

@@ -64,12 +64,12 @@ Tag names and tag values can be provided as needed. A tag can be left without a
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `applicationSecurityGroupName` | string | The name of the application security group |
-| `applicationSecurityGroupResourceGroup` | string | The resource group the application security group was deployed into |
-| `applicationSecurityGroupResourceId` | string | The resource ID of the application security group |
+| `name` | string | The name of the application security group |
+| `resourceGroupName` | string | The resource group the application security group was deployed into |
+| `resourceId` | string | The resource ID of the application security group |
 
 ## Template references
 
 - [Applicationsecuritygroups](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-02-01/applicationSecurityGroups)
 - [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks)
-- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments)
+- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments)

arm/Microsoft.Network/azureFirewalls/deploy.bicep

@@ -191,16 +191,16 @@ module azureFirewall_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, ind
 }]
 
 @description('The resource ID of the Azure firewall')
-output azureFirewallResourceId string = azureFirewall.id
+output resourceId string = azureFirewall.id
 
 @description('The name of the Azure firewall')
-output azureFirewallName string = azureFirewall.name
+output name string = azureFirewall.name
 
-@description('The resource group the azure firewall was deployed into')
-output azureFirewallResourceGroup string = resourceGroup().name
+@description('The resource group the Azure firewall was deployed into')
+output resourceGroupName string = resourceGroup().name
 
-@description('The private IP of the Azure Firewall')
-output azureFirewallPrivateIp string = azureFirewall.properties.ipConfigurations[0].properties.privateIPAddress
+@description('The private IP of the Azure firewall')
+output privateIp string = azureFirewall.properties.ipConfigurations[0].properties.privateIPAddress
 
 @description('List of Application Rule Collections')
 output applicationRuleCollections array = applicationRuleCollections

arm/Microsoft.Network/azureFirewalls/readme.md

@@ -82,12 +82,12 @@ Tag names and tag values can be provided as needed. A tag can be left without a
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
 | `applicationRuleCollections` | array | List of Application Rule Collections |
-| `azureFirewallName` | string | The name of the Azure firewall |
-| `azureFirewallPrivateIp` | string | The private IP of the Azure Firewall |
-| `azureFirewallResourceGroup` | string | The resource group the azure firewall was deployed into |
-| `azureFirewallResourceId` | string | The resource ID of the Azure firewall |
+| `name` | string | The name of the Azure firewall |
 | `natRuleCollections` | array | Collection of NAT rule collections used by Azure Firewall |
 | `networkRuleCollections` | array | List of Network Rule Collections |
+| `privateIp` | string | The private IP of the Azure firewall |
+| `resourceGroupName` | string | The resource group the Azure firewall was deployed into |
+| `resourceId` | string | The resource ID of the Azure firewall |
 
 ## Considerations
 

arm/Microsoft.Network/bastionHosts/.bicep/nested_publicIPAddress.bicep

@@ -139,10 +139,10 @@ module publicIpAddress_rbac 'nested_publicIPAddress_rbac.bicep' = [for (roleAssi
 }]
 
 @description('The resource group the public IP address was deployed into')
-output publicIPAddressResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
 
 @description('The name of the public IP address')
-output publicIPAddressName string = publicIpAddress.name
+output name string = publicIpAddress.name
 
 @description('The resource ID of the public IP address')
-output publicIPAddressResourceId string = publicIpAddress.id
+output resourceId string = publicIpAddress.id

arm/Microsoft.Network/bastionHosts/deploy.bicep

@@ -121,7 +121,7 @@ resource azureBastion 'Microsoft.Network/bastionHosts@2021-02-01' = {
             id: '${vNetId}/subnets/AzureBastionSubnet'
           }
           publicIPAddress: {
-            id: !(empty(publicIPAddressId)) ? publicIPAddressId : publicIPAddress.outputs.publicIPAddressResourceId
+            id: !(empty(publicIPAddressId)) ? publicIPAddressId : publicIPAddress.outputs.resourceId
           }
         }
       }
@@ -160,10 +160,10 @@ module azureBastion_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, inde
 }]
 
 @description('The resource group the Azure Bastion was deployed into')
-output azureBastionResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
 
 @description('The name the Azure Bastion')
-output azureBastionName string = azureBastion.name
+output name string = azureBastion.name
 
 @description('The resource ID the Azure Bastion')
-output azureBastionResourceId string = azureBastion.id
+output resourceId string = azureBastion.id

arm/Microsoft.Network/bastionHosts/readme.md

@@ -75,14 +75,14 @@ Tag names and tag values can be provided as needed. A tag can be left without a
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `azureBastionName` | string | The name the Azure Bastion |
-| `azureBastionResourceGroup` | string | The resource group the Azure Bastion was deployed into |
-| `azureBastionResourceId` | string | The resource ID the Azure Bastion |
+| `name` | string | The name the Azure Bastion |
+| `resourceGroupName` | string | The resource group the Azure Bastion was deployed into |
+| `resourceId` | string | The resource ID the Azure Bastion |
 
 ## Template references
 
 - [Bastionhosts](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-02-01/bastionHosts)
 - [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)
 - [Publicipaddresses](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-02-01/publicIPAddresses)
-- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments)
+- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments)

arm/Microsoft.Network/connections/deploy.bicep

@@ -63,17 +63,17 @@ param tags object = {}
 @description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered')
 param cuaId string = ''
 
-var localVirtualNetworkGatewayId = resourceId(resourceGroup().name, 'Microsoft.Network/virtualNetworkGateways', localVirtualNetworkGatewayName)
+var localVirtualNetworkGatewayId = az.resourceId(resourceGroup().name, 'Microsoft.Network/virtualNetworkGateways', localVirtualNetworkGatewayName)
 var remoteEntitySubscriptionId_var = (empty(remoteEntitySubscriptionId) ? subscription().subscriptionId : remoteEntitySubscriptionId)
 var remoteEntityResourceGroup_var = (empty(remoteEntityResourceGroup) ? resourceGroup().name : remoteEntityResourceGroup)
 var virtualNetworkGateway2Id = {
-  id: resourceId(remoteEntitySubscriptionId_var, remoteEntityResourceGroup_var, 'Microsoft.Network/virtualNetworkGateways', remoteEntityName)
+  id: az.resourceId(remoteEntitySubscriptionId_var, remoteEntityResourceGroup_var, 'Microsoft.Network/virtualNetworkGateways', remoteEntityName)
 }
 var localNetworkGateway2Id = {
-  id: resourceId(remoteEntitySubscriptionId_var, remoteEntityResourceGroup_var, 'Microsoft.Network/localNetworkGateways', remoteEntityName)
+  id: az.resourceId(remoteEntitySubscriptionId_var, remoteEntityResourceGroup_var, 'Microsoft.Network/localNetworkGateways', remoteEntityName)
 }
 var peer = {
-  id: resourceId(remoteEntitySubscriptionId_var, remoteEntityResourceGroup_var, 'Microsoft.Network/expressRouteCircuits', remoteEntityName)
+  id: az.resourceId(remoteEntitySubscriptionId_var, remoteEntityResourceGroup_var, 'Microsoft.Network/expressRouteCircuits', remoteEntityName)
 }
 var customIPSecPolicy_var = [
   {
@@ -123,10 +123,10 @@ resource connection_lock 'Microsoft.Authorization/locks@2017-04-01' = if (lock !
 }
 
 @description('The resource group the remote connection was deployed into')
-output remoteConnectionResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
 
 @description('The name of the remote connection')
-output connectionName string = connection.name
+output name string = connection.name
 
 @description('The resource ID of the remote connection')
-output remoteConnectionResourceId string = connection.id
+output resourceId string = connection.id

arm/Microsoft.Network/connections/readme.md

@@ -86,9 +86,9 @@ Tag names and tag values can be provided as needed. A tag can be left without a
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `connectionName` | string | The name of the remote connection |
-| `remoteConnectionResourceGroup` | string | The resource group the remote connection was deployed into |
-| `remoteConnectionResourceId` | string | The resource ID of the remote connection |
+| `name` | string | The name of the remote connection |
+| `resourceGroupName` | string | The resource group the remote connection was deployed into |
+| `resourceId` | string | The resource ID of the remote connection |
 
 ## Template references
 

arm/Microsoft.Network/ddosProtectionPlans/deploy.bicep

@@ -53,10 +53,10 @@ module ddosProtectionPlan_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment
 }]
 
 @description('The resource group the DDOS protection plan was deployed into')
-output ddosProtectionPlanResourceGroup string = resourceGroup().name
+output resourceGroupName string = resourceGroup().name
 
 @description('The resource ID of the DDOS protection plan')
-output ddosProtectionPlanResourceId string = ddosProtectionPlan.id
+output resourceId string = ddosProtectionPlan.id
 
 @description('The name of the DDOS protection plan')
-output ddosProtectionPlanName string = ddosProtectionPlan.name
+output name string = ddosProtectionPlan.name

arm/Microsoft.Network/ddosProtectionPlans/readme.md

@@ -64,12 +64,12 @@ Tag names and tag values can be provided as needed. A tag can be left without a
 
 | Output Name | Type | Description |
 | :-- | :-- | :-- |
-| `ddosProtectionPlanName` | string | The name of the DDOS protection plan |
-| `ddosProtectionPlanResourceGroup` | string | The resource group the DDOS protection plan was deployed into |
-| `ddosProtectionPlanResourceId` | string | The resource ID of the DDOS protection plan |
+| `name` | string | The name of the DDOS protection plan |
+| `resourceGroupName` | string | The resource group the DDOS protection plan was deployed into |
+| `resourceId` | string | The resource ID of the DDOS protection plan |
 
 ## Template references
 
 - [Ddosprotectionplans](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-02-01/ddosProtectionPlans)
 - [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)