diff --git a/modules/aurora-dashboard/outputs.tf b/modules/aurora-dashboard/outputs.tf
index 3bb023b..aff9f3c 100644
--- a/modules/aurora-dashboard/outputs.tf
+++ b/modules/aurora-dashboard/outputs.tf
@@ -1,4 +1,4 @@
 output "dashboard_url" {
-  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_metric_dashboard.aws_aurora_dashboard.id}"
+  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.aws_aurora_dashboard.id}"
   description = "Aurora Dashboard URL"
-}
\ No newline at end of file
+}
diff --git a/modules/ec2-dashboard/outputs.tf b/modules/ec2-dashboard/outputs.tf
index a307e36..7c131cc 100644
--- a/modules/ec2-dashboard/outputs.tf
+++ b/modules/ec2-dashboard/outputs.tf
@@ -1,4 +1,4 @@
 output "dashboard_url" {
-  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_metric_dashboard.aws_ec2_dashboard.id}"
+  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.aws_ec2_dashboard.id}"
   description = "EC2 Dashboard URL"
-}
\ No newline at end of file
+}
diff --git a/modules/ecs-dashboard/outputs.tf b/modules/ecs-dashboard/outputs.tf
index 786e47f..7663899 100644
--- a/modules/ecs-dashboard/outputs.tf
+++ b/modules/ecs-dashboard/outputs.tf
@@ -1,4 +1,4 @@
 output "dashboard_url" {
-  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_metric_dashboard.aws_ecs_dashboard.id}"
+  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.aws_ecs_dashboard.id}"
   description = "ECS Dashboard URL"
-}
\ No newline at end of file
+}
diff --git a/modules/efs-dashboard/main.tf b/modules/efs-dashboard/main.tf
index 469a46e..9efcfc1 100644
--- a/modules/efs-dashboard/main.tf
+++ b/modules/efs-dashboard/main.tf
@@ -8,7 +8,7 @@ terraform {
   required_version = ">= v1.0.11"
 }
 
-resource "lightstep_metric_dashboard" "aws_sns_dashboard" {
+resource "lightstep_metric_dashboard" "aws_efs_dashboard" {
   project_name   = var.lightstep_project
   dashboard_name = "AWS EFS"
 
@@ -152,4 +152,4 @@ resource "lightstep_metric_dashboard" "aws_sns_dashboard" {
 
   }
 
-}
\ No newline at end of file
+}
diff --git a/modules/efs-dashboard/outputs.tf b/modules/efs-dashboard/outputs.tf
index 0be9818..64cbfb2 100644
--- a/modules/efs-dashboard/outputs.tf
+++ b/modules/efs-dashboard/outputs.tf
@@ -1,4 +1,4 @@
 output "dashboard_url" {
-  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_metric_dashboard.aws_sns_dashboard.id}"
-  description = "SNS Dashboard URL"
-}
\ No newline at end of file
+  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.aws_efs_dashboard.id}"
+  description = "EFS Dashboard URL"
+}
diff --git a/modules/elasticache-redis-dashboard/outputs.tf b/modules/elasticache-redis-dashboard/outputs.tf
index 2cd1eb5..8b873a9 100644
--- a/modules/elasticache-redis-dashboard/outputs.tf
+++ b/modules/elasticache-redis-dashboard/outputs.tf
@@ -1,4 +1,4 @@
 output "dashboard_url" {
-  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_metric_dashboard.aws_elasticache_redis_dashboard.id}"
+  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.aws_elasticache_redis_dashboard.id}"
   description = "Elasticache Redis Dashboard URL"
-}
\ No newline at end of file
+}
diff --git a/modules/lambda-dashboard/outputs.tf b/modules/lambda-dashboard/outputs.tf
index 02ea5ce..75d1165 100644
--- a/modules/lambda-dashboard/outputs.tf
+++ b/modules/lambda-dashboard/outputs.tf
@@ -1,4 +1,4 @@
 output "dashboard_url" {
-  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_metric_dashboard.aws_lambda_dashboard.id}"
+  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.aws_lambda_dashboard.id}"
   description = "Lambda Dashboard URL"
-}
\ No newline at end of file
+}
diff --git a/modules/route53-dashboard/outputs.tf b/modules/route53-dashboard/outputs.tf
index 4151efd..b96bb7c 100644
--- a/modules/route53-dashboard/outputs.tf
+++ b/modules/route53-dashboard/outputs.tf
@@ -1,4 +1,4 @@
 output "dashboard_url" {
-  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_metric_dashboard.aws_route53_dashboard.id}"
+  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.aws_route53_dashboard.id}"
   description = "ROUTE53 Dashboard URL"
-}
\ No newline at end of file
+}
diff --git a/modules/stepfunctions-dashboard/outputs.tf b/modules/stepfunctions-dashboard/outputs.tf
index 85d34b1..3442ff1 100644
--- a/modules/stepfunctions-dashboard/outputs.tf
+++ b/modules/stepfunctions-dashboard/outputs.tf
@@ -1,4 +1,4 @@
 output "dashboard_url" {
-  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_metric_dashboard.aws_step_functions_dashboard.id}"
+  value       = "https://app.lightstep.com/${var.lightstep_project}/dashboard/${lightstep_dashboard.aws_step_functions_dashboard.id}"
   description = "AWS Step Functions Dashboard URL"
 }