updates

carml/1.3.0/Microsoft.Compute/virtualMachines/deploy.bicep

@@ -171,7 +171,7 @@ param extensionDomainJoinConfig object = {
   enabled: false
 }
 
-@description('Optional. The configuration for the [AAD Join] extension. Must at least contain the ["enabled": true] property to be executed.')
+@description('Optional. The configuration for the [EntraID Join] extension. Must at least contain the ["enabled": true] property to be executed.')
 param extensionAadJoinConfig object = {
   enabled: false
 }

carml/1.3.0/Microsoft.Compute/virtualMachines/readme.md

@@ -68,7 +68,7 @@ This module deploys one Virtual Machine with one or multiple NICs and optionally
 | `enableDefaultTelemetry` | bool | `True` |  | Enable telemetry via a Globally Unique Identifier (GUID). |
 | `enableEvictionPolicy` | bool | `False` |  | Specifies the eviction policy for the low priority virtual machine. Will result in 'Deallocate' eviction policy. |
 | `encryptionAtHost` | bool | `True` |  | This property can be used by user in the request to enable or disable the Host Encryption for the virtual machine. This will enable the encryption for all the disks including Resource/Temp disk at host itself. For security reasons, it is recommended to set encryptionAtHost to True. Restrictions: Cannot be enabled if Azure Disk Encryption (guest-VM encryption using bitlocker/DM-Crypt) is enabled on your VMs. |
-| `extensionAadJoinConfig` | object | `{object}` |  | The configuration for the [AAD Join] extension. Must at least contain the ["enabled": true] property to be executed. |
+| `extensionAadJoinConfig` | object | `{object}` |  | The configuration for the [EntraID Join] extension. Must at least contain the ["enabled": true] property to be executed. |
 | `extensionAntiMalwareConfig` | object | `{object}` |  | The configuration for the [Anti Malware] extension. Must at least contain the ["enabled": true] property to be executed. |
 | `extensionAzureDiskEncryptionConfig` | object | `{object}` |  | The configuration for the [Azure Disk Encryption] extension. Must at least contain the ["enabled": true] property to be executed. Restrictions: Cannot be enabled on disks that have encryption at host enabled. Managed disks encrypted using Azure Disk Encryption cannot be encrypted using customer-managed keys. |
 | `extensionCustomScriptConfig` | object | `{object}` |  | The configuration for the [Custom Script] extension. Must at least contain the ["enabled": true] property to be executed. |

carml/1.3.0/Microsoft.Network/virtualNetworkGateways/deploy.bicep

@@ -166,7 +166,7 @@ param virtualNetworkGatewaydiagnosticLogCategoriesToEnable array = [
   'allLogs'
 ]
 
-@description('Optional. Configuration for AAD Authentication for P2S Tunnel Type, Cannot be configured if clientRootCertData is provided.')
+@description('Optional. Configuration for EntraID Authentication for P2S Tunnel Type, Cannot be configured if clientRootCertData is provided.')
 param vpnClientAadConfiguration object = {}
 
 @description('Optional. The name of metrics that will be streamed.')

carml/1.3.0/Microsoft.Storage/storageAccounts/deploy.bicep

@@ -73,7 +73,7 @@ param networkAcls object = {}
 @description('Optional. A Boolean indicating whether or not the service applies a secondary layer of encryption with platform managed keys for data at rest. For security reasons, it is recommended to set it to true.')
 param requireInfrastructureEncryption bool = true
 
-@description('Optional. Allow or disallow cross AAD tenant object replication.')
+@description('Optional. Allow or disallow cross EntraID tenant object replication.')
 param allowCrossTenantReplication bool = true
 
 @description('Optional. Sets the custom domain name assigned to the storage account. Name is the CNAME source.')
@@ -159,7 +159,7 @@ param tags object = {}
 @description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
 param enableDefaultTelemetry bool = true
 
