diff --git a/apps/aaa/app.xml b/apps/aaa/app.xml
index 464e9ec..e324551 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" title="ONOS Auth App"
+     category="Security" url="http://onosproject.org" title="Authentication App"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
diff --git a/apps/acl/pom.xml b/apps/acl/pom.xml
index b5af2a3..ac8f0a0 100644
--- a/apps/acl/pom.xml
+++ b/apps/acl/pom.xml
@@ -40,8 +40,8 @@
     <properties>
         <onos.app.name>org.onosproject.acl</onos.app.name>
         <onos.app.origin>DLUT</onos.app.origin>
-        <onos.app.title>ONOS ACL App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.title>ACL App</onos.app.title>
+        <onos.app.category>Security</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>ONOS ACL application.</onos.app.readme>
 
diff --git a/apps/bgprouter/app.xml b/apps/bgprouter/app.xml
index e79fe79..327d237 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" title="BGP router App"
+     category="Traffic Steering" 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/cip/pom.xml b/apps/cip/pom.xml
index 263b8c9..3078af1 100644
--- a/apps/cip/pom.xml
+++ b/apps/cip/pom.xml
@@ -33,7 +33,7 @@
 
     <properties>
         <onos.app.name>org.onosproject.cip</onos.app.name>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Utility</onos.app.category>
         <onos.app.title>Cluster IP Alias App</onos.app.title>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Cluster IP alias application.</onos.app.readme>
diff --git a/apps/cordfabric/pom.xml b/apps/cordfabric/pom.xml
index 7ad3259..95fe672 100644
--- a/apps/cordfabric/pom.xml
+++ b/apps/cordfabric/pom.xml
@@ -33,7 +33,7 @@
     <properties>
         <onos.app.name>org.onosproject.cordfabric</onos.app.name>
         <onos.app.title>CORD Fabric App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Traffic Steering</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Simple fabric application for CORD.</onos.app.readme>
         <web.context>/onos/cordfabric</web.context>
diff --git a/apps/cordmcast/pom.xml b/apps/cordmcast/pom.xml
index 9c338b1..01cbaad 100644
--- a/apps/cordmcast/pom.xml
+++ b/apps/cordmcast/pom.xml
@@ -33,7 +33,9 @@
 
     <properties>
         <onos.app.name>org.onosproject.cordmcast</onos.app.name>
+        <onos.app.category>Traffic Steering</onos.app.category>
         <onos.app.title>CORD Multicast App</onos.app.title>
+        <onos.app.url>http://opencord.org</onos.app.url>
     </properties>
 
     <dependencies>
diff --git a/apps/cordvtn/app.xml b/apps/cordvtn/app.xml
index 62084f0..8f3e9e2 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" title="CORD Virtual Tenant Network"
+        category="Traffic Steering" 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/cpman/app/app.xml b/apps/cpman/app/app.xml
index f832d8d..329ebd6 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" title="Control Plane Manager"
+     category="Monitoring" url="http://onosproject.org" title="Control Plane Management App"
      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 26b4d78..a7ee69b 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" title="DHCP Server REST API"
+     category="Utility" url="http://onosproject.org" title="DHCP App"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
diff --git a/apps/drivermatrix/pom.xml b/apps/drivermatrix/pom.xml
index 9837cea..3d87a43 100644
--- a/apps/drivermatrix/pom.xml
+++ b/apps/drivermatrix/pom.xml
@@ -33,8 +33,8 @@
 
     <properties>
         <onos.app.name>org.onosproject.drivermatrix</onos.app.name>
-        <onos.app.title>Driver Behaviour Support Matrix</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.title>Driver Behaviour Support Matrix App</onos.app.title>
+        <onos.app.category>Utility</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Driver behaviour support matrix.</onos.app.readme>
     </properties>
diff --git a/apps/events/pom.xml b/apps/events/pom.xml
index 8d00285..c52c9ea 100644
--- a/apps/events/pom.xml
+++ b/apps/events/pom.xml
@@ -32,8 +32,8 @@
 
     <properties>
         <onos.app.name>org.onosproject.events</onos.app.name>
