Draft, in progress

Author: KennedyDMSFT

articles/iot-hub/TOC.yml

@@ -235,7 +235,7 @@
             - name: Use Azure portal
               displayName: create IoT Hub, register device, message routing, delete IoT hub
               href: iot-hub-create-through-portal.md
-            - name: Use Azure IoT Tools for VS Code
+            - name: Use the Azure IoT Hub extension for Visual Studio Code
               displayName: create IoT Hub, register device, message routing, delete IoT hub
               href: iot-hub-create-use-iot-toolkit.md
             - name: Use Azure PowerShell
@@ -457,9 +457,9 @@
               href: iot-hub-raspberry-pi-kit-c-get-started.md
     - name: Extended IoT scenarios
       items:
-        - name: Messaging with Azure IoT Tools for VS Code
+        - name: Messaging with the Azure IoT Hub extension for Visual Studio Code
           href: iot-hub-vscode-iot-toolkit-cloud-device-messaging.md
-        - name: Device management with Azure IoT Tools for VS Code
+        - name: Device management with the Azure IoT Hub extension for Visual Studio Code
           href: iot-hub-device-management-iot-toolkit.md
         - name: Device management with IoT extension for Azure CLI
           href: iot-hub-device-management-iot-extension-azure-cli-2-0.md
@@ -630,8 +630,8 @@
       href: iot-hub-customer-data-requests.md
     - name: Azure Roadmap
       href: https://azure.microsoft.com/roadmap/?category=iot
-    - name: Azure IoT Tools
-      displayName:  VS Code, Visual Studio Code, toolkit, azure-iot-toolkit, Azure loT Device Workbench
+    - name: Azure IoT Hub extension for Visual Studio Code
+      displayName:  VS Code, Visual Studio Code, toolkit, azure-iot-toolkit
       href: https://marketplace.visualstudio.com/items?itemName=vsciot-vscode.azure-iot-toolkit
     - name: Azure IoT Explorer tool
       displayName: azure-iot-explorer, Plug and Play

articles/iot-hub/iot-hub-create-use-iot-toolkit.md

@@ -55,7 +55,7 @@ The following steps show how to create an IoT Hub without an IoT Project in Visu
 
 ## Create an IoT hub and device in an existing IoT project
 
-The following steps show how to create an IoT Hub and register a device to the hub within an existing IoT project in Visual Studio (VS) Code.
+The following steps show how to create an IoT hub and register a device to the hub within an existing IoT project in Visual Studio (VS) Code.
 
 This method allows you to provision in Visual Studio Code without leaving your development environment.
 
@@ -74,37 +74,37 @@ This method allows you to provision in Visual Studio Code without leaving your d
 
    :::image type="content" source="media/iot-hub-create-use-iot-toolkit/select-resource-group.png" alt-text="A screenshot that shows how to choose a resource group or create a new one in Visual Studio Code." lightbox="media/iot-hub-create-use-iot-toolkit/select-resource-group.png":::
 
-1. In the resource group you specified, follow the prompts to select an existing IoT Hub or create a new Azure IoT Hub.
+1. In the resource group you specified, follow the prompts to select an existing IoT hub or create a new Azure IoT hub.
 
-   :::image type="content" source="media/iot-hub-create-use-iot-toolkit/iot-hub-provision.png" alt-text="A screenshot that shows the first prompt in choosing an existing IoT Hub in Visual Studio Code." lightbox="media/iot-hub-create-use-iot-toolkit/iot-hub-provision.png":::
+   :::image type="content" source="media/iot-hub-create-use-iot-toolkit/iot-hub-provision.png" alt-text="A screenshot that shows the first prompt in choosing an existing IoT hub in Visual Studio Code." lightbox="media/iot-hub-create-use-iot-toolkit/iot-hub-provision.png":::
 
-   :::image type="content" source="media/iot-hub-create-use-iot-toolkit/select-iot-hub.png" alt-text="A screenshot that shows the second prompt in choosing an existing IoT Hub in Visual Studio Code." lightbox="media/iot-hub-create-use-iot-toolkit/select-iot-hub.png":::
+   :::image type="content" source="media/iot-hub-create-use-iot-toolkit/select-iot-hub.png" alt-text="A screenshot that shows the second prompt in choosing an existing IoT hub in Visual Studio Code." lightbox="media/iot-hub-create-use-iot-toolkit/select-iot-hub.png":::
 
