diff --git a/README.md b/README.md
index 43afc48..0c38090 100644
--- a/README.md
+++ b/README.md
@@ -349,14 +349,14 @@ No modules.
 
 | Name | Description |
 |------|-------------|
+| <a name="output_eventbridge_archive_arns"></a> [eventbridge\_archive\_arns](#output\_eventbridge\_archive\_arns) | The EventBridge Archive Arns created |
+| <a name="output_eventbridge_bus_arn"></a> [eventbridge\_bus\_arn](#output\_eventbridge\_bus\_arn) | The EventBridge Bus Arn |
+| <a name="output_eventbridge_bus_name"></a> [eventbridge\_bus\_name](#output\_eventbridge\_bus\_name) | The EventBridge Bus Name |
+| <a name="output_eventbridge_permission_ids"></a> [eventbridge\_permission\_ids](#output\_eventbridge\_permission\_ids) | The EventBridge Permission Arns created |
 | <a name="output_eventbridge_role_arn"></a> [eventbridge\_role\_arn](#output\_eventbridge\_role\_arn) | The ARN of the IAM role created for EventBridge |
 | <a name="output_eventbridge_role_name"></a> [eventbridge\_role\_name](#output\_eventbridge\_role\_name) | The name of the IAM role created for EventBridge |
-| <a name="output_this_eventbridge_archive_arns"></a> [this\_eventbridge\_archive\_arns](#output\_this\_eventbridge\_archive\_arns) | The EventBridge Archive Arns created |
-| <a name="output_this_eventbridge_bus_arn"></a> [this\_eventbridge\_bus\_arn](#output\_this\_eventbridge\_bus\_arn) | The EventBridge Bus Arn |
-| <a name="output_this_eventbridge_bus_name"></a> [this\_eventbridge\_bus\_name](#output\_this\_eventbridge\_bus\_name) | The EventBridge Bus Name |
-| <a name="output_this_eventbridge_permission_ids"></a> [this\_eventbridge\_permission\_ids](#output\_this\_eventbridge\_permission\_ids) | The EventBridge Permission Arns created |
-| <a name="output_this_eventbridge_rule_arns"></a> [this\_eventbridge\_rule\_arns](#output\_this\_eventbridge\_rule\_arns) | The EventBridge Rule ARNs created |
-| <a name="output_this_eventbridge_rule_ids"></a> [this\_eventbridge\_rule\_ids](#output\_this\_eventbridge\_rule\_ids) | The EventBridge Rule IDs created |
+| <a name="output_eventbridge_rule_arns"></a> [eventbridge\_rule\_arns](#output\_eventbridge\_rule\_arns) | The EventBridge Rule ARNs created |
+| <a name="output_eventbridge_rule_ids"></a> [eventbridge\_rule\_ids](#output\_eventbridge\_rule\_ids) | The EventBridge Rule IDs created |
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 
 ## Authors
diff --git a/examples/api-gateway-event-source/README.md b/examples/api-gateway-event-source/README.md
index d59b619..158fe12 100644
--- a/examples/api-gateway-event-source/README.md
+++ b/examples/api-gateway-event-source/README.md
@@ -58,10 +58,10 @@ No inputs.
 
 | Name | Description |
 |------|-------------|
+| <a name="output_eventbridge_bus_arn"></a> [eventbridge\_bus\_arn](#output\_eventbridge\_bus\_arn) | The EventBridge Bus Arn |
+| <a name="output_eventbridge_bus_name"></a> [eventbridge\_bus\_name](#output\_eventbridge\_bus\_name) | The EventBridge Bus Name |
 | <a name="output_eventbridge_role_arn"></a> [eventbridge\_role\_arn](#output\_eventbridge\_role\_arn) | The ARN of the IAM role created for EventBridge |
 | <a name="output_eventbridge_role_name"></a> [eventbridge\_role\_name](#output\_eventbridge\_role\_name) | The name of the IAM role created for EventBridge |
-| <a name="output_this_eventbridge_bus_arn"></a> [this\_eventbridge\_bus\_arn](#output\_this\_eventbridge\_bus\_arn) | The EventBridge Bus Arn |
-| <a name="output_this_eventbridge_bus_name"></a> [this\_eventbridge\_bus\_name](#output\_this\_eventbridge\_bus\_name) | The EventBridge Bus Name |
-| <a name="output_this_eventbridge_rule_arns"></a> [this\_eventbridge\_rule\_arns](#output\_this\_eventbridge\_rule\_arns) | The EventBridge Rule ARNs created |
-| <a name="output_this_eventbridge_rule_ids"></a> [this\_eventbridge\_rule\_ids](#output\_this\_eventbridge\_rule\_ids) | The EventBridge Rule IDs created |
+| <a name="output_eventbridge_rule_arns"></a> [eventbridge\_rule\_arns](#output\_eventbridge\_rule\_arns) | The EventBridge Rule ARNs created |
+| <a name="output_eventbridge_rule_ids"></a> [eventbridge\_rule\_ids](#output\_eventbridge\_rule\_ids) | The EventBridge Rule IDs created |
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
diff --git a/examples/api-gateway-event-source/main.tf b/examples/api-gateway-event-source/main.tf
index d37fa88..ece8422 100644
--- a/examples/api-gateway-event-source/main.tf
+++ b/examples/api-gateway-event-source/main.tf
@@ -72,7 +72,7 @@ module "api_gateway" {
       credentials_arn     = module.apigateway_put_events_to_eventbridge_role.this_iam_role_arn
 
       request_parameters = jsonencode({
-        EventBusName = module.eventbridge.this_eventbridge_bus_name,
+        EventBusName = module.eventbridge.eventbridge_bus_name,
         Source       = "api.gateway.orders.create",
         DetailType   = "Order Create",
         Detail       = "$request.body",
@@ -114,7 +114,7 @@ data "aws_iam_policy_document" "apigateway_put_events_to_eventbridge_policy" {
   statement {
     sid       = "AllowPutEvents"
     actions   = ["events:PutEvents"]
-    resources = [module.eventbridge.this_eventbridge_bus_arn]
+    resources = [module.eventbridge.eventbridge_bus_arn]
   }
 
   depends_on = [module.eventbridge]
diff --git a/examples/api-gateway-event-source/outputs.tf b/examples/api-gateway-event-source/outputs.tf
index 10f1f4e..4e53484 100644
--- a/examples/api-gateway-event-source/outputs.tf
+++ b/examples/api-gateway-event-source/outputs.tf
@@ -1,20 +1,20 @@
-output "this_eventbridge_bus_name" {
+output "eventbridge_bus_name" {
   description = "The EventBridge Bus Name"
-  value       = module.eventbridge.this_eventbridge_bus_name
+  value       = module.eventbridge.eventbridge_bus_name
 }
 
-output "this_eventbridge_bus_arn" {
+output "eventbridge_bus_arn" {
   description = "The EventBridge Bus Arn"
-  value       = module.eventbridge.this_eventbridge_bus_arn
+  value       = module.eventbridge.eventbridge_bus_arn
 }
-output "this_eventbridge_rule_ids" {
+output "eventbridge_rule_ids" {
   description = "The EventBridge Rule IDs created"
-  value       = module.eventbridge.this_eventbridge_rule_ids
+  value       = module.eventbridge.eventbridge_rule_ids
 }
 
-output "this_eventbridge_rule_arns" {
+output "eventbridge_rule_arns" {
   description = "The EventBridge Rule ARNs created"
-  value       = module.eventbridge.this_eventbridge_rule_arns
+  value       = module.eventbridge.eventbridge_rule_arns
 }
 
 output "eventbridge_role_arn" {
diff --git a/examples/complete/outputs.tf b/examples/complete/outputs.tf
index 4b50256..89ca939 100644
--- a/examples/complete/outputs.tf
+++ b/examples/complete/outputs.tf
@@ -1,14 +1,14 @@
 output "eventbridge_bus_arn" {
   description = "The EventBridge Bus ARN"
-  value       = module.eventbridge.this_eventbridge_bus_arn
+  value       = module.eventbridge.eventbridge_bus_arn
 }
 
 output "eventbridge_rule_ids" {
   description = "The EventBridge Rule IDs"
-  value       = module.eventbridge.this_eventbridge_rule_ids
+  value       = module.eventbridge.eventbridge_rule_ids
 }
 
 output "eventbridge_rule_arns" {
   description = "The EventBridge Rule ARNs"
-  value       = module.eventbridge.this_eventbridge_rule_arns
+  value       = module.eventbridge.eventbridge_rule_arns
 }
diff --git a/examples/default-bus/outputs.tf b/examples/default-bus/outputs.tf
index 7a3ecdc..e63e61c 100644
--- a/examples/default-bus/outputs.tf
+++ b/examples/default-bus/outputs.tf
@@ -1,5 +1,5 @@
 output "eventbridge_bus_arn" {
   description = "The EventBridge Bus ARN"
-  value       = module.eventbridge.this_eventbridge_bus_arn
+  value       = module.eventbridge.eventbridge_bus_arn
 }
 
diff --git a/examples/with-archive/outputs.tf b/examples/with-archive/outputs.tf
index 864bf8d..46425c5 100644
--- a/examples/with-archive/outputs.tf
+++ b/examples/with-archive/outputs.tf
@@ -1,10 +1,10 @@
 output "eventbridge_bus_arn" {
   description = "The EventBridge Bus ARN"
-  value       = module.eventbridge.this_eventbridge_bus_arn
+  value       = module.eventbridge.eventbridge_bus_arn
 }
 
 output "eventbridge_archive_arns" {
   description = "The EventBridge Archive ARNs"
-  value       = module.eventbridge.this_eventbridge_archive_arns
+  value       = module.eventbridge.eventbridge_archive_arns
 }
 
diff --git a/examples/with-permissions/README.md b/examples/with-permissions/README.md
index d2ce8a0..7b81b02 100644
--- a/examples/with-permissions/README.md
+++ b/examples/with-permissions/README.md
@@ -52,5 +52,5 @@ No inputs.
 | Name | Description |
 |------|-------------|
 | <a name="output_eventbridge_bus_arn"></a> [eventbridge\_bus\_arn](#output\_eventbridge\_bus\_arn) | The EventBridge Bus ARN |
-| <a name="output_this_eventbridge_permission_ids"></a> [this\_eventbridge\_permission\_ids](#output\_this\_eventbridge\_permission\_ids) | The EventBridge Permissions |
+| <a name="output_eventbridge_permission_ids"></a> [eventbridge\_permission\_ids](#output\_eventbridge\_permission\_ids) | The EventBridge Permissions |
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
diff --git a/examples/with-permissions/outputs.tf b/examples/with-permissions/outputs.tf
index fa74977..2b942fa 100644
--- a/examples/with-permissions/outputs.tf
+++ b/examples/with-permissions/outputs.tf
@@ -1,9 +1,9 @@
 output "eventbridge_bus_arn" {
   description = "The EventBridge Bus ARN"
-  value       = module.eventbridge.this_eventbridge_bus_arn
+  value       = module.eventbridge.eventbridge_bus_arn
 }
 
-output "this_eventbridge_permission_ids" {
+output "eventbridge_permission_ids" {
   description = "The EventBridge Permissions"
-  value       = module.eventbridge.this_eventbridge_permission_ids
+  value       = module.eventbridge.eventbridge_permission_ids
 }
diff --git a/outputs.tf b/outputs.tf
index 568855d..29b526e 100644
--- a/outputs.tf
+++ b/outputs.tf
@@ -1,35 +1,35 @@
 # EventBridge Bus
-output "this_eventbridge_bus_name" {
+output "eventbridge_bus_name" {
   description = "The EventBridge Bus Name"
   value       = var.bus_name
 }
 
-output "this_eventbridge_bus_arn" {
+output "eventbridge_bus_arn" {
   description = "The EventBridge Bus Arn"
   value       = element(concat(aws_cloudwatch_event_bus.this.*.arn, [""]), 0)
 }
 
 # EventBridge Archive
-output "this_eventbridge_archive_arns" {
+output "eventbridge_archive_arns" {
   description = "The EventBridge Archive Arns created"
   value       = { for v in aws_cloudwatch_event_archive.this : v.name => v.arn }
 }
 
 # EventBridge Permission
-output "this_eventbridge_permission_ids" {
+output "eventbridge_permission_ids" {
   description = "The EventBridge Permission Arns created"
   value       = { for k, v in aws_cloudwatch_event_permission.this : k => v.id }
 }
 
 # EventBridge Rule
-output "this_eventbridge_rule_ids" {
+output "eventbridge_rule_ids" {
   description = "The EventBridge Rule IDs created"
   value = {
     for p in sort(keys(var.rules)) : p => aws_cloudwatch_event_rule.this[p].id
   }
 }
 
-output "this_eventbridge_rule_arns" {
+output "eventbridge_rule_arns" {
   description = "The EventBridge Rule ARNs created"
   value = {
     for p in sort(keys(var.rules)) : p => aws_cloudwatch_event_rule.this[p].arn