diff --git a/apps/acl/BUCK b/apps/acl/BUCK
index 064c678..45b13eb 100644
--- a/apps/acl/BUCK
+++ b/apps/acl/BUCK
@@ -19,7 +19,7 @@
 )
 
 onos_app (
-    title = 'ACL App',
+    title = 'Access Control Lists',
     category = 'Security',
     url = 'http://onosproject.org',
     description = 'ONOS ACL application.',
diff --git a/apps/bgprouter/BUCK b/apps/bgprouter/BUCK
index 6c94749..bdb02e4 100644
--- a/apps/bgprouter/BUCK
+++ b/apps/bgprouter/BUCK
@@ -16,7 +16,7 @@
 )
 
 onos_app (
-    title = 'BGP Router App',
+    title = 'BGP Router',
     category = 'Traffic Steering',
     url = 'http://onosproject.org',
     description = 'BGP router application.',
diff --git a/apps/castor/BUCK b/apps/castor/BUCK
index ff3eb9d..9b305ec 100644
--- a/apps/castor/BUCK
+++ b/apps/castor/BUCK
@@ -28,14 +28,14 @@
   deps = COMPILE_DEPS,
   test_deps = TEST_DEPS,
   web_context = '/onos/castor',
-  api_title = 'Castor App',
+  api_title = 'Castor',
   api_version = '1.0',
-  api_description = 'REST API for Castor App',
+  api_description = 'REST API for Castor',
   api_package = 'org.onosproject.castor',
 )
 
 onos_app (
-  title = 'Castor App',
+  title = 'Castor',
   category = 'Utility',
   url = 'http://onosproject.org',
   included_bundles = BUNDLES,
diff --git a/apps/cip/BUCK b/apps/cip/BUCK
index 9afbab3..a7590d9 100644
--- a/apps/cip/BUCK
+++ b/apps/cip/BUCK
@@ -7,7 +7,7 @@
 )
 
 onos_app (
-    title = 'Cluster IP alias App',
+    title = 'Cluster IP Alias',
     category = 'Utility',
     url = 'http://onosproject.org',
     description = 'ONOS Cluster IP alias application.',
diff --git a/apps/config/BUCK b/apps/config/BUCK
index 8a8bbb8..7b2a79b 100644
--- a/apps/config/BUCK
+++ b/apps/config/BUCK
@@ -16,9 +16,12 @@
 )
 
 onos_app (
-    title = 'Dynamic Config App',
+    title = 'Dynamic Configuration',
     category = 'Utility',
     url = 'http://onosproject.org',
-    description = 'Application to support the Dynamic configuration service and store.',
+    description = 'Provides means to track and distribute service and device configuration data ' +
+        'throughout the ONOS cluster. It works with the YANG runtime to ensure that the tracked ' +
+        'data adheres to the registered YANG models. Applications can traverse and access this ' +
+        'data which is organized in a logically unified tree.<p/>(Under development)',
     required_apps = APPS,
 )
diff --git a/apps/cord-support/BUCK b/apps/cord-support/BUCK
index 2893bea..e70691927 100644
--- a/apps/cord-support/BUCK
+++ b/apps/cord-support/BUCK
@@ -15,14 +15,14 @@
   deps = COMPILE_DEPS,
   test_deps = TEST_DEPS,
   web_context = '/onos/cord-support',
-  api_title = 'CORD Support App',
+  api_title = 'CORD Support',
   api_version = '1.0',
   api_description = 'REST API for CORD inquiry to ONOS topology',
   api_package = 'org.onosproject.cordsupport',
 )
 
 onos_app (
-  title = 'CORD Support App',
+  title = 'CORD Support',
   category = 'Utility',
   url = 'http://onosproject.org',
   description = 'CORD Support application.',
diff --git a/apps/cpman/app/BUCK b/apps/cpman/app/BUCK
index 9b20519..936c9ff 100644
--- a/apps/cpman/app/BUCK
+++ b/apps/cpman/app/BUCK
@@ -31,15 +31,15 @@
     deps = COMPILE_DEPS,
     test_deps = TEST_DEPS,
     web_context = '/onos/cpman',
-    api_title = 'Control Plane Manager App API',
+    api_title = 'Control Plane Manager API',
     api_version = '1.0',
-    api_description = 'REST API for Control Plane Manager App',
+    api_description = 'REST API for Control Plane Manager',
     api_package = 'org.onosproject.cpman.rest',
 )
 
 onos_app (
     app_name = 'org.onosproject.cpman',
-    title = 'Control Plane Manager application',
+    title = 'Control Plane Manager',
     category = 'Monitoring',
     url = 'http://onosproject.org',
     description = 'Control Plane Management application for monitoring the health of the ONOS cluster',
diff --git a/apps/dhcp/BUCK b/apps/dhcp/BUCK
index 1bd1876..fbbb126 100644
--- a/apps/dhcp/BUCK
+++ b/apps/dhcp/BUCK
@@ -4,7 +4,7 @@
 ]
 
 onos_app (
-  title = 'DHCP Server App',
+  title = 'DHCP Server',
   category = 'Utility',
   url = 'http://onosproject.org',
   included_bundles = BUNDLES,
diff --git a/apps/dhcp/app/BUCK b/apps/dhcp/app/BUCK
index bb5c7d6..7dd3a0e 100644
--- a/apps/dhcp/app/BUCK
+++ b/apps/dhcp/app/BUCK
@@ -18,8 +18,8 @@
     deps = COMPILE_DEPS,
     test_deps = TEST_DEPS,
     web_context = '/onos/dhcp',
-    api_title = 'DHCP Server App',
+    api_title = 'DHCP Server',
     api_version = '1.0',
-    api_description = 'REST API for DHCP Server App',
+    api_description = 'REST API for DHCP Server',
     api_package = 'org.onosproject.dhcp.rest',
 )
diff --git a/apps/dhcprelay/BUCK b/apps/dhcprelay/BUCK
index cc42956..c1829b3 100644
--- a/apps/dhcprelay/BUCK
+++ b/apps/dhcprelay/BUCK
@@ -21,7 +21,7 @@
 
 onos_app (
     app_name = 'org.onosproject.dhcprelay',
-    title = 'DHCP Relay Agent App',
+    title = 'DHCP Relay Agent',
     category = 'Utility',
     url = 'http://onosproject.org',
     description = 'DHCP Relay Agent Application.',
diff --git a/apps/drivermatrix/BUCK b/apps/drivermatrix/BUCK
index b439e73..41876bd 100644
--- a/apps/drivermatrix/BUCK
+++ b/apps/drivermatrix/BUCK
@@ -15,6 +15,7 @@
     title = 'Driver Support Matrix',
     category = 'Utility',
     url = 'http://onosproject.org',
-    description = 'Driver behaviour support matrix.',
+    description = 'Extends the ONOS GUI with a view that allows the operator to visualize ' +
+        'the currently loaded drivers.',
 )
 
diff --git a/apps/events/BUCK b/apps/events/BUCK
index 54fa135..52fd3a9 100644
--- a/apps/events/BUCK
+++ b/apps/events/BUCK
@@ -13,8 +13,10 @@
 )
 
 onos_app (
-    title = 'Event History App',
-    category = 'Utility',
+    title = 'Event History',
+    category = 'Test Utility',
     url = 'http://onosproject.org',
-    description = 'App to display ONOS event history.',
+    description = 'Allows recording and tracking of otherwise ephemeral ONOS core events. ' +
+        'It is primarily aimed for supporting various system tests and to assure that expected ' +
+        'events are raised and broadcast to applications that have requested them.',
 )
