diff --git a/terraform/modules/aws-s3-bucket/00-init.tf b/terraform/modules/s3-bucket/00-init.tf
similarity index 100%
rename from terraform/modules/aws-s3-bucket/00-init.tf
rename to terraform/modules/s3-bucket/00-init.tf
diff --git a/terraform/modules/aws-s3-bucket/01-inputs-required.tf b/terraform/modules/s3-bucket/01-inputs-required.tf
similarity index 100%
rename from terraform/modules/aws-s3-bucket/01-inputs-required.tf
rename to terraform/modules/s3-bucket/01-inputs-required.tf
diff --git a/terraform/modules/aws-s3-bucket/02-inputs-optional.tf b/terraform/modules/s3-bucket/02-inputs-optional.tf
similarity index 100%
rename from terraform/modules/aws-s3-bucket/02-inputs-optional.tf
rename to terraform/modules/s3-bucket/02-inputs-optional.tf
diff --git a/terraform/modules/aws-s3-bucket/03-input-derived.tf b/terraform/modules/s3-bucket/03-input-derived.tf
similarity index 100%
rename from terraform/modules/aws-s3-bucket/03-input-derived.tf
rename to terraform/modules/s3-bucket/03-input-derived.tf
diff --git a/terraform/modules/aws-s3-bucket/10-s3-bucket.tf b/terraform/modules/s3-bucket/10-s3-bucket.tf
similarity index 100%
rename from terraform/modules/aws-s3-bucket/10-s3-bucket.tf
rename to terraform/modules/s3-bucket/10-s3-bucket.tf
diff --git a/terraform/modules/aws-s3-bucket/99-outputs.tf b/terraform/modules/s3-bucket/99-outputs.tf
similarity index 100%
rename from terraform/modules/aws-s3-bucket/99-outputs.tf
rename to terraform/modules/s3-bucket/99-outputs.tf