-        <onos.app.title>ONOS Event History App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.title>Event History App</onos.app.title>
+        <onos.app.category>Utility</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>ONOS event history display application.</onos.app.readme>
     </properties>
diff --git a/apps/faultmanagement/app/app.xml b/apps/faultmanagement/app/app.xml
index 74ed710..9276b82 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" title="ONOS Fault Mgmt App"
+     category="Monitoring" url="https://wiki.onosproject.org/display/ONOS/Fault+Management" title="Fault Management App"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
diff --git a/apps/flowanalyzer/pom.xml b/apps/flowanalyzer/pom.xml
index 686711f..9ad72c0 100644
--- a/apps/flowanalyzer/pom.xml
+++ b/apps/flowanalyzer/pom.xml
@@ -33,8 +33,8 @@
 
     <properties>
         <onos.app.name>org.onosproject.flowanalyzer</onos.app.name>
-        <onos.app.title>Flow Space Analyzer</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.title>Flow Space Analysis App</onos.app.title>
+        <onos.app.category>Monitoring</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Simple flow space analyzer.</onos.app.readme>
     </properties>
diff --git a/apps/fwd/pom.xml b/apps/fwd/pom.xml
index 1b1c9be..923ccdd 100644
--- a/apps/fwd/pom.xml
+++ b/apps/fwd/pom.xml
@@ -34,7 +34,7 @@
     <properties>
         <onos.app.name>org.onosproject.fwd</onos.app.name>
         <onos.app.title>Reactive Forwarding App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Traffic Steering</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Reactive forwarding application using flow subsystem.</onos.app.readme>
     </properties>
diff --git a/apps/igmp/pom.xml b/apps/igmp/pom.xml
index 90759d8..aafa5a7 100644
--- a/apps/igmp/pom.xml
+++ b/apps/igmp/pom.xml
@@ -34,7 +34,7 @@
     <properties>
         <onos.app.name>org.onosproject.igmp</onos.app.name>
         <onos.app.title>IGMP App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Traffic Steering</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>IGMP implementation.</onos.app.readme>
     </properties>
diff --git a/apps/iptopology-api/pom.xml b/apps/iptopology-api/pom.xml
index d6bc64e..3b8f484 100644
--- a/apps/iptopology-api/pom.xml
+++ b/apps/iptopology-api/pom.xml
@@ -31,7 +31,7 @@
     <properties>
         <onos.app.name>org.onosproject.iptopology-api</onos.app.name>
         <onos.app.title>IP Layer Topology API</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Test</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>IP layer topology API.</onos.app.readme>
     </properties>
diff --git a/apps/metrics/pom.xml b/apps/metrics/pom.xml
index 5d8bbaa..8d4a682 100644
--- a/apps/metrics/pom.xml
+++ b/apps/metrics/pom.xml
@@ -34,7 +34,7 @@
     <properties>
         <onos.app.name>org.onosproject.metrics</onos.app.name>
         <onos.app.title>Performance Metrics App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Monitoring</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Performance metrics collection application.</onos.app.readme>
     </properties>
diff --git a/apps/mfwd/pom.xml b/apps/mfwd/pom.xml
index 2c75aef..92e18cf 100644
--- a/apps/mfwd/pom.xml
+++ b/apps/mfwd/pom.xml
@@ -34,7 +34,7 @@
     <properties>
         <onos.app.name>org.onosproject.mfwd</onos.app.name>
         <onos.app.title>Multicast Forwarding App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Traffic Steering</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Multicast forwarding application.</onos.app.readme>
     </properties>
diff --git a/apps/mlb/pom.xml b/apps/mlb/pom.xml
index c130029..7c89108 100644
--- a/apps/mlb/pom.xml
+++ b/apps/mlb/pom.xml
@@ -34,7 +34,7 @@
     <properties>
         <onos.app.name>org.onosproject.mlb</onos.app.name>
         <onos.app.title>Mastership Load Balancer App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Utility</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>
             Application that balances mastership among nodes.