diff --git a/apps/evpn-route-service/BUCK b/apps/evpn-route-service/BUCK
index 5c8b037..d13d4af 100644
--- a/apps/evpn-route-service/BUCK
+++ b/apps/evpn-route-service/BUCK
@@ -4,7 +4,7 @@
 ]
 
 onos_app (
-    title = 'EVPN Routing App',
+    title = 'EVPN Routing',
     category = 'Utility',
     url = 'http://onosproject.org',
     included_bundles = BUNDLES,
diff --git a/apps/evpnopenflow/BUCK b/apps/evpnopenflow/BUCK
index 69e881f..fe1eb9a 100644
--- a/apps/evpnopenflow/BUCK
+++ b/apps/evpnopenflow/BUCK
@@ -23,7 +23,7 @@
 )
 
 onos_app(
-  title = 'EVPN OpenFlow App',
+  title = 'EVPN OpenFlow',
   category = 'Traffic Steering',
   url = 'http://onosproject.org',
   description = 'Ethernet VPN (EVPN) introduces a new model for Ethernet services delivery.' +
diff --git a/apps/faultmanagement/BUCK b/apps/faultmanagement/BUCK
index 4553a5f..3156894 100644
--- a/apps/faultmanagement/BUCK
+++ b/apps/faultmanagement/BUCK
@@ -6,7 +6,7 @@
 ]
 
 onos_app (
-  title = 'Fault Management App',
+  title = 'Fault Management',
   description = 'ONOS fault management application',
   category = 'Monitoring',
   url = 'https://wiki.onosproject.org/display/ONOS/Fault+Management',
diff --git a/apps/flowanalyzer/BUCK b/apps/flowanalyzer/BUCK
index b09e7d4..2f5461f 100644
--- a/apps/flowanalyzer/BUCK
+++ b/apps/flowanalyzer/BUCK
@@ -16,7 +16,7 @@
 )
 
 onos_app (
-    title = 'Flow Space Analysis App',
+    title = 'Flow Space Analysis',
     category = 'Monitoring',
     url = 'http://onosproject.org',
     description = 'Simple flow space analyzer.',
diff --git a/apps/fwd/BUCK b/apps/fwd/BUCK
index 7893313..aaf0a34 100644
--- a/apps/fwd/BUCK
+++ b/apps/fwd/BUCK
@@ -13,8 +13,15 @@
 )
 
 onos_app (
-    title = 'Reactive Forwarding App',
+    title = 'Reactive Forwarding',
     category = 'Traffic Steering',
     url = 'http://onosproject.org',
-    description = 'Reactive forwarding application using flow objective subsystem.',
+    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 ' +
+        'data plane. The paths paved in this manner are short-lived, i.e. they expire a few ' +
+        'seconds after the flow on whose behalf they were programmed stops.\n\n' +
+        'The application relies on the ONOS path service to compute the shortest paths. ' +
+        'In the event of negative topology events (link loss, device disconnect, etc.), ' +
+        'the application will proactively invalidate any paths that it had programmed to lead ' +
+        'through the resources that are no longer available.',
 )
