diff --git a/.github/scripts/Wipe-AlzTenant.ps1 b/.github/scripts/Wipe-AlzTenant.ps1
index 1af4185a..9c11f565 100644
--- a/.github/scripts/Wipe-AlzTenant.ps1
+++ b/.github/scripts/Wipe-AlzTenant.ps1
@@ -1,9 +1,9 @@
 [CmdletBinding()]
 param (
     #Added this back into parameters as error occurs if multiple tenants are found when using Get-AzTenant
-    [Parameter(Mandatory = $true, Position = 1, HelpMessage = "Please the Insert Tenant ID (GUID) of your Azure AD tenant e.g.'f73a2b89-6c0e-4382-899f-ea227cd6b68f'")]
+    [Parameter(Mandatory = $true, Position = 1, HelpMessage = "Please the Insert Tenant ID (GUID) of your Microsoft Entra tenant e.g.'f73a2b89-6c0e-4382-899f-ea227cd6b68f'")]
     [string]
-    $tenantRootGroupID = "<Insert the Tenant ID (GUID) of your Azure AD tenant>",
+    $tenantRootGroupID = "<Insert the Tenant ID (GUID) of your Microsoft Entra tenant>",
 
     [Parameter(Mandatory = $true, Position = 2, HelpMessage = "Insert the name of your intermediate root Management Group e.g. 'Contoso'")]
     [string]
@@ -52,12 +52,12 @@ $subDeployments | ForEach-Object -Parallel {
 }
 
 
-# Get all AAD Tenant level deployments
+# Get all Microsoft Entra Tenant level deployments
 $tenantDeployments = Get-AzTenantDeployment
 
 Write-Information "Removing all Tenant level deployments"
 
-# For each AAD Tenant level deployment, remove it
+# For each Microsoft Entra Tenant level deployment, remove it
 $tenantDeployments | ForEach-Object -Parallel {
     Write-Information "Removing $($_.DeploymentName) ..."
     Remove-AzTenantDeployment -Id $_.Id
@@ -99,4 +99,4 @@ $StopWatch.Stop()
 
 # Display timer output as table
 Write-Information "Time taken to complete task:"
-$StopWatch.Elapsed | Format-Table
\ No newline at end of file
+$StopWatch.Elapsed | Format-Table
diff --git a/README.md b/README.md
index ed042503..67f99682 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 >
 > ℹ️ This module is also available on the Bicep Module Registry [here](https://github.com/Azure/bicep-registry-modules/tree/main/modules/lz/sub-vending). Examples also included in our [wiki examples](https://github.com/Azure/bicep-lz-vending/wiki/examples). ℹ️
 
-The landing zone Bicep modules are designed to accelerate deployment of the individual landing zones (aka Subscriptions) within an Azure AD Tenant.
+The landing zone Bicep modules are designed to accelerate deployment of the individual landing zones (aka Subscriptions) within an Microsoft Entra Tenant.
 
 > See the different types of landing zones in the Azure Landing Zones documentation here: [What is an Azure landing zone? - Platform vs. application landing zones](https://learn.microsoft.com/azure/cloud-adoption-framework/ready/landing-zone/#platform-vs-application-landing-zones)
 
diff --git a/docs/wiki/ConsumerGuide.md b/docs/wiki/ConsumerGuide.md
index 3aa56f5f..d185e496 100644
--- a/docs/wiki/ConsumerGuide.md
+++ b/docs/wiki/ConsumerGuide.md
@@ -3,7 +3,7 @@
 
 ## Background
 
-This repository has been created to help customers and partners to create, deploy and deliver landing zone Subscriptions into an Azure AD Tenant utilizing [Bicep](https://aka.ms/bicep) as the Infrastructure-as-Code (IaC) tooling and language of choice.
+This repository has been created to help customers and partners to create, deploy and deliver landing zone Subscriptions into an Microsoft Entra Tenant utilizing [Bicep](https://aka.ms/bicep) as the Infrastructure-as-Code (IaC) tooling and language of choice.
 
 ## Ways to Consume `bicep-lz-vending`
 
diff --git a/main.bicep b/main.bicep
index ecf785bd..eb12c38a 100644
--- a/main.bicep
+++ b/main.bicep
@@ -4,7 +4,7 @@ targetScope = 'managementGroup'
 
 metadata name = '`main.bicep` Parameters'
 
-metadata description = 'This module is designed to accelerate deployment of landing zones (aka Subscriptions) within an Azure AD Tenant.'
+metadata description = 'This module is designed to accelerate deployment of landing zones (aka Subscriptions) within an Microsoft Entra Tenant.'
 
 metadata details = '''These are the input parameters for the Bicep module: [`main.bicep`](./main.bicep)
 
diff --git a/main.bicep.parameters.md b/main.bicep.parameters.md
index 550a48ef..e48aa9ca 100644
--- a/main.bicep.parameters.md
+++ b/main.bicep.parameters.md
@@ -1,6 +1,6 @@
 # `main.bicep` Parameters
 
-This module is designed to accelerate deployment of landing zones (aka Subscriptions) within an Azure AD Tenant.
+This module is designed to accelerate deployment of landing zones (aka Subscriptions) within an Microsoft Entra Tenant.
 
 ## Parameters
 
diff --git a/tests/pester/full.tests.ps1 b/tests/pester/full.tests.ps1
index d8852ca6..d045c44b 100644
--- a/tests/pester/full.tests.ps1
+++ b/tests/pester/full.tests.ps1
@@ -62,7 +62,7 @@ Describe "Bicep Landing Zone (Sub) Vending Tests" {
   }
 
   Context "Role-Based Access Control Assignment Tests" {
-    It "Should Have a Role Assignment for an known AAD Group with the Reader role directly upon the Subscription" {
+    It "Should Have a Role Assignment for an known Microsoft Entra Group with the Reader role directly upon the Subscription" {
       $iterationCount = 0
       do {
         $roleAssignment = Get-AzRoleAssignment -Scope "/subscriptions/$subId" -RoleDefinitionName "Reader" -ObjectId "7eca0dca-6701-46f1-b7b6-8b424dab50b3" -ErrorAction SilentlyContinue
@@ -80,7 +80,7 @@ Describe "Bicep Landing Zone (Sub) Vending Tests" {
       $roleAssignment.scope | Should -Be "/subscriptions/$subId"
     }
 
-    It "Should Have a Role Assignment for an known AAD Group with the Network Contributor role directly upon the Resource Group" {
+    It "Should Have a Role Assignment for an known Microsoft Entra Group with the Network Contributor role directly upon the Resource Group" {
       $iterationCount = 0
       do {
         $roleAssignment = Get-AzRoleAssignment -Scope "/subscriptions/$subId/resourceGroups/rsg-$location-net-hs-pr-$prNumber" -RoleDefinitionName "Network Contributor" -ObjectId "7eca0dca-6701-46f1-b7b6-8b424dab50b3" -ErrorAction SilentlyContinue