diff --git a/apps/mobility/pom.xml b/apps/mobility/pom.xml
index 00054b0..d84382b 100644
--- a/apps/mobility/pom.xml
+++ b/apps/mobility/pom.xml
@@ -34,7 +34,7 @@
     <properties>
         <onos.app.name>org.onosproject.mobility</onos.app.name>
         <onos.app.title>Host Mobility App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Utility</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Host mobility application.</onos.app.readme>
     </properties>
diff --git a/apps/olt/app/app.xml b/apps/olt/app/app.xml
index fc4b029..2b69712 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" title="ONOS OLT App"
+     category="Traffic Steering" url="http://onosproject.org" title="Optical Line Terminal 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 9ff3ba2..516636c 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" title="Openstack Interface App"
+     category="Utility" 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/openstacknetworking/app/app.xml b/apps/openstacknetworking/app/app.xml
index 4a5039a..c68cfc9 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" title="Openstack Networking App"
+     category="Utility" 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/openstacknode/pom.xml b/apps/openstacknode/pom.xml
index 884619b..2ea8af2 100644
--- a/apps/openstacknode/pom.xml
+++ b/apps/openstacknode/pom.xml
@@ -34,8 +34,8 @@
 
     <properties>
         <onos.app.name>org.onosproject.openstacknode</onos.app.name>
-        <onos.app.title>SONA Openstack Node Bootstrap App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.title>OpenStack Node Bootstrap App</onos.app.title>
+        <onos.app.category>Utility</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>SONA Openstack Node Bootstrap Application</onos.app.readme>
         <onos.app.requires>
diff --git a/apps/optical/pom.xml b/apps/optical/pom.xml
index ee9d78a..5226490 100644
--- a/apps/optical/pom.xml
+++ b/apps/optical/pom.xml
@@ -34,7 +34,7 @@
     <properties>
         <onos.app.name>org.onosproject.optical</onos.app.name>
         <onos.app.title>Packet/Optical Use-Case App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Traffic Steering</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Packet/Optical use-case application.</onos.app.readme>
     </properties>
diff --git a/apps/pathpainter/pom.xml b/apps/pathpainter/pom.xml
index 053bbed..57457f0 100644
--- a/apps/pathpainter/pom.xml
+++ b/apps/pathpainter/pom.xml
@@ -34,9 +34,8 @@
     <properties>
         <onos.app.name>org.onosproject.pathpainter</onos.app.name>
         <onos.app.title>Path Visualization App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Utility</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.readme>
             Allows the user to visualize different types of paths between
             network entities such as switches and hosts.
diff --git a/apps/pcep-api/pom.xml b/apps/pcep-api/pom.xml
index c9be816..c9eebac 100644
--- a/apps/pcep-api/pom.xml
+++ b/apps/pcep-api/pom.xml
@@ -31,7 +31,7 @@
     <properties>
         <onos.app.name>org.onosproject.pcep-api</onos.app.name>
         <onos.app.title>PCEP Protocol API</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Traffic Steering</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>PCEP protocol API.</onos.app.readme>
     </properties>
diff --git a/apps/pim/pom.xml b/apps/pim/pom.xml
index 058be7d..68f331c 100644
--- a/apps/pim/pom.xml
+++ b/apps/pim/pom.xml
@@ -33,8 +33,8 @@
 
     <properties>
         <onos.app.name>org.onosproject.pim</onos.app.name>
-        <onos.app.title>Protocol Independent Multicast Emulation</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.title>Protocol Independent Multicast Emulation App</onos.app.title>
+        <onos.app.category>Traffic Steering</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Protocol independent multicast emulation.</onos.app.readme>
     </properties>
diff --git a/apps/proxyarp/pom.xml b/apps/proxyarp/pom.xml
index 0bd4824..4e92b2d 100644
--- a/apps/proxyarp/pom.xml
+++ b/apps/proxyarp/pom.xml
@@ -34,7 +34,7 @@
     <properties>
         <onos.app.name>org.onosproject.proxyarp</onos.app.name>
         <onos.app.title>Proxy ARP/NDP App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Traffic Steering</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Proxy ARP/NDP application.</onos.app.readme>
     </properties>