diff --git a/apps/gangliametrics/BUCK b/apps/gangliametrics/BUCK
index 8f9d763..3dc67f4 100644
--- a/apps/gangliametrics/BUCK
+++ b/apps/gangliametrics/BUCK
@@ -17,7 +17,7 @@
 )
 
 onos_app (
-    title = 'Ganglia Report and Query App',
+    title = 'Ganglia Report and Query',
     category = 'Monitoring',
     url = 'http://onosproject.org',
     description = 'Performance metric service reporter',
diff --git a/apps/gluon/BUCK b/apps/gluon/BUCK
index c2134c4..a11d2b6 100644
--- a/apps/gluon/BUCK
+++ b/apps/gluon/BUCK
@@ -29,7 +29,7 @@
 
 onos_app (
     app_name = 'org.onosproject.gluon',
-    title = 'Gluon Shim Application',
+    title = 'Gluon Shim',
     category = 'Monitoring',
     url = 'http://onosproject.org',
     included_bundles = BUNDLES,
diff --git a/apps/graphitemetrics/BUCK b/apps/graphitemetrics/BUCK
index 90ca131..d8e4441 100644
--- a/apps/graphitemetrics/BUCK
+++ b/apps/graphitemetrics/BUCK
@@ -21,7 +21,7 @@
 )
 
 onos_app (
-    title = 'Graphite Report and Query App',
+    title = 'Graphite Report and Query',
     category = 'Monitoring',
     url = 'http://onosproject.org',
     description = 'Performance metric service reporter and retriever for graphite',
diff --git a/apps/influxdbmetrics/BUCK b/apps/influxdbmetrics/BUCK
index 3a10bc5..6c0bbc8 100644
--- a/apps/influxdbmetrics/BUCK
+++ b/apps/influxdbmetrics/BUCK
@@ -33,7 +33,7 @@
 )
 
 onos_app (
-    title = 'InfluxDB Report and Query App',
+    title = 'InfluxDB Report and Query',
     category = 'Monitoring',
     url = 'http://onosproject.org',
     description = 'Performance metric service reporter and retriever for influxDB.',
diff --git a/apps/l3vpn/BUCK b/apps/l3vpn/BUCK
index a2dc294..1a59467 100644
--- a/apps/l3vpn/BUCK
+++ b/apps/l3vpn/BUCK
@@ -32,7 +32,7 @@
 
 onos_app(
     app_name = 'org.onosproject.l3vpn',
-    title = 'YANG L3VPN App',
+    title = 'YANG L3VPN',
     category = 'Traffic Steering',
     url = 'http://onosproject.org',
     description = 'L3VPN YANG Application',
diff --git a/apps/mappingmanagement/BUCK b/apps/mappingmanagement/BUCK
index 83214c4..529962b 100644
--- a/apps/mappingmanagement/BUCK
+++ b/apps/mappingmanagement/BUCK
@@ -6,7 +6,7 @@
 ]
 
 onos_app (
-  title = 'Mapping Management App',
+  title = 'Mapping Management',
   description = 'ONOS mapping management application',
   category = 'Monitoring',
   url = 'https://onosproject.org/',
diff --git a/apps/mappingmanagement/web/BUCK b/apps/mappingmanagement/web/BUCK
index 7744056..24eba23 100644
--- a/apps/mappingmanagement/web/BUCK
+++ b/apps/mappingmanagement/web/BUCK
@@ -16,8 +16,8 @@
     deps = COMPILE_DEPS,
     test_deps = TEST_DEPS,
     web_context = '/onos/mappingmanagement',
-    api_title = 'Mapping Management App API',
+    api_title = 'Mapping Management API',
     api_version = '1.0',
-    api_description = 'REST API for ONOS Mapping Management App',
+    api_description = 'REST API for ONOS Mapping Management',
     api_package = 'org.onosproject.mapping.web.api',
 )
diff --git a/apps/metrics/BUCK b/apps/metrics/BUCK
index eef6513..5f151e4 100644
--- a/apps/metrics/BUCK
+++ b/apps/metrics/BUCK
@@ -13,7 +13,7 @@
 )
 
 onos_app (
-    title = 'OpenStack Interface App',
+    title = 'OpenStack Interface',
     category = 'Utility',
     url = 'http://onosproject.org',
     description = 'Openstack Interface Application.',
diff --git a/apps/mfwd/BUCK b/apps/mfwd/BUCK
index 2d20a48..3d27aad 100644
--- a/apps/mfwd/BUCK
+++ b/apps/mfwd/BUCK
@@ -7,7 +7,7 @@
 )
 
 onos_app (
-    title = 'Multicast Forwarding App',
+    title = 'Multicast Forwarding',
     category = 'Traffic Steering',
     url = 'http://onosproject.org',
     description = 'Multicast forwarding application.',
diff --git a/apps/mlb/BUCK b/apps/mlb/BUCK
index aeb9dce..eec3405 100644
--- a/apps/mlb/BUCK
+++ b/apps/mlb/BUCK
@@ -7,8 +7,10 @@
 )
 
 onos_app (
-    title = 'Mastership Load Balancer App',
+    title = 'Mastership Load Balancer',
     category = 'Utility',
     url = 'http://onosproject.org',
-    description = 'Application that balances mastership among nodes.',
+    description = 'Monitors distribution of mastership of network devices between the ONOS cluster ' +
+        'nodes and periodically re-assigns the mastership to achieve balanced distribution when ' +
+        'necessary and possible.',
 )
diff --git a/apps/mobility/BUCK b/apps/mobility/BUCK
index d2b076e..38b0228 100644
--- a/apps/mobility/BUCK
+++ b/apps/mobility/BUCK
@@ -7,7 +7,7 @@
 )
 
 onos_app (
-    title = 'Host Mobility App',
+    title = 'Host Mobility',
     category = 'Utility',
     url = 'http://onosproject.org',
     description = 'Host mobility application.',
diff --git a/apps/newoptical/BUCK b/apps/newoptical/BUCK
index af3dc1b..8a1345b 100644
--- a/apps/newoptical/BUCK
+++ b/apps/newoptical/BUCK
@@ -19,8 +19,8 @@
 )
 
 onos_app (
-  title = 'Packet/Optical Use-Case App',
-  category = 'Traffic Steering',
+  title = 'Packet/Optical Use-Case',
+  category = 'Optical',
   url = 'http://onosproject.org',
   description = 'Packet/Optical use-case application.',
   required_apps = [ 'org.onosproject.optical-model' ],
diff --git a/apps/ofagent/BUCK b/apps/ofagent/BUCK
index 6c8ef63..8e0826b 100644
--- a/apps/ofagent/BUCK
+++ b/apps/ofagent/BUCK
@@ -34,7 +34,7 @@
 )
 
 onos_app (
-    title = 'OpenFlow Agent App',
+    title = 'OpenFlow Agent',
     category = 'Traffic Steering',
     url = 'http://onosproject.org',
     description = 'OpenFlow agent application for virtualization subsystem.',
diff --git a/apps/openroadm/BUCK b/apps/openroadm/BUCK
index f619439..20cb8a1 100644
--- a/apps/openroadm/BUCK
+++ b/apps/openroadm/BUCK
@@ -16,7 +16,7 @@
 
 onos_app(
   app_name = 'org.onosproject.openroadm',
-  title = 'Open ROADM App',
+  title = 'Open ROADM',
   category = 'Utility',
   url = 'http://onosproject.org',
   included_bundles = BUNDLES,
diff --git a/apps/openstacknetworking/BUCK b/apps/openstacknetworking/BUCK
index 57990c7..60ebc1f 100644
--- a/apps/openstacknetworking/BUCK
+++ b/apps/openstacknetworking/BUCK
@@ -22,15 +22,15 @@
   deps = COMPILE_DEPS,
   test_deps = TEST_DEPS,
   web_context = '/onos/openstacknetworking',
-  api_title = 'OpenStack Networking App API',
+  api_title = 'OpenStack Networking API',
   api_version = '1.0',
-  api_description = 'REST API for OpenStack Networking App',
+  api_description = 'REST API for OpenStack Networking',
   api_package = 'org.onosproject.openstacknetworking.web',
 )
 
 onos_app (
   app_name = 'org.onosproject.openstacknetworking',
-  title = 'OpenStack Networking App',
+  title = 'OpenStack Networking',
   category = 'Utility',
   url = 'http://onosproject.org',
   description = 'OpenStack Networking application.',
diff --git a/apps/openstacknode/BUCK b/apps/openstacknode/BUCK
index 704f016..e1a2628 100644
--- a/apps/openstacknode/BUCK
+++ b/apps/openstacknode/BUCK
@@ -4,7 +4,7 @@
 ]
 
 onos_app (
-    title = 'OpenStack Node Bootstrap App',
+    title = 'OpenStack Node Bootstrap',
     category = 'Utility',
     url = 'http://onosproject.org',
     included_bundles = BUNDLES,
diff --git a/apps/openstacknode/app/BUCK b/apps/openstacknode/app/BUCK
index 22adbee..ee11cb5 100644
--- a/apps/openstacknode/app/BUCK
+++ b/apps/openstacknode/app/BUCK
@@ -22,9 +22,9 @@
     deps = COMPILE_DEPS,
     test_deps = TEST_DEPS,
     web_context = '/onos/openstacknode',
-    api_title = 'OpenStack Node App API',
+    api_title = 'OpenStack Node API',
     api_version = '1.0',
-    api_description = 'REST API for OpenStack Node App',
+    api_description = 'REST API for OpenStack Node',
     api_package = 'org.onosproject.openstacknode.web',
 )
 
diff --git a/apps/optical-model/BUCK b/apps/optical-model/BUCK
index e82406b..de3def8 100644
--- a/apps/optical-model/BUCK
+++ b/apps/optical-model/BUCK
@@ -21,7 +21,7 @@
     # Is there a way to change BUCK target name properly?
     #name = 'onos-optical-model',
     feature_coords = 'org.onosproject:onos-optical-model:%s' % (ONOS_VERSION),
-    title = 'Optical information model',
+    title = 'Optical Network Model',
     category = 'Optical',
     url = 'https://wiki.onosproject.org/x/C4m',
     description = 'ONOS optical information model.',
diff --git a/apps/pathpainter/BUCK b/apps/pathpainter/BUCK
index 7bd1c17..71eec89 100644
--- a/apps/pathpainter/BUCK
+++ b/apps/pathpainter/BUCK
@@ -10,8 +10,11 @@
 )
 
 onos_app (
-    title = 'Path Visualization App',
+    title = 'Path Visualization',
     category = 'Utility',
     url = 'http://onosproject.org',
-    description = 'Path visualization application.',
+    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 ' +
+        'the Dijkstra shortest path using default link metric (ONOS default), using geographic ' +
+        'distances, disjoint paths, etc.',
 )
diff --git a/apps/pce/app/BUCK b/apps/pce/app/BUCK
index 1846ee0..7637aaf 100644
--- a/apps/pce/app/BUCK
+++ b/apps/pce/app/BUCK
@@ -27,7 +27,7 @@
 
 onos_app (
     app_name='org.onosproject.pce.app',
-    title = 'PCE App',
+    title = 'PCE',
     category = 'default',
     url = 'http://onosproject.org',
     description = 'PCE as centeral controller App.',
diff --git a/apps/pce/pcerest/BUCK b/apps/pce/pcerest/BUCK
index f261ede..bed98d2 100644
--- a/apps/pce/pcerest/BUCK
+++ b/apps/pce/pcerest/BUCK
@@ -20,7 +20,7 @@
 )
 
 onos_app (
-    title = 'PCE Rest application',
+    title = 'PCE REST API',
     category = 'Utility',
     url = 'http://onosproject.org',
     description = 'Tunnel Service between network devices via REST interface',
diff --git a/apps/pce/pceweb/BUCK b/apps/pce/pceweb/BUCK
index 6ab1b97..a4a9a34 100644
--- a/apps/pce/pceweb/BUCK
+++ b/apps/pce/pceweb/BUCK
@@ -13,7 +13,7 @@
 )
 
 onos_app (
-    title = 'PCE web application',
+    title = 'PCE REST API',
     category = 'Utility',
     url = 'http://onosproject.org',
     description = 'Allows the user to visualize different types of paths between network entities',
diff --git a/apps/pim/BUCK b/apps/pim/BUCK
index a281975..2d36352 100644
--- a/apps/pim/BUCK
+++ b/apps/pim/BUCK
@@ -20,7 +20,7 @@
 )
 
 onos_app (
-    title = 'Protocol Independent Multicast Emulation App',
+    title = 'Protocol Independent Multicast Emulation',
     category = 'Traffic Steering',
     url = 'http://onosproject.org',
     description = 'Protocol independent multicast emulation.',
diff --git a/apps/proxyarp/BUCK b/apps/proxyarp/BUCK
index 70e3c9d..fe57fcb 100644
--- a/apps/proxyarp/BUCK
+++ b/apps/proxyarp/BUCK
@@ -8,7 +8,7 @@
 )
 
 onos_app (
-    title = 'Proxy ARP/NDP App',
+    title = 'Proxy ARP/NDP',
     category = 'Traffic Steering',
     url = 'http://onosproject.org',
     description = 'Proxy ARP/NDP application.',
diff --git a/apps/reactive-routing/BUCK b/apps/reactive-routing/BUCK
index f1a7cfa..36dd7ad 100644
--- a/apps/reactive-routing/BUCK
+++ b/apps/reactive-routing/BUCK
@@ -13,7 +13,7 @@
 )
 
 onos_app (
-    title = 'SDN-IP Reactive Routing App',
+    title = 'SDN-IP Reactive Routing',
     category = 'Traffic Steering',
     url = 'http://onosproject.org',
     description = 'SDN-IP reactive routing application.',
diff --git a/apps/roadm/BUCK b/apps/roadm/BUCK
index 8a87283..042bd52 100644
--- a/apps/roadm/BUCK
+++ b/apps/roadm/BUCK
@@ -16,10 +16,10 @@
 )
 
 onos_app (
-    title = 'ROADM App',
+    title = 'ROADM',
     category = 'Optical',
     url = 'http://onosproject.org',
-    description = """This application provides an interface and web GUI for monitoring
-                     and configuring power on ROADM devices.""",
+    description = 'This application provides an interface and web GUI for monitoring and ' +
+        'configuring power on ROADM devices.',
     required_apps = [ 'org.onosproject.optical-model' ],
 )
