diff --git a/101-azure-relay-create-namespace/azuredeploy.parameters.json b/101-azure-relay-create-namespace/azuredeploy.parameters.json
index 931e4b6ff98a..109d3d5a6653 100644
--- a/101-azure-relay-create-namespace/azuredeploy.parameters.json
+++ b/101-azure-relay-create-namespace/azuredeploy.parameters.json
@@ -3,7 +3,7 @@
     "contentVersion": "1.0.0.0",
     "parameters": {
         "name": {
-            "value": "GEN-UNIQUE-RL-NM-001"
+            "value": "GEN-UNIQUE"
         }
     }
 }
\ No newline at end of file
diff --git a/201-azure-relay-create-all-resources/azuredeploy.parameters.json b/201-azure-relay-create-all-resources/azuredeploy.parameters.json
index a52a322dc6dc..f02713168a57 100644
--- a/201-azure-relay-create-all-resources/azuredeploy.parameters.json
+++ b/201-azure-relay-create-all-resources/azuredeploy.parameters.json
@@ -3,16 +3,16 @@
     "contentVersion": "1.0.0.0",
     "parameters": {
         "namespaceName": {
-            "value": "GEN-UNIQUE-RL-NM-001"
+            "value": "GEN-UNIQUE"
         },
         "wcfRelayName": {
-            "value": "GEN-UNIQUE-RELAY-TCP-001"
+            "value": "GEN-UNIQUE"
         },
         "wcfRelayType": {
             "value": "NetTcp"
         },
         "hybridConnectionName": {
-            "value": "GEN-UNIQUE-HYBRID-001"
+            "value": "GEN-UNIQUE"
         }
     }
 }
\ No newline at end of file
diff --git a/201-azure-relay-create-hybridconnection/azuredeploy.parameters.json b/201-azure-relay-create-hybridconnection/azuredeploy.parameters.json
index 1df50f1e6620..bf69df8baa2f 100644
--- a/201-azure-relay-create-hybridconnection/azuredeploy.parameters.json
+++ b/201-azure-relay-create-hybridconnection/azuredeploy.parameters.json
@@ -3,10 +3,10 @@
     "contentVersion": "1.0.0.0",
     "parameters": {
         "namespaceName": {
-            "value": "GEN-UNIQUE-RL-NM-001"
+            "value": "GEN-UNIQUE"
         },
         "hybridConnectionName": {
-            "value": "GEN-UNIQUE-HC-001"
+            "value": "GEN-UNIQUE"
         }
     }
 }
\ No newline at end of file
diff --git a/201-azure-relay-create-wcfrelay/azuredeploy.parameters.json b/201-azure-relay-create-wcfrelay/azuredeploy.parameters.json
index 6fdbe06acba3..1b4d3122082c 100644
--- a/201-azure-relay-create-wcfrelay/azuredeploy.parameters.json
+++ b/201-azure-relay-create-wcfrelay/azuredeploy.parameters.json
@@ -3,10 +3,10 @@
     "contentVersion": "1.0.0.0",
     "parameters": {
         "namespaceName": {
-            "value": "GEN-UNIQUE-RL-NM-001"
+            "value": "GEN-UNIQUE"
         },
         "wcfRelayName": {
-            "value": "GEN-UNIQUE-RELAY-HTTP-001"
+            "value": "GEN-UNIQUE"
         },
         "wcfRelayType": {
             "value": "Http"