diff --git a/apps/aaa/app.xml b/apps/aaa/app.xml
index f47fd8d..464e9ec 100644
--- a/apps/aaa/app.xml
+++ b/apps/aaa/app.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <app name="org.onosproject.aaa" origin="ATT" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="ONOS Auth App"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
diff --git a/apps/bgprouter/app.xml b/apps/bgprouter/app.xml
index 7b17655..e79fe79 100644
--- a/apps/bgprouter/app.xml
+++ b/apps/bgprouter/app.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <app name="org.onosproject.bgprouter" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="BGP router App"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
diff --git a/apps/cordmcast/pom.xml b/apps/cordmcast/pom.xml
index 32a5c72..9c338b1 100644
--- a/apps/cordmcast/pom.xml
+++ b/apps/cordmcast/pom.xml
@@ -33,6 +33,7 @@
 
     <properties>
         <onos.app.name>org.onosproject.cordmcast</onos.app.name>
+        <onos.app.title>CORD Multicast App</onos.app.title>
     </properties>
 
     <dependencies>
diff --git a/apps/cordvtn/app.xml b/apps/cordvtn/app.xml
index 4efb8a4..62084f0 100644
--- a/apps/cordvtn/app.xml
+++ b/apps/cordvtn/app.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <app name="org.onosproject.cordvtn" origin="ON.Lab" version="${project.version}"
-        category="default" url="http://onosproject.org"
+        category="default" url="http://onosproject.org" title="CORD Virtual Tenant Network"
         featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
         features="${project.artifactId}"
         apps="org.onosproject.ovsdb-base,org.onosproject.openstackinterface,org.onosproject.dhcp">
diff --git a/apps/cordvtn/pom.xml b/apps/cordvtn/pom.xml
index 783e96c..883e400 100644
--- a/apps/cordvtn/pom.xml
+++ b/apps/cordvtn/pom.xml
@@ -32,11 +32,6 @@
     <description>Virtual tenant network service for CORD</description>
 
     <properties>
-        <onos.app.name>org.onosproject.cordvtn</onos.app.name>
-        <onos.app.title>CORD Virtual Tenant Network</onos.app.title>
-        <onos.app.category>default</onos.app.category>
-        <onos.app.url>http://onosproject.org</onos.app.url>
-        <onos.app.readme>Virtual tenant network service for CORD.</onos.app.readme>
         <web.context>/onos/cordvtn</web.context>
         <api.version>1.0.0</api.version>
         <api.title>CORD VTN REST API</api.title>
diff --git a/apps/cpman/app/app.xml b/apps/cpman/app/app.xml
index 4ebb66d..f832d8d 100644
--- a/apps/cpman/app/app.xml
+++ b/apps/cpman/app/app.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <app name="org.onosproject.cpman" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="Control Plane Manager"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}" apps="org.onosproject.openflow-message">
     <description>${project.description}</description>
diff --git a/apps/dhcp/app/app.xml b/apps/dhcp/app/app.xml
index ba15b05..26b4d78 100644
--- a/apps/dhcp/app/app.xml
+++ b/apps/dhcp/app/app.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <app name="org.onosproject.dhcp" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="DHCP Server REST API"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
diff --git a/apps/faultmanagement/app/app.xml b/apps/faultmanagement/app/app.xml
index 10c8e9c..74ed710 100644
--- a/apps/faultmanagement/app/app.xml
+++ b/apps/faultmanagement/app/app.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <app name="org.onosproject.faultmanagement" origin="BTI Systems" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="ONOS Fault Mgmt App"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
diff --git a/apps/metrics/pom.xml b/apps/metrics/pom.xml
index 9c75b6e..5d8bbaa 100644
--- a/apps/metrics/pom.xml
+++ b/apps/metrics/pom.xml
@@ -36,9 +36,7 @@
         <onos.app.title>Performance Metrics App</onos.app.title>
         <onos.app.category>default</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
