diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 00000000..5008ddfc
Binary files /dev/null and b/.DS_Store differ
diff --git a/analytics/adx/create-database/pom.xml b/analytics/adx/create-database/pom.xml
index 05cc45d7..295b8f63 100644
--- a/analytics/adx/create-database/pom.xml
+++ b/analytics/adx/create-database/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>adx-create-database</artifactId>
     <packaging>pom</packaging>
-    <name>Create a database</name>
+    <name>Analytics :: Data Explorer :: Create a database</name>
 </project>
diff --git a/analytics/adx/create-table/pom.xml b/analytics/adx/create-table/pom.xml
index bc897267..16e28137 100644
--- a/analytics/adx/create-table/pom.xml
+++ b/analytics/adx/create-table/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>adx-create-table</artifactId>
     <packaging>pom</packaging>
-    <name>Create a table</name>
+    <name>Analytics :: Data Explorer :: Create a table</name>
 </project>
diff --git a/analytics/adx/create/pom.xml b/analytics/adx/create/pom.xml
index 42d5f6f3..c52dc07b 100644
--- a/analytics/adx/create/pom.xml
+++ b/analytics/adx/create/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>adx-create</artifactId>
     <packaging>pom</packaging>
-    <name>Create an Azure Data Explorer cluster</name>
+    <name>Analytics :: Data Explorer :: Create an Azure Data Explorer cluster</name>
 </project>
diff --git a/analytics/adx/ingest-client/pom.xml b/analytics/adx/ingest-client/pom.xml
index 65e10777..27db14e4 100644
--- a/analytics/adx/ingest-client/pom.xml
+++ b/analytics/adx/ingest-client/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>adx-ingest-client</artifactId>
     <packaging>jar</packaging>
-    <name>Ingest Client</name>
+    <name>Analytics :: Data Explorer :: Ingest Client</name>
     <build>
         <finalName>ingest</finalName>
         <plugins>
diff --git a/analytics/adx/pom.xml b/analytics/adx/pom.xml
index 60896965..d04d21fc 100644
--- a/analytics/adx/pom.xml
+++ b/analytics/adx/pom.xml
@@ -10,7 +10,7 @@
     <groupId>examples.azure.analytics.adx</groupId>
     <artifactId>project</artifactId>
     <packaging>pom</packaging>
-    <name>Azure Data Explorer examples</name>
+    <name>Analytics :: Data Explorer</name>
     <modules>
         <module>create</module>
         <module>create-database</module>
diff --git a/analytics/eventhubs/create-eventhub/pom.xml b/analytics/eventhubs/create-eventhub/pom.xml
index d116aec5..d794b095 100644
--- a/analytics/eventhubs/create-eventhub/pom.xml
+++ b/analytics/eventhubs/create-eventhub/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>eventhubs-create-eventhub</artifactId>
     <packaging>pom</packaging>
-    <name>Create an event hub</name>
+    <name>Analytics :: Event Hubs :: Create an event hub</name>
 </project>
diff --git a/analytics/eventhubs/create-namespace/pom.xml b/analytics/eventhubs/create-namespace/pom.xml
index b1408ac1..37a16f4b 100644
--- a/analytics/eventhubs/create-namespace/pom.xml
+++ b/analytics/eventhubs/create-namespace/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>eventhubs-create-namespace</artifactId>
     <packaging>pom</packaging>
-    <name>Create a namespace</name>
+    <name>Analytics :: Event Hubs :: Create a namespace</name>
 </project>
diff --git a/analytics/eventhubs/pom.xml b/analytics/eventhubs/pom.xml
index e77be9b8..c5cf435a 100644
--- a/analytics/eventhubs/pom.xml
+++ b/analytics/eventhubs/pom.xml
@@ -10,7 +10,7 @@
     <groupId>examples.azure.analytics.eventhubs</groupId>
     <artifactId>project</artifactId>
     <packaging>pom</packaging>
-    <name>Azure Event Hubs examples</name>
+    <name>Analytics :: Event Hubs</name>
     <modules>
         <module>create-eventhub</module>
         <module>create-namespace</module>
diff --git a/analytics/eventhubs/receive-event/pom.xml b/analytics/eventhubs/receive-event/pom.xml
index 4198d690..2cdc12b1 100644
--- a/analytics/eventhubs/receive-event/pom.xml
+++ b/analytics/eventhubs/receive-event/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>eventhubs-receive-event</artifactId>
     <packaging>jar</packaging>
-    <name>Receive an event</name>
+    <name>Analytics :: Event Hubs :: Receive an event</name>
     <build>
         <finalName>receive-event</finalName>
         <plugins>
diff --git a/analytics/eventhubs/send-event/pom.xml b/analytics/eventhubs/send-event/pom.xml
index a2c7152a..35a36a87 100644
--- a/analytics/eventhubs/send-event/pom.xml
+++ b/analytics/eventhubs/send-event/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>eventhubs-send-event</artifactId>
     <packaging>jar</packaging>
-    <name>Send an event</name>
+    <name>Analytics :: Event Hubs :: Send an event</name>
     <build>
         <finalName>send-event</finalName>
         <plugins>
diff --git a/compute/appservice/create-deployment-slot/pom.xml b/compute/appservice/create-deployment-slot/pom.xml
index 06865ce1..71e06c91 100644
--- a/compute/appservice/create-deployment-slot/pom.xml
+++ b/compute/appservice/create-deployment-slot/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>appservice-create-deployment-slot</artifactId>
     <packaging>pom</packaging>
-    <name>Create a deployment slot</name>
+    <name>Compute :: App Service :: Create a deployment slot</name>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
diff --git a/compute/appservice/create-plan/pom.xml b/compute/appservice/create-plan/pom.xml
index afe7d886..c8cab9e3 100644
--- a/compute/appservice/create-plan/pom.xml
+++ b/compute/appservice/create-plan/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>appservice-create-plan</artifactId>
     <packaging>pom</packaging>
-    <name>Create an App Service Plan</name>
+    <name>Compute :: App Service :: Create an App Service Plan</name>
 </project>
diff --git a/compute/appservice/delete-plan/pom.xml b/compute/appservice/delete-plan/pom.xml
index f5913781..a6518531 100644
--- a/compute/appservice/delete-plan/pom.xml
+++ b/compute/appservice/delete-plan/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>appservice-delete-plan</artifactId>
     <packaging>pom</packaging>
-    <name>Delete an App Service Plan</name>
+    <name>Compute :: App Service :: Delete an App Service Plan</name>
 </project>
diff --git a/compute/appservice/delete-webapp/pom.xml b/compute/appservice/delete-webapp/pom.xml
index 10dab215..d6b80920 100644
--- a/compute/appservice/delete-webapp/pom.xml
+++ b/compute/appservice/delete-webapp/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>appservice-delete-webapp</artifactId>
     <packaging>pom</packaging>
-    <name>Delete your web application</name>
+    <name>Compute :: App Service :: Delete your web application</name>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
diff --git a/compute/appservice/deploy-to-deployment-slot/pom.xml b/compute/appservice/deploy-to-deployment-slot/pom.xml
index 44af4145..c05cba66 100644
--- a/compute/appservice/deploy-to-deployment-slot/pom.xml
+++ b/compute/appservice/deploy-to-deployment-slot/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>appservice-deploy-to-deployment-slot</artifactId>
     <packaging>war</packaging>
