diff --git a/.github/workflows/Generate-Compatibility-Doc.yml b/.github/workflows/Generate-Compatibility-Doc.yml
new file mode 100644
index 0000000000..7e29194dff
--- /dev/null
+++ b/.github/workflows/Generate-Compatibility-Doc.yml
@@ -0,0 +1,143 @@
+name: Generate Compatibility Doc
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - instrumentation/**/build.gradle
+      - instrumentation/**/build.gradle.kts
+
+  workflow_dispatch:
+    inputs:
+      doc_type:
+        description: The type of the compatibility doc you wish to generate - either "internal" (a simplified .md file, copied into this repo) or "site" (a complete .mdx file, copied to the public docs website).
+        required: true
+        options:
+          - internal
+          - site
+      release_tag:
+        description: If triggering this action as a part of a release workflow, the release tag to use when naming the PR to the public docs site.
+        default: 00
+
+
+jobs:
+  generate-files:
+    name: Generate Compatibility Files
+    runs-on: ubuntu-24.04
+
+    env:
+      INTERNAL_DOC_FILE: build/docs/site/compatibility-requirements-java-agent-internal.md
+      PUBLIC_DOC_FILE: build/docs/site/compatibility-requirements-java-agent.mdx
+
+    steps:
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # pin@v4
+
+      - name: Setup environment
+        uses: ./.github/actions/setup-environment
+
+      - name: Run compatibility plugin
+        run: ./gradlew clean generateCompatibilitySite
+
+      - name: Upload internal compatibility doc
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 #pin@v4
+        with:
+          name: internal-compatibility-doc
+          path: ${{ env.INTERNAL_DOC_FILE }}
+          retention-days: 1
+
+      - name: Upload public site compatibility doc
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 #pin@v4
+        with:
+          name: site-compatibility-doc
+          path: ${{ env.PUBLIC_DOC_FILE }}
+          retention-days: 1
+
+  update-internal-compatibility-doc:
+    name: Update Internal Compatibility File
+    needs: generate-files
+    runs-on: ubuntu-24.04
+    if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && inputs.doc_type == 'internal')
+
+    env:
+      INTERNAL_FILEPATH: COMPATIBILITY.md
+
+    steps:
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # pin@v4
+
+      - name: Download internal doc
+        uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # pin@v4
+        with:
+          name: internal-compatibility-doc
+          path: tmp
+
+      - name: Copy internal doc to destination
+        run: cp tmp/compatibility-requirements-java-agent-internal.md ${{ env.INTERNAL_FILEPATH }}
+
+      - name: Create PR for internal doc
+        id: create-pr-internal
+        uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          add-paths: ${{ env.INTERNAL_FILEPATH }}
+          commit-message: 'Update internal compatibility doc'
+          branch: update-compatibility-doc-${{ github.run_id }}
+          delete-branch: true
+          base: main
+          title: 'Update Internal Compatibility Doc'
+          body: |
+            This PR updates the internal compatibility documentation. It was triggered manually or by a detected instrumentation build file change. 
+
+      - name: Summary
+        run: |
+          echo "Submitted PR #${{ steps.create-pr-internal.outputs.pull-request-number}} to the New Relic Agent repo." 
+          echo "Your review is required. See ${{ steps.create-pr-internal.outputs.pull-request-url}}"
+
+  update-site-compatibility-doc:
+    name: Update Public Site Documentation
+    needs: generate-files
+    runs-on: ubuntu-24.04
+    if: github.event_name == 'workflow_dispatch' && inputs.doc_type == 'site'
+
+    env:
+      EXTERNAL_REPO_NAME: newrelic/docs-website
+      DESTINATION_FILEPATH: src/content/docs/apm/agents/java-agent/getting-started/compatibility-requirements-java-agent.mdx
+
+    steps:
+      - name: Checkout external docs repo
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # pin@v4
+        with:
+          repository: ${{ env.EXTERNAL_REPO_NAME }}
+          token: ${{ secrets.DOCS_WEBSITE_TOKEN }}
+          path: docs-website
+
+      - name: Download site doc
+        uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # pin@v4
+        with:
+          name: site-compatibility-doc
+          path: tmp
+
+      - name: Copy site doc to destination path
+        run: cp tmp/compatibility-requirements-java-agent.mdx docs-website/${{ env.DESTINATION_FILEPATH }}
+
+      - name: Create PR for site doc
+        id: create-pr-docs-site
+        uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e
+        with:
+          token: ${{ secrets.DOCS_WEBSITE_TOKEN }}
+          path: docs-website
+          add-paths: ${{ env.DESTINATION_FILEPATH }}
+          commit-message: 'Update Java agent compatibility documentation'
+          branch: update-java-agent-compatibility-${{ inputs.release_tag }}
+          delete-branch: true
+          base: develop
+          title: '[DO-NOT-MERGE] Update Java Agent Compatibility Requirements'
+          body: |
+            This is a WIP.
+            This PR updates the Java agent compatibility documentation.
+
+      - name: Summary
+        run: |
+          echo "Submitted PR #${{ steps.create-pr-docs-site.outputs.pull-request-number}} to the docs site repo." 
+          echo "Your review is required. See ${{ steps.create-pr-docs-site.outputs.pull-request-url}}"
+          echo "Once you have reviewed the PR, update its title and description to show it is ready for merge."
diff --git a/COMPATIBILITY.md b/COMPATIBILITY.md
new file mode 100644
index 0000000000..8170762e27
--- /dev/null
+++ b/COMPATIBILITY.md
@@ -0,0 +1,217 @@
+# Java Agent Compatibility
+
+## JVMs
+
+This version of the Java Agent supports Java versions 8 - 25.
+
+  ## App/Web severs
+  The agent automatically instruments the following app/web servers.
+
+  * Glassfish 3.0 to latest
+  * JBoss 7.0 to latest
+  * Jetty 7.0.0 to latest
+  * Mule 3.4.0 to latest
+  * Netty 3.3.0.Alpha1 to 5.0.0.Alpha1 (exclusive)
+  * Netty Reactor 0.7.0.RELEASE to latest
+  * Open Liberty 21.0.0.12 to latest
+  * Play 2.3.0 to latest
+  * Resin 3.1.9 to latest
+  * Spray 1.3.1 to latest
+  * Tomcat 7.0.0 to latest
+  * Undertow 1.1.0.Final to latest
+  * WebLogic 12.1.2.1 to 12.2.x (exclusive)
+  * WebSphere 8 to 9 (exclusive)
+  * WebSphere Liberty 8.5 to latest
+  * Wildfly 8.0.0.Final to latest
+
+  ## Frameworks
+  The agent automatically instruments the following frameworks.
+
+  * Akka 2.4.10 to latest
+  * AWS Firehose 2.1.0 to latest
+  * AWS Kinesis 1.11.106 to latest
+  * AWS Lambda 1.11.280 to latest
+  * AWS S3 1.9.0 to latest
+  * AWS SNS 1.11.12 to latest
+  * AWS SQS 1.10.44 to latest
+  * Cats Effect 3.3.0 to 3.3.4 (exclusive)
+  * Cats Effect v2 2.1 to 3.0 (exclusive)
+    * Scala 2.12: 2.1 to 3.0 (exclusive)
+    * Scala 2.13: 2.1 to 3.0 (exclusive)
+  * Cats Effect v3 3.2 to 3.3 (exclusive)
+    * Scala 2.12: 3.2 to 3.3.4
+    * Scala 2.13: 3.2 to 3.3.4
+  * CXF 2.1.3 to latest
+  * EJB 6.0 to latest
+  * Grails 1.3.0 to 3.0.0.RC1 (exclusive)
+  * GraphQL 16.0 to 21.0 (exclusive)
+  * GraphQL Java 21.0 to latest
+  * Hibernate 3.3.0.CR1 to 6.0.0.Alpha2 (exclusive)
+  * Hystrix 1.3.15 to latest
+  * JAX-RS 1.0 to 4.0 (exclusive)
+  * JCache API 1.0.0 to latest
+  * Jersey 1.0.1 to 3.1 (exclusive)
+  * Jersey Client 0.9 to latest
+  * Micronaut 1.0.0 to latest
+  * Monix tasks 2.0.0 to latest
+    * Scala 2.12: 2.0.6 to latest
+    * Scala 2.13: 3.0.0 to latest
+    * Scala 3: 3.4.0 to latest
+  * Pekko 1.0.0 to latest
+  * Pekko Http 1.0.0 to latest
+    * Scala 2.13: 1.0.0 to latest
+    * Scala 3: 1.0.0 to latest
+  * Pekko Http Core 1.0.0 to latest
+    * Scala 2.13: 1.0.0 to latest
+    * Scala 3: 1.0.0 to latest
+  * Play 2.3.0 to latest
+  * Quartz Scheduler 1.7.2 to latest
+  * RESTEasy 2.2-RC-1 to latest
+  * Servlet 2.3 to latest
+  * Spray 1.3.1 to latest
+  * Spring 3.0.0.RELEASE to latest
+  * Spring AOP 2.0.3 to latest
+  * Spring Batch 4.0.0.RELEASE to 6.0.0 (exclusive)
+  * Spring Boot Actuator 3.0.0 to 4.0.0-M1 (exclusive)
+  * Spring Web Services 1.5.7 to 4.0.0 (exclusive)
+  * Spring WebFlux 5.0.0.RELEASE to latest
+  * Struts 2.0 to latest
+  * Thrift 0.8.0 to latest
+  * Vertx 3.2.0 to 5.0.0.CR1 (exclusive)
+  * ZIO 1.0.9 to latest
+    * Scala 2.13: 1.0.9 to latest
+  * JSF (Java Server Faces)
+
+  ## HTTP libraries
+  The agent automatically instruments the following HTTP libraries.
+
+  * Akka Http 2.4.5 to latest
+  * Akka Http Core 0.4 to latest
+  * Apache HttpAsyncClient 4.1 to latest
+  * Apache Httpclient 3.1-rc1 to latest
+  * Async Http Client 2.0.0-RC1 to latest
+  * Blaze Client 0.21 to 0.24.0 (exclusive)
+    * Scala 2.12: 0.21.0 to 0.24.0 (exclusive)
+    * Scala 2.13: 0.21.0 to 0.24.0 (exclusive)
+  * Blaze Server 0.21 to 0.24.0 (exclusive)
+    * Scala 2.12: 0.21.0 to 0.24.0 (exclusive)
+    * Scala 2.13: 0.21.0 to 0.24.0 (exclusive)
+  * Ember Client 0.23.0 to 0.24.0 (exclusive)
+  * Ember Server 0.23.0 to 0.24.0 (exclusive)
+  * gRPC 1.4.0 to latest
+  * HttpUrlConnection 0 to latest
+  * Java HttpClient 11 to latest
+  * Ning AsyncHttpClient 1.0 to 2.0.0 (exclusive)
+  * OKHttp 3.6.0 to 4.4.0 (exclusive)
+  * Play WS 2.6.0 to latest
+    * Scala 2.12: 2.6.0 to latest
+    * Scala 2.13: 2.7.3 to latest
+  * Spray 1.3.1 to latest
+  * Spring Webclient 5.0.0.RELEASE to latest
+  * Spring Webflux 5.0.0.RELEASE to latest
+  * STTP 2.2.3 to latest
+    * Scala 2.13: 2.2.3 to latest
+    * Scala 2.12: 2.2.3 to latest
+
+  ## Logging libraries
+  The agent automatically instruments the following logging libraries. For more information about the Java agent's logging solutions, including
+  log forwarding and logs in context, see our [logging-specific documentation](https://docs.newrelic.com/docs/logs/logs-context/java-configure-logs-context-all/).
+
+  * Glassfish JUL Extension 7.0.0 to latest
+  * Java Logging 8 to latest
+  * JBoss Logging 1.3.0 to latest
+  * Log4j Layout Template JSON 2.14.0 to latest
+  * Log4j-1 1.2.17 to latest
+  * Log4j2 2.6 to latest
+  * Logback 1.1.0 to latest
+
+  ## Messaging
+  The agent automatically instruments the following messaging services.
+
+  * ActiveMQClient 5.8.0 to latest
+  * AWS SNS 1.11.12 to latest
+  * AWS SQS 1.10.44 to latest
+  * Azure Service Bus 7.15.0 to latest
+  * JMS 1.1 to latest
+  * RabbitAMQP 1.7.2 to latest
+  * Spring JMS 0 to latest
+  * Spring Kafka 2.2.0.RELEASE to latest
+
+  The agent instruments the following Kafka libraries. Not all Kafka instrumentation is enabled by default. See our [Kafka documentation](https://docs.newrelic.com/docs/apm/agents/java-agent/instrumentation/java-agent-instrument-kafka-message-queues/) for more information.
+
+  * Kafka Clients Config 1.1.0 to latest
+  * Kafka Clients Heartbeat 0.10.1.0 to 2.5.0 (exclusive)
+  * Kafka Clients Metrics 0.10.0.0 to 4.0.0 (exclusive)
+  * Kafka Clients Node Metrics 1.0.0 to latest
+  * Kafka Clients Spans 0.11.0.0 to latest
+  * Kafka Clients Spans Consumer 2.0.0 to 4.0.0 (exclusive)
+  * Kafka Connect Metrics 1.0.0 to latest
+  * Kafka Connect Spans 2.0.0 to latest
+  * Kafka Streams Metrics 1.0.0 to latest
+  * Kafka Streams Spans 2.0.0 to latest
+
+
+  ## Datastores
+  New Relic currently supports MySQL and PostgreSQL to capture explain plans for slow database queries.
+
+  * Generic JDBC (any JDBC compliant driver)
+  * Anorm 2.3-M1 to 2.5 (exclusive)
+  * AWS v1 DynamoDB 1.11.106 to latest
+  * AWS v2 DynamoDB 2.1.0 to latest
+  * Cassandra 3.0.0 to latest
+  * Couchbase 2.4.0 to latest
+  * DB2 9.1 to latest
+  * Derby 10.11.1.1 to latest
+  * Flyway 8.0.0 to latest
+  * H2 1.0.57 to latest
+  * H2 R2DBC 0 to latest
+  * HikariCP 2.4.0 to latest
+  * HSQLDB 1.7.2.2 to latest
+  * Jedis 1.4.0 to latest
+  * jTDS 1.2 to latest
+  * Lettuce 4.2.1.Final to latest
+  * MariaDB Java Client (3.0.2-rc,) to latest
+  * MariaDB R2DBC 1.0.2 to latest
+  * Merlia 7.03 to latest
+  * MongoDB 4.2.0 to 5.6.0 (exclusive)
+  * MongoDB async clients 3.4.0 to 4.2.0 (exclusive)
+  * MongoDB sync clients 3.1.0-rc0 to latest
+  * MSSQL R2DBC 0.8.0 to latest
+  * MySQL 3.0.8 to latest
+  * MySQL R2DBC 0.8.2 to latest
+  * Oracle JDBC 5 to latest
+  * Oracle R2DBC 0.0.0 to latest
+  * Oranxo 3.06 to latest
+  * PostgreSQL 8.0-312.jdbc3 to latest
+  * PostgreSQL R2DBC 0.9.0 to latest
+  * Slick 3.0.0 to latest
+  * Solr 4.0.0 to latest
+  * Spymemcached 2.11 to latest
+  * SQLServer jdk6 to latest
+  * Sybase 6 to latest
+  * Vertx Sql Client 4.4.2 to 5.0.0 (exclusive)
+
+  ## Instance-level database information
+  New Relic collects instance details for a variety of databases and database drivers.
+
+  * Any [compatible JDBC driver](#JDBC)
+  * AWS v1 DynamoDB 1.11.106 to latest
+  * AWS v2 DynamoDB 2.1.0 to latest
+  * Cassandra 3.0.0 to latest
+  * Jedis 1.4.0 to latest
+  * MongoDB async clients 3.4.0 to 4.2.0 (exclusive)
+  * MongoDB sync clients 3.1.0-rc0 to latest
+  * Spymemcached 2.11 to latest
+
+  ## AI Monitoring
+  If you have version 8.12.0 or higher of Java agent, you can collect AI data from certain AI libraries and frameworks.
+  * AWS Bedrock 2.20.157 to latest
+
+  ## Other instrumented features
+  * AWS Wrap 0.7.0 to latest
+  * Java Completable futures 8 to latest
+  * Java Process 8 to latest
+  * JSP 2.0 to latest
+  * OpenEJB 3.0 to latest
+  * OpenJPA 1.0 to latest
+  * Scala 2.1.5 to latest
diff --git a/build.gradle b/build.gradle
index e5ad78e40b..4c42e87c7e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'com.github.prokod.gradle-crossbuild' version '0.14.1' apply false
     id "org.jetbrains.kotlin.jvm" version "1.8.21" apply false
     id "com.newrelic.gradle-verify-instrumentation-plugin" version "4.0" apply false
-    id "com.newrelic.gradle-compatibility-doc-plugin" version "1.1" apply false
+    id "com.newrelic.gradle-compatibility-doc-plugin" version "1.2" apply false
     id "com.github.spotbugs" version "5.0.14" apply false
 
 }
diff --git a/instrumentation/akka-http-2.11_2.4.5/build.gradle b/instrumentation/akka-http-2.11_2.4.5/build.gradle
index 37656eb191..d86ef14187 100644
--- a/instrumentation/akka-http-2.11_2.4.5/build.gradle
+++ b/instrumentation/akka-http-2.11_2.4.5/build.gradle
@@ -45,5 +45,5 @@ verifyInstrumentation {
 
 site {
     title 'Akka Http'
-    type 'Framework'
+    type 'Http'
 }
diff --git a/instrumentation/akka-http-2.13_10.1.8/build.gradle b/instrumentation/akka-http-2.13_10.1.8/build.gradle
index 17e24418e6..5efe8b78a8 100644
--- a/instrumentation/akka-http-2.13_10.1.8/build.gradle
+++ b/instrumentation/akka-http-2.13_10.1.8/build.gradle
@@ -33,5 +33,5 @@ verifyInstrumentation {
 
 site {
     title 'Akka Http'
-    type 'Framework'
+    type 'Http'
 }
diff --git a/instrumentation/akka-http-2.13_10.2.0/build.gradle b/instrumentation/akka-http-2.13_10.2.0/build.gradle
index 2ba2b77599..bd1937f93b 100644
--- a/instrumentation/akka-http-2.13_10.2.0/build.gradle
+++ b/instrumentation/akka-http-2.13_10.2.0/build.gradle
@@ -33,5 +33,5 @@ verifyInstrumentation {
 
 site {
     title 'Akka Http'
-    type 'Framework'
+    type 'Http'
 }
diff --git a/instrumentation/akka-http-2.13_10.5.0/build.gradle b/instrumentation/akka-http-2.13_10.5.0/build.gradle
index b2fd631056..6884a0199e 100644
--- a/instrumentation/akka-http-2.13_10.5.0/build.gradle
+++ b/instrumentation/akka-http-2.13_10.5.0/build.gradle
@@ -33,5 +33,5 @@ verifyInstrumentation {
 
 site {
     title 'Akka Http'
-    type 'Framework'
+    type 'Http'
 }
diff --git a/instrumentation/akka-http-core-0.4/build.gradle b/instrumentation/akka-http-core-0.4/build.gradle
index 7a0021be7f..24227e1f45 100644
--- a/instrumentation/akka-http-core-0.4/build.gradle
+++ b/instrumentation/akka-http-core-0.4/build.gradle
@@ -23,5 +23,5 @@ verifyInstrumentation {
 
 site {
     title 'Akka Http Core'
-    type 'Framework'
+    type 'Http'
 }
\ No newline at end of file
diff --git a/instrumentation/akka-http-core-0.7/build.gradle b/instrumentation/akka-http-core-0.7/build.gradle
index 238603f4ef..1016d2d8c4 100644
--- a/instrumentation/akka-http-core-0.7/build.gradle
+++ b/instrumentation/akka-http-core-0.7/build.gradle
@@ -26,5 +26,5 @@ verifyInstrumentation {
 
 site {
     title 'Akka Http Core'
-    type 'Framework'
+    type 'Http'
 }
\ No newline at end of file
diff --git a/instrumentation/akka-http-core-1.0/build.gradle b/instrumentation/akka-http-core-1.0/build.gradle
index 080dfce429..f986783252 100644
--- a/instrumentation/akka-http-core-1.0/build.gradle
+++ b/instrumentation/akka-http-core-1.0/build.gradle
@@ -24,5 +24,5 @@ verifyInstrumentation {
 
 site {
     title 'Akka Http Core'
-    type 'Framework'
+    type 'Http'
 }
\ No newline at end of file
diff --git a/instrumentation/akka-http-core-10.0/build.gradle b/instrumentation/akka-http-core-10.0/build.gradle
index 6cf5514d41..280da1b59b 100644
--- a/instrumentation/akka-http-core-10.0/build.gradle
+++ b/instrumentation/akka-http-core-10.0/build.gradle
@@ -26,5 +26,5 @@ verifyInstrumentation {
 
 site {
     title 'Akka Http Core'
-    type 'Framework'
+    type 'Http'
 }
diff --git a/instrumentation/akka-http-core-10.2.0/build.gradle b/instrumentation/akka-http-core-10.2.0/build.gradle
index 03f0c5e11c..be4f835483 100644
--- a/instrumentation/akka-http-core-10.2.0/build.gradle
+++ b/instrumentation/akka-http-core-10.2.0/build.gradle
@@ -42,5 +42,5 @@ verifyInstrumentation {
 
 site {
     title 'Akka Http Core'
-    type 'Framework'
+    type 'Http'
 }
diff --git a/instrumentation/akka-http-core-2.11_10.0.11/build.gradle b/instrumentation/akka-http-core-2.11_10.0.11/build.gradle
index 01777e9aee..79437242cd 100644
--- a/instrumentation/akka-http-core-2.11_10.0.11/build.gradle
+++ b/instrumentation/akka-http-core-2.11_10.0.11/build.gradle
@@ -26,5 +26,5 @@ verifyInstrumentation {
 
 site {
     title 'Akka Http Core'
-    type 'Framework'
+    type 'Http'
 }
diff --git a/instrumentation/akka-http-core-2.13_10.1.8/build.gradle b/instrumentation/akka-http-core-2.13_10.1.8/build.gradle
index 015130d547..6ed6e54a22 100644
--- a/instrumentation/akka-http-core-2.13_10.1.8/build.gradle
+++ b/instrumentation/akka-http-core-2.13_10.1.8/build.gradle
@@ -37,5 +37,5 @@ verifyInstrumentation {
 
 site {
     title 'Akka Http Core'
-    type 'Framework'
+    type 'Http'
 }
diff --git a/instrumentation/akka-http-core-2.13_10.2.0/build.gradle b/instrumentation/akka-http-core-2.13_10.2.0/build.gradle
index 4ab698ee77..fe7ed2617b 100644
--- a/instrumentation/akka-http-core-2.13_10.2.0/build.gradle
+++ b/instrumentation/akka-http-core-2.13_10.2.0/build.gradle
@@ -23,5 +23,5 @@ verifyInstrumentation {
 
 site {
     title 'Akka Http Core'
-    type 'Framework'
+    type 'Http'
 }
diff --git a/instrumentation/apache-log4j-1/build.gradle b/instrumentation/apache-log4j-1/build.gradle
index 0390b1ee73..c71546f899 100644
--- a/instrumentation/apache-log4j-1/build.gradle
+++ b/instrumentation/apache-log4j-1/build.gradle
@@ -19,5 +19,5 @@ verifyInstrumentation {
 
 site {
     title 'Log4j-1'
-    type 'Framework'
+    type 'Logging'
 }
diff --git a/instrumentation/apache-log4j-2.11/build.gradle b/instrumentation/apache-log4j-2.11/build.gradle
index e84eff7c3d..9a75259fbd 100644
--- a/instrumentation/apache-log4j-2.11/build.gradle
+++ b/instrumentation/apache-log4j-2.11/build.gradle
@@ -19,5 +19,5 @@ verifyInstrumentation {
 
 site {
     title 'Log4j2'
-    type 'Framework'
+    type 'Logging'
 }
diff --git a/instrumentation/apache-log4j-2.6/build.gradle b/instrumentation/apache-log4j-2.6/build.gradle
index dff4ad111b..2a0334f8dc 100644
--- a/instrumentation/apache-log4j-2.6/build.gradle
+++ b/instrumentation/apache-log4j-2.6/build.gradle
@@ -13,5 +13,5 @@ verifyInstrumentation {
 
 site {
     title 'Log4j2'
-    type 'Framework'
+    type 'Logging'
 }
diff --git a/instrumentation/apache-log4j-layout-template-json-2.14.0/build.gradle b/instrumentation/apache-log4j-layout-template-json-2.14.0/build.gradle
index db3a2eb0b8..3facfaac8e 100644
--- a/instrumentation/apache-log4j-layout-template-json-2.14.0/build.gradle
+++ b/instrumentation/apache-log4j-layout-template-json-2.14.0/build.gradle
@@ -12,3 +12,8 @@ verifyInstrumentation {
     passesOnly("org.apache.logging.log4j:log4j-layout-template-json:[2.14.0,)")
     excludeRegex '.*(alpha|beta|rc).*'
 }
+
+site {
+    title 'Log4j Layout Template JSON'
+    type 'Logging'
+}
diff --git a/instrumentation/apache-pekko-http-2.13_1/build.gradle b/instrumentation/apache-pekko-http-2.13_1/build.gradle
index 992320a278..0b7998bc25 100644
--- a/instrumentation/apache-pekko-http-2.13_1/build.gradle
+++ b/instrumentation/apache-pekko-http-2.13_1/build.gradle
@@ -34,4 +34,5 @@ verifyInstrumentation {
 site {
     title 'Pekko Http'
     type 'Framework'
+    details 'Scala 2.13: 1.0.0 to latest'
 }
diff --git a/instrumentation/apache-pekko-http-3_1/build.gradle b/instrumentation/apache-pekko-http-3_1/build.gradle
index 24b6e9f396..57a076bfbc 100644
--- a/instrumentation/apache-pekko-http-3_1/build.gradle
+++ b/instrumentation/apache-pekko-http-3_1/build.gradle
@@ -32,4 +32,5 @@ verifyInstrumentation {
 site {
     title 'Pekko Http'
     type 'Framework'
+    details 'Scala 3: 1.0.0 to latest'
 }
diff --git a/instrumentation/apache-pekko-http-core-2.13_1/build.gradle b/instrumentation/apache-pekko-http-core-2.13_1/build.gradle
index 94c6f4b809..52bcedd64d 100644
--- a/instrumentation/apache-pekko-http-core-2.13_1/build.gradle
+++ b/instrumentation/apache-pekko-http-core-2.13_1/build.gradle
@@ -24,4 +24,5 @@ verifyInstrumentation {
 site {
     title 'Pekko Http Core'
     type 'Framework'
+    details 'Scala 2.13: 1.0.0 to latest, Scala 3: 1.0.0 to latest'
 }
diff --git a/instrumentation/async-http-client-2.0.0/build.gradle b/instrumentation/async-http-client-2.0.0/build.gradle
index ad81095a32..5084f99a1d 100644
--- a/instrumentation/async-http-client-2.0.0/build.gradle
+++ b/instrumentation/async-http-client-2.0.0/build.gradle
@@ -23,5 +23,5 @@ test {
 
 site {
     title 'Async Http Client'
-    type 'Messaging'
+    type 'Http'
 }
diff --git a/instrumentation/async-http-client-2.1.0/build.gradle b/instrumentation/async-http-client-2.1.0/build.gradle
index 87e9b93193..05390e0ecd 100644
--- a/instrumentation/async-http-client-2.1.0/build.gradle
+++ b/instrumentation/async-http-client-2.1.0/build.gradle
@@ -22,5 +22,5 @@ test {
 
 site {
     title 'Async Http Client'
-    type 'Messaging'
+    type 'Http'
 }
diff --git a/instrumentation/aws-bedrock-runtime-2.20/build.gradle b/instrumentation/aws-bedrock-runtime-2.20/build.gradle
index 01da205a22..47b9cdf69a 100644
--- a/instrumentation/aws-bedrock-runtime-2.20/build.gradle
+++ b/instrumentation/aws-bedrock-runtime-2.20/build.gradle
@@ -17,5 +17,5 @@ verifyInstrumentation {
 
 site {
     title 'AWS Bedrock'
-    type 'Other'
+    type 'AI'
 }
diff --git a/instrumentation/aws-java-sdk-dynamodb-1.11.106/build.gradle b/instrumentation/aws-java-sdk-dynamodb-1.11.106/build.gradle
index 464c934cd7..2511e6662d 100644
--- a/instrumentation/aws-java-sdk-dynamodb-1.11.106/build.gradle
+++ b/instrumentation/aws-java-sdk-dynamodb-1.11.106/build.gradle
@@ -70,6 +70,6 @@ test {
 }
 
 site {
-    title 'AWS DynamoDB'
-    type 'Datastore'
+    title 'AWS v1 DynamoDB'
+    type 'Datastore, InstanceLevelDB'
 }
diff --git a/instrumentation/aws-java-sdk-dynamodb-2.15.34/build.gradle b/instrumentation/aws-java-sdk-dynamodb-2.15.34/build.gradle
index ddb55df1b1..304ab92d37 100644
--- a/instrumentation/aws-java-sdk-dynamodb-2.15.34/build.gradle
+++ b/instrumentation/aws-java-sdk-dynamodb-2.15.34/build.gradle
@@ -99,6 +99,6 @@ test {
 }
 
 site {
-    title 'AWS DynamoDB'
-    type 'Datastore'
+    title 'AWS v2 DynamoDB'
+    type 'Datastore, InstanceLevelDB'
 }
diff --git a/instrumentation/aws-java-sdk-firehose-2.1.0/build.gradle b/instrumentation/aws-java-sdk-firehose-2.1.0/build.gradle
index 2cda6125cd..13fad904f2 100644
--- a/instrumentation/aws-java-sdk-firehose-2.1.0/build.gradle
+++ b/instrumentation/aws-java-sdk-firehose-2.1.0/build.gradle
@@ -74,4 +74,9 @@ verifyInstrumentation {
 
     // The next excludes will be 2.34.x -- Leaving this out so the verifier actually
     // has something to run against.
+}
+
+site {
+    title 'AWS Firehose'
+    type 'Framework'
 }
\ No newline at end of file
diff --git a/instrumentation/aws-java-sdk-kinesis-1.11.106/build.gradle b/instrumentation/aws-java-sdk-kinesis-1.11.106/build.gradle
index caeb5235d6..35ec3df3c1 100644
--- a/instrumentation/aws-java-sdk-kinesis-1.11.106/build.gradle
+++ b/instrumentation/aws-java-sdk-kinesis-1.11.106/build.gradle
@@ -9,4 +9,9 @@ jar {
 
 verifyInstrumentation {
     passesOnly 'com.amazonaws:aws-java-sdk-kinesis:[1.11.106,1.11.272)'
+}
+
+site {
+    title 'AWS Kinesis'
+    type 'Framework'
 }
\ No newline at end of file
diff --git a/instrumentation/aws-java-sdk-kinesis-1.11.272/build.gradle b/instrumentation/aws-java-sdk-kinesis-1.11.272/build.gradle
index 3cdd105bf2..47b1d7e14f 100644
--- a/instrumentation/aws-java-sdk-kinesis-1.11.272/build.gradle
+++ b/instrumentation/aws-java-sdk-kinesis-1.11.272/build.gradle
@@ -9,4 +9,9 @@ jar {
 
 verifyInstrumentation {
     passesOnly 'com.amazonaws:aws-java-sdk-kinesis:[1.11.272,)'
+}
+
+site {
+    title 'AWS Kinesis'
+    type 'Framework'
 }
\ No newline at end of file
diff --git a/instrumentation/aws-java-sdk-kinesis-2.1.0/build.gradle b/instrumentation/aws-java-sdk-kinesis-2.1.0/build.gradle
index 1dc842d96c..d2421bcc3d 100644
--- a/instrumentation/aws-java-sdk-kinesis-2.1.0/build.gradle
+++ b/instrumentation/aws-java-sdk-kinesis-2.1.0/build.gradle
@@ -69,4 +69,9 @@ verifyInstrumentation {
     exclude 'software.amazon.awssdk:kinesis:[2.31.0,2.31.77]'
     exclude 'software.amazon.awssdk:kinesis:[2.32.0,2.32.32]'
     exclude 'software.amazon.awssdk:kinesis:[2.33.0,2.33.12]'
+}
+
+site {
+    title 'AWS Kinesis'
+    type 'Framework'
 }
\ No newline at end of file
diff --git a/instrumentation/aws-java-sdk-kinesis-2.18.40/build.gradle b/instrumentation/aws-java-sdk-kinesis-2.18.40/build.gradle
index 8a8122bea6..326a4202cc 100644
--- a/instrumentation/aws-java-sdk-kinesis-2.18.40/build.gradle
+++ b/instrumentation/aws-java-sdk-kinesis-2.18.40/build.gradle
@@ -10,4 +10,9 @@ jar {
 verifyInstrumentation {
     passes 'software.amazon.awssdk:kinesis:[2.18.40,)'
     excludeRegex '.*-preview-[0-9a-f]+'
+}
+
+site {
+    title 'AWS Kinesis'
+    type 'Framework'
 }
\ No newline at end of file
diff --git a/instrumentation/aws-java-sdk-s3-2.0/src/main/java/com/agent/instrumentation/awsjavasdk2/services/s3/ResultWrapper.java b/instrumentation/aws-java-sdk-s3-2.0/src/main/java/com/agent/instrumentation/awsjavasdk2/services/s3/ResultWrapper.java
new file mode 100644
index 0000000000..82bcdd99a9
--- /dev/null
+++ b/instrumentation/aws-java-sdk-s3-2.0/src/main/java/com/agent/instrumentation/awsjavasdk2/services/s3/ResultWrapper.java
@@ -0,0 +1,24 @@
+package com.agent.instrumentation.awsjavasdk2.services.s3;
+
+import com.newrelic.agent.bridge.AgentBridge;
+import com.newrelic.api.agent.Segment;
+import com.newrelic.api.agent.weaver.Weaver;
+
+import java.util.function.BiConsumer;
+
+public class ResultWrapper<T, U> implements BiConsumer<T, U> {
+    private Segment segment;
+
+    public ResultWrapper(Segment segment) {
+        this.segment = segment;
+    }
+
+    @Override
+    public void accept(T t, U u) {
+        try {
+            segment.end();
+        } catch (Throwable t1) {
+            AgentBridge.instrumentation.noticeInstrumentationError(t1, Weaver.getImplementationTitle());
+        }
+    }
+}
diff --git a/instrumentation/aws-java-sdk-s3-2.0/src/main/java/com/agent/instrumentation/awsjavasdk2/services/s3/S3ResponseResultWrapper.java b/instrumentation/aws-java-sdk-s3-2.0/src/main/java/com/agent/instrumentation/awsjavasdk2/services/s3/S3ResponseResultWrapper.java
new file mode 100644
index 0000000000..98ad5c23c6
--- /dev/null
+++ b/instrumentation/aws-java-sdk-s3-2.0/src/main/java/com/agent/instrumentation/awsjavasdk2/services/s3/S3ResponseResultWrapper.java
@@ -0,0 +1,30 @@
+package com.agent.instrumentation.awsjavasdk2.services.s3;
+
+import com.newrelic.agent.bridge.AgentBridge;
+import com.newrelic.api.agent.Segment;
+import com.newrelic.api.agent.weaver.Weaver;
+import software.amazon.awssdk.services.s3.model.S3Response;
+
+import java.util.function.BiConsumer;
+
+public class S3ResponseResultWrapper<T extends S3Response, U> implements BiConsumer<T, U> {
+    private Segment segment;
+    private String uri;
+    private String operationName;
+
+    public S3ResponseResultWrapper(Segment segment, String uri, String operationName) {
+        this.segment = segment;
+        this.uri = uri;
+        this.operationName = operationName;
+    }
+
+    @Override
+    public void accept(T s3Response, U u) {
+        try {
+            S3MetricUtil.reportExternalMetrics(segment, uri, s3Response, operationName);
+            segment.end();
+        } catch (Throwable t1) {
+            AgentBridge.instrumentation.noticeInstrumentationError(t1, Weaver.getImplementationTitle());
+        }
+    }
+}
diff --git a/instrumentation/aws-java-sdk-s3-2.0/src/main/java/software/amazon/awssdk/services/s3/S3AsyncClient_Instrumentation.java b/instrumentation/aws-java-sdk-s3-2.0/src/main/java/software/amazon/awssdk/services/s3/S3AsyncClient_Instrumentation.java
index adf6a9bd81..4d3bf6c72f 100644
--- a/instrumentation/aws-java-sdk-s3-2.0/src/main/java/software/amazon/awssdk/services/s3/S3AsyncClient_Instrumentation.java
+++ b/instrumentation/aws-java-sdk-s3-2.0/src/main/java/software/amazon/awssdk/services/s3/S3AsyncClient_Instrumentation.java
@@ -7,14 +7,14 @@
 
 package software.amazon.awssdk.services.s3;
 
-import com.agent.instrumentation.awsjavasdk2.services.s3.S3MetricUtil;
+import com.agent.instrumentation.awsjavasdk2.services.s3.ResultWrapper;
+import com.agent.instrumentation.awsjavasdk2.services.s3.S3ResponseResultWrapper;
 import com.newrelic.agent.bridge.AgentBridge;
 import com.newrelic.api.agent.NewRelic;
 import com.newrelic.api.agent.Segment;
 import com.newrelic.api.agent.weaver.MatchType;
 import com.newrelic.api.agent.weaver.Weave;
 import com.newrelic.api.agent.weaver.Weaver;
-import java.util.Optional;
 import software.amazon.awssdk.core.async.AsyncRequestBody;
 import software.amazon.awssdk.core.async.AsyncResponseTransformer;
 import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
@@ -34,10 +34,8 @@
 import software.amazon.awssdk.services.s3.model.ListObjectsResponse;
 import software.amazon.awssdk.services.s3.model.PutObjectRequest;
 import software.amazon.awssdk.services.s3.model.PutObjectResponse;
-import software.amazon.awssdk.services.s3.model.S3Response;
 
 import java.util.concurrent.CompletableFuture;
-import java.util.function.BiConsumer;
 
 @Weave(type = MatchType.Interface, originalName = "software.amazon.awssdk.services.s3.S3AsyncClient")
 public class S3AsyncClient_Instrumentation {
@@ -131,43 +129,4 @@ public CompletableFuture<DeleteObjectsResponse> deleteObjects(DeleteObjectsReque
 
         return result.whenComplete(new S3ResponseResultWrapper<>(segment, uri, "deleteObjects"));
     }
-
-    private class ResultWrapper<T, U> implements BiConsumer<T, U> {
-        private Segment segment;
-
-        public ResultWrapper(Segment segment) {
-            this.segment = segment;
-        }
-
-        @Override
-        public void accept(T t, U u) {
-            try {
-                segment.end();
-            } catch (Throwable t1) {
-                AgentBridge.instrumentation.noticeInstrumentationError(t1, Weaver.getImplementationTitle());
-            }
-        }
-    }
-
-    private class S3ResponseResultWrapper<T extends S3Response, U> implements BiConsumer<T, U> {
-        private Segment segment;
-        private String uri;
-        private String operationName;
-
-        public S3ResponseResultWrapper(Segment segment, String uri, String operationName) {
-            this.segment = segment;
-            this.uri = uri;
-            this.operationName = operationName;
-        }
-
-        @Override
-        public void accept(T s3Response, U u) {
-            try {
-                S3MetricUtil.reportExternalMetrics(segment, uri, s3Response, operationName);
-                segment.end();
-            } catch (Throwable t1) {
-                AgentBridge.instrumentation.noticeInstrumentationError(t1, Weaver.getImplementationTitle());
-            }
-        }
-    }
 }
diff --git a/instrumentation/aws-java-sdk-sns-1.11.12/build.gradle b/instrumentation/aws-java-sdk-sns-1.11.12/build.gradle
index e1241f823d..a0a7f1bea0 100644
--- a/instrumentation/aws-java-sdk-sns-1.11.12/build.gradle
+++ b/instrumentation/aws-java-sdk-sns-1.11.12/build.gradle
@@ -18,5 +18,5 @@ verifyInstrumentation {
 
 site {
     title 'AWS SNS'
-    type 'Messaging'
+    type 'Framework, Messaging'
 }
diff --git a/instrumentation/aws-java-sdk-sns-2.0/build.gradle b/instrumentation/aws-java-sdk-sns-2.0/build.gradle
index 5e5c4bb37b..c6b892cc6b 100644
--- a/instrumentation/aws-java-sdk-sns-2.0/build.gradle
+++ b/instrumentation/aws-java-sdk-sns-2.0/build.gradle
@@ -77,5 +77,5 @@ verifyInstrumentation {
 
 site {
     title 'AWS SNS'
-    type 'Messaging'
+    type 'Framework, Messaging'
 }
diff --git a/instrumentation/aws-java-sdk-sqs-1.10.44/build.gradle b/instrumentation/aws-java-sdk-sqs-1.10.44/build.gradle
index ded46bcac4..f526d804ca 100644
--- a/instrumentation/aws-java-sdk-sqs-1.10.44/build.gradle
+++ b/instrumentation/aws-java-sdk-sqs-1.10.44/build.gradle
@@ -25,5 +25,5 @@ verifyInstrumentation {
 
 site {
     title 'AWS SQS'
-    type 'Messaging'
+    type 'Framework, Messaging'
 }
\ No newline at end of file
diff --git a/instrumentation/aws-java-sdk-sqs-2.1.0/build.gradle b/instrumentation/aws-java-sdk-sqs-2.1.0/build.gradle
index 1398604d02..275dbd0400 100644
--- a/instrumentation/aws-java-sdk-sqs-2.1.0/build.gradle
+++ b/instrumentation/aws-java-sdk-sqs-2.1.0/build.gradle
@@ -78,5 +78,5 @@ verifyInstrumentation {
 
 site {
     title 'AWS SQS'
-    type 'Messaging'
+    type 'Framework, Messaging'
 }
diff --git a/instrumentation/cassandra-datastax-3.0.0/build.gradle b/instrumentation/cassandra-datastax-3.0.0/build.gradle
index 8672be5cfb..cb9f0fa1b2 100644
--- a/instrumentation/cassandra-datastax-3.0.0/build.gradle
+++ b/instrumentation/cassandra-datastax-3.0.0/build.gradle
@@ -36,5 +36,5 @@ test {
 
 site {
     title 'Cassandra'
-    type 'Datastore'
+    type 'Datastore, InstanceLevelDB'
 }
diff --git a/instrumentation/cassandra-datastax-3.8.0/build.gradle b/instrumentation/cassandra-datastax-3.8.0/build.gradle
index e6215f6213..87c64504be 100644
--- a/instrumentation/cassandra-datastax-3.8.0/build.gradle
+++ b/instrumentation/cassandra-datastax-3.8.0/build.gradle
@@ -29,5 +29,5 @@ verifyInstrumentation {
 
 site {
     title 'Cassandra'
-    type 'Datastore'
+    type 'Datastore, InstanceLevelDB'
 }
diff --git a/instrumentation/cassandra-datastax-4.0.0/build.gradle b/instrumentation/cassandra-datastax-4.0.0/build.gradle
index 164603d499..94e1b32985 100644
--- a/instrumentation/cassandra-datastax-4.0.0/build.gradle
+++ b/instrumentation/cassandra-datastax-4.0.0/build.gradle
@@ -25,5 +25,5 @@ test {
 
 site {
     title 'Cassandra'
-    type 'Datastore'
+    type 'Datastore, InstanceLevelDB'
 }
diff --git a/instrumentation/cats-effect-2/build.gradle b/instrumentation/cats-effect-2/build.gradle
index 2f9580fc84..d146335000 100644
--- a/instrumentation/cats-effect-2/build.gradle
+++ b/instrumentation/cats-effect-2/build.gradle
@@ -28,8 +28,9 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Scala'
-    type 'Other'
+    title 'Cats Effect v2'
+    type 'Framework'
+    details 'Scala 2.12: 2.1 to 3.0 (exclusive), Scala 2.13: 2.1 to 3.0 (exclusive)'
 }
 
 sourceSets.main.scala.srcDirs = ['src/main/scala', 'src/main/java']
diff --git a/instrumentation/cats-effect-3.3.0/build.gradle b/instrumentation/cats-effect-3.3.0/build.gradle
index dd11f49204..37d39f523a 100644
--- a/instrumentation/cats-effect-3.3.0/build.gradle
+++ b/instrumentation/cats-effect-3.3.0/build.gradle
@@ -23,8 +23,8 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Scala'
-    type 'Other'
+    title 'Cats Effect'
+    type 'Framework'
 }
 
 sourceSets.main.scala.srcDirs = ['src/main/scala', 'src/main/java']
diff --git a/instrumentation/cats-effect-3/build.gradle b/instrumentation/cats-effect-3/build.gradle
index 1bcbe79199..0f1c2e3cea 100644
--- a/instrumentation/cats-effect-3/build.gradle
+++ b/instrumentation/cats-effect-3/build.gradle
@@ -23,8 +23,9 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Scala'
-    type 'Other'
+    title 'Cats Effect v3'
+    type 'Framework'
+    details 'Scala 2.12: 3.2 to 3.3.4, Scala 2.13: 3.2 to 3.3.4'
 }
 
 sourceSets.main.scala.srcDirs = ['src/main/scala', 'src/main/java']
diff --git a/instrumentation/couchbase-client-2.4.0/build.gradle b/instrumentation/couchbase-client-2.4.0/build.gradle
index 93e032b7bf..9a3b945340 100644
--- a/instrumentation/couchbase-client-2.4.0/build.gradle
+++ b/instrumentation/couchbase-client-2.4.0/build.gradle
@@ -19,5 +19,5 @@ verifyInstrumentation {
 
 site {
 	title 'Couchbase'
-	type 'Framework'
+	type 'Datastore'
 }
\ No newline at end of file
diff --git a/instrumentation/couchbase-client-3.0.0/build.gradle b/instrumentation/couchbase-client-3.0.0/build.gradle
index 041f7cc411..6fc33c1d8a 100644
--- a/instrumentation/couchbase-client-3.0.0/build.gradle
+++ b/instrumentation/couchbase-client-3.0.0/build.gradle
@@ -18,5 +18,5 @@ verifyInstrumentation {
 
 site {
 	title 'Couchbase'
-	type 'Framework'
+	type 'Datastore'
 }
\ No newline at end of file
diff --git a/instrumentation/couchbase-client-3.4.3/build.gradle b/instrumentation/couchbase-client-3.4.3/build.gradle
index 260580fb80..3341071480 100644
--- a/instrumentation/couchbase-client-3.4.3/build.gradle
+++ b/instrumentation/couchbase-client-3.4.3/build.gradle
@@ -18,5 +18,5 @@ verifyInstrumentation {
 
 site {
 	title 'Couchbase'
-	type 'Framework'
+	type 'Datastore'
 }
\ No newline at end of file
diff --git a/instrumentation/glassfish-jul-extension-7/build.gradle b/instrumentation/glassfish-jul-extension-7/build.gradle
index f3a71bcda6..be6d31dd6f 100644
--- a/instrumentation/glassfish-jul-extension-7/build.gradle
+++ b/instrumentation/glassfish-jul-extension-7/build.gradle
@@ -30,6 +30,6 @@ test {
 
 site {
     title 'Glassfish JUL Extension'
-    type 'Other'
+    type 'Logging'
     versionOverride '[7.0.0,)'
 }
diff --git a/instrumentation/graphql-java-16.2/build.gradle b/instrumentation/graphql-java-16.2/build.gradle
index ff3aae1752..af8e042bcc 100644
--- a/instrumentation/graphql-java-16.2/build.gradle
+++ b/instrumentation/graphql-java-16.2/build.gradle
@@ -23,7 +23,7 @@ verifyInstrumentation {
 }
 
 site {
-    title 'GraphQL Java'
+    title 'GraphQL'
     type 'Framework'
 }
 
diff --git a/instrumentation/graphql-java-17.0/build.gradle b/instrumentation/graphql-java-17.0/build.gradle
index 99a8f9d42a..4126303c13 100644
--- a/instrumentation/graphql-java-17.0/build.gradle
+++ b/instrumentation/graphql-java-17.0/build.gradle
@@ -22,7 +22,7 @@ verifyInstrumentation {
 }
 
 site {
-    title 'GraphQL Java'
+    title 'GraphQL'
     type 'Framework'
 }
 
diff --git a/instrumentation/grpc-1.22.0/build.gradle b/instrumentation/grpc-1.22.0/build.gradle
index c15acd55c1..e0b220f3fe 100644
--- a/instrumentation/grpc-1.22.0/build.gradle
+++ b/instrumentation/grpc-1.22.0/build.gradle
@@ -41,5 +41,5 @@ protobuf {
 
 site {
     title 'gRPC'
-    type 'Messaging'
+    type 'Http'
 }
diff --git a/instrumentation/grpc-1.30.0/build.gradle b/instrumentation/grpc-1.30.0/build.gradle
index 4697de41fb..4e2ed40870 100644
--- a/instrumentation/grpc-1.30.0/build.gradle
+++ b/instrumentation/grpc-1.30.0/build.gradle
@@ -44,5 +44,5 @@ protobuf {
 
 site {
     title 'gRPC'
-    type 'Messaging'
+    type 'Http'
 }
diff --git a/instrumentation/grpc-1.4.0/build.gradle b/instrumentation/grpc-1.4.0/build.gradle
index 0d566858f4..a85832fda9 100644
--- a/instrumentation/grpc-1.4.0/build.gradle
+++ b/instrumentation/grpc-1.4.0/build.gradle
@@ -41,5 +41,5 @@ protobuf {
 
 site {
     title 'gRPC'
-    type 'Messaging'
+    type 'Http'
 }
\ No newline at end of file
diff --git a/instrumentation/grpc-1.40.0/build.gradle b/instrumentation/grpc-1.40.0/build.gradle
index 90f0e8cb2f..7f146213db 100644
--- a/instrumentation/grpc-1.40.0/build.gradle
+++ b/instrumentation/grpc-1.40.0/build.gradle
@@ -48,5 +48,5 @@ test {
 
 site {
     title 'gRPC'
-    type 'Messaging'
+    type 'Http'
 }
diff --git a/instrumentation/http-async-client-4/build.gradle b/instrumentation/http-async-client-4/build.gradle
index 4b93b30ca6..64e9d7449b 100644
--- a/instrumentation/http-async-client-4/build.gradle
+++ b/instrumentation/http-async-client-4/build.gradle
@@ -17,5 +17,5 @@ verifyInstrumentation {
 
 site {
     title 'Apache HttpAsyncClient'
-    type 'Messaging'
+    type 'Http'
 }
\ No newline at end of file
diff --git a/instrumentation/http4s-blaze-client-2.12_0.21/build.gradle b/instrumentation/http4s-blaze-client-2.12_0.21/build.gradle
index b71d967317..5fe559d1c9 100644
--- a/instrumentation/http4s-blaze-client-2.12_0.21/build.gradle
+++ b/instrumentation/http4s-blaze-client-2.12_0.21/build.gradle
@@ -29,3 +29,8 @@ verifyInstrumentation {
 
 sourceSets.main.scala.srcDirs = ['src/main/scala', 'src/main/java']
 sourceSets.main.java.srcDirs = []
+
+site {
+    title 'Blaze Client'
+    type 'Http'
+}
diff --git a/instrumentation/http4s-blaze-client-2.12_0.22/build.gradle b/instrumentation/http4s-blaze-client-2.12_0.22/build.gradle
index 3578e50c3d..52c6d6adab 100644
--- a/instrumentation/http4s-blaze-client-2.12_0.22/build.gradle
+++ b/instrumentation/http4s-blaze-client-2.12_0.22/build.gradle
@@ -30,3 +30,8 @@ verifyInstrumentation {
 
 sourceSets.main.scala.srcDirs = ['src/main/scala', 'src/main/java']
 sourceSets.main.java.srcDirs = []
+
+site {
+    title 'Blaze Client'
+    type 'Http'
+}
diff --git a/instrumentation/http4s-blaze-client-2.12_0.23/build.gradle b/instrumentation/http4s-blaze-client-2.12_0.23/build.gradle
index c0f1cac68a..aa0e373102 100644
--- a/instrumentation/http4s-blaze-client-2.12_0.23/build.gradle
+++ b/instrumentation/http4s-blaze-client-2.12_0.23/build.gradle
@@ -30,3 +30,9 @@ verifyInstrumentation {
 
 sourceSets.main.scala.srcDirs = ['src/main/scala', 'src/main/java']
 sourceSets.main.java.srcDirs = []
+
+site {
+    title 'Blaze Client'
+    type 'Http'
+    details 'Scala 2.12: 0.21.0 to 0.24.0 (exclusive)'
+}
diff --git a/instrumentation/http4s-blaze-client-2.13_0.21/build.gradle b/instrumentation/http4s-blaze-client-2.13_0.21/build.gradle
index f6d3ab8123..98942b05b0 100644
--- a/instrumentation/http4s-blaze-client-2.13_0.21/build.gradle
+++ b/instrumentation/http4s-blaze-client-2.13_0.21/build.gradle
@@ -29,3 +29,8 @@ verifyInstrumentation {
 
 sourceSets.main.scala.srcDirs = ['src/main/scala', 'src/main/java']
 sourceSets.main.java.srcDirs = []
+
+site {
+    title 'Blaze Client'
+    type 'Http'
+}
diff --git a/instrumentation/http4s-blaze-client-2.13_0.22/build.gradle b/instrumentation/http4s-blaze-client-2.13_0.22/build.gradle
index 63830032a9..76b308cb32 100644
--- a/instrumentation/http4s-blaze-client-2.13_0.22/build.gradle
+++ b/instrumentation/http4s-blaze-client-2.13_0.22/build.gradle
@@ -30,3 +30,8 @@ verifyInstrumentation {
 
 sourceSets.main.scala.srcDirs = ['src/main/scala', 'src/main/java']
 sourceSets.main.java.srcDirs = []
+
+site {
+    title 'Blaze Client'
+    type 'Http'
+}
\ No newline at end of file
diff --git a/instrumentation/http4s-blaze-client-2.13_0.23/build.gradle b/instrumentation/http4s-blaze-client-2.13_0.23/build.gradle
index 32b219c7eb..0c4f4efa57 100644
--- a/instrumentation/http4s-blaze-client-2.13_0.23/build.gradle
+++ b/instrumentation/http4s-blaze-client-2.13_0.23/build.gradle
@@ -30,3 +30,9 @@ verifyInstrumentation {
 
 sourceSets.main.scala.srcDirs = ['src/main/scala', 'src/main/java']
 sourceSets.main.java.srcDirs = []
+
+site {
+    title 'Blaze Client'
+    type 'Http'
+    details 'Scala 2.13: 0.21.0 to 0.24.0 (exclusive)'
+}
diff --git a/instrumentation/http4s-blaze-server-2.12_0.21/build.gradle b/instrumentation/http4s-blaze-server-2.12_0.21/build.gradle
index a1d97d665e..29352389c8 100644
--- a/instrumentation/http4s-blaze-server-2.12_0.21/build.gradle
+++ b/instrumentation/http4s-blaze-server-2.12_0.21/build.gradle
@@ -26,3 +26,8 @@ verifyInstrumentation {
 
 sourceSets.main.scala.srcDirs = ['src/main/scala', 'src/main/java']
 sourceSets.main.java.srcDirs = []
+
+site {
+    title 'Blaze Server'
+    type 'Http'
+}
diff --git a/instrumentation/http4s-blaze-server-2.12_0.22/build.gradle b/instrumentation/http4s-blaze-server-2.12_0.22/build.gradle
index 00c94fc011..8e799390f8 100644
--- a/instrumentation/http4s-blaze-server-2.12_0.22/build.gradle
+++ b/instrumentation/http4s-blaze-server-2.12_0.22/build.gradle
@@ -27,3 +27,8 @@ verifyInstrumentation {
 
 sourceSets.main.scala.srcDirs = ['src/main/scala', 'src/main/java']
 sourceSets.main.java.srcDirs = []
+
+site {
+    title 'Blaze Server'
+    type 'Http'
+}
diff --git a/instrumentation/http4s-blaze-server-2.12_0.23/build.gradle b/instrumentation/http4s-blaze-server-2.12_0.23/build.gradle
index 21fa44cfda..449e146544 100644
--- a/instrumentation/http4s-blaze-server-2.12_0.23/build.gradle
+++ b/instrumentation/http4s-blaze-server-2.12_0.23/build.gradle
@@ -28,3 +28,9 @@ verifyInstrumentation {
 
 sourceSets.main.scala.srcDirs = ['src/main/scala', 'src/main/java']
 sourceSets.main.java.srcDirs = []
+
+site {
+    title 'Blaze Server'
+    type 'Http'
+    details 'Scala 2.12: 0.21.0 to 0.24.0 (exclusive)'
+}
diff --git a/instrumentation/http4s-blaze-server-2.13_0.21/build.gradle b/instrumentation/http4s-blaze-server-2.13_0.21/build.gradle
index e49f8c114b..1351b59c0f 100644
--- a/instrumentation/http4s-blaze-server-2.13_0.21/build.gradle
+++ b/instrumentation/http4s-blaze-server-2.13_0.21/build.gradle
@@ -26,3 +26,8 @@ verifyInstrumentation {
 
 sourceSets.main.scala.srcDirs = ['src/main/scala', 'src/main/java']
 sourceSets.main.java.srcDirs = []
+
+site {
+    title 'Blaze Server'
+    type 'Http'
+}
diff --git a/instrumentation/http4s-blaze-server-2.13_0.22/build.gradle b/instrumentation/http4s-blaze-server-2.13_0.22/build.gradle
index 00f7eb878f..a676bfb8e9 100644
--- a/instrumentation/http4s-blaze-server-2.13_0.22/build.gradle
+++ b/instrumentation/http4s-blaze-server-2.13_0.22/build.gradle
@@ -27,3 +27,8 @@ verifyInstrumentation {
 
 sourceSets.main.scala.srcDirs = ['src/main/scala', 'src/main/java']
 sourceSets.main.java.srcDirs = []
+
+site {
+    title 'Blaze Server'
+    type 'Http'
+}
diff --git a/instrumentation/http4s-blaze-server-2.13_0.23/build.gradle b/instrumentation/http4s-blaze-server-2.13_0.23/build.gradle
index cccc7d0462..5158c16966 100644
--- a/instrumentation/http4s-blaze-server-2.13_0.23/build.gradle
+++ b/instrumentation/http4s-blaze-server-2.13_0.23/build.gradle
@@ -28,3 +28,9 @@ verifyInstrumentation {
 
 sourceSets.main.scala.srcDirs = ['src/main/scala', 'src/main/java']
 sourceSets.main.java.srcDirs = []
+
+site {
+    title 'Blaze Server'
+    type 'Http'
+    details 'Scala 2.13: 0.21.0 to 0.24.0 (exclusive)'
+}
diff --git a/instrumentation/http4s-ember-client-2.12_0.23/build.gradle b/instrumentation/http4s-ember-client-2.12_0.23/build.gradle
index f46855ee37..2067259b5f 100644
--- a/instrumentation/http4s-ember-client-2.12_0.23/build.gradle
+++ b/instrumentation/http4s-ember-client-2.12_0.23/build.gradle
@@ -26,3 +26,8 @@ verifyInstrumentation {
 
 sourceSets.main.scala.srcDirs = ['src/main/scala', 'src/main/java']
 sourceSets.main.java.srcDirs = []
+
+site {
+    title 'Ember Client'
+    type 'Http'
+}
diff --git a/instrumentation/http4s-ember-client-2.13_0.23/build.gradle b/instrumentation/http4s-ember-client-2.13_0.23/build.gradle
index cb94fc6a32..eba5086c64 100644
--- a/instrumentation/http4s-ember-client-2.13_0.23/build.gradle
+++ b/instrumentation/http4s-ember-client-2.13_0.23/build.gradle
@@ -26,3 +26,8 @@ verifyInstrumentation {
 
 sourceSets.main.scala.srcDirs = ['src/main/scala', 'src/main/java']
 sourceSets.main.java.srcDirs = []
+
+site {
+    title 'Ember Client'
+    type 'Http'
+}
diff --git a/instrumentation/http4s-ember-server-2.12_0.23/build.gradle b/instrumentation/http4s-ember-server-2.12_0.23/build.gradle
index 63c334a50f..85bdbb06ec 100644
--- a/instrumentation/http4s-ember-server-2.12_0.23/build.gradle
+++ b/instrumentation/http4s-ember-server-2.12_0.23/build.gradle
@@ -28,3 +28,8 @@ verifyInstrumentation {
 
 sourceSets.main.scala.srcDirs = ['src/main/scala', 'src/main/java']
 sourceSets.main.java.srcDirs = []
+
+site {
+    title 'Ember Server'
+    type 'Http'
+}
diff --git a/instrumentation/http4s-ember-server-2.13_0.23/build.gradle b/instrumentation/http4s-ember-server-2.13_0.23/build.gradle
index 03c967c83a..d8ec48e6c5 100644
--- a/instrumentation/http4s-ember-server-2.13_0.23/build.gradle
+++ b/instrumentation/http4s-ember-server-2.13_0.23/build.gradle
@@ -27,3 +27,8 @@ verifyInstrumentation {
 
 sourceSets.main.scala.srcDirs = ['src/main/scala', 'src/main/java']
 sourceSets.main.java.srcDirs = []
+
+site {
+    title 'Ember Server'
+    type 'Http'
+}
diff --git a/instrumentation/httpclient-3.1/build.gradle b/instrumentation/httpclient-3.1/build.gradle
index 9516d23343..1666147246 100644
--- a/instrumentation/httpclient-3.1/build.gradle
+++ b/instrumentation/httpclient-3.1/build.gradle
@@ -20,5 +20,5 @@ verifyInstrumentation {
 
 site {
     title 'Apache Httpclient'
-    type 'Messaging'
+    type 'Http'
 }
\ No newline at end of file
diff --git a/instrumentation/httpclient-4.0/build.gradle b/instrumentation/httpclient-4.0/build.gradle
index a87cb8a6f2..10b720161a 100644
--- a/instrumentation/httpclient-4.0/build.gradle
+++ b/instrumentation/httpclient-4.0/build.gradle
@@ -16,5 +16,5 @@ verifyInstrumentation {
 
 site {
     title 'Apache Httpclient'
-    type 'Messaging'
+    type 'Http'
 }
\ No newline at end of file
diff --git a/instrumentation/httpclient-5.0/build.gradle b/instrumentation/httpclient-5.0/build.gradle
index 796fe90343..4e9e62dba9 100644
--- a/instrumentation/httpclient-5.0/build.gradle
+++ b/instrumentation/httpclient-5.0/build.gradle
@@ -16,5 +16,5 @@ verifyInstrumentation {
 
 site {
     title 'Apache Httpclient'
-    type 'Messaging'
+    type 'Http'
 }
\ No newline at end of file
diff --git a/instrumentation/httpclient-jdk11/build.gradle b/instrumentation/httpclient-jdk11/build.gradle
index 501136d6b7..4e4f576fc8 100644
--- a/instrumentation/httpclient-jdk11/build.gradle
+++ b/instrumentation/httpclient-jdk11/build.gradle
@@ -23,6 +23,12 @@ compileJava {
     options.bootstrapClasspath = null
 }
 
+site {
+    title 'Java HttpClient'
+    type 'Http'
+    versionOverride '[11,)'
+}
+
 
 
 
diff --git a/instrumentation/httpurlconnection/build.gradle b/instrumentation/httpurlconnection/build.gradle
index a39e6befd6..3f83f50861 100644
--- a/instrumentation/httpurlconnection/build.gradle
+++ b/instrumentation/httpurlconnection/build.gradle
@@ -14,7 +14,7 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Httpurlconnection'
-    type 'Messaging'
+    title 'HttpUrlConnection'
+    type 'Http'
     versionOverride '[0,)'
 }
\ No newline at end of file
diff --git a/instrumentation/java.logging-jdk8/build.gradle b/instrumentation/java.logging-jdk8/build.gradle
index 53f2c09a01..71455ca1f8 100644
--- a/instrumentation/java.logging-jdk8/build.gradle
+++ b/instrumentation/java.logging-jdk8/build.gradle
@@ -15,7 +15,7 @@ verifyInstrumentation {
 
 site {
     title 'Java Logging'
-    type 'Other'
+    type 'Logging'
     versionOverride '[8,)'
 }
 
diff --git a/instrumentation/jboss-logging/build.gradle b/instrumentation/jboss-logging/build.gradle
index d5ed4a5e2b..524623ae9c 100644
--- a/instrumentation/jboss-logging/build.gradle
+++ b/instrumentation/jboss-logging/build.gradle
@@ -13,7 +13,7 @@ verifyInstrumentation {
 
 site {
     title 'JBoss Logging'
-    type 'Other'
+    type 'Logging'
     versionOverride '[1.3.0,)'
 }
 
diff --git a/instrumentation/jdbc-db2/build.gradle b/instrumentation/jdbc-db2/build.gradle
index 69d176c90a..b2c8e16063 100644
--- a/instrumentation/jdbc-db2/build.gradle
+++ b/instrumentation/jdbc-db2/build.gradle
@@ -13,7 +13,7 @@ verifyInstrumentation {
 }
 
 site {
-    title 'IBM DB2'
+    title 'DB2'
     type 'Datastore'
     versionOverride '[9.1,)'
 }
diff --git a/instrumentation/jdbc-embedded-derby-10.11.1.1/build.gradle b/instrumentation/jdbc-embedded-derby-10.11.1.1/build.gradle
index d184332323..a49f0a7d80 100644
--- a/instrumentation/jdbc-embedded-derby-10.11.1.1/build.gradle
+++ b/instrumentation/jdbc-embedded-derby-10.11.1.1/build.gradle
@@ -14,6 +14,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Embedded Derby'
+    title 'Derby'
     type 'Datastore'
 }
diff --git a/instrumentation/jdbc-embedded-derby-10.15.1.3/build.gradle b/instrumentation/jdbc-embedded-derby-10.15.1.3/build.gradle
index aa07511011..85353a53cc 100644
--- a/instrumentation/jdbc-embedded-derby-10.15.1.3/build.gradle
+++ b/instrumentation/jdbc-embedded-derby-10.15.1.3/build.gradle
@@ -18,6 +18,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Embedded Derby'
+    title 'Derby'
     type 'Datastore'
 }
diff --git a/instrumentation/jdbc-generic/build.gradle b/instrumentation/jdbc-generic/build.gradle
index 98ada615a1..17315b4c3f 100644
--- a/instrumentation/jdbc-generic/build.gradle
+++ b/instrumentation/jdbc-generic/build.gradle
@@ -59,9 +59,3 @@ verifyInstrumentation {
     passesOnly 'com.sybase:jdbc3:[6.0,)'
 
 }
-
-site {
-    title 'Generic JDBC'
-    type 'Datastore' 
-    versionOverride '[0,)'
-}
diff --git a/instrumentation/jedis-1.4.0/build.gradle b/instrumentation/jedis-1.4.0/build.gradle
index 3995e5648b..80d4abd7b3 100644
--- a/instrumentation/jedis-1.4.0/build.gradle
+++ b/instrumentation/jedis-1.4.0/build.gradle
@@ -19,5 +19,5 @@ verifyInstrumentation {
 
 site {
     title 'Jedis'
-    type 'Datastore'
+    type 'Datastore, InstanceLevelDB'
 }
\ No newline at end of file
diff --git a/instrumentation/jedis-2.7.1/build.gradle b/instrumentation/jedis-2.7.1/build.gradle
index 698b8ff1f1..d92856c64b 100644
--- a/instrumentation/jedis-2.7.1/build.gradle
+++ b/instrumentation/jedis-2.7.1/build.gradle
@@ -17,5 +17,5 @@ verifyInstrumentation {
 
 site {
     title 'Jedis'
-    type 'Datastore'
+    type 'Datastore, InstanceLevelDB'
 }
\ No newline at end of file
diff --git a/instrumentation/jedis-2.7.2/build.gradle b/instrumentation/jedis-2.7.2/build.gradle
index 5ea102c136..7951cd1d96 100644
--- a/instrumentation/jedis-2.7.2/build.gradle
+++ b/instrumentation/jedis-2.7.2/build.gradle
@@ -17,5 +17,5 @@ verifyInstrumentation {
 
 site {
     title 'Jedis'
-    type 'Datastore'
+    type 'Datastore, InstanceLevelDB'
 }
\ No newline at end of file
diff --git a/instrumentation/jedis-3.0.0/build.gradle b/instrumentation/jedis-3.0.0/build.gradle
index e039dc97f3..1cc17f3f0b 100644
--- a/instrumentation/jedis-3.0.0/build.gradle
+++ b/instrumentation/jedis-3.0.0/build.gradle
@@ -20,5 +20,5 @@ verifyInstrumentation {
 
 site {
     title 'Jedis'
-    type 'Datastore'
+    type 'Datastore, InstanceLevelDB'
 }
\ No newline at end of file
diff --git a/instrumentation/jedis-4.0.0/build.gradle b/instrumentation/jedis-4.0.0/build.gradle
index 0d1ddbe93e..1544d53885 100644
--- a/instrumentation/jedis-4.0.0/build.gradle
+++ b/instrumentation/jedis-4.0.0/build.gradle
@@ -20,5 +20,5 @@ verifyInstrumentation {
 
 site {
     title 'Jedis'
-    type 'Datastore'
+    type 'Datastore, InstanceLevelDB'
 }
\ No newline at end of file
diff --git a/instrumentation/jedis-5.0.0/build.gradle b/instrumentation/jedis-5.0.0/build.gradle
index 324631dae3..c7bfdbb58b 100644
--- a/instrumentation/jedis-5.0.0/build.gradle
+++ b/instrumentation/jedis-5.0.0/build.gradle
@@ -20,5 +20,5 @@ verifyInstrumentation {
 
 site {
     title 'Jedis'
-    type 'Datastore'
+    type 'Datastore, InstanceLevelDB'
 }
diff --git a/instrumentation/jedis-6.0.0/build.gradle b/instrumentation/jedis-6.0.0/build.gradle
index 295d1f201a..a4c2afb782 100644
--- a/instrumentation/jedis-6.0.0/build.gradle
+++ b/instrumentation/jedis-6.0.0/build.gradle
@@ -19,5 +19,5 @@ verifyInstrumentation {
 
 site {
     title 'Jedis'
-    type 'Datastore'
+    type 'Datastore, InstanceLevelDB'
 }
diff --git a/instrumentation/kafka-clients-config-1.1.0/build.gradle b/instrumentation/kafka-clients-config-1.1.0/build.gradle
index ea40411a86..3d3a9b91a6 100644
--- a/instrumentation/kafka-clients-config-1.1.0/build.gradle
+++ b/instrumentation/kafka-clients-config-1.1.0/build.gradle
@@ -19,6 +19,6 @@ verifyInstrumentation {
 
 
 site {
-    title 'Kafka'
-    type 'Messaging'
+    title 'Kafka Clients Config'
+    type 'Kafka'
 }
diff --git a/instrumentation/kafka-clients-heartbeat-0.10.1.0/build.gradle b/instrumentation/kafka-clients-heartbeat-0.10.1.0/build.gradle
index 4d7eb6a250..bcb51a89cd 100644
--- a/instrumentation/kafka-clients-heartbeat-0.10.1.0/build.gradle
+++ b/instrumentation/kafka-clients-heartbeat-0.10.1.0/build.gradle
@@ -14,6 +14,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Kafka'
-    type 'Messaging'
+    title 'Kafka Clients Heartbeat'
+    type 'Kafka'
 }
\ No newline at end of file
diff --git a/instrumentation/kafka-clients-heartbeat-2.1.0/build.gradle b/instrumentation/kafka-clients-heartbeat-2.1.0/build.gradle
index c463273cce..4004279d03 100644
--- a/instrumentation/kafka-clients-heartbeat-2.1.0/build.gradle
+++ b/instrumentation/kafka-clients-heartbeat-2.1.0/build.gradle
@@ -14,6 +14,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Kafka'
-    type 'Messaging'
+    title 'Kafka Clients Heartbeat'
+    type 'Kafka'
 }
\ No newline at end of file
diff --git a/instrumentation/kafka-clients-metrics-0.10.0.0/build.gradle b/instrumentation/kafka-clients-metrics-0.10.0.0/build.gradle
index 41e2ad0fa8..73323bfe0e 100644
--- a/instrumentation/kafka-clients-metrics-0.10.0.0/build.gradle
+++ b/instrumentation/kafka-clients-metrics-0.10.0.0/build.gradle
@@ -17,6 +17,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Kafka'
-    type 'Messaging'
+    title 'Kafka Clients Metrics'
+    type 'Kafka'
 }
\ No newline at end of file
diff --git a/instrumentation/kafka-clients-metrics-2.0.0/build.gradle b/instrumentation/kafka-clients-metrics-2.0.0/build.gradle
index 6ac7423ffb..d3e17116f9 100644
--- a/instrumentation/kafka-clients-metrics-2.0.0/build.gradle
+++ b/instrumentation/kafka-clients-metrics-2.0.0/build.gradle
@@ -16,6 +16,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Kafka'
-    type 'Messaging'
+    title 'Kafka Clients Metrics'
+    type 'Kafka'
 }
diff --git a/instrumentation/kafka-clients-metrics-3.0.0/build.gradle b/instrumentation/kafka-clients-metrics-3.0.0/build.gradle
index c63f4c997b..ea3401a162 100644
--- a/instrumentation/kafka-clients-metrics-3.0.0/build.gradle
+++ b/instrumentation/kafka-clients-metrics-3.0.0/build.gradle
@@ -16,6 +16,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Kafka'
-    type 'Messaging'
+    title 'Kafka Clients Metrics'
+    type 'Kafka'
 }
diff --git a/instrumentation/kafka-clients-metrics-3.7.0/build.gradle b/instrumentation/kafka-clients-metrics-3.7.0/build.gradle
index 5776f777a4..5a2bc9cb78 100644
--- a/instrumentation/kafka-clients-metrics-3.7.0/build.gradle
+++ b/instrumentation/kafka-clients-metrics-3.7.0/build.gradle
@@ -16,6 +16,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Kafka'
-    type 'Messaging'
+    title 'Kafka Clients Metrics'
+    type 'Kafka'
 }
diff --git a/instrumentation/kafka-clients-metrics-3.9.0/build.gradle b/instrumentation/kafka-clients-metrics-3.9.0/build.gradle
index 1088ebc88d..59fa2eb03c 100644
--- a/instrumentation/kafka-clients-metrics-3.9.0/build.gradle
+++ b/instrumentation/kafka-clients-metrics-3.9.0/build.gradle
@@ -16,6 +16,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Kafka'
-    type 'Messaging'
+    title 'Kafka Clients Metrics'
+    type 'Kafka'
 }
diff --git a/instrumentation/kafka-clients-node-metrics-1.0.0/build.gradle b/instrumentation/kafka-clients-node-metrics-1.0.0/build.gradle
index 4e835cf447..1ad0754249 100644
--- a/instrumentation/kafka-clients-node-metrics-1.0.0/build.gradle
+++ b/instrumentation/kafka-clients-node-metrics-1.0.0/build.gradle
@@ -19,6 +19,6 @@ verifyInstrumentation {
 
 
 site {
-    title 'Kafka'
-    type 'Messaging'
+    title 'Kafka Clients Node Metrics'
+    type 'Kafka'
 }
diff --git a/instrumentation/kafka-clients-node-metrics-2.3.0/build.gradle b/instrumentation/kafka-clients-node-metrics-2.3.0/build.gradle
index 85c23079d3..868e76ce3d 100644
--- a/instrumentation/kafka-clients-node-metrics-2.3.0/build.gradle
+++ b/instrumentation/kafka-clients-node-metrics-2.3.0/build.gradle
@@ -19,6 +19,6 @@ verifyInstrumentation {
 
 
 site {
-    title 'Kafka'
-    type 'Messaging'
+    title 'Kafka Clients Node Metrics'
+    type 'Kafka'
 }
diff --git a/instrumentation/kafka-clients-node-metrics-3.7.0/build.gradle b/instrumentation/kafka-clients-node-metrics-3.7.0/build.gradle
index 2107fea2ee..f4fbd5b1b1 100644
--- a/instrumentation/kafka-clients-node-metrics-3.7.0/build.gradle
+++ b/instrumentation/kafka-clients-node-metrics-3.7.0/build.gradle
@@ -19,6 +19,6 @@ verifyInstrumentation {
 
 
 site {
-    title 'Kafka'
-    type 'Messaging'
+    title 'Kafka Clients Node Metrics'
+    type 'Kafka'
 }
diff --git a/instrumentation/kafka-clients-node-metrics-3.9.0/build.gradle b/instrumentation/kafka-clients-node-metrics-3.9.0/build.gradle
index 2b27e9cf2c..09ed2c971e 100644
--- a/instrumentation/kafka-clients-node-metrics-3.9.0/build.gradle
+++ b/instrumentation/kafka-clients-node-metrics-3.9.0/build.gradle
@@ -19,6 +19,6 @@ verifyInstrumentation {
 
 
 site {
-    title 'Kafka'
-    type 'Messaging'
+    title 'Kafka Clients Node Metrics'
+    type 'Kafka'
 }
diff --git a/instrumentation/kafka-clients-spans-0.11.0.0/build.gradle b/instrumentation/kafka-clients-spans-0.11.0.0/build.gradle
index 1c0cdba38d..2e8dcf7286 100644
--- a/instrumentation/kafka-clients-spans-0.11.0.0/build.gradle
+++ b/instrumentation/kafka-clients-spans-0.11.0.0/build.gradle
@@ -14,6 +14,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Kafka'
-    type 'Messaging'
+    title 'Kafka Clients Spans'
+    type 'Kafka'
 }
\ No newline at end of file
diff --git a/instrumentation/kafka-clients-spans-consumer-2.0.0/build.gradle b/instrumentation/kafka-clients-spans-consumer-2.0.0/build.gradle
index 7533073980..2c99036ada 100644
--- a/instrumentation/kafka-clients-spans-consumer-2.0.0/build.gradle
+++ b/instrumentation/kafka-clients-spans-consumer-2.0.0/build.gradle
@@ -14,6 +14,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Kafka'
-    type 'Messaging'
+    title 'Kafka Clients Spans Consumer'
+    type 'Kafka'
 }
\ No newline at end of file
diff --git a/instrumentation/kafka-connect-metrics-1.0.0/build.gradle b/instrumentation/kafka-connect-metrics-1.0.0/build.gradle
index ee93991314..f2a5a07adb 100644
--- a/instrumentation/kafka-connect-metrics-1.0.0/build.gradle
+++ b/instrumentation/kafka-connect-metrics-1.0.0/build.gradle
@@ -22,6 +22,6 @@ test {
 }
 
 site {
-    title 'Kafka'
-    type 'Messaging'
+    title 'Kafka Connect Metrics'
+    type 'Kafka'
 }
\ No newline at end of file
diff --git a/instrumentation/kafka-connect-spans-2.0.0/build.gradle b/instrumentation/kafka-connect-spans-2.0.0/build.gradle
index 696b4addc3..e86f8e1e52 100644
--- a/instrumentation/kafka-connect-spans-2.0.0/build.gradle
+++ b/instrumentation/kafka-connect-spans-2.0.0/build.gradle
@@ -16,6 +16,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Kafka'
-    type 'Messaging'
+    title 'Kafka Connect Spans'
+    type 'Kafka'
 }
\ No newline at end of file
diff --git a/instrumentation/kafka-connect-spans-3.3.0/build.gradle b/instrumentation/kafka-connect-spans-3.3.0/build.gradle
index 3585b38297..16c8a1986d 100644
--- a/instrumentation/kafka-connect-spans-3.3.0/build.gradle
+++ b/instrumentation/kafka-connect-spans-3.3.0/build.gradle
@@ -16,6 +16,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Kafka'
-    type 'Messaging'
+    title 'Kafka Connect Spans'
+    type 'Kafka'
 }
\ No newline at end of file
diff --git a/instrumentation/kafka-streams-metrics-1.0.0/build.gradle b/instrumentation/kafka-streams-metrics-1.0.0/build.gradle
index 5ecae37a08..164a7adc73 100644
--- a/instrumentation/kafka-streams-metrics-1.0.0/build.gradle
+++ b/instrumentation/kafka-streams-metrics-1.0.0/build.gradle
@@ -17,6 +17,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Kafka'
-    type 'Messaging'
+    title 'Kafka Streams Metrics'
+    type 'Kafka'
 }
\ No newline at end of file
diff --git a/instrumentation/kafka-streams-spans-2.0.0/build.gradle b/instrumentation/kafka-streams-spans-2.0.0/build.gradle
index 160806a0a3..e1cbe6f0ec 100644
--- a/instrumentation/kafka-streams-spans-2.0.0/build.gradle
+++ b/instrumentation/kafka-streams-spans-2.0.0/build.gradle
@@ -17,6 +17,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Kafka'
-    type 'Messaging'
+    title 'Kafka Streams Spans'
+    type 'Kafka'
 }
\ No newline at end of file
diff --git a/instrumentation/kafka-streams-spans-2.1.0/build.gradle b/instrumentation/kafka-streams-spans-2.1.0/build.gradle
index cb3835818c..bdafd07d85 100644
--- a/instrumentation/kafka-streams-spans-2.1.0/build.gradle
+++ b/instrumentation/kafka-streams-spans-2.1.0/build.gradle
@@ -17,6 +17,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Kafka'
-    type 'Messaging'
+    title 'Kafka Streams Spans'
+    type 'Kafka'
 }
\ No newline at end of file
diff --git a/instrumentation/kafka-streams-spans-2.6.0/build.gradle b/instrumentation/kafka-streams-spans-2.6.0/build.gradle
index acf2bc2e89..5e94680fe7 100644
--- a/instrumentation/kafka-streams-spans-2.6.0/build.gradle
+++ b/instrumentation/kafka-streams-spans-2.6.0/build.gradle
@@ -17,6 +17,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Kafka'
-    type 'Messaging'
+    title 'Kafka Streams Spans'
+    type 'Kafka'
 }
\ No newline at end of file
diff --git a/instrumentation/kafka-streams-spans-3.2.0/build.gradle b/instrumentation/kafka-streams-spans-3.2.0/build.gradle
index 5e4aeb6d0a..ede8b3b0d9 100644
--- a/instrumentation/kafka-streams-spans-3.2.0/build.gradle
+++ b/instrumentation/kafka-streams-spans-3.2.0/build.gradle
@@ -17,6 +17,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Kafka'
-    type 'Messaging'
+    title 'Kafka Streams Spans'
+    type 'Kafka'
 }
diff --git a/instrumentation/kafka-streams-spans-3.7.0/build.gradle b/instrumentation/kafka-streams-spans-3.7.0/build.gradle
index 805c776213..5ac17414b4 100644
--- a/instrumentation/kafka-streams-spans-3.7.0/build.gradle
+++ b/instrumentation/kafka-streams-spans-3.7.0/build.gradle
@@ -17,6 +17,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Kafka'
-    type 'Messaging'
+    title 'Kafka Streams Spans'
+    type 'Kafka'
 }
diff --git a/instrumentation/lettuce-4.3/build.gradle b/instrumentation/lettuce-4.3/build.gradle
index f516bd1ff2..1c8afd0147 100644
--- a/instrumentation/lettuce-4.3/build.gradle
+++ b/instrumentation/lettuce-4.3/build.gradle
@@ -24,6 +24,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Lettuce 4.3'
-    type 'Framework'
+    title 'Lettuce'
+    type 'Datastore'
 }
diff --git a/instrumentation/lettuce-5.0/build.gradle b/instrumentation/lettuce-5.0/build.gradle
index d732a1b93f..8b5b6a8c6c 100644
--- a/instrumentation/lettuce-5.0/build.gradle
+++ b/instrumentation/lettuce-5.0/build.gradle
@@ -23,6 +23,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Lettuce 5.0'
-    type 'Framework'
+    title 'Lettuce'
+    type 'Datastore'
 }
\ No newline at end of file
diff --git a/instrumentation/lettuce-6.0/build.gradle b/instrumentation/lettuce-6.0/build.gradle
index 30844be638..c266fd8ab7 100644
--- a/instrumentation/lettuce-6.0/build.gradle
+++ b/instrumentation/lettuce-6.0/build.gradle
@@ -25,6 +25,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Lettuce 6.0'
-    type 'Framework'
+    title 'Lettuce'
+    type 'Datastore'
 }
diff --git a/instrumentation/lettuce-6.5/build.gradle b/instrumentation/lettuce-6.5/build.gradle
index bb4b9c7e44..22fd304f42 100644
--- a/instrumentation/lettuce-6.5/build.gradle
+++ b/instrumentation/lettuce-6.5/build.gradle
@@ -26,6 +26,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Lettuce 6.5'
-    type 'Framework'
+    title 'Lettuce'
+    type 'Datastore'
 }
diff --git a/instrumentation/logback-classic-1.2/build.gradle b/instrumentation/logback-classic-1.2/build.gradle
index 87fef876c3..a054e2f7f8 100644
--- a/instrumentation/logback-classic-1.2/build.gradle
+++ b/instrumentation/logback-classic-1.2/build.gradle
@@ -15,5 +15,5 @@ verifyInstrumentation {
 
 site {
     title 'Logback'
-    type 'Framework'
+    type 'Logging'
 }
\ No newline at end of file
diff --git a/instrumentation/logback-classic-1.5.20/build.gradle b/instrumentation/logback-classic-1.5.20/build.gradle
index 1551c8cf04..554f2df9cc 100644
--- a/instrumentation/logback-classic-1.5.20/build.gradle
+++ b/instrumentation/logback-classic-1.5.20/build.gradle
@@ -1,4 +1,5 @@
 jar {
+    // Make sure to update the instrumentation name (e.g. logback-classic-1.5.20) in the AgentUtil class so that log events show the correct source attribute
     manifest { attributes 'Implementation-Title': 'com.newrelic.instrumentation.logback-classic-1.5.20' }
 }
 
@@ -27,5 +28,5 @@ test {
 
 site {
     title 'Logback'
-    type 'Framework'
-}
\ No newline at end of file
+    type 'Logging'
+}
diff --git a/instrumentation/logback-classic-1.5.20/src/main/java/com/nr/agent/instrumentation/logbackclassic1520/AgentUtil.java b/instrumentation/logback-classic-1.5.20/src/main/java/com/nr/agent/instrumentation/logbackclassic1520/AgentUtil.java
index c6692ac0e6..9dd3ffbf5f 100644
--- a/instrumentation/logback-classic-1.5.20/src/main/java/com/nr/agent/instrumentation/logbackclassic1520/AgentUtil.java
+++ b/instrumentation/logback-classic-1.5.20/src/main/java/com/nr/agent/instrumentation/logbackclassic1520/AgentUtil.java
@@ -44,7 +44,7 @@ public static void recordNewRelicLogEvent(String message, Map<String, String> md
 
         if (shouldCreateLogEvent(messageEmpty, throwable)) {
             Map<LogAttributeKey, Object> logEventMap = new HashMap<>(calculateInitialMapSize(mdcPropertyMap));
-            logEventMap.put(INSTRUMENTATION, "logback-classic-1.2");
+            logEventMap.put(INSTRUMENTATION, "logback-classic-1.5.20");
             if (!messageEmpty) {
                 logEventMap.put(MESSAGE, message);
             }
diff --git a/instrumentation/mongodb-3.1/build.gradle b/instrumentation/mongodb-3.1/build.gradle
index a47e3ea766..fffe40ac22 100644
--- a/instrumentation/mongodb-3.1/build.gradle
+++ b/instrumentation/mongodb-3.1/build.gradle
@@ -27,6 +27,6 @@ test {
 }
 
 site {
-    title 'MongoDB'
-    type 'Datastore'
+    title 'MongoDB sync clients'
+    type 'Datastore, InstanceLevelDB'
 }
\ No newline at end of file
diff --git a/instrumentation/mongodb-3.7/build.gradle b/instrumentation/mongodb-3.7/build.gradle
index 448bca780c..17b793b634 100644
--- a/instrumentation/mongodb-3.7/build.gradle
+++ b/instrumentation/mongodb-3.7/build.gradle
@@ -23,6 +23,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'MongoDB'
-    type 'Datastore'
+    title 'MongoDB sync clients'
+    type 'Datastore, InstanceLevelDB'
 }
\ No newline at end of file
diff --git a/instrumentation/mongodb-async-3.10/build.gradle b/instrumentation/mongodb-async-3.10/build.gradle
index 6ecd61436c..c8ba8a512d 100644
--- a/instrumentation/mongodb-async-3.10/build.gradle
+++ b/instrumentation/mongodb-async-3.10/build.gradle
@@ -20,6 +20,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'MongoDB'
-    type 'Datastore'
+    title 'MongoDB async clients'
+    type 'Datastore, InstanceLevelDB'
 }
diff --git a/instrumentation/mongodb-async-3.11/build.gradle b/instrumentation/mongodb-async-3.11/build.gradle
index ee24b1048f..b9b68247a0 100644
--- a/instrumentation/mongodb-async-3.11/build.gradle
+++ b/instrumentation/mongodb-async-3.11/build.gradle
@@ -20,6 +20,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'MongoDB'
-    type 'Datastore'
+    title 'MongoDB async clients'
+    type 'Datastore, InstanceLevelDB'
 }
diff --git a/instrumentation/mongodb-async-3.4/build.gradle b/instrumentation/mongodb-async-3.4/build.gradle
index 11dd247455..1a14c66339 100644
--- a/instrumentation/mongodb-async-3.4/build.gradle
+++ b/instrumentation/mongodb-async-3.4/build.gradle
@@ -19,6 +19,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'MongoDB'
-    type 'Datastore'
+    title 'MongoDB async clients'
+    type 'Datastore, InstanceLevelDB'
 }
diff --git a/instrumentation/mongodb-async-3.6/build.gradle b/instrumentation/mongodb-async-3.6/build.gradle
index df7186cfaf..fdc99ff71b 100644
--- a/instrumentation/mongodb-async-3.6/build.gradle
+++ b/instrumentation/mongodb-async-3.6/build.gradle
@@ -19,6 +19,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'MongoDB'
-    type 'Datastore'
+    title 'MongoDB async clients'
+    type 'Datastore, InstanceLevelDB'
 }
diff --git a/instrumentation/mongodb-async-3.7/build.gradle b/instrumentation/mongodb-async-3.7/build.gradle
index 9caec7f38f..a596dc37e6 100644
--- a/instrumentation/mongodb-async-3.7/build.gradle
+++ b/instrumentation/mongodb-async-3.7/build.gradle
@@ -19,6 +19,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'MongoDB'
-    type 'Datastore'
+    title 'MongoDB async clients'
+    type 'Datastore, InstanceLevelDB'
 }
diff --git a/instrumentation/mongodb-async-3.8/build.gradle b/instrumentation/mongodb-async-3.8/build.gradle
index 94cffd45ad..a0b04bf06e 100644
--- a/instrumentation/mongodb-async-3.8/build.gradle
+++ b/instrumentation/mongodb-async-3.8/build.gradle
@@ -20,6 +20,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'MongoDB'
-    type 'Datastore'
+    title 'MongoDB async clients'
+    type 'Datastore, InstanceLevelDB'
 }
diff --git a/instrumentation/mongodb-async-4.0/build.gradle b/instrumentation/mongodb-async-4.0/build.gradle
index 412a368c41..6f333ca509 100644
--- a/instrumentation/mongodb-async-4.0/build.gradle
+++ b/instrumentation/mongodb-async-4.0/build.gradle
@@ -22,6 +22,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'MongoDB'
-    type 'Datastore'
+    title 'MongoDB async clients'
+    type 'Datastore, InstanceLevelDB'
 }
diff --git a/instrumentation/monix-2.13_3.4.0/build.gradle b/instrumentation/monix-2.13_3.4.0/build.gradle
index bb6c3c798b..a1099ede11 100644
--- a/instrumentation/monix-2.13_3.4.0/build.gradle
+++ b/instrumentation/monix-2.13_3.4.0/build.gradle
@@ -38,6 +38,7 @@ test {
 }
 
 site {
-    title 'Scala'
-    type 'Other'
+    title 'Monix tasks'
+    type 'Framework'
+    details 'Scala 2.12: 2.0.6 to latest, Scala 2.13: 3.0.0 to latest, Scala 3: 3.4.0 to latest'
 }
diff --git a/instrumentation/ning-async-http-client-1.0/build.gradle b/instrumentation/ning-async-http-client-1.0/build.gradle
index 133a0a5814..46a4b18355 100644
--- a/instrumentation/ning-async-http-client-1.0/build.gradle
+++ b/instrumentation/ning-async-http-client-1.0/build.gradle
@@ -13,5 +13,5 @@ verifyInstrumentation {
 
 site {
     title 'Ning AsyncHttpClient'
-    type 'Messaging'
+    type 'Http'
 }
\ No newline at end of file
diff --git a/instrumentation/ning-async-http-client-1.1/build.gradle b/instrumentation/ning-async-http-client-1.1/build.gradle
index b7950e7b5a..7e111533c0 100644
--- a/instrumentation/ning-async-http-client-1.1/build.gradle
+++ b/instrumentation/ning-async-http-client-1.1/build.gradle
@@ -13,5 +13,5 @@ verifyInstrumentation {
 
 site {
     title 'Ning AsyncHttpClient'
-    type 'Messaging'
+    type 'Http'
 }
\ No newline at end of file
diff --git a/instrumentation/ning-async-http-client-1.6.1/build.gradle b/instrumentation/ning-async-http-client-1.6.1/build.gradle
index 51b1c6ae84..364eca1a0d 100644
--- a/instrumentation/ning-async-http-client-1.6.1/build.gradle
+++ b/instrumentation/ning-async-http-client-1.6.1/build.gradle
@@ -15,5 +15,5 @@ verifyInstrumentation {
 
 site {
     title 'Ning AsyncHttpClient'
-    type 'Messaging'
+    type 'Http'
 }
\ No newline at end of file
diff --git a/instrumentation/okhttp-3.14.0/build.gradle b/instrumentation/okhttp-3.14.0/build.gradle
index f8cad1fed0..22c5f996a0 100644
--- a/instrumentation/okhttp-3.14.0/build.gradle
+++ b/instrumentation/okhttp-3.14.0/build.gradle
@@ -19,5 +19,5 @@ verifyInstrumentation {
 
 site {
     title 'OKHttp'
-    type 'Messaging'
+    type 'Http'
 }
\ No newline at end of file
diff --git a/instrumentation/okhttp-3.6.0/build.gradle b/instrumentation/okhttp-3.6.0/build.gradle
index f17d07ba90..5a65de8db0 100644
--- a/instrumentation/okhttp-3.6.0/build.gradle
+++ b/instrumentation/okhttp-3.6.0/build.gradle
@@ -19,5 +19,5 @@ verifyInstrumentation {
 
 site {
     title 'OKHttp'
-    type 'Messaging'
+    type 'Http'
 }
\ No newline at end of file
diff --git a/instrumentation/okhttp-4.0.0/build.gradle b/instrumentation/okhttp-4.0.0/build.gradle
index 0f5d6e3bc8..cd771aa7c2 100644
--- a/instrumentation/okhttp-4.0.0/build.gradle
+++ b/instrumentation/okhttp-4.0.0/build.gradle
@@ -22,6 +22,6 @@ verifyInstrumentation {
 }
 
 site {
-    title = "OKHttp"
-    type = "Messaging"
+    title  'OKHttp'
+    type  'Http'
 }
diff --git a/instrumentation/okhttp-4.4.0/build.gradle b/instrumentation/okhttp-4.4.0/build.gradle
index b5d0e9fa0f..8a9bfd65a0 100644
--- a/instrumentation/okhttp-4.4.0/build.gradle
+++ b/instrumentation/okhttp-4.4.0/build.gradle
@@ -28,5 +28,5 @@ verifyInstrumentation {
 
 site {
     title = "OKHttp"
-    type = "Messaging"
+    type = "Http"
 }
diff --git a/instrumentation/play-2.3/build.gradle b/instrumentation/play-2.3/build.gradle
index 9b95650ae7..4f6a264174 100644
--- a/instrumentation/play-2.3/build.gradle
+++ b/instrumentation/play-2.3/build.gradle
@@ -35,5 +35,5 @@ verifyInstrumentation {
 
 site {
     title 'Play'
-    type 'Appserver'
+    type 'Appserver, Framework'
 }
\ No newline at end of file
diff --git a/instrumentation/play-2.4/build.gradle b/instrumentation/play-2.4/build.gradle
index a97e201b6b..47ffe0f7ab 100644
--- a/instrumentation/play-2.4/build.gradle
+++ b/instrumentation/play-2.4/build.gradle
@@ -28,5 +28,5 @@ verifyInstrumentation {
 
 site {
     title 'Play'
-    type 'Appserver'
+    type 'Appserver, Framework'
 }
\ No newline at end of file
diff --git a/instrumentation/play-2.5/build.gradle b/instrumentation/play-2.5/build.gradle
index ebf493d62e..3ec8ec4939 100644
--- a/instrumentation/play-2.5/build.gradle
+++ b/instrumentation/play-2.5/build.gradle
@@ -27,5 +27,5 @@ verifyInstrumentation {
 
 site {
     title 'Play'
-    type 'Appserver'
+    type 'Appserver, Framework'
 }
\ No newline at end of file
diff --git a/instrumentation/play-2.6.13/build.gradle b/instrumentation/play-2.6.13/build.gradle
index 5c7268bbc1..82444e3904 100644
--- a/instrumentation/play-2.6.13/build.gradle
+++ b/instrumentation/play-2.6.13/build.gradle
@@ -74,5 +74,5 @@ clean {
 
 site {
     title 'Play'
-    type 'Appserver'
+    type 'Appserver, Framework'
 }
diff --git a/instrumentation/play-2.6/build.gradle b/instrumentation/play-2.6/build.gradle
index 6de9c83a2a..456ec9913b 100644
--- a/instrumentation/play-2.6/build.gradle
+++ b/instrumentation/play-2.6/build.gradle
@@ -73,5 +73,5 @@ clean {
 
 site {
     title 'Play'
-    type 'Appserver'
+    type 'Appserver, Framework'
 }
diff --git a/instrumentation/play-2.7/build.gradle b/instrumentation/play-2.7/build.gradle
index 0cd66827fd..ef9be5aca2 100644
--- a/instrumentation/play-2.7/build.gradle
+++ b/instrumentation/play-2.7/build.gradle
@@ -77,5 +77,5 @@ clean {
 
 site {
     title 'Play'
-    type 'Appserver'
+    type 'Appserver, Framework'
 }
diff --git a/instrumentation/play-2.8.16/build.gradle b/instrumentation/play-2.8.16/build.gradle
index 189d2fd359..7dcf37d03b 100644
--- a/instrumentation/play-2.8.16/build.gradle
+++ b/instrumentation/play-2.8.16/build.gradle
@@ -78,5 +78,5 @@ clean {
 
 site {
     title 'Play'
-    type 'Appserver'
+    type 'Appserver, Framework'
 }
\ No newline at end of file
diff --git a/instrumentation/play-ws-2.13_2.6.0/build.gradle b/instrumentation/play-ws-2.13_2.6.0/build.gradle
index c86ac98fcb..008d66ea97 100644
--- a/instrumentation/play-ws-2.13_2.6.0/build.gradle
+++ b/instrumentation/play-ws-2.13_2.6.0/build.gradle
@@ -30,5 +30,6 @@ sourceSets.main.java.srcDirs = []
 
 site {
     title 'Play WS'
-    type 'Messaging'
+    type 'Http'
+    details 'Scala 2.13: 2.7.3 to latest'
 }
\ No newline at end of file
diff --git a/instrumentation/play-ws-2.6.0/build.gradle b/instrumentation/play-ws-2.6.0/build.gradle
index 0c19d42e87..03681fc860 100644
--- a/instrumentation/play-ws-2.6.0/build.gradle
+++ b/instrumentation/play-ws-2.6.0/build.gradle
@@ -35,5 +35,6 @@ test {
 
 site {
     title 'Play WS'
-    type 'Messaging'
+    type 'Http'
+    details 'Scala 2.12: 2.6.0 to latest'
 }
diff --git a/instrumentation/quartz-1.8.3/build.gradle b/instrumentation/quartz-1.8.3/build.gradle
index e2debee775..694a43177a 100644
--- a/instrumentation/quartz-1.8.3/build.gradle
+++ b/instrumentation/quartz-1.8.3/build.gradle
@@ -12,3 +12,8 @@ jar {
 verifyInstrumentation {
     passesOnly 'org.quartz-scheduler:quartz:[1.7.2,2.0.0)'
 }
+
+site {
+    title 'Quartz Scheduler'
+    type 'Framework'
+}
diff --git a/instrumentation/quartz-2.0.0/build.gradle b/instrumentation/quartz-2.0.0/build.gradle
index 2c9f2708ab..42fe913a82 100644
--- a/instrumentation/quartz-2.0.0/build.gradle
+++ b/instrumentation/quartz-2.0.0/build.gradle
@@ -12,3 +12,8 @@ jar {
 verifyInstrumentation {
     passesOnly 'org.quartz-scheduler:quartz:[2.0.0,)'
 }
+
+site {
+    title 'Quartz Scheduler'
+    type 'Framework'
+}
diff --git a/instrumentation/spray-can-1.3.1/build.gradle b/instrumentation/spray-can-1.3.1/build.gradle
index e53355fd69..43e3fb41cb 100644
--- a/instrumentation/spray-can-1.3.1/build.gradle
+++ b/instrumentation/spray-can-1.3.1/build.gradle
@@ -23,6 +23,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Spray-can'
-    type 'Messaging'
+    title 'Spray'
+    type 'Appserver, Framework, Http'
 }
\ No newline at end of file
diff --git a/instrumentation/spray-can-http-client-1.3.1/build.gradle b/instrumentation/spray-can-http-client-1.3.1/build.gradle
index c60fc63385..8c550f5ca2 100644
--- a/instrumentation/spray-can-http-client-1.3.1/build.gradle
+++ b/instrumentation/spray-can-http-client-1.3.1/build.gradle
@@ -29,6 +29,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Spray-can client'
-    type 'Messaging'
+    title 'Spray'
+    type 'Appserver, Framework, Http'
 }
\ No newline at end of file
diff --git a/instrumentation/spray-client-1.3.1/build.gradle b/instrumentation/spray-client-1.3.1/build.gradle
index e9d414fc61..a88c5f9e85 100644
--- a/instrumentation/spray-client-1.3.1/build.gradle
+++ b/instrumentation/spray-client-1.3.1/build.gradle
@@ -24,6 +24,6 @@ verifyInstrumentation {
 }   
 
 site {
-    title 'Spray-can client'
-    type 'Messaging'
+    title 'Spray'
+    type 'Appserver, Framework, Http'
 }
\ No newline at end of file
diff --git a/instrumentation/spray-http-1.3.1/build.gradle b/instrumentation/spray-http-1.3.1/build.gradle
index de51b747cb..ac6d5ef783 100644
--- a/instrumentation/spray-http-1.3.1/build.gradle
+++ b/instrumentation/spray-http-1.3.1/build.gradle
@@ -33,6 +33,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Spray-http'
-    type 'Messaging'
+    title 'Spray'
+    type 'Appserver, Framework, Http'
 }
\ No newline at end of file
diff --git a/instrumentation/spring-batch-4.0.0/build.gradle b/instrumentation/spring-batch-4.0.0/build.gradle
index b28ae34549..09446f40b0 100644
--- a/instrumentation/spring-batch-4.0.0/build.gradle
+++ b/instrumentation/spring-batch-4.0.0/build.gradle
@@ -22,6 +22,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Spring'
+    title 'Spring Batch'
     type 'Framework'
 }
\ No newline at end of file
diff --git a/instrumentation/spring-batch-5.0.0/build.gradle b/instrumentation/spring-batch-5.0.0/build.gradle
index 7b47264b15..86b2809145 100644
--- a/instrumentation/spring-batch-5.0.0/build.gradle
+++ b/instrumentation/spring-batch-5.0.0/build.gradle
@@ -15,14 +15,14 @@ jar {
 }
 
 verifyInstrumentation {
-    passesOnly 'org.springframework.batch:spring-batch-core:[5.0.0,)'
+    passesOnly 'org.springframework.batch:spring-batch-core:[5.0.0,6.0.0)'
 
     excludeRegex 'org.springframework.batch:spring-batch-core:.*(RC|SEC|M)[0-9]*$'
     exclude 'org.springframework.batch:spring-batch-core:[1.0.0.FINAL,4.0.0.RELEASE)'
 }
 
 site {
-    title 'Spring'
+    title 'Spring Batch'
     type 'Framework'
 }
 
diff --git a/instrumentation/spring-boot-actuator-3.0.0/build.gradle b/instrumentation/spring-boot-actuator-3.0.0/build.gradle
index 4e571b9c51..1920cc4e32 100644
--- a/instrumentation/spring-boot-actuator-3.0.0/build.gradle
+++ b/instrumentation/spring-boot-actuator-3.0.0/build.gradle
@@ -32,6 +32,6 @@ test {
 }
 
 site {
-    title 'Spring'
+    title 'Spring Boot Actuator'
     type 'Framework'
 }
\ No newline at end of file
diff --git a/instrumentation/spring-webclient-5.0/build.gradle b/instrumentation/spring-webclient-5.0/build.gradle
index a8f5f0a5cd..67d2993991 100644
--- a/instrumentation/spring-webclient-5.0/build.gradle
+++ b/instrumentation/spring-webclient-5.0/build.gradle
@@ -17,6 +17,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Spring webclient'
-    type 'Messaging'
+    title 'Spring Webclient'
+    type 'Http'
 }
diff --git a/instrumentation/spring-webclient-6.0/build.gradle b/instrumentation/spring-webclient-6.0/build.gradle
index 3750f8003c..91aa5f31f7 100644
--- a/instrumentation/spring-webclient-6.0/build.gradle
+++ b/instrumentation/spring-webclient-6.0/build.gradle
@@ -18,6 +18,6 @@ java {
 }
 
 site {
-    title 'Spring webclient'
-    type 'Messaging'
+    title 'Spring Webclient'
+    type 'Http'
 }
diff --git a/instrumentation/spring-webflux-5.0.0/build.gradle b/instrumentation/spring-webflux-5.0.0/build.gradle
index 197eb2b4a1..c7f952ae13 100644
--- a/instrumentation/spring-webflux-5.0.0/build.gradle
+++ b/instrumentation/spring-webflux-5.0.0/build.gradle
@@ -21,6 +21,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Spring webclient'
-    type 'Messaging'
+    title 'Spring Webflux'
+    type 'Http'
 }
diff --git a/instrumentation/spring-webflux-5.1.0/build.gradle b/instrumentation/spring-webflux-5.1.0/build.gradle
index d0f23de38e..d8a9d64f89 100644
--- a/instrumentation/spring-webflux-5.1.0/build.gradle
+++ b/instrumentation/spring-webflux-5.1.0/build.gradle
@@ -21,6 +21,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Spring webclient'
-    type 'Messaging'
+    title 'Spring Webflux'
+    type 'Http'
 }
diff --git a/instrumentation/spring-webflux-5.3.0/build.gradle b/instrumentation/spring-webflux-5.3.0/build.gradle
index 1fdca4b3b3..0b07a51fbe 100644
--- a/instrumentation/spring-webflux-5.3.0/build.gradle
+++ b/instrumentation/spring-webflux-5.3.0/build.gradle
@@ -21,6 +21,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Spring webclient'
-    type 'Messaging'
+    title 'Spring Webflux'
+    type 'Http'
 }
diff --git a/instrumentation/spring-webflux-6.0.0/build.gradle b/instrumentation/spring-webflux-6.0.0/build.gradle
index 1a86ac70d9..bd2d7d5dee 100644
--- a/instrumentation/spring-webflux-6.0.0/build.gradle
+++ b/instrumentation/spring-webflux-6.0.0/build.gradle
@@ -34,6 +34,6 @@ test {
 }
 
 site {
-    title 'Spring webclient'
-    type 'Messaging'
+    title 'Spring Webflux'
+    type 'Http'
 }
diff --git a/instrumentation/spring-webflux-6.1.0/build.gradle b/instrumentation/spring-webflux-6.1.0/build.gradle
index ff0eb56ad7..ca37c3d279 100644
--- a/instrumentation/spring-webflux-6.1.0/build.gradle
+++ b/instrumentation/spring-webflux-6.1.0/build.gradle
@@ -35,6 +35,6 @@ test {
 }
 
 site {
-    title 'Spring webclient'
-    type 'Messaging'
+    title 'Spring Webflux'
+    type 'Http'
 }
diff --git a/instrumentation/spymemcached-2.12.0/build.gradle b/instrumentation/spymemcached-2.12.0/build.gradle
index c14d4f6048..eac3497f3c 100644
--- a/instrumentation/spymemcached-2.12.0/build.gradle
+++ b/instrumentation/spymemcached-2.12.0/build.gradle
@@ -20,5 +20,5 @@ verifyInstrumentation {
 
 site {
     title 'Spymemcached'
-    type 'Messaging'
+    type 'Datastore, InstanceLevelDB'
 }
\ No newline at end of file
diff --git a/instrumentation/sttp-2.12_2.2.3/build.gradle b/instrumentation/sttp-2.12_2.2.3/build.gradle
index d6162f1cc2..dad443cdf7 100644
--- a/instrumentation/sttp-2.12_2.2.3/build.gradle
+++ b/instrumentation/sttp-2.12_2.2.3/build.gradle
@@ -21,6 +21,7 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Scala'
-    type 'Other'
+    title 'STTP'
+    type 'Http'
+    details 'Scala 2.12: 2.2.3 to latest'
 }
\ No newline at end of file
diff --git a/instrumentation/sttp-2.13_2.2.3/build.gradle b/instrumentation/sttp-2.13_2.2.3/build.gradle
index 10a7e1ea15..6af513cdee 100644
--- a/instrumentation/sttp-2.13_2.2.3/build.gradle
+++ b/instrumentation/sttp-2.13_2.2.3/build.gradle
@@ -23,6 +23,7 @@ verifyInstrumentation {
 
 
 site {
-    title 'Scala'
-    type 'Other'
+    title 'STTP'
+    type 'Http'
+    details 'Scala 2.13: 2.2.3 to latest'
 }
\ No newline at end of file
diff --git a/instrumentation/sttp-2.13_3.0.0/build.gradle b/instrumentation/sttp-2.13_3.0.0/build.gradle
index d43660a0fb..9a9213d524 100644
--- a/instrumentation/sttp-2.13_3.0.0/build.gradle
+++ b/instrumentation/sttp-2.13_3.0.0/build.gradle
@@ -24,6 +24,6 @@ verifyInstrumentation {
 
 
 site {
-    title 'Scala'
-    type 'Other'
+    title 'STTP'
+    type 'Http'
 }
\ No newline at end of file
diff --git a/instrumentation/tomcat-10/build.gradle b/instrumentation/tomcat-10/build.gradle
index 664be53e0b..1d3851c982 100644
--- a/instrumentation/tomcat-10/build.gradle
+++ b/instrumentation/tomcat-10/build.gradle
@@ -12,6 +12,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Apache Tomcat'
+    title 'Tomcat'
     type 'Appserver'
 }
diff --git a/instrumentation/tomcat-7.0.70/build.gradle b/instrumentation/tomcat-7.0.70/build.gradle
index b547645edb..77de258ddd 100644
--- a/instrumentation/tomcat-7.0.70/build.gradle
+++ b/instrumentation/tomcat-7.0.70/build.gradle
@@ -14,6 +14,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Apache Tomcat'
+    title 'Tomcat'
     type 'Appserver'
 }
\ No newline at end of file
diff --git a/instrumentation/tomcat-7/build.gradle b/instrumentation/tomcat-7/build.gradle
index b5b9f8f93c..b3203e8b05 100644
--- a/instrumentation/tomcat-7/build.gradle
+++ b/instrumentation/tomcat-7/build.gradle
@@ -15,6 +15,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Apache Tomcat'
+    title 'Tomcat'
     type 'Appserver'
 }
\ No newline at end of file
diff --git a/instrumentation/tomcat-8.5.0/build.gradle b/instrumentation/tomcat-8.5.0/build.gradle
index 59bc65a49f..548832b6d7 100644
--- a/instrumentation/tomcat-8.5.0/build.gradle
+++ b/instrumentation/tomcat-8.5.0/build.gradle
@@ -14,6 +14,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Apache Tomcat'
+    title 'Tomcat'
     type 'Appserver'
 }
\ No newline at end of file
diff --git a/instrumentation/tomcat-8.5.2/build.gradle b/instrumentation/tomcat-8.5.2/build.gradle
index b59248bb4b..e792cc14ea 100644
--- a/instrumentation/tomcat-8.5.2/build.gradle
+++ b/instrumentation/tomcat-8.5.2/build.gradle
@@ -13,6 +13,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Apache Tomcat'
+    title 'Tomcat'
     type 'Appserver'
 }
diff --git a/instrumentation/tomcat-jmx/build.gradle b/instrumentation/tomcat-jmx/build.gradle
index 754a31221c..23024a730a 100644
--- a/instrumentation/tomcat-jmx/build.gradle
+++ b/instrumentation/tomcat-jmx/build.gradle
@@ -12,6 +12,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Apache Tomcat'
+    title 'Tomcat'
     type 'Appserver'
 }
\ No newline at end of file
diff --git a/instrumentation/tomcat-request-listener-10/build.gradle b/instrumentation/tomcat-request-listener-10/build.gradle
index f60d1dde53..58e0e4918f 100644
--- a/instrumentation/tomcat-request-listener-10/build.gradle
+++ b/instrumentation/tomcat-request-listener-10/build.gradle
@@ -12,6 +12,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Apache Tomcat'
+    title 'Tomcat'
     type 'Appserver'
 }
diff --git a/instrumentation/tomcat-request-listener/build.gradle b/instrumentation/tomcat-request-listener/build.gradle
index f56574c89e..2b8bea4854 100644
--- a/instrumentation/tomcat-request-listener/build.gradle
+++ b/instrumentation/tomcat-request-listener/build.gradle
@@ -12,6 +12,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Apache Tomcat'
+    title 'Tomcat'
     type 'Appserver'
 }
diff --git a/instrumentation/undertow-server-1.1.0/build.gradle b/instrumentation/undertow-server-1.1.0/build.gradle
index 757909ae3d..c90b1bd17f 100644
--- a/instrumentation/undertow-server-1.1.0/build.gradle
+++ b/instrumentation/undertow-server-1.1.0/build.gradle
@@ -16,5 +16,5 @@ verifyInstrumentation {
 
 site {
     title 'Undertow'
-    type 'Framework'
+    type 'Appserver'
 }
\ No newline at end of file
diff --git a/instrumentation/vertx-postgres-sqlclient-4.4.2/build.gradle b/instrumentation/vertx-postgres-sqlclient-4.4.2/build.gradle
index 2d8c909cb3..f8cd68e349 100644
--- a/instrumentation/vertx-postgres-sqlclient-4.4.2/build.gradle
+++ b/instrumentation/vertx-postgres-sqlclient-4.4.2/build.gradle
@@ -25,6 +25,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Vertx'
-    type 'Framework'
+    title 'Vertx Sql Client'
+    type 'Datastore'
 }
\ No newline at end of file
diff --git a/instrumentation/zio-2/build.gradle b/instrumentation/zio-2/build.gradle
index a0db406e37..cde36342bc 100644
--- a/instrumentation/zio-2/build.gradle
+++ b/instrumentation/zio-2/build.gradle
@@ -20,6 +20,7 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Scala'
-    type 'Other'
+    title 'ZIO'
+    type 'Framework'
+    details 'Scala 2.13: 1.0.9 to latest'
 }
\ No newline at end of file
diff --git a/instrumentation/zio/build.gradle b/instrumentation/zio/build.gradle
index 4a5a147166..718fc25894 100644
--- a/instrumentation/zio/build.gradle
+++ b/instrumentation/zio/build.gradle
@@ -19,6 +19,6 @@ verifyInstrumentation {
 }
 
 site {
-    title 'Scala'
-    type 'Other'
+    title 'ZIO'
+    type 'Framework'
 }