diff --git a/peer/main.tf b/peer/main.tf
index 2337be9..f5cf51f 100644
--- a/peer/main.tf
+++ b/peer/main.tf
@@ -50,12 +50,11 @@
 locals {
   self_account_id          = var.account_id != "" ? var.account_id : data.aws_caller_identity.self_current.account_id
   self_account_environment = data.aws_arn.self_current.partition == "aws-us-gov" ? "gov" : "ew"
-
-  self_region = data.aws_region.self_current.name
-  peer_region = data.aws_region.peer_current.name
+  self_region              = data.aws_region.self_current.name
 
   peer_account_id          = var.peer_account_id != "" ? var.peer_account_id : data.aws_caller_identity.peer_current.account_id
   peer_account_environment = data.aws_arn.peer_current.partition == "aws-us-gov" ? "gov" : "ew"
+  peer_region              = data.aws_region.peer_current.name
 
   base_tags = {
     "boc:tf_module_version" = local._module_version
@@ -86,8 +85,10 @@ locals {
 
 
 locals {
-  self_vpc_id = var.vpc_id
-  peer_vpc_id = var.peer_vpc_id
+  self_vpc_id       = var.vpc_id
+  peer_vpc_id       = var.peer_vpc_id
+  self_vpc_tag_name = data.aws_vpc.self_vpc.tags.Name
+  peer_vpc_tag_name = data.aws_vpc.peer_vpc.tags.Name
 
   self_cidr_block = var.vpc_cidr_block != "" ? var.vpc_cidr_block : data.aws_vpc.self_vpc.cidr_block
   peer_cidr_block = var.peer_vpc_cidr_block != "" ? var.peer_vpc_cidr_block : data.aws_vpc.peer_vpc.cidr_block
@@ -95,16 +96,16 @@ locals {
   self_route_tables = length(var.route_table_ids) > 0 ? var.route_table_ids : tolist(data.aws_route_tables.default_self_route_tables.ids)
   peer_route_tables = length(var.peer_route_table_ids) > 0 ? var.peer_route_table_ids : tolist(data.aws_route_tables.default_peer_route_tables.ids)
 
-  self_label = format("%v-%s:%s", local._prefixes["vpc-peer"], var.vpc_short_name, var.peer_vpc_short_name)
-  peer_label = format("%v-%s:%s", local._prefixes["vpc-peer"], var.peer_vpc_short_name, var.vpc_short_name)
+  self_label = format("%v%v %v:%v", local._prefixes["vpc-peer"], var.vpc_full_name, local.peer_account_id, var.peer_vpc_full_name)
+  peer_label = format("%v%v %v:%v", local._prefixes["vpc-peer"], var.peer_vpc_full_name, local.self_account_id, var.vpc_full_name)
 
   self_tags = merge(
     var.tags,
     local.base_tags,
     {
       "Name"              = local.self_label
-      "boc:vpc_peer:from" = format("%v-%v-%v", local.self_account_id, local.self_region, var.vpc_short_name),
-      "boc:vpc_peer:to"   = format("%v-%v-%v", local.peer_account_id, local.peer_region, var.peer_vpc_short_name),
+      "boc:vpc_peer:from" = format("%v:%v:%v", local.self_account_id, local.self_region, var.vpc_full_name),
+      "boc:vpc_peer:to"   = format("%v:%v:%v", local.peer_account_id, local.peer_region, var.peer_vpc_full_name),
     }
   )
   peer_tags = merge(
@@ -112,8 +113,8 @@ locals {
     local.base_tags,
     {
       "Name"              = local.peer_label
-      "boc:vpc_peer:from" = format("%v-%v-%v", local.peer_account_id, local.peer_region, var.peer_vpc_short_name),
-      "boc:vpc_peer:to"   = format("%v-%v-%v", local.self_account_id, local.self_region, var.vpc_short_name),
+      "boc:vpc_peer:from" = format("%v:%v:%v", local.peer_account_id, local.peer_region, var.peer_vpc_full_name),
+      "boc:vpc_peer:to"   = format("%v:%v:%v", local.self_account_id, local.self_region, var.vpc_full_name),
     }
   )