diff --git a/inst/etc/parameter_linux_key.json b/inst/etc/parameter_linux_key.json
index 81edc07..893ad35 100644
--- a/inst/etc/parameter_linux_key.json
+++ b/inst/etc/parameter_linux_key.json
@@ -8,28 +8,28 @@
    "adminUsername": {
         "value": "<USER>"
     },
-   "virtualMachines_newdsvm_adminPassword": {
+   "virtualMachines_adminPassword": {
         "value": "<PWD>"
     },
-    "virtualMachines_newdsvm_adminPublicKey": {
+    "virtualMachines_adminPublicKey": {
 	"value": "<PUBKEY>"
     },
-    "virtualMachines_newdsvm_name": {
+    "virtualMachines_name": {
 	"value": "<DEFAULT>"
     },
-    "networkInterfaces_newdsvm161_name": {
+    "networkInterfaces_name": {
         "value": "<DEFAULT>nic"
     },
-    "networkSecurityGroups_newdsvm_nsg_name": {
+    "networkSecurityGroups_nsg_name": {
         "value": "<DEFAULT>sg"
     },
-    "publicIPAddresses_newdsvm_ip_name": {
+    "publicIPAddresses_ip_name": {
         "value": "<DEFAULT>ip"
     },
-    "virtualNetworks_dsvm_vnet_name": {
+    "virtualNetworks_name": {
         "value": "<DEFAULT>vnet"
     },
-    "storageAccounts_dsvmdisks490_name": {
+    "storageAccounts_name": {
         "value": "<DEFAULT>sa"
     }
 }
diff --git a/inst/etc/template_deeplearning.json b/inst/etc/template_deeplearning.json
index a680a1e..4775af9 100644
--- a/inst/etc/template_deeplearning.json
+++ b/inst/etc/template_deeplearning.json
@@ -39,7 +39,7 @@
             "type": "String"
         },
         "storageAccounts_name": {
-            "defaultValue": "dsvmdisks490",
+            "defaultValue": "dsvmdisks",
             "type": "String"
         },
         "extensions_DSVMDeepLearning_name": {
diff --git a/inst/etc/template_linux.json b/inst/etc/template_linux.json
index 8b0b625..8198c3d 100644
--- a/inst/etc/template_linux.json
+++ b/inst/etc/template_linux.json
@@ -15,39 +15,39 @@
             "defaultValue": null,
             "type": "String"
     	},
-        "virtualMachines_newdsvm_adminPassword": {
+        "virtualMachines_adminPassword": {
             "defaultValue": null,
             "type": "SecureString"
         },
-        "virtualMachines_newdsvm_name": {
+        "virtualMachines_name": {
             "defaultValue": "newdsvm",
             "type": "String"
         },
-        "networkInterfaces_newdsvm161_name": {
-            "defaultValue": "newdsvm161",
+        "networkInterfaces_name": {
+            "defaultValue": "newdsvm-ni",
             "type": "String"
         },
-        "networkSecurityGroups_newdsvm_nsg_name": {
+        "networkSecurityGroups_nsg_name": {
             "defaultValue": "newdsvm-nsg",
             "type": "String"
         },
-        "publicIPAddresses_newdsvm_ip_name": {
+        "publicIPAddresses_ip_name": {
             "defaultValue": "newdsvm-ip",
             "type": "String"
         },
-        "virtualNetworks_dsvm_vnet_name": {
+        "virtualNetworks_name": {
             "defaultValue": "dsvm-vnet",
             "type": "String"
         },
-        "storageAccounts_dsvmdisks490_name": {
-            "defaultValue": "dsvmdisks490",
+        "storageAccounts_name": {
+            "defaultValue": "dsvmdisks",
             "type": "String"
         }
     },
     "resources": [
         {
             "type": "Microsoft.Compute/virtualMachines",
-            "name": "[parameters('virtualMachines_newdsvm_name')]",
+            "name": "[parameters('virtualMachines_name')]",
             "apiVersion": "2015-06-15",
             "location": "[parameters('location')]",
             "plan": {
@@ -67,47 +67,47 @@
                         "version": "latest"
                     },
                     "osDisk": {
-                        "name": "[parameters('virtualMachines_newdsvm_name')]",
+                        "name": "[parameters('virtualMachines_name')]",
                         "createOption": "FromImage",
                         "vhd": {
-                            "uri": "[concat('https', '://', parameters('storageAccounts_dsvmdisks490_name'), '.blob.core.windows.net', concat('/vhds/', parameters('virtualMachines_newdsvm_name'),'20168192442.vhd'))]"
+                            "uri": "[concat('https', '://', parameters('storageAccounts_name'), '.blob.core.windows.net', concat('/vhds/', parameters('virtualMachines_name'),'20168192442.vhd'))]"
                         },
                         "caching": "ReadWrite"
                     },
                     "dataDisks": [
                         {
                             "lun": 0,
-                            "name": "[concat(parameters('virtualMachines_newdsvm_name'),'-disk-1')]",
+                            "name": "[concat(parameters('virtualMachines_name'),'-disk-1')]",
                             "createOption": "FromImage",
                             "vhd": {
-                                "uri": "[concat('https', '://', parameters('storageAccounts_dsvmdisks490_name'), '.blob.core.windows.net', concat('/vhds/', parameters('virtualMachines_newdsvm_name'),'-disk-1-20168192442.vhd'))]"
+                                "uri": "[concat('https', '://', parameters('storageAccounts_name'), '.blob.core.windows.net', concat('/vhds/', parameters('virtualMachines_name'),'-disk-1-20168192442.vhd'))]"
                             },
                             "caching": "None"
                         }
                     ]
                 },
                 "osProfile": {
-                    "computerName": "[parameters('virtualMachines_newdsvm_name')]",
+                    "computerName": "[parameters('virtualMachines_name')]",
                     "adminUsername": "[parameters('adminUsername')]",
-                    "adminPassword": "[parameters('virtualMachines_newdsvm_adminPassword')]"
+                    "adminPassword": "[parameters('virtualMachines_adminPassword')]"
                 },
                 "networkProfile": {
                     "networkInterfaces": [
                         {
-                            "id": "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_newdsvm161_name'))]"
+                            "id": "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_name'))]"
                         }
                     ]
                 }
             },
             "resources": [],
             "dependsOn": [
-                "[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_dsvmdisks490_name'))]",
-                "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_newdsvm161_name'))]"
+                "[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_name'))]",
+                "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_name'))]"
             ]
         },
         {
             "type": "Microsoft.Network/networkInterfaces",
-            "name": "[parameters('networkInterfaces_newdsvm161_name')]",
+            "name": "[parameters('networkInterfaces_name')]",
             "apiVersion": "2016-03-30",
             "location": "[parameters('location')]",
             "properties": {
@@ -118,10 +118,10 @@
                             "privateIPAddress": "10.0.0.4",
                             "privateIPAllocationMethod": "Dynamic",
                             "publicIPAddress": {
-                                "id": "[resourceId('Microsoft.Network/publicIPAddresses', parameters('publicIPAddresses_newdsvm_ip_name'))]"
+                                "id": "[resourceId('Microsoft.Network/publicIPAddresses', parameters('publicIPAddresses_ip_name'))]"
                             },
                             "subnet": {
-                                "id": "[concat(resourceId('Microsoft.Network/virtualNetworks', parameters('virtualNetworks_dsvm_vnet_name')), '/subnets/default')]"
+                                "id": "[concat(resourceId('Microsoft.Network/virtualNetworks', parameters('virtualNetworks_name')), '/subnets/default')]"
                             }
                         }
                     }
@@ -131,19 +131,19 @@
                 },
                 "enableIPForwarding": false,
                 "networkSecurityGroup": {
-                    "id": "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_newdsvm_nsg_name'))]"
+                    "id": "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_name'))]"
                 }
             },
             "resources": [],
             "dependsOn": [
-                "[resourceId('Microsoft.Network/publicIPAddresses', parameters('publicIPAddresses_newdsvm_ip_name'))]",
-                "[resourceId('Microsoft.Network/virtualNetworks', parameters('virtualNetworks_dsvm_vnet_name'))]",
-                "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_newdsvm_nsg_name'))]"
+                "[resourceId('Microsoft.Network/publicIPAddresses', parameters('publicIPAddresses_ip_name'))]",
+                "[resourceId('Microsoft.Network/virtualNetworks', parameters('virtualNetworks_name'))]",
+                "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_name'))]"
             ]
         },
         {
             "type": "Microsoft.Network/networkSecurityGroups",
-            "name": "[parameters('networkSecurityGroups_newdsvm_nsg_name')]",
+            "name": "[parameters('networkSecurityGroups_nsg_name')]",
             "apiVersion": "2016-03-30",
             "location": "[parameters('location')]",
             "properties": {
@@ -220,7 +220,7 @@
         },
         {
             "type": "Microsoft.Network/publicIPAddresses",
-            "name": "[parameters('publicIPAddresses_newdsvm_ip_name')]",
+            "name": "[parameters('publicIPAddresses_ip_name')]",
             "apiVersion": "2016-03-30",
             "location": "[parameters('location')]",
             "properties": {
@@ -235,7 +235,7 @@
         },
         {
             "type": "Microsoft.Network/virtualNetworks",
-            "name": "[parameters('virtualNetworks_dsvm_vnet_name')]",
+            "name": "[parameters('virtualNetworks_name')]",
             "apiVersion": "2016-03-30",
             "location": "[parameters('location')]",
             "properties": {
@@ -263,7 +263,7 @@
                 "tier": "Standard"
             },
             "kind": "Storage",
-            "name": "[parameters('storageAccounts_dsvmdisks490_name')]",
+            "name": "[parameters('storageAccounts_name')]",
             "apiVersion": "2016-01-01",
             "location": "[parameters('location')]",
             "tags": {},
diff --git a/inst/etc/template_linux_key.json b/inst/etc/template_linux_key.json
index ed6cc84..a75e755 100644
--- a/inst/etc/template_linux_key.json
+++ b/inst/etc/template_linux_key.json
@@ -15,43 +15,43 @@
             "defaultValue": null,
             "type": "String"
     	},
-      "virtualMachines_newdsvm_adminPassword": {
+      "virtualMachines_adminPassword": {
             "defaultValue": null,
             "type": "SecureString"
       },
-    	"virtualMachines_newdsvm_adminPublicKey": {
+    	"virtualMachines_adminPublicKey": {
             "defaultValue": null,
             "type": "SecureString"
     	},
-      "virtualMachines_newdsvm_name": {
+      "virtualMachines_name": {
             "defaultValue": "newdsvm",
             "type": "String"
       },
-      "networkInterfaces_newdsvm161_name": {
-            "defaultValue": "newdsvm161",
+      "networkInterfaces_name": {
+            "defaultValue": "newdsvm-ni",
             "type": "String"
       },
-      "networkSecurityGroups_newdsvm_nsg_name": {
+      "networkSecurityGroups_nsg_name": {
             "defaultValue": "newdsvm-nsg",
             "type": "String"
       },
-      "publicIPAddresses_newdsvm_ip_name": {
+      "publicIPAddresses_ip_name": {
             "defaultValue": "newdsvm-ip",
             "type": "String"
       },
-      "virtualNetworks_dsvm_vnet_name": {
+      "virtualNetworks_name": {
             "defaultValue": "dsvm-vnet",
             "type": "String"
       },
-      "storageAccounts_dsvmdisks490_name": {
-            "defaultValue": "dsvmdisks490",
+      "storageAccounts_name": {
+            "defaultValue": "dsvmdisks",
             "type": "String"
       }
     },
     "resources": [
         {
             "type": "Microsoft.Compute/virtualMachines",
-            "name": "[parameters('virtualMachines_newdsvm_name')]",
+            "name": "[parameters('virtualMachines_name')]",
             "apiVersion": "2015-06-15",
             "location": "[resourceGroup().location]",
             "plan": {
@@ -71,27 +71,27 @@
                         "version": "latest"
                     },
                     "osDisk": {
-                        "name": "[parameters('virtualMachines_newdsvm_name')]",
+                        "name": "[parameters('virtualMachines_name')]",
                         "createOption": "FromImage",
                         "vhd": {
-                            "uri": "[concat('https', '://', parameters('storageAccounts_dsvmdisks490_name'), '.blob.core.windows.net', concat('/vhds/', parameters('virtualMachines_newdsvm_name'),'20168192442.vhd'))]"
+                            "uri": "[concat('https', '://', parameters('storageAccounts_name'), '.blob.core.windows.net', concat('/vhds/', parameters('virtualMachines_name'),'20168192442.vhd'))]"
                         },
                         "caching": "ReadWrite"
                     },
                     "dataDisks": [
                         {
                             "lun": 0,
-                            "name": "[concat(parameters('virtualMachines_newdsvm_name'),'-disk-1')]",
+                            "name": "[concat(parameters('virtualMachines_name'),'-disk-1')]",
                             "createOption": "FromImage",
                             "vhd": {
-                                "uri": "[concat('https', '://', parameters('storageAccounts_dsvmdisks490_name'), '.blob.core.windows.net', concat('/vhds/', parameters('virtualMachines_newdsvm_name'),'-disk-1-20168192442.vhd'))]"
+                                "uri": "[concat('https', '://', parameters('storageAccounts_name'), '.blob.core.windows.net', concat('/vhds/', parameters('virtualMachines_name'),'-disk-1-20168192442.vhd'))]"
                             },
                             "caching": "None"
                         }
                     ]
                 },
                 "osProfile": {
-                    "computerName": "[parameters('virtualMachines_newdsvm_name')]",
+                    "computerName": "[parameters('virtualMachines_name')]",
                     "adminUsername": "[parameters('adminUsername')]",
 		    "linuxConfiguration": {
                         "disablePasswordAuthentication": true,
@@ -99,30 +99,30 @@
                             "publicKeys": [
                                 {
                                     "path": "[concat('/home/', parameters('adminUsername'), '/.ssh/authorized_keys')]",
-                                    "keyData": "[parameters('virtualMachines_newdsvm_adminPublicKey')]"
+                                    "keyData": "[parameters('virtualMachines_adminPublicKey')]"
                                 }
                             ]
                         }
                     },
-                    "adminPassword": "[parameters('virtualMachines_newdsvm_adminPassword')]"
+                    "adminPassword": "[parameters('virtualMachines_adminPassword')]"
                 },
                 "networkProfile": {
                     "networkInterfaces": [
                         {
-                            "id": "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_newdsvm161_name'))]"
+                            "id": "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_name'))]"
                         }
                     ]
                 }
             },
             "resources": [],
             "dependsOn": [
-                "[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_dsvmdisks490_name'))]",
-                "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_newdsvm161_name'))]"
+                "[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_name'))]",
+                "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_name'))]"
             ]
         },
         {
             "type": "Microsoft.Network/networkInterfaces",
-            "name": "[parameters('networkInterfaces_newdsvm161_name')]",
+            "name": "[parameters('networkInterfaces_name')]",
             "apiVersion": "2016-03-30",
             "location": "[resourceGroup().location]",
             "properties": {
@@ -133,10 +133,10 @@
                             "privateIPAddress": "10.0.0.4",
                             "privateIPAllocationMethod": "Dynamic",
                             "publicIPAddress": {
-                                "id": "[resourceId('Microsoft.Network/publicIPAddresses', parameters('publicIPAddresses_newdsvm_ip_name'))]"
+                                "id": "[resourceId('Microsoft.Network/publicIPAddresses', parameters('publicIPAddresses_ip_name'))]"
                             },
                             "subnet": {
-                                "id": "[concat(resourceId('Microsoft.Network/virtualNetworks', parameters('virtualNetworks_dsvm_vnet_name')), '/subnets/default')]"
+                                "id": "[concat(resourceId('Microsoft.Network/virtualNetworks', parameters('virtualNetworks_name')), '/subnets/default')]"
                             }
                         }
                     }
@@ -146,19 +146,19 @@
                 },
                 "enableIPForwarding": false,
                 "networkSecurityGroup": {
-                    "id": "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_newdsvm_nsg_name'))]"
+                    "id": "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_name'))]"
                 }
             },
             "resources": [],
             "dependsOn": [
-                "[resourceId('Microsoft.Network/publicIPAddresses', parameters('publicIPAddresses_newdsvm_ip_name'))]",
-                "[resourceId('Microsoft.Network/virtualNetworks', parameters('virtualNetworks_dsvm_vnet_name'))]",
-                "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_newdsvm_nsg_name'))]"
+                "[resourceId('Microsoft.Network/publicIPAddresses', parameters('publicIPAddresses_ip_name'))]",
+                "[resourceId('Microsoft.Network/virtualNetworks', parameters('virtualNetworks_name'))]",
+                "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_name'))]"
             ]
         },
         {
             "type": "Microsoft.Network/networkSecurityGroups",
-            "name": "[parameters('networkSecurityGroups_newdsvm_nsg_name')]",
+            "name": "[parameters('networkSecurityGroups_nsg_name')]",
             "apiVersion": "2016-03-30",
             "location": "[resourceGroup().location]",
             "properties": {
@@ -235,7 +235,7 @@
         },
         {
             "type": "Microsoft.Network/publicIPAddresses",
-            "name": "[parameters('publicIPAddresses_newdsvm_ip_name')]",
+            "name": "[parameters('publicIPAddresses_ip_name')]",
             "apiVersion": "2016-03-30",
             "location": "[resourceGroup().location]",
             "properties": {
@@ -250,7 +250,7 @@
         },
         {
             "type": "Microsoft.Network/virtualNetworks",
-            "name": "[parameters('virtualNetworks_dsvm_vnet_name')]",
+            "name": "[parameters('virtualNetworks_name')]",
             "apiVersion": "2016-03-30",
             "location": "[resourceGroup().location]",
             "properties": {
@@ -278,7 +278,7 @@
                 "tier": "Standard"
             },
             "kind": "Storage",
-            "name": "[parameters('storageAccounts_dsvmdisks490_name')]",
+            "name": "[parameters('storageAccounts_name')]",
             "apiVersion": "2016-01-01",
             "location": "[resourceGroup().location]",
             "tags": {},
diff --git a/inst/etc/template_linux_key_ubuntu.json b/inst/etc/template_linux_key_ubuntu.json
index 33ba284..6baeff4 100644
--- a/inst/etc/template_linux_key_ubuntu.json
+++ b/inst/etc/template_linux_key_ubuntu.json
@@ -15,43 +15,43 @@
             "defaultValue": null,
             "type": "String"
     	},
-      "virtualMachines_newdsvm_adminPassword": {
+      "virtualMachines_adminPassword": {
             "defaultValue": null,
             "type": "SecureString"
       },
-    	"virtualMachines_newdsvm_adminPublicKey": {
+    	"virtualMachines_adminPublicKey": {
             "defaultValue": null,
             "type": "SecureString"
     	},
-      "virtualMachines_newdsvm_name": {
+      "virtualMachines_name": {
             "defaultValue": "newdsvm",
             "type": "String"
       },
-      "networkInterfaces_newdsvm161_name": {
-            "defaultValue": "newdsvm161",
+      "networkInterfaces_name": {
+            "defaultValue": "newdsvm-ni",
             "type": "String"
       },
-      "networkSecurityGroups_newdsvm_nsg_name": {
+      "networkSecurityGroups_nsg_name": {
             "defaultValue": "newdsvm-nsg",
             "type": "String"
       },
-      "publicIPAddresses_newdsvm_ip_name": {
+      "publicIPAddresses_ip_name": {
             "defaultValue": "newdsvm-ip",
             "type": "String"
       },
-      "virtualNetworks_dsvm_vnet_name": {
+      "virtualNetworks_name": {
             "defaultValue": "dsvm-vnet",
             "type": "String"
       },
-      "storageAccounts_dsvmdisks490_name": {
-            "defaultValue": "dsvmdisks490",
+      "storageAccounts_name": {
+            "defaultValue": "dsvmdisks",
             "type": "String"
       }
     },
     "resources": [
         {
             "type": "Microsoft.Compute/virtualMachines",
-            "name": "[parameters('virtualMachines_newdsvm_name')]",
+            "name": "[parameters('virtualMachines_name')]",
             "apiVersion": "2016-04-30-preview",
             "location": "[resourceGroup().location]",
             "plan": {
@@ -71,27 +71,27 @@
                         "version": "latest"
                     },
                     "osDisk": {
-                        "name": "[parameters('virtualMachines_newdsvm_name')]",
+                        "name": "[parameters('virtualMachines_name')]",
                         "createOption": "FromImage",
                         "vhd": {
-                            "uri": "[concat('https', '://', parameters('storageAccounts_dsvmdisks490_name'), '.blob.core.windows.net', concat('/vhds/', parameters('virtualMachines_newdsvm_name'),'20168192442.vhd'))]"
+                            "uri": "[concat('https', '://', parameters('storageAccounts_name'), '.blob.core.windows.net', concat('/vhds/', parameters('virtualMachines_name'),'20168192442.vhd'))]"
                         },
                         "caching": "ReadWrite"
                     },
                     "dataDisks": [
                         {
                             "lun": 0,
-                            "name": "[concat(parameters('virtualMachines_newdsvm_name'),'-disk-1')]",
+                            "name": "[concat(parameters('virtualMachines_name'),'-disk-1')]",
                             "createOption": "FromImage",
                             "vhd": {
-                                "uri": "[concat('https', '://', parameters('storageAccounts_dsvmdisks490_name'), '.blob.core.windows.net', concat('/vhds/', parameters('virtualMachines_newdsvm_name'),'-disk-1-20168192442.vhd'))]"
+                                "uri": "[concat('https', '://', parameters('storageAccounts_name'), '.blob.core.windows.net', concat('/vhds/', parameters('virtualMachines_name'),'-disk-1-20168192442.vhd'))]"
                             },
                             "caching": "None"
                         }
                     ]
                 },
                 "osProfile": {
-                    "computerName": "[parameters('virtualMachines_newdsvm_name')]",
+                    "computerName": "[parameters('virtualMachines_name')]",
                     "adminUsername": "[parameters('adminUsername')]",
 		    "linuxConfiguration": {
                         "disablePasswordAuthentication": true,
@@ -99,30 +99,30 @@
                             "publicKeys": [
                                 {
                                     "path": "[concat('/home/', parameters('adminUsername'), '/.ssh/authorized_keys')]",
-                                    "keyData": "[parameters('virtualMachines_newdsvm_adminPublicKey')]"
+                                    "keyData": "[parameters('virtualMachines_adminPublicKey')]"
                                 }
                             ]
                         }
                     },
-                    "adminPassword": "[parameters('virtualMachines_newdsvm_adminPassword')]"
+                    "adminPassword": "[parameters('virtualMachines_adminPassword')]"
                 },
                 "networkProfile": {
                     "networkInterfaces": [
                         {
-                            "id": "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_newdsvm161_name'))]"
+                            "id": "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_name'))]"
                         }
                     ]
                 }
             },
             "resources": [],
             "dependsOn": [
-                "[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_dsvmdisks490_name'))]",
-                "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_newdsvm161_name'))]"
+                "[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_name'))]",
+                "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_name'))]"
             ]
         },
         {
             "type": "Microsoft.Network/networkInterfaces",
-            "name": "[parameters('networkInterfaces_newdsvm161_name')]",
+            "name": "[parameters('networkInterfaces_name')]",
             "apiVersion": "2016-03-30",
             "location": "[resourceGroup().location]",
             "properties": {
@@ -133,10 +133,10 @@
                             "privateIPAddress": "10.0.0.4",
                             "privateIPAllocationMethod": "Dynamic",
                             "publicIPAddress": {
-                                "id": "[resourceId('Microsoft.Network/publicIPAddresses', parameters('publicIPAddresses_newdsvm_ip_name'))]"
+                                "id": "[resourceId('Microsoft.Network/publicIPAddresses', parameters('publicIPAddresses_ip_name'))]"
                             },
                             "subnet": {
-                                "id": "[concat(resourceId('Microsoft.Network/virtualNetworks', parameters('virtualNetworks_dsvm_vnet_name')), '/subnets/default')]"
+                                "id": "[concat(resourceId('Microsoft.Network/virtualNetworks', parameters('virtualNetworks_name')), '/subnets/default')]"
                             }
                         }
                     }
@@ -146,19 +146,19 @@
                 },
                 "enableIPForwarding": false,
                 "networkSecurityGroup": {
-                    "id": "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_newdsvm_nsg_name'))]"
+                    "id": "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_name'))]"
                 }
             },
             "resources": [],
             "dependsOn": [
-                "[resourceId('Microsoft.Network/publicIPAddresses', parameters('publicIPAddresses_newdsvm_ip_name'))]",
-                "[resourceId('Microsoft.Network/virtualNetworks', parameters('virtualNetworks_dsvm_vnet_name'))]",
-                "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_newdsvm_nsg_name'))]"
+                "[resourceId('Microsoft.Network/publicIPAddresses', parameters('publicIPAddresses_ip_name'))]",
+                "[resourceId('Microsoft.Network/virtualNetworks', parameters('virtualNetworks_name'))]",
+                "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_name'))]"
             ]
         },
         {
             "type": "Microsoft.Network/networkSecurityGroups",
-            "name": "[parameters('networkSecurityGroups_newdsvm_nsg_name')]",
+            "name": "[parameters('networkSecurityGroups_nsg_name')]",
             "apiVersion": "2016-03-30",
             "location": "[resourceGroup().location]",
             "properties": {
@@ -248,7 +248,7 @@
         },
         {
             "type": "Microsoft.Network/publicIPAddresses",
-            "name": "[parameters('publicIPAddresses_newdsvm_ip_name')]",
+            "name": "[parameters('publicIPAddresses_ip_name')]",
             "apiVersion": "2016-03-30",
             "location": "[resourceGroup().location]",
             "properties": {
@@ -263,7 +263,7 @@
         },
         {
             "type": "Microsoft.Network/virtualNetworks",
-            "name": "[parameters('virtualNetworks_dsvm_vnet_name')]",
+            "name": "[parameters('virtualNetworks_name')]",
             "apiVersion": "2016-03-30",
             "location": "[resourceGroup().location]",
             "properties": {
@@ -291,7 +291,7 @@
                 "tier": "Standard"
             },
             "kind": "Storage",
-            "name": "[parameters('storageAccounts_dsvmdisks490_name')]",
+            "name": "[parameters('storageAccounts_name')]",
             "apiVersion": "2016-01-01",
             "location": "[resourceGroup().location]",
             "tags": {},
diff --git a/inst/etc/template_linux_ubuntu.json b/inst/etc/template_linux_ubuntu.json
index 5c7352e..810268d 100644
--- a/inst/etc/template_linux_ubuntu.json
+++ b/inst/etc/template_linux_ubuntu.json
@@ -15,39 +15,39 @@
             "defaultValue": null,
             "type": "String"
     	},
-        "virtualMachines_newdsvm_adminPassword": {
+        "virtualMachines_adminPassword": {
             "defaultValue": null,
             "type": "SecureString"
         },
-        "virtualMachines_newdsvm_name": {
+        "virtualMachines_name": {
             "defaultValue": "newdsvm",
             "type": "String"
         },
-        "networkInterfaces_newdsvm161_name": {
-            "defaultValue": "newdsvm161",
+        "networkInterfaces_name": {
+            "defaultValue": "newdsvm-ni",
             "type": "String"
         },
-        "networkSecurityGroups_newdsvm_nsg_name": {
+        "networkSecurityGroups_nsg_name": {
             "defaultValue": "newdsvm-nsg",
             "type": "String"
         },
-        "publicIPAddresses_newdsvm_ip_name": {
+        "publicIPAddresses_ip_name": {
             "defaultValue": "newdsvm-ip",
             "type": "String"
         },
-        "virtualNetworks_dsvm_vnet_name": {
+        "virtualNetworks_name": {
             "defaultValue": "dsvm-vnet",
             "type": "String"
         },
-        "storageAccounts_dsvmdisks490_name": {
-            "defaultValue": "dsvmdisks490",
+        "storageAccounts_name": {
+            "defaultValue": "dsvmdisks",
             "type": "String"
         }
     },
     "resources": [
         {
             "type": "Microsoft.Compute/virtualMachines",
-            "name": "[parameters('virtualMachines_newdsvm_name')]",
+            "name": "[parameters('virtualMachines_name')]",
             "apiVersion": "2016-04-30-preview",
             "location": "[parameters('location')]",
             "plan": {
@@ -67,47 +67,47 @@
                         "version": "latest"
                     },
                     "osDisk": {
-                        "name": "[parameters('virtualMachines_newdsvm_name')]",
+                        "name": "[parameters('virtualMachines_name')]",
                         "createOption": "FromImage",
                         "vhd": {
-                            "uri": "[concat('https', '://', parameters('storageAccounts_dsvmdisks490_name'), '.blob.core.windows.net', concat('/vhds/', parameters('virtualMachines_newdsvm_name'),'20168192442.vhd'))]"
+                            "uri": "[concat('https', '://', parameters('storageAccounts_name'), '.blob.core.windows.net', concat('/vhds/', parameters('virtualMachines_name'),'20168192442.vhd'))]"
                         },
                         "caching": "ReadWrite"
                     },
                     "dataDisks": [
                         {
                             "lun": 0,
-                            "name": "[concat(parameters('virtualMachines_newdsvm_name'),'-disk-1')]",
+                            "name": "[concat(parameters('virtualMachines_name'),'-disk-1')]",
                             "createOption": "FromImage",
                             "vhd": {
-                                "uri": "[concat('https', '://', parameters('storageAccounts_dsvmdisks490_name'), '.blob.core.windows.net', concat('/vhds/', parameters('virtualMachines_newdsvm_name'),'-disk-1-20168192442.vhd'))]"
+                                "uri": "[concat('https', '://', parameters('storageAccounts_name'), '.blob.core.windows.net', concat('/vhds/', parameters('virtualMachines_name'),'-disk-1-20168192442.vhd'))]"
                             },
                             "caching": "None"
                         }
                     ]
                 },
                 "osProfile": {
-                    "computerName": "[parameters('virtualMachines_newdsvm_name')]",
+                    "computerName": "[parameters('virtualMachines_name')]",
                     "adminUsername": "[parameters('adminUsername')]",
-                    "adminPassword": "[parameters('virtualMachines_newdsvm_adminPassword')]"
+                    "adminPassword": "[parameters('virtualMachines_adminPassword')]"
                 },
                 "networkProfile": {
                     "networkInterfaces": [
                         {
-                            "id": "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_newdsvm161_name'))]"
+                            "id": "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_name'))]"
                         }
                     ]
                 }
             },
             "resources": [],
             "dependsOn": [
-                "[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_dsvmdisks490_name'))]",
-                "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_newdsvm161_name'))]"
+                "[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_name'))]",
+                "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_name'))]"
             ]
         },
         {
             "type": "Microsoft.Network/networkInterfaces",
-            "name": "[parameters('networkInterfaces_newdsvm161_name')]",
+            "name": "[parameters('networkInterfaces_name')]",
             "apiVersion": "2016-03-30",
             "location": "[parameters('location')]",
             "properties": {
@@ -118,10 +118,10 @@
                             "privateIPAddress": "10.0.0.4",
                             "privateIPAllocationMethod": "Dynamic",
                             "publicIPAddress": {
-                                "id": "[resourceId('Microsoft.Network/publicIPAddresses', parameters('publicIPAddresses_newdsvm_ip_name'))]"
+                                "id": "[resourceId('Microsoft.Network/publicIPAddresses', parameters('publicIPAddresses_ip_name'))]"
                             },
                             "subnet": {
-                                "id": "[concat(resourceId('Microsoft.Network/virtualNetworks', parameters('virtualNetworks_dsvm_vnet_name')), '/subnets/default')]"
+                                "id": "[concat(resourceId('Microsoft.Network/virtualNetworks', parameters('virtualNetworks_name')), '/subnets/default')]"
                             }
                         }
                     }
@@ -131,19 +131,19 @@
                 },
                 "enableIPForwarding": false,
                 "networkSecurityGroup": {
-                    "id": "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_newdsvm_nsg_name'))]"
+                    "id": "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_name'))]"
                 }
             },
             "resources": [],
             "dependsOn": [
-                "[resourceId('Microsoft.Network/publicIPAddresses', parameters('publicIPAddresses_newdsvm_ip_name'))]",
-                "[resourceId('Microsoft.Network/virtualNetworks', parameters('virtualNetworks_dsvm_vnet_name'))]",
-                "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_newdsvm_nsg_name'))]"
+                "[resourceId('Microsoft.Network/publicIPAddresses', parameters('publicIPAddresses_ip_name'))]",
+                "[resourceId('Microsoft.Network/virtualNetworks', parameters('virtualNetworks_name'))]",
+                "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_name'))]"
             ]
         },
         {
             "type": "Microsoft.Network/networkSecurityGroups",
-            "name": "[parameters('networkSecurityGroups_newdsvm_nsg_name')]",
+            "name": "[parameters('networkSecurityGroups_nsg_name')]",
             "apiVersion": "2016-03-30",
             "location": "[parameters('location')]",
             "properties": {
@@ -233,7 +233,7 @@
         },
         {
             "type": "Microsoft.Network/publicIPAddresses",
-            "name": "[parameters('publicIPAddresses_newdsvm_ip_name')]",
+            "name": "[parameters('publicIPAddresses_ip_name')]",
             "apiVersion": "2016-03-30",
             "location": "[parameters('location')]",
             "properties": {
@@ -248,7 +248,7 @@
         },
         {
             "type": "Microsoft.Network/virtualNetworks",
-            "name": "[parameters('virtualNetworks_dsvm_vnet_name')]",
+            "name": "[parameters('virtualNetworks_name')]",
             "apiVersion": "2016-03-30",
             "location": "[parameters('location')]",
             "properties": {
@@ -276,7 +276,7 @@
                 "tier": "Standard"
             },
             "kind": "Storage",
-            "name": "[parameters('storageAccounts_dsvmdisks490_name')]",
+            "name": "[parameters('storageAccounts_name')]",
             "apiVersion": "2016-01-01",
             "location": "[parameters('location')]",
             "tags": {},
diff --git a/inst/etc/template_mrs_key_ubuntu.json b/inst/etc/template_mrs_key_ubuntu.json
index 88cfdc0..6c55203 100644
--- a/inst/etc/template_mrs_key_ubuntu.json
+++ b/inst/etc/template_mrs_key_ubuntu.json
@@ -15,43 +15,43 @@
             "defaultValue": null,
             "type": "String"
     	},
-      "virtualMachines_newdsvm_adminPassword": {
+      "virtualMachines_adminPassword": {
             "defaultValue": null,
             "type": "SecureString"
       },
-    	"virtualMachines_newdsvm_adminPublicKey": {
+    	"virtualMachines_adminPublicKey": {
             "defaultValue": null,
             "type": "SecureString"
     	},
-      "virtualMachines_newdsvm_name": {
+      "virtualMachines_name": {
             "defaultValue": "newdsvm",
             "type": "String"
       },
-      "networkInterfaces_newdsvm161_name": {
-            "defaultValue": "newdsvm161",
+      "networkInterfaces_name": {
+            "defaultValue": "newdsvm-ni",
             "type": "String"
       },
-      "networkSecurityGroups_newdsvm_nsg_name": {
+      "networkSecurityGroups_nsg_name": {
             "defaultValue": "newdsvm-nsg",
             "type": "String"
       },
-      "publicIPAddresses_newdsvm_ip_name": {
+      "publicIPAddresses_ip_name": {
             "defaultValue": "newdsvm-ip",
             "type": "String"
       },
-      "virtualNetworks_dsvm_vnet_name": {
+      "virtualNetworks_name": {
             "defaultValue": "dsvm-vnet",
             "type": "String"
       },
-      "storageAccounts_dsvmdisks490_name": {
-            "defaultValue": "dsvmdisks490",
+      "storageAccounts_name": {
+            "defaultValue": "dsvmdisks",
             "type": "String"
       }
     },
     "resources": [
         {
             "type": "Microsoft.Compute/virtualMachines",
-            "name": "[parameters('virtualMachines_newdsvm_name')]",
+            "name": "[parameters('virtualMachines_name')]",
             "apiVersion": "2016-04-30-preview",
             "location": "[resourceGroup().location]",
             "properties": {
@@ -66,16 +66,16 @@
                         "version": "latest"
                     },
                     "osDisk": {
-                        "name": "[parameters('virtualMachines_newdsvm_name')]",
+                        "name": "[parameters('virtualMachines_name')]",
                         "createOption": "FromImage",
                         "vhd": {
-                            "uri": "[concat('https', '://', parameters('storageAccounts_dsvmdisks490_name'), '.blob.core.windows.net', concat('/vhds/', parameters('virtualMachines_newdsvm_name'),'20168192442.vhd'))]"
+                            "uri": "[concat('https', '://', parameters('storageAccounts_name'), '.blob.core.windows.net', concat('/vhds/', parameters('virtualMachines_name'),'20168192442.vhd'))]"
                         },
                         "caching": "ReadWrite"
                     }
                 },
                 "osProfile": {
-                    "computerName": "[parameters('virtualMachines_newdsvm_name')]",
+                    "computerName": "[parameters('virtualMachines_name')]",
                     "adminUsername": "[parameters('adminUsername')]",
 		    "linuxConfiguration": {
                         "disablePasswordAuthentication": true,
@@ -83,30 +83,30 @@
                             "publicKeys": [
                                 {
                                     "path": "[concat('/home/', parameters('adminUsername'), '/.ssh/authorized_keys')]",
-                                    "keyData": "[parameters('virtualMachines_newdsvm_adminPublicKey')]"
+                                    "keyData": "[parameters('virtualMachines_adminPublicKey')]"
                                 }
                             ]
                         }
                     },
-                    "adminPassword": "[parameters('virtualMachines_newdsvm_adminPassword')]"
+                    "adminPassword": "[parameters('virtualMachines_adminPassword')]"
                 },
                 "networkProfile": {
                     "networkInterfaces": [
                         {
-                            "id": "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_newdsvm161_name'))]"
+                            "id": "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_name'))]"
                         }
                     ]
                 }
             },
             "resources": [],
             "dependsOn": [
-                "[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_dsvmdisks490_name'))]",
-                "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_newdsvm161_name'))]"
+                "[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_name'))]",
+                "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_name'))]"
             ]
         },
         {
             "type": "Microsoft.Network/networkInterfaces",
-            "name": "[parameters('networkInterfaces_newdsvm161_name')]",
+            "name": "[parameters('networkInterfaces_name')]",
             "apiVersion": "2016-03-30",
             "location": "[resourceGroup().location]",
             "properties": {
@@ -117,10 +117,10 @@
                             "privateIPAddress": "10.0.0.4",
                             "privateIPAllocationMethod": "Dynamic",
                             "publicIPAddress": {
-                                "id": "[resourceId('Microsoft.Network/publicIPAddresses', parameters('publicIPAddresses_newdsvm_ip_name'))]"
+                                "id": "[resourceId('Microsoft.Network/publicIPAddresses', parameters('publicIPAddresses_ip_name'))]"
                             },
                             "subnet": {
-                                "id": "[concat(resourceId('Microsoft.Network/virtualNetworks', parameters('virtualNetworks_dsvm_vnet_name')), '/subnets/default')]"
+                                "id": "[concat(resourceId('Microsoft.Network/virtualNetworks', parameters('virtualNetworks_name')), '/subnets/default')]"
                             }
                         }
                     }
@@ -130,19 +130,19 @@
                 },
                 "enableIPForwarding": false,
                 "networkSecurityGroup": {
-                    "id": "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_newdsvm_nsg_name'))]"
+                    "id": "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_name'))]"
                 }
             },
             "resources": [],
             "dependsOn": [
-                "[resourceId('Microsoft.Network/publicIPAddresses', parameters('publicIPAddresses_newdsvm_ip_name'))]",
-                "[resourceId('Microsoft.Network/virtualNetworks', parameters('virtualNetworks_dsvm_vnet_name'))]",
-                "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_newdsvm_nsg_name'))]"
+                "[resourceId('Microsoft.Network/publicIPAddresses', parameters('publicIPAddresses_ip_name'))]",
+                "[resourceId('Microsoft.Network/virtualNetworks', parameters('virtualNetworks_name'))]",
+                "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_name'))]"
             ]
         },
         {
             "type": "Microsoft.Network/networkSecurityGroups",
-            "name": "[parameters('networkSecurityGroups_newdsvm_nsg_name')]",
+            "name": "[parameters('networkSecurityGroups_nsg_name')]",
             "apiVersion": "2016-03-30",
             "location": "[resourceGroup().location]",
             "properties": {
@@ -232,7 +232,7 @@
         },
         {
             "type": "Microsoft.Network/publicIPAddresses",
-            "name": "[parameters('publicIPAddresses_newdsvm_ip_name')]",
+            "name": "[parameters('publicIPAddresses_ip_name')]",
             "apiVersion": "2016-03-30",
             "location": "[resourceGroup().location]",
             "properties": {
@@ -247,7 +247,7 @@
         },
         {
             "type": "Microsoft.Network/virtualNetworks",
-            "name": "[parameters('virtualNetworks_dsvm_vnet_name')]",
+            "name": "[parameters('virtualNetworks_name')]",
             "apiVersion": "2016-03-30",
             "location": "[resourceGroup().location]",
             "properties": {
@@ -275,7 +275,7 @@
                 "tier": "Standard"
             },
             "kind": "Storage",
-            "name": "[parameters('storageAccounts_dsvmdisks490_name')]",
+            "name": "[parameters('storageAccounts_name')]",
             "apiVersion": "2016-01-01",
             "location": "[resourceGroup().location]",
             "tags": {},
diff --git a/inst/etc/template_mrs_ubuntu.json b/inst/etc/template_mrs_ubuntu.json
index 0de6896..a5bedfc 100644
--- a/inst/etc/template_mrs_ubuntu.json
+++ b/inst/etc/template_mrs_ubuntu.json
@@ -15,39 +15,39 @@
             "defaultValue": null,
             "type": "String"
     	},
-        "virtualMachines_newdsvm_adminPassword": {
+        "virtualMachines_adminPassword": {
             "defaultValue": null,
             "type": "SecureString"
         },
-        "virtualMachines_newdsvm_name": {
+        "virtualMachines_name": {
             "defaultValue": "newdsvm",
             "type": "String"
         },
-        "networkInterfaces_newdsvm161_name": {
-            "defaultValue": "newdsvm161",
+        "networkInterfaces_name": {
+            "defaultValue": "newdsvm-ni",
             "type": "String"
         },
-        "networkSecurityGroups_newdsvm_nsg_name": {
+        "networkSecurityGroups_nsg_name": {
             "defaultValue": "newdsvm-nsg",
             "type": "String"
         },
-        "publicIPAddresses_newdsvm_ip_name": {
+        "publicIPAddresses_ip_name": {
             "defaultValue": "newdsvm-ip",
             "type": "String"
         },
-        "virtualNetworks_dsvm_vnet_name": {
+        "virtualNetworks_name": {
             "defaultValue": "dsvm-vnet",
             "type": "String"
         },
-        "storageAccounts_dsvmdisks490_name": {
-            "defaultValue": "dsvmdisks490",
+        "storageAccounts_name": {
+            "defaultValue": "dsvmdisks",
             "type": "String"
         }
     },
     "resources": [
         {
             "type": "Microsoft.Compute/virtualMachines",
-            "name": "[parameters('virtualMachines_newdsvm_name')]",
+            "name": "[parameters('virtualMachines_name')]",
             "apiVersion": "2016-04-30-preview",
             "location": "[parameters('location')]",
             "properties": {
@@ -62,36 +62,36 @@
                         "version": "latest"
                     },
                     "osDisk": {
-                        "name": "[parameters('virtualMachines_newdsvm_name')]",
+                        "name": "[parameters('virtualMachines_name')]",
                         "createOption": "FromImage",
                         "vhd": {
-                            "uri": "[concat('https', '://', parameters('storageAccounts_dsvmdisks490_name'), '.blob.core.windows.net', concat('/vhds/', parameters('virtualMachines_newdsvm_name'),'20168192442.vhd'))]"
+                            "uri": "[concat('https', '://', parameters('storageAccounts_name'), '.blob.core.windows.net', concat('/vhds/', parameters('virtualMachines_name'),'20168192442.vhd'))]"
                         },
                         "caching": "ReadWrite"
                     }
                 },
                 "osProfile": {
-                    "computerName": "[parameters('virtualMachines_newdsvm_name')]",
+                    "computerName": "[parameters('virtualMachines_name')]",
                     "adminUsername": "[parameters('adminUsername')]",
-                    "adminPassword": "[parameters('virtualMachines_newdsvm_adminPassword')]"
+                    "adminPassword": "[parameters('virtualMachines_adminPassword')]"
                 },
                 "networkProfile": {
                     "networkInterfaces": [
                         {
-                            "id": "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_newdsvm161_name'))]"
+                            "id": "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_name'))]"
                         }
                     ]
                 }
             },
             "resources": [],
             "dependsOn": [
-                "[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_dsvmdisks490_name'))]",
-                "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_newdsvm161_name'))]"
+                "[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccounts_name'))]",
+                "[resourceId('Microsoft.Network/networkInterfaces', parameters('networkInterfaces_name'))]"
             ]
         },
         {
             "type": "Microsoft.Network/networkInterfaces",
-            "name": "[parameters('networkInterfaces_newdsvm161_name')]",
+            "name": "[parameters('networkInterfaces_name')]",
             "apiVersion": "2016-03-30",
             "location": "[parameters('location')]",
             "properties": {
@@ -102,10 +102,10 @@
                             "privateIPAddress": "10.0.0.4",
                             "privateIPAllocationMethod": "Dynamic",
                             "publicIPAddress": {
-                                "id": "[resourceId('Microsoft.Network/publicIPAddresses', parameters('publicIPAddresses_newdsvm_ip_name'))]"
+                                "id": "[resourceId('Microsoft.Network/publicIPAddresses', parameters('publicIPAddresses_ip_name'))]"
                             },
                             "subnet": {
-                                "id": "[concat(resourceId('Microsoft.Network/virtualNetworks', parameters('virtualNetworks_dsvm_vnet_name')), '/subnets/default')]"
+                                "id": "[concat(resourceId('Microsoft.Network/virtualNetworks', parameters('virtualNetworks_name')), '/subnets/default')]"
                             }
                         }
                     }
@@ -115,19 +115,19 @@
                 },
                 "enableIPForwarding": false,
                 "networkSecurityGroup": {
-                    "id": "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_newdsvm_nsg_name'))]"
+                    "id": "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_name'))]"
                 }
             },
             "resources": [],
             "dependsOn": [
-                "[resourceId('Microsoft.Network/publicIPAddresses', parameters('publicIPAddresses_newdsvm_ip_name'))]",
-                "[resourceId('Microsoft.Network/virtualNetworks', parameters('virtualNetworks_dsvm_vnet_name'))]",
-                "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_newdsvm_nsg_name'))]"
+                "[resourceId('Microsoft.Network/publicIPAddresses', parameters('publicIPAddresses_ip_name'))]",
+                "[resourceId('Microsoft.Network/virtualNetworks', parameters('virtualNetworks_name'))]",
+                "[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_nsg_name'))]"
             ]
         },
         {
             "type": "Microsoft.Network/networkSecurityGroups",
-            "name": "[parameters('networkSecurityGroups_newdsvm_nsg_name')]",
+            "name": "[parameters('networkSecurityGroups_nsg_name')]",
             "apiVersion": "2016-03-30",
             "location": "[parameters('location')]",
             "properties": {
@@ -217,7 +217,7 @@
         },
         {
             "type": "Microsoft.Network/publicIPAddresses",
-            "name": "[parameters('publicIPAddresses_newdsvm_ip_name')]",
+            "name": "[parameters('publicIPAddresses_ip_name')]",
             "apiVersion": "2016-03-30",
             "location": "[parameters('location')]",
             "properties": {
@@ -232,7 +232,7 @@
         },
         {
             "type": "Microsoft.Network/virtualNetworks",
-            "name": "[parameters('virtualNetworks_dsvm_vnet_name')]",
+            "name": "[parameters('virtualNetworks_name')]",
             "apiVersion": "2016-03-30",
             "location": "[parameters('location')]",
             "properties": {
@@ -260,7 +260,7 @@
                 "tier": "Standard"
             },
             "kind": "Storage",
-            "name": "[parameters('storageAccounts_dsvmdisks490_name')]",
+            "name": "[parameters('storageAccounts_name')]",
             "apiVersion": "2016-01-01",
             "location": "[parameters('location')]",
             "tags": {},
diff --git a/inst/etc/template_windows.json b/inst/etc/template_windows.json
index 7ffbbbd..461e983 100644
--- a/inst/etc/template_windows.json
+++ b/inst/etc/template_windows.json
@@ -39,7 +39,7 @@
             "type": "String"
         },
         "storageAccounts_name": {
-            "defaultValue": "dsvmdisks490",
+            "defaultValue": "dsvmdisks",
             "type": "String"
         }
     },