diff --git a/modules/aws-rds-cluster-activity-stream/README.md b/modules/aws-rds-cluster-activity-stream/README.md
index 9313f13..8259607 100644
--- a/modules/aws-rds-cluster-activity-stream/README.md
+++ b/modules/aws-rds-cluster-activity-stream/README.md
@@ -32,5 +32,5 @@ No modules.
 
 | Name | Description |
 |------|-------------|
-| <a name="output_this"></a> [this](#output\_this) | RDS Cluster activity stream |
+| <a name="output_this"></a> [this](#output\_this) | RDS Aurora Cluster database activity stream |
 <!-- END_TF_DOCS -->
\ No newline at end of file
diff --git a/modules/aws-rds-cluster-activity-stream/outputs.tf b/modules/aws-rds-cluster-activity-stream/outputs.tf
index 3414fcc..1cda0bf 100644
--- a/modules/aws-rds-cluster-activity-stream/outputs.tf
+++ b/modules/aws-rds-cluster-activity-stream/outputs.tf
@@ -1,4 +1,4 @@
 output "this" {
-  description = "RDS Cluster activity stream"
+  description = "RDS Aurora Cluster database activity stream"
   value       = aws_rds_cluster_activity_stream.this
 }
diff --git a/modules/aws-rds-cluster-instance/README.md b/modules/aws-rds-cluster-instance/README.md
index 677ca64..5560ec5 100644
--- a/modules/aws-rds-cluster-instance/README.md
+++ b/modules/aws-rds-cluster-instance/README.md
@@ -37,5 +37,5 @@ No modules.
 
 | Name | Description |
 |------|-------------|
-| <a name="output_this"></a> [this](#output\_this) | Aurora MySQL Cluster instance |
+| <a name="output_this"></a> [this](#output\_this) | RDS Aurora cluster instance |
 <!-- END_TF_DOCS -->
\ No newline at end of file
diff --git a/modules/aws-rds-cluster-instance/outputs.tf b/modules/aws-rds-cluster-instance/outputs.tf
index f57e416..7056ce7 100644
--- a/modules/aws-rds-cluster-instance/outputs.tf
+++ b/modules/aws-rds-cluster-instance/outputs.tf
@@ -1,4 +1,4 @@
 output "this" {
-  description = "Aurora MySQL Cluster instance"
+  description = "RDS Aurora cluster instance"
   value       = aws_rds_cluster_instance.this
 }
diff --git a/modules/aws-rds-cluster/README.md b/modules/aws-rds-cluster/README.md
index 6dcbc2d..56c0951 100644
--- a/modules/aws-rds-cluster/README.md
+++ b/modules/aws-rds-cluster/README.md
@@ -43,5 +43,5 @@ No modules.
 
 | Name | Description |
 |------|-------------|
-| <a name="output_this"></a> [this](#output\_this) | Aurora MySQL cluster |
+| <a name="output_this"></a> [this](#output\_this) | RDS Aurora cluster |
 <!-- END_TF_DOCS -->
\ No newline at end of file
diff --git a/modules/aws-rds-cluster/outputs.tf b/modules/aws-rds-cluster/outputs.tf
index 552ac2a..379f083 100644
--- a/modules/aws-rds-cluster/outputs.tf
+++ b/modules/aws-rds-cluster/outputs.tf
@@ -1,4 +1,4 @@
 output "this" {
-  description = "Aurora MySQL cluster"
+  description = "RDS Aurora cluster"
   value       = aws_rds_cluster.this
 }
diff --git a/modules/dsfhub-aws-rds-aurora-postgresql-cluster/README.md b/modules/dsfhub-aws-rds-aurora-postgresql-cluster/README.md
index 50b1f05..e6222a4 100644
--- a/modules/dsfhub-aws-rds-aurora-postgresql-cluster/README.md
+++ b/modules/dsfhub-aws-rds-aurora-postgresql-cluster/README.md
@@ -40,5 +40,5 @@ No modules.
 
 | Name | Description |
 |------|-------------|
-| <a name="output_this"></a> [this](#output\_this) | Aurora PostgreSQL DSF asset |
+| <a name="output_this"></a> [this](#output\_this) | Aurora PostgreSQL cluster DSF asset |
 <!-- END_TF_DOCS -->
\ No newline at end of file
diff --git a/modules/dsfhub-aws-rds-aurora-postgresql-cluster/outputs.tf b/modules/dsfhub-aws-rds-aurora-postgresql-cluster/outputs.tf
index 555a870..3b34474 100644
--- a/modules/dsfhub-aws-rds-aurora-postgresql-cluster/outputs.tf
+++ b/modules/dsfhub-aws-rds-aurora-postgresql-cluster/outputs.tf
@@ -1,4 +1,4 @@
 output "this" {
-  description = "Aurora PostgreSQL DSF asset"
+  description = "Aurora PostgreSQL cluster DSF asset"
   value       = dsfhub_data_source.this
 }
diff --git a/modules/onboard-aws-rds-aurora-mysql-slowquery/README.md b/modules/onboard-aws-rds-aurora-mysql-slowquery/README.md
index aa3830a..165ae34 100644
--- a/modules/onboard-aws-rds-aurora-mysql-slowquery/README.md
+++ b/modules/onboard-aws-rds-aurora-mysql-slowquery/README.md
@@ -72,11 +72,11 @@ No resources.
 
 | Name | Description |
 |------|-------------|
+| <a name="output_aws_log_group_asset"></a> [aws\_log\_group\_asset](#output\_aws\_log\_group\_asset) | AWS log group asset |
+| <a name="output_aws_log_group_slowquery_asset"></a> [aws\_log\_group\_slowquery\_asset](#output\_aws\_log\_group\_slowquery\_asset) | AWS Slow Query log group asset |
+| <a name="output_aws_rds_aurora_mysql_cluster_asset"></a> [aws\_rds\_aurora\_mysql\_cluster\_asset](#output\_aws\_rds\_aurora\_mysql\_cluster\_asset) | Aurora MySQL cluster asset |
 | <a name="output_cluster"></a> [cluster](#output\_cluster) | Aurora MySQL Cluster |
 | <a name="output_cluster_parameter_group"></a> [cluster\_parameter\_group](#output\_cluster\_parameter\_group) | Aurora MySQL Cluster parameter group |
-| <a name="output_dsf_aurora_mysql_cluster"></a> [dsf\_aurora\_mysql\_cluster](#output\_dsf\_aurora\_mysql\_cluster) | Aurora MySQL cluster DSF asset |
-| <a name="output_dsf_aurora_mysql_log_group"></a> [dsf\_aurora\_mysql\_log\_group](#output\_dsf\_aurora\_mysql\_log\_group) | Aurora MySQL log group asset |
-| <a name="output_dsf_aurora_mysql_log_group_slowquery"></a> [dsf\_aurora\_mysql\_log\_group\_slowquery](#output\_dsf\_aurora\_mysql\_log\_group\_slowquery) | Aurora MySQL slow query log group asset |
 | <a name="output_instance"></a> [instance](#output\_instance) | Aurora MySQL instance |
 | <a name="output_log_group"></a> [log\_group](#output\_log\_group) | Aurora MySQL log group |
 | <a name="output_log_group_slowquery"></a> [log\_group\_slowquery](#output\_log\_group\_slowquery) | Aurora MySQL slow query log group |
diff --git a/modules/onboard-aws-rds-aurora-mysql-slowquery/outputs.tf b/modules/onboard-aws-rds-aurora-mysql-slowquery/outputs.tf
index 3cdc2d9..e477eda 100644
--- a/modules/onboard-aws-rds-aurora-mysql-slowquery/outputs.tf
+++ b/modules/onboard-aws-rds-aurora-mysql-slowquery/outputs.tf
@@ -23,17 +23,17 @@ output "log_group_slowquery" {
   value       = module.aurora-mysql-log-group-slowquery.this
 }
 
-output "dsf_aurora_mysql_cluster" {
-  description = "Aurora MySQL cluster DSF asset"
+output "aws_rds_aurora_mysql_cluster_asset" {
+  description = "Aurora MySQL cluster asset"
   value       = module.aws-rds-aurora-mysql-cluster-asset.this
 }
 
-output "dsf_aurora_mysql_log_group" {
-  description = "Aurora MySQL log group asset"
+output "aws_log_group_asset" {
+  description = "AWS log group asset"
   value       = module.aws-log-group-asset.this
 }
 
-output "dsf_aurora_mysql_log_group_slowquery" {
-  description = "Aurora MySQL slow query log group asset"
+output "aws_log_group_slowquery_asset" {
+  description = "AWS Slow Query log group asset"
   value       = module.aws-log-group-slowquery-asset.this
 }
diff --git a/modules/onboard-aws-rds-aurora-mysql/README.md b/modules/onboard-aws-rds-aurora-mysql/README.md
index f76799e..198dae5 100644
--- a/modules/onboard-aws-rds-aurora-mysql/README.md
+++ b/modules/onboard-aws-rds-aurora-mysql/README.md
@@ -70,10 +70,10 @@ No resources.
 
 | Name | Description |
 |------|-------------|
+| <a name="output_aws_log_group_asset"></a> [aws\_log\_group\_asset](#output\_aws\_log\_group\_asset) | AWS log group asset |
+| <a name="output_aws_rds_aurora_mysql_cluster_asset"></a> [aws\_rds\_aurora\_mysql\_cluster\_asset](#output\_aws\_rds\_aurora\_mysql\_cluster\_asset) | Aurora MySQL cluster asset |
 | <a name="output_cluster"></a> [cluster](#output\_cluster) | Aurora MySQL Cluster |
 | <a name="output_cluster_parameter_group"></a> [cluster\_parameter\_group](#output\_cluster\_parameter\_group) | Aurora MySQL Cluster parameter group |
-| <a name="output_dsf_aurora_mysql_cluster"></a> [dsf\_aurora\_mysql\_cluster](#output\_dsf\_aurora\_mysql\_cluster) | Aurora MySQL cluster asset |
-| <a name="output_dsf_aurora_mysql_log_group"></a> [dsf\_aurora\_mysql\_log\_group](#output\_dsf\_aurora\_mysql\_log\_group) | Aurora MySQL log group asset |
 | <a name="output_instance"></a> [instance](#output\_instance) | Aurora MySQL instance |
 | <a name="output_log_group"></a> [log\_group](#output\_log\_group) | Aurora MySQL log group |
 <!-- END_TF_DOCS -->
\ No newline at end of file
diff --git a/modules/onboard-aws-rds-aurora-mysql/outputs.tf b/modules/onboard-aws-rds-aurora-mysql/outputs.tf
index b69ff6f..a197da2 100644
--- a/modules/onboard-aws-rds-aurora-mysql/outputs.tf
+++ b/modules/onboard-aws-rds-aurora-mysql/outputs.tf
@@ -18,12 +18,12 @@ output "log_group" {
   value       = module.aurora-mysql-log-group.this
 }
 
-output "dsf_aurora_mysql_cluster" {
+output "aws_rds_aurora_mysql_cluster_asset" {
   description = "Aurora MySQL cluster asset"
   value       = module.aws-rds-aurora-mysql-cluster-asset.this
 }
 
-output "dsf_aurora_mysql_log_group" {
-  description = "Aurora MySQL log group asset"
+output "aws_log_group_asset" {
+  description = "AWS log group asset"
   value       = module.aws-log-group-asset.this
 }
diff --git a/modules/onboard-aws-rds-aurora-postgresql/outputs.tf b/modules/onboard-aws-rds-aurora-postgresql/outputs.tf
index 425c0dc..4cee4fb 100644
--- a/modules/onboard-aws-rds-aurora-postgresql/outputs.tf
+++ b/modules/onboard-aws-rds-aurora-postgresql/outputs.tf
@@ -1,10 +1,10 @@
 output "cluster_parameter_group" {
-  description = "Aurora PostgreSQL cluster parameter group"
+  description = "Aurora PostgreSQL Cluster parameter group"
   value       = module.aurora-postgresql-cluster-parameter-group.this
 }
 
 output "cluster" {
-  description = "Aurora PostgreSQL cluster"
+  description = "Aurora PostgreSQL Cluster"
   value       = module.aurora-postgresql-cluster.this
 }