From 2c827fe6d367484e3a6437eeb6f1094345e77b8a Mon Sep 17 00:00:00 2001
From: Kris Baranek <k.baranek@microsoft.com>
Date: Fri, 16 Feb 2024 14:04:18 +0100
Subject: [PATCH 1/7] Add support for triggering workflows based on file diff

---
 utilities/tools/Invoke-PipelinesForBranch.ps1 | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/utilities/tools/Invoke-PipelinesForBranch.ps1 b/utilities/tools/Invoke-PipelinesForBranch.ps1
index 9b2acad2c2..15d0cb71e3 100644
--- a/utilities/tools/Invoke-PipelinesForBranch.ps1
+++ b/utilities/tools/Invoke-PipelinesForBranch.ps1
@@ -28,6 +28,9 @@ Optional. Input parameters to pass into the pipeline. Must match the names of th
 .PARAMETER WorkflowFilePath
 Required. The path to the workflow.
 
+.PARAMETER InvokeForDiff
+Optional. Trigger workflows only for those who's module files have changed (based on diff of branch to main)
+
 .EXAMPLE
 Invoke-GitHubWorkflow -PersonalAccessToken '<Placeholder>' -GitHubRepositoryOwner 'Azure' -GitHubRepositoryName 'ResourceModules' -WorkflowFileName 'ms.analysisservices.servers.yml' -TargetBranch 'main' -GitHubPipelineInputs @{ prerelease = 'false'; staticValidation = 'true'; deploymentValidation = 'true'; removeDeployment = 'true' }
 
