diff --git a/main.tf b/main.tf
index 6e74a3cb4..fce2925fa 100644
--- a/main.tf
+++ b/main.tf
@@ -174,7 +174,7 @@ resource "aws_route_table" "intra" {
 
   vpc_id = "${local.vpc_id}"
 
-  tags = "${merge(map("Name", "${var.name}-intra"), var.tags, var.intra_route_table_tags)}"
+  tags = "${merge(map("Name", "${var.name}-${var.intra_subnet_suffix}"), var.tags, var.intra_route_table_tags)}"
 }
 
 ################
@@ -281,7 +281,7 @@ resource "aws_subnet" "intra" {
   cidr_block        = "${var.intra_subnets[count.index]}"
   availability_zone = "${element(var.azs, count.index)}"
 
-  tags = "${merge(map("Name", format("%s-intra-%s", var.name, element(var.azs, count.index))), var.tags, var.intra_subnet_tags)}"
+  tags = "${merge(map("Name", format("%s-${var.intra_subnet_suffix}-%s", var.name, element(var.azs, count.index))), var.tags, var.intra_subnet_tags)}"
 }
 
 ##############
diff --git a/variables.tf b/variables.tf
index 3467a87c4..b052c6448 100644
--- a/variables.tf
+++ b/variables.tf
@@ -38,6 +38,11 @@ variable "private_subnet_suffix" {
   default     = "private"
 }
 
+variable "intra_subnet_suffix" {
+  description = "Suffix to append to intra subnets name"
+  default     = "intra"
+}
+
 variable "database_subnet_suffix" {
   description = "Suffix to append to database subnets name"
   default     = "db"