-    <name>Deploy to a deployment slot</name>
+    <name>Compute :: App Service :: Deploy to a deployment slot</name>
     <build>
         <plugins>
             <plugin>
diff --git a/compute/appservice/docker-glassfish/pom.xml b/compute/appservice/docker-glassfish/pom.xml
index f2e99614..e0a0b566 100644
--- a/compute/appservice/docker-glassfish/pom.xml
+++ b/compute/appservice/docker-glassfish/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>appservice-docker-glassfish</artifactId>
     <packaging>pom</packaging>
-    <name>Deploy Glassfish using a Docker image</name>
+    <name>Compute :: App Service :: Deploy Glassfish using a Docker image</name>
     <build>
         <plugins>
             <plugin>
diff --git a/compute/appservice/docker-graalvm/pom.xml b/compute/appservice/docker-graalvm/pom.xml
index cad96b9e..0b305c89 100644
--- a/compute/appservice/docker-graalvm/pom.xml
+++ b/compute/appservice/docker-graalvm/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>appservice-docker-graalvm</artifactId>
     <packaging>pom</packaging>
-    <name>Deploy a GraalVM application using a Docker image</name>
+    <name>Compute :: App Service :: Deploy a GraalVM application using a Docker image</name>
     <build>
         <plugins>
             <plugin>
diff --git a/compute/appservice/docker-jetty/pom.xml b/compute/appservice/docker-jetty/pom.xml
index 7423854f..dce3ffcd 100644
--- a/compute/appservice/docker-jetty/pom.xml
+++ b/compute/appservice/docker-jetty/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>appservice-docker-jetty</artifactId>
     <packaging>pom</packaging>
-    <name>Deploy Jetty using a Docker image</name>
+    <name>Compute :: App Service :: Deploy Jetty using a Docker image</name>
     <build>
         <plugins>
             <plugin>
diff --git a/compute/appservice/docker-payara/pom.xml b/compute/appservice/docker-payara/pom.xml
index 0d9e55ae..140b51c2 100644
--- a/compute/appservice/docker-payara/pom.xml
+++ b/compute/appservice/docker-payara/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>appservice-docker-payara</artifactId>
     <packaging>pom</packaging>
-    <name>Deploy Payara using a Docker image</name>
+    <name>Compute :: App Service :: Deploy Payara using a Docker image</name>
     <build>
         <plugins>
             <plugin>
diff --git a/compute/appservice/docker-tomcat/pom.xml b/compute/appservice/docker-tomcat/pom.xml
index d02c7b84..264cf579 100644
--- a/compute/appservice/docker-tomcat/pom.xml
+++ b/compute/appservice/docker-tomcat/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>appservice-docker-tomcat</artifactId>
     <packaging>pom</packaging>
-    <name>Deploy Tomcat using a Docker image</name>
+    <name>Compute :: App Service :: Deploy Tomcat using a Docker image</name>
     <build>
         <plugins>
             <plugin>
diff --git a/compute/appservice/docker-wildfly/pom.xml b/compute/appservice/docker-wildfly/pom.xml
index 24583d44..a7a94a2b 100644
--- a/compute/appservice/docker-wildfly/pom.xml
+++ b/compute/appservice/docker-wildfly/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>appservice-docker-wildfly</artifactId>
     <packaging>pom</packaging>
-    <name>Deploy WildFly using a Docker image</name>
+    <name>Compute :: App Service :: Deploy WildFly using a Docker image</name>
     <build>
         <plugins>
             <plugin>
diff --git a/compute/appservice/javase-quarkus/pom.xml b/compute/appservice/javase-quarkus/pom.xml
index 010b4832..35be170c 100644
--- a/compute/appservice/javase-quarkus/pom.xml
+++ b/compute/appservice/javase-quarkus/pom.xml
@@ -8,7 +8,7 @@
         <version>1-SNAPSHOT</version>
     </parent>
     <artifactId>appservice-javase-quarkus</artifactId>
-    <name>Deploy a managed JavaSE Quarkus application</name>
+    <name>Compute :: App Service :: Deploy a managed JavaSE Quarkus application</name>
     <properties>
         <compiler-plugin.version>3.8.1</compiler-plugin.version>
         <maven.compiler.parameters>true</maven.compiler.parameters>
diff --git a/compute/appservice/javase-springboot/pom.xml b/compute/appservice/javase-springboot/pom.xml
index c51df293..3e1c94d6 100644
--- a/compute/appservice/javase-springboot/pom.xml
+++ b/compute/appservice/javase-springboot/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>appservice-javase-springboot</artifactId>
     <packaging>jar</packaging>
-    <name>Deploy a Spring Boot Application using managed JavaSE</name>
+    <name>Compute :: App Service :: Deploy a Spring Boot Application using managed JavaSE</name>
     <build>
         <plugins>
             <plugin>
diff --git a/compute/appservice/jboss-eap-helloworld/pom.xml b/compute/appservice/jboss-eap-helloworld/pom.xml
index 89035564..7b53c0e3 100644
--- a/compute/appservice/jboss-eap-helloworld/pom.xml
+++ b/compute/appservice/jboss-eap-helloworld/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>appservice-jboss-eap-helloworld</artifactId>
     <packaging>war</packaging>
-    <name>Deploy a web application on a managed JBoss EAP</name>
+    <name>Compute :: App Service :: Deploy a web application on a managed JBoss EAP</name>
     <build>
         <plugins>
             <plugin>
diff --git a/compute/appservice/list-webapp/pom.xml b/compute/appservice/list-webapp/pom.xml
index 2fd53f49..c62541b6 100644
--- a/compute/appservice/list-webapp/pom.xml
+++ b/compute/appservice/list-webapp/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>appservice-list-webapp</artifactId>
     <packaging>pom</packaging>
-    <name>List your web applications</name>
+    <name>Compute :: App Service :: List your web applications</name>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
diff --git a/compute/appservice/pom.xml b/compute/appservice/pom.xml
index 29f27056..02fb4032 100644
--- a/compute/appservice/pom.xml
+++ b/compute/appservice/pom.xml
@@ -10,7 +10,7 @@
     <groupId>examples.azure.compute.appservice</groupId>
     <artifactId>project</artifactId>
     <packaging>pom</packaging>
-    <name>Azure App Service examples</name>
+    <name>Compute :: App Service</name>
     <modules>
         <module>create-deployment-slot</module>
         <module>create-plan</module>
diff --git a/compute/appservice/scale-manually/pom.xml b/compute/appservice/scale-manually/pom.xml
index 6c9e0a92..23e93e14 100644
--- a/compute/appservice/scale-manually/pom.xml
+++ b/compute/appservice/scale-manually/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>appservice-scale-manually</artifactId>
     <packaging>pom</packaging>
-    <name>Scale your App Service Plan manually</name>
+    <name>Compute :: App Service :: Scale your App Service Plan manually</name>
 </project>
diff --git a/compute/appservice/swap-deployment-slot/pom.xml b/compute/appservice/swap-deployment-slot/pom.xml
index 1fb2d495..37aaed8f 100644
--- a/compute/appservice/swap-deployment-slot/pom.xml
+++ b/compute/appservice/swap-deployment-slot/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>appservice-swap-deployment-slot</artifactId>
     <packaging>pom</packaging>