@@ -215,6 +218,9 @@ function Invoke-PipelinesForBranch {
         [Parameter(Mandatory = $false)]
         [string] $PipelineFilter = 'ms.*',
 
+        [Parameter(Mandatory = $false)]
+        [switch] $InvokeForDiff,
+
         [Parameter(Mandatory = $false)]
         [ValidateSet('GitHub', 'AzureDevOps')]
         [string] $Environment = 'GitHub',
@@ -259,6 +265,31 @@ function Invoke-PipelinesForBranch {
         Write-Verbose 'Fetching current GitHub workflows' -Verbose
         $workflows = Get-GitHubModuleWorkflowList @baseInputObject -Filter $PipelineFilter
 
+        Write-Verbose ('Fetched [{0}] workflows' -f $workflows.Count) -Verbose
+
+        if ($InvokeForDiff) {
+            # Load used function
+            . (Join-Path $RepoRoot 'utilities' 'tools' 'helper' 'Get-PipelineFileName.ps1')
+
+            # Get diff
+            $diff = git diff 'main' --name-only
+
+            # Identify pipeline names
+            $pipelineNames = [System.Collections.ArrayList]@()
+            $pipelineNames = $diff | ForEach-Object {
+                $folderPath = Split-Path $_ -Parent
+                $pipelineFileName = Get-PipelineFileName -ResourceIdentifier $folderPath
+                if ($pipelineFileName -match $PipelineFilter) {
+                    $pipelineFileName
+                }
+            } | Select-Object -Unique
+
+            # Filter workflows
+            $workflows = $workflows | Where-Object { $pipelineNames -contains (Split-Path $_.path -Leaf) }
+
+            Write-Verbose ("As per 'diff', filtered workflows down to [{0}]" -f $workflows.Count)
+        }
+
         $gitHubWorkflowBadges = [System.Collections.ArrayList]@()
 
         Write-Verbose "Triggering GitHub workflows for branch [$TargetBranch]" -Verbose

From cd4932f29dfc54bf251befba7e7e3d474561b3a2 Mon Sep 17 00:00:00 2001
From: Kris Baranek <k.baranek@microsoft.com>
Date: Fri, 16 Feb 2024 19:53:13 +0100
Subject: [PATCH 2/7] Dummy change to test diff

---
 modules/network/ip-group/main.bicep | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/network/ip-group/main.bicep b/modules/network/ip-group/main.bicep
index 08a30eee33..91f139c485 100644
--- a/modules/network/ip-group/main.bicep
+++ b/modules/network/ip-group/main.bicep
@@ -9,7 +9,7 @@ param name string
 @description('Optional. Location for all resources.')
 param location string = resourceGroup().location
 
-@description('Optional. IpAddresses/IpAddressPrefixes in the IpGroups resource.')
+@description('Optional. IpAddresses/IpAddressPrefixes in the IpGroups resource...')
 param ipAddresses array = []
 
 @description('Optional. The lock settings of the service.')

From bd9c1d18765a2f65ce208593aba3f5869d2adc86 Mon Sep 17 00:00:00 2001
From: Kris Baranek <k.baranek@microsoft.com>
Date: Fri, 16 Feb 2024 23:07:03 +0100
Subject: [PATCH 3/7] Dummy change to test diff

---
 modules/network/public-ip-address/main.bicep | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/network/public-ip-address/main.bicep b/modules/network/public-ip-address/main.bicep
index 46fd1decb2..b9f376fcbc 100644
--- a/modules/network/public-ip-address/main.bicep
+++ b/modules/network/public-ip-address/main.bicep
@@ -8,7 +8,7 @@ param name string
 @description('Optional. Resource ID of the Public IP Prefix object. This is only needed if you want your Public IPs created in a PIP Prefix.')
 param publicIPPrefixResourceId string = ''
 
-@description('Optional. The public IP address allocation method.')
+@description('Optional. The public IP address allocation method...')
 @allowed([
   'Dynamic'
   'Static'

From 41e37c50071b1448cf606ad37f9719aed09e38d3 Mon Sep 17 00:00:00 2001
From: Kris Baranek <k.baranek@microsoft.com>
Date: Sat, 17 Feb 2024 01:16:18 +0100
Subject: [PATCH 4/7] Adding diff module filter

---
 utilities/tools/Invoke-PipelinesForBranch.ps1 | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/utilities/tools/Invoke-PipelinesForBranch.ps1 b/utilities/tools/Invoke-PipelinesForBranch.ps1
index 15d0cb71e3..704830f29c 100644
--- a/utilities/tools/Invoke-PipelinesForBranch.ps1
+++ b/utilities/tools/Invoke-PipelinesForBranch.ps1
@@ -76,10 +76,14 @@ function Invoke-GitHubWorkflow {
         } | ConvertTo-Json
     }
     if ($PSCmdlet.ShouldProcess("GitHub workflow [$workflowFileName] for branch [$TargetBranch]", 'Invoke')) {
-        $response = Invoke-RestMethod @requestInputObject -Verbose:$false
+        try {
+            $response = Invoke-RestMethod @requestInputObject -Verbose:$false
+        } catch {
+            Write-Error "Request failed for [$workflowFileName]. Reponse: [$_]"
+        }
 
         if ($response) {
-            Write-Error "Request failed. Reponse: [$response]"
+            Write-Error "Request failed for [$workflowFileName]. Reponse: [$response]"
             return $false
         }
     }
@@ -269,7 +273,7 @@ function Invoke-PipelinesForBranch {
 
         if ($InvokeForDiff) {
             # Load used function
-            . (Join-Path $RepoRoot 'utilities' 'tools' 'helper' 'Get-PipelineFileName.ps1')
+            . (Join-Path $RepositoryRoot 'utilities' 'tools' 'helper' 'Get-PipelineFileName.ps1')
 
             # Get diff
             $diff = git diff 'main' --name-only
@@ -278,16 +282,21 @@ function Invoke-PipelinesForBranch {
             $pipelineNames = [System.Collections.ArrayList]@()
             $pipelineNames = $diff | ForEach-Object {
                 $folderPath = Split-Path $_ -Parent
-                $pipelineFileName = Get-PipelineFileName -ResourceIdentifier $folderPath
-                if ($pipelineFileName -match $PipelineFilter) {
-                    $pipelineFileName
+                $resourceTypeIdentifier = ($folderPath -split 'modules[\/|\\]{1}')[1] -replace '\\', '/'
+                if ($resourceTypeIdentifier.Length -gt 0) {
+                    $pipelineFileName = Get-PipelineFileName -ResourceIdentifier $resourceTypeIdentifier
+                    if ($pipelineFileName -match $PipelineFilter) {
+                        $pipelineFileName
+                    }
                 }
             } | Select-Object -Unique
 
             # Filter workflows
-            $workflows = $workflows | Where-Object { $pipelineNames -contains (Split-Path $_.path -Leaf) }
+            $workflows = $workflows | Where-Object {
+                $pipelineNames -contains (Split-Path $_.path -Leaf)
+            }
 
-            Write-Verbose ("As per 'diff', filtered workflows down to [{0}]" -f $workflows.Count)
+            Write-Verbose ("As per 'diff', filtered workflows down to [{0}]" -f $workflows.Count) -Verbose
         }
 
         $gitHubWorkflowBadges = [System.Collections.ArrayList]@()

From 240ae05571b7e9d9fa9fdab2f0cb668ef18b1031 Mon Sep 17 00:00:00 2001
From: Kris Baranek <k.baranek@microsoft.com>
Date: Sun, 18 Feb 2024 00:16:10 +0100
Subject: [PATCH 5/7] Replaced NamePrefix in modules

---
 modules/aad/domain-service/tests/e2e/max/main.test.bicep        | 2 +-
 .../aad/domain-service/tests/e2e/waf-aligned/main.test.bicep    | 2 +-
 .../configuration-store/tests/e2e/defaults/main.test.bicep      | 2 +-
 .../configuration-store/tests/e2e/encr/main.test.bicep          | 2 +-
 .../configuration-store/tests/e2e/max/main.test.bicep           | 2 +-
 .../configuration-store/tests/e2e/pe/main.test.bicep            | 2 +-
 .../configuration-store/tests/e2e/waf-aligned/main.test.bicep   | 2 +-
 modules/app/job/tests/e2e/defaults/main.test.bicep              | 2 +-
 modules/app/job/tests/e2e/max/main.test.bicep                   | 2 +-
 modules/app/job/tests/e2e/waf-aligned/main.test.bicep           | 2 +-
 modules/authorization/lock/tests/e2e/max/main.test.bicep        | 2 +-
 .../authorization/lock/tests/e2e/waf-aligned/main.test.bicep    | 2 +-
 .../policy-assignment/tests/e2e/mg.common/main.test.bicep       | 2 +-
 .../policy-assignment/tests/e2e/mg.min/main.test.bicep          | 2 +-
 .../policy-assignment/tests/e2e/rg.common/main.test.bicep       | 2 +-
 .../policy-assignment/tests/e2e/rg.min/main.test.bicep          | 2 +-
 .../policy-assignment/tests/e2e/sub.common/main.test.bicep      | 2 +-
 .../policy-assignment/tests/e2e/sub.min/main.test.bicep         | 2 +-
 .../policy-definition/tests/e2e/mg.common/main.test.bicep       | 2 +-
 .../policy-definition/tests/e2e/mg.min/main.test.bicep          | 2 +-
 .../policy-definition/tests/e2e/sub.common/main.test.bicep      | 2 +-
 .../policy-definition/tests/e2e/sub.min/main.test.bicep         | 2 +-
 .../policy-exemption/tests/e2e/mg.common/main.test.bicep        | 2 +-
 .../policy-exemption/tests/e2e/mg.min/main.test.bicep           | 2 +-
 .../policy-exemption/tests/e2e/rg.common/main.test.bicep        | 2 +-
 .../policy-exemption/tests/e2e/rg.min/main.test.bicep           | 2 +-
 .../policy-exemption/tests/e2e/sub.common/main.test.bicep       | 2 +-
 .../policy-exemption/tests/e2e/sub.min/main.test.bicep          | 2 +-
 .../policy-set-definition/tests/e2e/mg.common/main.test.bicep   | 2 +-
 .../policy-set-definition/tests/e2e/mg.min/main.test.bicep      | 2 +-
 .../policy-set-definition/tests/e2e/sub.common/main.test.bicep  | 2 +-
 .../policy-set-definition/tests/e2e/sub.min/main.test.bicep     | 2 +-
 .../role-assignment/tests/e2e/mg.common/main.test.bicep         | 2 +-
 .../role-assignment/tests/e2e/mg.min/main.test.bicep            | 2 +-
 .../role-assignment/tests/e2e/rg.common/main.test.bicep         | 2 +-
 .../role-assignment/tests/e2e/rg.min/main.test.bicep            | 2 +-
 .../role-assignment/tests/e2e/sub.common/main.test.bicep        | 2 +-
 .../role-assignment/tests/e2e/sub.min/main.test.bicep           | 2 +-
 .../role-definition/tests/e2e/mg.common/main.test.bicep         | 2 +-
 .../role-definition/tests/e2e/mg.min/main.test.bicep            | 2 +-
 .../role-definition/tests/e2e/rg.common/main.test.bicep         | 2 +-
 .../role-definition/tests/e2e/rg.min/main.test.bicep            | 2 +-
 .../role-definition/tests/e2e/sub.common/main.test.bicep        | 2 +-
 .../role-definition/tests/e2e/sub.min/main.test.bicep           | 2 +-
 .../cache/redis-enterprise/tests/e2e/defaults/main.test.bicep   | 2 +-
 modules/cache/redis-enterprise/tests/e2e/geo/main.test.bicep    | 2 +-
 modules/cache/redis-enterprise/tests/e2e/max/main.test.bicep    | 2 +-
 .../redis-enterprise/tests/e2e/waf-aligned/main.test.bicep      | 2 +-
 modules/cdn/profile/tests/e2e/afd/main.test.bicep               | 2 +-
 modules/cdn/profile/tests/e2e/max/main.test.bicep               | 2 +-
 modules/cdn/profile/tests/e2e/waf-aligned/main.test.bicep       | 2 +-
 .../tests/e2e/linux.min/main.test.bicep                         | 2 +-
 .../tests/e2e/linux.ssecmk/main.test.bicep                      | 2 +-
 .../virtual-machine-scale-set/tests/e2e/linux/main.test.bicep   | 2 +-
 .../tests/e2e/windows.min/main.test.bicep                       | 2 +-
 .../virtual-machine-scale-set/tests/e2e/windows/main.test.bicep | 2 +-
 .../container-group/tests/e2e/defaults/main.test.bicep          | 2 +-
 .../container-group/tests/e2e/encr/main.test.bicep              | 2 +-
 .../container-group/tests/e2e/max/main.test.bicep               | 2 +-
 .../container-group/tests/e2e/private/main.test.bicep           | 2 +-
 .../container-group/tests/e2e/waf-aligned/main.test.bicep       | 2 +-
 modules/dev-test-lab/lab/tests/e2e/defaults/main.test.bicep     | 2 +-
 modules/dev-test-lab/lab/tests/e2e/max/main.test.bicep          | 2 +-
 modules/dev-test-lab/lab/tests/e2e/waf-aligned/main.test.bicep  | 2 +-
 .../digital-twins-instance/tests/e2e/defaults/main.test.bicep   | 2 +-
 .../digital-twins-instance/tests/e2e/max/main.test.bicep        | 2 +-
 .../tests/e2e/waf-aligned/main.test.bicep                       | 2 +-
 modules/event-hub/namespace/tests/e2e/defaults/main.test.bicep  | 2 +-
 modules/event-hub/namespace/tests/e2e/encr/main.test.bicep      | 2 +-
 modules/event-hub/namespace/tests/e2e/max/main.test.bicep       | 2 +-
 modules/event-hub/namespace/tests/e2e/pe/main.test.bicep        | 2 +-
 .../event-hub/namespace/tests/e2e/waf-aligned/main.test.bicep   | 2 +-
 .../workspace/tests/e2e/defaults/main.test.bicep                | 2 +-
 modules/healthcare-apis/workspace/tests/e2e/max/main.test.bicep | 2 +-
 .../workspace/tests/e2e/waf-aligned/main.test.bicep             | 2 +-
 .../workspace/tests/e2e/defaults/main.test.bicep                | 2 +-
 .../workspace/tests/e2e/encr/main.test.bicep                    | 2 +-
 .../workspace/tests/e2e/max/main.test.bicep                     | 2 +-
 .../workspace/tests/e2e/waf-aligned/main.test.bicep             | 2 +-
 .../registration-definition/tests/e2e/max/main.test.bicep       | 2 +-
 .../registration-definition/tests/e2e/rg/main.test.bicep        | 2 +-
 .../tests/e2e/waf-aligned/main.test.bicep                       | 2 +-
 .../tests/e2e/max/main.test.bicep                               | 2 +-
 .../tests/e2e/waf-aligned/main.test.bicep                       | 2 +-
 .../network/application-gateway/tests/e2e/max/main.test.bicep   | 2 +-
 .../application-gateway/tests/e2e/waf-aligned/main.test.bicep   | 2 +-
 modules/network/azure-firewall/tests/e2e/addpip/main.test.bicep | 2 +-
 .../network/azure-firewall/tests/e2e/custompip/main.test.bicep  | 2 +-
 .../network/azure-firewall/tests/e2e/defaults/main.test.bicep   | 2 +-
 .../network/azure-firewall/tests/e2e/hubcommon/main.test.bicep  | 2 +-
 modules/network/azure-firewall/tests/e2e/hubmin/main.test.bicep | 2 +-
 modules/network/azure-firewall/tests/e2e/max/main.test.bicep    | 2 +-
 .../azure-firewall/tests/e2e/waf-aligned/main.test.bicep        | 2 +-
 modules/network/network-manager/tests/e2e/max/main.test.bicep   | 2 +-
 .../network-manager/tests/e2e/waf-aligned/main.test.bicep       | 2 +-
 modules/network/network-watcher/tests/e2e/max/main.test.bicep   | 2 +-
 .../network-watcher/tests/e2e/waf-aligned/main.test.bicep       | 2 +-
 .../service-endpoint-policy/tests/e2e/defaults/main.test.bicep  | 2 +-
 .../service-endpoint-policy/tests/e2e/max/main.test.bicep       | 2 +-
 .../tests/e2e/waf-aligned/main.test.bicep                       | 2 +-
 modules/network/virtual-hub/tests/e2e/defaults/main.test.bicep  | 2 +-
 modules/network/virtual-hub/tests/e2e/max/main.test.bicep       | 2 +-
 .../network/virtual-hub/tests/e2e/waf-aligned/main.test.bicep   | 2 +-
 modules/network/virtual-wan/tests/e2e/defaults/main.test.bicep  | 2 +-
 modules/network/virtual-wan/tests/e2e/max/main.test.bicep       | 2 +-
 .../network/virtual-wan/tests/e2e/waf-aligned/main.test.bicep   | 2 +-
 .../remediation/tests/e2e/mg.common/main.test.bicep             | 2 +-
 .../remediation/tests/e2e/mg.min/main.test.bicep                | 2 +-
 .../remediation/tests/e2e/rg.common/main.test.bicep             | 2 +-
 .../remediation/tests/e2e/rg.min/main.test.bicep                | 2 +-
 .../remediation/tests/e2e/sub.common/main.test.bicep            | 2 +-
 .../remediation/tests/e2e/sub.min/main.test.bicep               | 2 +-
 modules/purview/account/tests/e2e/defaults/main.test.bicep      | 2 +-
 modules/purview/account/tests/e2e/max/main.test.bicep           | 2 +-
 modules/purview/account/tests/e2e/waf-aligned/main.test.bicep   | 2 +-
 .../recovery-services/vault/tests/e2e/defaults/main.test.bicep  | 2 +-
 modules/recovery-services/vault/tests/e2e/dr/main.test.bicep    | 2 +-
 modules/recovery-services/vault/tests/e2e/max/main.test.bicep   | 2 +-
 .../vault/tests/e2e/waf-aligned/main.test.bicep                 | 2 +-
 modules/relay/namespace/tests/e2e/defaults/main.test.bicep      | 2 +-
 modules/relay/namespace/tests/e2e/max/main.test.bicep           | 2 +-
 modules/relay/namespace/tests/e2e/pe/main.test.bicep            | 2 +-
 modules/relay/namespace/tests/e2e/waf-aligned/main.test.bicep   | 2 +-
 modules/resources/tags/tests/e2e/rg/main.test.bicep             | 2 +-
 .../azure-security-center/tests/e2e/max/main.test.bicep         | 2 +-
 .../azure-security-center/tests/e2e/waf-aligned/main.test.bicep | 2 +-
 modules/service-fabric/cluster/tests/e2e/cert/main.test.bicep   | 2 +-
 .../service-fabric/cluster/tests/e2e/defaults/main.test.bicep   | 2 +-
 modules/service-fabric/cluster/tests/e2e/max/main.test.bicep    | 2 +-
 .../cluster/tests/e2e/waf-aligned/main.test.bicep               | 2 +-
 .../signal-r/tests/e2e/defaults/main.test.bicep                 | 2 +-
 modules/signal-r-service/signal-r/tests/e2e/max/main.test.bicep | 2 +-
 .../signal-r/tests/e2e/waf-aligned/main.test.bicep              | 2 +-
 .../web-pub-sub/tests/e2e/defaults/main.test.bicep              | 2 +-
 .../signal-r-service/web-pub-sub/tests/e2e/max/main.test.bicep  | 2 +-
 .../signal-r-service/web-pub-sub/tests/e2e/pe/main.test.bicep   | 2 +-
 .../web-pub-sub/tests/e2e/waf-aligned/main.test.bicep           | 2 +-
 modules/sql/managed-instance/tests/e2e/defaults/main.test.bicep | 2 +-
 modules/sql/managed-instance/tests/e2e/max/main.test.bicep      | 2 +-
 modules/sql/managed-instance/tests/e2e/vulnAssm/main.test.bicep | 2 +-
 .../sql/managed-instance/tests/e2e/waf-aligned/main.test.bicep  | 2 +-
 .../synapse/private-link-hub/tests/e2e/defaults/main.test.bicep | 2 +-
 modules/synapse/private-link-hub/tests/e2e/max/main.test.bicep  | 2 +-
 .../private-link-hub/tests/e2e/waf-aligned/main.test.bicep      | 2 +-
 modules/synapse/workspace/tests/e2e/defaults/main.test.bicep    | 2 +-
 modules/synapse/workspace/tests/e2e/encrwsai/main.test.bicep    | 2 +-
 modules/synapse/workspace/tests/e2e/encrwuai/main.test.bicep    | 2 +-
 modules/synapse/workspace/tests/e2e/managedvnet/main.test.bicep | 2 +-
 modules/synapse/workspace/tests/e2e/max/main.test.bicep         | 2 +-
 modules/synapse/workspace/tests/e2e/waf-aligned/main.test.bicep | 2 +-
 modules/web/connection/tests/e2e/max/main.test.bicep            | 2 +-
 modules/web/connection/tests/e2e/waf-aligned/main.test.bicep    | 2 +-
 modules/web/hosting-environment/tests/e2e/asev2/main.test.bicep | 2 +-
 modules/web/hosting-environment/tests/e2e/asev3/main.test.bicep | 2 +-
 154 files changed, 154 insertions(+), 154 deletions(-)

diff --git a/modules/aad/domain-service/tests/e2e/max/main.test.bicep b/modules/aad/domain-service/tests/e2e/max/main.test.bicep
index 57a8a8aae6..ef8e12019d 100644
--- a/modules/aad/domain-service/tests/e2e/max/main.test.bicep
+++ b/modules/aad/domain-service/tests/e2e/max/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'aaddsmax'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/aad/domain-service/tests/e2e/waf-aligned/main.test.bicep b/modules/aad/domain-service/tests/e2e/waf-aligned/main.test.bicep
index 605f339c95..77c503fd0e 100644
--- a/modules/aad/domain-service/tests/e2e/waf-aligned/main.test.bicep
+++ b/modules/aad/domain-service/tests/e2e/waf-aligned/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'aaddswaf'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/app-configuration/configuration-store/tests/e2e/defaults/main.test.bicep b/modules/app-configuration/configuration-store/tests/e2e/defaults/main.test.bicep
index 895734bd01..092d59b0dd 100644
--- a/modules/app-configuration/configuration-store/tests/e2e/defaults/main.test.bicep
+++ b/modules/app-configuration/configuration-store/tests/e2e/defaults/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'accmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/app-configuration/configuration-store/tests/e2e/encr/main.test.bicep b/modules/app-configuration/configuration-store/tests/e2e/encr/main.test.bicep
index 8c676e3be7..6cc33baabf 100644
--- a/modules/app-configuration/configuration-store/tests/e2e/encr/main.test.bicep
+++ b/modules/app-configuration/configuration-store/tests/e2e/encr/main.test.bicep
@@ -21,7 +21,7 @@ param enableDefaultTelemetry bool = true
 param baseTime string = utcNow('u')
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/app-configuration/configuration-store/tests/e2e/max/main.test.bicep b/modules/app-configuration/configuration-store/tests/e2e/max/main.test.bicep
index a3bba846cd..f4175ddee9 100644
--- a/modules/app-configuration/configuration-store/tests/e2e/max/main.test.bicep
+++ b/modules/app-configuration/configuration-store/tests/e2e/max/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'accmax'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/app-configuration/configuration-store/tests/e2e/pe/main.test.bicep b/modules/app-configuration/configuration-store/tests/e2e/pe/main.test.bicep
index 59ca3034ed..18fe1ef05c 100644
--- a/modules/app-configuration/configuration-store/tests/e2e/pe/main.test.bicep
+++ b/modules/app-configuration/configuration-store/tests/e2e/pe/main.test.bicep
@@ -18,7 +18,7 @@ param serviceShort string = 'accpe'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/app-configuration/configuration-store/tests/e2e/waf-aligned/main.test.bicep b/modules/app-configuration/configuration-store/tests/e2e/waf-aligned/main.test.bicep
index 11ffe42dcc..8a4d6c63f0 100644
--- a/modules/app-configuration/configuration-store/tests/e2e/waf-aligned/main.test.bicep
+++ b/modules/app-configuration/configuration-store/tests/e2e/waf-aligned/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'accwaf'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/app/job/tests/e2e/defaults/main.test.bicep b/modules/app/job/tests/e2e/defaults/main.test.bicep
index d09eaa87c6..a5f5013d37 100644
--- a/modules/app/job/tests/e2e/defaults/main.test.bicep
+++ b/modules/app/job/tests/e2e/defaults/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'ajmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // =========== //
 // Deployments //
diff --git a/modules/app/job/tests/e2e/max/main.test.bicep b/modules/app/job/tests/e2e/max/main.test.bicep
index 10751e7801..49c0077bbe 100644
--- a/modules/app/job/tests/e2e/max/main.test.bicep
+++ b/modules/app/job/tests/e2e/max/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'ajmax'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // =========== //
 // Deployments //
diff --git a/modules/app/job/tests/e2e/waf-aligned/main.test.bicep b/modules/app/job/tests/e2e/waf-aligned/main.test.bicep
index 5de0b2f354..13413c82d8 100644
--- a/modules/app/job/tests/e2e/waf-aligned/main.test.bicep
+++ b/modules/app/job/tests/e2e/waf-aligned/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'ajwaf'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // =========== //
 // Deployments //
diff --git a/modules/authorization/lock/tests/e2e/max/main.test.bicep b/modules/authorization/lock/tests/e2e/max/main.test.bicep
index b0a46425c0..6ff6a84685 100644
--- a/modules/authorization/lock/tests/e2e/max/main.test.bicep
+++ b/modules/authorization/lock/tests/e2e/max/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'almax'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/authorization/lock/tests/e2e/waf-aligned/main.test.bicep b/modules/authorization/lock/tests/e2e/waf-aligned/main.test.bicep
index 0ed75a7621..145c0ffce4 100644
--- a/modules/authorization/lock/tests/e2e/waf-aligned/main.test.bicep
+++ b/modules/authorization/lock/tests/e2e/waf-aligned/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'alwaf'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/authorization/policy-assignment/tests/e2e/mg.common/main.test.bicep b/modules/authorization/policy-assignment/tests/e2e/mg.common/main.test.bicep
index 95285f90ac..7eb100ed21 100644
--- a/modules/authorization/policy-assignment/tests/e2e/mg.common/main.test.bicep
+++ b/modules/authorization/policy-assignment/tests/e2e/mg.common/main.test.bicep
@@ -14,7 +14,7 @@ param location string = deployment().location
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============== //
 // Test Execution //
diff --git a/modules/authorization/policy-assignment/tests/e2e/mg.min/main.test.bicep b/modules/authorization/policy-assignment/tests/e2e/mg.min/main.test.bicep
index d0d00c55f3..951d87c51f 100644
--- a/modules/authorization/policy-assignment/tests/e2e/mg.min/main.test.bicep
+++ b/modules/authorization/policy-assignment/tests/e2e/mg.min/main.test.bicep
@@ -11,7 +11,7 @@ param serviceShort string = 'apamgmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============== //
 // Test Execution //
diff --git a/modules/authorization/policy-assignment/tests/e2e/rg.common/main.test.bicep b/modules/authorization/policy-assignment/tests/e2e/rg.common/main.test.bicep
index 3c64f5e2c1..debeb8a080 100644
--- a/modules/authorization/policy-assignment/tests/e2e/rg.common/main.test.bicep
+++ b/modules/authorization/policy-assignment/tests/e2e/rg.common/main.test.bicep
@@ -18,7 +18,7 @@ param serviceShort string = 'apargcom'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/authorization/policy-assignment/tests/e2e/rg.min/main.test.bicep b/modules/authorization/policy-assignment/tests/e2e/rg.min/main.test.bicep
index 2953f4aace..f372ebe3e4 100644
--- a/modules/authorization/policy-assignment/tests/e2e/rg.min/main.test.bicep
+++ b/modules/authorization/policy-assignment/tests/e2e/rg.min/main.test.bicep
@@ -18,7 +18,7 @@ param serviceShort string = 'apargmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/authorization/policy-assignment/tests/e2e/sub.common/main.test.bicep b/modules/authorization/policy-assignment/tests/e2e/sub.common/main.test.bicep
index cb3c088c6c..43c6a8f6d1 100644
--- a/modules/authorization/policy-assignment/tests/e2e/sub.common/main.test.bicep
+++ b/modules/authorization/policy-assignment/tests/e2e/sub.common/main.test.bicep
@@ -18,7 +18,7 @@ param location string = deployment().location
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/authorization/policy-assignment/tests/e2e/sub.min/main.test.bicep b/modules/authorization/policy-assignment/tests/e2e/sub.min/main.test.bicep
index d9039eca58..27a8d82477 100644
--- a/modules/authorization/policy-assignment/tests/e2e/sub.min/main.test.bicep
+++ b/modules/authorization/policy-assignment/tests/e2e/sub.min/main.test.bicep
@@ -11,7 +11,7 @@ param serviceShort string = 'apasubmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============== //
 // Test Execution //
diff --git a/modules/authorization/policy-definition/tests/e2e/mg.common/main.test.bicep b/modules/authorization/policy-definition/tests/e2e/mg.common/main.test.bicep
index df669b50c3..8c6c9466ac 100644
--- a/modules/authorization/policy-definition/tests/e2e/mg.common/main.test.bicep
+++ b/modules/authorization/policy-definition/tests/e2e/mg.common/main.test.bicep
@@ -11,7 +11,7 @@ param serviceShort string = 'apdmgcom'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============== //
 // Test Execution //
diff --git a/modules/authorization/policy-definition/tests/e2e/mg.min/main.test.bicep b/modules/authorization/policy-definition/tests/e2e/mg.min/main.test.bicep
index 26408738b1..f8df0cb77b 100644
--- a/modules/authorization/policy-definition/tests/e2e/mg.min/main.test.bicep
+++ b/modules/authorization/policy-definition/tests/e2e/mg.min/main.test.bicep
@@ -11,7 +11,7 @@ param serviceShort string = 'apdmgmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============== //
 // Test Execution //
diff --git a/modules/authorization/policy-definition/tests/e2e/sub.common/main.test.bicep b/modules/authorization/policy-definition/tests/e2e/sub.common/main.test.bicep
index 735058877b..59b1af26f9 100644
--- a/modules/authorization/policy-definition/tests/e2e/sub.common/main.test.bicep
+++ b/modules/authorization/policy-definition/tests/e2e/sub.common/main.test.bicep
@@ -11,7 +11,7 @@ param serviceShort string = 'apdsubcom'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============== //
 // Test Execution //
diff --git a/modules/authorization/policy-definition/tests/e2e/sub.min/main.test.bicep b/modules/authorization/policy-definition/tests/e2e/sub.min/main.test.bicep
index 8e0f2c8c48..aea368c437 100644
--- a/modules/authorization/policy-definition/tests/e2e/sub.min/main.test.bicep
+++ b/modules/authorization/policy-definition/tests/e2e/sub.min/main.test.bicep
@@ -11,7 +11,7 @@ param serviceShort string = 'apdsubmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============== //
 // Test Execution //
diff --git a/modules/authorization/policy-exemption/tests/e2e/mg.common/main.test.bicep b/modules/authorization/policy-exemption/tests/e2e/mg.common/main.test.bicep
index 4832fa018c..420a4bf8e1 100644
--- a/modules/authorization/policy-exemption/tests/e2e/mg.common/main.test.bicep
+++ b/modules/authorization/policy-exemption/tests/e2e/mg.common/main.test.bicep
@@ -14,7 +14,7 @@ param serviceShort string = 'apemgcom'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/authorization/policy-exemption/tests/e2e/mg.min/main.test.bicep b/modules/authorization/policy-exemption/tests/e2e/mg.min/main.test.bicep
index d34ab40cdb..f484162091 100644
--- a/modules/authorization/policy-exemption/tests/e2e/mg.min/main.test.bicep
+++ b/modules/authorization/policy-exemption/tests/e2e/mg.min/main.test.bicep
@@ -14,7 +14,7 @@ param serviceShort string = 'apemgmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/authorization/policy-exemption/tests/e2e/rg.common/main.test.bicep b/modules/authorization/policy-exemption/tests/e2e/rg.common/main.test.bicep
index 650cefa0b3..f136eb4763 100644
--- a/modules/authorization/policy-exemption/tests/e2e/rg.common/main.test.bicep
+++ b/modules/authorization/policy-exemption/tests/e2e/rg.common/main.test.bicep
@@ -18,7 +18,7 @@ param serviceShort string = 'apergcom'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/authorization/policy-exemption/tests/e2e/rg.min/main.test.bicep b/modules/authorization/policy-exemption/tests/e2e/rg.min/main.test.bicep
index 49828f611d..6fddf3f27a 100644
--- a/modules/authorization/policy-exemption/tests/e2e/rg.min/main.test.bicep
+++ b/modules/authorization/policy-exemption/tests/e2e/rg.min/main.test.bicep
@@ -18,7 +18,7 @@ param serviceShort string = 'apergmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/authorization/policy-exemption/tests/e2e/sub.common/main.test.bicep b/modules/authorization/policy-exemption/tests/e2e/sub.common/main.test.bicep
index ac0f4d16eb..5f7051041b 100644
--- a/modules/authorization/policy-exemption/tests/e2e/sub.common/main.test.bicep
+++ b/modules/authorization/policy-exemption/tests/e2e/sub.common/main.test.bicep
@@ -14,7 +14,7 @@ param serviceShort string = 'apesubcom'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/authorization/policy-exemption/tests/e2e/sub.min/main.test.bicep b/modules/authorization/policy-exemption/tests/e2e/sub.min/main.test.bicep
index c3a5b57b44..a42c413c8d 100644
--- a/modules/authorization/policy-exemption/tests/e2e/sub.min/main.test.bicep
+++ b/modules/authorization/policy-exemption/tests/e2e/sub.min/main.test.bicep
@@ -14,7 +14,7 @@ param serviceShort string = 'apesubmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/authorization/policy-set-definition/tests/e2e/mg.common/main.test.bicep b/modules/authorization/policy-set-definition/tests/e2e/mg.common/main.test.bicep
index 0f5653cc1f..bf079bf7df 100644
--- a/modules/authorization/policy-set-definition/tests/e2e/mg.common/main.test.bicep
+++ b/modules/authorization/policy-set-definition/tests/e2e/mg.common/main.test.bicep
@@ -11,7 +11,7 @@ param serviceShort string = 'apsdmgcom'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============== //
 // Test Execution //
diff --git a/modules/authorization/policy-set-definition/tests/e2e/mg.min/main.test.bicep b/modules/authorization/policy-set-definition/tests/e2e/mg.min/main.test.bicep
index 8ad45325f9..4a16b73094 100644
--- a/modules/authorization/policy-set-definition/tests/e2e/mg.min/main.test.bicep
+++ b/modules/authorization/policy-set-definition/tests/e2e/mg.min/main.test.bicep
@@ -11,7 +11,7 @@ param serviceShort string = 'apsdmgmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============== //
 // Test Execution //
diff --git a/modules/authorization/policy-set-definition/tests/e2e/sub.common/main.test.bicep b/modules/authorization/policy-set-definition/tests/e2e/sub.common/main.test.bicep
index dfe66dba51..60d224c23f 100644
--- a/modules/authorization/policy-set-definition/tests/e2e/sub.common/main.test.bicep
+++ b/modules/authorization/policy-set-definition/tests/e2e/sub.common/main.test.bicep
@@ -11,7 +11,7 @@ param serviceShort string = 'apsdsubcom'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============== //
 // Test Execution //
diff --git a/modules/authorization/policy-set-definition/tests/e2e/sub.min/main.test.bicep b/modules/authorization/policy-set-definition/tests/e2e/sub.min/main.test.bicep
index 9057a849b5..66218f2c27 100644
--- a/modules/authorization/policy-set-definition/tests/e2e/sub.min/main.test.bicep
+++ b/modules/authorization/policy-set-definition/tests/e2e/sub.min/main.test.bicep
@@ -11,7 +11,7 @@ param serviceShort string = 'apsdsubmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============== //
 // Test Execution //
diff --git a/modules/authorization/role-assignment/tests/e2e/mg.common/main.test.bicep b/modules/authorization/role-assignment/tests/e2e/mg.common/main.test.bicep
index 336f3cd4bd..de50433047 100644
--- a/modules/authorization/role-assignment/tests/e2e/mg.common/main.test.bicep
+++ b/modules/authorization/role-assignment/tests/e2e/mg.common/main.test.bicep
@@ -18,7 +18,7 @@ param serviceShort string = 'aramgcom'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/authorization/role-assignment/tests/e2e/mg.min/main.test.bicep b/modules/authorization/role-assignment/tests/e2e/mg.min/main.test.bicep
index 62cc16085c..1bf3523c20 100644
--- a/modules/authorization/role-assignment/tests/e2e/mg.min/main.test.bicep
+++ b/modules/authorization/role-assignment/tests/e2e/mg.min/main.test.bicep
@@ -18,7 +18,7 @@ param serviceShort string = 'aramgmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/authorization/role-assignment/tests/e2e/rg.common/main.test.bicep b/modules/authorization/role-assignment/tests/e2e/rg.common/main.test.bicep
index c4a6b7ea07..9437ce59c1 100644
--- a/modules/authorization/role-assignment/tests/e2e/rg.common/main.test.bicep
+++ b/modules/authorization/role-assignment/tests/e2e/rg.common/main.test.bicep
@@ -18,7 +18,7 @@ param serviceShort string = 'arargcom'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/authorization/role-assignment/tests/e2e/rg.min/main.test.bicep b/modules/authorization/role-assignment/tests/e2e/rg.min/main.test.bicep
index ca2f37a9ab..9c09f72475 100644
--- a/modules/authorization/role-assignment/tests/e2e/rg.min/main.test.bicep
+++ b/modules/authorization/role-assignment/tests/e2e/rg.min/main.test.bicep
@@ -18,7 +18,7 @@ param serviceShort string = 'arargmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/authorization/role-assignment/tests/e2e/sub.common/main.test.bicep b/modules/authorization/role-assignment/tests/e2e/sub.common/main.test.bicep
index 77a6b7883c..53627f28a3 100644
--- a/modules/authorization/role-assignment/tests/e2e/sub.common/main.test.bicep
+++ b/modules/authorization/role-assignment/tests/e2e/sub.common/main.test.bicep
@@ -18,7 +18,7 @@ param serviceShort string = 'arasubcom'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/authorization/role-assignment/tests/e2e/sub.min/main.test.bicep b/modules/authorization/role-assignment/tests/e2e/sub.min/main.test.bicep
index 90242be1d0..c1161af619 100644
--- a/modules/authorization/role-assignment/tests/e2e/sub.min/main.test.bicep
+++ b/modules/authorization/role-assignment/tests/e2e/sub.min/main.test.bicep
@@ -18,7 +18,7 @@ param serviceShort string = 'arasubmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/authorization/role-definition/tests/e2e/mg.common/main.test.bicep b/modules/authorization/role-definition/tests/e2e/mg.common/main.test.bicep
index 4a11b95b59..f2144ea002 100644
--- a/modules/authorization/role-definition/tests/e2e/mg.common/main.test.bicep
+++ b/modules/authorization/role-definition/tests/e2e/mg.common/main.test.bicep
@@ -11,7 +11,7 @@ param serviceShort string = 'ardmgcom'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============== //
 // Test Execution //
diff --git a/modules/authorization/role-definition/tests/e2e/mg.min/main.test.bicep b/modules/authorization/role-definition/tests/e2e/mg.min/main.test.bicep
index 67848fd6db..3c34c5d2f6 100644
--- a/modules/authorization/role-definition/tests/e2e/mg.min/main.test.bicep
+++ b/modules/authorization/role-definition/tests/e2e/mg.min/main.test.bicep
@@ -11,7 +11,7 @@ param serviceShort string = 'ardmgmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============== //
 // Test Execution //
diff --git a/modules/authorization/role-definition/tests/e2e/rg.common/main.test.bicep b/modules/authorization/role-definition/tests/e2e/rg.common/main.test.bicep
index b4f16419dc..c23a3da82c 100644
--- a/modules/authorization/role-definition/tests/e2e/rg.common/main.test.bicep
+++ b/modules/authorization/role-definition/tests/e2e/rg.common/main.test.bicep
@@ -18,7 +18,7 @@ param serviceShort string = 'ardrgcom'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/authorization/role-definition/tests/e2e/rg.min/main.test.bicep b/modules/authorization/role-definition/tests/e2e/rg.min/main.test.bicep
index 632a73d713..efc371b9f0 100644
--- a/modules/authorization/role-definition/tests/e2e/rg.min/main.test.bicep
+++ b/modules/authorization/role-definition/tests/e2e/rg.min/main.test.bicep
@@ -18,7 +18,7 @@ param serviceShort string = 'ardrgmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/authorization/role-definition/tests/e2e/sub.common/main.test.bicep b/modules/authorization/role-definition/tests/e2e/sub.common/main.test.bicep
index 9e7bdf1096..215b9d296c 100644
--- a/modules/authorization/role-definition/tests/e2e/sub.common/main.test.bicep
+++ b/modules/authorization/role-definition/tests/e2e/sub.common/main.test.bicep
@@ -11,7 +11,7 @@ param serviceShort string = 'ardsubcom'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============== //
 // Test Execution //
diff --git a/modules/authorization/role-definition/tests/e2e/sub.min/main.test.bicep b/modules/authorization/role-definition/tests/e2e/sub.min/main.test.bicep
index e03ba0142c..5d90ead84d 100644
--- a/modules/authorization/role-definition/tests/e2e/sub.min/main.test.bicep
+++ b/modules/authorization/role-definition/tests/e2e/sub.min/main.test.bicep
@@ -11,7 +11,7 @@ param serviceShort string = 'ardsubmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============== //
 // Test Execution //
diff --git a/modules/cache/redis-enterprise/tests/e2e/defaults/main.test.bicep b/modules/cache/redis-enterprise/tests/e2e/defaults/main.test.bicep
index 667f64420a..06fd7c901f 100644
--- a/modules/cache/redis-enterprise/tests/e2e/defaults/main.test.bicep
+++ b/modules/cache/redis-enterprise/tests/e2e/defaults/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'cremin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/cache/redis-enterprise/tests/e2e/geo/main.test.bicep b/modules/cache/redis-enterprise/tests/e2e/geo/main.test.bicep
index 5d09f89094..cbaa3b9959 100644
--- a/modules/cache/redis-enterprise/tests/e2e/geo/main.test.bicep
+++ b/modules/cache/redis-enterprise/tests/e2e/geo/main.test.bicep
@@ -18,7 +18,7 @@ param serviceShort string = 'cregeo'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/cache/redis-enterprise/tests/e2e/max/main.test.bicep b/modules/cache/redis-enterprise/tests/e2e/max/main.test.bicep
index baf56e3e5e..6221bdc26d 100644
--- a/modules/cache/redis-enterprise/tests/e2e/max/main.test.bicep
+++ b/modules/cache/redis-enterprise/tests/e2e/max/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'cremax'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/cache/redis-enterprise/tests/e2e/waf-aligned/main.test.bicep b/modules/cache/redis-enterprise/tests/e2e/waf-aligned/main.test.bicep
index b9030436a7..727b16e393 100644
--- a/modules/cache/redis-enterprise/tests/e2e/waf-aligned/main.test.bicep
+++ b/modules/cache/redis-enterprise/tests/e2e/waf-aligned/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'crewaf'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/cdn/profile/tests/e2e/afd/main.test.bicep b/modules/cdn/profile/tests/e2e/afd/main.test.bicep
index e9e3864bf9..a9fa6461d5 100644
--- a/modules/cdn/profile/tests/e2e/afd/main.test.bicep
+++ b/modules/cdn/profile/tests/e2e/afd/main.test.bicep
@@ -18,7 +18,7 @@ param serviceShort string = 'cdnpafd'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/cdn/profile/tests/e2e/max/main.test.bicep b/modules/cdn/profile/tests/e2e/max/main.test.bicep
index 85bf8f601d..072ba84099 100644
--- a/modules/cdn/profile/tests/e2e/max/main.test.bicep
+++ b/modules/cdn/profile/tests/e2e/max/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'cdnpmax'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/cdn/profile/tests/e2e/waf-aligned/main.test.bicep b/modules/cdn/profile/tests/e2e/waf-aligned/main.test.bicep
index af0c232249..cf383d9a1b 100644
--- a/modules/cdn/profile/tests/e2e/waf-aligned/main.test.bicep
+++ b/modules/cdn/profile/tests/e2e/waf-aligned/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'cdnpwaf'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/compute/virtual-machine-scale-set/tests/e2e/linux.min/main.test.bicep b/modules/compute/virtual-machine-scale-set/tests/e2e/linux.min/main.test.bicep
index 7878e685a0..9d8b1fa9f6 100644
--- a/modules/compute/virtual-machine-scale-set/tests/e2e/linux.min/main.test.bicep
+++ b/modules/compute/virtual-machine-scale-set/tests/e2e/linux.min/main.test.bicep
@@ -18,7 +18,7 @@ param serviceShort string = 'cvmsslinmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/compute/virtual-machine-scale-set/tests/e2e/linux.ssecmk/main.test.bicep b/modules/compute/virtual-machine-scale-set/tests/e2e/linux.ssecmk/main.test.bicep
index e283b6b1b1..dfe6c99d20 100644
--- a/modules/compute/virtual-machine-scale-set/tests/e2e/linux.ssecmk/main.test.bicep
+++ b/modules/compute/virtual-machine-scale-set/tests/e2e/linux.ssecmk/main.test.bicep
@@ -21,7 +21,7 @@ param baseTime string = utcNow('u')
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/compute/virtual-machine-scale-set/tests/e2e/linux/main.test.bicep b/modules/compute/virtual-machine-scale-set/tests/e2e/linux/main.test.bicep
index 13f29dad53..a67d351384 100644
--- a/modules/compute/virtual-machine-scale-set/tests/e2e/linux/main.test.bicep
+++ b/modules/compute/virtual-machine-scale-set/tests/e2e/linux/main.test.bicep
@@ -18,7 +18,7 @@ param serviceShort string = 'cvmsslin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/compute/virtual-machine-scale-set/tests/e2e/windows.min/main.test.bicep b/modules/compute/virtual-machine-scale-set/tests/e2e/windows.min/main.test.bicep
index e9eca80fae..045206cc8e 100644
--- a/modules/compute/virtual-machine-scale-set/tests/e2e/windows.min/main.test.bicep
+++ b/modules/compute/virtual-machine-scale-set/tests/e2e/windows.min/main.test.bicep
@@ -22,7 +22,7 @@ param password string = newGuid()
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/compute/virtual-machine-scale-set/tests/e2e/windows/main.test.bicep b/modules/compute/virtual-machine-scale-set/tests/e2e/windows/main.test.bicep
index e1c8c527ea..45e5874ca6 100644
--- a/modules/compute/virtual-machine-scale-set/tests/e2e/windows/main.test.bicep
+++ b/modules/compute/virtual-machine-scale-set/tests/e2e/windows/main.test.bicep
@@ -22,7 +22,7 @@ param password string = newGuid()
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/container-instance/container-group/tests/e2e/defaults/main.test.bicep b/modules/container-instance/container-group/tests/e2e/defaults/main.test.bicep
index d8bb8445fd..43d8eb139c 100644
--- a/modules/container-instance/container-group/tests/e2e/defaults/main.test.bicep
+++ b/modules/container-instance/container-group/tests/e2e/defaults/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'cicgmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/container-instance/container-group/tests/e2e/encr/main.test.bicep b/modules/container-instance/container-group/tests/e2e/encr/main.test.bicep
index 661a32df6f..dc27c97050 100644
--- a/modules/container-instance/container-group/tests/e2e/encr/main.test.bicep
+++ b/modules/container-instance/container-group/tests/e2e/encr/main.test.bicep
@@ -21,7 +21,7 @@ param baseTime string = utcNow('u')
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/container-instance/container-group/tests/e2e/max/main.test.bicep b/modules/container-instance/container-group/tests/e2e/max/main.test.bicep
index cf13c2ed38..f52db0e28c 100644
--- a/modules/container-instance/container-group/tests/e2e/max/main.test.bicep
+++ b/modules/container-instance/container-group/tests/e2e/max/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'cicgmax'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/container-instance/container-group/tests/e2e/private/main.test.bicep b/modules/container-instance/container-group/tests/e2e/private/main.test.bicep
index 31b7606b89..64f91536ef 100644
--- a/modules/container-instance/container-group/tests/e2e/private/main.test.bicep
+++ b/modules/container-instance/container-group/tests/e2e/private/main.test.bicep
@@ -18,7 +18,7 @@ param serviceShort string = 'cicgprivate'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/container-instance/container-group/tests/e2e/waf-aligned/main.test.bicep b/modules/container-instance/container-group/tests/e2e/waf-aligned/main.test.bicep
index cba1ba2b00..a98119ad40 100644
--- a/modules/container-instance/container-group/tests/e2e/waf-aligned/main.test.bicep
+++ b/modules/container-instance/container-group/tests/e2e/waf-aligned/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'cicgwaf'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/dev-test-lab/lab/tests/e2e/defaults/main.test.bicep b/modules/dev-test-lab/lab/tests/e2e/defaults/main.test.bicep
index 9a583e7a24..411e373c0d 100644
--- a/modules/dev-test-lab/lab/tests/e2e/defaults/main.test.bicep
+++ b/modules/dev-test-lab/lab/tests/e2e/defaults/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'dtllmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/dev-test-lab/lab/tests/e2e/max/main.test.bicep b/modules/dev-test-lab/lab/tests/e2e/max/main.test.bicep
index 21a1faa4f9..7b8a03239e 100644
--- a/modules/dev-test-lab/lab/tests/e2e/max/main.test.bicep
+++ b/modules/dev-test-lab/lab/tests/e2e/max/main.test.bicep
@@ -24,7 +24,7 @@ param baseTime string = utcNow('u')
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/dev-test-lab/lab/tests/e2e/waf-aligned/main.test.bicep b/modules/dev-test-lab/lab/tests/e2e/waf-aligned/main.test.bicep
index fb32ba4ed3..ea39dffb3e 100644
--- a/modules/dev-test-lab/lab/tests/e2e/waf-aligned/main.test.bicep
+++ b/modules/dev-test-lab/lab/tests/e2e/waf-aligned/main.test.bicep
@@ -24,7 +24,7 @@ param baseTime string = utcNow('u')
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/digital-twins/digital-twins-instance/tests/e2e/defaults/main.test.bicep b/modules/digital-twins/digital-twins-instance/tests/e2e/defaults/main.test.bicep
index e62a489683..bd273760fd 100644
--- a/modules/digital-twins/digital-twins-instance/tests/e2e/defaults/main.test.bicep
+++ b/modules/digital-twins/digital-twins-instance/tests/e2e/defaults/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'dtdtimin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/digital-twins/digital-twins-instance/tests/e2e/max/main.test.bicep b/modules/digital-twins/digital-twins-instance/tests/e2e/max/main.test.bicep
index 1b35dd6068..a270bdec3a 100644
--- a/modules/digital-twins/digital-twins-instance/tests/e2e/max/main.test.bicep
+++ b/modules/digital-twins/digital-twins-instance/tests/e2e/max/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'dtdtimax'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/digital-twins/digital-twins-instance/tests/e2e/waf-aligned/main.test.bicep b/modules/digital-twins/digital-twins-instance/tests/e2e/waf-aligned/main.test.bicep
index 98f7a003e8..ac1195a76d 100644
--- a/modules/digital-twins/digital-twins-instance/tests/e2e/waf-aligned/main.test.bicep
+++ b/modules/digital-twins/digital-twins-instance/tests/e2e/waf-aligned/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'dtdtiwaf'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/event-hub/namespace/tests/e2e/defaults/main.test.bicep b/modules/event-hub/namespace/tests/e2e/defaults/main.test.bicep
index 424ca90ffe..fb61567610 100644
--- a/modules/event-hub/namespace/tests/e2e/defaults/main.test.bicep
+++ b/modules/event-hub/namespace/tests/e2e/defaults/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'ehnmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/event-hub/namespace/tests/e2e/encr/main.test.bicep b/modules/event-hub/namespace/tests/e2e/encr/main.test.bicep
index 56749b440d..423593c878 100644
--- a/modules/event-hub/namespace/tests/e2e/encr/main.test.bicep
+++ b/modules/event-hub/namespace/tests/e2e/encr/main.test.bicep
@@ -21,7 +21,7 @@ param baseTime string = utcNow('u')
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/event-hub/namespace/tests/e2e/max/main.test.bicep b/modules/event-hub/namespace/tests/e2e/max/main.test.bicep
index 5224046f19..0255d2eb78 100644
--- a/modules/event-hub/namespace/tests/e2e/max/main.test.bicep
+++ b/modules/event-hub/namespace/tests/e2e/max/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'ehnmax'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/event-hub/namespace/tests/e2e/pe/main.test.bicep b/modules/event-hub/namespace/tests/e2e/pe/main.test.bicep
index e55e3faf2f..56a8615b33 100644
--- a/modules/event-hub/namespace/tests/e2e/pe/main.test.bicep
+++ b/modules/event-hub/namespace/tests/e2e/pe/main.test.bicep
@@ -18,7 +18,7 @@ param serviceShort string = 'ehnpe'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/event-hub/namespace/tests/e2e/waf-aligned/main.test.bicep b/modules/event-hub/namespace/tests/e2e/waf-aligned/main.test.bicep
index c00b8c1668..338e3b0945 100644
--- a/modules/event-hub/namespace/tests/e2e/waf-aligned/main.test.bicep
+++ b/modules/event-hub/namespace/tests/e2e/waf-aligned/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'ehnwaf'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/healthcare-apis/workspace/tests/e2e/defaults/main.test.bicep b/modules/healthcare-apis/workspace/tests/e2e/defaults/main.test.bicep
index 4eb6a8dc85..8eb6913a61 100644
--- a/modules/healthcare-apis/workspace/tests/e2e/defaults/main.test.bicep
+++ b/modules/healthcare-apis/workspace/tests/e2e/defaults/main.test.bicep
@@ -20,7 +20,7 @@ param serviceShort string = 'hawmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // =========== //
 // Deployments //
diff --git a/modules/healthcare-apis/workspace/tests/e2e/max/main.test.bicep b/modules/healthcare-apis/workspace/tests/e2e/max/main.test.bicep
index 3d1bf48e56..d4c0ff8592 100644
--- a/modules/healthcare-apis/workspace/tests/e2e/max/main.test.bicep
+++ b/modules/healthcare-apis/workspace/tests/e2e/max/main.test.bicep
@@ -20,7 +20,7 @@ param serviceShort string = 'hawmax'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // =========== //
 // Deployments //
diff --git a/modules/healthcare-apis/workspace/tests/e2e/waf-aligned/main.test.bicep b/modules/healthcare-apis/workspace/tests/e2e/waf-aligned/main.test.bicep
index bc4990b2d3..4f323fd56f 100644
--- a/modules/healthcare-apis/workspace/tests/e2e/waf-aligned/main.test.bicep
+++ b/modules/healthcare-apis/workspace/tests/e2e/waf-aligned/main.test.bicep
@@ -20,7 +20,7 @@ param serviceShort string = 'hawwaf'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // =========== //
 // Deployments //
diff --git a/modules/machine-learning-services/workspace/tests/e2e/defaults/main.test.bicep b/modules/machine-learning-services/workspace/tests/e2e/defaults/main.test.bicep
index 4ad340de5c..f8ae30e874 100644
--- a/modules/machine-learning-services/workspace/tests/e2e/defaults/main.test.bicep
+++ b/modules/machine-learning-services/workspace/tests/e2e/defaults/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'mlswmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/machine-learning-services/workspace/tests/e2e/encr/main.test.bicep b/modules/machine-learning-services/workspace/tests/e2e/encr/main.test.bicep
index 43af630b14..87c42edd8c 100644
--- a/modules/machine-learning-services/workspace/tests/e2e/encr/main.test.bicep
+++ b/modules/machine-learning-services/workspace/tests/e2e/encr/main.test.bicep
@@ -21,7 +21,7 @@ param baseTime string = utcNow('u')
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/machine-learning-services/workspace/tests/e2e/max/main.test.bicep b/modules/machine-learning-services/workspace/tests/e2e/max/main.test.bicep
index f09fb15a5c..e4ed0fb75d 100644
--- a/modules/machine-learning-services/workspace/tests/e2e/max/main.test.bicep
+++ b/modules/machine-learning-services/workspace/tests/e2e/max/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'mlswmax'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/machine-learning-services/workspace/tests/e2e/waf-aligned/main.test.bicep b/modules/machine-learning-services/workspace/tests/e2e/waf-aligned/main.test.bicep
index 416696a964..cd7bf05c64 100644
--- a/modules/machine-learning-services/workspace/tests/e2e/waf-aligned/main.test.bicep
+++ b/modules/machine-learning-services/workspace/tests/e2e/waf-aligned/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'mlswwaf'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/managed-services/registration-definition/tests/e2e/max/main.test.bicep b/modules/managed-services/registration-definition/tests/e2e/max/main.test.bicep
index 703eb9a46e..ece9c55a41 100644
--- a/modules/managed-services/registration-definition/tests/e2e/max/main.test.bicep
+++ b/modules/managed-services/registration-definition/tests/e2e/max/main.test.bicep
@@ -14,7 +14,7 @@ param serviceShort string = 'msrdmax'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============== //
 // Test Execution //
diff --git a/modules/managed-services/registration-definition/tests/e2e/rg/main.test.bicep b/modules/managed-services/registration-definition/tests/e2e/rg/main.test.bicep
index f3407db0d1..8414efaa3f 100644
--- a/modules/managed-services/registration-definition/tests/e2e/rg/main.test.bicep
+++ b/modules/managed-services/registration-definition/tests/e2e/rg/main.test.bicep
@@ -18,7 +18,7 @@ param serviceShort string = 'msrdrg'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/managed-services/registration-definition/tests/e2e/waf-aligned/main.test.bicep b/modules/managed-services/registration-definition/tests/e2e/waf-aligned/main.test.bicep
index f28e22d49b..e3484171ea 100644
--- a/modules/managed-services/registration-definition/tests/e2e/waf-aligned/main.test.bicep
+++ b/modules/managed-services/registration-definition/tests/e2e/waf-aligned/main.test.bicep
@@ -14,7 +14,7 @@ param serviceShort string = 'msrdwaf'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============== //
 // Test Execution //
diff --git a/modules/network/application-gateway-web-application-firewall-policy/tests/e2e/max/main.test.bicep b/modules/network/application-gateway-web-application-firewall-policy/tests/e2e/max/main.test.bicep
index 6d6e62eff2..fdfc5a3b14 100644
--- a/modules/network/application-gateway-web-application-firewall-policy/tests/e2e/max/main.test.bicep
+++ b/modules/network/application-gateway-web-application-firewall-policy/tests/e2e/max/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'nagwafpmax'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/network/application-gateway-web-application-firewall-policy/tests/e2e/waf-aligned/main.test.bicep b/modules/network/application-gateway-web-application-firewall-policy/tests/e2e/waf-aligned/main.test.bicep
index 5ef5d817c3..6443126dc0 100644
--- a/modules/network/application-gateway-web-application-firewall-policy/tests/e2e/waf-aligned/main.test.bicep
+++ b/modules/network/application-gateway-web-application-firewall-policy/tests/e2e/waf-aligned/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'nagwafpwaf'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/network/application-gateway/tests/e2e/max/main.test.bicep b/modules/network/application-gateway/tests/e2e/max/main.test.bicep
index eed5a5bb44..60302360d8 100644
--- a/modules/network/application-gateway/tests/e2e/max/main.test.bicep
+++ b/modules/network/application-gateway/tests/e2e/max/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'nagmax'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/network/application-gateway/tests/e2e/waf-aligned/main.test.bicep b/modules/network/application-gateway/tests/e2e/waf-aligned/main.test.bicep
index be6d16d560..d050396560 100644
--- a/modules/network/application-gateway/tests/e2e/waf-aligned/main.test.bicep
+++ b/modules/network/application-gateway/tests/e2e/waf-aligned/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'nagwaf'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/network/azure-firewall/tests/e2e/addpip/main.test.bicep b/modules/network/azure-firewall/tests/e2e/addpip/main.test.bicep
index 61b216c4a3..58b48946b8 100644
--- a/modules/network/azure-firewall/tests/e2e/addpip/main.test.bicep
+++ b/modules/network/azure-firewall/tests/e2e/addpip/main.test.bicep
@@ -18,7 +18,7 @@ param serviceShort string = 'nafaddpip'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/network/azure-firewall/tests/e2e/custompip/main.test.bicep b/modules/network/azure-firewall/tests/e2e/custompip/main.test.bicep
index 37fb6178bc..c44663afea 100644
--- a/modules/network/azure-firewall/tests/e2e/custompip/main.test.bicep
+++ b/modules/network/azure-firewall/tests/e2e/custompip/main.test.bicep
@@ -18,7 +18,7 @@ param serviceShort string = 'nafcstpip'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/network/azure-firewall/tests/e2e/defaults/main.test.bicep b/modules/network/azure-firewall/tests/e2e/defaults/main.test.bicep
index 7530eeedd1..4454742028 100644
--- a/modules/network/azure-firewall/tests/e2e/defaults/main.test.bicep
+++ b/modules/network/azure-firewall/tests/e2e/defaults/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'nafmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/network/azure-firewall/tests/e2e/hubcommon/main.test.bicep b/modules/network/azure-firewall/tests/e2e/hubcommon/main.test.bicep
index 5870bd2081..892e439d9a 100644
--- a/modules/network/azure-firewall/tests/e2e/hubcommon/main.test.bicep
+++ b/modules/network/azure-firewall/tests/e2e/hubcommon/main.test.bicep
@@ -18,7 +18,7 @@ param serviceShort string = 'nafhubcom'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/network/azure-firewall/tests/e2e/hubmin/main.test.bicep b/modules/network/azure-firewall/tests/e2e/hubmin/main.test.bicep
index dd3dd67364..8766b78120 100644
--- a/modules/network/azure-firewall/tests/e2e/hubmin/main.test.bicep
+++ b/modules/network/azure-firewall/tests/e2e/hubmin/main.test.bicep
@@ -18,7 +18,7 @@ param serviceShort string = 'nafhubmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/network/azure-firewall/tests/e2e/max/main.test.bicep b/modules/network/azure-firewall/tests/e2e/max/main.test.bicep
index 6952eb7b58..6bf6524ada 100644
--- a/modules/network/azure-firewall/tests/e2e/max/main.test.bicep
+++ b/modules/network/azure-firewall/tests/e2e/max/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'nafmax'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/network/azure-firewall/tests/e2e/waf-aligned/main.test.bicep b/modules/network/azure-firewall/tests/e2e/waf-aligned/main.test.bicep
index 12b95314ae..3405de83a3 100644
--- a/modules/network/azure-firewall/tests/e2e/waf-aligned/main.test.bicep
+++ b/modules/network/azure-firewall/tests/e2e/waf-aligned/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'nafwaf'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/network/network-manager/tests/e2e/max/main.test.bicep b/modules/network/network-manager/tests/e2e/max/main.test.bicep
index d0e1fd2393..ee02d709e7 100644
--- a/modules/network/network-manager/tests/e2e/max/main.test.bicep
+++ b/modules/network/network-manager/tests/e2e/max/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'nnmmax'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/network/network-manager/tests/e2e/waf-aligned/main.test.bicep b/modules/network/network-manager/tests/e2e/waf-aligned/main.test.bicep
index 630be8e2bc..4bc0d7507c 100644
--- a/modules/network/network-manager/tests/e2e/waf-aligned/main.test.bicep
+++ b/modules/network/network-manager/tests/e2e/waf-aligned/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'nnmwaf'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/network/network-watcher/tests/e2e/max/main.test.bicep b/modules/network/network-watcher/tests/e2e/max/main.test.bicep
index c453c48b8d..6653394615 100644
--- a/modules/network/network-watcher/tests/e2e/max/main.test.bicep
+++ b/modules/network/network-watcher/tests/e2e/max/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'nnwmax'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/network/network-watcher/tests/e2e/waf-aligned/main.test.bicep b/modules/network/network-watcher/tests/e2e/waf-aligned/main.test.bicep
index 0753347fd0..f455db6206 100644
--- a/modules/network/network-watcher/tests/e2e/waf-aligned/main.test.bicep
+++ b/modules/network/network-watcher/tests/e2e/waf-aligned/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'nnwwaf'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/network/service-endpoint-policy/tests/e2e/defaults/main.test.bicep b/modules/network/service-endpoint-policy/tests/e2e/defaults/main.test.bicep
index 56ed8c03d5..7921ffcdb3 100644
--- a/modules/network/service-endpoint-policy/tests/e2e/defaults/main.test.bicep
+++ b/modules/network/service-endpoint-policy/tests/e2e/defaults/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'nsnpmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/network/service-endpoint-policy/tests/e2e/max/main.test.bicep b/modules/network/service-endpoint-policy/tests/e2e/max/main.test.bicep
index 271bf7e24a..4d7b87f5c0 100644
--- a/modules/network/service-endpoint-policy/tests/e2e/max/main.test.bicep
+++ b/modules/network/service-endpoint-policy/tests/e2e/max/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'nsnpmax'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/network/service-endpoint-policy/tests/e2e/waf-aligned/main.test.bicep b/modules/network/service-endpoint-policy/tests/e2e/waf-aligned/main.test.bicep
index ba10f48947..5b1d05b994 100644
--- a/modules/network/service-endpoint-policy/tests/e2e/waf-aligned/main.test.bicep
+++ b/modules/network/service-endpoint-policy/tests/e2e/waf-aligned/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'nsnpwaf'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/network/virtual-hub/tests/e2e/defaults/main.test.bicep b/modules/network/virtual-hub/tests/e2e/defaults/main.test.bicep
index 584c74324e..c6cc04eee2 100644
--- a/modules/network/virtual-hub/tests/e2e/defaults/main.test.bicep
+++ b/modules/network/virtual-hub/tests/e2e/defaults/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'nvhmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/network/virtual-hub/tests/e2e/max/main.test.bicep b/modules/network/virtual-hub/tests/e2e/max/main.test.bicep
index b8ffb6fc70..e52b5c0b8f 100644
--- a/modules/network/virtual-hub/tests/e2e/max/main.test.bicep
+++ b/modules/network/virtual-hub/tests/e2e/max/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'nvhmax'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/network/virtual-hub/tests/e2e/waf-aligned/main.test.bicep b/modules/network/virtual-hub/tests/e2e/waf-aligned/main.test.bicep
index befed0daa5..25cbf78be1 100644
--- a/modules/network/virtual-hub/tests/e2e/waf-aligned/main.test.bicep
+++ b/modules/network/virtual-hub/tests/e2e/waf-aligned/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'nvhwaf'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/network/virtual-wan/tests/e2e/defaults/main.test.bicep b/modules/network/virtual-wan/tests/e2e/defaults/main.test.bicep
index 85f5f16915..4f3d7da7f0 100644
--- a/modules/network/virtual-wan/tests/e2e/defaults/main.test.bicep
+++ b/modules/network/virtual-wan/tests/e2e/defaults/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'nvwmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/network/virtual-wan/tests/e2e/max/main.test.bicep b/modules/network/virtual-wan/tests/e2e/max/main.test.bicep
index 9079c1e718..4459b86ad0 100644
--- a/modules/network/virtual-wan/tests/e2e/max/main.test.bicep
+++ b/modules/network/virtual-wan/tests/e2e/max/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'nvwmax'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/network/virtual-wan/tests/e2e/waf-aligned/main.test.bicep b/modules/network/virtual-wan/tests/e2e/waf-aligned/main.test.bicep
index 7bccc274c5..cedd85426f 100644
--- a/modules/network/virtual-wan/tests/e2e/waf-aligned/main.test.bicep
+++ b/modules/network/virtual-wan/tests/e2e/waf-aligned/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'nvwwaf'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/policy-insights/remediation/tests/e2e/mg.common/main.test.bicep b/modules/policy-insights/remediation/tests/e2e/mg.common/main.test.bicep
index b34f003368..f0dda5c7a9 100644
--- a/modules/policy-insights/remediation/tests/e2e/mg.common/main.test.bicep
+++ b/modules/policy-insights/remediation/tests/e2e/mg.common/main.test.bicep
@@ -14,7 +14,7 @@ param serviceShort string = 'pirmgcom'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/policy-insights/remediation/tests/e2e/mg.min/main.test.bicep b/modules/policy-insights/remediation/tests/e2e/mg.min/main.test.bicep
index 89336edd4a..7bd05ef9f9 100644
--- a/modules/policy-insights/remediation/tests/e2e/mg.min/main.test.bicep
+++ b/modules/policy-insights/remediation/tests/e2e/mg.min/main.test.bicep
@@ -14,7 +14,7 @@ param serviceShort string = 'pirmgmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/policy-insights/remediation/tests/e2e/rg.common/main.test.bicep b/modules/policy-insights/remediation/tests/e2e/rg.common/main.test.bicep
index ad8934beac..d61be71788 100644
--- a/modules/policy-insights/remediation/tests/e2e/rg.common/main.test.bicep
+++ b/modules/policy-insights/remediation/tests/e2e/rg.common/main.test.bicep
@@ -18,7 +18,7 @@ param serviceShort string = 'pirrgcom'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/policy-insights/remediation/tests/e2e/rg.min/main.test.bicep b/modules/policy-insights/remediation/tests/e2e/rg.min/main.test.bicep
index f176a984d7..424f8de193 100644
--- a/modules/policy-insights/remediation/tests/e2e/rg.min/main.test.bicep
+++ b/modules/policy-insights/remediation/tests/e2e/rg.min/main.test.bicep
@@ -18,7 +18,7 @@ param serviceShort string = 'pirrgmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/policy-insights/remediation/tests/e2e/sub.common/main.test.bicep b/modules/policy-insights/remediation/tests/e2e/sub.common/main.test.bicep
index 5ee1cd36da..9bbc279afd 100644
--- a/modules/policy-insights/remediation/tests/e2e/sub.common/main.test.bicep
+++ b/modules/policy-insights/remediation/tests/e2e/sub.common/main.test.bicep
@@ -14,7 +14,7 @@ param serviceShort string = 'pirsubcom'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/policy-insights/remediation/tests/e2e/sub.min/main.test.bicep b/modules/policy-insights/remediation/tests/e2e/sub.min/main.test.bicep
index 7cd844eda5..c5b04a1c9e 100644
--- a/modules/policy-insights/remediation/tests/e2e/sub.min/main.test.bicep
+++ b/modules/policy-insights/remediation/tests/e2e/sub.min/main.test.bicep
@@ -14,7 +14,7 @@ param serviceShort string = 'pirsubmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/purview/account/tests/e2e/defaults/main.test.bicep b/modules/purview/account/tests/e2e/defaults/main.test.bicep
index 78ad70351f..a4da110432 100644
--- a/modules/purview/account/tests/e2e/defaults/main.test.bicep
+++ b/modules/purview/account/tests/e2e/defaults/main.test.bicep
@@ -20,7 +20,7 @@ param serviceShort string = 'pvamin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // =========== //
 // Deployments //
diff --git a/modules/purview/account/tests/e2e/max/main.test.bicep b/modules/purview/account/tests/e2e/max/main.test.bicep
index 5f09f48e2e..e95ba15870 100644
--- a/modules/purview/account/tests/e2e/max/main.test.bicep
+++ b/modules/purview/account/tests/e2e/max/main.test.bicep
@@ -20,7 +20,7 @@ param serviceShort string = 'pvamax'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 // =========== //
 // Deployments //
 // =========== //
diff --git a/modules/purview/account/tests/e2e/waf-aligned/main.test.bicep b/modules/purview/account/tests/e2e/waf-aligned/main.test.bicep
index 50ff6aa700..0928d0883e 100644
--- a/modules/purview/account/tests/e2e/waf-aligned/main.test.bicep
+++ b/modules/purview/account/tests/e2e/waf-aligned/main.test.bicep
@@ -20,7 +20,7 @@ param serviceShort string = 'pvawaf'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 // =========== //
 // Deployments //
 // =========== //
diff --git a/modules/recovery-services/vault/tests/e2e/defaults/main.test.bicep b/modules/recovery-services/vault/tests/e2e/defaults/main.test.bicep
index 8b9f40bfcb..3c862a3afb 100644
--- a/modules/recovery-services/vault/tests/e2e/defaults/main.test.bicep
+++ b/modules/recovery-services/vault/tests/e2e/defaults/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'rsvmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/recovery-services/vault/tests/e2e/dr/main.test.bicep b/modules/recovery-services/vault/tests/e2e/dr/main.test.bicep
index c76d0f632e..7ed9590791 100644
--- a/modules/recovery-services/vault/tests/e2e/dr/main.test.bicep
+++ b/modules/recovery-services/vault/tests/e2e/dr/main.test.bicep
@@ -18,7 +18,7 @@ param serviceShort string = 'rsvdr'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/recovery-services/vault/tests/e2e/max/main.test.bicep b/modules/recovery-services/vault/tests/e2e/max/main.test.bicep
index 0e78cb6064..782e1c9c53 100644
--- a/modules/recovery-services/vault/tests/e2e/max/main.test.bicep
+++ b/modules/recovery-services/vault/tests/e2e/max/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'rsvmax'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/recovery-services/vault/tests/e2e/waf-aligned/main.test.bicep b/modules/recovery-services/vault/tests/e2e/waf-aligned/main.test.bicep
index 005293b717..d3922a7e83 100644
--- a/modules/recovery-services/vault/tests/e2e/waf-aligned/main.test.bicep
+++ b/modules/recovery-services/vault/tests/e2e/waf-aligned/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'rsvwaf'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/relay/namespace/tests/e2e/defaults/main.test.bicep b/modules/relay/namespace/tests/e2e/defaults/main.test.bicep
index c35d68e568..b2215089af 100644
--- a/modules/relay/namespace/tests/e2e/defaults/main.test.bicep
+++ b/modules/relay/namespace/tests/e2e/defaults/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'rnmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/relay/namespace/tests/e2e/max/main.test.bicep b/modules/relay/namespace/tests/e2e/max/main.test.bicep
index ef21d1c6bc..0791f8e55c 100644
--- a/modules/relay/namespace/tests/e2e/max/main.test.bicep
+++ b/modules/relay/namespace/tests/e2e/max/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'rnmax'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/relay/namespace/tests/e2e/pe/main.test.bicep b/modules/relay/namespace/tests/e2e/pe/main.test.bicep
index cc38c87c6f..e4f04296b5 100644
--- a/modules/relay/namespace/tests/e2e/pe/main.test.bicep
+++ b/modules/relay/namespace/tests/e2e/pe/main.test.bicep
@@ -18,7 +18,7 @@ param serviceShort string = 'rnpe'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/relay/namespace/tests/e2e/waf-aligned/main.test.bicep b/modules/relay/namespace/tests/e2e/waf-aligned/main.test.bicep
index f4d56ac66e..69cf96f495 100644
--- a/modules/relay/namespace/tests/e2e/waf-aligned/main.test.bicep
+++ b/modules/relay/namespace/tests/e2e/waf-aligned/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'rnwaf'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/resources/tags/tests/e2e/rg/main.test.bicep b/modules/resources/tags/tests/e2e/rg/main.test.bicep
index 0f08a5a281..76f0bff161 100644
--- a/modules/resources/tags/tests/e2e/rg/main.test.bicep
+++ b/modules/resources/tags/tests/e2e/rg/main.test.bicep
@@ -18,7 +18,7 @@ param serviceShort string = 'rtrg'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/security/azure-security-center/tests/e2e/max/main.test.bicep b/modules/security/azure-security-center/tests/e2e/max/main.test.bicep
index e76028a93a..2f04f18a18 100644
--- a/modules/security/azure-security-center/tests/e2e/max/main.test.bicep
+++ b/modules/security/azure-security-center/tests/e2e/max/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'sascmax'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/security/azure-security-center/tests/e2e/waf-aligned/main.test.bicep b/modules/security/azure-security-center/tests/e2e/waf-aligned/main.test.bicep
index 1e6b326548..2d237c16f2 100644
--- a/modules/security/azure-security-center/tests/e2e/waf-aligned/main.test.bicep
+++ b/modules/security/azure-security-center/tests/e2e/waf-aligned/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'sascwaf'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/service-fabric/cluster/tests/e2e/cert/main.test.bicep b/modules/service-fabric/cluster/tests/e2e/cert/main.test.bicep
index abdbb40a0c..fb7b5a17d9 100644
--- a/modules/service-fabric/cluster/tests/e2e/cert/main.test.bicep
+++ b/modules/service-fabric/cluster/tests/e2e/cert/main.test.bicep
@@ -18,7 +18,7 @@ param serviceShort string = 'sfccer'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/service-fabric/cluster/tests/e2e/defaults/main.test.bicep b/modules/service-fabric/cluster/tests/e2e/defaults/main.test.bicep
index 8a543b9681..c333cdee84 100644
--- a/modules/service-fabric/cluster/tests/e2e/defaults/main.test.bicep
+++ b/modules/service-fabric/cluster/tests/e2e/defaults/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'sfcmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/service-fabric/cluster/tests/e2e/max/main.test.bicep b/modules/service-fabric/cluster/tests/e2e/max/main.test.bicep
index cb3ffc3d41..9c0af719c3 100644
--- a/modules/service-fabric/cluster/tests/e2e/max/main.test.bicep
+++ b/modules/service-fabric/cluster/tests/e2e/max/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'sfcmax'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/service-fabric/cluster/tests/e2e/waf-aligned/main.test.bicep b/modules/service-fabric/cluster/tests/e2e/waf-aligned/main.test.bicep
index 4cc334c475..c8d138b05d 100644
--- a/modules/service-fabric/cluster/tests/e2e/waf-aligned/main.test.bicep
+++ b/modules/service-fabric/cluster/tests/e2e/waf-aligned/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'sfcwaf'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/signal-r-service/signal-r/tests/e2e/defaults/main.test.bicep b/modules/signal-r-service/signal-r/tests/e2e/defaults/main.test.bicep
index 91c816bddf..7d5ed7e499 100644
--- a/modules/signal-r-service/signal-r/tests/e2e/defaults/main.test.bicep
+++ b/modules/signal-r-service/signal-r/tests/e2e/defaults/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'srsdrmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // =========== //
 // Deployments //
diff --git a/modules/signal-r-service/signal-r/tests/e2e/max/main.test.bicep b/modules/signal-r-service/signal-r/tests/e2e/max/main.test.bicep
index 701bca066f..85ed3a091a 100644
--- a/modules/signal-r-service/signal-r/tests/e2e/max/main.test.bicep
+++ b/modules/signal-r-service/signal-r/tests/e2e/max/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'srssrmax'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // =========== //
 // Deployments //
diff --git a/modules/signal-r-service/signal-r/tests/e2e/waf-aligned/main.test.bicep b/modules/signal-r-service/signal-r/tests/e2e/waf-aligned/main.test.bicep
index c07a791bbf..0bd867d92f 100644
--- a/modules/signal-r-service/signal-r/tests/e2e/waf-aligned/main.test.bicep
+++ b/modules/signal-r-service/signal-r/tests/e2e/waf-aligned/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'srssrwaf'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // =========== //
 // Deployments //
diff --git a/modules/signal-r-service/web-pub-sub/tests/e2e/defaults/main.test.bicep b/modules/signal-r-service/web-pub-sub/tests/e2e/defaults/main.test.bicep
index 4e72d5a97b..148f390f04 100644
--- a/modules/signal-r-service/web-pub-sub/tests/e2e/defaults/main.test.bicep
+++ b/modules/signal-r-service/web-pub-sub/tests/e2e/defaults/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'srswpsmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/signal-r-service/web-pub-sub/tests/e2e/max/main.test.bicep b/modules/signal-r-service/web-pub-sub/tests/e2e/max/main.test.bicep
index 7c9c967f3a..28de34b5a2 100644
--- a/modules/signal-r-service/web-pub-sub/tests/e2e/max/main.test.bicep
+++ b/modules/signal-r-service/web-pub-sub/tests/e2e/max/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'srswpsmax'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/signal-r-service/web-pub-sub/tests/e2e/pe/main.test.bicep b/modules/signal-r-service/web-pub-sub/tests/e2e/pe/main.test.bicep
index 0483d13826..ceeeee3a02 100644
--- a/modules/signal-r-service/web-pub-sub/tests/e2e/pe/main.test.bicep
+++ b/modules/signal-r-service/web-pub-sub/tests/e2e/pe/main.test.bicep
@@ -18,7 +18,7 @@ param serviceShort string = 'srswpspe'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/signal-r-service/web-pub-sub/tests/e2e/waf-aligned/main.test.bicep b/modules/signal-r-service/web-pub-sub/tests/e2e/waf-aligned/main.test.bicep
index 03b8af5643..cc08ae316e 100644
--- a/modules/signal-r-service/web-pub-sub/tests/e2e/waf-aligned/main.test.bicep
+++ b/modules/signal-r-service/web-pub-sub/tests/e2e/waf-aligned/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'srswpswaf'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/sql/managed-instance/tests/e2e/defaults/main.test.bicep b/modules/sql/managed-instance/tests/e2e/defaults/main.test.bicep
index 80ccb391bc..8fa789345e 100644
--- a/modules/sql/managed-instance/tests/e2e/defaults/main.test.bicep
+++ b/modules/sql/managed-instance/tests/e2e/defaults/main.test.bicep
@@ -25,7 +25,7 @@ param password string = newGuid()
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/sql/managed-instance/tests/e2e/max/main.test.bicep b/modules/sql/managed-instance/tests/e2e/max/main.test.bicep
index 62ecd613a7..3848c59ee6 100644
--- a/modules/sql/managed-instance/tests/e2e/max/main.test.bicep
+++ b/modules/sql/managed-instance/tests/e2e/max/main.test.bicep
@@ -28,7 +28,7 @@ param password string = newGuid()
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/sql/managed-instance/tests/e2e/vulnAssm/main.test.bicep b/modules/sql/managed-instance/tests/e2e/vulnAssm/main.test.bicep
index b93e5f73ec..80de435d4c 100644
--- a/modules/sql/managed-instance/tests/e2e/vulnAssm/main.test.bicep
+++ b/modules/sql/managed-instance/tests/e2e/vulnAssm/main.test.bicep
@@ -22,7 +22,7 @@ param password string = newGuid()
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/sql/managed-instance/tests/e2e/waf-aligned/main.test.bicep b/modules/sql/managed-instance/tests/e2e/waf-aligned/main.test.bicep
index 9f69895001..7d64f39291 100644
--- a/modules/sql/managed-instance/tests/e2e/waf-aligned/main.test.bicep
+++ b/modules/sql/managed-instance/tests/e2e/waf-aligned/main.test.bicep
@@ -28,7 +28,7 @@ param password string = newGuid()
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/synapse/private-link-hub/tests/e2e/defaults/main.test.bicep b/modules/synapse/private-link-hub/tests/e2e/defaults/main.test.bicep
index d25afb53a7..5db94fea88 100644
--- a/modules/synapse/private-link-hub/tests/e2e/defaults/main.test.bicep
+++ b/modules/synapse/private-link-hub/tests/e2e/defaults/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'splhmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/synapse/private-link-hub/tests/e2e/max/main.test.bicep b/modules/synapse/private-link-hub/tests/e2e/max/main.test.bicep
index a4718d62b4..4c28ee64f0 100644
--- a/modules/synapse/private-link-hub/tests/e2e/max/main.test.bicep
+++ b/modules/synapse/private-link-hub/tests/e2e/max/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'splhmax'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/synapse/private-link-hub/tests/e2e/waf-aligned/main.test.bicep b/modules/synapse/private-link-hub/tests/e2e/waf-aligned/main.test.bicep
index cda0f2510d..1f428f445a 100644
--- a/modules/synapse/private-link-hub/tests/e2e/waf-aligned/main.test.bicep
+++ b/modules/synapse/private-link-hub/tests/e2e/waf-aligned/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'splhwaf'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/synapse/workspace/tests/e2e/defaults/main.test.bicep b/modules/synapse/workspace/tests/e2e/defaults/main.test.bicep
index f6084c8e78..00fc68b3c3 100644
--- a/modules/synapse/workspace/tests/e2e/defaults/main.test.bicep
+++ b/modules/synapse/workspace/tests/e2e/defaults/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'swmin'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/synapse/workspace/tests/e2e/encrwsai/main.test.bicep b/modules/synapse/workspace/tests/e2e/encrwsai/main.test.bicep
index bc21173e2f..6469e67446 100644
--- a/modules/synapse/workspace/tests/e2e/encrwsai/main.test.bicep
+++ b/modules/synapse/workspace/tests/e2e/encrwsai/main.test.bicep
@@ -21,7 +21,7 @@ param baseTime string = utcNow('u')
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/synapse/workspace/tests/e2e/encrwuai/main.test.bicep b/modules/synapse/workspace/tests/e2e/encrwuai/main.test.bicep
index bad49f51aa..799792dd59 100644
--- a/modules/synapse/workspace/tests/e2e/encrwuai/main.test.bicep
+++ b/modules/synapse/workspace/tests/e2e/encrwuai/main.test.bicep
@@ -21,7 +21,7 @@ param baseTime string = utcNow('u')
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/synapse/workspace/tests/e2e/managedvnet/main.test.bicep b/modules/synapse/workspace/tests/e2e/managedvnet/main.test.bicep
index 7d4f2b072c..1cf1a68e4f 100644
--- a/modules/synapse/workspace/tests/e2e/managedvnet/main.test.bicep
+++ b/modules/synapse/workspace/tests/e2e/managedvnet/main.test.bicep
@@ -18,7 +18,7 @@ param serviceShort string = 'swmanv'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/synapse/workspace/tests/e2e/max/main.test.bicep b/modules/synapse/workspace/tests/e2e/max/main.test.bicep
index b94327be00..fc37ae74f8 100644
--- a/modules/synapse/workspace/tests/e2e/max/main.test.bicep
+++ b/modules/synapse/workspace/tests/e2e/max/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'swmax'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/synapse/workspace/tests/e2e/waf-aligned/main.test.bicep b/modules/synapse/workspace/tests/e2e/waf-aligned/main.test.bicep
index ddc6aaef1c..3b1e1e7749 100644
--- a/modules/synapse/workspace/tests/e2e/waf-aligned/main.test.bicep
+++ b/modules/synapse/workspace/tests/e2e/waf-aligned/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'swwaf'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/web/connection/tests/e2e/max/main.test.bicep b/modules/web/connection/tests/e2e/max/main.test.bicep
index 6a482325ae..438cad8e3b 100644
--- a/modules/web/connection/tests/e2e/max/main.test.bicep
+++ b/modules/web/connection/tests/e2e/max/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'wcmax'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/web/connection/tests/e2e/waf-aligned/main.test.bicep b/modules/web/connection/tests/e2e/waf-aligned/main.test.bicep
index 9718e758f7..7f964ea119 100644
--- a/modules/web/connection/tests/e2e/waf-aligned/main.test.bicep
+++ b/modules/web/connection/tests/e2e/waf-aligned/main.test.bicep
@@ -21,7 +21,7 @@ param serviceShort string = 'wcwaf'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/web/hosting-environment/tests/e2e/asev2/main.test.bicep b/modules/web/hosting-environment/tests/e2e/asev2/main.test.bicep
index 36c5157724..93606780af 100644
--- a/modules/web/hosting-environment/tests/e2e/asev2/main.test.bicep
+++ b/modules/web/hosting-environment/tests/e2e/asev2/main.test.bicep
@@ -18,7 +18,7 @@ param serviceShort string = 'whasev2'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //
diff --git a/modules/web/hosting-environment/tests/e2e/asev3/main.test.bicep b/modules/web/hosting-environment/tests/e2e/asev3/main.test.bicep
index 93269c7e3b..330f50eb01 100644
--- a/modules/web/hosting-environment/tests/e2e/asev3/main.test.bicep
+++ b/modules/web/hosting-environment/tests/e2e/asev3/main.test.bicep
@@ -18,7 +18,7 @@ param serviceShort string = 'whasev3'
 param enableDefaultTelemetry bool = true
 
 @description('Optional. A token to inject into the name of each resource.')
-param namePrefix string = '[[namePrefix]]'
+param namePrefix string = '#_namePrefix_#'
 
 // ============ //
 // Dependencies //

From 9a4547ae98dbc66d660278c7e936d22d971e48f8 Mon Sep 17 00:00:00 2001
From: Kris Baranek <k.baranek@microsoft.com>
Date: Sun, 18 Feb 2024 22:25:48 +0100
Subject: [PATCH 6/7] Update token prefix and suffix in settings.yml and
 replace token in Test-NamePrefixAvailability.ps1

---
 docs/wiki/The CI environment - Token replacement.md | 4 ++--
 settings.yml                                        | 4 ++--
 utilities/tools/Test-NamePrefixAvailability.ps1     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/wiki/The CI environment - Token replacement.md b/docs/wiki/The CI environment - Token replacement.md
index fe3f229631..1158d6c62a 100644
--- a/docs/wiki/The CI environment - Token replacement.md	
+++ b/docs/wiki/The CI environment - Token replacement.md	
@@ -52,14 +52,14 @@ Let's say you'd want to use this token inside a Key Vault module test file, to d
 ```json
 "parameters": {
     "name": {
-        "value": "[[tokenA]]-keyVault-[[tokenB]]"
+        "value": "#_tokenA_#-keyVault-#_tokenB_#"
     }
 }
 ```
 
 Once the Key Vault is deployed, you'll notice that the Key Vault name in Azure will be `foo-keyVault-bar`
 
-The token prefix `'[['` and suffix `']]'` in the above example are also configurable in the [settings.yml](https://github.com/Azure/ResourceModules/blob/main/settings.yml) file and are used to identify the tokens in the files.
+The token prefix `'#_'` and suffix `'_#'` in the above example are also configurable in the [settings.yml](https://github.com/Azure/ResourceModules/blob/main/settings.yml) file and are used to identify the tokens in the files.
 
 The solution comes with one predefined local token `namePrefix`. This token is leveraged in most of the parameter & test files for deployments. It allows using a consistent naming prefix that is applied to all resources being tested. There are two ways this token can be set and one will take precedence over the other:
 
diff --git a/settings.yml b/settings.yml
index c96dbe1dc2..66f937a19b 100644
--- a/settings.yml
+++ b/settings.yml
@@ -16,8 +16,8 @@ variables:
   localToken_namePrefix: '' # A 3-5 character length unique string, included in the resources names (e.g. 'cntso'). Used for local module testing and pipelines.
 
   # this determines the starting prefix and ending suffix of the token in your file.
-  tokenPrefix: '[['
-  tokenSuffix: ']]'
+  tokenPrefix: '#_'
+  tokenSuffix: '_#'
 
   ########################
   ##   Agent settings   ##
diff --git a/utilities/tools/Test-NamePrefixAvailability.ps1 b/utilities/tools/Test-NamePrefixAvailability.ps1
index 0e6b30c4fc..6f88e92962 100644
--- a/utilities/tools/Test-NamePrefixAvailability.ps1
+++ b/utilities/tools/Test-NamePrefixAvailability.ps1
@@ -107,7 +107,7 @@ function Test-NamePrefixAvailability {
 
                     # trim the entry and replace placeholder values
                     $temp = $temp.Replace("'", '') # remove trailing quotes
-                    $temp = $temp.Replace('[[namePrefix]]', $namePrefix)
+                    $temp = $temp.Replace('#_namePrefix_#', $namePrefix)
                     $temp = $temp.Replace('${serviceShort}', $serviceShort)
                     $temp = $temp.Replace(' ', '') # remove trailing whitespaces
 

From f26cf22a1e26706abb2fee8d6551cb30df006c86 Mon Sep 17 00:00:00 2001
From: Kris Baranek <k.baranek@microsoft.com>
Date: Sun, 18 Feb 2024 22:30:20 +0100
Subject: [PATCH 7/7] Removed dummy changes

---
 modules/network/ip-group/main.bicep          | 2 +-
 modules/network/public-ip-address/main.bicep | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/network/ip-group/main.bicep b/modules/network/ip-group/main.bicep
index 91f139c485..08a30eee33 100644
--- a/modules/network/ip-group/main.bicep
+++ b/modules/network/ip-group/main.bicep
@@ -9,7 +9,7 @@ param name string
 @description('Optional. Location for all resources.')
 param location string = resourceGroup().location
 
-@description('Optional. IpAddresses/IpAddressPrefixes in the IpGroups resource...')
+@description('Optional. IpAddresses/IpAddressPrefixes in the IpGroups resource.')
 param ipAddresses array = []
 
 @description('Optional. The lock settings of the service.')
diff --git a/modules/network/public-ip-address/main.bicep b/modules/network/public-ip-address/main.bicep
index b9f376fcbc..46fd1decb2 100644
--- a/modules/network/public-ip-address/main.bicep
+++ b/modules/network/public-ip-address/main.bicep
@@ -8,7 +8,7 @@ param name string
 @description('Optional. Resource ID of the Public IP Prefix object. This is only needed if you want your Public IPs created in a PIP Prefix.')
 param publicIPPrefixResourceId string = ''
 
-@description('Optional. The public IP address allocation method...')
+@description('Optional. The public IP address allocation method.')
 @allowed([
   'Dynamic'
   'Static'