diff --git a/.github/actions/gradle/experiment-1/action.yml b/.github/actions/gradle/experiment-1/action.yml
index 806a9e94..b52032fd 100644
--- a/.github/actions/gradle/experiment-1/action.yml
+++ b/.github/actions/gradle/experiment-1/action.yml
@@ -80,19 +80,19 @@ runs:
         if [ ! -z "${{ inputs.args }}" ]; then
           ARG_ARGS="${{ inputs.args }}"
         fi
-        ARG_GE_URL=""
+        ARG_DEVELOCITY_URL=""
         if [ ! -z "${{ inputs.gradleEnterpriseUrl }}" ]; then
-          ARG_GE_URL="${{ inputs.gradleEnterpriseUrl }}"
+          ARG_DEVELOCITY_URL="${{ inputs.gradleEnterpriseUrl }}"
         fi
         if [ ! -z "${{ inputs.develocityUrl }}" ]; then
-          ARG_GE_URL="${{ inputs.develocityUrl }}"
+          ARG_DEVELOCITY_URL="${{ inputs.develocityUrl }}"
         fi
-        ARG_GE_ENABLE=""
+        ARG_DEVELOCITY_ENABLE=""
         if [ "${{ inputs.enableGradleEnterprise }}" == "true" ]; then
-          ARG_GE_ENABLE="${{ inputs.enableGradleEnterprise }}"
+          ARG_DEVELOCITY_ENABLE="${{ inputs.enableGradleEnterprise }}"
         fi
         if [ "${{ inputs.enableDeveocity }}" == "true" ]; then
-          ARG_GE_ENABLE="${{ inputs.enableDeveocity }}"
+          ARG_DEVELOCITY_ENABLE="${{ inputs.enableDeveocity }}"
         fi
 
         # Navigate into the folder containing the validation scripts
@@ -107,8 +107,8 @@ runs:
           ${ARG_PROJECT_DIR:+"-p" "$ARG_PROJECT_DIR"} \
           ${ARG_TASKS:+"-t" "$ARG_TASKS"} \
           ${ARG_ARGS:+"-a" "$ARG_ARGS"} \
-          ${ARG_GE_URL:+"-s" "$ARG_GE_URL"} \
-          ${ARG_GE_ENABLE:+"-e"} \
+          ${ARG_DEVELOCITY_URL:+"-s" "$ARG_DEVELOCITY_URL"} \
+          ${ARG_DEVELOCITY_ENABLE:+"-e"} \
           ${RUNNER_DEBUG:+"--debug"}
 
         # Set the Build Scan urls as outputs
diff --git a/.github/actions/gradle/experiment-2/action.yml b/.github/actions/gradle/experiment-2/action.yml
index ccdb528a..48a9a0a3 100644
--- a/.github/actions/gradle/experiment-2/action.yml
+++ b/.github/actions/gradle/experiment-2/action.yml
@@ -83,19 +83,19 @@ runs:
         if [ ! -z "${{ inputs.args }}" ]; then
           ARG_ARGS="${{ inputs.args }}"
         fi
-        ARG_GE_URL=""
+        ARG_DEVELOCITY_URL=""
         if [ ! -z "${{ inputs.gradleEnterpriseUrl }}" ]; then
-          ARG_GE_URL="${{ inputs.gradleEnterpriseUrl }}"
+          ARG_DEVELOCITY_URL="${{ inputs.gradleEnterpriseUrl }}"
         fi
         if [ ! -z "${{ inputs.develocityUrl }}" ]; then
-          ARG_GE_URL="${{ inputs.develocityUrl }}"
+          ARG_DEVELOCITY_URL="${{ inputs.develocityUrl }}"
         fi
-        ARG_GE_ENABLE=""
+        ARG_DEVELOCITY_ENABLE=""
         if [ "${{ inputs.enableGradleEnterprise }}" == "true" ]; then
-          ARG_GE_ENABLE="${{ inputs.enableGradleEnterprise }}"
+          ARG_DEVELOCITY_ENABLE="${{ inputs.enableGradleEnterprise }}"
         fi
         if [ "${{ inputs.enableDeveocity }}" == "true" ]; then
-          ARG_GE_ENABLE="${{ inputs.enableDeveocity }}"
+          ARG_DEVELOCITY_ENABLE="${{ inputs.enableDeveocity }}"
         fi
         ARG_FAIL_IF_NOT_FULLY_CACHEABLE=""
         if [ "${{ inputs.failIfNotFullyCacheable }}" == "true" ]; then
@@ -114,8 +114,8 @@ runs:
           ${ARG_PROJECT_DIR:+"-p" "$ARG_PROJECT_DIR"} \
           ${ARG_TASKS:+"-t" "$ARG_TASKS"} \
           ${ARG_ARGS:+"-a" "$ARG_ARGS"} \
-          ${ARG_GE_URL:+"-s" "$ARG_GE_URL"} \
-          ${ARG_GE_ENABLE:+"-e"} \
+          ${ARG_DEVELOCITY_URL:+"-s" "$ARG_DEVELOCITY_URL"} \
+          ${ARG_DEVELOCITY_ENABLE:+"-e"} \
           ${ARG_FAIL_IF_NOT_FULLY_CACHEABLE:+"-f"} \
           ${RUNNER_DEBUG:+"--debug"}
 
