diff --git a/providers/bgp/app/app.xml b/providers/bgp/app/app.xml
index 96ae7c9..ee3af32 100755
--- a/providers/bgp/app/app.xml
+++ b/providers/bgp/app/app.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <app name="org.onosproject.bgp" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org" title="BGP Provider"
+     category="Provider" url="http://onosproject.org" title="BGP Provider"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
diff --git a/providers/host/pom.xml b/providers/host/pom.xml
index d47ba91..ccb1438 100644
--- a/providers/host/pom.xml
+++ b/providers/host/pom.xml
@@ -33,7 +33,7 @@
         <onos.app.name>org.onosproject.hostprovider</onos.app.name>
         <onos.app.title>Host Location Provider</onos.app.title>
         <onos.app.origin>ON.Lab</onos.app.origin>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Provider</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>ONOS host location provider.</onos.app.readme>
     </properties>
diff --git a/providers/lldp/app.xml b/providers/lldp/app.xml
index f938802..5645fde 100644
--- a/providers/lldp/app.xml
+++ b/providers/lldp/app.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <app name="org.onosproject.lldpprovider" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org" title="LLDP Provider"
+     category="Provider" url="http://onosproject.org" title="LLDP Link Provider"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
diff --git a/providers/lldp/pom.xml b/providers/lldp/pom.xml
index f7e3f1d..93b713a 100644
--- a/providers/lldp/pom.xml
+++ b/providers/lldp/pom.xml
@@ -34,7 +34,7 @@
         <onos.app.name>org.onosproject.lldpprovider</onos.app.name>
         <onos.app.title>LLDP Link Provider</onos.app.title>
         <onos.app.origin>ON.Lab</onos.app.origin>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Provider</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>ONOS LLDP link provider.</onos.app.readme>
     </properties>
diff --git a/providers/netcfghost/pom.xml b/providers/netcfghost/pom.xml
index 76bc50e..e7a8645 100644
--- a/providers/netcfghost/pom.xml
+++ b/providers/netcfghost/pom.xml
@@ -34,9 +34,9 @@
 
     <properties>
         <onos.app.name>org.onosproject.netcfghostprovider</onos.app.name>
-        <onos.app.title>Network Config host Provider</onos.app.title>
+        <onos.app.title>Network Config Host Provider</onos.app.title>
         <onos.app.origin>ON.Lab</onos.app.origin>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Provider</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>Host provider that uses network config service to discover hosts.</onos.app.readme>
     </properties>
diff --git a/providers/netcfglinks/app.xml b/providers/netcfglinks/app.xml
index 10c7700..efa0511 100644
--- a/providers/netcfglinks/app.xml
+++ b/providers/netcfglinks/app.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <app name="org.onosproject.netcfglinksprovider" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org" title="Network Config Link Provider"
+     category="Provider" url="http://onosproject.org" title="Network Config Link Provider"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
diff --git a/providers/netconf/app/app.xml b/providers/netconf/app/app.xml
index 4ef7a0d..ace95be 100644
--- a/providers/netconf/app/app.xml
+++ b/providers/netconf/app/app.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <app name="org.onosproject.netconf" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org" title="NetConf Provider"
+     category="Provider" url="https://wiki.onosproject.org/display/ONOS/NETCONF" title="NETCONF Provider"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
diff --git a/providers/null/pom.xml b/providers/null/pom.xml
index d498c7f..8337e54 100644
--- a/providers/null/pom.xml
+++ b/providers/null/pom.xml
@@ -35,7 +35,7 @@
         <onos.app.name>org.onosproject.null</onos.app.name>
         <onos.app.title>Null Southbound Provider</onos.app.title>
         <onos.app.origin>ON.Lab</onos.app.origin>
-        <onos.app.category>default</onos.app.category>
+        <onos.app.category>Provider</onos.app.category>
         <onos.app.url>http://onosproject.org</onos.app.url>
         <onos.app.readme>ONOS null southbound provider.</onos.app.readme>
     </properties>
diff --git a/providers/openflow/app/pom.xml b/providers/openflow/app/pom.xml
index 58650a0..0e8d04d 100644
--- a/providers/openflow/app/pom.xml
+++ b/providers/openflow/app/pom.xml
@@ -32,6 +32,7 @@
     <properties>
         <onos.app.name>org.onosproject.openflow</onos.app.name>
         <onos.app.title>OpenFlow Southbound Meta App</onos.app.title>
