diff --git a/apps/netconf/client/BUCK b/apps/netconf/client/BUCK
index 2f2960b..52a2a6a 100644
--- a/apps/netconf/client/BUCK
+++ b/apps/netconf/client/BUCK
@@ -21,7 +21,7 @@
 onos_app(
   app_name = 'org.onosproject.netconfsb',
   title = 'NETCONF Device Configuration',
-  category = 'Protocols',
+  category = 'Protocol',
   url = 'http://onosproject.org',
   description = 'Extension to allow ONOS to configure NETCONF devices.',
   required_apps = APPS,
diff --git a/onos.defs b/onos.defs
index e056dfa..e4e6dab 100644
--- a/onos.defs
+++ b/onos.defs
@@ -1,4 +1,4 @@
-ONOS_ORIGIN = 'ON.Lab'
+ONOS_ORIGIN = 'ONOS Community'
 ONOS_GROUP_ID = 'org.onosproject'
 ONOS_VERSION = '1.11.0-SNAPSHOT'
 DEFAULT_APP_CATEGORY = 'Utility'
diff --git a/protocols/grpc/BUCK b/protocols/grpc/BUCK
index 57ab1a0..562d6f6 100644
--- a/protocols/grpc/BUCK
+++ b/protocols/grpc/BUCK
@@ -31,7 +31,7 @@
 onos_app (
     app_name = 'org.onosproject.protocols.grpc',
     title = 'gRPC Protocol Subsystem',
-    category = 'Protocols',
+    category = 'Protocol',
     url = 'http://onosproject.org',
     description = 'ONOS gRPC protocol subsystem',
     included_bundles = BUNDLES,
diff --git a/protocols/p4runtime/BUCK b/protocols/p4runtime/BUCK
index e677f9f..bf89ed7 100644
--- a/protocols/p4runtime/BUCK
+++ b/protocols/p4runtime/BUCK
@@ -7,7 +7,7 @@
 onos_app(
     app_name = 'org.onosproject.protocols.p4runtime',
     title = 'P4Runtime Protocol Subsystem',
-    category = 'Protocols',
+    category = 'Protocol',
     url = 'http://onosproject.org',
     description = 'ONOS P4Runtime protocol subsystem',
     included_bundles = BUNDLES,