-    <name>Swap a deployment slot</name>
+    <name>Compute :: App Service :: Swap a deployment slot</name>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
diff --git a/compute/appservice/tomcat-helloworld/pom.xml b/compute/appservice/tomcat-helloworld/pom.xml
index ecb4d5c1..df8cd355 100644
--- a/compute/appservice/tomcat-helloworld/pom.xml
+++ b/compute/appservice/tomcat-helloworld/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>appservice-tomcat-helloworld</artifactId>
     <packaging>war</packaging>
-    <name>Deploy a web application on a managed Tomcat</name>
+    <name>Compute :: App Service :: Deploy a web application on a managed Tomcat</name>
     <build>
         <plugins>
             <plugin>
diff --git a/compute/functions/cosmosdb-output/pom.xml b/compute/functions/cosmosdb-output/pom.xml
index eb7b36d1..baaeacf8 100644
--- a/compute/functions/cosmosdb-output/pom.xml
+++ b/compute/functions/cosmosdb-output/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>functions-cosmosdb-output</artifactId>
     <packaging>jar</packaging>
-    <name>Deploy a Java Function storing data in Cosmos DB</name>
+    <name>Compute :: Functions :: Deploy a Java Function storing data in Cosmos DB</name>
     <build>
         <plugins>
             <plugin>
diff --git a/compute/functions/install-tools/pom.xml b/compute/functions/install-tools/pom.xml
index 6d9a7bb8..642f37d3 100644
--- a/compute/functions/install-tools/pom.xml
+++ b/compute/functions/install-tools/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>functions-install-tools</artifactId>
     <packaging>pom</packaging>
-    <name>Install Azure Functions Core Tools</name>
+    <name>Compute :: Functions :: Install Azure Functions Core Tools</name>
 </project>
diff --git a/compute/functions/java/pom.xml b/compute/functions/java/pom.xml
index a268b51c..b3bfdf57 100644
--- a/compute/functions/java/pom.xml
+++ b/compute/functions/java/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>functions-java</artifactId>
     <packaging>jar</packaging>
-    <name>Deploy a Java Function</name>
+    <name>Compute :: Functions :: Deploy a Java Function</name>
     <build>
         <plugins>
             <plugin>
diff --git a/compute/functions/pom.xml b/compute/functions/pom.xml
index df6fbf54..e47f6ab9 100644
--- a/compute/functions/pom.xml
+++ b/compute/functions/pom.xml
@@ -10,7 +10,7 @@
     <groupId>examples.azure.compute.functions</groupId>
     <artifactId>project</artifactId>
     <packaging>pom</packaging>
-    <name>Azure Functions examples</name>
+    <name>Compute :: Functions</name>
     <modules>
         <module>cosmosdb-output</module>
         <module>install-tools</module>
diff --git a/compute/spring-cloud/config-server/pom.xml b/compute/spring-cloud/config-server/pom.xml
index 02dcde75..26d6492a 100644
--- a/compute/spring-cloud/config-server/pom.xml
+++ b/compute/spring-cloud/config-server/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>springcloud-config-server</artifactId>
     <packaging>pom</packaging>
-    <name>Configure the Azure Spring Cloud Config Server</name>
+    <name>Compute :: Spring Cloud :: Configure the Azure Spring Cloud Config Server</name>
 </project>
diff --git a/compute/spring-cloud/create/pom.xml b/compute/spring-cloud/create/pom.xml
index 3579db33..a9c01701 100644
--- a/compute/spring-cloud/create/pom.xml
+++ b/compute/spring-cloud/create/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>springcloud-create</artifactId>
     <packaging>pom</packaging>
-    <name>Create an Azure Spring Cloud</name>
+    <name>Compute :: Spring Cloud :: Create an Azure Spring Cloud</name>
 </project>
diff --git a/compute/spring-cloud/helloworld/pom.xml b/compute/spring-cloud/helloworld/pom.xml
index 96ba12e9..5f574955 100644
--- a/compute/spring-cloud/helloworld/pom.xml
+++ b/compute/spring-cloud/helloworld/pom.xml
@@ -11,7 +11,7 @@
     <groupId>examples.azure.compute.springcloud</groupId>
     <artifactId>springcloud-helloworld</artifactId>
     <version>1-SNAPSHOT</version>
-    <name>Deploy a Spring Boot application to an Azure Spring Cloud</name>
+    <name>Compute :: Spring Cloud :: Deploy a Spring Boot application to an Azure Spring Cloud</name>
 
     <properties>
         <example.appName>${example.prefix}-springcloud-helloworld</example.appName>
diff --git a/compute/spring-cloud/pom.xml b/compute/spring-cloud/pom.xml
index 9099de67..2685469d 100644
--- a/compute/spring-cloud/pom.xml
+++ b/compute/spring-cloud/pom.xml
@@ -10,7 +10,7 @@
     <groupId>examples.azure.compute.springcloud</groupId>
     <artifactId>project</artifactId>
     <packaging>pom</packaging>
-    <name>Azure Spring Cloud examples</name>
+    <name>Compute :: Spring Cloud</name>
     <modules>
         <module>create</module>
         <module>config-server</module>
diff --git a/containers/aci/pom.xml b/containers/aci/pom.xml
index ec4703d6..518ebcc9 100644
--- a/containers/aci/pom.xml
+++ b/containers/aci/pom.xml
@@ -10,7 +10,7 @@
     <groupId>examples.azure.containers.aci</groupId>
     <artifactId>project</artifactId>
     <packaging>pom</packaging>
-    <name>Azure Container Instance examples</name>
+    <name>Containers :: Container Instance</name>
     <modules>
         <module>quarkus</module>
         <module>tomcat</module>
diff --git a/containers/aci/quarkus/pom.xml b/containers/aci/quarkus/pom.xml
index 531253bb..8a324cb4 100644
--- a/containers/aci/quarkus/pom.xml
+++ b/containers/aci/quarkus/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>aci-quarkus</artifactId>
     <packaging>pom</packaging>
-    <name>Deploy a Quarkus application</name>
+    <name>Containers :: Container Instance :: Deploy a Quarkus application</name>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
diff --git a/containers/aci/tomcat/pom.xml b/containers/aci/tomcat/pom.xml
index c2ffed46..d86735d5 100644
--- a/containers/aci/tomcat/pom.xml
+++ b/containers/aci/tomcat/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>aci-tomcat</artifactId>
     <packaging>pom</packaging>
-    <name>Deploy Tomcat</name>
+    <name>Containers :: Container Instance :: Deploy Tomcat</name>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
diff --git a/containers/aci/wildfly/pom.xml b/containers/aci/wildfly/pom.xml
index e7ca3b9e..2e5da662 100644
--- a/containers/aci/wildfly/pom.xml
+++ b/containers/aci/wildfly/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>aci-deploy-wildfly</artifactId>
     <packaging>pom</packaging>
-    <name>Deploy WildFly</name>
+    <name>Containers :: Container Instance :: Deploy WildFly</name>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
diff --git a/containers/acr/create-acrpull-service-principal/pom.xml b/containers/acr/create-acrpull-service-principal/pom.xml
index 2ca610fd..826c4714 100644
--- a/containers/acr/create-acrpull-service-principal/pom.xml
+++ b/containers/acr/create-acrpull-service-principal/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>acr-create-acrpull-service-principal</artifactId>
     <packaging>pom</packaging>
-    <name>Create an 'acrpull' Service Principal</name>
+    <name>Containers :: Container Registry :: Create an 'acrpull' Service Principal</name>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
diff --git a/containers/acr/create-settings-xml/pom.xml b/containers/acr/create-settings-xml/pom.xml
index 62bb17bb..7aa25449 100644
--- a/containers/acr/create-settings-xml/pom.xml
+++ b/containers/acr/create-settings-xml/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>acr-create-settings-xml</artifactId>
     <packaging>pom</packaging>
