diff --git a/quickstart/101-machine-learning/main.tf b/quickstart/101-machine-learning/main.tf
index a2d6a6f7..3c5cf513 100644
--- a/quickstart/101-machine-learning/main.tf
+++ b/quickstart/101-machine-learning/main.tf
@@ -16,6 +16,6 @@ provider "azurerm" {
 data "azurerm_client_config" "current" {}
 
 resource "azurerm_resource_group" "default" {
-  name     = "${var.name}-${var.environment}-rgp"
-  location = "${var.location}"
+  name     = "rg-${var.name}-${var.environment}"
+  location = var.location
 }
\ No newline at end of file
diff --git a/quickstart/101-machine-learning/readme.md b/quickstart/101-machine-learning/readme.md
index 1bf3d7c5..0bfd76f1 100644
--- a/quickstart/101-machine-learning/readme.md
+++ b/quickstart/101-machine-learning/readme.md
@@ -1,9 +1,9 @@
 # Azure Machine Learning workspace
 
-This deployment template specifies an [Azure Machine Learning workspace](https://docs.microsoft.com/en-us/azure/machine-learning/concept-workspace), 
+This deployment configuration specifies an [Azure Machine Learning workspace](https://docs.microsoft.com/en-us/azure/machine-learning/concept-workspace), 
 and its associated resources including Azure Key Vault, Azure Storage, Azure Application Insights and Azure Container Registry.
 
-This template describes the minimal set of resources you require to get started with Azure Machine Learning.
+This configuration describes the minimal set of resources you require to get started with Azure Machine Learning.
 
 ## Resources
 
diff --git a/quickstart/101-machine-learning/variables.tf b/quickstart/101-machine-learning/variables.tf
index 8140ad98..2eef923b 100644
--- a/quickstart/101-machine-learning/variables.tf
+++ b/quickstart/101-machine-learning/variables.tf
@@ -1,7 +1,6 @@
 variable "name" {
   type        = string
   description = "Name of the deployment"
-  default     = "azureml999"
 }
 
 variable "environment" {
diff --git a/quickstart/101-machine-learning/workspace.tf b/quickstart/101-machine-learning/workspace.tf
index de924454..edc60426 100644
--- a/quickstart/101-machine-learning/workspace.tf
+++ b/quickstart/101-machine-learning/workspace.tf
@@ -1,13 +1,13 @@
 # Dependent resources for Azure Machine Learning
 resource "azurerm_application_insights" "default" {
-  name                = "${var.name}-${var.environment}-ain"
+  name                = "appi-${var.name}-${var.environment}"
   location            = azurerm_resource_group.default.location
   resource_group_name = azurerm_resource_group.default.name
   application_type    = "web"
 }
 
 resource "azurerm_key_vault" "default" {
-  name                     = "${var.name}${var.environment}kv"
+  name                     = "kv-${var.name}-${var.environment}"
   location                 = azurerm_resource_group.default.location
   resource_group_name      = azurerm_resource_group.default.name
   tenant_id                = data.azurerm_client_config.current.tenant_id
@@ -21,7 +21,7 @@ resource "azurerm_key_vault" "default" {
 }
 
 resource "azurerm_storage_account" "default" {
-  name                     = "${var.name}${var.environment}sa"
+  name                     = "st${var.name}${var.environment}"
   location                 = azurerm_resource_group.default.location
   resource_group_name      = azurerm_resource_group.default.name
   account_tier             = "Standard"
@@ -34,7 +34,7 @@ resource "azurerm_storage_account" "default" {
 }
 
 resource "azurerm_container_registry" "default" {
-  name                     = "${var.name}${var.environment}cr"
+  name                     = "cr${var.name}${var.environment}"
   location                 = azurerm_resource_group.default.location
   resource_group_name      = azurerm_resource_group.default.name
   sku                      = "Premium"
@@ -43,7 +43,7 @@ resource "azurerm_container_registry" "default" {
 
 # Machine Learning workspace
 resource "azurerm_machine_learning_workspace" "default" {
-  name                    = "${var.name}-${var.environment}-aml"
+  name                    = "mlw-${var.name}-${var.environment}"
   location                = azurerm_resource_group.default.location
   resource_group_name     = azurerm_resource_group.default.name
   application_insights_id = azurerm_application_insights.default.id
diff --git a/quickstart/201-machine-learning-private/main.tf b/quickstart/201-machine-learning-private/main.tf
index 5f1e8381..b6b66a46 100644
--- a/quickstart/201-machine-learning-private/main.tf
+++ b/quickstart/201-machine-learning-private/main.tf
@@ -16,6 +16,6 @@ provider "azurerm" {
 data "azurerm_client_config" "current" {}
 
 resource "azurerm_resource_group" "default" {
-  name     = "${var.name}-${var.environment}-rgp"
-  location = "${var.location}"
-}
\ No newline at end of file
+  name     = "rg-${var.name}-${var.environment}"
+  location = var.location
+}
diff --git a/quickstart/201-machine-learning-private/network.tf b/quickstart/201-machine-learning-private/network.tf
index 65d7b682..dbf1b6a6 100644
--- a/quickstart/201-machine-learning-private/network.tf
+++ b/quickstart/201-machine-learning-private/network.tf
@@ -1,6 +1,6 @@
 # Virtual Network
 resource "azurerm_virtual_network" "default" {
-  name                = "${var.name}-${var.environment}-vnet"
+  name                = "vnet-${var.name}-${var.environment}"
   address_space       = var.vnet_address_space
   location            = azurerm_resource_group.default.location
   resource_group_name = azurerm_resource_group.default.name
diff --git a/quickstart/201-machine-learning-private/readme.md b/quickstart/201-machine-learning-private/readme.md
index 221333ab..70c1b663 100644
--- a/quickstart/201-machine-learning-private/readme.md
+++ b/quickstart/201-machine-learning-private/readme.md
@@ -1,12 +1,12 @@
 # Azure Machine Learning workspace using Azure Private Link
 
-This deployment template specifies an [Azure Machine Learning workspace](https://docs.microsoft.com/en-us/azure/machine-learning/concept-workspace), 
+This deployment configuration specifies an [Azure Machine Learning workspace](https://docs.microsoft.com/en-us/azure/machine-learning/concept-workspace), 
 and its associated resources including Azure Key Vault, Azure Storage, Azure Application Insights and Azure Container Registry.
 
-In addition to these core services, this template deploys any networking components that are required to set up Azure Machine Learning
+In addition to these core services, this configuration specifies any networking components that are required to set up Azure Machine Learning
 for private network connectivity using [Azure Private Link](https://docs.microsoft.com/en-us/azure/private-link/). 
 
-This template describes the minimal set of resources you require to get started with Azure Machine Learning in a network-isolated set-up.
+This configuration describes the minimal set of resources you require to get started with Azure Machine Learning in a network-isolated set-up.
 
 To learn more about security configurations in Azure Machine Learning, see [Enterprise security and governance for Azure Machine Learning](https://docs.microsoft.com/en-us/azure/machine-learning/concept-enterprise-security).
 
diff --git a/quickstart/201-machine-learning-private/variables.tf b/quickstart/201-machine-learning-private/variables.tf
index 274468c6..ae58bfd1 100644
--- a/quickstart/201-machine-learning-private/variables.tf
+++ b/quickstart/201-machine-learning-private/variables.tf
@@ -1,7 +1,6 @@
 variable "name" {
   type        = string
   description = "Name of the deployment"
-  default     = "azureml568"
 }
 
 variable "environment" {
diff --git a/quickstart/201-machine-learning-private/workspace.tf b/quickstart/201-machine-learning-private/workspace.tf
index 911dbe80..da718bc2 100644
--- a/quickstart/201-machine-learning-private/workspace.tf
+++ b/quickstart/201-machine-learning-private/workspace.tf
@@ -1,18 +1,18 @@
-# Dependent resources for the workspace
+# Dependent resources for Azure Machine Learning
 resource "azurerm_application_insights" "default" {
-  name                = "${var.name}-${var.environment}-ain"
+  name                = "appi-${var.name}-${var.environment}"
   location            = azurerm_resource_group.default.location
   resource_group_name = azurerm_resource_group.default.name
   application_type    = "web"
 }
 
 resource "azurerm_key_vault" "default" {
-  name                     = "${var.name}${var.environment}kv"
+  name                     = "kv-${var.name}-${var.environment}"
   location                 = azurerm_resource_group.default.location
   resource_group_name      = azurerm_resource_group.default.name
   tenant_id                = data.azurerm_client_config.current.tenant_id
   sku_name                 = "premium"
-  purge_protection_enabled = true
+  purge_protection_enabled = false
   
   network_acls {
     default_action = "Deny"
@@ -21,7 +21,7 @@ resource "azurerm_key_vault" "default" {
 }
 
 resource "azurerm_storage_account" "default" {
-  name                     = "${var.name}${var.environment}sa"
+  name                     = "st${var.name}${var.environment}"
   location                 = azurerm_resource_group.default.location
   resource_group_name      = azurerm_resource_group.default.name
   account_tier             = "Standard"
@@ -34,7 +34,7 @@ resource "azurerm_storage_account" "default" {
 }
 
 resource "azurerm_container_registry" "default" {
-  name                     = "${var.name}${var.environment}cr"
+  name                     = "cr${var.name}${var.environment}"
   location                 = azurerm_resource_group.default.location
   resource_group_name      = azurerm_resource_group.default.name
   sku                      = "Premium"
@@ -43,7 +43,7 @@ resource "azurerm_container_registry" "default" {
 
 # Machine Learning workspace
 resource "azurerm_machine_learning_workspace" "default" {
-  name                    = "${var.name}-${var.environment}-aml"
+  name                    = "mlw-${var.name}-${var.environment}"
   location                = azurerm_resource_group.default.location
   resource_group_name     = azurerm_resource_group.default.name
   application_insights_id = azurerm_application_insights.default.id
@@ -57,8 +57,8 @@ resource "azurerm_machine_learning_workspace" "default" {
 }
 
 # Private endpoints
-resource "azurerm_private_endpoint" "keyvault_ple" {
-  name                = "${var.name}-${var.environment}-kv-ple"
+resource "azurerm_private_endpoint" "kv_ple" {
+  name                = "ple-${var.name}-${var.environment}-kv"
   location            = azurerm_resource_group.default.location
   resource_group_name = azurerm_resource_group.default.name
   subnet_id           = azurerm_subnet.mlsubnet.id
@@ -69,15 +69,15 @@ resource "azurerm_private_endpoint" "keyvault_ple" {
   }
 
   private_service_connection {
-    name                           = "${var.name}kv-psc"
+    name                           = "psc-${var.name}-kv"
     private_connection_resource_id = azurerm_key_vault.default.id
     subresource_names              = [ "vault" ]
     is_manual_connection           = false
   }
 }
 
-resource "azurerm_private_endpoint" "storage_ple_blob" {
-  name                = "${var.name}-${var.environment}-sa-ple-blob"
+resource "azurerm_private_endpoint" "st_ple_blob" {
+  name                = "ple-${var.name}-${var.environment}-st-blob"
   location            = azurerm_resource_group.default.location
   resource_group_name = azurerm_resource_group.default.name
   subnet_id           = azurerm_subnet.mlsubnet.id
@@ -88,7 +88,7 @@ resource "azurerm_private_endpoint" "storage_ple_blob" {
   }
 
   private_service_connection {
-    name                           = "${var.name}sa-psc"
+    name                           = "psc-${var.name}-st"
     private_connection_resource_id = azurerm_storage_account.default.id
     subresource_names              = [ "blob" ]
     is_manual_connection           = false
@@ -96,7 +96,7 @@ resource "azurerm_private_endpoint" "storage_ple_blob" {
 }
 
 resource "azurerm_private_endpoint" "storage_ple_file" {
-  name                = "${var.name}-${var.environment}-sa-ple-file"
+  name                = "ple-${var.name}-${var.environment}-st-file"
   location            = azurerm_resource_group.default.location
   resource_group_name = azurerm_resource_group.default.name
   subnet_id           = azurerm_subnet.mlsubnet.id
@@ -107,7 +107,7 @@ resource "azurerm_private_endpoint" "storage_ple_file" {
   }
 
   private_service_connection {
-    name                           = "${var.name}sa-psc"
+    name                           = "psc-${var.name}-st"
     private_connection_resource_id = azurerm_storage_account.default.id
     subresource_names              = [ "file" ]
     is_manual_connection           = false
@@ -115,7 +115,7 @@ resource "azurerm_private_endpoint" "storage_ple_file" {
 }
 
 resource "azurerm_private_endpoint" "cr_ple" {
-  name                = "${var.name}-${var.environment}-cr-ple"
+  name                = "ple-${var.name}-${var.environment}-cr"
   location            = azurerm_resource_group.default.location
   resource_group_name = azurerm_resource_group.default.name
   subnet_id           = azurerm_subnet.mlsubnet.id
@@ -126,15 +126,15 @@ resource "azurerm_private_endpoint" "cr_ple" {
   }
 
   private_service_connection {
-    name                           = "${var.name}cr-psc"
+    name                           = "psc-${var.name}-cr"
     private_connection_resource_id = azurerm_container_registry.default.id
     subresource_names              = [ "registry" ]
     is_manual_connection           = false
   }
 }
 
-resource "azurerm_private_endpoint" "ml_ple" {
-  name                = "${var.name}-${var.environment}-ml-ple"
+resource "azurerm_private_endpoint" "mlw_ple" {
+  name                = "ple-${var.name}-${var.environment}-mlw"
   location            = azurerm_resource_group.default.location
   resource_group_name = azurerm_resource_group.default.name
   subnet_id           = azurerm_subnet.mlsubnet.id
@@ -148,7 +148,7 @@ resource "azurerm_private_endpoint" "ml_ple" {
   }
 
   private_service_connection {
-    name                           = "${var.name}ml-psc"
+    name                           = "psc-${var.name}-mlw"
     private_connection_resource_id = azurerm_machine_learning_workspace.default.id
     subresource_names              = [ "amlworkspace" ]
     is_manual_connection           = false