diff --git a/apps/route-service/BUCK b/apps/route-service/BUCK
index bf6ff33..d7ebe99 100644
--- a/apps/route-service/BUCK
+++ b/apps/route-service/BUCK
@@ -4,7 +4,7 @@
 ]
 
 onos_app (
-    title = 'Route Service Server App',
+    title = 'Route Service Server',
     category = 'Utility',
     url = 'http://onosproject.org',
     included_bundles = BUNDLES,
diff --git a/apps/routing/cpr/BUCK b/apps/routing/cpr/BUCK
index 51ffe35..1d35832 100644
--- a/apps/routing/cpr/BUCK
+++ b/apps/routing/cpr/BUCK
@@ -24,7 +24,7 @@
 
 onos_app (
     app_name = 'org.onosproject.cpr',
-    title = 'Control plane redirect',
+    title = 'Control Plane Redirect',
     category = 'Traffic Steering',
     url = 'http://onosproject.org',
     description = 'Redirects routing control traffic to a control plane',
diff --git a/apps/routing/fibinstaller/BUCK b/apps/routing/fibinstaller/BUCK
index ee7bf98..337fd28 100644
--- a/apps/routing/fibinstaller/BUCK
+++ b/apps/routing/fibinstaller/BUCK
@@ -24,7 +24,7 @@
 
 onos_app (
     app_name = 'org.onosproject.fibinstaller',
-    title = 'FIB installer app',
+    title = 'FIB Installer',
     category = 'Traffic Steering',
     url = 'http://onosproject.org',
     description = 'Installs routing rules into switches',
diff --git a/apps/routing/fpm/BUCK b/apps/routing/fpm/BUCK
index 98189e7..002481f 100644
--- a/apps/routing/fpm/BUCK
+++ b/apps/routing/fpm/BUCK
@@ -28,7 +28,7 @@
 
 onos_app (
     app_name = 'org.onosproject.fpm',
-    title = 'FIB Push Manager (FPM) route reciever',
+    title = 'FIB Push Manager (FPM) Route Receiver',
     category = 'Utility',
     url = 'http://onosproject.org',
     description = 'Receives routes from external routing daemon over FPM protocol',
diff --git a/apps/scalablegateway/BUCK b/apps/scalablegateway/BUCK
index ca94e6a..362c431 100644
--- a/apps/scalablegateway/BUCK
+++ b/apps/scalablegateway/BUCK
@@ -12,8 +12,8 @@
 )
 
 onos_app (
-  title = 'Scalable GW App',
-  category = 'Utility',
+  title = 'Scalable Gateway',
+  category = 'Traffic Steering',
   url = 'http://onosproject.org',
   description = 'Scalable gateway service',
 )
diff --git a/apps/sdnip/BUCK b/apps/sdnip/BUCK
index 06f07a1..fd7aeda 100644
--- a/apps/sdnip/BUCK
+++ b/apps/sdnip/BUCK
@@ -27,8 +27,8 @@
 )
 
 onos_app (
-  title = 'SDN-IP App',
-  category = 'Utility',
+  title = 'SDN-IP',
+  category = 'Traffic Steering',
   url = 'http://onosproject.org',
   included_bundles = BUNDLES,
   description = 'SDN-IP peering application',
diff --git a/apps/segmentrouting/BUCK b/apps/segmentrouting/BUCK
index b67b34b..5e7a9d9 100644
--- a/apps/segmentrouting/BUCK
+++ b/apps/segmentrouting/BUCK
@@ -29,7 +29,7 @@
 )
 
 onos_app (
-    title = 'Segment Routing App',
+    title = 'Segment Routing',
     category = 'Traffic Steering',
     url = 'http://onosproject.org',
     included_bundles = BUNDLES,
diff --git a/apps/test/demo/BUCK b/apps/test/demo/BUCK
index ac94dd7..5623e04 100644
--- a/apps/test/demo/BUCK
+++ b/apps/test/demo/BUCK
@@ -11,15 +11,15 @@
 osgi_jar_with_tests (
     deps = COMPILE_DEPS,
     web_context = '/onos/demo',
-    api_title = 'Flow Throughput Demo App',
+    api_title = 'Flow Throughput Demo',
     api_version = '1.0',
-    api_description = 'REST API for Demo App',
+    api_description = 'REST API for Demo',
     api_package = 'org.onosproject.demo',
 )
 
 onos_app (
-    title = 'Flow Throughput Demo App',
-    category = 'Test',
+    title = 'Flow Throughput Demo',
+    category = 'Test Utility',
     url = 'http://onosproject.org',
     description = 'APIs for interacting with the flow throughput test application.',
 )
diff --git a/apps/test/distributed-primitives/BUCK b/apps/test/distributed-primitives/BUCK
index 089dfa2..eed561a 100644
--- a/apps/test/distributed-primitives/BUCK
+++ b/apps/test/distributed-primitives/BUCK
@@ -14,8 +14,8 @@
 
 onos_app (
     app_name = 'org.onosproject.distributedprimitives',
-    title = 'Distributed Primitives Test App',
-    category = 'Test',
+    title = 'Distributed Primitives Test',
+    category = 'Test Utility',
     url = 'http://onosproject.org',
     description = 'ONOS app to test distributed primitives.',
 )
diff --git a/apps/test/election/BUCK b/apps/test/election/BUCK
index c191bce..67077c9 100644
--- a/apps/test/election/BUCK
+++ b/apps/test/election/BUCK
@@ -12,8 +12,8 @@
 )
 
 onos_app (
-    title = 'Master Election Test App',
-    category = 'Test',
+    title = 'Master Election Test',
+    category = 'Test Utility',
     url = 'http://onosproject.org',
     description = 'Master election test application.',
 )
diff --git a/apps/test/flow-perf/BUCK b/apps/test/flow-perf/BUCK
index f065aab..522647b 100644
--- a/apps/test/flow-perf/BUCK
+++ b/apps/test/flow-perf/BUCK
@@ -12,8 +12,8 @@
 )
 
 onos_app (
-    title = 'Flow Performance Test App',
-    category = 'Test',
+    title = 'Flow Performance Test',
+    category = 'Test Utility',
     url = 'http://onosproject.org',
     description = 'Messaging performance test application.',
 )
diff --git a/apps/test/intent-perf/BUCK b/apps/test/intent-perf/BUCK
index 29011f7..6187b8c 100644
--- a/apps/test/intent-perf/BUCK
+++ b/apps/test/intent-perf/BUCK
@@ -14,8 +14,8 @@
 
 onos_app (
     app_name = 'org.onosproject.intentperf',
-    title = 'Intent Performance Test App',
-    category = 'Test',
+    title = 'Intent Performance Test',
+    category = 'Test Utility',
     url = 'http://onosproject.org',
     description = 'Intent performance test application.',
 )
diff --git a/apps/test/loadtest/BUCK b/apps/test/loadtest/BUCK
index 933cbce..93f15ff 100644
--- a/apps/test/loadtest/BUCK
+++ b/apps/test/loadtest/BUCK
@@ -12,8 +12,8 @@
 )
 
 onos_app (
-    title = 'Distributed Load Test App',
-    category = 'Test',
+    title = 'Distributed Load Test',
+    category = 'Test Utility',
     url = 'http://onosproject.org',
     description = 'Distributed consensus load test application.',
 )
