diff --git a/workload/bicep/brownfield/startVmOnConnect/deploy.bicep b/workload/bicep/brownfield/startVmOnConnect/deploy.bicep
index 2edca7ed5..d5e669d68 100644
--- a/workload/bicep/brownfield/startVmOnConnect/deploy.bicep
+++ b/workload/bicep/brownfield/startVmOnConnect/deploy.bicep
@@ -5,7 +5,7 @@ targetScope = 'subscription'
 // Parameters //
 // ========== //
 
-@description('Required. The object ID for the Azure Virtual Desktop application in Azure AD.')
+@description('Required. The object ID for the Azure Virtual Desktop application in Microsoft Entra ID.')
 param avdObjectId string
 
 @description('Required. The resource ID for the host pool to enable Start VM On Connect on.')
diff --git a/workload/bicep/brownfield/startVmOnConnect/readme.md b/workload/bicep/brownfield/startVmOnConnect/readme.md
index dd575991e..73cb2750f 100644
--- a/workload/bicep/brownfield/startVmOnConnect/readme.md
+++ b/workload/bicep/brownfield/startVmOnConnect/readme.md
@@ -21,7 +21,7 @@ This solution will deploy Start VM On Connect. The feature allows stopped / deal
 New-AzDeployment `
     -Location '<Azure location>' `
     -TemplateFile 'https://raw.githubusercontent.com/Azure/avdaccelerator/main/workload/brownfield/startVmOnConnect/solution.json' `
-    -AvdObjectId '<Object ID for the AVD / WVD application in Azure AD>' `
+    -AvdObjectId '<Object ID for the AVD / WVD application in Microsoft Entra ID>' `
     -HostPoolResourceId '<Resource ID for the target host pool>' `
     -Verbose
 ```
@@ -33,6 +33,6 @@ az deployment sub create \
     --location '<Azure location>' \
     --template-uri 'https://raw.githubusercontent.com/Azure/avdaccelerator/main/workload/brownfield/startVmOnConnect/solution.json' \
     --parameters \
-        AvdObjectId '<Object ID for the AVD / WVD application in Azure AD>' \
+        AvdObjectId '<Object ID for the AVD / WVD application in Microsoft Entra ID>' \
         HostPoolResourceId '<Resource ID for the target host pool>'
 ```
diff --git a/workload/bicep/deploy-baseline.bicep b/workload/bicep/deploy-baseline.bicep
index 4b3fbfd6b..f5f157ba3 100644
--- a/workload/bicep/deploy-baseline.bicep
+++ b/workload/bicep/deploy-baseline.bicep
@@ -47,7 +47,7 @@ param avdVmLocalUserPassword string
 @allowed([
     'ADDS' // Active Directory Domain Services
     'AADDS' // Azure Active Directory Domain Services
-    'AAD' // Azure AD Join
+    'AAD' // Microsoft Entra ID Join
 ])
 @sys.description('Required, The service providing domain services for Azure Virtual Desktop. (Default: ADDS)')
 param avdIdentityServiceProvider string = 'ADDS'
diff --git a/workload/bicep/modules/avdSessionHosts/deploy.bicep b/workload/bicep/modules/avdSessionHosts/deploy.bicep
index e98f759da..b432c8615 100644
--- a/workload/bicep/modules/avdSessionHosts/deploy.bicep
+++ b/workload/bicep/modules/avdSessionHosts/deploy.bicep
@@ -231,7 +231,7 @@ module sessionHosts '../../../../carml/1.3.0/Microsoft.Compute/virtualMachines/d
               options: '3'
           }
       }
-      // Azure AD (AAD) Join.
+      // Microsoft Entra ID (AAD) Join.
       extensionAadJoinConfig: {
           enabled: (identityServiceProvider == 'AAD') ? true: false
           settings: createIntuneEnrollment ? {
diff --git a/workload/docs/deploy-baseline.md b/workload/docs/deploy-baseline.md
index 56a5f2803..b359f8c71 100644
--- a/workload/docs/deploy-baseline.md
+++ b/workload/docs/deploy-baseline.md
@@ -11,9 +11,9 @@
   - **Environment** – Deployment Environment type (Development/Test/Production), will be used for naming and tagging purposes.
 - **Identity provider** blade
   - **Identity Service Provider** - Identity service provider (AD DS, AAD DS, AAD) that already exists and will be used for Azure Virtual Desktop.
-    - Azure Active Directory (AAD).
+    - Microsoft Entra ID (AAD).
     - Active Directory (AD DS).
-    - Azure AD Domain Services (AAD DS).
+    - Microsoft Entra ID Domain Services (AAD DS).
   - **Azure Virtual Desktop access assignment** - These identities will be granted access to Azure Virtual Desktop application groups (role "Desktop Virtualization User").
     - Groups - select from the drop down the groups to be granted access to Azure Virtual Desktop published items and to create sessions on VMs and single sign-on (SSO) when using AAD as identity provider.
     - Note: when using AAD as identity service provider, an additional role (virtual machine user login) will be granted to compute resource group during deployment.
diff --git a/workload/portal-ui/portal-ui-baseline.json b/workload/portal-ui/portal-ui-baseline.json
index 54143ac06..38c4f07dd 100644
--- a/workload/portal-ui/portal-ui-baseline.json
+++ b/workload/portal-ui/portal-ui-baseline.json
@@ -45,7 +45,7 @@
                             "type": "Microsoft.Common.TextBlock",
                             "visible": true,
                             "options": {
-                                "text": "Azure Azure Virtual Desktop Landing Zones will create the resource group hierarchy under the subscriptions with the prefix provided in this step.",
+                                "text": "Azure Virtual Desktop Landing Zones will create the resource group hierarchy under the subscriptions with the prefix provided in this step.",
                                 "link": {
                                     "label": "Learn more",
                                     "uri": "https://docs.microsoft.com/azure/cloud-adoption-framework/ready/enterprise-scale/management-group-and-subscription-organization"