diff --git a/.gitignore b/.gitignore
index 1ae602b..14bd6d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ logs
 common/README.md
 
 OLD/
+X
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a287c4..28fa283 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -122,4 +122,8 @@
   - flowlogs
     - change template to use account_alias
 
+* 1.6.5 -- 2022-06-07
+  - all
+    - backport module name and list(), map() changes
+
 ## Version 2.x
diff --git a/common/defaults.tf b/common/defaults.tf
index 5b39070..263025b 100644
--- a/common/defaults.tf
+++ b/common/defaults.tf
@@ -47,5 +47,9 @@ locals {
       "peers"      = []
     }
     "transit-gateway-environments" = ["services", "dev", "test", "stage", "prod", "cre"]
+    "role" = {
+      "force_detach_policies" = false
+      "max_session_duration"  = 3600
+    }
   }
 }
diff --git a/common/module_name.tf b/common/module_name.tf
new file mode 100644
index 0000000..c844252
--- /dev/null
+++ b/common/module_name.tf
@@ -0,0 +1,3 @@
+locals {
+  _module_name = "aws-vpc-setup"
+}
diff --git a/common/version.tf b/common/version.tf
index a85d2b4..f5c9860 100644
--- a/common/version.tf
+++ b/common/version.tf
@@ -1,3 +1,19 @@
 locals {
-  _module_version = "1.6.4"
+  _module_version = "1.6.5"
+  _module_names = {
+    "_main_" = "aws-vpc-setup"
+
+    "flowlogs"               = "aws-vpc-setup/flowlogs"
+    "flowlogs-role"          = "aws-vpc-setup/flowlogs-role"
+    "nacl-rules"             = "aws-vpc-setup/nacl-rules"
+    "nacls"                  = "aws-vpc-setup/nacls"
+    "peer"                   = "aws-vpc-setup/peer"
+    "routing"                = "aws-vpc-setup/routing"
+    "security-groups"        = "aws-vpc-setup/security-groups"
+    "subnets"                = "aws-vpc-setup/subnets"
+    "vpc"                    = "aws-vpc-setup/vpc"
+    "vpc-interface-endpoint" = "aws-vpc-setup/vpc-interface-endpoint"
+    "vpn"                    = "aws-vpc-setup/vpn"
+    "vpn-transit-gateway"    = "aws-vpc-setup/vpn-transit-gateway"
+  }
 }
