diff --git a/apps/faultmanagement/BUCK b/apps/faultmanagement/BUCK
index 3156894..c3d1b57 100644
--- a/apps/faultmanagement/BUCK
+++ b/apps/faultmanagement/BUCK
@@ -5,10 +5,11 @@
     '//apps/faultmanagement/fmweb:onos-apps-faultmanagement-fmweb',
 ]
 
-onos_app (
-  title = 'Fault Management',
-  description = 'ONOS fault management application',
-  category = 'Monitoring',
-  url = 'https://wiki.onosproject.org/display/ONOS/Fault+Management',
-  included_bundles = BUNDLES,
+onos_app(
+    title = 'Fault Management',
+    description = 'Provides managements of alarms. Stores retrieved alarms from devices. ' +
+        'Offers CLI, UI and REST integration to obtain and display them from ONOS.',
+    category = 'Monitoring',
+    url = 'https://wiki.onosproject.org/display/ONOS/Fault+Management',
+    included_bundles = BUNDLES,
 )
diff --git a/apps/netconf/client/BUCK b/apps/netconf/client/BUCK
index 52a2a6a..035b0b5 100644
--- a/apps/netconf/client/BUCK
+++ b/apps/netconf/client/BUCK
@@ -1,28 +1,29 @@
 APPS = [
-  'org.onosproject.yang',
-  'org.onosproject.config',
-  'org.onosproject.netconf',
+    'org.onosproject.yang',
+    'org.onosproject.config',
+    'org.onosproject.netconf',
 ]
 
 COMPILE_DEPS = [
-  '//lib:CORE_DEPS',
-  '//lib:onos-yang-model',
-  '//lib:onos-yang-runtime',
-  '//apps/config:onos-apps-config',
-  '//utils/misc:onlab-misc',
-  '//protocols/netconf/api:onos-protocols-netconf-api',
-  '//utils/osgi:onlab-osgi',
+    '//lib:CORE_DEPS',
+    '//lib:onos-yang-model',
+    '//lib:onos-yang-runtime',
+    '//apps/config:onos-apps-config',
+    '//utils/misc:onlab-misc',
+    '//protocols/netconf/api:onos-protocols-netconf-api',
+    '//utils/osgi:onlab-osgi',
 ]
 
 osgi_jar_with_tests(
-  deps = COMPILE_DEPS,
+    deps = COMPILE_DEPS,
 )
 
 onos_app(
-  app_name = 'org.onosproject.netconfsb',
-  title = 'NETCONF Device Configuration',
-  category = 'Protocol',
-  url = 'http://onosproject.org',
-  description = 'Extension to allow ONOS to configure NETCONF devices.',
-  required_apps = APPS,
+    app_name = 'org.onosproject.netconfsb',
+    title = 'NETCONF Protocol Subsystem',
+    category = 'Protocol',
+    url = 'http://onosproject.org',
+    description = 'Exposes APIs to establish NETCONF connections to devices and to send and receive ' +
+        'messages and asynchronous notifications over such connection.',
+    required_apps = APPS,
 )
diff --git a/apps/network-troubleshoot/BUCK b/apps/network-troubleshoot/BUCK
index a860e30..66b12f4 100644
--- a/apps/network-troubleshoot/BUCK
+++ b/apps/network-troubleshoot/BUCK
@@ -5,8 +5,8 @@
 ]
 
 onos_app (
-  title = 'Network Trouble-Shooter',
-  description = 'ONOS Network Trouble-Shooting utility',
+  title = 'Network Troubleshooter',
+  description = 'Provides various network troubleshooting utilities.',
   category = 'Utility',
   url = 'https://wiki.onosproject.org/display/ONOS/Network+TroubleShooting+Module',
   included_bundles = BUNDLES,
diff --git a/apps/pcep-api/BUCK b/apps/pcep-api/BUCK
index b0f7332..283bbfb 100644
--- a/apps/pcep-api/BUCK
+++ b/apps/pcep-api/BUCK
@@ -10,7 +10,7 @@
 
 onos_app (
     title = 'PCEP Protocol API',
-    category = 'Traffic Steering',
+    category = 'Protocol',
     url = 'http://onosproject.org',
     description = 'PCEP protocol API.',
 )
diff --git a/bucklets/yang.bucklet b/bucklets/yang.bucklet
index 31ce169..490c62a 100644
--- a/bucklets/yang.bucklet
+++ b/bucklets/yang.bucklet
@@ -69,7 +69,7 @@
     onos_app (
       app_name = app_name,
       title = title,
-      category = 'Model',
+      category = 'Models',
       url = url,
       description = description,
       required_apps = [ 'org.onosproject.yang' ],
diff --git a/drivers/p4runtime/BUCK b/drivers/p4runtime/BUCK
new file mode 100644
index 0000000..59a5d60
--- /dev/null
+++ b/drivers/p4runtime/BUCK
@@ -0,0 +1,30 @@
+GRPC_VER = '1.3.0'
+
+COMPILE_DEPS = [
+    '//lib:CORE_DEPS',
+    '//protocols/p4runtime/api:onos-protocols-p4runtime-api',
+    '//incubator/grpc-dependencies:grpc-core-repkg-' + GRPC_VER,
+    '//lib:grpc-netty-' + GRPC_VER,
+]
+
+BUNDLES = [
+    ':onos-drivers-p4runtime',
+]
+
+osgi_jar(
+    deps = COMPILE_DEPS,
+)
+
+onos_app (
+    app_name = 'org.onosproject.drivers.p4runtime',
+    title = 'P4Runtime Drivers',
+    category = 'Drivers',
+    url = 'http://onosproject.org',
+    description = 'Adds support for devices using P4 Runtime protocol.',
+    included_bundles = BUNDLES,
+    required_apps = [
+        'org.onosproject.generaldeviceprovider',
+        'org.onosproject.protocols.p4runtime',
+        'org.onosproject.p4runtime',
+    ],
+)
diff --git a/protocols/grpc/BUCK b/protocols/grpc/BUCK
index 562d6f6..bcd74a5 100644
--- a/protocols/grpc/BUCK
+++ b/protocols/grpc/BUCK
@@ -33,6 +33,8 @@
     title = 'gRPC Protocol Subsystem',
     category = 'Protocol',
     url = 'http://onosproject.org',
-    description = 'ONOS gRPC protocol subsystem',
+    description = 'Exposes APIs to setup, manage and teardown gRPC Managed channels with devices. ' +
+        'Also offers channel observer registration and removal capabilities. ' +
+        'The exposed APis abstract low level channel operations.',
     included_bundles = BUNDLES,
 )
\ No newline at end of file
diff --git a/providers/netconf/BUCK b/providers/netconf/BUCK
index 4b077ad..92f7a72 100644
--- a/providers/netconf/BUCK
+++ b/providers/netconf/BUCK
@@ -13,10 +13,12 @@
 onos_app (
     title = 'NETCONF Provider',
     category = 'Provider',
-    url = 'http://onosproject.org',
+    url = 'https://wiki.onosproject.org/display/ONOS/NETCONF',
     included_bundles = BUNDLES,
     excluded_bundles = EXCLUDED_BUNDLES,
-    description = 'NETCONF protocol southbound providers.',
+    description = 'Provides means for ONOS to discover and trigger the initial handshake procedure ' +
+        'with NETCONF from information given by network configuration.' +
+        'Also provides capabilities for receiving asynchronous alarm notifications from devices.',
     required_apps = [ 'org.onosproject.faultmanagement'],
 )
 
diff --git a/providers/openflow/base/BUCK b/providers/openflow/base/BUCK
index a973d06..0513e6f 100644
--- a/providers/openflow/base/BUCK
+++ b/providers/openflow/base/BUCK
@@ -17,7 +17,7 @@
     app_name = 'org.onosproject.openflow-base',
     title = 'OpenFlow Base Provider',
     category = 'Provider',
-    url = 'http://onosproject.org',
+    url = 'https://wiki.onosproject.org/display/ONOS/OpenFlow',
     description = 'Provides the base suite of device, flow and packet providers that rely on the ' +
         'OpenFlow protocol to interact with network devices.',
     included_bundles = BUNDLES,
diff --git a/providers/rest/BUCK b/providers/rest/BUCK
index ff2baa8..81fe5b4 100644
--- a/providers/rest/BUCK
+++ b/providers/rest/BUCK
@@ -12,8 +12,9 @@
     app_name = 'org.onosproject.restsb',
     title = 'REST Provider',
     category = 'Provider',
-    url = 'http://onosproject.org',
+    url = 'https://wiki.onosproject.org/display/ONOS/REST',
     included_bundles = BUNDLES,
-    description = 'REST protocol southbound providers.',
+    description = 'Provides means for ONOS to discover the existence of a REST API enabled device ' +
+        'or proxy for multiple devices from information given by network configuration.',
 )
 