diff --git a/apps/reactive-routing/pom.xml b/apps/reactive-routing/pom.xml
index e85f3ca..28a2f49 100644
--- a/apps/reactive-routing/pom.xml
+++ b/apps/reactive-routing/pom.xml
@@ -34,7 +34,7 @@
     <properties>
         <onos.app.name>org.onosproject.reactive.routing</onos.app.name>
         <onos.app.title>SDN-IP Reactive Routing App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Traffic Steering</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>SDN-IP reactive routing application.</onos.app.readme>
     </properties>
diff --git a/apps/routing-api/pom.xml b/apps/routing-api/pom.xml
index d1c3e0c..682f5d3 100644
--- a/apps/routing-api/pom.xml
+++ b/apps/routing-api/pom.xml
@@ -33,7 +33,7 @@
     <properties>
         <onos.app.name>org.onosproject.routing-api</onos.app.name>
         <onos.app.title>Routing API</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Traffic Steering</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>API for routing applications.</onos.app.readme>
     </properties>
diff --git a/apps/routing/pom.xml b/apps/routing/pom.xml
index 1fb132f..68556ca 100644
--- a/apps/routing/pom.xml
+++ b/apps/routing/pom.xml
@@ -33,7 +33,7 @@
     <properties>
         <onos.app.name>org.onosproject.routing</onos.app.name>
         <onos.app.title>SDN-IP Routing App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Traffic Steering</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>SDN-IP routing application.</onos.app.readme>
     </properties>
diff --git a/apps/sdnip/app.xml b/apps/sdnip/app.xml
index e05108a..050ab66 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" title="SDN-IP App"
+     category="Traffic Steering" 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/segmentrouting/pom.xml b/apps/segmentrouting/pom.xml
index c634de4..c21ea9a 100644
--- a/apps/segmentrouting/pom.xml
+++ b/apps/segmentrouting/pom.xml
@@ -33,7 +33,7 @@
     <properties>
         <onos.app.name>org.onosproject.segmentrouting</onos.app.name>
         <onos.app.title>Segment Routing App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Traffic Steering</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Segment routing application.</onos.app.readme>
         <web.context>/onos/segmentrouting</web.context>
diff --git a/apps/test/demo/pom.xml b/apps/test/demo/pom.xml
index 423d371..98effd5 100644
--- a/apps/test/demo/pom.xml
+++ b/apps/test/demo/pom.xml
@@ -33,8 +33,8 @@
 
     <properties>
         <onos.app.name>org.onosproject.demo</onos.app.name>
-        <onos.app.title>Flow Throughput Demo</onos.app.title>
-        <onos.app.category>test</onos.app.category>
+        <onos.app.title>Flow Throughput Demo App</onos.app.title>
+        <onos.app.category>Test</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Flow throughput test application.</onos.app.readme>
         <web.context>/onos/demo</web.context>
diff --git a/apps/test/distributed-primitives/pom.xml b/apps/test/distributed-primitives/pom.xml
index 5915e9b..44b5fbb 100644
--- a/apps/test/distributed-primitives/pom.xml
+++ b/apps/test/distributed-primitives/pom.xml
@@ -35,7 +35,7 @@
     <properties>
         <onos.app.name>org.onosproject.distributedprimitives</onos.app.name>
         <onos.app.title>Distributed Primitives Test App</onos.app.title>
-        <onos.app.category>test</onos.app.category>
+        <onos.app.category>Test</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>ONOS app to test distributed primitives.</onos.app.readme>
     </properties>
diff --git a/apps/test/election/pom.xml b/apps/test/election/pom.xml
index b18b6c5..8637036 100644
--- a/apps/test/election/pom.xml
+++ b/apps/test/election/pom.xml
@@ -35,7 +35,7 @@
     <properties>
         <onos.app.name>org.onosproject.election</onos.app.name>
         <onos.app.title>Master Election Test App</onos.app.title>
