user name => username

Author: ktoliver

articles/active-directory/hybrid/tutorial-federation.md

@@ -237,7 +237,7 @@ To create the Hybrid Identity Administrator account:
 
    :::image type="content" source="media/tutorial-federation/gadmin1.png" alt-text="Screenshot that shows Users selected under Manage in the resource menu to create a Hybrid Identity Administrator in Azure AD.":::
 1. Select **All users**, and then select **New user**.
-1. In the **User** pane, enter a name and a user name for the new user. You're creating your Hybrid Identity Administrator account for the tenant. You can show and copy the temporary password.
+1. In the **User** pane, enter a name and a username for the new user. You're creating your Hybrid Identity Administrator account for the tenant. You can show and copy the temporary password.
 
    In the **Directory role** pane, select **Hybrid Identity Administrator**. Then select **Create**.
 
@@ -279,15 +279,15 @@ Now it's time to download and install Azure AD Connect. After it's installed, yo
 1. In **User sign-in**, select **Federation with AD FS**, and then select **Next**.
 
    :::image type="content" source="media/tutorial-federation/fed1.png" alt-text="Screenshot that shows where to select Federation with AD FS.":::
-1. In **Connect to Azure AD**, enter the user name and password of the Hybrid Identity Administrator account you created earlier, and then select **Next**.
-1. In **Connect your directories**, select **Add directory**. Then select **Create new AD account** and enter the contoso\Administrator user name and password. Select **OK**.
+1. In **Connect to Azure AD**, enter the username and password of the Hybrid Identity Administrator account you created earlier, and then select **Next**.
+1. In **Connect your directories**, select **Add directory**. Then select **Create new AD account** and enter the contoso\Administrator username and password. Select **OK**.
 1. Select **Next**.
 1. In **Azure AD sign-in configuration**, select **Continue without matching all UPN suffixes to verified domains**. Select **Next.**
 1. In **Domain and OU filtering**, select **Next**.
 1. In **Uniquely identifying your users**, select **Next**.
 1. In **Filter users and devices**, select **Next**.
 1. In **Optional features**, select **Next**.
-1. In **Domain Administrator credentials**, enter the contoso\Administrator user name and password, and then select **Next.**
+1. In **Domain Administrator credentials**, enter the contoso\Administrator username and password, and then select **Next.**
 1. In **AD FS farm**, make sure that **Configure a new AD FS farm** is selected.
 1. Select **Use a certificate installed on the federation servers**, and then select **Browse**.
 1. In the search box, enter **DC1** and select it in the search results. Select **OK**.
@@ -298,7 +298,7 @@ Now it's time to download and install Azure AD Connect. After it's installed, yo
 
    :::image type="content" source="media/tutorial-federation/fed3.png" alt-text="Screenshot that shows where to select your AD FS server.":::
 1. In **Web application proxy servers**, select **Next**.
-1. In **AD FS service account**, enter the contoso\Administrator user name and password, and then select **Next.**
+1. In **AD FS service account**, enter the contoso\Administrator username and password, and then select **Next.**
 1. In **Azure AD Domain**, select your verified custom domain, and then select **Next**.
 1. In **Ready to configure**, select **Install**.
 1. When the installation is finished, select **Exit**.
