Fix terminology

Author: dominicbetts

articles/iot-operations/deploy-iot-ops/howto-deploy-iot-test-operations.md

@@ -24,7 +24,7 @@ This article discusses Azure IoT Operations *deployments* and *instances*, which
   * An Azure IoT Operations instance
   * Arc extensions
   * Custom locations
-  * Resources that you can configure in your Azure IoT Operations solution, like assets and asset endpoints.
+  * Resources that you can configure in your Azure IoT Operations solution, like namespace assets and devices.
 
 * An Azure IoT Operations *instance* is the parent resource that bundles the suite of services that are defined in [What is Azure IoT Operations?](../overview-iot-operations.md) like MQTT broker, data flows, and connector for OPC UA.
 

articles/iot-operations/discover-manage-assets/howto-autodetect-opc-ua-assets-use-akri.md

@@ -16,7 +16,7 @@ The Akri services and connector for OPC UA are a turnkey solution that lets you
 
 To discover OPC UA assets, the assets must be compliant with the [OPC 10000-100: Devices](https://reference.opcfoundation.org/DI/v103/docs/) companion specification. The connector for OPC UA and Akri services follow the process described in [OPC 10000-110: Asset Management Basics](https://reference.opcfoundation.org/AMB/v101/docs/) to discover OPC UA assets and onboard them into Azure Device Registry.
 
-In this article, you learn how to automatically discover and configure OPC UA devices and assets connected to your Azure IoT Operations deployment. The automatic discovery process starts when you add an asset endpoint with the **Enable discovery** option selected.
+In this article, you learn how to automatically discover and configure OPC UA devices and assets connected to your Azure IoT Operations deployment. The automatic discovery process starts when you add a device with the **Enable discovery** option selected.
 
 To learn more, see [What is asset discovery (preview)?](overview-akri.md).
 
@@ -72,27 +72,27 @@ Currently, discovery is only enabled in the preview version of the connector for
 
 [!INCLUDE [deploy-preview-media-connectors](../includes/deploy-preview-media-connectors.md)]
 
-## Create an asset endpoint
+## Create a device
 
-To create an asset endpoint with discovery enabled:
+To create a device with discovery enabled:
 
 1. Go to your Azure IoT Operations instance in the operations experience web UI.
 
-1. Add a new asset endpoint and select the **Enable discovery** option:
+1. Add a new device and select the **Enable discovery** option:
 
-    :::image type="content" source="media/howto-autodetect-opc-ua-assets-use-akri/enable-auto-discover.png" alt-text="Screenshot that shows how to create an asset endpoint with discovery enabled.":::
+    :::image type="content" source="media/howto-autodetect-opc-ua-assets-use-akri/enable-auto-discover.png" alt-text="Screenshot that shows how to create a device with discovery enabled.":::
 
-1. Select **Create** to create the asset endpoint.
+1. Select **Create** to create the device.
 
 ## Review the discovered assets
 
-Azure IoT Operations uses the asset endpoint to connect to the OPC UA server and scan for assets. To view the discovered assets:
+Azure IoT Operations uses the device to connect to the OPC UA server and scan for assets. To view the discovered assets:
 
 1. Go to the **Discovery** page for your instance in the operations experience:
 
     :::image type="content" source="media/howto-autodetect-opc-ua-assets-use-akri/discovered-assets-list.png" alt-text="Screenshot that shows how to view discovered assets.":::
 
-1. You can filter the list by the asset endpoint name, or by keyword. The list shows the discovered assets and their status.
+1. You can filter the list by the device name, or by keyword. The list shows the discovered assets and their status.
 
 ## Import an asset from a discovered asset
 

articles/iot-operations/discover-manage-assets/howto-configure-opc-ua-authentication-options.md

@@ -35,11 +35,11 @@ To learn more, see [OPC UA applications - user authentication](https://reference
 
 To configure the secrets for the *username* and *password* values in the [operations experience](https://iotoperations.azure.com) web UI:
 
-1. Navigate to your list of asset endpoints:
+1. Navigate to your list of devices:
 
-    :::image type="content" source="media/howto-configure-opc-ua-authentication-options/asset-endpoint-list.png" alt-text="Screenshot that shows the list of asset endpoints.":::
+    :::image type="content" source="media/howto-configure-opc-ua-authentication-options/asset-endpoint-list.png" alt-text="Screenshot that shows the list of devices.":::
 
-1. Select **Create asset endpoint**.
+1. Select **Create device**.
 
 1. Select **Username password** as the authentication mode:
 

articles/iot-operations/discover-manage-assets/howto-configure-opc-ua-certificates-infrastructure.md

@@ -51,7 +51,7 @@ To use the operations experience web UI to manage the trusted certificates list,
     > [!NOTE]
     > The connector for OPC UA uses a Kubernetes native secret named *aio-opc-ua-broker-trust-list* to store the trusted certificates list. This secret is created when you deploy Azure IoT Operations.
 
-1. Go to the **Asset endpoints page** in the [operations experience](https://iotoperations.azure.com) web UI.
+1. Go to the **Devices page** in the [operations experience](https://iotoperations.azure.com) web UI.
 
 1. To view the trusted certificates list, select **Manage certificates and secrets** and then **Certificates**:
 
@@ -163,7 +163,7 @@ To use the operations experience web UI to manage the issuer certificates list,
     > [!NOTE]
     > The connector for OPC UA uses a Kubernetes native secret named *aio-opc-ua-broker-issuer-list* to store the issuer certificates list. This secret is created when you deploy Azure IoT Operations.
 
-1. Go to the **Asset endpoints page** in the [operations experience](https://iotoperations.azure.com) web UI.
+1. Go to the **Devices page** in the [operations experience](https://iotoperations.azure.com) web UI.
 
 1. To view the issuer certificates list, select **Manage certificates and secrets** and then **Certificates**:
 

articles/iot-operations/discover-manage-assets/howto-configure-opc-ua.md

@@ -183,7 +183,7 @@ Now you can define the tags associated with the asset. To add OPC UA tags:
 
 # [Azure CLI](#tab/cli)
 
-Use the following commands to add a "thermostat" namespaced asset to your device by using the Azure CLI. The commands add a dataset and two tags to the asset by using the `point add` command:
+Use the following commands to add a "thermostat" namespace asset to your device by using the Azure CLI. The commands add a dataset and two tags to the asset by using the `point add` command:
 
 ```azurecli
 # Create the asset

articles/iot-operations/get-started-end-to-end-sample/quickstart-configure.md

@@ -87,8 +87,8 @@ $CLUSTER_NAME = "<kubernetes-cluster-name>"
 
 Run the following commands to download and run the Bicep file that configures your Azure IoT Operations instance. The Bicep file:
 
-- Adds an asset endpoint that connects to the OPC PLC simulator.
-- Adds an asset that represents the oven and defines the data points that the oven exposes.
+- Adds a device that connects to the OPC PLC simulator.
+- Adds a namespace asset that represents the oven and defines the data points that the oven exposes.
 - Adds a data flow that manipulates the messages from the simulated oven.
 - Creates an Azure Event Hubs instance to receive the data.
 

articles/iot-operations/secure-iot-ops/howto-manage-certificates.md

@@ -154,7 +154,7 @@ For example, the connector for OPC UA uses the certificate management experience
 
 When you [deploy Azure IoT Operations with secure settings](../deploy-iot-ops/overview-deploy.md#secure-settings-deployment), you can start adding certificates to Azure Key Vault, and sync them to the Kubernetes cluster to be used in the *Trust list* and *Issuer list* stores for OPC UA connections:
 
-:::image type="content" source="media/howto-manage-certificates/add-new-certificate.png" lightbox="media/howto-manage-certificates/add-new-certificate.png" alt-text="Screenshot that shows the Upload certificate and Add from Azure Key Vault options when adding a new certificate to the asset endpoints page.":::
+:::image type="content" source="media/howto-manage-certificates/add-new-certificate.png" lightbox="media/howto-manage-certificates/add-new-certificate.png" alt-text="Screenshot that shows the Upload certificate and Add from Azure Key Vault options when adding a new certificate to the devices page.":::
 
 - **Upload Certificate**: Uploads a certificate which is then added as a secret to Azure Key Vault and automatically synchronized to the cluster using Secret Store extension. 
 
@@ -174,7 +174,7 @@ When you [deploy Azure IoT Operations with secure settings](../deploy-iot-ops/ov
 
 Using the list view you can manage the synchronized certificates. You can view all the synchronized certificates, and which certificate store it's synchronized to:
 
-:::image type="content" source="media/howto-manage-certificates/list-certificates.png" lightbox="media/howto-manage-certificates/list-certificates.png" alt-text="Screenshot that shows the list of certificates in the asset endpoints page and how to filter by Trust List and Issuer List.":::
+:::image type="content" source="media/howto-manage-certificates/list-certificates.png" lightbox="media/howto-manage-certificates/list-certificates.png" alt-text="Screenshot that shows the list of certificates in the devices page and how to filter by Trust List and Issuer List.":::
 
 - To learn more about the *Trust list* and *Issuer list* stores, see [Configure OPC UA certificates infrastructure for the connector for OPC UA](../discover-manage-assets/howto-configure-opc-ua-certificates-infrastructure.md).
 

articles/iot-operations/secure-iot-ops/howto-manage-secrets.md

@@ -29,35 +29,35 @@ Secrets management for Azure IoT Operations uses Secret Store extension to sync
 > [!NOTE]
 > Azure IoT Operations instances work with only one Azure Key Vault, multiple key vaults per instance isn't supported.
 
-Once the [set up secrets management](../deploy-iot-ops/howto-enable-secure-settings.md#set-up-secrets-management) steps are completed, you can start adding secrets to Azure Key Vault, and sync them to the Kubernetes cluster to be used in **Asset Endpoints** or **Data flow Endpoints** using the [operations experience](https://iotoperations.azure.com) web UI.
+Once the [set up secrets management](../deploy-iot-ops/howto-enable-secure-settings.md#set-up-secrets-management) steps are completed, you can start adding secrets to Azure Key Vault, and sync them to the Kubernetes cluster to be used in **Devices** or **Data flow endpoints** using the [operations experience](https://iotoperations.azure.com) web UI.
 
-Secrets are used in asset endpoints and data flow endpoints for authentication. This section uses asset endpoints as an example. The same process can be applied to data flow endpoints. You have the option to directly create the secret in Azure Key Vault and have it automatically synchronized down to the cluster, or use an existing secret reference from the key vault:
+Secrets are used in devices and data flow endpoints for authentication. This section uses devices as an example. The same process can be applied to data flow endpoints. You have the option to directly create the secret in Azure Key Vault and have it automatically synchronized down to the cluster, or use an existing secret reference from the key vault:
 
-1. Go to the **Asset endpoints** page in the [operations experience](https://iotoperations.azure.com) web UI.
+1. Go to the **Devices** page in the [operations experience](https://iotoperations.azure.com) web UI.
 
-1. To add a new secret reference, select **Add reference** when creating a new asset endpoint:
+1. To add a new secret reference, select **Add reference** when creating a new device:
 
     :::image type="content" source="media/howto-manage-secrets/use-secrets.png" lightbox="media/howto-manage-secrets/use-secrets.png" alt-text="Screenshot that shows the Add from Azure Key Vault and Create new options when selecting a secret in operations experience.":::
 
     - **Create a new secret**: creates a secret reference in the Azure Key Vault and also automatically synchronizes the secret down to the cluster using Secret Store extension. Use this option if you didn't create the secret you require for this scenario in the key vault beforehand. 
 
     - **Add from Azure Key Vault**: synchronizes an existing secret in key vault down to the cluster if it wasn't synchronized before. Selecting this option shows you the list of secret references in the selected key vault. Use this option if you created the secret in the key vault beforehand. *Only the latest version of the secret is synced to the cluster*.
 
-1. When you add the username and password references to the asset endpoints or data flow endpoints, you then need to give the synchronized secret a name. The secret references are saved in the cluster with this given name as one secret sync resource. In the example from the screenshot below, the username and password references are saved to the cluster as *edp1secrets*.
+1. When you add the username and password references to the devices or data flow endpoints, you then need to give the synchronized secret a name. The secret references are saved in the cluster with this given name as one secret sync resource. In the example from the screenshot below, the username and password references are saved to the cluster as *edp1secrets*.
 
     :::image type="content" source="media/howto-manage-secrets/synced-secret-name.png" lightbox="media/howto-manage-secrets/synced-secret-name.png" alt-text="Screenshot that shows the synced secret name field when username password is selected for authentication mode in operations experience.":::
-    
+
 ## Manage synced secrets
 
-This section uses asset endpoints as an example. The same process can be applied to data flow endpoints:
+This section uses devices as an example. The same process can be applied to data flow endpoints:
 
-1. Go to the **Asset endpoints** page in the [operations experience](https://iotoperations.azure.com) web UI.
+1. Go to the **Devices** page in the [operations experience](https://iotoperations.azure.com) web UI.
 
 1. To view the secrets list, select **Manage certificates and secrets** and then **Secrets**:
 
     :::image type="content" source="media/howto-manage-secrets/synced-secret-list.png" lightbox="media/howto-manage-secrets/synced-secret-list.png" alt-text="Screenshot that shows the synced secrets list in the operations experience secrets page.":::
 
-You can use the **Secrets** page to view synchronized secrets in your asset endpoints and data flow endpoints. Secrets page shows the list of all current synchronized secrets at the edge for the resource you're viewing. A synced secret represents one or multiple secret references, depending on the resource using it. Any operation applied to a synced secret will be applied to all secret references contained within the synced secret. 
+You can use the **Secrets** page to view synchronized secrets in your devices and data flow endpoints. Secrets page shows the list of all current synchronized secrets at the edge for the resource you're viewing. A synced secret represents one or multiple secret references, depending on the resource using it. Any operation applied to a synced secret will be applied to all secret references contained within the synced secret. 
 
 You can delete synced secrets as well in the **Secrets** page. When you delete a synced secret, it only deletes the synced secret from the Kubernetes cluster, and doesn't delete the contained secret reference from Azure Key Vault. You must delete the certificate secret manually from the key vault.
 

articles/iot-operations/troubleshoot/tips-tools.md

@@ -214,7 +214,7 @@ The following table describes some of the custom resource types you might work w
 
 | Custom resource type | Description |
 |----------------------|-------------|
-| `assetendpointprofiles` | Represents the configuration for an asset endpoint. |
+| `devices` | Represents the configuration for a device. |
 | `assets` | Represents the configuration for an asset. |
 | `brokers`, `brokerlisters`, `brokerauthentications`, `brokerauthorizations` | Represent the configuration for an MQTT broker. |
 | `dataflows`, `dataflowendpoints`, `dataflowprofiles` | Represent the configuration for a data flow. |