-   :::image type="content" source="media/iot-hub-create-use-iot-toolkit/iot-hub-selected.png" alt-text="A screenshot that shows the third prompt in choosing an existing IoT Hub in Visual Studio Code." lightbox="media/iot-hub-create-use-iot-toolkit/iot-hub-selected.png":::
+   :::image type="content" source="media/iot-hub-create-use-iot-toolkit/iot-hub-selected.png" alt-text="A screenshot that shows the third prompt in choosing an existing IoT hub in Visual Studio Code." lightbox="media/iot-hub-create-use-iot-toolkit/iot-hub-selected.png":::
 
-1. In the output window, you see the Azure IoT Hub provisioned.
+1. In the output window, you see the Azure IoT hub provisioned.
 
    :::image type="content" source="media/iot-hub-create-use-iot-toolkit/iot-hub-provisioned.png" alt-text="A screenshot that shows the output window in Visual Studio Code." lightbox="media/iot-hub-create-use-iot-toolkit/iot-hub-provisioned.png":::
 
-1. Select or create a new IoT Hub Device in the Azure IoT Hub you provisioned.
+1. Select or create a new IoT device in the Azure IoT hub you provisioned.
 
-   :::image type="content" source="media/iot-hub-create-use-iot-toolkit/iot-device-provision.png" alt-text="A screenshot that shows the fourth prompt in choosing an existing IoT Hub in Visual Studio Code." lightbox="media/iot-hub-create-use-iot-toolkit/iot-device-provision.png":::
+   :::image type="content" source="media/iot-hub-create-use-iot-toolkit/iot-device-provision.png" alt-text="A screenshot that shows the fourth prompt in choosing an existing IoT hub in Visual Studio Code." lightbox="media/iot-hub-create-use-iot-toolkit/iot-device-provision.png":::
 
-   :::image type="content" source="media/iot-hub-create-use-iot-toolkit/select-iot-device.png" alt-text="A screenshot that shows an example of an existing IoT Hub in Visual Studio Code." lightbox="media/iot-hub-create-use-iot-toolkit/select-iot-device.png":::
+   :::image type="content" source="media/iot-hub-create-use-iot-toolkit/select-iot-device.png" alt-text="A screenshot that shows an example of an existing IoT hub in Visual Studio Code." lightbox="media/iot-hub-create-use-iot-toolkit/select-iot-device.png":::
 
-1. Now you have an Azure IoT Hub provisioned and a device created in it. The device connection string is saved in VS Code.
+1. Now you have an Azure IoT hub provisioned and a device created in it. The device connection string is saved in VS Code.
 
