diff --git a/apps/actn-mdsc/BUCK b/apps/actn-mdsc/BUCK
index 86dce7d..0961e47 100644
--- a/apps/actn-mdsc/BUCK
+++ b/apps/actn-mdsc/BUCK
@@ -7,7 +7,7 @@
 
 onos_app (
     title = 'ACTN MDSC',
-    category = 'Traffic Steering',
+    category = 'Traffic Engineering',
     url = 'http://onosproject.org',
     included_bundles = BUNDLES,
     description = 'ACTN MDSC APP.',
diff --git a/apps/bgprouter/BUCK b/apps/bgprouter/BUCK
index bdb02e4..436c6b6 100644
--- a/apps/bgprouter/BUCK
+++ b/apps/bgprouter/BUCK
@@ -17,7 +17,7 @@
 
 onos_app (
     title = 'BGP Router',
-    category = 'Traffic Steering',
+    category = 'Traffic Engineering',
     url = 'http://onosproject.org',
     description = 'BGP router application.',
     included_bundles = BUNDLES,
diff --git a/apps/cfm/BUCK b/apps/cfm/BUCK
index 687badd..17e3059 100644
--- a/apps/cfm/BUCK
+++ b/apps/cfm/BUCK
@@ -6,7 +6,7 @@
 
 onos_app (
     title = 'Layer 2 Monitoring CFM Application',
-    category = 'Utility',
+    category = 'Monitoring',
     url = 'http://onosproject.org',
     description = 'Layer 2 Monitoring Connectivity Fault Management App',
     included_bundles = BUNDLES,
diff --git a/apps/cord-support/BUCK b/apps/cord-support/BUCK
index e70691927..2caced2 100644
--- a/apps/cord-support/BUCK
+++ b/apps/cord-support/BUCK
@@ -23,7 +23,7 @@
 
 onos_app (
   title = 'CORD Support',
-  category = 'Utility',
+  category = 'Integration',
   url = 'http://onosproject.org',
   description = 'CORD Support application.',
 )
diff --git a/apps/drivermatrix/BUCK b/apps/drivermatrix/BUCK
index 41876bd..fa94a8b 100644
--- a/apps/drivermatrix/BUCK
+++ b/apps/drivermatrix/BUCK
@@ -13,7 +13,7 @@
 
 onos_app (
     title = 'Driver Support Matrix',
-    category = 'Utility',
+    category = 'GUI',
     url = 'http://onosproject.org',
     description = 'Extends the ONOS GUI with a view that allows the operator to visualize ' +
         'the currently loaded drivers.',
diff --git a/apps/evpn-route-service/BUCK b/apps/evpn-route-service/BUCK
index d13d4af..c571d1f 100644
--- a/apps/evpn-route-service/BUCK
+++ b/apps/evpn-route-service/BUCK
@@ -5,7 +5,7 @@
 
 onos_app (
     title = 'EVPN Routing',
-    category = 'Utility',
+    category = 'Traffic Engineering',
     url = 'http://onosproject.org',
     included_bundles = BUNDLES,
 )
diff --git a/apps/evpnopenflow/BUCK b/apps/evpnopenflow/BUCK
index fe1eb9a..47f66a5 100644
--- a/apps/evpnopenflow/BUCK
+++ b/apps/evpnopenflow/BUCK
@@ -24,7 +24,7 @@
 
 onos_app(
   title = 'EVPN OpenFlow',
-  category = 'Traffic Steering',
+  category = 'Traffic Engineering',
   url = 'http://onosproject.org',
   description = 'Ethernet VPN (EVPN) introduces a new model for Ethernet services delivery.' +
   'It enables integrated Layer 2 service over Ethernet with multihoming.',
diff --git a/apps/fwd/BUCK b/apps/fwd/BUCK
index aaf0a34..6a877fd 100644
--- a/apps/fwd/BUCK
+++ b/apps/fwd/BUCK
@@ -14,7 +14,7 @@
 
 onos_app (
     title = 'Reactive Forwarding',
-    category = 'Traffic Steering',
+    category = 'Traffic Engineering',
     url = 'http://onosproject.org',
     description = 'Provisions traffic between end-stations using hop-by-hop flow programming by ' +
         'intercepting packets for which there are currently no matching flow objectives on the ' +
diff --git a/apps/l3vpn/BUCK b/apps/l3vpn/BUCK
index a7da678..d663a65 100644
--- a/apps/l3vpn/BUCK
+++ b/apps/l3vpn/BUCK
@@ -38,7 +38,7 @@
 onos_app(
     app_name = 'org.onosproject.l3vpn',
     title = 'YANG L3VPN',
-    category = 'Traffic Steering',
+    category = 'Traffic Engineering',
     url = 'http://onosproject.org',
     description = 'L3VPN YANG Application',
     required_apps = APPS,
diff --git a/apps/layout/BUCK b/apps/layout/BUCK
index 5d249c4..a24c4ea 100644
--- a/apps/layout/BUCK
+++ b/apps/layout/BUCK
@@ -12,7 +12,7 @@
 
 onos_app (
     title = 'UI Auto-Layout',
-    category = 'Utility',
+    category = 'GUI',
     url = 'http://onosproject.org',
     description = 'Automatically lays out the network topology using roles assigned to each ' +
         'network element via the network configuration. Supports multiple layout variants.',
diff --git a/apps/metrics/BUCK b/apps/metrics/BUCK
index 5f151e4..81ee918 100644
--- a/apps/metrics/BUCK
+++ b/apps/metrics/BUCK
@@ -13,8 +13,8 @@
 )
 
 onos_app (
-    title = 'OpenStack Interface',
-    category = 'Utility',
+    title = 'Topology &amp; Intent Metrics',
+    category = 'Monitoring',
     url = 'http://onosproject.org',
-    description = 'Openstack Interface Application.',
+    description = 'Monitoring of various metrics related to topology mutation and intent programming.',
 )
diff --git a/apps/mfwd/BUCK b/apps/mfwd/BUCK
index 3d27aad..a2ed151 100644
--- a/apps/mfwd/BUCK
+++ b/apps/mfwd/BUCK
@@ -8,7 +8,7 @@
 
 onos_app (
     title = 'Multicast Forwarding',
-    category = 'Traffic Steering',
+    category = 'Traffic Engineering',
     url = 'http://onosproject.org',
     description = 'Multicast forwarding application.',
 )
diff --git a/apps/nodemetrics/BUCK b/apps/nodemetrics/BUCK
index 65c845e..de9c07e 100644
--- a/apps/nodemetrics/BUCK
+++ b/apps/nodemetrics/BUCK
@@ -11,7 +11,7 @@
     '3. The Native libraries like .so, .dll and .dylib are packed as jar along with sigar libs.'+
     '4. If the Native libraries are corrupted because of any reason,'+
     'so, the controller is vulnerable to crash of the entire JVM',
-    category = 'Utility',
+    category = 'Monitoring',
     url = 'http://samsung.com',
     included_bundles = BUNDLES
 )
\ No newline at end of file
diff --git a/apps/odtn/api/BUCK b/apps/odtn/api/BUCK
index 0c5811f..23ac161 100644
--- a/apps/odtn/api/BUCK
+++ b/apps/odtn/api/BUCK
@@ -28,7 +28,7 @@
 onos_app (
     app_name = 'org.onosproject.odtn-api',
     title = 'ODTN API &amp; Utilities Application',
-    category = 'Traffic Steering',
+    category = 'Traffic Engineering',
     url = 'http://onosproject.org',
     description = 'ODTN API &amp; Utilities Application',
     required_apps = APPS,
diff --git a/apps/odtn/service/BUCK b/apps/odtn/service/BUCK
index bcccad1..e85e574 100644
--- a/apps/odtn/service/BUCK
+++ b/apps/odtn/service/BUCK
@@ -43,7 +43,7 @@
 onos_app (
     app_name = 'org.onosproject.odtn-service',
     title = 'ODTN Service Application',
-    category = 'Traffic Steering',
+    category = 'Traffic Engineering',
     url = 'http://onosproject.org',
     description = 'ODTN Service Application',
     required_apps = APPS,
diff --git a/apps/ofagent/BUCK b/apps/ofagent/BUCK
index 23e7ca2..893b0c9 100644
--- a/apps/ofagent/BUCK
+++ b/apps/ofagent/BUCK
@@ -47,7 +47,7 @@
 
 onos_app (
     title = 'OpenFlow Agent',
-    category = 'Traffic Steering',
+    category = 'Traffic Engineering',
     url = 'http://onosproject.org',
     included_bundles = BUNDLES,
     description = 'OpenFlow agent application for virtualization subsystem.',
diff --git a/apps/openroadm/BUCK b/apps/openroadm/BUCK
index 20cb8a1..d529c3b 100644
--- a/apps/openroadm/BUCK
+++ b/apps/openroadm/BUCK
@@ -17,7 +17,7 @@
 onos_app(
   app_name = 'org.onosproject.openroadm',
   title = 'Open ROADM',
-  category = 'Utility',
+  category = 'Optical',
   url = 'http://onosproject.org',
   included_bundles = BUNDLES,
   description = 'Open ROADM Application',
diff --git a/apps/openstacknetworking/BUCK b/apps/openstacknetworking/BUCK
index c1e8532..9b6d8d0 100644
--- a/apps/openstacknetworking/BUCK
+++ b/apps/openstacknetworking/BUCK
@@ -5,7 +5,7 @@
 
 onos_app (
     title = 'OpenStack Networking Application',
-    category = 'Utility',
+    category = 'Integration',
     url = 'https://wiki.onosproject.org/display/ONOS/SONA%3A+DC+Network+Virtualization',
     included_bundles = BUNDLES,
     description = 'SONA Openstack Networking Application.',
diff --git a/apps/openstacknetworkingui/BUCK b/apps/openstacknetworkingui/BUCK
index d077328..ee452bd 100644
--- a/apps/openstacknetworkingui/BUCK
+++ b/apps/openstacknetworkingui/BUCK
@@ -28,7 +28,7 @@
 onos_app (
   app_name = 'org.onosproject.openstacknetworkingui',
   title = 'Openstack Networking UI',
-  category = 'Utility',
+  category = 'GUI',
   url = 'http://onosproject.org',
   description = 'Openstack Networking UI Service',
 )
diff --git a/apps/openstacknode/BUCK b/apps/openstacknode/BUCK
index e1a2628..6abc695 100644
--- a/apps/openstacknode/BUCK
+++ b/apps/openstacknode/BUCK
@@ -5,7 +5,7 @@
 
 onos_app (
     title = 'OpenStack Node Bootstrap',
-    category = 'Utility',
+    category = 'Integration',
     url = 'http://onosproject.org',
     included_bundles = BUNDLES,
     description = 'SONA Openstack Node Bootstrap Application.',
diff --git a/apps/openstacktelemetry/BUCK b/apps/openstacktelemetry/BUCK
index 0dad1e2..4aaf5d6 100644
--- a/apps/openstacktelemetry/BUCK
+++ b/apps/openstacktelemetry/BUCK
@@ -20,7 +20,7 @@
 
 onos_app (
     title = 'OpenStack Telemetry Application',
-    category = 'Utility',
+    category = 'Integration',
     url = 'https://wiki.onosproject.org/display/ONOS/SONA%3A+DC+Network+Virtualization',
     included_bundles = BUNDLES,
     description = 'SONA Openstack Telemetry Application.'
diff --git a/apps/p4-tutorial/mytunnel/BUCK b/apps/p4-tutorial/mytunnel/BUCK
index 5ada8fc..7945c93 100644
--- a/apps/p4-tutorial/mytunnel/BUCK
+++ b/apps/p4-tutorial/mytunnel/BUCK
@@ -14,7 +14,7 @@
 onos_app (
     app_name = 'org.onosproject.p4tutorial.mytunnel',
     title = 'MyTunnel Demo App',
-    category = 'Steering',
+    category = 'Traffic Engineering',
     url = 'http://onosproject.org',
     description = 'Provides forwarding between each pair of hosts via MyTunnel protocol',
     included_bundles = BUNDLES,
diff --git a/apps/packet-stats/BUCK b/apps/packet-stats/BUCK
index e3cf58e..e7c77b1 100644
--- a/apps/packet-stats/BUCK
+++ b/apps/packet-stats/BUCK
@@ -15,7 +15,7 @@
 
 onos_app (
     title = 'Packet Statistics',
-    category = 'Traffic Steering',
+    category = 'Traffic Engineering',
     url = 'http://onosproject.org',
     description = 'Application to calculate the number of packets of different types',
 )
diff --git a/apps/pathpainter/BUCK b/apps/pathpainter/BUCK
index 71eec89..bbb142a 100644
--- a/apps/pathpainter/BUCK
+++ b/apps/pathpainter/BUCK
@@ -11,7 +11,7 @@
 
 onos_app (
     title = 'Path Visualization',
-    category = 'Utility',
+    category = 'GUI',
     url = 'http://onosproject.org',
     description = 'Extends the GUI topology view by adding an overlay that allows the operator ' +
         'to visualize topology paths using various forms of path-finding algorithms such as ' +
diff --git a/apps/pi-demo/ecmp/BUCK b/apps/pi-demo/ecmp/BUCK
index a584b5d..71dcc31 100644
--- a/apps/pi-demo/ecmp/BUCK
+++ b/apps/pi-demo/ecmp/BUCK
@@ -17,7 +17,7 @@
 onos_app (
     app_name = 'org.onosproject.pi-ecmp',
     title = 'PI Demo ECMP Fabric',
-    category = 'Traffic Steering',
+    category = 'Traffic Engineering',
     url = 'http://onosproject.org',
     description = 'Provides ECMP support for a 2-stage clos fabric topology of PI-enabled devices',
     included_bundles = BUNDLES,
diff --git a/apps/pim/BUCK b/apps/pim/BUCK
index 2d36352..3eab5a8 100644
--- a/apps/pim/BUCK
+++ b/apps/pim/BUCK
@@ -21,7 +21,7 @@
 
 onos_app (
     title = 'Protocol Independent Multicast Emulation',
-    category = 'Traffic Steering',
+    category = 'Traffic Engineering',
     url = 'http://onosproject.org',
     description = 'Protocol independent multicast emulation.',
     included_bundles = BUNDLES,
diff --git a/apps/proxyarp/BUCK b/apps/proxyarp/BUCK
index fe57fcb..6923d0d 100644
--- a/apps/proxyarp/BUCK
+++ b/apps/proxyarp/BUCK
@@ -9,7 +9,7 @@
 
 onos_app (
     title = 'Proxy ARP/NDP',
-    category = 'Traffic Steering',
+    category = 'Traffic Engineering',
     url = 'http://onosproject.org',
     description = 'Proxy ARP/NDP application.',
 )
diff --git a/apps/reactive-routing/BUCK b/apps/reactive-routing/BUCK
index 36dd7ad..4157a55 100644
--- a/apps/reactive-routing/BUCK
+++ b/apps/reactive-routing/BUCK
@@ -14,7 +14,7 @@
 
 onos_app (
     title = 'SDN-IP Reactive Routing',
-    category = 'Traffic Steering',
+    category = 'Traffic Engineering',
     url = 'http://onosproject.org',
     description = 'SDN-IP reactive routing application.',
     required_apps = [ 'org.onosproject.intentsynchronizer', 'org.onosproject.sdnip', 'org.onosproject.route-service'],
diff --git a/apps/routeradvertisement/BUCK b/apps/routeradvertisement/BUCK
index f77c16a..c414ec3 100644
--- a/apps/routeradvertisement/BUCK
+++ b/apps/routeradvertisement/BUCK
@@ -17,7 +17,7 @@
 
 onos_app (
     title = 'IPv6 RA Generator',
-    category = 'Traffic Steering',
+    category = 'Traffic Engineering',
     url = 'http://onosproject.org',
     description = 'Application for generating IPv6 RAs',
 )
diff --git a/apps/routing/cpr/BUCK b/apps/routing/cpr/BUCK
index 1d35832..90d8634 100644
--- a/apps/routing/cpr/BUCK
+++ b/apps/routing/cpr/BUCK
@@ -25,7 +25,7 @@
 onos_app (
     app_name = 'org.onosproject.cpr',
     title = 'Control Plane Redirect',
-    category = 'Traffic Steering',
+    category = 'Traffic Engineering',
     url = 'http://onosproject.org',
     description = 'Redirects routing control traffic to a control plane',
     included_bundles = BUNDLES,
diff --git a/apps/routing/fibinstaller/BUCK b/apps/routing/fibinstaller/BUCK
index 337fd28..94bcab2 100644
--- a/apps/routing/fibinstaller/BUCK
+++ b/apps/routing/fibinstaller/BUCK
@@ -25,7 +25,7 @@
 onos_app (
     app_name = 'org.onosproject.fibinstaller',
     title = 'FIB Installer',
-    category = 'Traffic Steering',
+    category = 'Traffic Engineering',
     url = 'http://onosproject.org',
     description = 'Installs routing rules into switches',
     included_bundles = BUNDLES,
diff --git a/apps/scalablegateway/BUCK b/apps/scalablegateway/BUCK
index 362c431..a7a6d74 100644
--- a/apps/scalablegateway/BUCK
+++ b/apps/scalablegateway/BUCK
@@ -13,7 +13,7 @@
 
 onos_app (
   title = 'Scalable Gateway',
-  category = 'Traffic Steering',
+  category = 'Traffic Engineering',
   url = 'http://onosproject.org',
   description = 'Scalable gateway service',
 )
diff --git a/apps/sdnip/BUCK b/apps/sdnip/BUCK
index fd7aeda..4a807cf 100644
--- a/apps/sdnip/BUCK
+++ b/apps/sdnip/BUCK
@@ -28,7 +28,7 @@
 
 onos_app (
   title = 'SDN-IP',
-  category = 'Traffic Steering',
+  category = 'Traffic Engineering',
   url = 'http://onosproject.org',
   included_bundles = BUNDLES,
   description = 'SDN-IP peering application',
diff --git a/apps/segmentrouting/BUCK b/apps/segmentrouting/BUCK
index c03ace3..1b3990f 100644
--- a/apps/segmentrouting/BUCK
+++ b/apps/segmentrouting/BUCK
@@ -5,7 +5,7 @@
 
 onos_app (
     title = 'Segment Routing',
-    category = 'Traffic Steering',
+    category = 'Traffic Engineering',
     url = 'http://onosproject.org',
     included_bundles = BUNDLES,
     description = 'Segment routing application.',
diff --git a/apps/simplefabric/BUCK b/apps/simplefabric/BUCK
index b215c46..177b953 100644
--- a/apps/simplefabric/BUCK
+++ b/apps/simplefabric/BUCK
@@ -24,7 +24,7 @@
 
 onos_app (
   title = 'SimpleFabric',
-  category = 'Traffic Steering',
+  category = 'Traffic Engineering',
   url = 'http://onosproject.org',
   included_bundles = BUNDLES,
   description = 'Simple Fabric application',
diff --git a/apps/t3/BUCK b/apps/t3/BUCK
index bb18951..c64641c 100644
--- a/apps/t3/BUCK
+++ b/apps/t3/BUCK
@@ -25,7 +25,7 @@
 
 onos_app (
     title = 'Trellis Troubleshooting Toolkit',
-    category = 'Utilities',
+    category = 'Monitoring',
     url = 'https://wiki.opencord.org/pages/viewpage.action?pageId=4456974',
     description = 'Provides static analysis of flows and groups ' +
     'to determine the possible paths a packet may take.',
diff --git a/apps/test/cluster-ha/BUCK b/apps/test/cluster-ha/BUCK
index feb9b6b..d1ebbc9 100644
--- a/apps/test/cluster-ha/BUCK
+++ b/apps/test/cluster-ha/BUCK
@@ -10,7 +10,7 @@
 )
 onos_app (
     title = 'Cluster HA Test',
-    category = 'Cluster Test Utility',
+    category = 'Test Utility',
     url = 'http://onosproject.org',
     description = 'Test for ONOS Cluster HA',
 )
diff --git a/apps/tetopology/BUCK b/apps/tetopology/BUCK
index fb11ee5..0d91b2d 100644
--- a/apps/tetopology/BUCK
+++ b/apps/tetopology/BUCK
@@ -6,7 +6,7 @@
 onos_app (
     app_name = 'org.onosproject.tetopology',
     title = 'TE Topology Core',
-    category = 'Traffic Steering',
+    category = 'Traffic Engineering',
     url = 'http://onosproject.org',
     description = 'Application to create and manage hierarchical TE topologies.',
     included_bundles = BUNDLES,
diff --git a/apps/tetunnel/BUCK b/apps/tetunnel/BUCK
index c1af844..73065c2 100644
--- a/apps/tetunnel/BUCK
+++ b/apps/tetunnel/BUCK
@@ -6,7 +6,7 @@
 onos_app (
     app_name = 'org.onosproject.tetunnel',
     title = 'TE Tunnel Core',
-    category = 'Traffic Steering',
+    category = 'Traffic Engineering',
     url = 'http://onosproject.org',
     description = 'Application to create and manage TE tunnels.',
     included_bundles = BUNDLES,
diff --git a/apps/virtualbng/BUCK b/apps/virtualbng/BUCK
index 9845b93..036ce08 100644
--- a/apps/virtualbng/BUCK
+++ b/apps/virtualbng/BUCK
@@ -16,7 +16,7 @@
 
 onos_app (
     title = 'Virtual Broadband Gateway',
-    category = 'Traffic Steering',
+    category = 'Traffic Engineering',
     url = 'http://onosproject.org',
     description = 'A virtual Broadband Network Gateway(BNG) application.',
 )
diff --git a/apps/vpls/BUCK b/apps/vpls/BUCK
index d089ea2..d07376f 100644
--- a/apps/vpls/BUCK
+++ b/apps/vpls/BUCK
@@ -22,7 +22,7 @@
 
 onos_app (
     title = 'VLAN L2 Broadcast Network',
-    category = 'Traffic Steering',
+    category = 'Traffic Engineering',
     url = 'http://onosproject.org',
     description = 'Application to create L2 broadcast network using VLAN.',
     required_apps = [ 'org.onosproject.intentsynchronizer' ],
diff --git a/apps/vrouter/BUCK b/apps/vrouter/BUCK
index db2f9c8..bc51d54 100644
--- a/apps/vrouter/BUCK
+++ b/apps/vrouter/BUCK
@@ -15,7 +15,7 @@
 
 onos_app (
     title = 'Virtual Router',
-    category = 'Traffic Steering',
+    category = 'Traffic Engineering',
     url = 'http://onosproject.org',
     included_bundles = BUNDLES,
     description = 'Virtual router (vRouter) application.',
diff --git a/apps/vtn/BUCK b/apps/vtn/BUCK
index 3cb6dd3..3afd56d 100644
--- a/apps/vtn/BUCK
+++ b/apps/vtn/BUCK
@@ -8,6 +8,7 @@
 onos_app (
   title = 'OPNFV',
   url = 'http://onosproject.org',
+  category = 'Integration',
   included_bundles = BUNDLES,
   description = 'ONOS framework applications',
 )
diff --git a/apps/yang-gui/BUCK b/apps/yang-gui/BUCK
index 13d92d9..7e971f4 100644
--- a/apps/yang-gui/BUCK
+++ b/apps/yang-gui/BUCK
@@ -14,7 +14,7 @@
 
 onos_app (
     title = 'YANG Runtime GUI',
-    category = 'Utility',
+    category = 'GUI',
     url = 'http://onosproject.org',
     description = 'Adds GUI extension that allows the operator to view the list of currently ' +
         'registered YANG models, and their YANG sources. It also provides means for compiling ' +