-    <name>Create settings.xml using admin access keys</name>
+    <name>Containers :: Container Registry :: Create settings.xml using admin access keys</name>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
diff --git a/containers/acr/create/pom.xml b/containers/acr/create/pom.xml
index ba60b111..2a4f2d9d 100644
--- a/containers/acr/create/pom.xml
+++ b/containers/acr/create/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>acr-create</artifactId>
     <packaging>pom</packaging>
-    <name>Create an Azure Container Registry</name>
+    <name>Containers :: Container Registry :: Create an Azure Container Registry</name>
 </project>
diff --git a/containers/acr/glassfish/pom.xml b/containers/acr/glassfish/pom.xml
index 9e0cb080..3c0461c6 100644
--- a/containers/acr/glassfish/pom.xml
+++ b/containers/acr/glassfish/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>acr-glassfish</artifactId>
     <packaging>war</packaging>
-    <name>Push a Glassfish Docker image to Azure Container Registry</name>
+    <name>Containers :: Container Registry :: Push a Glassfish Docker image to Azure Container Registry</name>
     <build>
         <finalName>ROOT</finalName>
     </build>
diff --git a/containers/acr/graalvm/pom.xml b/containers/acr/graalvm/pom.xml
index 6ffb9f3d..3305549f 100644
--- a/containers/acr/graalvm/pom.xml
+++ b/containers/acr/graalvm/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>acr-graalvm</artifactId>
     <packaging>jar</packaging>
-    <name>Create a GraalVM application using a Docker image and push it to Azure Container Registry</name>
+    <name>Containers :: Container Registry :: Create a GraalVM application using a Docker image and push it to Azure Container Registry</name>
     <build>
         <finalName>graalvm</finalName>
         <plugins>
diff --git a/containers/acr/jetty/pom.xml b/containers/acr/jetty/pom.xml
index eaaf1d6d..c820d86a 100644
--- a/containers/acr/jetty/pom.xml
+++ b/containers/acr/jetty/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>acr-jetty</artifactId>
     <packaging>war</packaging>
-    <name>Push a Jetty Docker image to Azure Container Registry</name>
+    <name>Containers :: Container Registry :: Push a Jetty Docker image to Azure Container Registry</name>
     <build>
         <finalName>ROOT</finalName>
     </build>
diff --git a/containers/acr/payara/pom.xml b/containers/acr/payara/pom.xml
index 5153099f..a098dbba 100644
--- a/containers/acr/payara/pom.xml
+++ b/containers/acr/payara/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>acr-payara</artifactId>
     <packaging>war</packaging>
-    <name>Push a Payara Docker image to Azure Container Registry</name>
+    <name>Containers :: Container Registry :: Push a Payara Docker image to Azure Container Registry</name>
     <build>
         <finalName>ROOT</finalName>
     </build>
diff --git a/containers/acr/pom.xml b/containers/acr/pom.xml
index 30677b3f..65297f0a 100644
--- a/containers/acr/pom.xml
+++ b/containers/acr/pom.xml
@@ -10,7 +10,7 @@
     <groupId>examples.azure.containers.acr</groupId>
     <artifactId>project</artifactId>
     <packaging>pom</packaging>
-    <name>Azure Container Registry examples</name>
+    <name>Containers :: Container Registry</name>
     <modules>
         <module>create</module>
         <module>create-settings-xml</module>
diff --git a/containers/acr/quarkus/pom.xml b/containers/acr/quarkus/pom.xml
index 459cc0ae..eeea28b8 100644
--- a/containers/acr/quarkus/pom.xml
+++ b/containers/acr/quarkus/pom.xml
@@ -8,7 +8,7 @@
         <version>1-SNAPSHOT</version>
     </parent>
     <artifactId>acr-quarkus</artifactId>
-    <name>Create a Quarkus application packaged as a Docker image</name>
+    <name>Containers :: Container Registry :: Create a Quarkus application packaged as a Docker image</name>
     <properties>
         <compiler-plugin.version>3.8.1</compiler-plugin.version>
         <maven.compiler.parameters>true</maven.compiler.parameters>
diff --git a/containers/acr/tomcat/pom.xml b/containers/acr/tomcat/pom.xml
index 0aa40dd1..1c70fd4b 100644
--- a/containers/acr/tomcat/pom.xml
+++ b/containers/acr/tomcat/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>acr-tomcat</artifactId>
     <packaging>war</packaging>
-    <name>Push a Tomcat Docker image to Azure Container Registry</name>
+    <name>Containers :: Container Registry :: Push a Tomcat Docker image to Azure Container Registry</name>
     <build>
         <finalName>ROOT</finalName>
     </build>
diff --git a/containers/acr/wildfly/pom.xml b/containers/acr/wildfly/pom.xml
index 99228283..841f8007 100644
--- a/containers/acr/wildfly/pom.xml
+++ b/containers/acr/wildfly/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>acr-wildfly</artifactId>
     <packaging>war</packaging>
-    <name>Push a WildFly Docker image to Azure Container Registry</name>
+    <name>Containers :: Container Registry :: Push a WildFly Docker image to Azure Container Registry</name>
     <build>
         <finalName>ROOT</finalName>
     </build>
diff --git a/containers/aks/create-kube-config/pom.xml b/containers/aks/create-kube-config/pom.xml
index 48f8b15e..be05209e 100644
--- a/containers/aks/create-kube-config/pom.xml
+++ b/containers/aks/create-kube-config/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>aks-create-kube-config</artifactId>
     <packaging>pom</packaging>
-    <name>Create Kube config using admin access</name>
+    <name>Containers :: Kubernetes :: Create Kube config using admin access</name>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
diff --git a/containers/aks/create/pom.xml b/containers/aks/create/pom.xml
index 0f69e026..683fd50e 100644
--- a/containers/aks/create/pom.xml
+++ b/containers/aks/create/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>aks-create</artifactId>
     <packaging>pom</packaging>
-    <name>Create an Azure Kubernetes Service cluster</name>
+    <name>Containers :: Kubernetes :: Create an Azure Kubernetes Service cluster</name>
 </project>
diff --git a/containers/aks/pom.xml b/containers/aks/pom.xml
index 5177ee9a..368eefde 100644
--- a/containers/aks/pom.xml
+++ b/containers/aks/pom.xml
@@ -10,7 +10,7 @@
     <groupId>examples.azure.containers.aks</groupId>
     <artifactId>project</artifactId>
     <packaging>pom</packaging>
-    <name>Azure Kubernetes Service examples</name>
+    <name>Containers :: Kubernetes</name>
     <modules>
         <module>create</module>
         <module>create-kube-config</module>
diff --git a/containers/aks/springboot/pom.xml b/containers/aks/springboot/pom.xml
index 373600ec..718c2cc0 100644
--- a/containers/aks/springboot/pom.xml
+++ b/containers/aks/springboot/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>aks-springboot</artifactId>
     <packaging>jar</packaging>
-    <name>Deploy a Spring Boot application</name>
+    <name>Containers :: Kubernetes :: Deploy a Spring Boot application</name>
     <build>
         <plugins>
             <plugin>