diff --git a/apps/test/messaging-perf/BUCK b/apps/test/messaging-perf/BUCK
index 231d072..9b12fd2 100644
--- a/apps/test/messaging-perf/BUCK
+++ b/apps/test/messaging-perf/BUCK
@@ -13,8 +13,8 @@
 )
 
 onos_app (
-    title = 'Messaging Performance Test App',
-    category = 'Test',
+    title = 'Messaging Performance Test',
+    category = 'Test Utility',
     url = 'http://onosproject.org',
     description = 'Messaging performance test application.',
 )
diff --git a/apps/test/netcfg-monitor/BUCK b/apps/test/netcfg-monitor/BUCK
index 7b6a8a4..f6051d9 100644
--- a/apps/test/netcfg-monitor/BUCK
+++ b/apps/test/netcfg-monitor/BUCK
@@ -7,8 +7,8 @@
 )
 
 onos_app (
-    title = 'Network Configuration Monitor Test App',
-    category = 'Test',
+    title = 'Network Configuration Monitor Test',
+    category = 'Test Utility',
     url = 'http://onosproject.org',
     description = 'Network configuration monitor test application.',
 )
diff --git a/apps/test/primitive-perf/BUCK b/apps/test/primitive-perf/BUCK
index 00dade9..be70e00 100644
--- a/apps/test/primitive-perf/BUCK
+++ b/apps/test/primitive-perf/BUCK
@@ -13,8 +13,8 @@
 
 onos_app (
     app_name = 'org.onosproject.primitiveperf',
-    title = 'Primitive Performance Test App',
-    category = 'Test',
+    title = 'Primitive Performance Test',
+    category = 'Test Utility',
     url = 'http://onosproject.org',
     description = 'Primitive performance test application.',
 )
diff --git a/apps/test/transaction-perf/BUCK b/apps/test/transaction-perf/BUCK
index 7b60d19..0caa955 100644
--- a/apps/test/transaction-perf/BUCK
+++ b/apps/test/transaction-perf/BUCK
@@ -12,8 +12,8 @@
 )
 
 onos_app (
-    title = 'Transaction Performance Test App',
-    category = 'Test',
+    title = 'Transaction Performance Test',
+    category = 'Test Utility',
     url = 'http://onosproject.org',
     description = 'Transaction performance test application.',
 )
diff --git a/apps/tetopology/BUCK b/apps/tetopology/BUCK
index bc36ab0..fb11ee5 100644
--- a/apps/tetopology/BUCK
+++ b/apps/tetopology/BUCK
@@ -5,7 +5,7 @@
 
 onos_app (
     app_name = 'org.onosproject.tetopology',
-    title = 'TE Topology Core App',
+    title = 'TE Topology Core',
     category = 'Traffic Steering',
     url = 'http://onosproject.org',
     description = 'Application to create and manage hierarchical TE topologies.',
diff --git a/apps/tetunnel/BUCK b/apps/tetunnel/BUCK
index 1f6af77..c1af844 100644
--- a/apps/tetunnel/BUCK
+++ b/apps/tetunnel/BUCK
@@ -5,7 +5,7 @@
 
 onos_app (
     app_name = 'org.onosproject.tetunnel',
-    title = 'TE Tunnel Core App',
+    title = 'TE Tunnel Core',
     category = 'Traffic Steering',
     url = 'http://onosproject.org',
     description = 'Application to create and manage TE tunnels.',
diff --git a/apps/virtualbng/BUCK b/apps/virtualbng/BUCK
index ac68c8d..9845b93 100644
--- a/apps/virtualbng/BUCK
+++ b/apps/virtualbng/BUCK
@@ -15,8 +15,8 @@
 )
 
 onos_app (
-    title = 'Virtual Broadband Gateway App',
-    category = 'Utility',
+    title = 'Virtual Broadband Gateway',
+    category = 'Traffic Steering',
     url = 'http://onosproject.org',
     description = 'A virtual Broadband Network Gateway(BNG) application.',
 )
diff --git a/apps/vpls/BUCK b/apps/vpls/BUCK
index 97a5d78..d089ea2 100644
--- a/apps/vpls/BUCK
+++ b/apps/vpls/BUCK
@@ -21,7 +21,7 @@
 )
 
 onos_app (
-    title = 'VLAN L2 Broadcast Network App',
+    title = 'VLAN L2 Broadcast Network',
     category = 'Traffic Steering',
     url = 'http://onosproject.org',
     description = 'Application to create L2 broadcast network using VLAN.',
diff --git a/apps/vrouter/BUCK b/apps/vrouter/BUCK
index 267460a..db2f9c8 100644
--- a/apps/vrouter/BUCK
+++ b/apps/vrouter/BUCK
@@ -14,7 +14,7 @@
 )
 
 onos_app (
-    title = 'Virtual Router App',
+    title = 'Virtual Router',
     category = 'Traffic Steering',
     url = 'http://onosproject.org',
     included_bundles = BUNDLES,
diff --git a/apps/vtn/BUCK b/apps/vtn/BUCK
index 7e5a886..3cb6dd3 100644
--- a/apps/vtn/BUCK
+++ b/apps/vtn/BUCK
@@ -6,7 +6,7 @@
 ]
 
 onos_app (
-  title = 'OPNFV App',
+  title = 'OPNFV',
   url = 'http://onosproject.org',
   included_bundles = BUNDLES,
   description = 'ONOS framework applications',
diff --git a/apps/yang-gui/BUCK b/apps/yang-gui/BUCK
index 772b069..13d92d9 100644
--- a/apps/yang-gui/BUCK
+++ b/apps/yang-gui/BUCK
@@ -16,6 +16,10 @@
     title = 'YANG Runtime GUI',
     category = 'Utility',
     url = 'http://onosproject.org',
-    description = 'YANG Runtime GUI application for visualization of registered YANG models.',
+    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 ' +
+        'source YANG files (*.yang, *.zip, *.jar) on the fly and directly from the GUI using ' +
+        'drag-n-drop.<p/>User can simply compress a set of YANG source files and drop it on the ' +
+        'YANG Models GUI view to automatically compile and then register the compiled YANG models.',
     required_apps = [ 'org.onosproject.yang' ],
 )
diff --git a/apps/yang/BUCK b/apps/yang/BUCK
index 2cf902b..a7319ea 100644
--- a/apps/yang/BUCK
+++ b/apps/yang/BUCK
@@ -44,7 +44,10 @@
   title = 'YANG Compiler and Runtime',
   category = 'Utility',
   url = 'http://onosproject.org',