-        <onos.app.readme>
-            Performance metrics collection application.
-        </onos.app.readme>
+        <onos.app.readme>Performance metrics collection application.</onos.app.readme>
     </properties>
 
     <dependencies>
diff --git a/apps/mfwd/pom.xml b/apps/mfwd/pom.xml
index 24c763b..2c75aef 100644
--- a/apps/mfwd/pom.xml
+++ b/apps/mfwd/pom.xml
@@ -36,9 +36,7 @@
         <onos.app.title>Multicast Forwarding App</onos.app.title>
         <onos.app.category>default</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
-        <onos.app.readme>
-            Multicast forwarding application.
-        </onos.app.readme>
+        <onos.app.readme>Multicast forwarding application.</onos.app.readme>
     </properties>
 
     <dependencies>
diff --git a/apps/mlb/pom.xml b/apps/mlb/pom.xml
index cebf68d..c130029 100644
--- a/apps/mlb/pom.xml
+++ b/apps/mlb/pom.xml
@@ -36,7 +36,8 @@
         <onos.app.title>Mastership Load Balancer App</onos.app.title>
         <onos.app.category>default</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
-        <onos.app.readme>Application that balances mastership among nodes.
+        <onos.app.readme>
+            Application that balances mastership among nodes.
         </onos.app.readme>
     </properties>
 
diff --git a/apps/mobility/pom.xml b/apps/mobility/pom.xml
index f1b2587..00054b0 100644
--- a/apps/mobility/pom.xml
+++ b/apps/mobility/pom.xml
@@ -36,9 +36,7 @@
         <onos.app.title>Host Mobility App</onos.app.title>
         <onos.app.category>default</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
-        <onos.app.readme>
-            Host mobility application.
-        </onos.app.readme>
+        <onos.app.readme>Host mobility application.</onos.app.readme>
     </properties>
 
     <dependencies>
diff --git a/apps/olt/app/app.xml b/apps/olt/app/app.xml
index c8c33ba..fc4b029 100644
--- a/apps/olt/app/app.xml
+++ b/apps/olt/app/app.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <app name="org.onosproject.olt" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="ONOS OLT App"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
diff --git a/apps/openstackinterface/app/app.xml b/apps/openstackinterface/app/app.xml
index 13e7179..9ff3ba2 100644
--- a/apps/openstackinterface/app/app.xml
+++ b/apps/openstackinterface/app/app.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <app name="org.onosproject.openstackinterface" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="Openstack Interface App"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
diff --git a/apps/openstackinterface/app/pom.xml b/apps/openstackinterface/app/pom.xml
index b3b620f..6f2555c 100644
--- a/apps/openstackinterface/app/pom.xml
+++ b/apps/openstackinterface/app/pom.xml
@@ -29,12 +29,9 @@
     <artifactId>onos-app-openstackinterface-app</artifactId>
     <packaging>bundle</packaging>
 
+    <description>Openstack Interface Application</description>
 
     <properties>
-        <onos.app.name>org.onosproject.openstackinterface</onos.app.name>
-        <onos.app.title>Openstack Interface App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
-        <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Openstack Interface Application.</onos.app.readme>
     </properties>
 
@@ -95,6 +92,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-
-
 </project>
diff --git a/apps/openstacknetworking/app/app.xml b/apps/openstacknetworking/app/app.xml
index 911e1e9..4a5039a 100644
--- a/apps/openstacknetworking/app/app.xml
+++ b/apps/openstacknetworking/app/app.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <app name="org.onosproject.openstacknetworking" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="Openstack Networking App"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}"
      apps="org.onosproject.openstackswitching,org.onosproject.openstackrouting">
diff --git a/apps/openstacknetworking/app/pom.xml b/apps/openstacknetworking/app/pom.xml
index 9e1cdd6..9943a6c 100644
--- a/apps/openstacknetworking/app/pom.xml
+++ b/apps/openstacknetworking/app/pom.xml
@@ -30,10 +30,6 @@
     <packaging>pom</packaging>
 
     <properties>