diff --git a/containers/aks/tomcat/pom.xml b/containers/aks/tomcat/pom.xml
index 542013a6..2d9db25e 100644
--- a/containers/aks/tomcat/pom.xml
+++ b/containers/aks/tomcat/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>aks-tomcat</artifactId>
     <packaging>pom</packaging>
-    <name>Deploy Tomcat</name>
+    <name>Containers :: Kubernetes :: Deploy Tomcat</name>
 </project>
diff --git a/containers/aks/use-your-acr/pom.xml b/containers/aks/use-your-acr/pom.xml
index 75b25511..e54a962e 100644
--- a/containers/aks/use-your-acr/pom.xml
+++ b/containers/aks/use-your-acr/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>aks-use-your-acr-registry</artifactId>
     <packaging>pom</packaging>
-    <name>Update your AKS cluster to use your Azure Container Registry</name>
+    <name>Containers :: Kubernetes :: Update your AKS cluster to use your Azure Container Registry</name>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
diff --git a/containers/aks/wildfly/pom.xml b/containers/aks/wildfly/pom.xml
index c3bf65e9..b71445ce 100644
--- a/containers/aks/wildfly/pom.xml
+++ b/containers/aks/wildfly/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>aks-wildfly</artifactId>
     <packaging>pom</packaging>
-    <name>Deploy WildFly</name>
+    <name>Containers :: Kubernetes :: Deploy WildFly</name>
 </project>
diff --git a/containers/aro/create/pom.xml b/containers/aro/create/pom.xml
index 43ee16c0..53553c55 100644
--- a/containers/aro/create/pom.xml
+++ b/containers/aro/create/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>aro-create</artifactId>
     <packaging>pom</packaging>
-    <name>Deploy Azure Redhat OpenShift</name>
+    <name>Containers :: OpenShift :: Deploy Azure Redhat OpenShift</name>
 </project>
diff --git a/containers/aro/pom.xml b/containers/aro/pom.xml
index 4cb2594d..0a9dc345 100644
--- a/containers/aro/pom.xml
+++ b/containers/aro/pom.xml
@@ -10,7 +10,7 @@
     <groupId>examples.azure.containers.aro</groupId>
     <artifactId>project</artifactId>
     <packaging>pom</packaging>
-    <name>Azure Redhat OpenShift examples</name>
+    <name>Containers :: OpenShift</name>
     <modules>
         <module>create</module>
     </modules>
diff --git a/databases/cosmosdb/cosmos-to-storage/pom.xml b/databases/cosmosdb/cosmos-to-storage/pom.xml
index 6714bdae..5f4e3f8d 100644
--- a/databases/cosmosdb/cosmos-to-storage/pom.xml
+++ b/databases/cosmosdb/cosmos-to-storage/pom.xml
@@ -11,7 +11,7 @@
     <groupId>examples.azure.databases.cosmosdb</groupId>
     <artifactId>cosmosdb-cosmos-to-storage</artifactId>
     <version>1-SNAPSHOT</version>
-    <name>Cosmos DB to Azure Storage</name>
+    <name>Databases :: Cosmos DB :: Cosmos DB to Azure Storage</name>
     <build>
         <plugins>
             <plugin>
diff --git a/databases/cosmosdb/create-sql-container/pom.xml b/databases/cosmosdb/create-sql-container/pom.xml
index 157b480c..86bef36d 100644
--- a/databases/cosmosdb/create-sql-container/pom.xml
+++ b/databases/cosmosdb/create-sql-container/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>cosmosdb-create-sql-container</artifactId>
     <packaging>pom</packaging>
-    <name>Create a SQL container</name>
+    <name>Databases :: Cosmos DB :: Create a SQL container</name>
 </project>
diff --git a/databases/cosmosdb/create-sql-database/pom.xml b/databases/cosmosdb/create-sql-database/pom.xml
index 78395250..214ffabf 100644
--- a/databases/cosmosdb/create-sql-database/pom.xml
+++ b/databases/cosmosdb/create-sql-database/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>cosmosdb-create-sql-database</artifactId>
     <packaging>pom</packaging>
-    <name>Create a SQL database</name>
+    <name>Databases :: Cosmos DB :: Create a SQL database</name>
 </project>
diff --git a/databases/cosmosdb/create-sql-leases-container/pom.xml b/databases/cosmosdb/create-sql-leases-container/pom.xml
index bfee19c9..40b5aa98 100644
--- a/databases/cosmosdb/create-sql-leases-container/pom.xml
+++ b/databases/cosmosdb/create-sql-leases-container/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>cosmosdb-create-sql-leases-container</artifactId>
     <packaging>pom</packaging>
-    <name>Create a SQL leases container</name>
+    <name>Databases :: Cosmos DB :: Create a SQL leases container</name>
 </project>
diff --git a/databases/cosmosdb/create/pom.xml b/databases/cosmosdb/create/pom.xml
index ac64b101..b7d8ba34 100644
--- a/databases/cosmosdb/create/pom.xml
+++ b/databases/cosmosdb/create/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>cosmosdb-create</artifactId>
     <packaging>pom</packaging>
-    <name>Create an Azure Cosmos DB</name>
+    <name>Databases :: Cosmos DB :: Create an Azure Cosmos DB</name>
 </project>
diff --git a/databases/cosmosdb/insert-item-into-sql-container/pom.xml b/databases/cosmosdb/insert-item-into-sql-container/pom.xml
index febfb60e..7d5c1702 100644
--- a/databases/cosmosdb/insert-item-into-sql-container/pom.xml
+++ b/databases/cosmosdb/insert-item-into-sql-container/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>cosmosdb-insert-item-into-sql-container</artifactId>
     <packaging>jar</packaging>
-    <name>Insert an item into a SQL container</name>
+    <name>Databases :: Cosmos DB :: Insert an item into a SQL container</name>
     <build>
         <finalName>insert-item</finalName>
         <plugins>
diff --git a/databases/cosmosdb/pom.xml b/databases/cosmosdb/pom.xml
index 93792a3a..6dd8f1f0 100644
--- a/databases/cosmosdb/pom.xml
+++ b/databases/cosmosdb/pom.xml
@@ -10,7 +10,7 @@
     <groupId>examples.azure.databases.cosmosdb</groupId>
     <artifactId>project</artifactId>
     <packaging>pom</packaging>
-    <name>Azure Cosmos DB examples</name>
+    <name>Databases :: Cosmos DB</name>
     <modules>
         <module>cosmos-to-storage</module>
         <module>create</module>
diff --git a/databases/cosmosdb/sql-change-feed-processor/pom.xml b/databases/cosmosdb/sql-change-feed-processor/pom.xml
index 2082cc72..ed53905f 100644
--- a/databases/cosmosdb/sql-change-feed-processor/pom.xml
+++ b/databases/cosmosdb/sql-change-feed-processor/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>cosmosdb-sql-changefeed-processor</artifactId>
     <packaging>jar</packaging>
-    <name>SQL Change Feed processor</name>
+    <name>Databases :: Cosmos DB :: SQL Change Feed processor</name>
     <build>
         <finalName>change-feed-processor</finalName>
         <plugins>
diff --git a/databases/mssql/create/pom.xml b/databases/mssql/create/pom.xml
index 0de0f3bc..a6c2d0df 100644
--- a/databases/mssql/create/pom.xml
+++ b/databases/mssql/create/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>mssql-create</artifactId>
     <packaging>pom</packaging>
-    <name>Create an Azure SQL Database</name>
+    <name>Databases :: Azure SQL :: Create an Azure SQL Database</name>
 </project>