-@description('Optional. Restrict copy to and from Storage Accounts within an AAD tenant or with Private Links to the same VNet.')
+@description('Optional. Restrict copy to and from Storage Accounts within an EntraID tenant or with Private Links to the same VNet.')
 @allowed([
   ''
   'AAD'

carml/1.3.0/Microsoft.Storage/storageAccounts/readme.md

@@ -55,8 +55,8 @@ This module is used to deploy a storage account, with the ability to deploy 1 or
 | Parameter Name | Type | Default Value | Allowed Values | Description |
 | :-- | :-- | :-- | :-- | :-- |
 | `allowBlobPublicAccess` | bool | `False` |  | Indicates whether public access is enabled for all blobs or containers in the storage account. For security reasons, it is recommended to set it to false. |
-| `allowCrossTenantReplication` | bool | `True` |  | Allow or disallow cross AAD tenant object replication. |
-| `allowedCopyScope` | string | `''` | `['', AAD, PrivateLink]` | Restrict copy to and from Storage Accounts within an AAD tenant or with Private Links to the same VNet. |
+| `allowCrossTenantReplication` | bool | `True` |  | Allow or disallow cross EntraID tenant object replication. |
+| `allowedCopyScope` | string | `''` | `['', EntraID, PrivateLink]` | Restrict copy to and from Storage Accounts within an EntraID tenant or with Private Links to the same VNet. |
 | `allowSharedKeyAccess` | bool | `True` |  | Indicates whether the storage account permits requests to be authorized with the account access key via Shared Key. If false, then all requests, including shared access signatures, must be authorized with Microsoft Entra ID. The default value is null, which is equivalent to true. |
 | `azureFilesIdentityBasedAuthentication` | object | `{object}` |  | Provides the identity based authentication settings for Azure Files. |
 | `blobServices` | _[blobServices](blobServices/readme.md)_ object | `{object}` |  | Blob service and containers to deploy. |

workload/arm/brownfield/deployAppAttachToolsVM.json

@@ -632,7 +632,7 @@
                         "enabled": false
                       },
                       "metadata": {
-                        "description": "Optional. The configuration for the [AAD Join] extension. Must at least contain the [\"enabled\": true] property to be executed."
+                        "description": "Optional. The configuration for the [EntraID Join] extension. Must at least contain the [\"enabled\": true] property to be executed."
                       }
                     },
                     "extensionAntiMalwareConfig": {

workload/arm/brownfield/deployNewSessionHostsToHostPools.json

@@ -1281,7 +1281,7 @@
           "timeZone": {
             "value": "[variables('varTimeZoneSessionHosts')]"
           },
-          "systemAssignedIdentity": "[if(equals(parameters('identityServiceProvider'), 'AAD'), createObject('value', true()), createObject('value', false()))]",
+          "systemAssignedIdentity": "[if(equals(parameters('identityServiceProvider'), 'EntraID'), createObject('value', true()), createObject('value', false()))]",
           "availabilityZone": "[if(parameters('useAvailabilityZones'), createObject('value', take(skip(variables('varAllAvailabilityZones'), mod(range(1, parameters('count'))[copyIndex()], length(variables('varAllAvailabilityZones')))), 1)), createObject('value', createArray()))]",
           "encryptionAtHost": {
             "value": "[parameters('diskZeroTrust')]"
@@ -1350,7 +1350,7 @@
           },
           "extensionAadJoinConfig": {
             "value": {
-              "enabled": "[if(equals(parameters('identityServiceProvider'), 'AAD'), true(), false())]",
+              "enabled": "[if(equals(parameters('identityServiceProvider'), 'EntraID'), true(), false())]",
               "settings": "[if(parameters('createIntuneEnrollment'), createObject('mdmId', '0000000a-0000-0000-c000-000000000000'), createObject())]"
             }
           },
@@ -1699,7 +1699,7 @@
                 "enabled": false
               },
               "metadata": {
-                "description": "Optional. The configuration for the [AAD Join] extension. Must at least contain the [\"enabled\": true] property to be executed."
+                "description": "Optional. The configuration for the [EntraID Join] extension. Must at least contain the [\"enabled\": true] property to be executed."
               }
             },
             "extensionAntiMalwareConfig": {