-        <onos.app.name>org.onosproject.openstacknetworking</onos.app.name>
-        <onos.app.title>Openstack Networking App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
-        <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Openstack Networking Application.</onos.app.readme>
     </properties>
 
diff --git a/apps/optical/pom.xml b/apps/optical/pom.xml
index 57906ae..ee9d78a 100644
--- a/apps/optical/pom.xml
+++ b/apps/optical/pom.xml
@@ -36,8 +36,7 @@
         <onos.app.title>Packet/Optical Use-Case App</onos.app.title>
         <onos.app.category>default</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
-        <onos.app.readme>Packet/Optical use-case application.
-        </onos.app.readme>
+        <onos.app.readme>Packet/Optical use-case application.</onos.app.readme>
     </properties>
 
     <dependencies>
diff --git a/apps/pathpainter/pom.xml b/apps/pathpainter/pom.xml
index 1552415..053bbed 100644
--- a/apps/pathpainter/pom.xml
+++ b/apps/pathpainter/pom.xml
@@ -36,9 +36,7 @@
         <onos.app.title>Path Visualization App</onos.app.title>
         <onos.app.category>default</onos.app.category>
         <onos.app.url>https://wiki.onosproject.org/display/ONOS/Path+Painter+Application+GUI</onos.app.url>
-        <onos.app.title>
-            Path visualization application
-        </onos.app.title>
+        <onos.app.title>Path visualization application</onos.app.title>
         <onos.app.readme>
             Allows the user to visualize different types of paths between
             network entities such as switches and hosts.
diff --git a/apps/sdnip/app.xml b/apps/sdnip/app.xml
index 16503f7..e05108a 100644
--- a/apps/sdnip/app.xml
+++ b/apps/sdnip/app.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <app name="org.onosproject.sdnip" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="SDN-IP App"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
diff --git a/apps/vpls/pom.xml b/apps/vpls/pom.xml
index 3e79be2..e0ffe7c 100644
--- a/apps/vpls/pom.xml
+++ b/apps/vpls/pom.xml
@@ -33,6 +33,7 @@
 
     <properties>
         <onos.app.name>org.onosproject.vpls</onos.app.name>
+        <onos.app.title>VLAN L2 Broadcast Network App</onos.app.title>
     </properties>
 
     <dependencies>
diff --git a/apps/vrouter/app.xml b/apps/vrouter/app.xml
index ccb0289..2a11e87 100644
--- a/apps/vrouter/app.xml
+++ b/apps/vrouter/app.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <app name="org.onosproject.vrouter" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="Virtual Router App"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
diff --git a/apps/vrouter/pom.xml b/apps/vrouter/pom.xml
index 5580afd..d1515a4 100644
--- a/apps/vrouter/pom.xml
+++ b/apps/vrouter/pom.xml
@@ -31,23 +31,16 @@
     <packaging>bundle</packaging>
 
     <description>Virtual router (vRouter) application</description>