-  description = 'Base application to bring in the YANG libraries and assemble them for other apps to use.',
+  description = 'Provides ability to register compiled YANG models or even to compile YANG source ' +
+    'files on the fly. Registering YANG models allows other ONOS subsystems to interact with ' +
+    'orchestrators or individual network devices using XML or JSON data structured in accordance ' +
+    'with those models.',
   included_bundles = BUNDLES,
   excluded_bundles = EXCLUDED_BUNDLES,
 )
diff --git a/apps/yms/BUCK b/apps/yms/BUCK
index 6c9f6ca..aae4279 100644
--- a/apps/yms/BUCK
+++ b/apps/yms/BUCK
@@ -7,7 +7,7 @@
 ]
 
 onos_app(
-  title = 'YANG Management System App',
+  title = 'YANG Management System',
   category = 'Utility',
   url = 'http://onosproject.org',
   included_bundles = BUNDLES,
diff --git a/buck-tools/onos_app.py b/buck-tools/onos_app.py
index dc2e5fa..119d9f6 100755
--- a/buck-tools/onos_app.py
+++ b/buck-tools/onos_app.py
@@ -139,6 +139,7 @@
     parser.add_option("-v", "--version",  dest="version",      help="Version")
     parser.add_option("-t", "--title",    dest="title",        help="Title")
     parser.add_option("-r", "--repo",     dest="repo_name",    help="Repo Name")
+    parser.add_option('-D', '--desc',     dest='desc',         help='Application description')
 
     parser.add_option('-b', '--bundle',
                       action="append", dest='included_bundles',
@@ -188,6 +189,9 @@
         bundles += options.included_bundles
     if options.excluded_bundles:
         bundles += options.excluded_bundles
+    if options.desc:
+        values['description'] = options.desc
+
     feature = generateFeature(bundles=bundles,
                               features=options.features,
                               **values)
diff --git a/bucklets/onos_app.bucklet b/bucklets/onos_app.bucklet
index 64dd9d7..14e1d72 100644
--- a/bucklets/onos_app.bucklet
+++ b/bucklets/onos_app.bucklet
@@ -172,6 +172,8 @@
     args += [ '-b $(maven_coords %s)' % b for b in included_bundles ]
     args += [ '-e $(maven_coords %s)' % b for b in excluded_bundles ]
     args += [ '-d %s' % a for a in required_apps ]
+    if description is not None:
+        args += [ '-D "%s"' % description ]
 
     # cmd = '$(exe //buck-tools:onos-app-writer) -F ' + ' '.join(args) + ' > $OUT'
     # genrule(
diff --git a/drivers/arista/BUCK b/drivers/arista/BUCK
index 551afbb..0434807 100644
--- a/drivers/arista/BUCK
+++ b/drivers/arista/BUCK
@@ -27,10 +27,10 @@
 
 onos_app (
     app_name = 'org.onosproject.drivers.arista',
-    title = 'Arista Device Drivers',
+    title = 'Arista Drivers',
     category = 'Drivers',
     url = 'http://onosproject.org',
-    description = 'ONOS Arista Device Drivers application.',
+    description = 'Adds support for Arista devices.',
     included_bundles = BUNDLES,
     required_apps = [ 'org.onosproject.restsb' ],
 )
diff --git a/drivers/bmv2/BUCK b/drivers/bmv2/BUCK
index 30ee2ab..8938d7a 100644
--- a/drivers/bmv2/BUCK
+++ b/drivers/bmv2/BUCK
@@ -22,10 +22,10 @@
 
 onos_app (
     app_name = 'org.onosproject.drivers.bmv2',
-    title = 'BMv2 Device Drivers',
+    title = 'BMv2 Drivers',
     category = 'Drivers',
     url = 'http://onosproject.org',
-    description = 'ONOS BMv2 device drivers application.',
+    description = 'Adds support for BMv2 P4 devices.',
     included_bundles = BUNDLES,
     required_apps = [
         'org.onosproject.generaldeviceprovider',
diff --git a/drivers/ciena/BUCK b/drivers/ciena/BUCK
index 2db3559..f6b7fa7 100644
--- a/drivers/ciena/BUCK
+++ b/drivers/ciena/BUCK
@@ -27,10 +27,10 @@
 
 onos_app (
     app_name = 'org.onosproject.drivers.ciena',
-    title = 'Ciena Device Drivers',
+    title = 'Ciena Drivers',
     category = 'Drivers',
     url = 'http://onosproject.org',
-    description = 'ONOS Ciena Device Drivers application.',
+    description = 'Adds support for Ciena devices.',
     included_bundles = BUNDLES,
     required_apps = [ 'org.onosproject.restsb', 'org.onosproject.optical-model', 'org.onosproject.drivers.optical' ],
 )
diff --git a/drivers/cisco/netconf/BUCK b/drivers/cisco/netconf/BUCK
index b3b082a..6975a52 100644
--- a/drivers/cisco/netconf/BUCK
+++ b/drivers/cisco/netconf/BUCK
@@ -23,10 +23,10 @@
 
 onos_app (
     app_name = 'org.onosproject.drivers.cisco.netconf',
-    title = 'Cisco NETCONF device drivers',
+    title = 'Cisco NETCONF Drivers',
     category = 'Drivers',
     url = 'http://onosproject.org',
-    description = 'ONOS Cisco NETCONF device drivers application.',
+    description = 'Adds support for Cisco devices using NETCONF protocol.',
     included_bundles = BUNDLES,
     required_apps = [ 'org.onosproject.netconf', 'org.onosproject.drivers.netconf' ],
 )
diff --git a/drivers/cisco/rest/BUCK b/drivers/cisco/rest/BUCK
index 5f544d9..73acb67 100644
--- a/drivers/cisco/rest/BUCK
+++ b/drivers/cisco/rest/BUCK
@@ -27,10 +27,10 @@
 
 onos_app (
     app_name = 'org.onosproject.drivers.cisco.rest',
-    title = 'Cisco REST device drivers',
+    title = 'Cisco REST Drivers',
     category = 'Drivers',
     url = 'http://onosproject.org',
-    description = 'ONOS Cisco REST device drivers application.',
+    description = 'Adds support for Cisco devices using REST.',
     included_bundles = BUNDLES,
     required_apps = [ 'org.onosproject.restsb' ],
 )
diff --git a/drivers/corsa/BUCK b/drivers/corsa/BUCK
index 7f663bd..10eaf82 100644
--- a/drivers/corsa/BUCK
+++ b/drivers/corsa/BUCK
@@ -21,9 +21,9 @@
 
 onos_app (
     app_name = 'org.onosproject.drivers.corsa',
-    title = 'Corsa device drivers',
+    title = 'Corsa Drivers',
     category = 'Drivers',
     url = 'http://onosproject.org',
-    description = 'ONOS Corsa device drivers application.',
+    description = 'Adds support for Corsa devices.',
     required_apps = [ 'org.onosproject.openflow' ],
 )
diff --git a/drivers/default/BUCK b/drivers/default/BUCK
index b79b013..d8b95de 100644
--- a/drivers/default/BUCK
+++ b/drivers/default/BUCK
@@ -21,10 +21,10 @@
 
 onos_app (
     app_name = 'org.onosproject.drivers',
-    title = 'Default device drivers',
+    title = 'Default Drivers',
     category = 'Drivers',
     url = 'http://onosproject.org',
-    description = 'ONOS Default device drivers application.',
+    description = 'Suite of default drivers.',
     included_bundles = [
         ':onos-drivers-default',
         '//lib:openflowj',
diff --git a/drivers/flowspec/BUCK b/drivers/flowspec/BUCK
index baeeed9..7590eb2 100644
--- a/drivers/flowspec/BUCK
+++ b/drivers/flowspec/BUCK
@@ -19,9 +19,9 @@
 
 onos_app (
     app_name = 'org.onosproject.drivers.flowspec',
-    title = 'Flow specification Device Drivers',
+    title = 'Generic Flow Spec Drivers',
     category = 'Drivers',
     url = 'http://onosproject.org',
-    description = 'ONOS flow specification device drivers application.',
+    description = 'Adds support for devices using flow specs.',
     required_apps = [ 'org.onosproject.drivers'],
 )
diff --git a/drivers/fujitsu/BUCK b/drivers/fujitsu/BUCK
index 552084a..71bc9b6 100644
--- a/drivers/fujitsu/BUCK
+++ b/drivers/fujitsu/BUCK
@@ -28,10 +28,10 @@
 
 onos_app (
     app_name = 'org.onosproject.drivers.fujitsu',
-    title = 'Fujitsu device drivers',
+    title = 'Fujitsu Drivers',
     category = 'Drivers',
     url = 'http://onosproject.org',
-    description = 'ONOS Fujitsu device drivers application.',
+    description = 'Adds support for Fujitsu devices.',
     included_bundles = BUNDLES,
     required_apps = [ 'org.onosproject.netconf', 'org.onosproject.optical-model', 'org.onosproject.drivers.optical' ],
 )
diff --git a/drivers/hp/BUCK b/drivers/hp/BUCK
index 889557c..a403221 100644
--- a/drivers/hp/BUCK
+++ b/drivers/hp/BUCK
@@ -21,9 +21,9 @@
 
 onos_app (
     app_name = 'org.onosproject.drivers.hp',
-    title = 'HP driver',
+    title = 'HP Drivers',
     category = 'Drivers',
     url = 'http://onosproject.org',
-    description = 'ONOS HP device drivers application.',
+    description = 'Adds support for HP devices.',
     required_apps = [ 'org.onosproject.openflow' ],
 )
diff --git a/drivers/huawei/BUCK b/drivers/huawei/BUCK
index 8c3d5ea..a9663a5 100644
--- a/drivers/huawei/BUCK
+++ b/drivers/huawei/BUCK
@@ -39,9 +39,9 @@
 
 onos_app(
     app_name = 'org.onosproject.drivers.huawei',
-    title = 'Huawei Device Drivers',
+    title = 'Huawei Drivers',
     category = 'Drivers',
     url = 'http://onosproject.org',
-    description = 'ONOS Huawei Device Drivers application.',
+    description = 'Adds support for Huawei devices.',
     required_apps = APPS
 )
\ No newline at end of file
diff --git a/drivers/juniper/BUCK b/drivers/juniper/BUCK
index 1a40781..1339200 100644
--- a/drivers/juniper/BUCK
+++ b/drivers/juniper/BUCK
@@ -17,10 +17,10 @@
 
 onos_app (
   app_name = 'org.onosproject.drivers.juniper',
-  title = 'Juniper Device Drivers',
+  title = 'Juniper Drivers',
   category = 'Drivers',
   url = 'http://onosproject.org',
-  description = 'ONOS Juniper Device Drivers application.',
+  description = 'Adds support for Juniper devices.',
   included_bundles = BUNDLES,
   required_apps = [ 'org.onosproject.netconf' ],
 )
\ No newline at end of file
diff --git a/drivers/lisp/BUCK b/drivers/lisp/BUCK
index 695fc40..18b053a 100644
--- a/drivers/lisp/BUCK
+++ b/drivers/lisp/BUCK
@@ -31,10 +31,10 @@
 
 onos_app (
     app_name = 'org.onosproject.drivers.lisp',
-    title = 'LISP Device Drivers',
+    title = 'Generic LISP Drivers',
     category = 'Drivers',
     url = 'https://wiki.onosproject.org/display/ONOS/LISP+as+SBI',
-    description = 'ONOS LISP Device Drivers application.',
+    description = 'Adds support for devices using LISP.',
     included_bundles = BUNDLES,
     required_apps = [ 'org.onosproject.lisp' ],
 )
diff --git a/drivers/lumentum/BUCK b/drivers/lumentum/BUCK
index 9471018..15f50d2 100644
--- a/drivers/lumentum/BUCK
+++ b/drivers/lumentum/BUCK
@@ -23,10 +23,10 @@
 
 onos_app (
     app_name = 'org.onosproject.drivers.lumentum',
-    title = 'Lumentum Device Drivers',
+    title = 'Lumentum Drivers',
     category = 'Drivers',
     url = 'http://onosproject.org',
-    description = 'ONOS Lumentum Device Drivers application.',
+    description = 'Adds support for Lumentum devices.',
     required_apps = [ 'org.onosproject.snmp', 'org.onosproject.faultmanagement', 'org.onosproject.optical-model',
      'org.onosproject.tl1', 'org.onosproject.drivers.optical'],
 )
diff --git a/drivers/microsemi/BUCK b/drivers/microsemi/BUCK
index 2c34c1c..379e63d 100644
--- a/drivers/microsemi/BUCK
+++ b/drivers/microsemi/BUCK
@@ -35,9 +35,9 @@
 
 onos_app (
     app_name = 'org.onosproject.drivers.microsemi',
-    title = 'Microsemi device drivers',
+    title = 'Microsemi Drivers',
     category = 'Drivers',
     url = 'http://onosproject.org',
-    description = 'ONOS Microsemi device drivers application.',
+    description = 'Adds support for Microsemi devices.',
     required_apps = APPS,
 )
diff --git a/drivers/netconf/BUCK b/drivers/netconf/BUCK
index 2824a07..d84fbbe 100644
--- a/drivers/netconf/BUCK
+++ b/drivers/netconf/BUCK
@@ -23,10 +23,10 @@
 
 onos_app (
     app_name = 'org.onosproject.drivers.netconf',
-    title = 'NETCONF Device Drivers',
+    title = 'Generic NETCONF Drivers',
     category = 'Drivers',
     url = 'http://onosproject.org',
-    description = 'ONOS NETCONF Device Drivers application.',
+    description = 'Adds support for devices using NETCONF.',
     included_bundles = BUNDLES,
     required_apps = [ 'org.onosproject.netconf' ],
 )
diff --git a/drivers/oplink/BUCK b/drivers/oplink/BUCK
index bc52ab2..43b0826 100644
--- a/drivers/oplink/BUCK
+++ b/drivers/oplink/BUCK
@@ -25,10 +25,10 @@
 
 onos_app(
     app_name = 'org.onosproject.drivers.oplink',
-    title = 'Oplink Device Drivers',
+    title = 'Oplink Drivers',
     category = 'Drivers',
     url = 'http://onosproject.org',
-    description = 'ONOS Oplink Device Drivers application.',
+    description = 'Adds support for Oplink devices.',
     included_bundles = BUNDLES,
     required_apps = [
         'org.onosproject.netconf', 'org.onosproject.optical-model'
diff --git a/drivers/optical/BUCK b/drivers/optical/BUCK
index 3995be7..f9eef16 100644
--- a/drivers/optical/BUCK
+++ b/drivers/optical/BUCK
@@ -23,9 +23,9 @@
 
 onos_app (
     app_name = 'org.onosproject.drivers.optical',
-    title = 'Other optical Device Drivers',
+    title = 'Basic Optical Drivers',
     category = 'Drivers',
     url = 'http://onosproject.org',
-    description = 'ONOS other optical Device Drivers application.',
+    description = 'Suite of basic optical device drivers.',
     required_apps = [ 'org.onosproject.drivers', 'org.onosproject.optical-model' ],
 )
diff --git a/drivers/ovsdb/BUCK b/drivers/ovsdb/BUCK
index 97f83c0..3446bd2 100644
--- a/drivers/ovsdb/BUCK
+++ b/drivers/ovsdb/BUCK
@@ -19,9 +19,9 @@
 
 onos_app (
     app_name = 'org.onosproject.drivers.ovsdb',
-    title = 'OVSDB Device Drivers',
+    title = 'Generic OVSDB Drivers',
     category = 'Drivers',
     url = 'http://onosproject.org',
-    description = 'ONOS OVSDB Device Drivers application.',
+    description = 'Adds support for devices using OVSDB.',
     required_apps = [ 'org.onosproject.ovsdb-base' ],
 )
diff --git a/drivers/p4runtime/BUCK b/drivers/p4runtime/BUCK
index 2cbe48d..ed1d85d 100644
--- a/drivers/p4runtime/BUCK
+++ b/drivers/p4runtime/BUCK
@@ -17,10 +17,10 @@
 
 onos_app (
     app_name = 'org.onosproject.drivers.p4runtime',
-    title = 'P4Runtime Default Device Drivers',
+    title = 'P4 Runtime Drivers',
     category = 'Drivers',
     url = 'http://onosproject.org',
-    description = 'ONOS P4Runtime device drivers application.',
+    description = 'Adds support for devices using P4 Runtime protocol.',
     included_bundles = BUNDLES,
     required_apps = [
         'org.onosproject.generaldeviceprovider',
diff --git a/models/huawei/BUCK b/models/huawei/BUCK
index 301456a..a57225e 100644
--- a/models/huawei/BUCK
+++ b/models/huawei/BUCK
@@ -1,5 +1,5 @@
 
 yang_model (
   app_name = 'org.onosproject.models.huawei',
-  title = 'Huawei YANG Model',
+  title = 'Huawei YANG Models',
 )
diff --git a/models/l3vpn/BUCK b/models/l3vpn/BUCK
index babafb0..dae4099 100644
--- a/models/l3vpn/BUCK
+++ b/models/l3vpn/BUCK
@@ -1,4 +1,4 @@
 yang_model(
     app_name = 'org.onosproject.models.l3vpn',
-    title = 'L3VPN YANG Model',
+    title = 'L3VPN YANG Models',
 )
diff --git a/models/microsemi/BUCK b/models/microsemi/BUCK
index 58b8412..c9f83f3 100644
--- a/models/microsemi/BUCK
+++ b/models/microsemi/BUCK
@@ -1,4 +1,4 @@
 yang_model(
     app_name = 'org.onosproject.models.microsemi',
-    title = 'Microsemi YANG Model',
+    title = 'Microsemi YANG Models',
 )
diff --git a/models/openroadm/BUCK b/models/openroadm/BUCK
index 6f7313c..8a1352c 100644
--- a/models/openroadm/BUCK
+++ b/models/openroadm/BUCK
@@ -1,5 +1,5 @@
 
 yang_model(
   app_name = 'org.onosproject.models.openroadm',
-  title = 'Open ROADM YANG Model',
+  title = 'Open ROADM YANG Models',
 )
\ No newline at end of file
diff --git a/providers/host/BUCK b/providers/host/BUCK
index 2cfed29..b7d90f4 100644
--- a/providers/host/BUCK
+++ b/providers/host/BUCK
@@ -18,5 +18,5 @@
     title = 'Host Location Provider',
     category = 'Provider',
     url = 'http://onosproject.org',
-    description = 'ONOS host location provider.',
+    description = 'Provides host discovery and location to the ONOS core by eavesdropping on the ARP and NDP packets.',
 )
diff --git a/providers/lldp/BUCK b/providers/lldp/BUCK
index dfbc97e..8315f65 100644
--- a/providers/lldp/BUCK
+++ b/providers/lldp/BUCK
@@ -26,7 +26,7 @@
     title = 'LLDP Link Provider',
     category = 'Provider',
     url = 'http://onosproject.org',
-    description = 'ONOS LLDP Link provider.',
+    description = 'Provides link discovery to the ONOS core by eavesdropping on the LLDP control packets.',
     included_bundles = BUNDLES,
 )
 
diff --git a/providers/netcfghost/BUCK b/providers/netcfghost/BUCK
index 7b9a203..dfc8af1 100644
--- a/providers/netcfghost/BUCK
+++ b/providers/netcfghost/BUCK
@@ -11,6 +11,8 @@
     title = 'Network Config Host Provider',
     category = 'Provider',
     url = 'http://onosproject.org',
-    description = 'Host provider that uses network config service to discover hosts.',
+    description = 'Allows operator to prescribe information about known hosts and their locations ' +
+        'using the network configuration subsystem. Such information takes precedence over ' +
+        'information discovered through other host location providers.',
 )
 
diff --git a/providers/netcfglinks/BUCK b/providers/netcfglinks/BUCK
index fe1dc0b..2b643eb 100644
--- a/providers/netcfglinks/BUCK
+++ b/providers/netcfglinks/BUCK
@@ -23,6 +23,8 @@
     title = 'Network Config Link Provider',
     category = 'Provider',
     url = 'http://onosproject.org',
-    description = 'Links provider that uses network config service to predefine devices and links.',
+    description = 'Allows operator to prescribe information about known infrastructure links and ' +
+        'their state using the network configuration subsystem. Such information takes precedence ' +
+        'over information discovered through other link discovery providers.',
     included_bundles = BUNDLES,
 )
diff --git a/providers/null/BUCK b/providers/null/BUCK
index 440c4a8..8e43e3a 100644
--- a/providers/null/BUCK
+++ b/providers/null/BUCK
@@ -13,8 +13,11 @@
 )
 
 onos_app (
-    title = 'Null Southbound Provider',
-    category = 'Provider',
+    title = 'Null Provider Suite',
+    category = 'Test Utility',
     url = 'http://onosproject.org',
-    description = 'ONOS null southbound provider.',
+    description = 'Suite of device, link, host, flow and packet providers that allow the operator ' +
+        'to test ONOS against completely fictional network topology. This is useful for conducting ' +
+        'ONOS core performance tests and for developing features that require only control plane ' +
+        '- and not data plane - functionality. ',
 )
diff --git a/providers/openflow/app/BUCK b/providers/openflow/app/BUCK
index 78800ab..bcef496 100644
--- a/providers/openflow/app/BUCK
+++ b/providers/openflow/app/BUCK
@@ -6,10 +6,10 @@
 
 onos_app (
     app_name = 'org.onosproject.openflow',
-    title = 'OpenFlow Meta App',
+    title = 'OpenFlow Provider Suite',
     category = 'Provider',
     url = 'http://onosproject.org',
-    description = 'OpenFlow southbound meta application.',
+    description = 'Suite of the OpenFlow base providers bundled together with ARP/NDP host location provider and LLDP link provider.',
     included_bundles = [ '//utils/osgi:onlab-osgi' ],  # FIXME to allow hollow oar files
     required_apps = APPS,
 )
diff --git a/providers/openflow/base/BUCK b/providers/openflow/base/BUCK
index 46844fc..0a3b869 100644
--- a/providers/openflow/base/BUCK
+++ b/providers/openflow/base/BUCK
@@ -15,10 +15,10 @@
 
 onos_app (
     app_name = 'org.onosproject.openflow-base',
-    title = 'OpenFlow Provider',
+    title = 'OpenFlow Base Provider',
     category = 'Provider',
     url = 'http://onosproject.org',
-    description = 'OpenFlow protocol southbound providers.',
+    description = 'Provides the base suite of device, flow and packet providers that rely OpenFlow protocol to interact with network devices.',
     included_bundles = BUNDLES,
     required_apps = APPS,
 )
diff --git a/providers/ovsdb/BUCK b/providers/ovsdb/BUCK
index 642cf9a..0f36e70 100644
--- a/providers/ovsdb/BUCK
+++ b/providers/ovsdb/BUCK
@@ -5,7 +5,7 @@
 
 onos_app (
     app_name = 'org.onosproject.ovsdb',
-    title = 'OVSDB Southbound Meta App',
+    title = 'OVSDB Southbound Meta',
     category = 'Provider',
     url = 'http://onosproject.org',
     description = 'ONOS OVSDB southbound meta application',