diff --git a/vpc-transit-gateway-association/associate.tf b/vpc-transit-gateway-association/associate.tf
index 6e38901..6c47875 100644
--- a/vpc-transit-gateway-association/associate.tf
+++ b/vpc-transit-gateway-association/associate.tf
@@ -6,7 +6,7 @@ resource "aws_ec2_transit_gateway_vpc_attachment" "vpc_attachment" {
   #  subnet_ids                                      = [for sn in module.subnets.private_subnets_ids : sn.id if lookup(sn.tags, "boc:vpc:route-table", null) == "attachment"]
   subnet_ids                                      = var.private_subnets_ids
   transit_gateway_id                              = data.aws_ec2_transit_gateway.gateway_self.id
-  vpc_id                                          = local.vpc_id
+  vpc_id                                          = var.vpc_id
   dns_support                                     = "enable"
   ipv6_support                                    = "disable"
   transit_gateway_default_route_table_association = true
@@ -15,8 +15,8 @@ resource "aws_ec2_transit_gateway_vpc_attachment" "vpc_attachment" {
   tags = merge(
     local.base_tags,
     {
-      Name                  = format("tgwa-%v-%v-%v", var.tgw_label, var.vpc_short_name, local.region),
-      "boc:tgw_environment" = var.tgw_environment,
+      Name                  = format("tgwa-%v-%v-%v", var.transit_gateway_label, var.vpc_short_name, local.region),
+      "boc:tgw_environment" = var.transit_gateway_environment,
     },
   )
 }
@@ -28,7 +28,7 @@ resource "aws_ec2_transit_gateway_route_table_association" "route_table_self" {
   count                          = var.transit_gateway_routing_type == "self" ? 1 : 0
   provider                       = aws.self
   transit_gateway_attachment_id  = one(aws_ec2_transit_gateway_vpc_attachment.vpc_attachment[*].id)
-  transit_gateway_route_table_id = local.transit_gateway_route_table_ids_self[var.tgw_environment]
+  transit_gateway_route_table_id = local.transit_gateway_route_table_ids_self[var.transit_gateway_environment]
 }
 
 #---
@@ -70,7 +70,7 @@ resource "aws_ec2_transit_gateway_route_table_propagation" "vpc_self_common" {
 #---
 resource "aws_ec2_transit_gateway_route" "vpc_peer_own_rt" {
   provider               = aws.peer
-  for_each               = var.transit_gateway_routing_type == "peer" ? { for k in local.selected_rt : k => local.transit_gateway_route_table_ids_peer[k] if k == var.tgw_environment } : {}
+  for_each               = var.transit_gateway_routing_type == "peer" ? { for k in local.selected_rt : k => local.transit_gateway_route_table_ids_peer[k] if k == var.transit_gateway_environment } : {}
   destination_cidr_block = data.aws_vpc.vpc.cidr_block
 
   transit_gateway_attachment_id  = data.aws_ec2_transit_gateway_peering_attachment.attachment_peer.id
@@ -94,7 +94,7 @@ resource "aws_ec2_transit_gateway_route" "vpc_peer_common" {
 #--
 resource "aws_ec2_transit_gateway_route" "vpc_peer_all" {
   provider               = aws.peer
-  for_each               = var.transit_gateway_routing_type == "peer" && contains(local.propagate_all_rt, var.tgw_environment) ? { for k in local.selected_rt : k => local.transit_gateway_route_table_ids_peer[k] } : {}
+  for_each               = var.transit_gateway_routing_type == "peer" && contains(local.propagate_all_rt, var.transit_gateway_environment) ? { for k in local.selected_rt : k => local.transit_gateway_route_table_ids_peer[k] } : {}
   destination_cidr_block = data.aws_vpc.vpc.cidr_block
 
   transit_gateway_attachment_id  = data.aws_ec2_transit_gateway_peering_attachment.attachment_peer.id