diff --git a/flowlogs-role/README.md b/flowlogs-role/README.md
index 67b0450..21c816b 100644
--- a/flowlogs-role/README.md
+++ b/flowlogs-role/README.md
@@ -15,19 +15,24 @@ module "role_flowlogs" {
 
 ## Requirements
 
-No requirements.
+| Name | Version |
+|------|---------|
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.66.0 |
+| <a name="requirement_null"></a> [null](#requirement\_null) | >= 3.0 |
+| <a name="requirement_random"></a> [random](#requirement\_random) | >= 3.0 |
+| <a name="requirement_template"></a> [template](#requirement\_template) | >= 2.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.66.0 |
 
 ## Modules
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_flowlogs"></a> [flowlogs](#module\_flowlogs) | git@github.e.it.census.gov:terraform-modules/aws-iam-role.git |  |
+| <a name="module_flowlogs"></a> [flowlogs](#module\_flowlogs) | git@github.e.it.census.gov:terraform-modules/aws-iam-role.git | n/a |
 
 ## Resources
 
@@ -50,6 +55,8 @@ No requirements.
 | <a name="input_attached_policies"></a> [attached\_policies](#input\_attached\_policies) | List of IAM Policy ARNs to attach to this role | `list(string)` | `[]` | no |
 | <a name="input_override_prefixes"></a> [override\_prefixes](#input\_override\_prefixes) | Override built-in prefixes by component. This should be used primarily for common infrastructure things | `map(string)` | `{}` | no |
 | <a name="input_regions"></a> [regions](#input\_regions) | List of AWS Regions for which to grant Kinesis stream access | `list(string)` | `[]` | no |
+| <a name="input_role_description"></a> [role\_description](#input\_role\_description) | Role/application description | `string` | `""` | no |
+| <a name="input_role_name"></a> [role\_name](#input\_role\_name) | Role/application name without prefix | `string` | `"inf-flowlogs"` | no |
 | <a name="input_tags"></a> [tags](#input\_tags) | AWS Tags to apply to appropriate resources (S3, KMS).  Do not include safeguard tags here, use the data\_safeguard field for such things. | `map(string)` | `{}` | no |
 
 ## Outputs
diff --git a/flowlogs-role/main.tf b/flowlogs-role/main.tf
index 8d5777c..c94938f 100644
--- a/flowlogs-role/main.tf
+++ b/flowlogs-role/main.tf
@@ -21,6 +21,7 @@ locals {
 
   base_tags = {
     "boc:tf_module_version" = local._module_version
+    "boc:tf_module_name"    = lookup(local._module_names, local._module_name, local._module_names["_main_"])
     "boc:created_by"        = "terraform"
   }
 }
diff --git a/flowlogs-role/module_name.tf b/flowlogs-role/module_name.tf
new file mode 100644
index 0000000..6c1285a
--- /dev/null
+++ b/flowlogs-role/module_name.tf
@@ -0,0 +1,3 @@
+locals {
+  _module_name = "flowlogs-role"
+}
diff --git a/flowlogs-role/variables.tf b/flowlogs-role/variables.tf
index c419c06..803036d 100644
--- a/flowlogs-role/variables.tf
+++ b/flowlogs-role/variables.tf
@@ -9,3 +9,15 @@ variable "regions" {
   type        = list(string)
   default     = []
 }
+
+variable "role_name" {
+  description = "Role/application name without prefix"
+  type        = string
+  default     = "inf-flowlogs"
+}
+
+variable "role_description" {
+  description = "Role/application description"
+  type        = string
+  default     = ""
+}
diff --git a/flowlogs/README.md b/flowlogs/README.md
index 80062d8..4ac193d 100644
--- a/flowlogs/README.md
+++ b/flowlogs/README.md
@@ -41,15 +41,20 @@ module "flowlogs" {
 
 ## Requirements
 
-No requirements.
+| Name | Version |
+|------|---------|
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.66.0 |
+| <a name="requirement_null"></a> [null](#requirement\_null) | >= 3.0 |
+| <a name="requirement_random"></a> [random](#requirement\_random) | >= 3.0 |
+| <a name="requirement_template"></a> [template](#requirement\_template) | >= 2.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |
-| <a name="provider_null"></a> [null](#provider\_null) | n/a |
-| <a name="provider_template"></a> [template](#provider\_template) | n/a |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.66.0 |
+| <a name="provider_null"></a> [null](#provider\_null) | >= 3.0 |
+| <a name="provider_template"></a> [template](#provider\_template) | >= 2.0 |
 
 ## Modules
 
diff --git a/flowlogs/main.tf b/flowlogs/main.tf
index 3df8f26..abf605d 100644
--- a/flowlogs/main.tf
+++ b/flowlogs/main.tf
@@ -46,6 +46,7 @@ locals {
 
   base_tags = {
     "boc:tf_module_version" = local._module_version
+    "boc:tf_module_name"    = lookup(local._module_names, local._module_name, local._module_names["_main_"])
     "boc:created_by"        = "terraform"
   }
 
diff --git a/flowlogs/module_name.tf b/flowlogs/module_name.tf
new file mode 100644
index 0000000..5eaa4a8
--- /dev/null
+++ b/flowlogs/module_name.tf
@@ -0,0 +1,3 @@
+locals {
+  _module_name = "flowlogs"
+}
diff --git a/flowlogs/templates/aws_kinesis_tasks.conf.tpl b/flowlogs/templates/aws_kinesis_tasks.conf.tpl
index 82da2a8..9a09268 100644
--- a/flowlogs/templates/aws_kinesis_tasks.conf.tpl
+++ b/flowlogs/templates/aws_kinesis_tasks.conf.tpl
@@ -1,5 +1,5 @@
 [${account_alias}-flowlogs-${region}_${flowlog_name}]
-# account_id = ${account_id} 
+# account_id = ${account_id}
 account = ${account_alias}
 format = CloudWatchLogs
 index = aws_vpc_flow_logs
diff --git a/nacl-rules/main.tf b/nacl-rules/main.tf
index e00382f..16cf49f 100644
--- a/nacl-rules/main.tf
+++ b/nacl-rules/main.tf
@@ -33,6 +33,7 @@ locals {
 
   base_tags = {
     "boc:tf_module_version" = local._module_version
+    "boc:tf_module_name"    = lookup(local._module_names, local._module_name, local._module_names["_main_"])
     "boc:created_by"        = "terraform"
   }
 }
diff --git a/nacl-rules/module_name.tf b/nacl-rules/module_name.tf
new file mode 100644
index 0000000..825522a
--- /dev/null
+++ b/nacl-rules/module_name.tf
@@ -0,0 +1,3 @@
+locals {
+  _module_name = "nacl-rules"
+}
diff --git a/nacls/README.md b/nacls/README.md
index abf8000..3592248 100644
--- a/nacls/README.md
+++ b/nacls/README.md
@@ -25,13 +25,18 @@ module "nacls" {
 
 ## Requirements
 
-No requirements.
+| Name | Version |
+|------|---------|
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.66.0 |
+| <a name="requirement_null"></a> [null](#requirement\_null) | >= 3.0 |
+| <a name="requirement_random"></a> [random](#requirement\_random) | >= 3.0 |
+| <a name="requirement_template"></a> [template](#requirement\_template) | >= 2.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.66.0 |
 
 ## Modules
 
diff --git a/nacls/main.tf b/nacls/main.tf
index d95d27a..4605ee1 100644
--- a/nacls/main.tf
+++ b/nacls/main.tf
@@ -30,6 +30,7 @@ locals {
 
   base_tags = {
     "boc:tf_module_version" = local._module_version
+    "boc:tf_module_name"    = lookup(local._module_names, local._module_name, local._module_names["_main_"])
     "boc:created_by"        = "terraform"
   }
 
@@ -47,7 +48,7 @@ resource "aws_network_acl" "private" {
   tags = merge(
     local.base_tags,
     var.tags,
-    map("Name", format("%v%v-%v", local._prefixes["network-acl"], var.vpc_full_name, "private")),
+    { "Name" = format("%v%v-%v", local._prefixes["network-acl"], var.vpc_full_name, "private") },
   )
 }
 
@@ -61,6 +62,6 @@ resource "aws_network_acl" "public" {
   tags = merge(
     local.base_tags,
     var.tags,
-    map("Name", format("%v%v-%v", local._prefixes["network-acl"], var.vpc_full_name, "public")),
+    { "Name" = format("%v%v-%v", local._prefixes["network-acl"], var.vpc_full_name, "public") },
   )
 }
diff --git a/nacls/module_name.tf b/nacls/module_name.tf
new file mode 100644
index 0000000..9db7ed4
--- /dev/null
+++ b/nacls/module_name.tf
@@ -0,0 +1,3 @@
+locals {
+  _module_name = "nacls"
+}
diff --git a/peer/main.tf b/peer/main.tf
index 8cb4b2e..29c5b7f 100644
--- a/peer/main.tf
+++ b/peer/main.tf
@@ -89,6 +89,7 @@ locals {
 
   base_tags = {
     "boc:tf_module_version" = local._module_version
+    "boc:tf_module_name"    = lookup(local._module_names, local._module_name, local._module_names["_main_"])
     "boc:created_by"        = "terraform"
   }
 }
diff --git a/peer/module_name.tf b/peer/module_name.tf
new file mode 100644
index 0000000..8d27972
--- /dev/null
+++ b/peer/module_name.tf
@@ -0,0 +1,3 @@
+locals {
+  _module_name = "peer"
+}
diff --git a/routing/main.tf b/routing/main.tf
index 3d9eb1d..341dad6 100644
--- a/routing/main.tf
+++ b/routing/main.tf
@@ -29,6 +29,7 @@ locals {
 
   base_tags = {
     "boc:tf_module_version" = local._module_version
+    "boc:tf_module_name"    = lookup(local._module_names, local._module_name, local._module_names["_main_"])
     "boc:created_by"        = "terraform"
   }
 
@@ -50,7 +51,7 @@ resource "aws_route_table" "public" {
   tags = merge(
     local.base_tags,
     var.tags,
-    map("Name", format("%v%v-%v-%v", local._prefixes["route-table"], var.vpc_full_name, var.public_route_table_label, each.key))
+    { "Name" = format("%v%v-%v-%v", local._prefixes["route-table"], var.vpc_full_name, var.public_route_table_label, each.key) },
   )
 }
 
@@ -70,7 +71,7 @@ resource "aws_route_table" "private" {
   tags = merge(
     local.base_tags,
     var.tags,
-    map("Name", format("%v%v-%v-%v", local._prefixes["route-table"], var.vpc_full_name, var.private_route_table_label, each.key))
+    { "Name" = format("%v%v-%v-%v", local._prefixes["route-table"], var.vpc_full_name, var.private_route_table_label, each.key) },
   )
 }
 
@@ -93,7 +94,7 @@ resource "aws_eip" "nat" {
   tags = merge(
     local.base_tags,
     var.tags,
-    map("Name", format("%v%v-%v", local._prefixes["elastic-ip"], var.vpc_full_name, each.key)),
+    { "Name" = format("%v%v-%v", local._prefixes["elastic-ip"], var.vpc_full_name, each.key) },
   )
 }
 
@@ -107,7 +108,7 @@ resource "aws_internet_gateway" "gateway" {
   tags = merge(
     local.base_tags,
     var.tags,
-    map("Name", format("%v%v", local._prefixes["internet-gateway"], var.vpc_full_name)),
+    { "Name" = format("%v%v", local._prefixes["internet-gateway"], var.vpc_full_name) },
   )
 }
 
@@ -126,7 +127,7 @@ resource "aws_nat_gateway" "nat" {
   tags = merge(
     local.base_tags,
     var.tags,
-    map("Name", format("%v%v-%v", local._prefixes["nat-gateway"], var.vpc_full_name, each.key)),
+    { "Name" = format("%v%v-%v", local._prefixes["nat-gateway"], var.vpc_full_name, each.key) },
   )
 }
 
diff --git a/routing/module_name.tf b/routing/module_name.tf
new file mode 100644
index 0000000..14c3264
--- /dev/null
+++ b/routing/module_name.tf
@@ -0,0 +1,3 @@
+locals {
+  _module_name = "routing"
+}
diff --git a/routing/vpc-endpoints.tf b/routing/vpc-endpoints.tf
index c41066c..e271a66 100644
--- a/routing/vpc-endpoints.tf
+++ b/routing/vpc-endpoints.tf
@@ -26,7 +26,7 @@ resource "aws_vpc_endpoint" "s3" {
   tags = merge(
     local.base_tags,
     var.tags,
-    map("Name", format("%v%v-%v", local._prefixes["vpc-endpoint"], "s3", var.vpc_full_name)),
+    { "Name" = format("%v%v-%v", local._prefixes["vpc-endpoint"], "s3", var.vpc_full_name) },
   )
 }
 
@@ -54,7 +54,7 @@ resource "aws_vpc_endpoint" "dynamodb" {
   tags = merge(
     local.base_tags,
     var.tags,
-    map("Name", format("%v%v-%v", local._prefixes["vpc-endpoint"], "dynamodb", var.vpc_full_name)),
+    { "Name" = format("%v%v-%v", local._prefixes["vpc-endpoint"], "dynamodb", var.vpc_full_name) },
   )
 }
 
diff --git a/security-groups/README.md b/security-groups/README.md
index 333f6a5..20a3068 100644
--- a/security-groups/README.md
+++ b/security-groups/README.md
@@ -20,21 +20,26 @@ module "base-security-groups" {
 
 ## Requirements
 
-No requirements.
+| Name | Version |
+|------|---------|
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.66.0 |
+| <a name="requirement_null"></a> [null](#requirement\_null) | >= 3.0 |
+| <a name="requirement_random"></a> [random](#requirement\_random) | >= 3.0 |
+| <a name="requirement_template"></a> [template](#requirement\_template) | >= 2.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.66.0 |
 
 ## Modules
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_sg-linux-base"></a> [sg-linux-base](#module\_sg-linux-base) | git@github.e.it.census.gov:terraform-modules/aws-common-security-groups.git//it-linux-base |  |
-| <a name="module_sg-ois-scanner"></a> [sg-ois-scanner](#module\_sg-ois-scanner) | git@github.e.it.census.gov:terraform-modules/aws-common-security-groups.git//ois-scanner |  |
-| <a name="module_sg-windows-base"></a> [sg-windows-base](#module\_sg-windows-base) | git@github.e.it.census.gov:terraform-modules/aws-common-security-groups.git//it-windows-base |  |
+| <a name="module_sg-linux-base"></a> [sg-linux-base](#module\_sg-linux-base) | git@github.e.it.census.gov:terraform-modules/aws-common-security-groups.git//it-linux-base | n/a |
+| <a name="module_sg-ois-scanner"></a> [sg-ois-scanner](#module\_sg-ois-scanner) | git@github.e.it.census.gov:terraform-modules/aws-common-security-groups.git//ois-scanner | n/a |
+| <a name="module_sg-windows-base"></a> [sg-windows-base](#module\_sg-windows-base) | git@github.e.it.census.gov:terraform-modules/aws-common-security-groups.git//it-windows-base | n/a |
 
 ## Resources
 
diff --git a/security-groups/main.tf b/security-groups/main.tf
index f56c143..e0fcf35 100644
--- a/security-groups/main.tf
+++ b/security-groups/main.tf
@@ -26,6 +26,7 @@ locals {
 
   base_tags = {
     "boc:tf_module_version" = local._module_version
+    "boc:tf_module_name"    = lookup(local._module_names, local._module_name, local._module_names["_main_"])
     "boc:created_by"        = "terraform"
   }
 }
@@ -39,8 +40,10 @@ resource "aws_default_security_group" "default" {
   tags = merge(
     local.base_tags,
     var.tags,
-    map("Environment", var.vpc_environment),
-    map("Name", format("default-sg-%v", var.vpc_full_name))
+    {
+      "Environment" = var.vpc_environment
+      "Name"        = format("default-sg-%v", var.vpc_full_name)
+    }
   )
 }
 
@@ -56,7 +59,7 @@ module "sg-linux-base" {
   tags = merge(
     local.base_tags,
     var.tags,
-    map("Environment", var.vpc_environment),
+    { "Environment" = var.vpc_environment },
   )
 }
 
@@ -69,7 +72,7 @@ module "sg-windows-base" {
   tags = merge(
     local.base_tags,
     var.tags,
-    map("Environment", var.vpc_environment),
+    { "Environment" = var.vpc_environment },
   )
 }
 
@@ -82,6 +85,6 @@ module "sg-ois-scanner" {
   tags = merge(
     local.base_tags,
     var.tags,
-    map("Environment", var.vpc_environment),
+    { "Environment" = var.vpc_environment },
   )
 }
diff --git a/security-groups/module_name.tf b/security-groups/module_name.tf
new file mode 100644
index 0000000..71c482e
--- /dev/null
+++ b/security-groups/module_name.tf
@@ -0,0 +1,3 @@
+locals {
+  _module_name = "security-groups"
+}
diff --git a/subnets/README.md b/subnets/README.md
index 59ffcdc..cba69cd 100644
--- a/subnets/README.md
+++ b/subnets/README.md
@@ -50,13 +50,18 @@ be private.
 
 ## Requirements
 
-No requirements.
+| Name | Version |
+|------|---------|
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.66.0 |
+| <a name="requirement_null"></a> [null](#requirement\_null) | >= 3.0 |
+| <a name="requirement_random"></a> [random](#requirement\_random) | >= 3.0 |
+| <a name="requirement_template"></a> [template](#requirement\_template) | >= 2.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.66.0 |
 
 ## Modules
 
diff --git a/subnets/main.tf b/subnets/main.tf
index 9209aaa..247a862 100644
--- a/subnets/main.tf
+++ b/subnets/main.tf
@@ -56,6 +56,7 @@ locals {
 
   base_tags = {
     "boc:tf_module_version" = local._module_version
+    "boc:tf_module_name"    = lookup(local._module_names, local._module_name, local._module_names["_main_"])
     "boc:created_by"        = "terraform"
   }
 
@@ -98,7 +99,7 @@ resource "aws_subnet" "public" {
     local.base_tags,
     var.tags,
     each.value.tags,
-    map("Name", format("%v%v-%v", local._prefixes["subnet"], var.vpc_full_name, each.value.label))
+    { "Name" = format("%v%v-%v", local._prefixes["subnet"], var.vpc_full_name, each.value.label) },
   )
 }
 
@@ -136,6 +137,6 @@ resource "aws_subnet" "private" {
     local.base_tags,
     var.tags,
     each.value.tags,
-    map("Name", format("%v%v-%v", local._prefixes["subnet"], var.vpc_full_name, each.value.label))
+    { "Name" = format("%v%v-%v", local._prefixes["subnet"], var.vpc_full_name, each.value.label) },
   )
 }
diff --git a/subnets/module_name.tf b/subnets/module_name.tf
new file mode 100644
index 0000000..e8d6f2e
--- /dev/null
+++ b/subnets/module_name.tf
@@ -0,0 +1,3 @@
+locals {
+  _module_name = "subnets"
+}
diff --git a/vpc-interface-endpoint/main.tf b/vpc-interface-endpoint/main.tf
index 63c35ca..d879540 100644
--- a/vpc-interface-endpoint/main.tf
+++ b/vpc-interface-endpoint/main.tf
@@ -67,6 +67,7 @@ locals {
 
   base_tags = {
     "boc:tf_module_version" = local._module_version
+    "boc:tf_module_name"    = lookup(local._module_names, local._module_name, local._module_names["_main_"])
     "boc:created_by"        = "terraform"
   }
 }
diff --git a/vpc-interface-endpoint/module_name.tf b/vpc-interface-endpoint/module_name.tf
new file mode 100644
index 0000000..50a0a96
--- /dev/null
+++ b/vpc-interface-endpoint/module_name.tf
@@ -0,0 +1,3 @@
+locals {
+  _module_name = "vpc-interface-endpoint"
+}
diff --git a/vpc/README.md b/vpc/README.md
index b90e2ec..e9af509 100644
--- a/vpc/README.md
+++ b/vpc/README.md
@@ -29,13 +29,18 @@ module "vpc" {
 
 ## Requirements
 
-No requirements.
+| Name | Version |
+|------|---------|
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.66.0 |
+| <a name="requirement_null"></a> [null](#requirement\_null) | >= 3.0 |
+| <a name="requirement_random"></a> [random](#requirement\_random) | >= 3.0 |
+| <a name="requirement_template"></a> [template](#requirement\_template) | >= 2.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.66.0 |
 
 ## Modules
 
diff --git a/vpc/main.tf b/vpc/main.tf
index 61c8bd3..ade85af 100644
--- a/vpc/main.tf
+++ b/vpc/main.tf
@@ -34,6 +34,7 @@ locals {
 
   base_tags = {
     "boc:tf_module_version" = local._module_version
+    "boc:tf_module_name"    = lookup(local._module_names, local._module_name, local._module_names["_main_"])
     "boc:created_by"        = "terraform"
   }
 
@@ -54,7 +55,7 @@ resource "aws_vpc_dhcp_options" "vpc" {
   tags = merge(
     local.base_tags,
     var.tags,
-    map("Name", format("%v-dhcp-options", var.vpc_full_name)),
+    { "Name" = format("%v-dhcp-options", var.vpc_full_name) },
   )
 }
 
@@ -74,7 +75,7 @@ resource "aws_vpc" "vpc" {
   tags = merge(
     local.base_tags,
     var.tags,
-    map("Name", var.vpc_full_name),
+    { "Name" = var.vpc_full_name },
   )
 }
 
@@ -87,6 +88,6 @@ resource "aws_default_route_table" "vpc" {
   tags = merge(
     local.base_tags,
     var.tags,
-    map("Name", format("default-%v%v", local._prefixes["route-table"], var.vpc_full_name))
+    { "Name" = format("default-%v%v", local._prefixes["route-table"], var.vpc_full_name) },
   )
 }
diff --git a/vpc/module_name.tf b/vpc/module_name.tf
new file mode 100644
index 0000000..96f3d58
--- /dev/null
+++ b/vpc/module_name.tf
@@ -0,0 +1,3 @@
+locals {
+  _module_name = "vpc"
+}
diff --git a/vpn-transit-gateway/main.tf b/vpn-transit-gateway/main.tf
index 8e98e9a..9c01132 100644
--- a/vpn-transit-gateway/main.tf
+++ b/vpn-transit-gateway/main.tf
@@ -62,6 +62,7 @@ locals {
 
   base_tags = {
     "boc:tf_module_version" = local._module_version
+    "boc:tf_module_name"    = lookup(local._module_names, local._module_name, local._module_names["_main_"])
     "boc:created_by"        = "terraform"
   }
 
diff --git a/vpn-transit-gateway/module_name.tf b/vpn-transit-gateway/module_name.tf
new file mode 100644
index 0000000..cc65731
--- /dev/null
+++ b/vpn-transit-gateway/module_name.tf
@@ -0,0 +1,3 @@
+locals {
+  _module_name = "vpn-transit-gateway"
+}
diff --git a/vpn/main.tf b/vpn/main.tf
index 0fca4bf..d7a8c2a 100644
--- a/vpn/main.tf
+++ b/vpn/main.tf
@@ -53,10 +53,11 @@ locals {
 
   base_tags = {
     "boc:tf_module_version" = local._module_version
+    "boc:tf_module_name"    = lookup(local._module_names, local._module_name, local._module_names["_main_"])
     "boc:created_by"        = "terraform"
   }
 
-  vpn_gateway = element(concat(aws_vpn_gateway.vpn[*].id, list("")), 0)
+  vpn_gateway = element(concat(aws_vpn_gateway.vpn[*].id, []), 0)
 }
 
 
@@ -70,7 +71,7 @@ resource "aws_vpn_gateway" "vpn" {
   tags = merge(
     local.base_tags,
     var.tags,
-    map("Name", format("%v%v", local._prefixes["vpn-gateway"], var.vpc_full_name))
+    { "Name" = format("%v%v", local._prefixes["vpn-gateway"], var.vpc_full_name) },
   )
 }
 
@@ -92,7 +93,7 @@ resource "aws_customer_gateway" "vpn" {
   tags = merge(
     local.base_tags,
     var.tags,
-    map("Name", format("%v%v-%v", local._prefixes["customer-gateway"], each.key, var.vpc_full_name)),
+    { "Name" = format("%v%v-%v", local._prefixes["customer-gateway"], each.key, var.vpc_full_name) },
   )
 }
 
@@ -124,7 +125,7 @@ resource "aws_vpn_connection" "vpn" {
   tags = merge(
     local.base_tags,
     var.tags,
-    map("Name", format("%v%v-%v", local._prefixes["vpn-connection"], each.key, var.vpc_full_name))
+    { "Name" = format("%v%v-%v", local._prefixes["vpn-connection"], each.key, var.vpc_full_name) },
   )
 }
 
diff --git a/vpn/module_name.tf b/vpn/module_name.tf
new file mode 100644
index 0000000..1c530b0
--- /dev/null
+++ b/vpn/module_name.tf
@@ -0,0 +1,3 @@
+locals {
+  _module_name = "vpn"
+}