diff --git a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/virtual/ui/AgentUI.java b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/virtual/ui/AgentUI.java
index 4a8e3dda9..15b544389 100644
--- a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/virtual/ui/AgentUI.java
+++ b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/agent/virtual/ui/AgentUI.java
@@ -22,10 +22,10 @@ import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.core.AgentConstants
 import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.core.AgentManager;
 import org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.virtual.VirtualHardwareManager;
 
-import javax.swing.*;
 import java.awt.*;
-import java.net.URI;
 import java.net.URL;
+import java.util.Calendar;
+import javax.swing.*;
 
 public class AgentUI extends JFrame {
 
@@ -193,8 +193,10 @@ public class AgentUI extends JFrame {
         lblAgentName.setHorizontalAlignment(SwingConstants.LEFT);
         lblAgentName.setText("Device Name: " + AgentManager.getInstance().getDeviceName());
 
+        Calendar now = Calendar.getInstance();
+        int currentYear = now.get(Calendar.YEAR);
         jLabel2.setHorizontalAlignment(SwingConstants.CENTER);
-        jLabel2.setText("Copyright (c) 2015, WSO2 Inc.");
+        jLabel2.setText("Copyright (c) " + currentYear + ", WSO2 Inc.");
 
         jPanel1.setBackground(new Color(220, 220, 220));
 
diff --git a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/private/config.json b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/private/config.json
index 997094474..be47969f0 100644
--- a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/private/config.json
+++ b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/private/config.json
@@ -1,6 +1,6 @@
 {
   "deviceType": {
-    "label": "Virtual Firealarm",
+    "label": "Virtual Fire Alarm",
     "category": "virtual",
     "downloadAgentUri": "virtual_firealarm/device/download",
     "scopes" : [
diff --git a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/type-view.hbs b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/type-view.hbs
index 9040e8c8b..b97e29d0f 100644
--- a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/type-view.hbs
+++ b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/type-view.hbs
@@ -39,7 +39,7 @@
         </li>
         <li>
             <span class="badge">STEP 02</span>
-               Follow the steps under <a href="#prepare">[Prepare]</a>
+               Follow the steps under <a href="#prepare">[Prepare]</a> section.
         </li>
         <li>
             <span class="badge">STEP 03</span>
@@ -79,7 +79,7 @@
         <hr>
         <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
             <div class="panel-body col-centered text-center">
-                <h3>Name your device and download the agent from following link.</h3>
+                <h3>Name your device and download the agent.</h3>
                 <br />
                 <form id="downloadForm" method="GET"
                       action="{{@app.context}}/api/devices/sketch/download">
@@ -207,11 +207,11 @@
         </li>
         <li class="padding-top-double">
             <span class="badge">02</span>
-               Navigate to the unzipped agent directory via the terminal.
+               Navigate to the unzipped Agent folder via the terminal.
         </li>
         <li class="padding-top-double">
             <span class="badge">03</span>
-               Start the agent using the <span style="font-family: monospace;">sh start-device.sh</span> command.
+               Run this command: <span style="font-family: monospace;">sh start-device.sh</span>.
         </li>
     </ul>
     <br>
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/config.json b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/config.json
index 77396e058..e6ab55c5d 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/config.json
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/config.json
@@ -1,7 +1,7 @@
 {
     "deviceType": {
         "label": "Android",
-        "virtualLabel": "virtual Android",
+        "virtualLabel": "Virtual Android",
         "category": "hybrid",
         "analyticsEnabled": "false",
         "groupingEnabled": "true",