diff --git a/pkg/types/config/validate.go b/pkg/types/config/validate.go
index 8e13f040c48..4e57b3d43d3 100644
--- a/pkg/types/config/validate.go
+++ b/pkg/types/config/validate.go
@@ -105,7 +105,7 @@ func (c *Cluster) validateAWS() []error {
 	if err := c.validateAWSEndpoints(); err != nil {
 		errs = append(errs, err)
 	}
-	if err := c.validateTNCS3Bucket(); err != nil {
+	if err := c.validateS3Bucket(); err != nil {
 		errs = append(errs, err)
 	}
 	if err := validate.PrefixError("aws vpcCIDRBlock", validate.SubnetCIDR(c.AWS.VPCCIDRBlock)); err != nil {
@@ -235,12 +235,12 @@ func (c *Cluster) validateAWSEndpoints() error {
 	}
 }
 
-// validateTNCS3Bucket does some basic validation to ensure that the TNC bucket
+// validateS3Bucket does some basic validation to ensure that the S3 bucket
 // matches the S3 bucket naming rules. Not all rules are checked
 // because Tectonic controls the generation of S3 bucket names, creating
-// buckets of the form: <cluster-name>-<tnc>.<domain-name>
-func (c *Cluster) validateTNCS3Bucket() error {
-	bucket := fmt.Sprintf("%s-tnc.%s", c.Name, c.BaseDomain)
+// buckets of the form: <cluster-name>.<domain-name>
+func (c *Cluster) validateS3Bucket() error {
+	bucket := fmt.Sprintf("%s.%s", c.Name, c.BaseDomain)
 	if len(bucket) > maxS3BucketNameLength {
 		return fmt.Errorf("the S3 bucket name %q, generated from the cluster name and base domain, is too long; S3 bucket names must be less than 63 characters; please choose a shorter cluster name or base domain", bucket)
 	}
diff --git a/pkg/types/config/validate_test.go b/pkg/types/config/validate_test.go
index ab1cdd99896..36836f6df8c 100644
--- a/pkg/types/config/validate_test.go
+++ b/pkg/types/config/validate_test.go
@@ -351,7 +351,7 @@ func TestAWSEndpoints(t *testing.T) {
 	}
 }
 
-func TestTNCS3BucketNames(t *testing.T) {
+func TestS3BucketNames(t *testing.T) {
 	cases := []struct {
 		cluster Cluster
 		err     bool
@@ -395,7 +395,7 @@ func TestTNCS3BucketNames(t *testing.T) {
 	}
 
 	for i, c := range cases {
-		if err := c.cluster.validateTNCS3Bucket(); (err != nil) != c.err {
+		if err := c.cluster.validateS3Bucket(); (err != nil) != c.err {
 			no := "no"
 			if c.err {
 				no = "an"