diff --git a/databases/mssql/get-country/pom.xml b/databases/mssql/get-country/pom.xml
index 721bebb2..d8fd55f5 100644
--- a/databases/mssql/get-country/pom.xml
+++ b/databases/mssql/get-country/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>mssql-get-country</artifactId>
     <packaging>jar</packaging>
-    <name>Get country information</name>
+    <name>Databases :: Azure SQL :: Get country information</name>
     <build>
         <finalName>get-country</finalName>
         <plugins>
diff --git a/databases/mssql/load-your-mssql-database-with-data/pom.xml b/databases/mssql/load-your-mssql-database-with-data/pom.xml
index f4206d81..7aa72406 100644
--- a/databases/mssql/load-your-mssql-database-with-data/pom.xml
+++ b/databases/mssql/load-your-mssql-database-with-data/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>mssql-load-your-mssql-database-with-data</artifactId>
     <packaging>pom</packaging>
-    <name>Load your Azure SQL database with data</name>
+    <name>Databases :: Azure SQL :: Load your Azure SQL database with data</name>
 </project>
diff --git a/databases/mssql/open-firewall-to-your-ip/pom.xml b/databases/mssql/open-firewall-to-your-ip/pom.xml
index 1b1881eb..a30c48ed 100644
--- a/databases/mssql/open-firewall-to-your-ip/pom.xml
+++ b/databases/mssql/open-firewall-to-your-ip/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>mssql-open-firewall-to-your-ip</artifactId>
     <packaging>pom</packaging>
-    <name>Open Azure SQL server firewall to your IP address</name>
+    <name>Databases :: Azure SQL :: Open Azure SQL server firewall to your IP address</name>
 </project>
diff --git a/databases/mssql/pom.xml b/databases/mssql/pom.xml
index e7c6f01b..d9933c2d 100644
--- a/databases/mssql/pom.xml
+++ b/databases/mssql/pom.xml
@@ -10,7 +10,7 @@
     <groupId>examples.azure.databases.mssql</groupId>
     <artifactId>project</artifactId>
     <packaging>pom</packaging>
-    <name>Azure SQL examples</name>
+    <name>Databases :: Azure SQL</name>
     <modules>
         <module>create</module>
         <module>load-your-mssql-database-with-data</module>
diff --git a/databases/mysql/create/pom.xml b/databases/mysql/create/pom.xml
index 2bed6f67..8b84b267 100644
--- a/databases/mysql/create/pom.xml
+++ b/databases/mysql/create/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>mysql-create</artifactId>
     <packaging>pom</packaging>
-    <name>Create an Azure Database for MySQL</name>
+    <name>Databases :: MySQL :: Create an Azure Database for MySQL</name>
 </project>
diff --git a/databases/mysql/get-country/pom.xml b/databases/mysql/get-country/pom.xml
index 18ac534c..e9827dde 100644
--- a/databases/mysql/get-country/pom.xml
+++ b/databases/mysql/get-country/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>mysql-get-country</artifactId>
     <packaging>jar</packaging>
-    <name>Get country information</name>
+    <name>Databases :: MySQL :: Get country information</name>
     <build>
         <finalName>get-country</finalName>
         <plugins>
diff --git a/databases/mysql/load-your-mysql-database-with-data/pom.xml b/databases/mysql/load-your-mysql-database-with-data/pom.xml
index e6a83728..c3a238fd 100644
--- a/databases/mysql/load-your-mysql-database-with-data/pom.xml
+++ b/databases/mysql/load-your-mysql-database-with-data/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>mysql-load-your-mysql-database-with-data</artifactId>
     <packaging>pom</packaging>
-    <name>Load your MySQL database with data</name>
+    <name>Databases :: MySQL :: Load your MySQL database with data</name>
 </project>
diff --git a/databases/mysql/open-firewall-to-your-ip/pom.xml b/databases/mysql/open-firewall-to-your-ip/pom.xml
index 76468249..51719b4f 100644
--- a/databases/mysql/open-firewall-to-your-ip/pom.xml
+++ b/databases/mysql/open-firewall-to-your-ip/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>mysql-open-firewall-to-your-ip</artifactId>
     <packaging>pom</packaging>
-    <name>Open MySQL server firewall to your IP address</name>
+    <name>Databases :: MySQL :: Open MySQL server firewall to your IP address</name>
 </project>
diff --git a/databases/mysql/pom.xml b/databases/mysql/pom.xml
index 2d34b172..baf853a5 100644
--- a/databases/mysql/pom.xml
+++ b/databases/mysql/pom.xml
@@ -10,7 +10,7 @@
     <groupId>examples.azure.databases.mysql</groupId>
     <artifactId>project</artifactId>
     <packaging>pom</packaging>
-    <name>Azure Database for MySQL examples</name>
+    <name>Databases :: MySQL</name>
     <modules>
         <module>create</module>
         <module>get-country</module>
diff --git a/databases/postgresql/create/pom.xml b/databases/postgresql/create/pom.xml
index e2dae842..509da353 100644
--- a/databases/postgresql/create/pom.xml
+++ b/databases/postgresql/create/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>postgresql-create</artifactId>
     <packaging>pom</packaging>
-    <name>Create an Azure Database for PostgreSQL</name>
+    <name>Databases :: PostgreSQL :: Create an Azure Database for PostgreSQL</name>
 </project>
diff --git a/databases/postgresql/get-country/pom.xml b/databases/postgresql/get-country/pom.xml
index dfa3a758..8678fa6e 100644
--- a/databases/postgresql/get-country/pom.xml
+++ b/databases/postgresql/get-country/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>postgresql-get-country</artifactId>
     <packaging>jar</packaging>
-    <name>Get country information</name>
+    <name>Databases :: PostgreSQL :: Get country information</name>
     <build>
         <finalName>get-country</finalName>
         <plugins>
diff --git a/databases/postgresql/load-your-postgresql-database-with-data/pom.xml b/databases/postgresql/load-your-postgresql-database-with-data/pom.xml
index 817988b0..d8aab583 100644
--- a/databases/postgresql/load-your-postgresql-database-with-data/pom.xml
+++ b/databases/postgresql/load-your-postgresql-database-with-data/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>postgresql-load-your-postgresql-database-with-data</artifactId>
     <packaging>pom</packaging>
-    <name>Load your PostgreSQL database with data</name>
+    <name>Databases :: PostgreSQL :: Load your PostgreSQL database with data</name>
 </project>
diff --git a/databases/postgresql/open-firewall-to-your-ip/pom.xml b/databases/postgresql/open-firewall-to-your-ip/pom.xml
index ef4a0849..2f218407 100644
--- a/databases/postgresql/open-firewall-to-your-ip/pom.xml
+++ b/databases/postgresql/open-firewall-to-your-ip/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>postgresql-open-firewall-to-your-ip</artifactId>
     <packaging>pom</packaging>
-    <name>Open PostgreSQL server firewall to your IP address</name>
+    <name>Databases :: PostgreSQL :: Open PostgreSQL server firewall to your IP address</name>
 </project>
diff --git a/databases/postgresql/pom.xml b/databases/postgresql/pom.xml
index c4b61202..31ab414d 100644
--- a/databases/postgresql/pom.xml
+++ b/databases/postgresql/pom.xml
@@ -10,7 +10,7 @@
     <groupId>examples.azure.databases.postgresql</groupId>
     <artifactId>project</artifactId>
     <packaging>pom</packaging>