-        <onos.app.category>test</onos.app.category>
+        <onos.app.category>Test</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Master election test application.</onos.app.readme>
     </properties>
diff --git a/apps/test/intent-perf/pom.xml b/apps/test/intent-perf/pom.xml
index 07c81f1..769ecaa 100644
--- a/apps/test/intent-perf/pom.xml
+++ b/apps/test/intent-perf/pom.xml
@@ -34,7 +34,7 @@
     <properties>
         <onos.app.name>org.onosproject.intentperf</onos.app.name>
         <onos.app.title>Intent Performance Test App</onos.app.title>
-        <onos.app.category>test</onos.app.category>
+        <onos.app.category>Test</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>intent performance test application.</onos.app.readme>
     </properties>
diff --git a/apps/test/loadtest/pom.xml b/apps/test/loadtest/pom.xml
index 144f672..caf7ca0 100644
--- a/apps/test/loadtest/pom.xml
+++ b/apps/test/loadtest/pom.xml
@@ -35,7 +35,7 @@
     <properties>
         <onos.app.name>org.onosproject.loadtest</onos.app.name>
         <onos.app.title>Distributed Load Test App</onos.app.title>
-        <onos.app.category>test</onos.app.category>
+        <onos.app.category>Test</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Distributed consensus load test application.</onos.app.readme>
     </properties>
diff --git a/apps/test/messaging-perf/pom.xml b/apps/test/messaging-perf/pom.xml
index 2c0869a..307bfac 100644
--- a/apps/test/messaging-perf/pom.xml
+++ b/apps/test/messaging-perf/pom.xml
@@ -34,7 +34,7 @@
     <properties>
         <onos.app.name>org.onosproject.messagingperf</onos.app.name>
         <onos.app.title>Messaging Performance Test App</onos.app.title>
-        <onos.app.category>test</onos.app.category>
+        <onos.app.category>Test</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Messaging performance test application.</onos.app.readme>
     </properties>
diff --git a/apps/virtualbng/pom.xml b/apps/virtualbng/pom.xml
index ca16942..c9ffd50 100644
--- a/apps/virtualbng/pom.xml
+++ b/apps/virtualbng/pom.xml
@@ -34,7 +34,7 @@
     <properties>
         <onos.app.name>org.onosproject.virtualbng</onos.app.name>
         <onos.app.title>Virtual Broadband Gateway App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Utility</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Virtual broadband gateway application.</onos.app.readme>
         <web.context>/onos/virtualbng</web.context>
diff --git a/apps/vpls/pom.xml b/apps/vpls/pom.xml
index e0ffe7c..3c41274 100644
--- a/apps/vpls/pom.xml
+++ b/apps/vpls/pom.xml
@@ -33,7 +33,9 @@
 
     <properties>
         <onos.app.name>org.onosproject.vpls</onos.app.name>
+        <onos.app.category>Traffic Steering</onos.app.category>
         <onos.app.title>VLAN L2 Broadcast Network App</onos.app.title>
+        <onos.app.url>http://onosproject.org</onos.app.url>
     </properties>
 
     <dependencies>
diff --git a/apps/vrouter/app.xml b/apps/vrouter/app.xml
index 2a11e87..1a86912 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" title="Virtual Router App"
+     category="Traffic Steering" 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/vtn/app/app.xml b/apps/vtn/app/app.xml
index b74c585..3bec64d 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" title="ONOS Framework App"
+     category="Utility" url="http://onosproject.org" title="OPNFV App"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
diff --git a/apps/xos-integration/pom.xml b/apps/xos-integration/pom.xml
index ee33f6e..30b43d1 100644
--- a/apps/xos-integration/pom.xml
+++ b/apps/xos-integration/pom.xml
@@ -34,7 +34,7 @@
     <properties>
         <onos.app.name>org.onosproject.xosintegration</onos.app.name>
         <onos.app.title>ONOS XOS Integration App</onos.app.title>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Utility</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>ONOS XOS integration application.</onos.app.readme>
     </properties>