diff --git a/.github/actions/gradle/experiment-3/action.yml b/.github/actions/gradle/experiment-3/action.yml
index d0181a1e..8eb61f6d 100644
--- a/.github/actions/gradle/experiment-3/action.yml
+++ b/.github/actions/gradle/experiment-3/action.yml
@@ -83,19 +83,19 @@ runs:
         if [ ! -z "${{ inputs.args }}" ]; then
           ARG_ARGS="${{ inputs.args }}"
         fi
-        ARG_GE_URL=""
+        ARG_DEVELOCITY_URL=""
         if [ ! -z "${{ inputs.gradleEnterpriseUrl }}" ]; then
-          ARG_GE_URL="${{ inputs.gradleEnterpriseUrl }}"
+          ARG_DEVELOCITY_URL="${{ inputs.gradleEnterpriseUrl }}"
         fi
         if [ ! -z "${{ inputs.develocityUrl }}" ]; then
-          ARG_GE_URL="${{ inputs.develocityUrl }}"
+          ARG_DEVELOCITY_URL="${{ inputs.develocityUrl }}"
         fi
-        ARG_GE_ENABLE=""
+        ARG_DEVELOCITY_ENABLE=""
         if [ "${{ inputs.enableGradleEnterprise }}" == "true" ]; then
-          ARG_GE_ENABLE="${{ inputs.enableGradleEnterprise }}"
+          ARG_DEVELOCITY_ENABLE="${{ inputs.enableGradleEnterprise }}"
         fi
         if [ "${{ inputs.enableDeveocity }}" == "true" ]; then
-          ARG_GE_ENABLE="${{ inputs.enableDeveocity }}"
+          ARG_DEVELOCITY_ENABLE="${{ inputs.enableDeveocity }}"
         fi
         ARG_FAIL_IF_NOT_FULLY_CACHEABLE=""
         if [ "${{ inputs.failIfNotFullyCacheable }}" == "true" ]; then
@@ -114,8 +114,8 @@ runs:
           ${ARG_PROJECT_DIR:+"-p" "$ARG_PROJECT_DIR"} \
           ${ARG_TASKS:+"-t" "$ARG_TASKS"} \
           ${ARG_ARGS:+"-a" "$ARG_ARGS"} \
-          ${ARG_GE_URL:+"-s" "$ARG_GE_URL"} \
-          ${ARG_GE_ENABLE:+"-e"} \
+          ${ARG_DEVELOCITY_URL:+"-s" "$ARG_DEVELOCITY_URL"} \
+          ${ARG_DEVELOCITY_ENABLE:+"-e"} \
           ${ARG_FAIL_IF_NOT_FULLY_CACHEABLE:+"-f"} \
           ${RUNNER_DEBUG:+"--debug"}
 
diff --git a/.github/actions/maven/experiment-1/action.yml b/.github/actions/maven/experiment-1/action.yml
index 2375b0c7..2b6db05f 100644
--- a/.github/actions/maven/experiment-1/action.yml
+++ b/.github/actions/maven/experiment-1/action.yml
@@ -83,19 +83,19 @@ runs:
         if [ ! -z "${{ inputs.args }}" ]; then
           ARG_ARGS="${{ inputs.args }}"
         fi
-        ARG_GE_URL=""
+        ARG_DEVELOCITY_URL=""
         if [ ! -z "${{ inputs.gradleEnterpriseUrl }}" ]; then
-          ARG_GE_URL="${{ inputs.gradleEnterpriseUrl }}"
+          ARG_DEVELOCITY_URL="${{ inputs.gradleEnterpriseUrl }}"
         fi
         if [ ! -z "${{ inputs.develocityUrl }}" ]; then
-          ARG_GE_URL="${{ inputs.develocityUrl }}"
+          ARG_DEVELOCITY_URL="${{ inputs.develocityUrl }}"
         fi
-        ARG_GE_ENABLE=""
+        ARG_DEVELOCITY_ENABLE=""
         if [ "${{ inputs.enableGradleEnterprise }}" == "true" ]; then
-          ARG_GE_ENABLE="${{ inputs.enableGradleEnterprise }}"
+          ARG_DEVELOCITY_ENABLE="${{ inputs.enableGradleEnterprise }}"
         fi
         if [ "${{ inputs.enableDeveocity }}" == "true" ]; then
-          ARG_GE_ENABLE="${{ inputs.enableDeveocity }}"
+          ARG_DEVELOCITY_ENABLE="${{ inputs.enableDeveocity }}"
         fi
         ARG_FAIL_IF_NOT_FULLY_CACHEABLE=""
         if [ "${{ inputs.failIfNotFullyCacheable }}" == "true" ]; then
@@ -114,8 +114,8 @@ runs:
           ${ARG_PROJECT_DIR:+"-p" "$ARG_PROJECT_DIR"} \
           ${ARG_GOALS:+"-g" "$ARG_GOALS"} \
           ${ARG_ARGS:+"-a" "$ARG_ARGS"} \
