diff --git a/cloud/aws/alb/modules.tf b/cloud/aws/alb/modules.tf
index 94be5f4..1aae9bf 100644
--- a/cloud/aws/alb/modules.tf
+++ b/cloud/aws/alb/modules.tf
@@ -2,7 +2,7 @@ module "filter-tags" {
   source = "../../../common/filter-tags"
 
   environment              = "${var.environment}"
-  resource                 = "alb"
+  resource                 = "aws_alb"
   filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
   filter_tags_custom       = "${var.filter_tags_custom}"
 }
diff --git a/cloud/aws/elasticsearch/modules.tf b/cloud/aws/elasticsearch/modules.tf
index 88ddb32..0abfe32 100644
--- a/cloud/aws/elasticsearch/modules.tf
+++ b/cloud/aws/elasticsearch/modules.tf
@@ -2,7 +2,7 @@ module "filter-tags" {
   source = "../../../common/filter-tags"
 
   environment              = "${var.environment}"
-  resource                 = "elasticsearch"
+  resource                 = "aws_elasticsearch"
   filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
   filter_tags_custom       = "${var.filter_tags_custom}"
 }
diff --git a/cloud/aws/elb/modules.tf b/cloud/aws/elb/modules.tf
index 017032e..b64c814 100644
--- a/cloud/aws/elb/modules.tf
+++ b/cloud/aws/elb/modules.tf
@@ -2,7 +2,7 @@ module "filter-tags" {
   source = "../../../common/filter-tags"
 
   environment              = "${var.environment}"
-  resource                 = "elb"
+  resource                 = "aws_elb"
   filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
   filter_tags_custom       = "${var.filter_tags_custom}"
 }
diff --git a/cloud/aws/kinesis-firehose/modules.tf b/cloud/aws/kinesis-firehose/modules.tf
index c2d691d..b7b2e72 100644
--- a/cloud/aws/kinesis-firehose/modules.tf
+++ b/cloud/aws/kinesis-firehose/modules.tf
@@ -2,7 +2,7 @@ module "filter-tags" {
   source = "../../../common/filter-tags"
 
   environment              = "${var.environment}"
-  resource                 = "kinesis-firehose"
+  resource                 = "aws_kinesis-firehose"
   filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
   filter_tags_custom       = "${var.filter_tags_custom}"
 }
diff --git a/cloud/aws/rds/aurora/mysql/modules.tf b/cloud/aws/rds/aurora/mysql/modules.tf
index 21cb3ae..9f52fb1 100644
--- a/cloud/aws/rds/aurora/mysql/modules.tf
+++ b/cloud/aws/rds/aurora/mysql/modules.tf
@@ -2,7 +2,7 @@ module "filter-tags" {
   source = "../../../../../common/filter-tags"
 
   environment              = "${var.environment}"
-  resource                 = "rds"
+  resource                 = "aws_rds"
   filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
   filter_tags_custom       = "${var.filter_tags_custom}"
 }
diff --git a/cloud/aws/rds/aurora/postgresql/modules.tf b/cloud/aws/rds/aurora/postgresql/modules.tf
index 21cb3ae..9f52fb1 100644
--- a/cloud/aws/rds/aurora/postgresql/modules.tf
+++ b/cloud/aws/rds/aurora/postgresql/modules.tf
@@ -2,7 +2,7 @@ module "filter-tags" {
   source = "../../../../../common/filter-tags"
 
   environment              = "${var.environment}"
-  resource                 = "rds"
+  resource                 = "aws_rds"
   filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
   filter_tags_custom       = "${var.filter_tags_custom}"
 }
diff --git a/cloud/aws/rds/common/modules.tf b/cloud/aws/rds/common/modules.tf
index 401c9a3..dcbe336 100644
--- a/cloud/aws/rds/common/modules.tf
+++ b/cloud/aws/rds/common/modules.tf
@@ -2,7 +2,7 @@ module "filter-tags" {
   source = "../../../../common/filter-tags"
 
   environment              = "${var.environment}"
-  resource                 = "rds"
+  resource                 = "aws_rds"
   filter_tags_use_defaults = "${var.filter_tags_use_defaults}"
   filter_tags_custom       = "${var.filter_tags_custom}"
 }