diff --git a/examples/autokey/autokey-setup/README.md b/examples/autokey-setup/README.md
similarity index 100%
rename from examples/autokey/autokey-setup/README.md
rename to examples/autokey-setup/README.md
diff --git a/examples/autokey/autokey-setup/main.tf b/examples/autokey-setup/main.tf
similarity index 100%
rename from examples/autokey/autokey-setup/main.tf
rename to examples/autokey-setup/main.tf
diff --git a/examples/autokey/autokey-setup/outputs.tf b/examples/autokey-setup/outputs.tf
similarity index 100%
rename from examples/autokey/autokey-setup/outputs.tf
rename to examples/autokey-setup/outputs.tf
diff --git a/examples/autokey/autokey-setup/variables.tf b/examples/autokey-setup/variables.tf
similarity index 74%
rename from examples/autokey/autokey-setup/variables.tf
rename to examples/autokey-setup/variables.tf
index b9d4496..8639df6 100644
--- a/examples/autokey/autokey-setup/variables.tf
+++ b/examples/autokey-setup/variables.tf
@@ -15,12 +15,12 @@
  */
 
 variable "kms_project_id" {
-  description = "The ID of the project in which Autokey resources (autokey keyring, keyHandle and kms keys) will be provisioned."
+  description = "The ID of the project in which kms keyring and kms keys will be provisioned by autokey."
   type        = string
 }
 
 variable "folder_id" {
   type        = string
-  description = "The ID of the folder for which to enable and configure Autokey. Required when using Autokey."
+  description = "The ID of the folder for which to configure and enable Autokey feature. Required when using Autokey."
 }
 
diff --git a/examples/autokey/keyhandle-setup/README.md b/examples/bucket-setup-using-autokey/README.md
similarity index 100%
rename from examples/autokey/keyhandle-setup/README.md
rename to examples/bucket-setup-using-autokey/README.md
diff --git a/examples/autokey/keyhandle-setup/main.tf b/examples/bucket-setup-using-autokey/main.tf
similarity index 100%
rename from examples/autokey/keyhandle-setup/main.tf
rename to examples/bucket-setup-using-autokey/main.tf
diff --git a/examples/autokey/keyhandle-setup/outputs.tf b/examples/bucket-setup-using-autokey/outputs.tf
similarity index 100%
rename from examples/autokey/keyhandle-setup/outputs.tf
rename to examples/bucket-setup-using-autokey/outputs.tf
diff --git a/examples/autokey/keyhandle-setup/variables.tf b/examples/bucket-setup-using-autokey/variables.tf
similarity index 100%
rename from examples/autokey/keyhandle-setup/variables.tf
rename to examples/bucket-setup-using-autokey/variables.tf
diff --git a/modules/autokey/variables.tf b/modules/autokey/variables.tf
index 79fa1b2..0593f66 100644
--- a/modules/autokey/variables.tf
+++ b/modules/autokey/variables.tf
@@ -15,12 +15,12 @@
  */
 
 variable "autokey_kms_project_id" {
-  description = "The ID of the project in which to provision Autokey resources (autokey keyring and keys)."
+  description = "The ID of the project in which kms keyrings and keys will be provisioned by the Autokey."
   type        = string
 }
 
 variable "autokey_folder_number" {
   type        = string
-  description = "The folder number on which autokey will be configured. Required when using Autokey."
+  description = "The folder number on which autokey will be configured and enabled. Required when using Autokey."
 }