-          ${ARG_GE_URL:+"-s" "$ARG_GE_URL"} \
-          ${ARG_GE_ENABLE:+"-e"} \
+          ${ARG_DEVELOCITY_URL:+"-s" "$ARG_DEVELOCITY_URL"} \
+          ${ARG_DEVELOCITY_ENABLE:+"-e"} \
           ${ARG_FAIL_IF_NOT_FULLY_CACHEABLE:+"-f"} \
           ${RUNNER_DEBUG:+"--debug"}
 
diff --git a/.github/actions/maven/experiment-2/action.yml b/.github/actions/maven/experiment-2/action.yml
index 1de2c6da..eb0d9439 100644
--- a/.github/actions/maven/experiment-2/action.yml
+++ b/.github/actions/maven/experiment-2/action.yml
@@ -83,19 +83,19 @@ runs:
         if [ ! -z "${{ inputs.args }}" ]; then
           ARG_ARGS="${{ inputs.args }}"
         fi
-        ARG_GE_URL=""
+        ARG_DEVELOCITY_URL=""
         if [ ! -z "${{ inputs.gradleEnterpriseUrl }}" ]; then
-          ARG_GE_URL="${{ inputs.gradleEnterpriseUrl }}"
+          ARG_DEVELOCITY_URL="${{ inputs.gradleEnterpriseUrl }}"
         fi
         if [ ! -z "${{ inputs.develocityUrl }}" ]; then
-          ARG_GE_URL="${{ inputs.develocityUrl }}"
+          ARG_DEVELOCITY_URL="${{ inputs.develocityUrl }}"
         fi
-        ARG_GE_ENABLE=""
+        ARG_DEVELOCITY_ENABLE=""
         if [ "${{ inputs.enableGradleEnterprise }}" == "true" ]; then
-          ARG_GE_ENABLE="${{ inputs.enableGradleEnterprise }}"
+          ARG_DEVELOCITY_ENABLE="${{ inputs.enableGradleEnterprise }}"
         fi
         if [ "${{ inputs.enableDeveocity }}" == "true" ]; then
-          ARG_GE_ENABLE="${{ inputs.enableDeveocity }}"
+          ARG_DEVELOCITY_ENABLE="${{ inputs.enableDeveocity }}"
         fi
         ARG_FAIL_IF_NOT_FULLY_CACHEABLE=""
         if [ "${{ inputs.failIfNotFullyCacheable }}" == "true" ]; then
@@ -114,8 +114,8 @@ runs:
           ${ARG_PROJECT_DIR:+"-p" "$ARG_PROJECT_DIR"} \
           ${ARG_GOALS:+"-g" "$ARG_GOALS"} \
           ${ARG_ARGS:+"-a" "$ARG_ARGS"} \
-          ${ARG_GE_URL:+"-s" "$ARG_GE_URL"} \
-          ${ARG_GE_ENABLE:+"-e"} \
+          ${ARG_DEVELOCITY_URL:+"-s" "$ARG_DEVELOCITY_URL"} \
+          ${ARG_DEVELOCITY_ENABLE:+"-e"} \
           ${ARG_FAIL_IF_NOT_FULLY_CACHEABLE:+"-f"} \
           ${RUNNER_DEBUG:+"--debug"}
 
diff --git a/.github/workflows/cross-platform-testing-build-from-source.yml b/.github/workflows/cross-platform-testing-build-from-source.yml
index f0f85d6f..2c168ec6 100644
--- a/.github/workflows/cross-platform-testing-build-from-source.yml
+++ b/.github/workflows/cross-platform-testing-build-from-source.yml
@@ -57,8 +57,8 @@ jobs:
       run:
         shell: ${{ matrix.shell }} {0}
     env:
-      GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}
-      WSLENV: GITHUB_ACTIONS:GITHUB_SERVER_URL:GITHUB_REPOSITORY:GITHUB_RUN_ID:GITHUB_WORKFLOW:GITHUB_HEAD_REF:GRADLE_ENTERPRISE_ACCESS_KEY
+      DEVELOCITY_ACCESS_KEY: ${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}
+      WSLENV: GITHUB_ACTIONS:GITHUB_SERVER_URL:GITHUB_REPOSITORY:GITHUB_RUN_ID:GITHUB_WORKFLOW:GITHUB_HEAD_REF:DEVELOCITY_ACCESS_KEY
     steps:
       - name: Set up WSL
         if: ${{ runner.os == 'Windows' }}
diff --git a/.github/workflows/cross-platform-testing-use-development-release.yml b/.github/workflows/cross-platform-testing-use-development-release.yml
index 90043c6c..48c4adcd 100644
--- a/.github/workflows/cross-platform-testing-use-development-release.yml
+++ b/.github/workflows/cross-platform-testing-use-development-release.yml
@@ -36,8 +36,8 @@ jobs:
       run:
         shell: ${{ matrix.shell }} {0}
     env:
-      GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}
-      WSLENV: GITHUB_ACTIONS:GITHUB_SERVER_URL:GITHUB_REPOSITORY:GITHUB_RUN_ID:GITHUB_WORKFLOW:GITHUB_HEAD_REF:GRADLE_ENTERPRISE_ACCESS_KEY
+      DEVELOCITY_ACCESS_KEY: ${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}
+      WSLENV: GITHUB_ACTIONS:GITHUB_SERVER_URL:GITHUB_REPOSITORY:GITHUB_RUN_ID:GITHUB_WORKFLOW:GITHUB_HEAD_REF:DEVELOCITY_ACCESS_KEY
     steps:
       - name: Set up WSL
         if: ${{ runner.os == 'Windows' }}