-    <name>Azure Database for PostgreSQL examples</name>
+    <name>Databases :: PostgreSQL</name>
     <modules>
         <module>create</module>
         <module>load-your-postgresql-database-with-data</module>
diff --git a/databases/redis/create/pom.xml b/databases/redis/create/pom.xml
index 278bd8bb..8a101712 100644
--- a/databases/redis/create/pom.xml
+++ b/databases/redis/create/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>redis-create</artifactId>
     <packaging>pom</packaging>
-    <name>Create an Azure Cache for Redis</name>
+    <name>Databases :: Redis :: Create an Azure Cache for Redis</name>
 </project>
diff --git a/databases/redis/pom.xml b/databases/redis/pom.xml
index e8d5f765..9f1fe39d 100644
--- a/databases/redis/pom.xml
+++ b/databases/redis/pom.xml
@@ -10,7 +10,7 @@
     <groupId>examples.azure.databases.redis</groupId>
     <artifactId>project</artifactId>
     <packaging>pom</packaging>
-    <name>Azure Cache for Redis examples</name>
+    <name>Databases :: Redis</name>
     <modules>
         <module>create</module>
     </modules>
diff --git a/general/group/create/pom.xml b/general/group/create/pom.xml
index 9c31bcb8..10746d77 100644
--- a/general/group/create/pom.xml
+++ b/general/group/create/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>group-create</artifactId>
     <packaging>pom</packaging>
-    <name>Create an Azure Resource Group</name>
+    <name>General :: Resource Group :: Create an Azure Resource Group</name>
 </project>
diff --git a/general/group/delete/pom.xml b/general/group/delete/pom.xml
index 4ab5cd19..d476cbda 100644
--- a/general/group/delete/pom.xml
+++ b/general/group/delete/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>group-delete</artifactId>
     <packaging>pom</packaging>
-    <name>Delete an Azure Resource Group</name>
+    <name>General :: Resource Group :: Delete an Azure Resource Group</name>
 </project>
diff --git a/general/group/pom.xml b/general/group/pom.xml
index 772e5fd6..4e66d54e 100644
--- a/general/group/pom.xml
+++ b/general/group/pom.xml
@@ -10,7 +10,7 @@
     <groupId>examples.azure.general.group</groupId>
     <artifactId>project</artifactId>
     <packaging>pom</packaging>
-    <name>Azure Resource Group examples</name>
+    <name>General :: Resource Group</name>
     <modules>
         <module>create</module>
         <module>delete</module>
diff --git a/integration/servicebus/create-queue/pom.xml b/integration/servicebus/create-queue/pom.xml
index d17a998e..713471e6 100644
--- a/integration/servicebus/create-queue/pom.xml
+++ b/integration/servicebus/create-queue/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>servicebus-create-queue</artifactId>
     <packaging>pom</packaging>
-    <name>Create an Azure Service Bus Queue</name>
+    <name>Integration :: Service Bus :: Create an Azure Service Bus Queue</name>
 </project>
diff --git a/integration/servicebus/create/pom.xml b/integration/servicebus/create/pom.xml
index e88fc7f6..a62378a1 100644
--- a/integration/servicebus/create/pom.xml
+++ b/integration/servicebus/create/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>servicebus-create</artifactId>
     <packaging>pom</packaging>
-    <name>Create an Azure Service Bus</name>
+    <name>Integration :: Service Bus :: Create an Azure Service Bus</name>
 </project>
diff --git a/integration/servicebus/jms-to-cosmosdb-springboot-2/pom.xml b/integration/servicebus/jms-to-cosmosdb-springboot-2/pom.xml
index 1a456796..1921b7b6 100644
--- a/integration/servicebus/jms-to-cosmosdb-springboot-2/pom.xml
+++ b/integration/servicebus/jms-to-cosmosdb-springboot-2/pom.xml
@@ -11,7 +11,7 @@
     <groupId>examples.azure.integration.servicebus</groupId>
     <artifactId>servicebus-jms-to-cosmosdb-springboot-2</artifactId>
     <packaging>jar</packaging>
-    <name>JMS to Cosmos DB Spring Boot application #2</name>
+    <name>Integration :: Service Bus :: JMS to Cosmos DB Spring Boot application #2</name>
     <build>
         <finalName>jms-to-cosmosdb-springboot</finalName>
         <plugins>
diff --git a/integration/servicebus/jms-to-cosmosdb-springboot/pom.xml b/integration/servicebus/jms-to-cosmosdb-springboot/pom.xml
index bf8e7f05..b391dbdf 100644
--- a/integration/servicebus/jms-to-cosmosdb-springboot/pom.xml
+++ b/integration/servicebus/jms-to-cosmosdb-springboot/pom.xml
@@ -11,7 +11,7 @@
     <groupId>examples.azure.integration.servicebus</groupId>
     <artifactId>servicebus-jms-to-cosmosdb-springboot</artifactId>
     <packaging>jar</packaging>
-    <name>JMS to Cosmos DB Spring Boot application</name>
+    <name>Integration :: Service Bus :: JMS to Cosmos DB Spring Boot application</name>
     <build>
         <finalName>jms-to-cosmosdb-springboot</finalName>
         <plugins>
diff --git a/integration/servicebus/jms-to-eventhubs-springboot/pom.xml b/integration/servicebus/jms-to-eventhubs-springboot/pom.xml
index 8165d2f7..06c57b76 100644
--- a/integration/servicebus/jms-to-eventhubs-springboot/pom.xml
+++ b/integration/servicebus/jms-to-eventhubs-springboot/pom.xml
@@ -11,7 +11,7 @@
     <groupId>examples.azure.integration.servicebus</groupId>
     <artifactId>servicebus-jms-to-eventhubs-springboot</artifactId>
     <packaging>jar</packaging>
-    <name>JMS to EventHubs Spring Boot application</name>
+    <name>Integration :: Service Bus :: JMS to EventHubs Spring Boot application</name>
     <build>
         <finalName>jms-to-eventhubs-springboot</finalName>
         <plugins>
diff --git a/integration/servicebus/pom.xml b/integration/servicebus/pom.xml
index d8caa778..c62916ac 100644
--- a/integration/servicebus/pom.xml
+++ b/integration/servicebus/pom.xml
@@ -10,7 +10,7 @@
     <groupId>examples.azure.integration.servicebus</groupId>
     <artifactId>project</artifactId>
     <packaging>pom</packaging>
-    <name>Azure Service Bus examples</name>
+    <name>Integration :: Service Bus</name>
     <modules>
         <module>create</module>
         <module>create-queue</module>
diff --git a/integration/servicebus/receive-jms-message/pom.xml b/integration/servicebus/receive-jms-message/pom.xml
index 3c103d05..625b27db 100644
--- a/integration/servicebus/receive-jms-message/pom.xml
+++ b/integration/servicebus/receive-jms-message/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>servicebus-receive-jms-message</artifactId>
     <packaging>jar</packaging>
-    <name>Receive a JMS message</name>
+    <name>Integration :: Service Bus :: Receive a JMS message</name>
     <build>
         <finalName>receive-jms-message</finalName>
         <plugins>
diff --git a/integration/servicebus/receive-message/pom.xml b/integration/servicebus/receive-message/pom.xml
index cf34ebc5..a04f94ed 100644
--- a/integration/servicebus/receive-message/pom.xml
+++ b/integration/servicebus/receive-message/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>servicebus-receive-message</artifactId>
     <packaging>jar</packaging>
