diff --git a/examples/auto_heal_enabled/main.tf b/examples/auto_heal_enabled/main.tf
index 34f43e8..3d60cd2 100644
--- a/examples/auto_heal_enabled/main.tf
+++ b/examples/auto_heal_enabled/main.tf
@@ -19,7 +19,7 @@ module "naming" {
 }
 
 module "avm_res_resources_resourcegroup" {
-  source  = "Azure/avm_res_resources_resourcegroup/azurerm"
+  source  = "Azure/avm-res-resources-resourcegroup/azurerm"
   version = "0.1.0"
 
   location = local.azure_regions[random_integer.region_index.result]
@@ -27,7 +27,7 @@ module "avm_res_resources_resourcegroup" {
 }
 
 module "avm_res_web_serverfarm" {
-  source  = "Azure/avm_res_web_serverfarm/azurerm"
+  source  = "Azure/avm-res-web-serverfarm/azurerm"
   version = "0.2.0"
 
   enable_telemetry = var.enable_telemetry
@@ -42,7 +42,7 @@ module "avm_res_web_serverfarm" {
 module "avm_res_web_site" {
   source = "../../"
 
-  # source             = "Azure/avm_res_web_site/azurerm"
+  # source             = "Azure/avm-res-web-site/azurerm"
   # version = "0.11.0"
 
   enable_telemetry = var.enable_telemetry
diff --git a/examples/basic_auth/main.tf b/examples/basic_auth/main.tf
index 9acd107..cb4be27 100644
--- a/examples/basic_auth/main.tf
+++ b/examples/basic_auth/main.tf
@@ -19,19 +19,19 @@ module "naming" {
 }
 
 module "avm_res_resources_resourcegroup" {
-  source  = "Azure/avm_res_resources_resourcegroup/azurerm"
+  source  = "Azure/avm-res-resources-resourcegroup/azurerm"
   version = "0.1.0"
 
   location = local.azure_regions[random_integer.region_index.result]
   name     = module.naming.resource_group.name_unique
   tags = {
-    module  = "Azure/avm_res_resources_resourcegroup/azurerm"
+    module  = "Azure/avm-res-resources-resourcegroup/azurerm"
     version = "0.1.0"
   }
 }
 
 module "avm_res_web_serverfarm" {
-  source  = "Azure/avm_res_web_serverfarm/azurerm"
+  source  = "Azure/avm-res-web-serverfarm/azurerm"
   version = "0.2.0"
 
   enable_telemetry = var.enable_telemetry
@@ -42,13 +42,13 @@ module "avm_res_web_serverfarm" {
   os_type             = "Windows"
 
   tags = {
-    module  = "Azure/avm_res_web_serverfarm/azurerm"
+    module  = "Azure/avm-res-web-serverfarm/azurerm"
     version = "0.2.0"
   }
 }
 
 module "avm_res_storage_storageaccount" {
-  source  = "Azure/avm_res_storage_storageaccount/azurerm"
+  source  = "Azure/avm-res-storage-storageaccount/azurerm"
   version = "0.2.4"
 
   enable_telemetry              = var.enable_telemetry
@@ -63,7 +63,7 @@ module "avm_res_storage_storageaccount" {
   }
 
   tags = {
-    module  = "Azure/avm_res_storage_storageaccount/azurerm"
+    module  = "Azure/avm-res-storage-storageaccount/azurerm"
     version = "0.2.4"
   }
 
diff --git a/examples/custom_domain/main.tf b/examples/custom_domain/main.tf
index 8e4d617..3350ea6 100644
--- a/examples/custom_domain/main.tf
+++ b/examples/custom_domain/main.tf
@@ -19,18 +19,18 @@ module "naming" {
 }
 
 module "avm_res_resources_resourcegroup" {
-  source  = "Azure/avm_res_resources_resourcegroup/azurerm"
+  source  = "Azure/avm-res-resources-resourcegroup/azurerm"
   version = "0.1.0"
 
   location = local.azure_regions[random_integer.region_index.result]
   name     = module.naming.resource_group.name_unique
   tags = {
-    module  = "Azure/avm_res_resources_resourcegroup/azurerm"
+    module  = "Azure/avm-res-resources-resourcegroup/azurerm"
     version = "0.1.0"
   }
 }
 module "avm_res_storage_storageaccount" {
-  source  = "Azure/avm_res_storage_storageaccount/azurerm"
+  source  = "Azure/avm-res-storage-storageaccount/azurerm"
   version = "0.2.4"
 
   enable_telemetry              = var.enable_telemetry
@@ -46,7 +46,7 @@ module "avm_res_storage_storageaccount" {
 }
 
 module "avm_res_web_serverfarm" {
-  source  = "Azure/avm_res_web_serverfarm/azurerm"
+  source  = "Azure/avm-res-web-serverfarm/azurerm"
   version = "0.2.0"
 
   enable_telemetry = var.enable_telemetry
diff --git a/examples/default/main.tf b/examples/default/main.tf
index 6ecb0ad..1d854aa 100644
--- a/examples/default/main.tf
+++ b/examples/default/main.tf
@@ -19,19 +19,19 @@ module "naming" {
 }
 
 module "avm_res_resources_resourcegroup" {
-  source  = "Azure/avm_res_resources_resourcegroup/azurerm"
+  source  = "Azure/avm-res-resources-resourcegroup/azurerm"
   version = "0.1.0"
 
   location = local.azure_regions[random_integer.region_index.result]
   name     = module.naming.resource_group.name_unique
   tags = {
-    module  = "Azure/avm_res_resources_resourcegroup/azurerm"
+    module  = "Azure/avm-res-resources-resourcegroup/azurerm"
     version = "0.1.0"
   }
 }
 
 module "avm_res_web_serverfarm" {
-  source  = "Azure/avm_res_web_serverfarm/azurerm"
+  source  = "Azure/avm-res-web-serverfarm/azurerm"
   version = "0.2.0"
 
   enable_telemetry = var.enable_telemetry
@@ -42,13 +42,13 @@ module "avm_res_web_serverfarm" {
   os_type             = "Windows"
 
   tags = {
-    module  = "Azure/avm_res_web_serverfarm/azurerm"
+    module  = "Azure/avm-res-web-serverfarm/azurerm"
     version = "0.2.0"
   }
 }
 
 module "avm_res_storage_storageaccount" {
-  source  = "Azure/avm_res_storage_storageaccount/azurerm"
+  source  = "Azure/avm-res-storage-storageaccount/azurerm"
   version = "0.2.4"
 
   enable_telemetry              = var.enable_telemetry
@@ -63,7 +63,7 @@ module "avm_res_storage_storageaccount" {
   }
 
   tags = {
-    module  = "Azure/avm_res_storage_storageaccount/azurerm"
+    module  = "Azure/avm-res-storage-storageaccount/azurerm"
     version = "0.2.4"
   }
 
diff --git a/examples/deployment_slot_with_interfaces/main.tf b/examples/deployment_slot_with_interfaces/main.tf
index 42fa32b..c6eaf37 100644
--- a/examples/deployment_slot_with_interfaces/main.tf
+++ b/examples/deployment_slot_with_interfaces/main.tf
@@ -19,13 +19,13 @@ module "naming" {
 }
 
 module "avm_res_resources_resourcegroup" {
-  source  = "Azure/avm_res_resources_resourcegroup/azurerm"
+  source  = "Azure/avm-res-resources-resourcegroup/azurerm"
   version = "0.1.0"
 
   location = local.azure_regions[random_integer.region_index.result]
   name     = module.naming.resource_group.name_unique
   tags = {
-    module  = "Azure/avm_res_resources_resourcegroup/azurerm"
+    module  = "Azure/avm-res-resources-resourcegroup/azurerm"
     version = "0.1.0"
   }
 }
@@ -57,7 +57,7 @@ resource "azurerm_private_dns_zone_virtual_network_link" "example" {
 }
 
 module "avm_res_web_serverfarm" {
-  source  = "Azure/avm_res_web_serverfarm/azurerm"
+  source  = "Azure/avm-res-web-serverfarm/azurerm"
   version = "0.2.0"
 
   enable_telemetry = var.enable_telemetry
@@ -69,7 +69,7 @@ module "avm_res_web_serverfarm" {
 }
 
 module "avm_res_storage_storageaccount" {
-  source  = "Azure/avm_res_storage_storageaccount/azurerm"
+  source  = "Azure/avm-res-storage-storageaccount/azurerm"
   version = "0.2.4"
 
   enable_telemetry              = var.enable_telemetry
diff --git a/examples/function_app/main.tf b/examples/function_app/main.tf
index eae073c..d5c73cd 100644
--- a/examples/function_app/main.tf
+++ b/examples/function_app/main.tf
@@ -19,19 +19,19 @@ module "naming" {
 }
 
 module "avm_res_resources_resourcegroup" {
-  source  = "Azure/avm_res_resources_resourcegroup/azurerm"
+  source  = "Azure/avm-res-resources-resourcegroup/azurerm"
   version = "0.1.0"
 
   location = local.azure_regions[random_integer.region_index.result]
   name     = module.naming.resource_group.name_unique
   tags = {
-    module  = "Azure/avm_res_resources_resourcegroup/azurerm"
+    module  = "Azure/avm-res-resources-resourcegroup/azurerm"
     version = "0.1.0"
   }
 }
 
 module "avm_res_web_serverfarm" {
-  source  = "Azure/avm_res_web_serverfarm/azurerm"
+  source  = "Azure/avm-res-web-serverfarm/azurerm"
   version = "0.2.0"
 
   enable_telemetry = var.enable_telemetry
@@ -42,13 +42,13 @@ module "avm_res_web_serverfarm" {
   os_type             = "Windows"
 
   tags = {
-    module  = "Azure/avm_res_web_serverfarm/azurerm"
+    module  = "Azure/avm-res-web-serverfarm/azurerm"
     version = "0.2.0"
   }
 }
 
 module "avm_res_storage_storageaccount" {
-  source  = "Azure/avm_res_storage_storageaccount/azurerm"
+  source  = "Azure/avm-res-storage-storageaccount/azurerm"
   version = "0.2.4"
 
   enable_telemetry              = var.enable_telemetry
@@ -63,7 +63,7 @@ module "avm_res_storage_storageaccount" {
   }
 
   tags = {
-    module  = "Azure/avm_res_storage_storageaccount/azurerm"
+    module  = "Azure/avm-res-storage-storageaccount/azurerm"
     version = "0.2.4"
   }
 
diff --git a/examples/interfaces/main.tf b/examples/interfaces/main.tf
index 2f6bed0..e78b45c 100644
--- a/examples/interfaces/main.tf
+++ b/examples/interfaces/main.tf
@@ -26,19 +26,19 @@ module "naming" {
 # }
 
 module "avm_res_resources_resourcegroup" {
-  source  = "Azure/avm_res_resources_resourcegroup/azurerm"
+  source  = "Azure/avm-res-resources-resourcegroup/azurerm"
   version = "0.1.0"
 
   location = local.azure_regions[random_integer.region_index.result]
   name     = module.naming.resource_group.name_unique
   tags = {
-    module  = "Azure/avm_res_resources_resourcegroup/azurerm"
+    module  = "Azure/avm-res-resources-resourcegroup/azurerm"
     version = "0.1.0"
   }
 }
 
 module "avm_res_storage_storageaccount" {
-  source  = "Azure/avm_res_storage_storageaccount/azurerm"
+  source  = "Azure/avm-res-storage-storageaccount/azurerm"
   version = "0.2.4"
 
   enable_telemetry              = var.enable_telemetry
@@ -53,7 +53,7 @@ module "avm_res_storage_storageaccount" {
   }
 
   tags = {
-    module  = "Azure/avm_res_storage_storageaccount/azurerm"
+    module  = "Azure/avm-res-storage-storageaccount/azurerm"
     version = "0.2.4"
   }
 
@@ -100,7 +100,7 @@ resource "azurerm_user_assigned_identity" "user" {
 }
 
 module "avm_res_web_serverfarm" {
-  source  = "Azure/avm_res_web_serverfarm/azurerm"
+  source  = "Azure/avm-res-web-serverfarm/azurerm"
   version = "0.2.0"
 
   enable_telemetry = var.enable_telemetry
@@ -111,7 +111,7 @@ module "avm_res_web_serverfarm" {
   os_type             = "Windows"
 
   tags = {
-    module  = "Azure/avm_res_web_serverfarm/azurerm"
+    module  = "Azure/avm-res-web-serverfarm/azurerm"
     version = "0.2.0"
   }
 }
diff --git a/examples/ip_restriction/main.tf b/examples/ip_restriction/main.tf
index 8f8ae7c..c697f89 100644
--- a/examples/ip_restriction/main.tf
+++ b/examples/ip_restriction/main.tf
@@ -20,19 +20,19 @@ module "naming" {
 
 # This is required for resource modules
 module "avm_res_resources_resourcegroup" {
-  source  = "Azure/avm_res_resources_resourcegroup/azurerm"
+  source  = "Azure/avm-res-resources-resourcegroup/azurerm"
   version = "0.1.0"
 
   location = local.azure_regions[random_integer.region_index.result]
   name     = module.naming.resource_group.name_unique
   tags = {
-    module  = "Azure/avm_res_resources_resourcegroup/azurerm"
+    module  = "Azure/avm-res-resources-resourcegroup/azurerm"
     version = "0.1.0"
   }
 }
 
 module "avm_res_web_serverfarm" {
-  source  = "Azure/avm_res_web_serverfarm/azurerm"
+  source  = "Azure/avm-res-web-serverfarm/azurerm"
   version = "0.2.0"
 
   enable_telemetry = var.enable_telemetry
@@ -43,13 +43,13 @@ module "avm_res_web_serverfarm" {
   os_type             = "Linux"
 
   tags = {
-    module  = "Azure/avm_res_web_serverfarm/azurerm"
+    module  = "Azure/avm-res-web-serverfarm/azurerm"
     version = "0.2.0"
   }
 }
 
 module "avm_res_storage_storageaccount" {
-  source  = "Azure/avm_res_storage_storageaccount/azurerm"
+  source  = "Azure/avm-res-storage-storageaccount/azurerm"
   version = "0.2.4"
 
   enable_telemetry              = var.enable_telemetry
@@ -64,7 +64,7 @@ module "avm_res_storage_storageaccount" {
   }
 
   tags = {
-    module  = "Azure/avm_res_storage_storageaccount/azurerm"
+    module  = "Azure/avm-res-storage-storageaccount/azurerm"
     version = "0.2.4"
   }
 
diff --git a/examples/logs/main.tf b/examples/logs/main.tf
index c58bb62..f562d0d 100644
--- a/examples/logs/main.tf
+++ b/examples/logs/main.tf
@@ -19,19 +19,19 @@ module "naming" {
 }
 
 module "avm_res_resources_resourcegroup" {
-  source  = "Azure/avm_res_resources_resourcegroup/azurerm"
+  source  = "Azure/avm-res-resources-resourcegroup/azurerm"
   version = "0.1.0"
 
   location = local.azure_regions[random_integer.region_index.result]
   name     = module.naming.resource_group.name_unique
   tags = {
-    module  = "Azure/avm_res_resources_resourcegroup/azurerm"
+    module  = "Azure/avm-res-resources-resourcegroup/azurerm"
     version = "0.1.0"
   }
 }
 
 module "avm_res_web_serverfarm" {
-  source  = "Azure/avm_res_web_serverfarm/azurerm"
+  source  = "Azure/avm-res-web-serverfarm/azurerm"
   version = "0.2.0"
 
   enable_telemetry = var.enable_telemetry
@@ -42,7 +42,7 @@ module "avm_res_web_serverfarm" {
   os_type             = "Linux"
 
   tags = {
-    module  = "Azure/avm_res_web_serverfarm/azurerm"
+    module  = "Azure/avm-res-web-serverfarm/azurerm"
     version = "0.2.0"
   }
 }
diff --git a/examples/storage_uses_managed_identity/main.tf b/examples/storage_uses_managed_identity/main.tf
index b4f6ecd..5b44df2 100644
--- a/examples/storage_uses_managed_identity/main.tf
+++ b/examples/storage_uses_managed_identity/main.tf
@@ -19,7 +19,7 @@ module "naming" {
 }
 
 module "avm_res_resources_resourcegroup" {
-  source  = "Azure/avm_res_resources_resourcegroup/azurerm"
+  source  = "Azure/avm-res-resources-resourcegroup/azurerm"
   version = "0.1.0"
 
   location = local.azure_regions[random_integer.region_index.result]
@@ -27,7 +27,7 @@ module "avm_res_resources_resourcegroup" {
 }
 
 module "avm_res_web_serverfarm" {
-  source  = "Azure/avm_res_web_serverfarm/azurerm"
+  source  = "Azure/avm-res-web-serverfarm/azurerm"
   version = "0.2.0"
 
   enable_telemetry = var.enable_telemetry
@@ -38,14 +38,14 @@ module "avm_res_web_serverfarm" {
   os_type             = "Windows"
 
   tags = {
-    module  = "Azure/avm_res_web_serverfarm/azurerm"
+    module  = "Azure/avm-res-web-serverfarm/azurerm"
     version = "0.2.0"
   }
 }
 
 # Deploying Storage Account outside of root module to avoid circular dependency for role assignment + managed identity
 module "avm_res_storage_storageaccount" {
-  source  = "Azure/avm_res_storage_storageaccount/azurerm"
+  source  = "Azure/avm-res-storage-storageaccount/azurerm"
   version = "0.2.4"
 
   enable_telemetry              = var.enable_telemetry
diff --git a/examples/web_app/main.tf b/examples/web_app/main.tf
index 1a7c62e..b0f0b3e 100644
--- a/examples/web_app/main.tf
+++ b/examples/web_app/main.tf
@@ -19,19 +19,19 @@ module "naming" {
 }
 
 module "avm_res_resources_resourcegroup" {
-  source  = "Azure/avm_res_resources_resourcegroup/azurerm"
+  source  = "Azure/avm-res-resources-resourcegroup/azurerm"
   version = "0.1.0"
 
   location = local.azure_regions[random_integer.region_index.result]
   name     = module.naming.resource_group.name_unique
   tags = {
-    module  = "Azure/avm_res_resources_resourcegroup/azurerm"
+    module  = "Azure/avm-res-resources-resourcegroup/azurerm"
     version = "0.1.0"
   }
 }
 
 module "avm_res_web_serverfarm" {
-  source  = "Azure/avm_res_web_serverfarm/azurerm"
+  source  = "Azure/avm-res-web-serverfarm/azurerm"
   version = "0.2.0"
 
   enable_telemetry = var.enable_telemetry
@@ -42,7 +42,7 @@ module "avm_res_web_serverfarm" {
   os_type             = "Windows"
 
   tags = {
-    module  = "Azure/avm_res_web_serverfarm/azurerm"
+    module  = "Azure/avm-res-web-serverfarm/azurerm"
     version = "0.2.0"
   }
 }