-    <url>http://onosproject.org</url>
-
-    <properties>
-        <onos.version>1.5.0-SNAPSHOT</onos.version>
-    </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-api</artifactId>
-            <version>${onos.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onlab-osgi</artifactId>
-            <version>${onos.version}</version>
         </dependency>
 
         <dependency>
@@ -64,7 +57,6 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-api</artifactId>
-            <version>${onos.version}</version>
             <scope>test</scope>
             <classifier>tests</classifier>
         </dependency>
diff --git a/apps/vtn/app/app.xml b/apps/vtn/app/app.xml
index fb3b84d..b74c585 100644
--- a/apps/vtn/app/app.xml
+++ b/apps/vtn/app/app.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <app name="org.onosproject.vtn" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="ONOS Framework App"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
diff --git a/providers/bgp/app/app.xml b/providers/bgp/app/app.xml
index b45f399..96ae7c9 100755
--- a/providers/bgp/app/app.xml
+++ b/providers/bgp/app/app.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <app name="org.onosproject.bgp" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="BGP Provider"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
diff --git a/providers/lldp/app.xml b/providers/lldp/app.xml
index 509bcca..f938802 100644
--- a/providers/lldp/app.xml
+++ b/providers/lldp/app.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <app name="org.onosproject.lldpprovider" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="LLDP Provider"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
diff --git a/providers/netcfglinks/app.xml b/providers/netcfglinks/app.xml
index 5877360..10c7700 100644
--- a/providers/netcfglinks/app.xml
+++ b/providers/netcfglinks/app.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <app name="org.onosproject.netcfglinksprovider" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="Network Config Link Provider"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
diff --git a/providers/netcfglinks/features.xml b/providers/netcfglinks/features.xml
index 5594656..eab933c 100644
--- a/providers/netcfglinks/features.xml
+++ b/providers/netcfglinks/features.xml
@@ -13,7 +13,8 @@
   ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
-  --><features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
+  -->
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
     <feature name="${project.artifactId}" version="${project.version}"
              description="${project.description}">
         <feature>onos-api</feature>
diff --git a/providers/netcfglinks/pom.xml b/providers/netcfglinks/pom.xml
index 4ef71ec..86c088b 100644
--- a/providers/netcfglinks/pom.xml
+++ b/providers/netcfglinks/pom.xml
@@ -30,16 +30,8 @@
     <description>
         Links provider that uses network config service to predefine devices and links.
     </description>
-    <url>http://onosproject.org</url>
-
-    <properties>
-        <onos.app.name>org.onosproject.netcfglinksprovider</onos.app.name>
-        <onos.app.title>Network Config Link Provider</onos.app.title>
-        <onos.app.origin>ON.Lab</onos.app.origin>
-    </properties>
 
     <dependencies>
-
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onlab-osgi</artifactId>
diff --git a/providers/netconf/app/app.xml b/providers/netconf/app/app.xml
index 907b5d1..4ef7a0d 100644
--- a/providers/netconf/app/app.xml
+++ b/providers/netconf/app/app.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <app name="org.onosproject.netconf" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="NetConf Provider"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
diff --git a/providers/openflow/base/app.xml b/providers/openflow/base/app.xml
index 7faead8..2567ce6 100644
--- a/providers/openflow/base/app.xml
+++ b/providers/openflow/base/app.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <app name="org.onosproject.openflow-base" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="OpenFlow Provider"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
diff --git a/providers/openflow/message/app.xml b/providers/openflow/message/app.xml
index ff889ae..034fc35 100644
--- a/providers/openflow/message/app.xml
+++ b/providers/openflow/message/app.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <app name="org.onosproject.openflow-message" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="Control Message Stat. Provider"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
diff --git a/providers/ovsdb/base/app.xml b/providers/ovsdb/base/app.xml
index c8dbc09..b752f6d 100644
--- a/providers/ovsdb/base/app.xml
+++ b/providers/ovsdb/base/app.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <app name="org.onosproject.ovsdb-base" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="OVSDB Provider"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
diff --git a/providers/pcep/app/app.xml b/providers/pcep/app/app.xml
index 6d6c6c3..80b9942 100644
--- a/providers/pcep/app/app.xml
+++ b/providers/pcep/app/app.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <app name="org.onosproject.pcep" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="PCEP Provider"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
diff --git a/providers/rest/app/app.xml b/providers/rest/app/app.xml
index 3ba2ed6..408e36a 100644
--- a/providers/rest/app/app.xml
+++ b/providers/rest/app/app.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <app name="org.onosproject.restsb" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="REST Provider"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
diff --git a/providers/snmp/app/app.xml b/providers/snmp/app/app.xml
index 12ced11..3ca51eb 100644
--- a/providers/snmp/app/app.xml
+++ b/providers/snmp/app/app.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <app name="org.onosproject.snmp" origin="BTI Systems" version="${project.version}"
-     category="default" url="http://onosproject.org"
+     category="default" url="http://onosproject.org" title="SNMP Provider"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>