diff --git a/CHANGELOG.md b/CHANGELOG.md
index e815646c..df1e411e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 2.7.0 
+## 2.7.0 (2019-05-16)
 ### Added
 * Endpoints tree view
 * Monitor custom Event Hub endpoint
diff --git a/README.md b/README.md
index 5fd8b714..fb9cbc8b 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ The [Wiki page](https://github.com/Microsoft/vscode-azure-iot-toolkit/wiki) incl
 
 ### Prerequisites
 
-1. In Explorer of VS Code, click "Azure IoT Hub Devices" in the bottom left corner.
+1. In Explorer of VS Code, click "Azure IoT Hub" in the bottom left corner.
 
   ![Click Device Explorer](images/device-explorer-click.png)
 
@@ -60,7 +60,7 @@ The [Wiki page](https://github.com/Microsoft/vscode-azure-iot-toolkit/wiki) incl
 
   ![Enter Connection String](images/enter-connection-string.png)
 
-4. The device list will be shown.
+4. The devices list will be shown.
 
   ![Device Explorer](images/device-explorer.png)
 
@@ -77,7 +77,9 @@ Instead of copying and pasting to set IoT Hub Connection String, you could sign
 2. If you have not signed in to Azure, a pop-up will show to let you sign in to Azure.
 3. After you sign in, your Azure Subscription list will be shown, then select an Azure Subscription.
 4. Your IoT Hub list will be shown, then select an IoT Hub.
-5. The device list will be shown.
+5. The devices and endpoints list will be shown.
+
+  ![IoT Hub Explorer](images/iot-hub-explorer.png)
 
 ## Code Generation
 
diff --git a/images/device-explorer-click.png b/images/device-explorer-click.png
index 9720f627..34bf47f0 100644
Binary files a/images/device-explorer-click.png and b/images/device-explorer-click.png differ
diff --git a/images/device-explorer.png b/images/device-explorer.png
index b85cdc5d..a0fd4614 100644
Binary files a/images/device-explorer.png and b/images/device-explorer.png differ
diff --git a/images/iot-hub-explorer.png b/images/iot-hub-explorer.png
new file mode 100644
index 00000000..530b880a
Binary files /dev/null and b/images/iot-hub-explorer.png differ
diff --git a/images/select-iot-hub.png b/images/select-iot-hub.png
index 3b6aa3e4..81924257 100644
Binary files a/images/select-iot-hub.png and b/images/select-iot-hub.png differ
diff --git a/images/set-connection-string.png b/images/set-connection-string.png
index 0b51f471..fba7a4bf 100644
Binary files a/images/set-connection-string.png and b/images/set-connection-string.png differ
diff --git a/package.json b/package.json
index f518b79c..1edf32ea 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "azure-iot-toolkit",
   "displayName": "Azure IoT Hub Toolkit",
   "description": "Interact with Azure IoT Hub, IoT Device Management, IoT Edge Management, IoT Hub Device Simulation, IoT Hub Code Generation",
-  "version": "2.7.0-rc3",
+  "version": "2.7.0",
   "publisher": "vsciot-vscode",
   "aiKey": "0caaff90-cc1c-4def-b64c-3ef33615bc9b",
   "icon": "logo.png",
diff --git a/resources/welcome/index.html b/resources/welcome/index.html
index 0fb31ec4..fb4fb8e5 100644
--- a/resources/welcome/index.html
+++ b/resources/welcome/index.html
@@ -28,7 +28,7 @@ <h3>Select IoT Hub if you have existing one</h3>
                             To select IoT Hub, click above button, or follow below steps.
                             <ol>
                                 <li>
-                                    <div>In Explorer of VS Code, click "Azure IoT Hub Devices" tab in the bottom left corner.</div>
+                                    <div>In Explorer of VS Code, click "Azure IoT Hub" tab in the bottom left corner.</div>
                                     <img src="https://raw.githubusercontent.com/Microsoft/vscode-azure-iot-toolkit/master/images/device-explorer-click.png">
                                 </li>
                                 <li>
@@ -45,8 +45,8 @@ <h3>Select IoT Hub if you have existing one</h3>
                                         and IoT Hub.</div>
                                 </li>
                                 <li>
-                                    <div>The device list will be shown in "Azure IoT Hub Devices" tab in a few seconds.</div>
-                                    <img src="https://raw.githubusercontent.com/Microsoft/vscode-azure-iot-toolkit/master/images/device-explorer.png">
+                                    <div>The devices and endpoints list will be shown in "Azure IoT Hub" tab in a few seconds.</div>
+                                    <img src="https://raw.githubusercontent.com/Microsoft/vscode-azure-iot-toolkit/master/images/iot-hub-explorer.png">
                                 </li>
                             </ol>
                         </div>
@@ -62,7 +62,7 @@ <h3>Create IoT Hub if you don't have one</h3>
                             To create IoT Hub, click above button, or follow below steps.
                             <ol>
                                 <li>
-                                    <div>In Explorer of VS Code, click "Azure IoT Hub Devices" tab in the bottom left corner.</div>
+                                    <div>In Explorer of VS Code, click "Azure IoT Hub" tab in the bottom left corner.</div>
                                     <img src="https://raw.githubusercontent.com/Microsoft/vscode-azure-iot-toolkit/master/images/device-explorer-click.png">
                                 </li>
                                 <li>
@@ -110,7 +110,7 @@ <h3 id="register-device">Register a device</h3>
                             <strong>... &gt; Create Device</strong>
                             <span> </span>at
                             <span> </span>
-                            <strong>AZURE IOT HUB DEVICES</strong>
+                            <strong>AZURE IOT HUB</strong>
                             <span> </span>tab, or type
                             <span> </span>
                             <strong>Azure IoT Hub: Create Device</strong>
@@ -141,7 +141,7 @@ <h3 id="monitor-d2c">Monitor device-to-cloud (D2C) message</h3>
                     <ol>
                         <li>Right-click your device and select
                             <span> </span>
-                            <strong>Start Monitoring D2C Message</strong>.</li>
+                            <strong>Start Monitoring Built-in Event Endpoint</strong>.</li>
                     </ol>
                     <img src="https://raw.githubusercontent.com/wiki/Microsoft/vscode-azure-iot-toolkit/images/startmonitor.png" alt="start monitor"
                     />
@@ -155,7 +155,7 @@ <h3 id="monitor-d2c">Monitor device-to-cloud (D2C) message</h3>
                             <strong>OUTPUT</strong>
                             <span> </span>view and select
                             <span> </span>
-                            <strong>Stop Monitoring D2C Message</strong>.</li>
+                            <strong>Stop Monitoring Built-in Event Endpoint</strong>.</li>
                     </ol>
                     <img src="https://raw.githubusercontent.com/wiki/Microsoft/vscode-azure-iot-toolkit/images/stopmonitor.png" alt="stop monitor"
                     />