diff --git a/build.gradle.kts b/build.gradle.kts
index 867a56f4..b86bcd53 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -90,7 +90,7 @@ dependencies {
     develocityInjection("com.gradle:develocity-injection:1.1")
     develocityComponents("com.gradle:build-scan-summary:$buildScanSummaryVersion")
     develocityMavenComponents("com.gradle:gradle-enterprise-maven-extension:1.18.4")
-    mavenComponents(project(path = ":configure-gradle-enterprise-maven-extension", configuration = "shadow"))
+    mavenComponents(project(path = ":configure-develocity-maven-extension", configuration = "shadow"))
     thirdPartyMavenComponents("com.gradle:common-custom-user-data-maven-extension:2.0.1")
 }
 
diff --git a/components/configure-gradle-enterprise-maven-extension/build.gradle.kts b/components/configure-develocity-maven-extension/build.gradle.kts
similarity index 100%
rename from components/configure-gradle-enterprise-maven-extension/build.gradle.kts
rename to components/configure-develocity-maven-extension/build.gradle.kts
diff --git a/components/configure-gradle-enterprise-maven-extension/src/main/java/com/gradle/ConfigureDevelocityAdaptor.java b/components/configure-develocity-maven-extension/src/main/java/com/gradle/ConfigureDevelocityAdaptor.java
similarity index 82%
rename from components/configure-gradle-enterprise-maven-extension/src/main/java/com/gradle/ConfigureDevelocityAdaptor.java
rename to components/configure-develocity-maven-extension/src/main/java/com/gradle/ConfigureDevelocityAdaptor.java
index d22885f9..db2ca6ec 100644
--- a/components/configure-gradle-enterprise-maven-extension/src/main/java/com/gradle/ConfigureDevelocityAdaptor.java
+++ b/components/configure-develocity-maven-extension/src/main/java/com/gradle/ConfigureDevelocityAdaptor.java
@@ -19,7 +19,7 @@
 
 public class ConfigureDevelocityAdaptor {
 
-    private static final String EXPERIMENT_DIR = System.getProperty("com.gradle.enterprise.build-validation.expDir");
+    private static final String EXPERIMENT_DIR = System.getProperty("develocity.build-validation.expDir");
 
     private final RootProjectExtractor rootProjectExtractor;
     private final Logger logger;
@@ -35,14 +35,14 @@ public void configure(DevelocityAdapter api, MavenSession session) {
 
         BuildScanApiAdapter buildScan = api.getBuildScan();
 
-        String geUrl = System.getProperty("gradle.enterprise.url");
-        String geAllowUntrustedServer = System.getProperty("gradle.enterprise.allowUntrustedServer");
+        String develocityUrl = System.getProperty("develocity.url");
+        String develocityAllowUntrustedServer = System.getProperty("develocity.allowUntrustedServer");
 
-        if (geUrl != null && !geUrl.isEmpty()) {
-            buildScan.setServer(geUrl);
+        if (develocityUrl != null && !develocityUrl.isEmpty()) {
+            buildScan.setServer(develocityUrl);
         }
-        if (geAllowUntrustedServer != null && !geAllowUntrustedServer.isEmpty()) {
-            buildScan.setAllowUntrustedServer(Boolean.parseBoolean(geAllowUntrustedServer));
+        if (develocityAllowUntrustedServer != null && !develocityAllowUntrustedServer.isEmpty()) {
+            buildScan.setAllowUntrustedServer(Boolean.parseBoolean(develocityAllowUntrustedServer));
         }
 
         String rootProjectName = rootProjectExtractor.extractRootProject(session).getName();
@@ -53,8 +53,8 @@ public void configure(DevelocityAdapter api, MavenSession session) {
 
     private static void registerBuildScanActions(BuildScanApiAdapter buildScan, String rootProjectName) {
         buildScan.buildFinished(buildResult -> {
-            // communicate via error file that no GE server is set
-            boolean omitServerUrlValidation = parseBoolean(System.getProperty("com.gradle.enterprise.build-validation.omitServerUrlValidation"));
+            // communicate via error file that no Develocity server is set
+            boolean omitServerUrlValidation = parseBoolean(System.getProperty("develocity.build-validation.omitServerUrlValidation"));
             if (buildScan.getServer() == null && !omitServerUrlValidation) {
                 buildScan.publishAlwaysIf(false); // disable publishing, otherwise scans.gradle.com will be used
                 File errorFile = new File(EXPERIMENT_DIR, "errors.txt");
@@ -63,19 +63,19 @@ private static void registerBuildScanActions(BuildScanApiAdapter buildScan, Stri
         });
 
         buildScan.buildFinished(buildResult -> {
-            String expId = System.getProperty("com.gradle.enterprise.build-validation.expId");
+            String expId = System.getProperty("develocity.build-validation.expId");
             addCustomValueAndSearchLink(buildScan, "Experiment id", expId);
             buildScan.tag(expId);
 
-            String runId = System.getProperty("com.gradle.enterprise.build-validation.runId");
+            String runId = System.getProperty("develocity.build-validation.runId");
             addCustomValueAndSearchLink(buildScan, "Experiment run id", runId);
 
-            String scriptsVersion = System.getProperty("com.gradle.enterprise.build-validation.scriptsVersion");
+            String scriptsVersion = System.getProperty("develocity.build-validation.scriptsVersion");
             buildScan.value("Build validation scripts", scriptsVersion);
         });
 
         buildScan.buildScanPublished(scan -> {
-            String runNum = System.getProperty("com.gradle.enterprise.build-validation.runNum");
+            String runNum = System.getProperty("develocity.build-validation.runNum");
             URI buildScanUri = scan.getBuildScanUri();
             String buildScanId = scan.getBuildScanId();
             String port = buildScanUri.getPort() != -1 ? ":" + buildScanUri.getPort() : "";
diff --git a/components/configure-gradle-enterprise-maven-extension/src/main/java/com/gradle/ConfigureDevelocityListener.java b/components/configure-develocity-maven-extension/src/main/java/com/gradle/ConfigureDevelocityListener.java
similarity index 100%
rename from components/configure-gradle-enterprise-maven-extension/src/main/java/com/gradle/ConfigureDevelocityListener.java
rename to components/configure-develocity-maven-extension/src/main/java/com/gradle/ConfigureDevelocityListener.java
diff --git a/components/configure-gradle-enterprise-maven-extension/src/main/java/com/gradle/ConfigureGradleEnterpriseListener.java b/components/configure-develocity-maven-extension/src/main/java/com/gradle/ConfigureGradleEnterpriseListener.java
similarity index 100%
rename from components/configure-gradle-enterprise-maven-extension/src/main/java/com/gradle/ConfigureGradleEnterpriseListener.java
rename to components/configure-develocity-maven-extension/src/main/java/com/gradle/ConfigureGradleEnterpriseListener.java
diff --git a/components/configure-gradle-enterprise-maven-extension/src/main/java/com/gradle/RootProjectExtractor.java b/components/configure-develocity-maven-extension/src/main/java/com/gradle/RootProjectExtractor.java
similarity index 100%
rename from components/configure-gradle-enterprise-maven-extension/src/main/java/com/gradle/RootProjectExtractor.java
rename to components/configure-develocity-maven-extension/src/main/java/com/gradle/RootProjectExtractor.java
diff --git a/components/configure-gradle-enterprise-maven-extension/src/main/resources/META-INF/plexus/components.xml b/components/configure-develocity-maven-extension/src/main/resources/META-INF/plexus/components.xml
similarity index 100%
rename from components/configure-gradle-enterprise-maven-extension/src/main/resources/META-INF/plexus/components.xml
rename to components/configure-develocity-maven-extension/src/main/resources/META-INF/plexus/components.xml
diff --git a/components/scripts/gradle/01-validate-incremental-building.sh b/components/scripts/gradle/01-validate-incremental-building.sh
index f2a67074..71b17065 100755
--- a/components/scripts/gradle/01-validate-incremental-building.sh
+++ b/components/scripts/gradle/01-validate-incremental-building.sh
@@ -35,8 +35,8 @@ git_branch=''
 project_dir=''
 tasks=''
 extra_args=''
-enable_ge=''
-ge_server=''
+enable_develocity=''
+develocity_server=''
 interactive_mode=''
 
 main() {
diff --git a/components/scripts/gradle/02-validate-local-build-caching-same-location.sh b/components/scripts/gradle/02-validate-local-build-caching-same-location.sh
index ee44a40d..3317a0d5 100755
--- a/components/scripts/gradle/02-validate-local-build-caching-same-location.sh
+++ b/components/scripts/gradle/02-validate-local-build-caching-same-location.sh
@@ -35,8 +35,8 @@ git_branch=''
 project_dir=''
 tasks=''
 extra_args=''
-enable_ge=''
-ge_server=''
+enable_develocity=''
+develocity_server=''
 interactive_mode=''
 
 main() {
diff --git a/components/scripts/gradle/03-validate-local-build-caching-different-locations.sh b/components/scripts/gradle/03-validate-local-build-caching-different-locations.sh
index e5d08879..c4a5986f 100755
--- a/components/scripts/gradle/03-validate-local-build-caching-different-locations.sh
+++ b/components/scripts/gradle/03-validate-local-build-caching-different-locations.sh
@@ -35,8 +35,8 @@ git_branch=''
 project_dir=''
 tasks=''
 extra_args=''
-enable_ge=''
-ge_server=''
+enable_develocity=''
+develocity_server=''
 interactive_mode=''
 
 main() {
diff --git a/components/scripts/gradle/04-validate-remote-build-caching-ci-ci.sh b/components/scripts/gradle/04-validate-remote-build-caching-ci-ci.sh
index 96a1dc6f..2809d891 100755
--- a/components/scripts/gradle/04-validate-remote-build-caching-ci-ci.sh
+++ b/components/scripts/gradle/04-validate-remote-build-caching-ci-ci.sh
@@ -36,8 +36,8 @@ git_options='<not available>'
 project_dir='<not available>'
 extra_args='<not available>'
 tasks=''
-enable_ge=''
-ge_server=''
+enable_develocity=''
+develocity_server=''
 interactive_mode=''
 mapping_file=''
 
diff --git a/components/scripts/gradle/05-validate-remote-build-caching-ci-local.sh b/components/scripts/gradle/05-validate-remote-build-caching-ci-local.sh
index b56d075e..403776db 100755
--- a/components/scripts/gradle/05-validate-remote-build-caching-ci-local.sh
+++ b/components/scripts/gradle/05-validate-remote-build-caching-ci-local.sh
@@ -35,8 +35,8 @@ git_branch=''
 project_dir=''
 tasks=''
 extra_args=''
-enable_ge=''
-ge_server=''
+enable_develocity=''
+develocity_server=''
 interactive_mode=''
 
 ci_build_scan_url=''
@@ -148,7 +148,7 @@ validate_required_args() {
     fi
   fi
 
-  if [[ "${enable_ge}" == "on" && -z "${ge_server}" ]]; then
+  if [[ "${enable_develocity}" == "on" && -z "${develocity_server}" ]]; then
     _PRINT_HELP=yes die "ERROR: Missing required argument when enabling Develocity on a project not already connected: --develocity-server" "${INVALID_INPUT}"
   fi
 }
@@ -469,11 +469,11 @@ generate_command_to_repeat_experiment() {
     cmd+=("-u" "${remote_build_cache_url}")
   fi
 
-  if [ -n "${ge_server}" ]; then
-    cmd+=("-s" "${ge_server}")
+  if [ -n "${develocity_server}" ]; then
+    cmd+=("-s" "${develocity_server}")
   fi
 
-  if [[ "${enable_ge}" == "on" ]]; then
+  if [[ "${enable_develocity}" == "on" ]]; then
     cmd+=("-e")
   fi
 
diff --git a/components/scripts/lib/build-scan-online.sh b/components/scripts/lib/build-scan-online.sh
index 73bde206..d5e1c5cb 100644
--- a/components/scripts/lib/build-scan-online.sh
+++ b/components/scripts/lib/build-scan-online.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
 # This is a helper function for the common pattern of reading Build Scan metadata
-# from the build-scans.csv file, then retrieving build metrics using the Gradle
-# Enterprise API.
+# from the build-scans.csv file, then retrieving build metrics using the
+# Develocity API.
 process_build_scan_data_online() {
   read_build_scan_metadata
   fetch_build_scans_and_build_time_metrics 'brief_logging' "${build_scan_urls[@]}"
diff --git a/components/scripts/lib/config.sh b/components/scripts/lib/config.sh
index deccda4c..87c0534e 100644
--- a/components/scripts/lib/config.sh
+++ b/components/scripts/lib/config.sh
@@ -66,14 +66,14 @@ map_common_script_args() {
     mapping_file="${_arg_mapping_file}"
   fi
 
-  ge_server="${_arg_gradle_enterprise_server}"
+  develocity_server="${_arg_gradle_enterprise_server}"
   if [ -n "${_arg_develocity_server}" ]; then
-    ge_server="${_arg_develocity_server}"
+    develocity_server="${_arg_develocity_server}"
   fi
 
-  enable_ge="${_arg_enable_gradle_enterprise}"
+  enable_develocity="${_arg_enable_gradle_enterprise}"
   if [ "${_arg_enable_develocity}" == "on" ]; then
-    enable_ge="${_arg_enable_develocity}"
+    enable_develocity="${_arg_enable_develocity}"
   fi
 
   if [ -n "${_arg_fail_if_not_fully_cacheable+x}" ]; then
@@ -115,7 +115,7 @@ validate_required_args() {
     fi
   fi
 
-  if [[ "${enable_ge}" == "on" && -z "${ge_server}" ]]; then
+  if [[ "${enable_develocity}" == "on" && -z "${develocity_server}" ]]; then
     _PRINT_HELP=yes die "ERROR: Missing required argument when enabling Develocity on a project not already connected: --develocity-server" "${INVALID_INPUT}"
   fi
 }
@@ -292,11 +292,11 @@ generate_command_to_repeat_experiment() {
     cmd+=("-a" "${extra_args}")
   fi
 
-  if [ -n "${ge_server}" ]; then
-    cmd+=("-s" "${ge_server}")
+  if [ -n "${develocity_server}" ]; then
+    cmd+=("-s" "${develocity_server}")
   fi
 
-  if [[ "${enable_ge}" == "on" ]]; then
+  if [[ "${enable_develocity}" == "on" ]]; then
     cmd+=("-e")
   fi
 
diff --git a/components/scripts/lib/gradle.sh b/components/scripts/lib/gradle.sh
index 2adf808d..93f15d13 100644
--- a/components/scripts/lib/gradle.sh
+++ b/components/scripts/lib/gradle.sh
@@ -19,7 +19,7 @@ invoke_gradle() {
     -Ddevelocity.injection-enabled=true
   )
 
-  if [ "$enable_ge" == "on" ]; then
+  if [ "$enable_develocity" == "on" ]; then
     args+=(
       -Dgradle.plugin-repository.url=https://plugins.gradle.org/m2
       -Ddevelocity.plugin.version="3.14.1"
@@ -27,9 +27,9 @@ invoke_gradle() {
     )
   fi
 
-  if [ -n "${ge_server}" ]; then
+  if [ -n "${develocity_server}" ]; then
     args+=(
-      -Ddevelocity.url="${ge_server}"
+      -Ddevelocity.url="${develocity_server}"
       -Ddevelocity.enforce-url=true
       -Ddevelocity.allow-untrusted-server=false
     )
diff --git a/components/scripts/lib/interactive-mode.sh b/components/scripts/lib/interactive-mode.sh
index 75703d81..1da15f43 100644
--- a/components/scripts/lib/interactive-mode.sh
+++ b/components/scripts/lib/interactive-mode.sh
@@ -45,7 +45,7 @@ during daily development, it is advisable that you apply the Common Custom User
 Data Gradle plugin to your build. Details on how to apply the plugin are
 available from the documentation of the build validation scripts.
 
-https://github.com/gradle/develocity-build-validation-scripts/blob/main/Gradle.md#applying-the-common-custom-user-data-gradle-plugin
+https://gradle.com/bvs/main/Gradle.md#applying-the-common-custom-user-data-gradle-plugin
 
 Your updated build configuration should be pushed before proceeding.
 
@@ -73,7 +73,7 @@ during daily development, it is advisable that you apply the Common Custom User
 Data Maven extension to your build. Details on how to apply the extension are
 available from the documentation of the build validation scripts.
 
-https://github.com/gradle/develocity-build-validation-scripts/blob/main/Maven.md#applying-the-common-custom-user-data-maven-extension
+https://gradle.com/bvs/main/Maven.md#applying-the-common-custom-user-data-maven-extension
 
 Your updated build configuration should be pushed before proceeding.
 
@@ -239,9 +239,9 @@ explain_prerequisites_api_access() {
   fi
 
   if [[ "${BUILD_TOOL}" == "Maven" ]]; then
-    documentation_link="https://github.com/gradle/develocity-build-validation-scripts/blob/main/Maven.md#authenticating-with-develocity"
+    documentation_link="https://gradle.com/bvs/main/Maven.md#authenticating-with-develocity"
   else
-    documentation_link="https://github.com/gradle/develocity-build-validation-scripts/blob/main/Gradle.md#authenticating-with-develocity"
+    documentation_link="https://gradle.com/bvs/main/Gradle.md#authenticating-with-develocity"
   fi
 
   IFS='' read -r -d '' text <<EOF
diff --git a/components/scripts/lib/maven.sh b/components/scripts/lib/maven.sh
index e33be76d..81a3a219 100644
--- a/components/scripts/lib/maven.sh
+++ b/components/scripts/lib/maven.sh
@@ -8,10 +8,10 @@ find_versioned_jar() {
   find "${dir_to_search}" -name "${base_name}*" -type f -print -quit
 }
 
-CONFIGURE_GRADLE_ENTERPRISE_JAR="${LIB_DIR}/maven-libs/configure-gradle-enterprise-maven-extension-${SCRIPT_VERSION}-all.jar"
-GRADLE_ENTERPRISE_MAVEN_EXTENSION_JAR="$(find_versioned_jar "${SCRIPT_DIR}/lib/develocity" "gradle-enterprise-maven-extension")"
+CONFIGURE_DEVELOCITY_JAR="${LIB_DIR}/maven-libs/configure-develocity-maven-extension-${SCRIPT_VERSION}-all.jar"
+DEVELOCITY_MAVEN_EXTENSION_JAR="$(find_versioned_jar "${SCRIPT_DIR}/lib/develocity" "gradle-enterprise-maven-extension")"
 COMMON_CUSTOM_USER_DATA_MAVEN_EXTENSION_JAR="$(find_versioned_jar "${SCRIPT_DIR}/lib/third-party" "common-custom-user-data-maven-extension")"
-readonly CONFIGURE_GRADLE_ENTERPRISE_JAR GRADLE_ENTERPRISE_MAVEN_EXTENSION_JAR COMMON_CUSTOM_USER_DATA_MAVEN_EXTENSION_JAR
+readonly CONFIGURE_DEVELOCITY_JAR DEVELOCITY_MAVEN_EXTENSION_JAR COMMON_CUSTOM_USER_DATA_MAVEN_EXTENSION_JAR
 
 find_maven_executable() {
   if [ -f "./mvnw" ]; then
@@ -39,28 +39,28 @@ invoke_maven() {
   fi
 
   local extension_classpath
-  extension_classpath="${CONFIGURE_GRADLE_ENTERPRISE_JAR}"
+  extension_classpath="${CONFIGURE_DEVELOCITY_JAR}"
 
-  if [ "$enable_ge" == "on" ]; then
-    extension_classpath="${extension_classpath}:${GRADLE_ENTERPRISE_MAVEN_EXTENSION_JAR}:${COMMON_CUSTOM_USER_DATA_MAVEN_EXTENSION_JAR}"
+  if [ "$enable_develocity" == "on" ]; then
+    extension_classpath="${extension_classpath}:${DEVELOCITY_MAVEN_EXTENSION_JAR}:${COMMON_CUSTOM_USER_DATA_MAVEN_EXTENSION_JAR}"
   fi
 
-  if [ -n "${ge_server}" ]; then
+  if [ -n "${develocity_server}" ]; then
     args+=(
-      -Dgradle.enterprise.url="${ge_server}"
+      -Dgradle.enterprise.url="${develocity_server}"
       -Dgradle.enterprise.allowUntrustedServer=false
-      -Ddevelocity.url="${ge_server}"
+      -Ddevelocity.url="${develocity_server}"
       -Ddevelocity.allowUntrustedServer=false
     )
   fi
 
   args+=(
     -Dmaven.ext.class.path="${extension_classpath}"
-    -Dcom.gradle.enterprise.build-validation.expDir="${EXP_DIR}"
-    -Dcom.gradle.enterprise.build-validation.expId="${EXP_SCAN_TAG}"
-    -Dcom.gradle.enterprise.build-validation.runId="${RUN_ID}"
-    -Dcom.gradle.enterprise.build-validation.runNum="${run_num}"
-    -Dcom.gradle.enterprise.build-validation.scriptsVersion="${SCRIPT_VERSION}"
+    -Ddevelocity.build-validation.expDir="${EXP_DIR}"
+    -Ddevelocity.build-validation.expId="${EXP_SCAN_TAG}"
+    -Ddevelocity.build-validation.runId="${RUN_ID}"
+    -Ddevelocity.build-validation.runNum="${run_num}"
+    -Ddevelocity.build-validation.scriptsVersion="${SCRIPT_VERSION}"
     -Dgradle.scan.captureGoalInputFiles=true
     -Ddevelocity.scan.captureFileFingerprints=true
     -Dpts.enabled=false
diff --git a/components/scripts/maven/01-validate-local-build-caching-same-location.sh b/components/scripts/maven/01-validate-local-build-caching-same-location.sh
index e9ca2269..75f142ad 100755
--- a/components/scripts/maven/01-validate-local-build-caching-same-location.sh
+++ b/components/scripts/maven/01-validate-local-build-caching-same-location.sh
@@ -34,8 +34,8 @@ git_branch=''
 project_dir=''
 tasks=''
 extra_args=''
-enable_ge=''
-ge_server=''
+enable_develocity=''
+develocity_server=''
 interactive_mode=''
 
 main() {
diff --git a/components/scripts/maven/02-validate-local-build-caching-different-locations.sh b/components/scripts/maven/02-validate-local-build-caching-different-locations.sh
index 7e13e053..e4aabd37 100755
--- a/components/scripts/maven/02-validate-local-build-caching-different-locations.sh
+++ b/components/scripts/maven/02-validate-local-build-caching-different-locations.sh
@@ -34,8 +34,8 @@ git_branch=''
 project_dir=''
 tasks=''
 extra_args=''
-enable_ge=''
-ge_server=''
+enable_develocity=''
+develocity_server=''
 interactive_mode=''
 
 main() {
diff --git a/components/scripts/maven/04-validate-remote-build-caching-ci-local.sh b/components/scripts/maven/04-validate-remote-build-caching-ci-local.sh
index e3ddecff..8ad8b5f1 100755
--- a/components/scripts/maven/04-validate-remote-build-caching-ci-local.sh
+++ b/components/scripts/maven/04-validate-remote-build-caching-ci-local.sh
@@ -34,7 +34,7 @@ git_branch=''
 project_dir=''
 tasks=''
 extra_args=''
-ge_server=''
+develocity_server=''
 interactive_mode=''
 
 ci_build_scan_url=''
@@ -146,7 +146,7 @@ validate_required_args() {
     fi
   fi
 
-  if [[ "${enable_ge}" == "on" && -z "${ge_server}" ]]; then
+  if [[ "${enable_develocity}" == "on" && -z "${develocity_server}" ]]; then
     _PRINT_HELP=yes die "ERROR: Missing required argument when enabling Develocity on a project not already connected: --develocity-server" "${INVALID_INPUT}"
   fi
 }
@@ -483,11 +483,11 @@ generate_command_to_repeat_experiment() {
     cmd+=("-u" "${remote_build_cache_url}")
   fi
 
-  if [ -n "${ge_server}" ]; then
-    cmd+=("-s" "${ge_server}")
+  if [ -n "${develocity_server}" ]; then
+    cmd+=("-s" "${develocity_server}")
   fi
 
-  if [[ "${enable_ge}" == "on" ]]; then
+  if [[ "${enable_develocity}" == "on" ]]; then
     cmd+=("-e")
   fi
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4417d197..bd1bdf36 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -26,9 +26,9 @@ buildCache {
 
 rootProject.name = "build-validation-scripts"
 
-include("components/configure-gradle-enterprise-maven-extension")
+include("components/configure-develocity-maven-extension")
 
-project(":components/configure-gradle-enterprise-maven-extension").name = "configure-gradle-enterprise-maven-extension"
+project(":components/configure-develocity-maven-extension").name = "configure-develocity-maven-extension"
 
 val develocityCiInjectionProjectDir = providers.gradleProperty("develocityCiInjectionProjectDir")
 if (develocityCiInjectionProjectDir.isPresent) {