diff --git a/README.md b/README.md
index c325056..8fce3b7 100644
--- a/README.md
+++ b/README.md
@@ -56,11 +56,11 @@ A bare minimum configuration to execute the module:
 
 ```hcl
 data "aws_eks_cluster" "cluster" {
-  name = module.eks_cluster.eks_cluster_id
+  name = module.eks_cluster.eks_cluster_name
 }
 
 data "aws_eks_cluster_auth" "cluster" {
-  name = module.eks_cluster.eks_cluster_id
+  name = module.eks_cluster.eks_cluster_name
 }
 
 provider "aws" {
@@ -393,7 +393,7 @@ _Note: Since this module manages all of the Kubernetes addon dependencies requir
 | <a name="output_eks_cluster_arn"></a> [eks\_cluster\_arn](#output\_eks\_cluster\_arn) | The ARN for the EKS cluster created by this module |
 | <a name="output_eks_cluster_certificate_authority_data"></a> [eks\_cluster\_certificate\_authority\_data](#output\_eks\_cluster\_certificate\_authority\_data) | Base64 encoded certificate data required to communicate with the cluster |
 | <a name="output_eks_cluster_endpoint"></a> [eks\_cluster\_endpoint](#output\_eks\_cluster\_endpoint) | The endpoint for the EKS cluster created by this module |
-| <a name="output_eks_cluster_id"></a> [eks\_cluster\_id](#output\_eks\_cluster\_id) | The id/name of the EKS cluster created by this module |
+| <a name="output_eks_cluster_name"></a> [eks\_cluster\_name](#output\_eks\_cluster\_name) | The name of the EKS cluster created by this module |
 | <a name="output_eks_cluster_identity_oidc_issuer_arn"></a> [eks\_cluster\_identity\_oidc\_issuer\_arn](#output\_eks\_cluster\_identity\_oidc\_issuer\_arn) | The ARN for the OIDC issuer created by this module |
 | <a name="output_eks_cluster_identity_oidc_issuer_string"></a> [eks\_cluster\_identity\_oidc\_issuer\_string](#output\_eks\_cluster\_identity\_oidc\_issuer\_string) | A formatted string containing the prefix for the OIDC issuer created by this module. Same as "cluster\_oidc\_issuer\_url", but with "https://" stripped from the name. This output is typically used in other StreamNative modules that request the "oidc\_issuer" input. |
 | <a name="output_eks_cluster_identity_oidc_issuer_url"></a> [eks\_cluster\_identity\_oidc\_issuer\_url](#output\_eks\_cluster\_identity\_oidc\_issuer\_url) | The URL for the OIDC issuer created by this module |
diff --git a/examples/example-with-vpc/main.tf b/examples/example-with-vpc/main.tf
index e6480c7..635dc74 100644
--- a/examples/example-with-vpc/main.tf
+++ b/examples/example-with-vpc/main.tf
@@ -35,11 +35,11 @@ terraform {
 ### These data sources are required by the Kubernetes and Helm providers in order to connect to the newly provisioned cluster
 #######
 data "aws_eks_cluster" "cluster" {
-  name = module.sn_cluster.eks_cluster_id
+  name = module.sn_cluster.eks_cluster_name
 }
 
 data "aws_eks_cluster_auth" "cluster" {
-  name = module.sn_cluster.eks_cluster_id
+  name = module.sn_cluster.eks_cluster_name
 }
 
 data "aws_caller_identity" "current" {}
diff --git a/examples/root-example/main.tf b/examples/root-example/main.tf
index 5cfd1f4..ea591db 100644
--- a/examples/root-example/main.tf
+++ b/examples/root-example/main.tf
@@ -25,11 +25,11 @@ variable "region" {
 ### These data sources are required by the Kubernetes and Helm providers in order to connect to the newly provisioned cluster
 #######
 data "aws_eks_cluster" "cluster" {
-  name = module.sn_cluster.eks_cluster_id
+  name = module.sn_cluster.eks_cluster_name
 }
 
 data "aws_eks_cluster_auth" "cluster" {
-  name = module.sn_cluster.eks_cluster_id
+  name = module.sn_cluster.eks_cluster_name
 }
 
 provider "aws" {
diff --git a/examples/streamnative-platform/main.tf b/examples/streamnative-platform/main.tf
index e8614d9..06199f4 100644
--- a/examples/streamnative-platform/main.tf
+++ b/examples/streamnative-platform/main.tf
@@ -47,11 +47,11 @@ provider "kubernetes" {
 }
 
 data "aws_eks_cluster" "cluster" {
-  name = module.sn_cluster.eks_cluster_id
+  name = module.sn_cluster.eks_cluster_name
 }
 
 data "aws_eks_cluster_auth" "cluster" {
-  name = module.sn_cluster.eks_cluster_id
+  name = module.sn_cluster.eks_cluster_name
 }
 
 data "aws_caller_identity" "current" {}
@@ -131,7 +131,7 @@ module "sn_bootstrap" {
 module "sn_tiered_storage_resources" {
   source = "github.com/streamnative/terraform-aws-cloud//modules/tiered-storage-resources?ref=v2.2.4-alpha"
 
-  cluster_name     = module.sn_cluster.eks_cluster_id
+  cluster_name     = module.sn_cluster.eks_cluster_name
   oidc_issuer      = module.sn_cluster.eks_cluster_identity_oidc_issuer_string
   pulsar_namespace = local.pulsar_namespace
 
@@ -151,7 +151,7 @@ module "sn_tiered_storage_resources" {
 module "sn_tiered_storage_vault_resources" {
   source = "github.com/streamnative/terraform-aws-cloud//modules/vault-resources?ref=v2.2.4-alpha"
 
-  cluster_name     = module.sn_cluster.eks_cluster_id
+  cluster_name     = module.sn_cluster.eks_cluster_name
   oidc_issuer      = module.sn_cluster.eks_cluster_identity_oidc_issuer_string
   pulsar_namespace = local.pulsar_namespace
 
@@ -183,11 +183,11 @@ output "cleanup_for_destroying_cluster" {
 }
 
 output "connect_to_cluster" {
-  value = format("aws eks update-kubeconfig --name %s --kubeconfig ~/.kube/config --region %s", module.sn_cluster.eks_cluster_id, local.region)
+  value = format("aws eks update-kubeconfig --name %s --kubeconfig ~/.kube/config --region %s", module.sn_cluster.eks_cluster_name, local.region)
 }
 
-output "eks_cluster_id" {
-  value = module.sn_cluster.eks_cluster_id
+output "eks_cluster_name" {
+  value = module.sn_cluster.eks_cluster_name
 }
 
 output "vpc_id" {
diff --git a/outputs.tf b/outputs.tf
index 1dbb45a..164ee16 100644
--- a/outputs.tf
+++ b/outputs.tf
@@ -22,9 +22,9 @@ output "eks_cluster_endpoint" {
   description = "The endpoint for the EKS cluster created by this module"
 }
 
-output "eks_cluster_id" {
-  value       = module.eks.cluster_id
-  description = "The id/name of the EKS cluster created by this module"
+output "eks_cluster_name" {
+  value       = module.eks.cluster_name
+  description = "The name of the EKS cluster created by this module"
 }
 
 output "eks_cluster_identity_oidc_issuer_url" {