-   :::image type="content" source="media/iot-hub-create-use-iot-toolkit/provision-done.png" alt-text="A screenshot that shows IoT Hub details in the output window in Visual Studio Code." lightbox="media/iot-hub-create-use-iot-toolkit/provision-done.png":::
+   :::image type="content" source="media/iot-hub-create-use-iot-toolkit/provision-done.png" alt-text="A screenshot that shows IoT hub details in the output window in Visual Studio Code." lightbox="media/iot-hub-create-use-iot-toolkit/provision-done.png":::
 
 > [!TIP]
 > To delete a device from your IoT hub, use the `Azure IoT Hub: Delete Device` option from the Command Palette. There is no option to delete your IoT hub in Visual Studio Code, however you can [delete your hub in the Azure portal](iot-hub-create-through-portal.md#delete-an-iot-hub).
 
 ## Next steps
 
-Now that you've deployed an IoT hub using the Azure IoT Tools for Visual Studio Code, explore these articles:
+Now that you've deployed an IoT hub using the Azure IoT Hub extension for Visual Studio Code, explore these articles:
 
-- [Use the Azure IoT Tools for Visual Studio Code to send and receive messages between your device and an IoT Hub](iot-hub-vscode-iot-toolkit-cloud-device-messaging.md).
+- [Use the Azure IoT Hub extension for Visual Studio Code to send and receive messages between your device and an IoT hub](iot-hub-vscode-iot-toolkit-cloud-device-messaging.md).
 
-- [Use the Azure IoT Tools for Visual Studio Code for Azure IoT Hub device management](iot-hub-device-management-iot-toolkit.md)
+- [Use the Azure IoT Hub extension for Visual Studio Code for Azure IoT Hub device management](iot-hub-device-management-iot-toolkit.md)
 
-- [See the Azure IoT Hub for Visual Studio Code wiki page](https://github.com/microsoft/vscode-azure-iot-toolkit/wiki).
+- [See the Azure IoT Hub extension for Visual Studio Code wiki page](https://github.com/microsoft/vscode-azure-iot-toolkit/wiki).

articles/iot-hub/iot-hub-device-management-iot-toolkit.md

@@ -1,6 +1,6 @@
 ---
-title: Azure IoT device management with Azure IoT Tools for VSCode
-description: Use the Azure IoT Tools for Visual Studio Code for Azure IoT Hub device management, featuring the Direct methods and the Twin's desired properties management options.
+title: Azure IoT device management with the Azure IoT Hub extension for VSCode
+description: Use the Azure IoT Hub extension for Visual Studio Code for Azure IoT Hub device management, featuring the Direct methods and the Twin's desired properties management options.
 author: formulahendry
 
 ms.author: junhan
@@ -9,11 +9,11 @@ ms.topic: how-to
 ms.date: 01/04/2019
 ---
 
-# Use Azure IoT Tools for Visual Studio Code for Azure IoT Hub device management
+# Use the Azure IoT Hub extension for Visual Studio Code for Azure IoT Hub device management
 
 ![End-to-end diagram](media/iot-hub-get-started-e2e-diagram/2.png)
 
-In this article, you learn how to use Azure IoT Tools for Visual Studio Code with various management options on your development machine. [Azure IoT Hub for VS Code](https://marketplace.visualstudio.com/items?itemName=vsciot-vscode.azure-iot-toolkit) is a useful Visual Studio Code extension that makes IoT Hub management and IoT application development easier. It comes with management options that you can use to perform various tasks.
+In this article, you learn how to use the [Azure IoT Hub extension for Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=vsciot-vscode.azure-iot-toolkit) with various management options on your development machine. The IoT Hub extension is a useful Visual Studio Code extension that makes IoT Hub management and IoT application development easier. It comes with management options that you can use to perform various tasks.
 
 [!INCLUDE [iot-hub-basic](../../includes/iot-hub-basic-whole.md)]
 
@@ -35,7 +35,7 @@ Device twins are JSON documents that store device state information (metadata, c
 * An active Azure subscription.
 * An Azure IoT hub under your subscription.
 * [Visual Studio Code](https://code.visualstudio.com/)
-* [Azure IoT Hub for VS Code](https://marketplace.visualstudio.com/items?itemName=vsciot-vscode.azure-iot-toolkit) or copy this URL and paste it into a browser window:`vscode:extension/vsciot-vscode.azure-iot-toolkit`.
+* [Azure IoT Hub extension for Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=vsciot-vscode.azure-iot-toolkit) or copy this URL and paste it into a browser window:`vscode:extension/vsciot-vscode.azure-iot-toolkit`.
 
 ## Sign in to access your IoT hub
 
@@ -49,7 +49,7 @@ Device twins are JSON documents that store device state information (metadata, c
 
 5. The device list will be shown in **Azure IoT Hub Devices** tab in a few seconds.
 
-   > [!Note]
+   > [!NOTE]
    > You can also complete the set up by choosing **Set IoT Hub Connection String**. Enter the **iothubowner** policy connection string for the IoT hub that your IoT device connects to in the pop-up window.
 
 ## Direct methods
@@ -86,6 +86,6 @@ To send a message from your IoT hub to your device, follow these steps:
 
 ## Next steps
 
-You've learned how to use Azure IoT Hub for Visual Studio Code with various management options.
+You've learned how to use the Azure IoT Hub extension for Visual Studio Code with various management options.
 
 [!INCLUDE [iot-hub-get-started-next-steps](../../includes/iot-hub-get-started-next-steps.md)]

articles/iot-hub/iot-hub-distributed-tracing.md

@@ -206,9 +206,9 @@ To change the percentage of messages to be traced from the cloud, you must updat
 
 1. (Optional) Change the sampling rate to a different value, and observe the change in frequency that messages include `tracestate` in the application properties.
 
-### Update by using Azure IoT Hub for Visual Studio Code
+### Update by using the Azure IoT Hub extension for Visual Studio Code
 
-1. With Visual Studio Code installed, install the latest version of [Azure IoT Tools](https://marketplace.visualstudio.com/items?itemName=vsciot-vscode.azure-iot-toolkit) for Visual Studio Code.
+1. With Visual Studio Code installed, install the latest version of the [Azure IoT Hub extension for Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=vsciot-vscode.azure-iot-toolkit).
 
 1. Open Visual Studio Code, and go to the **Explorer** tab and the **Azure IoT Hub** section. 
 

articles/iot-hub/iot-hub-mqtt-support.md

@@ -118,9 +118,9 @@ If a device can't use the device SDKs, it can still connect to the public device
 
   For more information about how to generate SAS tokens, see the [Use SAS tokens as a device](iot-hub-dev-guide-sas.md#use-sas-tokens-as-a-device) section of [Control access to IoT Hub using Shared Access Signatures](iot-hub-dev-guide-sas.md).
 
-  You can also use the cross-platform Azure IoT Tools for Visual Studio Code or the CLI extension command [az iot hub generate-sas-token](/cli/azure/iot/hub#az-iot-hub-generate-sas-token) to quickly generate a SAS token. You can then copy and paste the SAS token into your own code for testing purposes.
+  You can also use the cross-platform [Azure IoT Hub extension for Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=vsciot-vscode.azure-iot-toolkit) or the CLI extension command [az iot hub generate-sas-token](/cli/azure/iot/hub#az-iot-hub-generate-sas-token) to quickly generate a SAS token. You can then copy and paste the SAS token into your own code for testing purposes.
 
-### For Azure IoT Tools
+### Using the Azure IoT Hub extension for Visual Studio Code
 
 1. Expand the **AZURE IOT HUB DEVICES** tab in the bottom left corner of Visual Studio Code.
 

articles/iot-hub/iot-hub-raspberry-pi-kit-c-get-started.md

@@ -225,7 +225,7 @@ You should see the following output that shows the sensor data and the messages
 
 ## Read the messages received by your hub
 
-One way to monitor messages received by your IoT hub from your device is to use the Azure IoT Tools for Visual Studio Code. To learn more, see [Use Azure IoT Hub extension for Visual Studio Code to send and receive messages between your device and IoT Hub](iot-hub-vscode-iot-toolkit-cloud-device-messaging.md).
+One way to monitor messages received by your IoT hub from your device is to use the Azure IoT Hub extension for Visual Studio Code. To learn more, see [Use the Azure IoT Hub extension for Visual Studio Code to send and receive messages between your device and IoT Hub](iot-hub-vscode-iot-toolkit-cloud-device-messaging.md).
 
 For more ways to process data sent by your device, continue on to the next section.
 

articles/iot-hub/iot-hub-raspberry-pi-kit-node-get-started.md

@@ -249,7 +249,7 @@ You should see the following output that shows the sensor data and the messages
 
 ## Read the messages received by your hub
 
-One way to monitor messages received by your IoT hub from your device is to use the Azure IoT Tools for Visual Studio Code. To learn more, see [Use Azure IoT Tools for Visual Studio Code to send and receive messages between your device and IoT Hub](iot-hub-vscode-iot-toolkit-cloud-device-messaging.md).
+One way to monitor messages received by your IoT hub from your device is to use the Azure IoT Hub extension for Visual Studio Code. To learn more, see [Use the Azure IoT Hub extension for Visual Studio Code to send and receive messages between your device and IoT Hub](iot-hub-vscode-iot-toolkit-cloud-device-messaging.md).
 
 For more ways to process data sent by your device, continue on to the next section.
 

articles/iot-hub/iot-hub-raspberry-pi-web-simulator-get-started.md

@@ -97,7 +97,7 @@ You should see the following output that shows the sensor data and the messages
 
 ## Read the messages received by your hub
 
-One way to monitor messages received by your IoT hub from the simulated device is to use the Azure IoT Tools for Visual Studio Code. To learn more, see [Use Azure IoT Tools for Visual Studio Code to send and receive messages between your device and IoT Hub](iot-hub-vscode-iot-toolkit-cloud-device-messaging.md).
+One way to monitor messages received by your IoT hub from the simulated device is to use the Azure IoT Hub extension for Visual Studio Code. To learn more, see [Use the Azure IoT Hub extension for Visual Studio Code to send and receive messages between your device and IoT Hub](iot-hub-vscode-iot-toolkit-cloud-device-messaging.md).
 
 For more ways to process data sent by your device, continue on to the next section.
 

articles/iot-hub/iot-hub-vscode-iot-toolkit-cloud-device-messaging.md

@@ -1,6 +1,6 @@
 ---
-title: Use Azure IoT Tools for VSCode to manage IoT Hub messaging
-description: Learn how to use Azure IoT Tools for Visual Studio Code to monitor device to cloud messages and send cloud to device messages in Azure IoT Hub.
+title: Use the Azure IoT Hub extension for Visual Studio Code to manage IoT Hub messaging
+description: Learn how to use the Azure IoT Hub extension for Visual Studio Code to monitor device to cloud messages and send cloud to device messages in Azure IoT Hub.
 author: formulahendry
 
 ms.author: junhan
@@ -10,13 +10,13 @@ ms.date: 01/18/2019
 ms.custom: ['Role: Cloud Development']
 ---
 
-# Use Azure IoT Tools for Visual Studio Code to send and receive messages between your device and IoT Hub
+# Use the Azure IoT Hub extension for Visual Studio Code to send and receive messages between your device and IoT Hub
 
 ![End-to-end diagram](./media/iot-hub-vscode-iot-toolkit-cloud-device-messaging/e-to-e-diagram.png)
 
-In this article, you learn how to use Azure IoT Tools for Visual Studio Code to monitor device-to-cloud messages and to send cloud-to-device messages. Device-to-cloud messages could be sensor data that your device collects and then sends to your IoT hub. Cloud-to-device messages could be commands that your IoT hub sends to your device to blink an LED that is connected to your device.
+In this article, you learn how to use the Azure IoT Hub extension for Visual Studio Code to monitor device-to-cloud messages and to send cloud-to-device messages. Device-to-cloud messages could be sensor data that your device collects and then sends to your IoT hub. Cloud-to-device messages could be commands that your IoT hub sends to your device to blink an LED that is connected to your device.
 
-[Azure IoT Tools](https://marketplace.visualstudio.com/items?itemName=vsciot-vscode.azure-iot-toolkit) is a useful Visual Studio Code extension that makes IoT Hub management and IoT application development easier. This article focuses on how to use Azure IoT Tools for Visual Studio Code to send and receive messages between your device and your IoT hub.
+The [Azure IoT Hub extension for Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=vsciot-vscode.azure-iot-toolkit) is a useful extension that makes IoT Hub management and IoT application development easier. This article focuses on how to use the extension to send and receive messages between your device and your IoT hub.
 
 [!INCLUDE [iot-hub-basic](../../includes/iot-hub-basic-partial.md)]
 
@@ -28,7 +28,7 @@ In this article, you learn how to use Azure IoT Tools for Visual Studio Code to
 
 * [Visual Studio Code](https://code.visualstudio.com/)
 
-* [Azure IoT Tools for VS Code](https://marketplace.visualstudio.com/items?itemName=vsciot-vscode.azure-iot-toolkit) or copy and paste this URL into a browser window: `vscode:extension/vsciot-vscode.azure-iot-toolkit`
+* [Azure IoT Hub extension for Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=vsciot-vscode.azure-iot-toolkit) or copy and paste this URL into a browser window: `vscode:extension/vsciot-vscode.azure-iot-toolkit`
 
 ## Sign in to access your IoT hub
 
@@ -42,7 +42,7 @@ In this article, you learn how to use Azure IoT Tools for Visual Studio Code to
 
 5. The device list will be shown in **Azure IoT Hub Devices** tab in a few seconds.
 
-   > [!Note]
+   > [!NOTE]
    > You can also complete the set up by choosing **Set IoT Hub Connection String**. Enter the **iothubowner** policy connection string for the IoT hub that your IoT device connects to in the pop-up window.
 
 ## Monitor device-to-cloud messages