-    <name>Receive a message</name>
+    <name>Integration :: Service Bus :: Receive a message</name>
     <build>
         <finalName>receive-message</finalName>
         <plugins>
diff --git a/integration/servicebus/send-jms-message/pom.xml b/integration/servicebus/send-jms-message/pom.xml
index e4c3c68a..685c1e4c 100644
--- a/integration/servicebus/send-jms-message/pom.xml
+++ b/integration/servicebus/send-jms-message/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>servicebus-send-jms-message</artifactId>
     <packaging>jar</packaging>
-    <name>Send a JMS message</name>
+    <name>Integration :: Service Bus :: Send a JMS message</name>
     <build>
         <finalName>send-jms-message</finalName>
         <plugins>
diff --git a/integration/servicebus/send-message/pom.xml b/integration/servicebus/send-message/pom.xml
index 59c5e30c..d126cb11 100644
--- a/integration/servicebus/send-message/pom.xml
+++ b/integration/servicebus/send-message/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>servicebus-send-message</artifactId>
     <packaging>jar</packaging>
-    <name>Send a message</name>
+    <name>Integration :: Service Bus :: Send a message</name>
     <build>
         <finalName>send-message</finalName>
         <plugins>
diff --git a/security/keyvault/add-secret/pom.xml b/security/keyvault/add-secret/pom.xml
index 845ceedb..7d024c8d 100644
--- a/security/keyvault/add-secret/pom.xml
+++ b/security/keyvault/add-secret/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>keyvault-add-secret</artifactId>
     <packaging>pom</packaging>
-    <name>Add a Secret</name>
+    <name>Security :: KeyVault :: Add a Secret</name>
 </project>
diff --git a/security/keyvault/create-self-signed-certificate/pom.xml b/security/keyvault/create-self-signed-certificate/pom.xml
index ef0452cb..678274ba 100644
--- a/security/keyvault/create-self-signed-certificate/pom.xml
+++ b/security/keyvault/create-self-signed-certificate/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>keyvault-create-self-signed-certificate</artifactId>
     <packaging>pom</packaging>
-    <name>Create a self-signed certificate</name>
+    <name>Security :: KeyVault :: Create a self-signed certificate</name>
 </project>
diff --git a/security/keyvault/create/pom.xml b/security/keyvault/create/pom.xml
index 0bc203c5..d3ce8c72 100644
--- a/security/keyvault/create/pom.xml
+++ b/security/keyvault/create/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>keyvault-create</artifactId>
     <packaging>pom</packaging>
-    <name>Create an Azure Key Vault</name>
+    <name>Security :: KeyVault :: Create an Azure Key Vault</name>
 </project>
diff --git a/security/keyvault/pom.xml b/security/keyvault/pom.xml
index 04684916..eb5c01bc 100644
--- a/security/keyvault/pom.xml
+++ b/security/keyvault/pom.xml
@@ -10,7 +10,7 @@
     <groupId>examples.azure.security.keyvault</groupId>
     <artifactId>project</artifactId>
     <packaging>pom</packaging>
-    <name>Azure KeyVault examples</name>
+    <name>Security :: KeyVault</name>
     <modules>
         <module>create</module>
         <module>add-secret</module>
diff --git a/security/keyvault/spring-boot-mtls-client-side/pom.xml b/security/keyvault/spring-boot-mtls-client-side/pom.xml
index 2903d3f0..e4ef06ec 100644
--- a/security/keyvault/spring-boot-mtls-client-side/pom.xml
+++ b/security/keyvault/spring-boot-mtls-client-side/pom.xml
@@ -8,7 +8,7 @@
         <version>1-SNAPSHOT</version>
     </parent>
     <artifactId>keyvault-spring-boot-mtls-client-side</artifactId>
-    <name>Spring Boot mTLS client-side application</name>
+    <name>Security :: KeyVault :: Spring Boot mTLS client-side application</name>
     <properties>
         <java.version>1.8</java.version>
     </properties>
diff --git a/security/keyvault/spring-boot-mtls-server-side/pom.xml b/security/keyvault/spring-boot-mtls-server-side/pom.xml
index 6c096636..72726314 100644
--- a/security/keyvault/spring-boot-mtls-server-side/pom.xml
+++ b/security/keyvault/spring-boot-mtls-server-side/pom.xml
@@ -8,7 +8,7 @@
         <version>1-SNAPSHOT</version>
     </parent>
     <artifactId>keyvault-spring-boot-mtls-server-side</artifactId>
-    <name>Spring Boot mTLS server-side application</name>
+    <name>Security :: KeyVault :: Spring Boot mTLS server-side application</name>
     <properties>
         <java.version>1.8</java.version>
     </properties>
diff --git a/security/keyvault/spring-boot-ssl-server-side/pom.xml b/security/keyvault/spring-boot-ssl-server-side/pom.xml
index 27f1a3ca..98607d57 100644
--- a/security/keyvault/spring-boot-ssl-server-side/pom.xml
+++ b/security/keyvault/spring-boot-ssl-server-side/pom.xml
@@ -8,7 +8,7 @@
         <version>1-SNAPSHOT</version>
     </parent>
     <artifactId>keyvault-spring-boot-ssl-server-side</artifactId>
-    <name>Spring Boot SSL server-side application</name>
+    <name>Security :: KeyVault :: Spring Boot SSL server-side application</name>
     <properties>
         <java.version>1.8</java.version>
     </properties>
diff --git a/storage/storage/create/pom.xml b/storage/storage/create/pom.xml
index 5d8cec6e..88342166 100644
--- a/storage/storage/create/pom.xml
+++ b/storage/storage/create/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>storage-create</artifactId>
     <packaging>pom</packaging>
-    <name>Create an Azure Storage Account</name>
+    <name>Storage :: Storage :: Create an Azure Storage Account</name>
 </project>
diff --git a/storage/storage/enable-static-website/pom.xml b/storage/storage/enable-static-website/pom.xml
index eeaba245..5ff78c9d 100644
--- a/storage/storage/enable-static-website/pom.xml
+++ b/storage/storage/enable-static-website/pom.xml
@@ -9,5 +9,5 @@
     </parent>
     <artifactId>storage-enable-static-website</artifactId>
     <packaging>pom</packaging>
-    <name>Enable static website</name>
+    <name>Storage :: Storage :: Enable static website</name>
 </project>
diff --git a/storage/storage/pom.xml b/storage/storage/pom.xml
index f63c514c..a7d0aca4 100644
--- a/storage/storage/pom.xml
+++ b/storage/storage/pom.xml
@@ -10,7 +10,7 @@
     <groupId>examples.azure.storage.storage</groupId>
     <artifactId>project</artifactId>
     <packaging>pom</packaging>
-    <name>Azure Storage examples</name>
+    <name>Storage :: Storage</name>
     <modules>
         <module>create</module>
         <module>enable-static-website</module>
diff --git a/storage/storage/upload-files-to-static-website/pom.xml b/storage/storage/upload-files-to-static-website/pom.xml
index ed070202..5bbf0c1a 100644
--- a/storage/storage/upload-files-to-static-website/pom.xml
+++ b/storage/storage/upload-files-to-static-website/pom.xml
@@ -9,6 +9,6 @@
     </parent>
     <artifactId>storage-upload-files-to-static-website</artifactId>
     <packaging>pom</packaging>
-    <name>Upload files to static website</name>
+    <name>Storage :: Storage :: Upload files to static website</name>
 </project>