diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/admin-ssl-post-deploy/src/main/scripts/configureCustomAdminSSL.sh b/weblogic-azure-vm/arm-oraclelinux-wls-admin/admin-ssl-post-deploy/src/main/scripts/configureCustomAdminSSL.sh
index eb2d9ab44..0ee7f3fd6 100644
--- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/admin-ssl-post-deploy/src/main/scripts/configureCustomAdminSSL.sh
+++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/admin-ssl-post-deploy/src/main/scripts/configureCustomAdminSSL.sh
@@ -215,14 +215,14 @@ function importAADCertificateIntoWLSCustomTrustKeyStore()
             exit 1
         fi
 
-        # For SSL enabled causes AAD failure #225
+        # For SSL enabled causes Entra ID failure #225
         # ISSUE: https://github.com/wls-eng/arm-oraclelinux-wls/issues/225
 
-        echo "Importing AAD Certificate into WLS Custom Trust Key Store: "
+        echo "Importing Entra ID Certificate into WLS Custom Trust Key Store: "
 
         sudo ${JAVA_HOME}/bin/keytool -noprompt -import -trustcacerts -keystore $customSSLTrustKeyStoreFile -storepass $customTrustKeyStorePassPhrase -alias aadtrust -file ${addsCertificate} -storetype $customTrustKeyStoreType
     else
-        echo "customSSL not enabled. Not required to configure AAD for WebLogic Custom SSL"
+        echo "customSSL not enabled. Not required to configure Entra ID for WebLogic Custom SSL"
     fi
 }
 
diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/aadIntegration.sh b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/aadIntegration.sh
index aadd4131e..fc820a898 100644
--- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/aadIntegration.sh
+++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/aadIntegration.sh
@@ -268,7 +268,7 @@ function importAADCertificate()
     # import the key to java security 
     . $oracleHome/oracle_common/common/bin/setWlstEnv.sh
 
-    # For AAD failure: exception happens when importing certificate to JDK 11.0.7
+    # For Entra ID failure: exception happens when importing certificate to JDK 11.0.7
     # ISSUE: https://github.com/wls-eng/arm-oraclelinux-wls/issues/109
     # JRE was removed since JDK 11.
     java_version=$(java -version 2>&1 | sed -n ';s/.* version "\(.*\)\.\(.*\)\..*"/\1\2/p;')
@@ -305,14 +305,14 @@ function importAADCertificateIntoWLSCustomTrustKeyStore()
            exit 1
         fi
 
-        # For SSL enabled causes AAD failure #225
+        # For SSL enabled causes Entra ID failure #225
         # ISSUE: https://github.com/wls-eng/arm-oraclelinux-wls/issues/225
 
-        echo "Importing AAD Certificate into WLS Custom Trust Key Store: "
+        echo "Importing Entra ID Certificate into WLS Custom Trust Key Store: "
 
         sudo ${JAVA_HOME}/bin/keytool -noprompt -import -trustcacerts -keystore ${DOMAIN_PATH}/${wlsDomainName}/keystores/trust.keystore -storepass ${customTrustKeyStorePassPhrase} -alias aadtrust -file ${addsCertificate} -storetype ${customTrustKeyStoreType}
     else
-        echo "customSSL not enabled. Not required to configure AAD for WebLogic Custom SSL"
+        echo "customSSL not enabled. Not required to configure Entra ID for WebLogic Custom SSL"
     fi
 }
 
diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode/src/main/scripts/addnode.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode/src/main/scripts/addnode.sh
index bad1ac112..4a099172f 100644
--- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode/src/main/scripts/addnode.sh
+++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode/src/main/scripts/addnode.sh
@@ -622,7 +622,7 @@ function importAADCertificate()
 {
     # import the key to java security 
     . $oracleHome/oracle_common/common/bin/setWlstEnv.sh
-    # For AAD failure: exception happens when importing certificate to JDK 11.0.7
+    # For Entra ID failure: exception happens when importing certificate to JDK 11.0.7
     # ISSUE: https://github.com/wls-eng/arm-oraclelinux-wls/issues/109
     # JRE was removed since JDK 11.
     java_version=$(java -version 2>&1 | sed -n ';s/.* version "\(.*\)\.\(.*\)\..*"/\1\2/p;')
@@ -658,14 +658,14 @@ function importAADCertificateIntoWLSCustomTrustKeyStore()
             exit 1
         fi
 
-        # For SSL enabled causes AAD failure #225
+        # For SSL enabled causes Entra ID failure #225
         # ISSUE: https://github.com/wls-eng/arm-oraclelinux-wls/issues/225
 
-        echo "Importing AAD Certificate into WLS Custom Trust Key Store: "
+        echo "Importing Entra ID Certificate into WLS Custom Trust Key Store: "
 
         sudo ${JAVA_HOME}/bin/keytool -noprompt -import -trustcacerts -keystore {KEYSTORE_PATH}/trust.keystore -storepass ${customTrustKeyStorePassPhrase} -alias aadtrust -file ${addsCertificate} -storetype ${customTrustKeyStoreType}
     else
-        echo "customSSL not enabled. Not required to configure AAD for WebLogic Custom SSL"
+        echo "customSSL not enabled. Not required to configure Entra ID for WebLogic Custom SSL"
     fi
 }
 
diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/aadIntegration.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/aadIntegration.sh
index ce645079a..0dd25b614 100644
--- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/aadIntegration.sh
+++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/aadIntegration.sh
@@ -1,7 +1,7 @@
 # Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 # Description
-# This script is to configure AAD for WebLogic cluster domain. 
+# This script is to configure Entra ID for WebLogic cluster domain. 
 
 
 #Function to output message to StdErr
@@ -304,7 +304,7 @@ function importAADCertificate()
 {
     # import the key to java security 
     . $oracleHome/oracle_common/common/bin/setWlstEnv.sh
-    # For AAD failure: exception happens when importing certificate to JDK 11.0.7
+    # For Entra ID failure: exception happens when importing certificate to JDK 11.0.7
     # ISSUE: https://github.com/wls-eng/arm-oraclelinux-wls/issues/109
     # JRE was removed since JDK 11.
     java_version=$(java -version 2>&1 | sed -n ';s/.* version "\(.*\)\.\(.*\)\..*"/\1\2/p;')
@@ -341,14 +341,14 @@ function importAADCertificateIntoWLSCustomTrustKeyStore()
            exit 1
         fi
 
-        # For SSL enabled causes AAD failure #225
+        # For SSL enabled causes Entra ID failure #225
         # ISSUE: https://github.com/wls-eng/arm-oraclelinux-wls/issues/225
 
-        echo "Importing AAD Certificate into WLS Custom Trust Key Store: "
+        echo "Importing Entra ID Certificate into WLS Custom Trust Key Store: "
 
         sudo ${JAVA_HOME}/bin/keytool -noprompt -import -trustcacerts -keystore ${DOMAIN_PATH}/${wlsDomainName}/keystores/trust.keystore -storepass ${customTrustKeyStorePassPhrase} -alias aadtrust -file ${addsCertificate} -storetype ${customTrustKeyStoreType}
     else
-        echo "customSSL not enabled. Not required to configure AAD for WebLogic Custom SSL"
+        echo "customSSL not enabled. Not required to configure Entra ID for WebLogic Custom SSL"
     fi
 }
 
@@ -414,7 +414,7 @@ EOF
     java $WLST_ARGS weblogic.WLST ${SCRIPT_PWD}/restart-managedServer.py 
 
     if [[ $? != 0 ]]; then
-    echo "Error : Fail to restart managed server to sync up aad configuration."
+    echo "Error : Fail to restart managed server to sync up Entra ID configuration."
     exit 1
     fi
 }
diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-aad-ag.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-aad-ag.sh
index bd146fd53..d70dfbc6f 100644
--- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-aad-ag.sh
+++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-aad-ag.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 # Description
-# This script is to generate test parameters for AAD and appgeateway testing.
+# This script is to generate test parameters for Entra ID and appgeateway testing.
 
 #read arguments from stdin
 read parametersPath repoPath testbranchName keyVaultName keyVaultResourceGroup keyVaultSSLCertDataSecretName keyVaultSSLCertPasswordSecretName
diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-aad.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-aad.sh
index 27536df8d..92ba45f8a 100644
--- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-aad.sh
+++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-aad.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 # Description
-# This script is to generate test parameters for AAD testing.
+# This script is to generate test parameters for Entra ID testing.
 
 #read arguments from stdin
 read parametersPath repoPath testbranchName
diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-db-aad-ag.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-db-aad-ag.sh
index 4195fcb77..8cf8ad2ee 100644
--- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-db-aad-ag.sh
+++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-db-aad-ag.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 # Description
-# This script is to generate test parameters for database datasource, AAD and Appgateway testing.
+# This script is to generate test parameters for database datasource, Entra ID and Appgateway testing.
 
 #read arguments from stdin
 read  parametersPath repoPath testbranchName keyVaultName keyVaultResourceGroup keyVaultSSLCertDataSecretName keyVaultSSLCertPasswordSecretName
diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-db-aad.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-db-aad.sh
index ffe2a6459..e1cd13403 100644
--- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-db-aad.sh
+++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/test/scripts/gen-parameters-db-aad.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2021, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 # Description
-# This script is to generate test parameters for database datasource and AAD testing.
+# This script is to generate test parameters for database datasource and Entra ID testing.
 
 #read arguments from stdin
 read parametersPath repoPath testbranchName
diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/addnode/src/main/scripts/addNodeToDynamicCluster.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/addnode/src/main/scripts/addNodeToDynamicCluster.sh
index 70d9f3785..3dbb23897 100644
--- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/addnode/src/main/scripts/addNodeToDynamicCluster.sh
+++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/addnode/src/main/scripts/addNodeToDynamicCluster.sh
@@ -522,7 +522,7 @@ function importAADCertificate()
 {
     # import the key to java security 
     . $oracleHome/oracle_common/common/bin/setWlstEnv.sh
-    # For AAD failure: exception happens when importing certificate to JDK 11.0.7
+    # For Entra ID failure: exception happens when importing certificate to JDK 11.0.7
     # ISSUE: https://github.com/wls-eng/arm-oraclelinux-wls/issues/109
     # JRE was removed since JDK 11.
     java_version=$(java -version 2>&1 | sed -n ';s/.* version "\(.*\)\.\(.*\)\..*"/\1\2/p;')
@@ -558,14 +558,14 @@ function importAADCertificateIntoWLSCustomTrustKeyStore()
             exit 1
         fi
 
-        # For SSL enabled causes AAD failure #225
+        # For SSL enabled causes Entra ID failure #225
         # ISSUE: https://github.com/wls-eng/arm-oraclelinux-wls/issues/225
 
-        echo "Importing AAD Certificate into WLS Custom Trust Key Store: "
+        echo "Importing Entra ID Certificate into WLS Custom Trust Key Store: "
 
         sudo ${JAVA_HOME}/bin/keytool -noprompt -import -trustcacerts -keystore {KEYSTORE_PATH}/trust.keystore -storepass ${customTrustKeyStorePassPhrase} -alias aadtrust -file ${addsCertificate} -storetype ${customTrustKeyStoreType}
     else
-        echo "customSSL not enabled. Not required to configure AAD for WebLogic Custom SSL"
+        echo "customSSL not enabled. Not required to configure Entra ID for WebLogic Custom SSL"
     fi
 }
 
diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/aadIntegration.sh b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/aadIntegration.sh
index 2831cca5a..3712af21e 100644
--- a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/aadIntegration.sh
+++ b/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/aadIntegration.sh
@@ -308,7 +308,7 @@ function importAADCertificate()
 {
     # import the key to java security 
     . $oracleHome/oracle_common/common/bin/setWlstEnv.sh
-    # For AAD failure: exception happens when importing certificate to JDK 11.0.7
+    # For Entra ID failure: exception happens when importing certificate to JDK 11.0.7
     # ISSUE: https://github.com/wls-eng/arm-oraclelinux-wls/issues/109
     # JRE was removed since JDK 11.
     java_version=$(java -version 2>&1 | sed -n ';s/.* version "\(.*\)\.\(.*\)\..*"/\1\2/p;')
@@ -345,14 +345,14 @@ function importAADCertificateIntoWLSCustomTrustKeyStore()
            exit 1
         fi
 
-        # For SSL enabled causes AAD failure #225
+        # For SSL enabled causes Entra ID failure #225
         # ISSUE: https://github.com/wls-eng/arm-oraclelinux-wls/issues/225
 
-        echo "Importing AAD Certificate into WLS Custom Trust Key Store: "
+        echo "Importing Entra ID Certificate into WLS Custom Trust Key Store: "
 
         sudo ${JAVA_HOME}/bin/keytool -noprompt -import -trustcacerts -keystore ${DOMAIN_PATH}/${wlsDomainName}/keystores/trust.keystore -storepass ${customTrustKeyStorePassPhrase} -alias aadtrust -file ${addsCertificate} -storetype ${customTrustKeyStoreType}
     else
-        echo "customSSL not enabled. Not required to configure AAD for WebLogic Custom SSL"
+        echo "customSSL not enabled. Not required to configure Entra ID for WebLogic Custom SSL"
     fi
 }