diff --git a/providers/snmp/BUCK b/providers/snmp/BUCK
index eca6599..15d6202 100644
--- a/providers/snmp/BUCK
+++ b/providers/snmp/BUCK
@@ -13,7 +13,8 @@
     app_name = 'org.onosproject.snmp',
     title = 'SNMP Provider',
     category = 'Provider',
-    url = 'http://onosproject.org',
+    url = 'https://wiki.onosproject.org/display/ONOS/SNMP',
     included_bundles = BUNDLES,
-    description = 'SNMP providers.',
+    description = 'Provides means for ONOS to discover and trigger the initial handshake procedure ' +
+        'with SNMP enabled devices from information given by network configuration.',
 )
diff --git a/providers/tl1/BUCK b/providers/tl1/BUCK
index 6168610..1c57dc4 100644
--- a/providers/tl1/BUCK
+++ b/providers/tl1/BUCK
@@ -7,7 +7,8 @@
     app_name = 'org.onosproject.tl1',
     title = 'TL1 Provider',
     category = 'Provider',
-    url = 'http://onosproject.org',
+    url = 'https://wiki.onosproject.org/display/ONOS/TL1',
     included_bundles = BUNDLES,
-    description = 'TL1 protocol southbound providers.',
+    description = 'Provides means for ONOS to discover and trigger the initial handshake procedure ' +
+        'with TL1 enable devices from information given by network configuration.',
 )