diff --git a/s3-access-logs/README.md b/s3-access-logs/README.md
index 5badbb8..c44b539 100644
--- a/s3-access-logs/README.md
+++ b/s3-access-logs/README.md
@@ -81,5 +81,5 @@ No Modules.
 
 | Name | Description |
 |------|-------------|
-| logs\_bucket\_arn | Logging S3 bucket ARN |
-| logs\_bucket\_id | Logging S3 bucket ID |
+| bucket\_arn | Logging S3 bucket ARN |
+| bucket\_id | Logging S3 bucket ID |
diff --git a/s3-access-logs/outputs.tf b/s3-access-logs/outputs.tf
index 7661e2f..9ae3752 100644
--- a/s3-access-logs/outputs.tf
+++ b/s3-access-logs/outputs.tf
@@ -1,9 +1,9 @@
-output "logs_bucket_id" {
+output "bucket_id" {
   description = "Logging S3 bucket ID"
   value       = aws_s3_bucket.logs.id
 }
 
-output "logs_bucket_arn" {
+output "bucket_arn" {
   description = "Logging S3 bucket ARN"
   value       = aws_s3_bucket.logs.arn
 }
diff --git a/s3-flow-logs/README.md b/s3-flow-logs/README.md
index 335ddcb..20a076f 100644
--- a/s3-flow-logs/README.md
+++ b/s3-flow-logs/README.md
@@ -80,5 +80,5 @@ No Modules.
 
 | Name | Description |
 |------|-------------|
-| flowlogs\_bucket\_arn | VPC Flow Logs S3 bucket ARN |
-| flowlogs\_bucket\_id | VPC Flow Logs S3 bucket ID |
+| bucket\_arn | VPC Flow Logs S3 bucket ARN |
+| bucket\_id | VPC Flow Logs S3 bucket ID |
diff --git a/s3-flow-logs/outputs.tf b/s3-flow-logs/outputs.tf
index cc57cc2..2caacd6 100644
--- a/s3-flow-logs/outputs.tf
+++ b/s3-flow-logs/outputs.tf
@@ -1,9 +1,9 @@
-output "flowlogs_bucket_id" {
+output "bucket_id" {
   description = "VPC Flow Logs S3 bucket ID"
   value       = aws_s3_bucket.flowlogs.id
 }
 
-output "flowlogs_bucket_arn" {
+output "bucket_arn" {
   description = "VPC Flow Logs S3 bucket ARN"
   value       = aws_s3_bucket.flowlogs.arn
 }