diff --git a/quickstart/201-machine-learning-moderately-secure/network.tf b/quickstart/201-machine-learning-moderately-secure/network.tf
index b1fcb2e8..3bcb8f41 100644
--- a/quickstart/201-machine-learning-moderately-secure/network.tf
+++ b/quickstart/201-machine-learning-moderately-secure/network.tf
@@ -6,24 +6,24 @@ resource "azurerm_virtual_network" "default" {
   resource_group_name = azurerm_resource_group.default.name
 }
 
-resource "azurerm_subnet" "training-subnet" {
-  name                 = "training-subnet"
+resource "azurerm_subnet" "snet-training" {
+  name                 = "snet-training"
   resource_group_name  = azurerm_resource_group.default.name
   virtual_network_name = azurerm_virtual_network.default.name
   address_prefixes     = var.training_subnet_address_space
   enforce_private_link_endpoint_network_policies = true
 }
 
-resource "azurerm_subnet" "aks-subnet" {
-  name                 = "aks-subnet"
+resource "azurerm_subnet" "snet-aks" {
+  name                 = "snet-aks"
   resource_group_name  = azurerm_resource_group.default.name
   virtual_network_name = azurerm_virtual_network.default.name
   address_prefixes     = var.aks_subnet_address_space
   enforce_private_link_endpoint_network_policies = true
 }
 
-resource "azurerm_subnet" "ml-subnet" {
-  name                 = "ml-subnet"
+resource "azurerm_subnet" "snet-workspace" {
+  name                 = "snet-workspace"
   resource_group_name  = azurerm_resource_group.default.name
   virtual_network_name = azurerm_virtual_network.default.name
   address_prefixes     = var.ml_subnet_address_space
@@ -106,8 +106,8 @@ resource "azurerm_private_dns_zone_virtual_network_link" "vnetlinknbs" {
 
 # Network Security Groups
 
-resource "azurerm_network_security_group" "training-NSG" {
-  name                = "training-NSG"
+resource "azurerm_network_security_group" "nsg-training" {
+  name                = "nsg-training"
   location            = azurerm_resource_group.default.location
   resource_group_name = azurerm_resource_group.default.name
 
@@ -135,29 +135,29 @@ resource "azurerm_network_security_group" "training-NSG" {
   }
 }
 
-resource "azurerm_subnet_network_security_group_association" "training-NSG-link" {
-  subnet_id                 = azurerm_subnet.training-subnet.id
-  network_security_group_id = azurerm_network_security_group.training-NSG.id
+resource "azurerm_subnet_network_security_group_association" "nsg-training-link" {
+  subnet_id                 = azurerm_subnet.snet-training.id
+  network_security_group_id = azurerm_network_security_group.nsg-training.id
 }
 
-resource "azurerm_network_security_group" "aks-NSG" {
-  name                = "aks-NSG"
+resource "azurerm_network_security_group" "nsg-aks" {
+  name                = "nsg-aks"
   location            = azurerm_resource_group.default.location
   resource_group_name = azurerm_resource_group.default.name
 
 
 }
 
-resource "azurerm_subnet_network_security_group_association" "aks-NSG-link" {
-  subnet_id                 = azurerm_subnet.aks-subnet.id
-  network_security_group_id = azurerm_network_security_group.aks-NSG.id
+resource "azurerm_subnet_network_security_group_association" "nsg-aks-link" {
+  subnet_id                 = azurerm_subnet.snet-aks.id
+  network_security_group_id = azurerm_network_security_group.nsg-aks.id
 }
 
 # User Defined Routes
 
 #UDR for Compute instance and compute clusters
-resource "azurerm_route_table" "training-UDR" {
-  name                = "training-UDR"
+resource "azurerm_route_table" "rt-training" {
+  name                = "rt-training"
   location            = azurerm_resource_group.default.location
   resource_group_name = azurerm_resource_group.default.name
 }
@@ -165,7 +165,7 @@ resource "azurerm_route_table" "training-UDR" {
 resource "azurerm_route" "training-Internet-Route" {
   name                = "Internet"
   resource_group_name = azurerm_resource_group.default.name
-  route_table_name    = azurerm_route_table.training-UDR.name
+  route_table_name    = azurerm_route_table.rt-training.name
   address_prefix      = "0.0.0.0/0"
   next_hop_type       = "Internet"
 }
@@ -173,7 +173,7 @@ resource "azurerm_route" "training-Internet-Route" {
 resource "azurerm_route" "training-AzureMLRoute" {
   name                = "AzureMLRoute"
   resource_group_name = azurerm_resource_group.default.name
-  route_table_name    = azurerm_route_table.training-UDR.name
+  route_table_name    = azurerm_route_table.rt-training.name
   address_prefix      = "AzureMachineLearning"
   next_hop_type       = "Internet"
 }
@@ -181,19 +181,19 @@ resource "azurerm_route" "training-AzureMLRoute" {
 resource "azurerm_route" "training-BatchRoute" {
   name                = "BatchRoute"
   resource_group_name = azurerm_resource_group.default.name
-  route_table_name    = azurerm_route_table.training-UDR.name
+  route_table_name    = azurerm_route_table.rt-training.name
   address_prefix      = "BatchNodeManagement"
   next_hop_type       = "Internet"
 }
 
-resource "azurerm_subnet_route_table_association" "training-UDRlink" {
-  subnet_id      = azurerm_subnet.training-subnet.id
-  route_table_id = azurerm_route_table.training-UDR.id
+resource "azurerm_subnet_route_table_association" "rt-training-link" {
+  subnet_id      = azurerm_subnet.snet-training.id
+  route_table_id = azurerm_route_table.rt-training.id
 }
 # Inferencing (AKS) Route
 
-resource "azurerm_route_table" "aks-UDR" {
-  name                = "aks-UDR"
+resource "azurerm_route_table" "rt-aks" {
+  name                = "rt-aks"
   location            = azurerm_resource_group.default.location
   resource_group_name = azurerm_resource_group.default.name
 }
@@ -201,12 +201,12 @@ resource "azurerm_route_table" "aks-UDR" {
 resource "azurerm_route" "aks-Internet-Route" {
   name                = "Internet"
   resource_group_name = azurerm_resource_group.default.name
-  route_table_name    = azurerm_route_table.aks-UDR.name
+  route_table_name    = azurerm_route_table.rt-aks.name
   address_prefix      = "0.0.0.0/0"
   next_hop_type       = "Internet"
 }
 
-resource "azurerm_subnet_route_table_association" "aks-UDR-link" {
-  subnet_id      = azurerm_subnet.aks-subnet.id
-  route_table_id = azurerm_route_table.aks-UDR.id
+resource "azurerm_subnet_route_table_association" "rt-aks-link" {
+  subnet_id      = azurerm_subnet.snet-aks.id
+  route_table_id = azurerm_route_table.rt-aks.id
 }
\ No newline at end of file
diff --git a/quickstart/201-machine-learning-moderately-secure/workspace.tf b/quickstart/201-machine-learning-moderately-secure/workspace.tf
index dc4beb33..a6bc89d9 100644
--- a/quickstart/201-machine-learning-moderately-secure/workspace.tf
+++ b/quickstart/201-machine-learning-moderately-secure/workspace.tf
@@ -61,7 +61,7 @@ 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.ml-subnet.id
+  subnet_id           = azurerm_subnet.snet-workspace.id
 
   private_dns_zone_group {
     name                 = "private-dns-zone-group"
@@ -80,7 +80,7 @@ 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.ml-subnet.id
+  subnet_id           = azurerm_subnet.snet-workspace.id
 
   private_dns_zone_group {
     name                 = "private-dns-zone-group"
@@ -99,7 +99,7 @@ resource "azurerm_private_endpoint" "storage_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.ml-subnet.id
+  subnet_id           = azurerm_subnet.snet-workspace.id
 
   private_dns_zone_group {
     name                 = "private-dns-zone-group"
@@ -118,7 +118,7 @@ resource "azurerm_private_endpoint" "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.ml-subnet.id
+  subnet_id           = azurerm_subnet.snet-workspace.id
 
   private_dns_zone_group {
     name                 = "private-dns-zone-group"
@@ -137,7 +137,7 @@ 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.ml-subnet.id
+  subnet_id           = azurerm_subnet.snet-workspace.id
 
   private_dns_zone_group {
     name                 = "private-dns-zone-group"
@@ -162,7 +162,7 @@ resource "azurerm_machine_learning_compute_cluster" "image-builder" {
   vm_priority                   = "LowPriority"
   vm_size                       = "Standard_DS2_v2"
   machine_learning_workspace_id = azurerm_machine_learning_workspace.default.id
-  subnet_resource_id            = azurerm_subnet.training-subnet.id
+  subnet_resource_id            = azurerm_subnet.snet-training.id
 
   scale_settings {
     min_node_count                       = 0