@@ -324,7 +324,7 @@ To test that users from your Windows Server AD tenant are synced with your Azure
 1. Go to [https://myapps.microsoft.com](https://myapps.microsoft.com).
 1. Sign in with a user account that was created in your new tenant.
 
-   For the user name, use the format `[email protected]`. Use the same password the user uses to sign in to on-premises Active Directory.
+   For the username, use the format `[email protected]`. Use the same password the user uses to sign in to on-premises Active Directory.
 
 You've successfully set up a hybrid identity environment that you can use to test and to get familiar with what Azure has to offer.
 

articles/active-directory/hybrid/tutorial-passthrough-authentication.md

@@ -216,7 +216,7 @@ To create the Hybrid Identity Administrator account:
    :::image type="content" source="media/tutorial-passthrough-authentication/gadmin1.png" alt-text="Screenshot that shows Users selected under Manage in the resource menu to create a Hybrid Identity Administrator in Azure AD.":::
 1. Select **All users**, and then select **New user**.
 
-1. In the **User** pane, enter a name and a user name for the new user. You're creating your Hybrid Identity Administrator account for the tenant. You can show and copy the temporary password.
+1. In the **User** pane, enter a name and a username for the new user. You're creating your Hybrid Identity Administrator account for the tenant. You can show and copy the temporary password.
 
    In the **Directory role** pane, select **Hybrid Identity Administrator**. Then select **Create**.
 
@@ -259,15 +259,15 @@ Now it's time to download and install Azure AD Connect. After it's installed, yo
 1. In **User sign-in**, select **Pass-through authentication** and **Enable single sign-on**, and then select **Next**.
 
    :::image type="content" source="media/tutorial-passthrough-authentication/pta1.png" alt-text="Screenshot that shows where to select Pass-through authentication.":::
-1. In **Connect to Azure AD**, enter the user name and password of the Hybrid Identity Administrator account you created earlier, and then select **Next**.
-1. In **Connect your directories**, select **Add directory**. Then select **Create new AD account** and enter the contoso\Administrator user name and password. Select **OK**.
+1. In **Connect to Azure AD**, enter the username and password of the Hybrid Identity Administrator account you created earlier, and then select **Next**.
+1. In **Connect your directories**, select **Add directory**. Then select **Create new AD account** and enter the contoso\Administrator username and password. Select **OK**.
 1. Select **Next**.
 1. In **Azure AD sign-in configuration**, select **Continue without matching all UPN suffixes to verified domains**. Select **Next.**
 1. In **Domain and OU filtering**, select **Next**.
 1. In **Uniquely identifying your users**, select **Next**.
 1. In **Filter users and devices**, select **Next**.
 1. In **Optional features**, select **Next**.
-1. In **Enable single sign-in credentials**, enter the contoso\Administrator user name and password, and then select **Next.**
+1. In **Enable single sign-in credentials**, enter the contoso\Administrator username and password, and then select **Next.**
 1. In **Ready to configure**, select **Install**.
 1. When the installation is finished, select **Exit**.
 1. Before you use Synchronization Service Manager or Synchronization Rule Editor, sign out, and then sign in again.
@@ -292,7 +292,7 @@ To test that users from your Windows Server AD tenant are synced with your Azure
 1. Go to [https://myapps.microsoft.com](https://myapps.microsoft.com).
 1. Sign in with a user account that was created in your new tenant.
 
-   For the user name, use the format `[email protected]`. Use the same password the user uses to sign in to on-premises Active Directory.
+   For the username, use the format `[email protected]`. Use the same password the user uses to sign in to on-premises Active Directory.
 
 You've successfully set up a hybrid identity environment that you can use to test and to get familiar with what Azure has to offer.
 

articles/active-directory/hybrid/tutorial-password-hash-sync.md

@@ -215,7 +215,7 @@ To create the Hybrid Identity Administrator account:
 
    :::image type="content" source="media/tutorial-password-hash-sync/gadmin1.png" alt-text="Screenshot that shows Users selected under Manage in the resource menu to create a Hybrid Identity Administrator in Azure AD.":::
 1. Select **All users**, and then select **New user**.
-1. In the **User** pane, enter a name and a user name for the new user. You're creating your Hybrid Identity Administrator account for the tenant. You can show and copy the temporary password.
+1. In the **User** pane, enter a name and a username for the new user. You're creating your Hybrid Identity Administrator account for the tenant. You can show and copy the temporary password.
 
    In the **Directory role** pane, select **Hybrid Identity Administrator**. Then select **Create**.
 
@@ -233,8 +233,8 @@ Now it's time to download and install Azure AD Connect. After it's installed, yo
 1. In **Express settings**, select **Use express settings**.
 
    :::image type="content" source="media/tutorial-password-hash-sync/express1.png" alt-text="Screenshot that shows the Express settings screen and the Use express settings button.":::
-1. In **Connect to Azure AD**, enter the user name and password for the Hybrid Identity Administrator account for Azure AD. Select **Next**.  
-1. In **Connect to AD DS**, enter the user name and password for an enterprise admin account. Select **Next**.  
+1. In **Connect to Azure AD**, enter the username and password for the Hybrid Identity Administrator account for Azure AD. Select **Next**.  
+1. In **Connect to AD DS**, enter the username and password for an enterprise admin account. Select **Next**.  
 1. In **Ready to configure**, select **Install**.
 1. When the installation is finished, select **Exit**.
 1. Before you use Synchronization Service Manager or Synchronization Rule Editor, sign out, and then sign in again.
@@ -259,7 +259,7 @@ To test that users from your Windows Server AD tenant are synced with your Azure
 1. Go to [https://myapps.microsoft.com](https://myapps.microsoft.com).
 1. Sign in with a user account that was created in your new tenant.
 
-   For the user name, use the format `[email protected]`. Use the same password the user uses to sign in to on-premises Active Directory.
+   For the username, use the format `[email protected]`. Use the same password the user uses to sign in to on-premises Active Directory.
 
 You've successfully set up a hybrid identity environment that you can use to test and to get familiar with what Azure has to offer.
 

articles/active-directory/hybrid/tutorial-phs-backup.md

@@ -39,7 +39,7 @@ Your first step in setting up your backup for federation is to turn on password
 1. In **Additional tasks**, select **Customize synchronization options**, and then select **Next**.
 
       :::image type="content" source="media/tutorial-phs-backup/backup2.png" alt-text="Screenshot that shows the Additional tasks pane, with Customize synchronization options selected.":::
-1. Enter the user name and password for the  [Hybrid Identity Administrator account you created](tutorial-federation.md#create-a-hybrid-identity-administrator-in-azure-ad) in the tutorial to set up federation.
+1. Enter the username and password for the  [Hybrid Identity Administrator account you created](tutorial-federation.md#create-a-hybrid-identity-administrator-in-azure-ad) in the tutorial to set up federation.
 1. In **Connect your directories**, select **Next**.
 1. In **Domain and OU filtering**, select **Next**.
 1. In **Optional features**, select **Password hash synchronization**, and then select **Next**.
@@ -64,7 +64,7 @@ If you decide to make the switch because fixing the problem will take too long,
 
 1. In Azure AD Connect, select **Configure**.
 1. Select **Change user sign-in**, and then select **Next**.
-1. Enter the user name and password for the  [Hybrid Identity Administrator account you created](tutorial-federation.md#create-a-hybrid-identity-administrator-in-azure-ad) in the tutorial to set up federation.
+1. Enter the username and password for the  [Hybrid Identity Administrator account you created](tutorial-federation.md#create-a-hybrid-identity-administrator-in-azure-ad) in the tutorial to set up federation.
 1. In **User sign-in**, select **Password hash synchronization**, and then select the **Do not convert user accounts** checkbox.  
 1. Leave the default **Enable single sign-on** selected and select **Next**.
 1. In **Enable single sign-on**, select **Next**.
@@ -78,7 +78,7 @@ Users can now use their passwords to sign in to Azure and Azure services.
 1. In a new web browser window, go to [https://myapps.microsoft.com](https://myapps.microsoft.com).
 1. Sign in with a user account that was created in your new tenant.
 
-   For the user name, use the format `[email protected]`. Use the same password the user uses to sign in to on-premises Active Directory.
+   For the username, use the format `[email protected]`. Use the same password the user uses to sign in to on-premises Active Directory.
 
    :::image type="content" source="media/tutorial-federation/verify1.png" alt-text="Screenshot that shows a successful message when testing the sign-in.":::
 
@@ -88,9 +88,9 @@ Now, switch back to federation:
 
 1. In Azure AD Connect, select **Configure**.
 1. Select **Change user sign-in**, and then select **Next**.
-1. Enter the user name and password for your Hybrid Identity Administrator account.
+1. Enter the username and password for your Hybrid Identity Administrator account.
 1. In  **User sign-in**, select **Federation with AD FS**, and then select **Next**.  
-1. In **Domain Administrator credentials**, enter the contoso\Administrator user name and password, and then select **Next.**
+1. In **Domain Administrator credentials**, enter the contoso\Administrator username and password, and then select **Next.**
 1. In **AD FS farm**, select **Next**.
 1. In **Azure AD domain**, select the domain and select **Next**.
 1. In **Ready to configure**, select **Configure**.
@@ -111,8 +111,8 @@ The final task is to reset the trust between AD FS and Azure:
 1. Select **Reset Azure AD trust**, and then select **Next**.
 
    :::image type="content" source="media/tutorial-phs-backup/backup6.png" alt-text="Screenshot that shows the Manage federation pane, with Reset Azure AD selected.":::
-1. In **Connect to Azure AD**, enter the user name and password for your Global Administrator account or your Hybrid Identity Administrator account.
-1. In **Connect to AD FS**, enter the contoso\Administrator user name and password, and then select **Next.**
+1. In **Connect to Azure AD**, enter the username and password for your Global Administrator account or your Hybrid Identity Administrator account.
+1. In **Connect to AD FS**, enter the contoso\Administrator username and password, and then select **Next.**
 1. In **Certificates**, select **Next**.
 1. Repeat the steps in [Sign in with a user account to test sync](#sign-in-with-a-user-account-to-test-sync).