diff --git a/README.md b/README.md
index 33a850ee..2a6c7c17 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Terraform Datadog Agentless Scanner Module
 
-This Terraform module provides a simple and reusable configuration for installing a Datadog agentless-scanner.
+This Terraform module provides a simple and reusable configuration for installing a Datadog agentless scanner.
 
 ## Prerequisites
 
diff --git a/examples/custom_vpc/README.md b/examples/custom_vpc/README.md
index f11a63d5..cd1bff99 100644
--- a/examples/custom_vpc/README.md
+++ b/examples/custom_vpc/README.md
@@ -1,6 +1,6 @@
 # Custom VPC Example
 
-This folder shows an example of Terraform code let you deploy the Datadog agentless-scanner in your own managed VPC.
+This folder shows an example of Terraform code let you deploy the Datadog agentless scanner in your own managed VPC.
 
 ## Quick start
 
@@ -9,4 +9,4 @@ To deploy a Datadog agentless scanner:
 1. Run `terraform init`.
 1. Run `terraform apply`.
 1. Set your datadog [API key](https://docs.datadoghq.com/account_management/api-app-keys/).
-1. Set your the `subnet_id` you want the agentless-scanner to be deployed in.
\ No newline at end of file
+1. Set your the `subnet_id` you want the agentless scanner to be deployed in.
\ No newline at end of file
diff --git a/examples/single_region/README.md b/examples/single_region/README.md
index 32af0549..73f64bad 100644
--- a/examples/single_region/README.md
+++ b/examples/single_region/README.md
@@ -1,6 +1,6 @@
 # Single Region Example
 
-This folder shows an example of Terraform code that uses the [datadog-agentless-scanner module](https://github.com/Datadog/terraform-datadog-agentless-scanner) to deploy a Datadog agentless-scanner in your [AWS](https://aws.amazon.com/) account.
+This folder shows an example of Terraform code that uses the [datadog-agentless-scanner module](https://github.com/Datadog/terraform-datadog-agentless-scanner) to deploy a Datadog agentless scanner in your [AWS](https://aws.amazon.com/) account.
 
 To deploy in multiple regions you can check this [example](../multi_region/README.md).
 If you are interested to scan your other accounts you can check that [example](../cross_account/README.md)
diff --git a/modules/agentless-scanner-role/README.md b/modules/agentless-scanner-role/README.md
index 13efc677..7fde34aa 100644
--- a/modules/agentless-scanner-role/README.md
+++ b/modules/agentless-scanner-role/README.md
@@ -33,7 +33,7 @@ No modules.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| <a name="input_account_roles"></a> [account\_roles](#input\_account\_roles) | List of cross accounts roles ARN that the Datadog agentless-scanner can assume | `list(string)` | `[]` | no |
+| <a name="input_account_roles"></a> [account\_roles](#input\_account\_roles) | List of cross accounts roles ARN that the Datadog agentless scanner can assume | `list(string)` | `[]` | no |
 | <a name="input_enable_ssm"></a> [enable\_ssm](#input\_enable\_ssm) | Whether to enable AWS SSM to facilitate executing troubleshooting commands on the instance | `bool` | `false` | no |
 | <a name="input_iam_role_name"></a> [iam\_role\_name](#input\_iam\_role\_name) | Name to use on IAM role created | `string` | `"DatadogAgentlessScannerAgentRole"` | no |
 | <a name="input_iam_role_path"></a> [iam\_role\_path](#input\_iam\_role\_path) | IAM role path | `string` | `null` | no |
@@ -43,6 +43,6 @@ No modules.
 
 | Name | Description |
 |------|-------------|
-| <a name="output_instance_profile"></a> [instance\_profile](#output\_instance\_profile) | The Datadog agentless-scanner instance profile created |
-| <a name="output_role"></a> [role](#output\_role) | The Datadog agentless-scanner role created |
+| <a name="output_instance_profile"></a> [instance\_profile](#output\_instance\_profile) | The Datadog agentless scanner instance profile created |
+| <a name="output_role"></a> [role](#output\_role) | The Datadog agentless scanner role created |
 <!-- END_TF_DOCS -->
\ No newline at end of file
diff --git a/modules/agentless-scanner-role/outputs.tf b/modules/agentless-scanner-role/outputs.tf
index dc983681..03cdf3f1 100644
--- a/modules/agentless-scanner-role/outputs.tf
+++ b/modules/agentless-scanner-role/outputs.tf
@@ -1,9 +1,9 @@
 output "role" {
-  description = "The Datadog agentless-scanner role created"
+  description = "The Datadog agentless scanner role created"
   value       = aws_iam_role.role
 }
 
 output "instance_profile" {
-  description = "The Datadog agentless-scanner instance profile created"
+  description = "The Datadog agentless scanner instance profile created"
   value       = aws_iam_instance_profile.profile
 }
\ No newline at end of file
diff --git a/modules/agentless-scanner-role/variables.tf b/modules/agentless-scanner-role/variables.tf
index 3274851d..2859b091 100644
--- a/modules/agentless-scanner-role/variables.tf
+++ b/modules/agentless-scanner-role/variables.tf
@@ -11,7 +11,7 @@ variable "iam_role_path" {
 }
 
 variable "account_roles" {
-  description = "List of cross accounts roles ARN that the Datadog agentless-scanner can assume"
+  description = "List of cross accounts roles ARN that the Datadog agentless scanner can assume"
   type        = list(string)
   default     = []
 }
diff --git a/modules/instance/README.md b/modules/instance/README.md
index a88c4bc9..c386e4c6 100644
--- a/modules/instance/README.md
+++ b/modules/instance/README.md
@@ -42,5 +42,5 @@ No modules.
 
 | Name | Description |
 |------|-------------|
-| <a name="output_instance"></a> [instance](#output\_instance) | The Datadog agentless-scanner instance created |
+| <a name="output_instance"></a> [instance](#output\_instance) | The Datadog agentless scanner instance created |
 <!-- END_TF_DOCS -->
\ No newline at end of file
diff --git a/modules/instance/outputs.tf b/modules/instance/outputs.tf
index 631577f8..3cb4beb6 100644
--- a/modules/instance/outputs.tf
+++ b/modules/instance/outputs.tf
@@ -1,4 +1,4 @@
 output "instance" {
-  description = "The Datadog agentless-scanner instance created"
+  description = "The Datadog agentless scanner instance created"
   value       = aws_instance.instance
 }
\ No newline at end of file
diff --git a/modules/scanning-delegate-role/main.tf b/modules/scanning-delegate-role/main.tf
index 4b0460c1..e06c2111 100644
--- a/modules/scanning-delegate-role/main.tf
+++ b/modules/scanning-delegate-role/main.tf
@@ -236,7 +236,7 @@ data "aws_iam_policy_document" "assume_role_policy" {
 resource "aws_iam_role" "role" {
   name        = var.iam_role_name
   path        = var.iam_role_path
-  description = "Role assumed by the Datadog Agentless-Scanner agent to perform scans"
+  description = "Role assumed by the Datadog Agentless scanner agent to perform scans"
 
   assume_role_policy = data.aws_iam_policy_document.assume_role_policy.json
 
diff --git a/modules/user_data/templates/install.sh.tftpl b/modules/user_data/templates/install.sh.tftpl
index 40dbb565..5b462dff 100644
--- a/modules/user_data/templates/install.sh.tftpl
+++ b/modules/user_data/templates/install.sh.tftpl
@@ -35,7 +35,7 @@ remote_configuration:
 EOF
 %{ endif }
 
-# Activate agentless-scanner logging
+# Activate agentless scanner logging
 mkdir -p /etc/datadog-agent/conf.d/agentless-scanner.d
 cat <<EOF > /etc/datadog-agent/conf.d/agentless-scanner.d/conf.yaml
 logs:
diff --git a/modules/vpc/README.md b/modules/vpc/README.md
index 5a7b5889..75b36f6e 100644
--- a/modules/vpc/README.md
+++ b/modules/vpc/README.md
@@ -58,5 +58,5 @@ No modules.
 | <a name="output_nap_public_id"></a> [nap\_public\_id](#output\_nap\_public\_id) | The public IP associated with the VPC's NAT |
 | <a name="output_private_subnet"></a> [private\_subnet](#output\_private\_subnet) | The private subnet of the created VPC |
 | <a name="output_public_subnet"></a> [public\_subnet](#output\_public\_subnet) | The public subnet of the created VPC |
-| <a name="output_vpc"></a> [vpc](#output\_vpc) | The VPC created for the Datadog agentless-scanner |
+| <a name="output_vpc"></a> [vpc](#output\_vpc) | The VPC created for the Datadog agentless scanner |
 <!-- END_TF_DOCS -->
\ No newline at end of file
diff --git a/modules/vpc/outputs.tf b/modules/vpc/outputs.tf
index 8f5e95da..bf281c75 100644
--- a/modules/vpc/outputs.tf
+++ b/modules/vpc/outputs.tf
@@ -1,5 +1,5 @@
 output "vpc" {
-  description = "The VPC created for the Datadog agentless-scanner"
+  description = "The VPC created for the Datadog agentless scanner"
   value       = aws_vpc.vpc
 }
 
diff --git a/outputs.tf b/outputs.tf
index 7c0062dd..b487ca2b 100644
--- a/outputs.tf
+++ b/outputs.tf
@@ -1,4 +1,4 @@
 output "vpc" {
-  description = "The VPC created for the Datadog agentless-scanner"
+  description = "The VPC created for the Datadog agentless scanner"
   value       = module.vpc.vpc
 }
\ No newline at end of file