diff --git a/.github/workflows/csv-coverage-metrics.yml b/.github/workflows/csv-coverage-metrics.yml
index 04a2d3f3dea..ca7bc176d6d 100644
--- a/.github/workflows/csv-coverage-metrics.yml
+++ b/.github/workflows/csv-coverage-metrics.yml
@@ -31,7 +31,7 @@ jobs:
       - name: Capture coverage information
         run: |
           DATABASE="${{ runner.temp }}/java-database"
-          codeql database analyze --format=sarif-latest --output=metrics.sarif -- "$DATABASE" ./java/ql/src/Diagnostics/CoverageDiagnostics.ql
+          codeql database analyze --format=sarif-latest --output=metrics.sarif -- "$DATABASE" ./java/ql/src/Metrics/Summaries/FrameworkCoverage.ql
       - uses: actions/upload-artifact@v2
         with:
           name: metrics.sarif
diff --git a/java/ql/src/Diagnostics/CoverageDiagnostics.ql b/java/ql/src/Metrics/Summaries/FrameworkCoverage.ql
similarity index 66%
rename from java/ql/src/Diagnostics/CoverageDiagnostics.ql
rename to java/ql/src/Metrics/Summaries/FrameworkCoverage.ql
index 4532ecfcfda..23fe38b036d 100644
--- a/java/ql/src/Diagnostics/CoverageDiagnostics.ql
+++ b/java/ql/src/Metrics/Summaries/FrameworkCoverage.ql
@@ -1,9 +1,9 @@
 /**
- * @name Diagnostics for framework coverage
- * @description Expose diagnostics for the number of API endpoints covered by CSV models.
+ * @id java/summary/framework-coverage
+ * @name Metrics of framework coverage
+ * @description Expose metrics for the number of API endpoints covered by CSV models.
  * @kind metric
  * @tags summary
- * @id java/diagnostics/framework-coverage
  */
 
 import java
diff --git a/misc/suite-helpers/code-scanning-selectors.yml b/misc/suite-helpers/code-scanning-selectors.yml
index 4c293683778..60c1576f4c9 100644
--- a/misc/suite-helpers/code-scanning-selectors.yml
+++ b/misc/suite-helpers/code-scanning-selectors.yml
@@ -26,4 +26,4 @@
 - exclude:
     query path:
       - /^experimental\/.*/
-      - Diagnostics/CoverageDiagnostics.ql
+      - Metrics/Summaries/FrameworkCoverage.ql
diff --git a/misc/suite-helpers/lgtm-selectors.yml b/misc/suite-helpers/lgtm-selectors.yml
index df461316436..8ccc9e41ebb 100644
--- a/misc/suite-helpers/lgtm-selectors.yml
+++ b/misc/suite-helpers/lgtm-selectors.yml
@@ -24,4 +24,4 @@
 - exclude:
     query path:
       - /^experimental\/.*/
-      - Diagnostics/CoverageDiagnostics.ql
+      - Metrics/Summaries/FrameworkCoverage.ql
diff --git a/misc/suite-helpers/security-and-quality-selectors.yml b/misc/suite-helpers/security-and-quality-selectors.yml
index 5ec953c3ba8..6502f77d598 100644
--- a/misc/suite-helpers/security-and-quality-selectors.yml
+++ b/misc/suite-helpers/security-and-quality-selectors.yml
@@ -27,5 +27,5 @@
 - exclude:
     query path:
       - /^experimental\/.*/
-      - Diagnostics/CoverageDiagnostics.ql
+      - Metrics/Summaries/FrameworkCoverage.ql
 
diff --git a/misc/suite-helpers/security-extended-selectors.yml b/misc/suite-helpers/security-extended-selectors.yml
index 947b3b5794c..9e1e1b46e06 100644
--- a/misc/suite-helpers/security-extended-selectors.yml
+++ b/misc/suite-helpers/security-extended-selectors.yml
@@ -32,4 +32,4 @@
 - exclude:
     query path:
       - /^experimental\/.*/
-      - Diagnostics/CoverageDiagnostics.ql
+      - Metrics/Summaries/FrameworkCoverage.ql