diff --git a/common/resources.tf b/common/resources.tf
index b3aba4e..55ccf14 100644
--- a/common/resources.tf
+++ b/common/resources.tf
@@ -7,6 +7,7 @@ locals {
 }
 
 locals {
+  base_name   = var.bucket_name
   name        = replace(var.bucket_name, local._prefixes["s3"], "")
   bucket_name = format("%s%s", local._prefixes["s3"], local.name)
 
@@ -228,7 +229,7 @@ resource "aws_kms_key" "key" {
     local.base_tags,
     var.tags,
     local.enforced_tags,
-    map("Name", local.bucket_name)
+    map("Name", local.kms_key_name)
   )
 }