diff --git a/java/ql/integration-tests/all-platforms/java/buildless-erroneous/diagnostics.expected b/java/ql/integration-tests/all-platforms/java/buildless-erroneous/diagnostics.expected
index 03978511bb75..90aa56bf3f6d 100644
--- a/java/ql/integration-tests/all-platforms/java/buildless-erroneous/diagnostics.expected
+++ b/java/ql/integration-tests/all-platforms/java/buildless-erroneous/diagnostics.expected
@@ -4,7 +4,7 @@
   "source": {
     "extractorName": "java",
     "id": "java/autobuilder/buildless/no-build-tool-advice",
-    "name": "Java buildless mode found no usable build tool"
+    "name": "Java analysis found no usable build tool"
   },
   "visibility": {
     "cliSummaryTable": true,
@@ -13,12 +13,12 @@
   }
 }
 {
-  "markdownMessage": "Java buildless extraction has completed.",
+  "markdownMessage": "Java analysis used the system default JDK.",
   "severity": "unknown",
   "source": {
     "extractorName": "java",
-    "id": "java/autobuilder/buildless/complete",
-    "name": "Java buildless extraction completed"
+    "id": "java/autobuilder/buildless/jdk-system-default",
+    "name": "Java analysis used the system default JDK"
   },
   "visibility": {
     "cliSummaryTable": true,
@@ -27,12 +27,12 @@
   }
 }
 {
-  "markdownMessage": "Java buildless mode used the system default JDK.",
+  "markdownMessage": "Java analysis with build-mode 'none' completed.",
   "severity": "unknown",
   "source": {
     "extractorName": "java",
-    "id": "java/autobuilder/buildless/jdk-system-default",
-    "name": "Java buildless mode used the system default JDK"
+    "id": "java/autobuilder/buildless/complete",
+    "name": "Java analysis with build-mode 'none' completed"
   },
   "visibility": {
     "cliSummaryTable": true,
@@ -41,12 +41,12 @@
   }
 }
 {
-  "markdownMessage": "Java was extracted in buildless mode. This means that all Java source in the working directory will be scanned, with build tools such as Maven and Gradle only contributing information about external dependencies.",
+  "markdownMessage": "Java was extracted with build-mode set to 'none'. This means that all Java source in the working directory will be scanned, with build tools such as Maven and Gradle only contributing information about external dependencies.",
   "severity": "note",
   "source": {
     "extractorName": "java",
     "id": "java/autobuilder/buildless/mode-active",
-    "name": "Java was extracted in buildless mode"
+    "name": "Java was extracted with build-mode set to 'none'"
   },
   "visibility": {
     "cliSummaryTable": true,
diff --git a/java/ql/integration-tests/all-platforms/java/buildless-gradle/diagnostics.expected b/java/ql/integration-tests/all-platforms/java/buildless-gradle/diagnostics.expected
index 5d8a00c5578b..337fa9338081 100644
--- a/java/ql/integration-tests/all-platforms/java/buildless-gradle/diagnostics.expected
+++ b/java/ql/integration-tests/all-platforms/java/buildless-gradle/diagnostics.expected
@@ -1,10 +1,10 @@
 {
-  "markdownMessage": "Java buildless extraction has completed.",
+  "markdownMessage": "Java analysis used build tool Gradle to pick a JDK version and/or to recommend external dependencies.",
   "severity": "unknown",
   "source": {
     "extractorName": "java",
-    "id": "java/autobuilder/buildless/complete",
-    "name": "Java buildless extraction completed"
+    "id": "java/autobuilder/buildless/using-build-tool-advice",
+    "name": "Java analysis used build tool Gradle to pick a JDK version and/or to recommend external dependencies"
   },
   "visibility": {
     "cliSummaryTable": true,
@@ -13,12 +13,12 @@
   }
 }
 {
-  "markdownMessage": "Java buildless mode used build tool Gradle to pick a JDK version and/or to recommend external dependencies.",
+  "markdownMessage": "Java analysis used the system default JDK.",
   "severity": "unknown",
   "source": {
     "extractorName": "java",
-    "id": "java/autobuilder/buildless/using-build-tool-advice",
-    "name": "Java buildless mode used build tool Gradle to pick a JDK version and/or to recommend external dependencies"
+    "id": "java/autobuilder/buildless/jdk-system-default",
+    "name": "Java analysis used the system default JDK"
   },
   "visibility": {
     "cliSummaryTable": true,
@@ -27,12 +27,12 @@
   }
 }
 {
-  "markdownMessage": "Java buildless mode used the system default JDK.",
+  "markdownMessage": "Java analysis with build-mode 'none' completed.",
   "severity": "unknown",
   "source": {
     "extractorName": "java",
-    "id": "java/autobuilder/buildless/jdk-system-default",
-    "name": "Java buildless mode used the system default JDK"
+    "id": "java/autobuilder/buildless/complete",
+    "name": "Java analysis with build-mode 'none' completed"
   },
   "visibility": {
     "cliSummaryTable": true,
@@ -41,12 +41,12 @@
   }
 }
 {
-  "markdownMessage": "Java was extracted in buildless mode. This means that all Java source in the working directory will be scanned, with build tools such as Maven and Gradle only contributing information about external dependencies.",
+  "markdownMessage": "Java was extracted with build-mode set to 'none'. This means that all Java source in the working directory will be scanned, with build tools such as Maven and Gradle only contributing information about external dependencies.",
   "severity": "note",
   "source": {
     "extractorName": "java",
     "id": "java/autobuilder/buildless/mode-active",
-    "name": "Java was extracted in buildless mode"
+    "name": "Java was extracted with build-mode set to 'none'"
   },
   "visibility": {
     "cliSummaryTable": true,
@@ -60,7 +60,7 @@
   "source": {
     "extractorName": "java",
     "id": "java/autobuilder/buildless/depgraph-provided-by-gradle",
-    "name": "Java buildless mode extracted precise dependency graph information from tool Gradle"
+    "name": "Java analysis extracted precise dependency graph information from tool Gradle"
   },
   "visibility": {
     "cliSummaryTable": true,
diff --git a/java/ql/integration-tests/all-platforms/java/buildless-maven-multimodule/diagnostics.expected b/java/ql/integration-tests/all-platforms/java/buildless-maven-multimodule/diagnostics.expected
index 77e259ae537a..1058e1528f99 100644
--- a/java/ql/integration-tests/all-platforms/java/buildless-maven-multimodule/diagnostics.expected
+++ b/java/ql/integration-tests/all-platforms/java/buildless-maven-multimodule/diagnostics.expected
@@ -1,10 +1,10 @@
 {
-  "markdownMessage": "Java buildless extraction has completed.",
+  "markdownMessage": "Java analysis used build tool Maven to pick a JDK version and/or to recommend external dependencies.",
   "severity": "unknown",
   "source": {
     "extractorName": "java",
-    "id": "java/autobuilder/buildless/complete",
-    "name": "Java buildless extraction completed"
+    "id": "java/autobuilder/buildless/using-build-tool-advice",
+    "name": "Java analysis used build tool Maven to pick a JDK version and/or to recommend external dependencies"
   },
   "visibility": {
     "cliSummaryTable": true,
@@ -13,12 +13,12 @@
   }
 }
 {
-  "markdownMessage": "Java buildless mode used build tool Maven to pick a JDK version and/or to recommend external dependencies.",
+  "markdownMessage": "Java analysis used the system default JDK.",
   "severity": "unknown",
   "source": {
     "extractorName": "java",
-    "id": "java/autobuilder/buildless/using-build-tool-advice",
-    "name": "Java buildless mode used build tool Maven to pick a JDK version and/or to recommend external dependencies"
+    "id": "java/autobuilder/buildless/jdk-system-default",
+    "name": "Java analysis used the system default JDK"
   },
   "visibility": {
     "cliSummaryTable": true,
@@ -27,12 +27,12 @@
   }
 }
 {
-  "markdownMessage": "Java buildless mode used the system default JDK.",
+  "markdownMessage": "Java analysis with build-mode 'none' completed.",
   "severity": "unknown",
   "source": {
     "extractorName": "java",
-    "id": "java/autobuilder/buildless/jdk-system-default",
-    "name": "Java buildless mode used the system default JDK"
+    "id": "java/autobuilder/buildless/complete",
+    "name": "Java analysis with build-mode 'none' completed"
   },
   "visibility": {
     "cliSummaryTable": true,
@@ -41,12 +41,12 @@
   }
 }
 {
-  "markdownMessage": "Java was extracted in buildless mode. This means that all Java source in the working directory will be scanned, with build tools such as Maven and Gradle only contributing information about external dependencies.",
+  "markdownMessage": "Java was extracted with build-mode set to 'none'. This means that all Java source in the working directory will be scanned, with build tools such as Maven and Gradle only contributing information about external dependencies.",
   "severity": "note",
   "source": {
     "extractorName": "java",
     "id": "java/autobuilder/buildless/mode-active",
-    "name": "Java was extracted in buildless mode"
+    "name": "Java was extracted with build-mode set to 'none'"
   },
   "visibility": {
     "cliSummaryTable": true,
@@ -60,7 +60,7 @@
   "source": {
     "extractorName": "java",
     "id": "java/autobuilder/buildless/depgraph-provided-by-maven",
-    "name": "Java buildless mode extracted precise dependency graph information from tool Maven"
+    "name": "Java analysis extracted precise dependency graph information from tool Maven"
   },
   "visibility": {
     "cliSummaryTable": true,
diff --git a/java/ql/integration-tests/all-platforms/java/buildless-maven/diagnostics.expected b/java/ql/integration-tests/all-platforms/java/buildless-maven/diagnostics.expected
index 0228a1165a90..f3c89bb842a0 100644
--- a/java/ql/integration-tests/all-platforms/java/buildless-maven/diagnostics.expected
+++ b/java/ql/integration-tests/all-platforms/java/buildless-maven/diagnostics.expected
@@ -1,10 +1,10 @@
 {
-  "markdownMessage": "Java buildless extraction has completed.",
+  "markdownMessage": "Java analysis used build tool Maven to pick a JDK version and/or to recommend external dependencies.",
   "severity": "unknown",
   "source": {
     "extractorName": "java",
-    "id": "java/autobuilder/buildless/complete",
-    "name": "Java buildless extraction completed"
+    "id": "java/autobuilder/buildless/using-build-tool-advice",
+    "name": "Java analysis used build tool Maven to pick a JDK version and/or to recommend external dependencies"
   },
   "visibility": {
     "cliSummaryTable": true,
@@ -13,12 +13,12 @@
   }
 }
 {
-  "markdownMessage": "Java buildless mode used build tool Maven to pick a JDK version and/or to recommend external dependencies.",
+  "markdownMessage": "Java analysis used the system default JDK.",
   "severity": "unknown",
   "source": {
     "extractorName": "java",
-    "id": "java/autobuilder/buildless/using-build-tool-advice",
-    "name": "Java buildless mode used build tool Maven to pick a JDK version and/or to recommend external dependencies"
+    "id": "java/autobuilder/buildless/jdk-system-default",
+    "name": "Java analysis used the system default JDK"
   },
   "visibility": {
     "cliSummaryTable": true,
@@ -27,12 +27,12 @@
   }
 }
 {
-  "markdownMessage": "Java buildless mode used the system default JDK.",
+  "markdownMessage": "Java analysis with build-mode 'none' completed.",
   "severity": "unknown",
   "source": {
     "extractorName": "java",
-    "id": "java/autobuilder/buildless/jdk-system-default",
-    "name": "Java buildless mode used the system default JDK"
+    "id": "java/autobuilder/buildless/complete",
+    "name": "Java analysis with build-mode 'none' completed"
   },
   "visibility": {
     "cliSummaryTable": true,
@@ -41,12 +41,12 @@
   }
 }
 {
-  "markdownMessage": "Java was extracted in buildless mode. This means that all Java source in the working directory will be scanned, with build tools such as Maven and Gradle only contributing information about external dependencies.",
+  "markdownMessage": "Java was extracted with build-mode set to 'none'. This means that all Java source in the working directory will be scanned, with build tools such as Maven and Gradle only contributing information about external dependencies.",
   "severity": "note",
   "source": {
     "extractorName": "java",
     "id": "java/autobuilder/buildless/mode-active",
-    "name": "Java was extracted in buildless mode"
+    "name": "Java was extracted with build-mode set to 'none'"
   },
   "visibility": {
     "cliSummaryTable": true,
@@ -60,7 +60,7 @@
   "source": {
     "extractorName": "java",
     "id": "java/autobuilder/buildless/depgraph-provided-by-maven",
-    "name": "Java buildless mode extracted precise dependency graph information from tool Maven"
+    "name": "Java analysis extracted precise dependency graph information from tool Maven"
   },
   "visibility": {
     "cliSummaryTable": true,
diff --git a/java/ql/integration-tests/all-platforms/java/buildless-sibling-projects/diagnostics.expected b/java/ql/integration-tests/all-platforms/java/buildless-sibling-projects/diagnostics.expected
index c150b2135f3b..b3df8a700c31 100644
--- a/java/ql/integration-tests/all-platforms/java/buildless-sibling-projects/diagnostics.expected
+++ b/java/ql/integration-tests/all-platforms/java/buildless-sibling-projects/diagnostics.expected
@@ -1,10 +1,10 @@
 {
-  "markdownMessage": "Java buildless extraction has completed.",
+  "markdownMessage": "Java analysis dropped the following dependencies because a sibling project depends on a higher version:\n\n* `junit/junit-4.11`",
   "severity": "unknown",
   "source": {
     "extractorName": "java",
-    "id": "java/autobuilder/buildless/complete",
-    "name": "Java buildless extraction completed"
+    "id": "java/autobuilder/buildless/dependencies-disagree",
+    "name": "Java analysis found sibling projects that disagree about some of their direct dependency versions"
   },
   "visibility": {
     "cliSummaryTable": true,
@@ -13,12 +13,12 @@
   }
 }
 {
-  "markdownMessage": "Java buildless mode dropped the following dependencies because a sibling project depends on a higher version:\n\n* `junit/junit-4.11`",
+  "markdownMessage": "Java analysis used JDK version 11.0.0 as recommended by build tool Gradle",
   "severity": "unknown",
   "source": {
     "extractorName": "java",
-    "id": "java/autobuilder/buildless/dependencies-disagree",
-    "name": "Java buildless mode found sibling projects that disagree about some of their direct dependency versions"
+    "id": "java/autobuilder/buildless/jdk-selected",
+    "name": "Java analysis used JDK version 11.0.0 as recommended by build tool Gradle"
   },
   "visibility": {
     "cliSummaryTable": true,
@@ -27,12 +27,12 @@
   }
 }
 {
-  "markdownMessage": "Java buildless mode used JDK version 11.0.0 as recommended by build tool Gradle",
+  "markdownMessage": "Java analysis used the highest recommended Java version out of:\n\n* Gradle at `<test-root-directory>/./gradle-sample` recommends version 8.0.0\n* Gradle at `<test-root-directory>/./gradle-sample2` recommends version 11.0.0",
   "severity": "unknown",
   "source": {
     "extractorName": "java",
-    "id": "java/autobuilder/buildless/jdk-selected",
-    "name": "Java buildless mode used JDK version 11.0.0 as recommended by build tool Gradle"
+    "id": "java/autobuilder/buildless/jdk-version-disagree",
+    "name": "Java analysis found sibling projects that disagree about the needed Java version. The highest recommended version will be used"
   },
   "visibility": {
     "cliSummaryTable": true,
@@ -41,12 +41,12 @@
   }
 }
 {
-  "markdownMessage": "Java buildless mode used the highest recommended Java version out of:\n\n* Gradle at `<test-root-directory>/./gradle-sample` recommends version 8.0.0\n* Gradle at `<test-root-directory>/./gradle-sample2` recommends version 11.0.0",
+  "markdownMessage": "Java analysis will combine recommended JDK versions and/or external dependency information from:\n\n* Gradle at `<test-root-directory>/./gradle-sample`\n* Gradle at `<test-root-directory>/./gradle-sample2`\n* Maven at `<test-root-directory>/./maven-project-1`\n* Maven at `<test-root-directory>/./maven-project-2`",
   "severity": "unknown",
   "source": {
     "extractorName": "java",
-    "id": "java/autobuilder/buildless/jdk-version-disagree",
-    "name": "Java buildless mode found sibling projects that disagree about the needed Java version. The highest recommended version will be used"
+    "id": "java/autobuilder/buildless/using-build-tool-advice-multiple",
+    "name": "Java analysis found several sibling projects and will combine their recommended JDK versions and/or external dependency information"
   },
   "visibility": {
     "cliSummaryTable": true,
@@ -55,12 +55,12 @@
   }
 }
 {
-  "markdownMessage": "Java buildless mode will combine recommended JDK versions and/or external dependency information from:\n\n* Gradle at `<test-root-directory>/./gradle-sample`\n* Gradle at `<test-root-directory>/./gradle-sample2`\n* Maven at `<test-root-directory>/./maven-project-1`\n* Maven at `<test-root-directory>/./maven-project-2`",
+  "markdownMessage": "Java analysis with build-mode 'none' completed.",
   "severity": "unknown",
   "source": {
     "extractorName": "java",
-    "id": "java/autobuilder/buildless/using-build-tool-advice-multiple",
-    "name": "Java buildless mode found several sibling projects and will combine their recommended JDK versions and/or external dependency information"
+    "id": "java/autobuilder/buildless/complete",
+    "name": "Java analysis with build-mode 'none' completed"
   },
   "visibility": {
     "cliSummaryTable": true,
@@ -69,12 +69,12 @@
   }
 }
 {
-  "markdownMessage": "Java was extracted in buildless mode. This means that all Java source in the working directory will be scanned, with build tools such as Maven and Gradle only contributing information about external dependencies.",
+  "markdownMessage": "Java was extracted with build-mode set to 'none'. This means that all Java source in the working directory will be scanned, with build tools such as Maven and Gradle only contributing information about external dependencies.",
   "severity": "note",
   "source": {
     "extractorName": "java",
     "id": "java/autobuilder/buildless/mode-active",
-    "name": "Java was extracted in buildless mode"
+    "name": "Java was extracted with build-mode set to 'none'"
   },
   "visibility": {
     "cliSummaryTable": true,
@@ -88,7 +88,7 @@
   "source": {
     "extractorName": "java",
     "id": "java/autobuilder/buildless/depgraph-provided-by-multiple",
-    "name": "Java buildless mode extracted precise dependency graph information from multiple build tools"
+    "name": "Java analysis extracted precise dependency graph information from multiple build tools"
   },
   "visibility": {
     "cliSummaryTable": true,
diff --git a/java/ql/integration-tests/all-platforms/java/buildless/diagnostics.expected b/java/ql/integration-tests/all-platforms/java/buildless/diagnostics.expected
index 03978511bb75..90aa56bf3f6d 100644
--- a/java/ql/integration-tests/all-platforms/java/buildless/diagnostics.expected
+++ b/java/ql/integration-tests/all-platforms/java/buildless/diagnostics.expected
@@ -4,7 +4,7 @@
   "source": {
     "extractorName": "java",
     "id": "java/autobuilder/buildless/no-build-tool-advice",
-    "name": "Java buildless mode found no usable build tool"
+    "name": "Java analysis found no usable build tool"
   },
   "visibility": {
     "cliSummaryTable": true,
@@ -13,12 +13,12 @@
   }
 }
 {
-  "markdownMessage": "Java buildless extraction has completed.",
+  "markdownMessage": "Java analysis used the system default JDK.",
   "severity": "unknown",
   "source": {
     "extractorName": "java",
-    "id": "java/autobuilder/buildless/complete",
-    "name": "Java buildless extraction completed"
+    "id": "java/autobuilder/buildless/jdk-system-default",
+    "name": "Java analysis used the system default JDK"
   },
   "visibility": {
     "cliSummaryTable": true,
@@ -27,12 +27,12 @@
   }
 }
 {
-  "markdownMessage": "Java buildless mode used the system default JDK.",
+  "markdownMessage": "Java analysis with build-mode 'none' completed.",
   "severity": "unknown",
   "source": {
     "extractorName": "java",
-    "id": "java/autobuilder/buildless/jdk-system-default",
-    "name": "Java buildless mode used the system default JDK"
+    "id": "java/autobuilder/buildless/complete",
+    "name": "Java analysis with build-mode 'none' completed"
   },
   "visibility": {
     "cliSummaryTable": true,
@@ -41,12 +41,12 @@
   }
 }
 {
-  "markdownMessage": "Java was extracted in buildless mode. This means that all Java source in the working directory will be scanned, with build tools such as Maven and Gradle only contributing information about external dependencies.",
+  "markdownMessage": "Java was extracted with build-mode set to 'none'. This means that all Java source in the working directory will be scanned, with build tools such as Maven and Gradle only contributing information about external dependencies.",
   "severity": "note",
   "source": {
     "extractorName": "java",
     "id": "java/autobuilder/buildless/mode-active",
-    "name": "Java was extracted in buildless mode"
+    "name": "Java was extracted with build-mode set to 'none'"
   },
   "visibility": {
     "cliSummaryTable": true,