+        <onos.app.category>Provider</onos.app.category>
         <onos.app.requires>
             org.onosproject.openflow-base,
             org.onosproject.hostprovider,
diff --git a/providers/openflow/base/app.xml b/providers/openflow/base/app.xml
index 2567ce6..fd6dc64 100644
--- a/providers/openflow/base/app.xml
+++ b/providers/openflow/base/app.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <app name="org.onosproject.openflow-base" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org" title="OpenFlow Provider"
+     category="Provider" url="http://onosproject.org" title="OpenFlow Provider"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
diff --git a/providers/openflow/message/app.xml b/providers/openflow/message/app.xml
index 034fc35..c01d515 100644
--- a/providers/openflow/message/app.xml
+++ b/providers/openflow/message/app.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <app name="org.onosproject.openflow-message" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org" title="Control Message Stat. Provider"
+     category="Provider" url="http://onosproject.org" title="Control Message Stats Provider"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
diff --git a/providers/ovsdb/app/pom.xml b/providers/ovsdb/app/pom.xml
index fa69bad..b30720d 100644
--- a/providers/ovsdb/app/pom.xml
+++ b/providers/ovsdb/app/pom.xml
@@ -32,6 +32,7 @@
     <properties>
         <onos.app.name>org.onosproject.ovsdb</onos.app.name>
         <onos.app.title>OVSDB Southbound Meta App</onos.app.title>
+        <onos.app.category>Provider</onos.app.category>
         <onos.app.requires>
             org.onosproject.ovsdb-base,
             org.onosproject.ovsdbhostprovider
diff --git a/providers/ovsdb/base/app.xml b/providers/ovsdb/base/app.xml
index b752f6d..32b3e1f 100644
--- a/providers/ovsdb/base/app.xml
+++ b/providers/ovsdb/base/app.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <app name="org.onosproject.ovsdb-base" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org" title="OVSDB Provider"
+     category="Provider" url="http://onosproject.org" title="OVSDB Provider"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
diff --git a/providers/pcep/app/app.xml b/providers/pcep/app/app.xml
index 80b9942..c3090b0 100644
--- a/providers/pcep/app/app.xml
+++ b/providers/pcep/app/app.xml
@@ -15,13 +15,13 @@
   ~ limitations under the License.
   -->
 <app name="org.onosproject.pcep" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org" title="PCEP Provider"
+     category="Provider" url="http://onosproject.org" title="PCEP Provider"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
     <artifact>mvn:${project.groupId}/onos-app-pcep-api/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-pcepio/${project.version}</artifact>     
-    <artifact>mvn:${project.groupId}/onos-pcep-controller-api/${project.version}</artifact>     
+    <artifact>mvn:${project.groupId}/onos-pcepio/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-pcep-controller-api/${project.version}</artifact>
     <artifact>mvn:${project.groupId}/onos-pcep-controller-impl/${project.version}</artifact>
     <artifact>mvn:${project.groupId}/onos-pcep-provider-topology/${project.version}</artifact>
     <artifact>mvn:${project.groupId}/onos-pcep-provider-tunnel/${project.version}</artifact>
diff --git a/providers/rest/app/app.xml b/providers/rest/app/app.xml
index 408e36a..7dadc3a 100644
--- a/providers/rest/app/app.xml
+++ b/providers/rest/app/app.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <app name="org.onosproject.restsb" origin="ON.Lab" version="${project.version}"
-     category="default" url="http://onosproject.org" title="REST Provider"
+     category="Provider" url="https://wiki.onosproject.org/display/ONOS/REST" title="REST/SB Provider"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>
diff --git a/providers/snmp/app/app.xml b/providers/snmp/app/app.xml
index 3ca51eb..625021d 100644
--- a/providers/snmp/app/app.xml
+++ b/providers/snmp/app/app.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <app name="org.onosproject.snmp" origin="BTI Systems" version="${project.version}"
-     category="default" url="http://onosproject.org" title="SNMP Provider"
+     category="Provider" url="http://onosproject.org" title="SNMP Provider"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
      features="${project.artifactId}">
     <description>${project.description}</description>