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.',
 )