diff --git a/.github/workflows/maven-build-caching-samples-verification.yml b/.github/workflows/maven-build-caching-samples-verification.yml.disabled
similarity index 97%
rename from .github/workflows/maven-build-caching-samples-verification.yml
rename to .github/workflows/maven-build-caching-samples-verification.yml.disabled
index b23e61ff0..eff34e95c 100644
--- a/.github/workflows/maven-build-caching-samples-verification.yml
+++ b/.github/workflows/maven-build-caching-samples-verification.yml.disabled
@@ -38,7 +38,7 @@ jobs:
             -g "verify" \
             -a "-Dorg.slf4j.simpleLogger.log.gradle.goal.cache=debug -B" \
             -s "https://ge.solutions-team.gradle.com" \
-            -f 2>&1 | tee -a /tmp/build.log
+            -f -e 2>&1 | tee -a /tmp/build.log
           echo "hasUnknownParams=$(grep "Build caching was not enabled for this goal execution because the following parameters were not handled" /tmp/build.log | wc -l)" >> $GITHUB_OUTPUT
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }}
diff --git a/.github/workflows/maven-data-capturing-samples-verification.yml b/.github/workflows/maven-data-capturing-samples-verification.yml
index a4ae8de08..fb0857eab 100644
--- a/.github/workflows/maven-data-capturing-samples-verification.yml
+++ b/.github/workflows/maven-data-capturing-samples-verification.yml
@@ -12,8 +12,8 @@ jobs:
     name: Verification of ${{ matrix.name }}
     runs-on: ubuntu-latest
     env:
-      LOG_MSG_EXTENSION_LOADED: "Build operation 'Gradle Enterprise mojo execution' completed"
-      LOG_MSG_EXECUTION_FAILED: "Error executing a GradleEnterpriseListener callback"
+      LOG_MSG_EXTENSION_LOADED: "Build operation 'Develocity mojo execution' completed"
+      LOG_MSG_EXECUTION_FAILED: "Error executing a DevelocityListener callback"
     strategy:
       matrix:
         include:
@@ -42,16 +42,16 @@ jobs:
       - name: Provide data capture script to Maven build
         run: |
             # copy over sample script such that it gets pulled in by the Develocity extension
-            cp build-data-capturing-maven-samples/${{ matrix.sample-file }} common-develocity-maven-configuration/.mvn/gradle-enterprise-custom-user-data.groovy
+            cp build-data-capturing-maven-samples/${{ matrix.sample-file }} common-develocity-maven-configuration/.mvn/develocity-custom-user-data.groovy
       - name: Run Maven build
         id: mvn-build
         run: |
           delimiter="$(openssl rand -hex 8)"
           echo "mavenOutput<<${delimiter}" >> $GITHUB_OUTPUT
-          echo "$(mvn -f common-develocity-maven-configuration/pom.xml -Dgradle.enterprise.url=https://ge.solutions-team.gradle.com -X -B clean validate)" >> $GITHUB_OUTPUT
+          echo "$(mvn -f common-develocity-maven-configuration/pom.xml -Ddevelocity.url=https://ge.solutions-team.gradle.com -X -B clean validate)" >> $GITHUB_OUTPUT
           echo "${delimiter}" >> $GITHUB_OUTPUT
         env:
-          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }}
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }}
       - name: Validate extension loaded
         # Asserting that extension was loaded checking a log entry
         run: exit 1
diff --git a/build-caching-maven-samples/.gitignore b/build-caching-maven-samples/.gitignore
index 89960d2e1..83806007c 100644
--- a/build-caching-maven-samples/.gitignore
+++ b/build-caching-maven-samples/.gitignore
@@ -1,3 +1,3 @@
-.mvn/.gradle-enterprise/gradle-enterprise-workspace-id
+.mvn/.develocity/develocity-workspace-id
 
 velocity.log
diff --git a/build-caching-maven-samples/.mvn/gradle-enterprise.xml b/build-caching-maven-samples/.mvn/develocity.xml
similarity index 68%
rename from build-caching-maven-samples/.mvn/gradle-enterprise.xml
rename to build-caching-maven-samples/.mvn/develocity.xml
index 93f695af7..cbc39aba0 100644
--- a/build-caching-maven-samples/.mvn/gradle-enterprise.xml
+++ b/build-caching-maven-samples/.mvn/develocity.xml
@@ -1,11 +1,8 @@
-<gradleEnterprise>
+<develocity>
     <server>
         <url>https://localhost</url>
         <allowUntrusted>true</allowUntrusted>
     </server>
-    <buildScan>
-        <captureGoalInputFiles>true</captureGoalInputFiles>
-    </buildScan>
     <buildCache>
         <local>
             <enabled>true</enabled>
@@ -14,4 +11,4 @@
             <enabled>false</enabled>
         </remote>
     </buildCache>
-</gradleEnterprise>
+</develocity>
diff --git a/build-caching-maven-samples/.mvn/extensions.xml b/build-caching-maven-samples/.mvn/extensions.xml
index 9414109cf..d91e415a3 100644
--- a/build-caching-maven-samples/.mvn/extensions.xml
+++ b/build-caching-maven-samples/.mvn/extensions.xml
@@ -1,12 +1,12 @@
 <extensions>
   <extension>
     <groupId>com.gradle</groupId>
-    <artifactId>gradle-enterprise-maven-extension</artifactId>
-    <version>1.20.1</version>
+    <artifactId>develocity-maven-extension</artifactId>
+    <version>1.21</version>
   </extension>
   <extension>
     <groupId>com.gradle</groupId>
     <artifactId>common-custom-user-data-maven-extension</artifactId>
-    <version>2</version>
+    <version>2.0</version>
   </extension>
 </extensions>
diff --git a/build-caching-maven-samples/animal-sniffer-project/pom.xml b/build-caching-maven-samples/animal-sniffer-project/pom.xml
index 53d379106..463eb66c7 100644
--- a/build-caching-maven-samples/animal-sniffer-project/pom.xml
+++ b/build-caching-maven-samples/animal-sniffer-project/pom.xml
@@ -39,9 +39,9 @@
       <plugins>
         <plugin>
           <groupId>com.gradle</groupId>
-          <artifactId>gradle-enterprise-maven-extension</artifactId>
+          <artifactId>develocity-maven-extension</artifactId>
           <configuration>
-            <gradleEnterprise>
+            <develocity>
               <plugins>
                 <plugin>
                   <groupId>org.codehaus.mojo</groupId>
@@ -116,7 +116,7 @@
                   </executions>
                 </plugin>
               </plugins>
-            </gradleEnterprise>
+            </develocity>
           </configuration>
         </plugin>
       </plugins>
diff --git a/build-caching-maven-samples/antlr3-project/pom.xml b/build-caching-maven-samples/antlr3-project/pom.xml
index 47b67f33d..3db91f537 100644
--- a/build-caching-maven-samples/antlr3-project/pom.xml
+++ b/build-caching-maven-samples/antlr3-project/pom.xml
@@ -59,9 +59,9 @@
       <plugins>
         <plugin>
           <groupId>com.gradle</groupId>
-          <artifactId>gradle-enterprise-maven-extension</artifactId>
+          <artifactId>develocity-maven-extension</artifactId>
           <configuration>
-            <gradleEnterprise>
+            <develocity>
               <plugins>
                 <plugin>
                   <groupId>org.antlr</groupId>
@@ -117,7 +117,7 @@
                   </outputs>
                 </plugin>
               </plugins>
-            </gradleEnterprise>
+            </develocity>
           </configuration>
         </plugin>
       </plugins>
diff --git a/build-caching-maven-samples/asciidoctor-project/pom.xml b/build-caching-maven-samples/asciidoctor-project/pom.xml
index 5fa1650ed..99b5c796f 100644
--- a/build-caching-maven-samples/asciidoctor-project/pom.xml
+++ b/build-caching-maven-samples/asciidoctor-project/pom.xml
@@ -58,9 +58,9 @@
       <plugins>
         <plugin>
           <groupId>com.gradle</groupId>
-          <artifactId>gradle-enterprise-maven-extension</artifactId>
+          <artifactId>develocity-maven-extension</artifactId>
           <configuration>
-            <gradleEnterprise>
+            <develocity>
               <plugins>
                 <plugin>
                   <groupId>org.asciidoctor</groupId>
@@ -174,7 +174,7 @@
                   </outputs>
                 </plugin>
               </plugins>
-            </gradleEnterprise>
+            </develocity>
           </configuration>
         </plugin>
       </plugins>
diff --git a/build-caching-maven-samples/aspectj-project/pom.xml b/build-caching-maven-samples/aspectj-project/pom.xml
index fb0aafd2b..cdd50acbe 100644
--- a/build-caching-maven-samples/aspectj-project/pom.xml
+++ b/build-caching-maven-samples/aspectj-project/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd
-        https://www.gradle.com/schema/gradle-enterprise-maven-project.xsd">
+        https://www.gradle.com/schema/develocity-maven-project.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -52,9 +52,9 @@
             <plugins>
                 <plugin>
                     <groupId>com.gradle</groupId>
-                    <artifactId>gradle-enterprise-maven-extension</artifactId>
+                    <artifactId>develocity-maven-extension</artifactId>
                     <configuration>
-                        <gradleEnterprise>
+                        <develocity>
                             <plugins>
                                 <plugin>
                                     <groupId>org.codehaus.mojo</groupId>
@@ -345,7 +345,7 @@
                                     </executions>
                                 </plugin>
                             </plugins>
-                        </gradleEnterprise>
+                        </develocity>
                     </configuration>
                 </plugin>
             </plugins>
diff --git a/build-caching-maven-samples/avro-project/pom.xml b/build-caching-maven-samples/avro-project/pom.xml
index 1e34495bb..968b42a88 100644
--- a/build-caching-maven-samples/avro-project/pom.xml
+++ b/build-caching-maven-samples/avro-project/pom.xml
@@ -62,9 +62,9 @@
       <plugins>
         <plugin>
           <groupId>com.gradle</groupId>
-          <artifactId>gradle-enterprise-maven-extension</artifactId>
+          <artifactId>develocity-maven-extension</artifactId>
           <configuration>
-            <gradleEnterprise>
+            <develocity>
               <plugins>
                 <plugin>
                   <groupId>org.apache.avro</groupId>
@@ -120,7 +120,7 @@
                   </outputs>
                 </plugin>
               </plugins>
-            </gradleEnterprise>
+            </develocity>
           </configuration>
         </plugin>
       </plugins>
diff --git a/build-caching-maven-samples/clojure-project/pom.xml b/build-caching-maven-samples/clojure-project/pom.xml
index 9baf8893b..fda02dc67 100644
--- a/build-caching-maven-samples/clojure-project/pom.xml
+++ b/build-caching-maven-samples/clojure-project/pom.xml
@@ -1,6 +1,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd
-  https://www.gradle.com/schema/gradle-enterprise-maven-project.xsd">
+  https://www.gradle.com/schema/develocity-maven-project.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>clojure-project</artifactId>
   <packaging>jar</packaging>
@@ -57,9 +57,9 @@
       <plugins>
         <plugin>
           <groupId>com.gradle</groupId>
-          <artifactId>gradle-enterprise-maven-extension</artifactId>
+          <artifactId>develocity-maven-extension</artifactId>
           <configuration>
-            <gradleEnterprise>
+            <develocity>
               <plugins>
                 <plugin>
                   <groupId>com.theoryinpractise</groupId>
@@ -212,7 +212,7 @@
                   </outputs>
                 </plugin>
               </plugins>
-            </gradleEnterprise>
+            </develocity>
           </configuration>
         </plugin>
       </plugins>
diff --git a/build-caching-maven-samples/duplicate-finder-project/pom.xml b/build-caching-maven-samples/duplicate-finder-project/pom.xml
index d830b607c..de8c4cd7e 100644
--- a/build-caching-maven-samples/duplicate-finder-project/pom.xml
+++ b/build-caching-maven-samples/duplicate-finder-project/pom.xml
@@ -42,9 +42,9 @@
       <plugins>
         <plugin>
           <groupId>com.gradle</groupId>
-          <artifactId>gradle-enterprise-maven-extension</artifactId>
+          <artifactId>develocity-maven-extension</artifactId>
           <configuration>
-            <gradleEnterprise>
+            <develocity>
               <plugins>
                 <plugin>
                   <groupId>org.basepom.maven</groupId>
@@ -115,7 +115,7 @@
                   </outputs>
                 </plugin>
               </plugins>
-            </gradleEnterprise>
+            </develocity>
           </configuration>
         </plugin>
       </plugins>
diff --git a/build-caching-maven-samples/enforcer-project/pom.xml b/build-caching-maven-samples/enforcer-project/pom.xml
index 5e63828d1..b74b5eb7d 100644
--- a/build-caching-maven-samples/enforcer-project/pom.xml
+++ b/build-caching-maven-samples/enforcer-project/pom.xml
@@ -94,9 +94,9 @@
       <plugins>
         <plugin>
           <groupId>com.gradle</groupId>
-          <artifactId>gradle-enterprise-maven-extension</artifactId>
+          <artifactId>develocity-maven-extension</artifactId>
           <configuration>
-            <gradleEnterprise>
+            <develocity>
               <plugins>
                 <plugin>
                   <groupId>org.apache.maven.plugins</groupId>
@@ -224,7 +224,7 @@
                   </executions>
                 </plugin>
               </plugins>
-            </gradleEnterprise>
+            </develocity>
           </configuration>
         </plugin>
       </plugins>
diff --git a/build-caching-maven-samples/exec-yarn-project/pom.xml b/build-caching-maven-samples/exec-yarn-project/pom.xml
index ee781ac41..2f3ef4758 100644
--- a/build-caching-maven-samples/exec-yarn-project/pom.xml
+++ b/build-caching-maven-samples/exec-yarn-project/pom.xml
@@ -52,9 +52,9 @@
         <!-- Make yarn build cacheable -->
         <plugin>
           <groupId>com.gradle</groupId>
-          <artifactId>gradle-enterprise-maven-extension</artifactId>
+          <artifactId>develocity-maven-extension</artifactId>
           <configuration>
-            <gradleEnterprise>
+            <develocity>
               <plugins>
                 <plugin>
                   <groupId>org.codehaus.mojo</groupId>
@@ -174,7 +174,7 @@
                   </executions>
                 </plugin>
               </plugins>
-            </gradleEnterprise>
+            </develocity>
           </configuration>
         </plugin>
       </plugins>
diff --git a/build-caching-maven-samples/kotlin-project/pom.xml b/build-caching-maven-samples/kotlin-project/pom.xml
index 64e8c6153..2d401b5eb 100644
--- a/build-caching-maven-samples/kotlin-project/pom.xml
+++ b/build-caching-maven-samples/kotlin-project/pom.xml
@@ -66,9 +66,9 @@
             <plugins>
                 <plugin>
                     <groupId>com.gradle</groupId>
-                    <artifactId>gradle-enterprise-maven-extension</artifactId>
+                    <artifactId>develocity-maven-extension</artifactId>
                     <configuration>
-                        <gradleEnterprise>
+                        <develocity>
                             <plugins>
                                 <plugin>
                                     <groupId>org.jetbrains.kotlin</groupId>
@@ -199,7 +199,7 @@
                                     </localState>
                                 </plugin>
                             </plugins>
-                        </gradleEnterprise>
+                        </develocity>
                     </configuration>
                 </plugin>
             </plugins>
diff --git a/build-caching-maven-samples/pmd-project/pom.xml b/build-caching-maven-samples/pmd-project/pom.xml
index c24ae6413..c28359683 100644
--- a/build-caching-maven-samples/pmd-project/pom.xml
+++ b/build-caching-maven-samples/pmd-project/pom.xml
@@ -35,9 +35,9 @@
       <plugins>
         <plugin>
           <groupId>com.gradle</groupId>
-          <artifactId>gradle-enterprise-maven-extension</artifactId>
+          <artifactId>develocity-maven-extension</artifactId>
           <configuration>
-            <gradleEnterprise>
+            <develocity>
               <plugins>
                 <plugin>
                   <artifactId>maven-pmd-plugin</artifactId>
@@ -295,7 +295,7 @@
                   </executions>
                 </plugin>
               </plugins>
-            </gradleEnterprise>
+            </develocity>
           </configuration>
         </plugin>
       </plugins>
diff --git a/build-caching-maven-samples/protobuf-project/pom.xml b/build-caching-maven-samples/protobuf-project/pom.xml
index 983978a01..f6a768178 100644
--- a/build-caching-maven-samples/protobuf-project/pom.xml
+++ b/build-caching-maven-samples/protobuf-project/pom.xml
@@ -65,9 +65,9 @@
       <plugins>
         <plugin>
           <groupId>com.gradle</groupId>
-          <artifactId>gradle-enterprise-maven-extension</artifactId>
+          <artifactId>develocity-maven-extension</artifactId>
           <configuration>
-            <gradleEnterprise>
+            <develocity>
               <plugins>
                 <plugin>
                   <groupId>com.github.os72</groupId>
@@ -126,7 +126,7 @@
                   </outputs>
                 </plugin>
               </plugins>
-            </gradleEnterprise>
+            </develocity>
           </configuration>
         </plugin>
       </plugins>
diff --git a/build-caching-maven-samples/spotbugs-project/pom.xml b/build-caching-maven-samples/spotbugs-project/pom.xml
index 5ff0e9624..ae29d02f5 100644
--- a/build-caching-maven-samples/spotbugs-project/pom.xml
+++ b/build-caching-maven-samples/spotbugs-project/pom.xml
@@ -39,9 +39,9 @@
       <plugins>
         <plugin>
           <groupId>com.gradle</groupId>
-          <artifactId>gradle-enterprise-maven-extension</artifactId>
+          <artifactId>develocity-maven-extension</artifactId>
           <configuration>
-            <gradleEnterprise>
+            <develocity>
               <plugins>
                 <plugin>
                   <groupId>com.github.spotbugs</groupId>
@@ -154,7 +154,7 @@
                   </executions>
                 </plugin>
               </plugins>
-            </gradleEnterprise>
+            </develocity>
           </configuration>
         </plugin>
       </plugins>
diff --git a/build-caching-maven-samples/spotless-project/pom.xml b/build-caching-maven-samples/spotless-project/pom.xml
index 875c76fd1..49f32d652 100644
--- a/build-caching-maven-samples/spotless-project/pom.xml
+++ b/build-caching-maven-samples/spotless-project/pom.xml
@@ -51,9 +51,9 @@
             <plugins>
                 <plugin>
                     <groupId>com.gradle</groupId>
-                    <artifactId>gradle-enterprise-maven-extension</artifactId>
+                    <artifactId>develocity-maven-extension</artifactId>
                     <configuration>
-                        <gradleEnterprise>
+                        <develocity>
                             <plugins>
                                 <plugin>
                                     <groupId>com.diffplug.spotless</groupId>
@@ -226,7 +226,7 @@
                                     </outputs>
                                 </plugin>
                             </plugins>
-                        </gradleEnterprise>
+                        </develocity>
                     </configuration>
                 </plugin>
             </plugins>
diff --git a/build-caching-maven-samples/spring-cloud-contract-project/pom.xml b/build-caching-maven-samples/spring-cloud-contract-project/pom.xml
index c0a2fa163..389aaa804 100644
--- a/build-caching-maven-samples/spring-cloud-contract-project/pom.xml
+++ b/build-caching-maven-samples/spring-cloud-contract-project/pom.xml
@@ -62,9 +62,9 @@
       <plugins>
         <plugin>
           <groupId>com.gradle</groupId>
-          <artifactId>gradle-enterprise-maven-extension</artifactId>
+          <artifactId>develocity-maven-extension</artifactId>
           <configuration>
-            <gradleEnterprise>
+            <develocity>
               <plugins>
                 <plugin>
                   <groupId>org.springframework.cloud</groupId>
@@ -206,7 +206,7 @@
                   </executions>
                 </plugin>
               </plugins>
-            </gradleEnterprise>
+            </develocity>
           </configuration>
         </plugin>
       </plugins>
diff --git a/build-caching-maven-samples/webstart-project/pom.xml b/build-caching-maven-samples/webstart-project/pom.xml
index 52172b62e..b2cd652b8 100644
--- a/build-caching-maven-samples/webstart-project/pom.xml
+++ b/build-caching-maven-samples/webstart-project/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd https://www.gradle.com/schema/gradle-enterprise-maven-project.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd https://www.gradle.com/schema/develocity-maven-project.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>webstart-project</artifactId>
   <packaging>jar</packaging>
@@ -73,9 +73,9 @@
       <plugins>
         <plugin>
           <groupId>com.gradle</groupId>
-          <artifactId>gradle-enterprise-maven-extension</artifactId>
+          <artifactId>develocity-maven-extension</artifactId>
           <configuration>
-            <gradleEnterprise>
+            <develocity>
               <plugins>
                 <plugin>
                   <groupId>org.codehaus.mojo</groupId>
@@ -423,7 +423,7 @@
                   </outputs>
                 </plugin>
               </plugins>
-            </gradleEnterprise>
+            </develocity>
           </configuration>
         </plugin>
       </plugins>
diff --git a/build-data-capturing-maven-samples/capture-develocity-extension-version/maven-develocity-extension-version.groovy b/build-data-capturing-maven-samples/capture-develocity-extension-version/maven-develocity-extension-version.groovy
index 3daeae2e6..d657fbfca 100644
--- a/build-data-capturing-maven-samples/capture-develocity-extension-version/maven-develocity-extension-version.groovy
+++ b/build-data-capturing-maven-samples/capture-develocity-extension-version/maven-develocity-extension-version.groovy
@@ -2,6 +2,6 @@
  * This Groovy script captures the Develocity Maven extension version as a custom value.
  */
 
-URL url = buildScan.class.classLoader.getResource("com.gradle.scan.plugin.internal.meta.buildAgentVersion.txt")
+URL url = buildScan.buildScan.class.classLoader.getResource("com.gradle.scan.plugin.internal.meta.buildAgentVersion.txt")
 String buildAgentVersion = url.text
 buildScan.value("Develocity Maven extension version", buildAgentVersion)
diff --git a/build-data-capturing-maven-samples/capture-os-processes/maven-os-processes.groovy b/build-data-capturing-maven-samples/capture-os-processes/maven-os-processes.groovy
index fc8811219..5de40c4f6 100644
--- a/build-data-capturing-maven-samples/capture-os-processes/maven-os-processes.groovy
+++ b/build-data-capturing-maven-samples/capture-os-processes/maven-os-processes.groovy
@@ -1,13 +1,13 @@
 import java.nio.charset.Charset
 import java.util.concurrent.TimeUnit
-import com.gradle.maven.extension.api.scan.BuildScanApi
+import com.gradle.develocity.agent.maven.adapters.BuildScanApiAdapter
 
 /**
  * This Groovy script captures the OS processes as reported by the OS 'ps' command,
  * and adds these as a custom value.
  */
 
-buildScan.executeOnce('os-processes') { BuildScanApi buildScanApi ->
+buildScan.executeOnce('os-processes') { BuildScanApiAdapter buildScanApi ->
     buildScanApi.background { api ->
         captureOsProcesses(api)
     }
diff --git a/build-data-capturing-maven-samples/capture-processor-arch/maven-processor-arch.groovy b/build-data-capturing-maven-samples/capture-processor-arch/maven-processor-arch.groovy
index a002f45a5..3f7a49235 100644
--- a/build-data-capturing-maven-samples/capture-processor-arch/maven-processor-arch.groovy
+++ b/build-data-capturing-maven-samples/capture-processor-arch/maven-processor-arch.groovy
@@ -1,13 +1,13 @@
 import java.nio.charset.Charset
 import java.util.concurrent.TimeUnit
-import com.gradle.maven.extension.api.scan.BuildScanApi
+import com.gradle.develocity.agent.maven.adapters.BuildScanApiAdapter
 
 /**
  * This Groovy script captures the processor architecture
  * and adds these as a custom value.
  */
 
-buildScan.executeOnce('processor-arch') { BuildScanApi buildScanApi ->
+buildScan.executeOnce('processor-arch') { BuildScanApiAdapter buildScanApi ->
     buildScanApi.background { api ->
         captureProcessorArch(api)
     }
diff --git a/build-data-capturing-maven-samples/capture-profiles/maven-profiles.groovy b/build-data-capturing-maven-samples/capture-profiles/maven-profiles.groovy
index 42c15552c..fdc5e2ec5 100644
--- a/build-data-capturing-maven-samples/capture-profiles/maven-profiles.groovy
+++ b/build-data-capturing-maven-samples/capture-profiles/maven-profiles.groovy
@@ -1,9 +1,9 @@
-import com.gradle.maven.extension.api.scan.BuildScanApi
+import com.gradle.develocity.agent.maven.adapters.BuildScanApiAdapter
 
 /**
  * This Groovy script captures the active profiles and add them as tags to the Build Scan.
  */
 
-buildScan.executeOnce('tag-profiles') { BuildScanApi buildScanApi ->
+buildScan.executeOnce('tag-profiles') { BuildScanApiAdapter buildScanApi ->
     project.activeProfiles.each { profile -> buildScanApi.tag profile.id }
 }
diff --git a/build-data-capturing-maven-samples/capture-quality-check-issues/maven-quality-check-issues.groovy b/build-data-capturing-maven-samples/capture-quality-check-issues/maven-quality-check-issues.groovy
index 1c7ccc370..024a231fd 100644
--- a/build-data-capturing-maven-samples/capture-quality-check-issues/maven-quality-check-issues.groovy
+++ b/build-data-capturing-maven-samples/capture-quality-check-issues/maven-quality-check-issues.groovy
@@ -1,5 +1,5 @@
 import java.nio.file.Paths
-import com.gradle.maven.extension.api.scan.BuildScanApi
+import com.gradle.develocity.agent.maven.adapters.BuildScanApiAdapter
 @Grab(group='org.codehaus.groovy', module='groovy-xml', version='3.0.9')
 import groovy.util.XmlSlurper
 
@@ -8,7 +8,7 @@ import groovy.util.XmlSlurper
  * and adds these as custom values.
  */
 
-buildScan.executeOnce('reporting-issues') { BuildScanApi buildScanApi ->
+buildScan.executeOnce('reporting-issues') { BuildScanApiAdapter buildScanApi ->
     captureReportingIssues(buildScanApi)
 }
 
diff --git a/build-data-capturing-maven-samples/capture-top-level-project/maven-top-level-project.groovy b/build-data-capturing-maven-samples/capture-top-level-project/maven-top-level-project.groovy
index 80e668703..e24c025a1 100644
--- a/build-data-capturing-maven-samples/capture-top-level-project/maven-top-level-project.groovy
+++ b/build-data-capturing-maven-samples/capture-top-level-project/maven-top-level-project.groovy
@@ -1,11 +1,11 @@
-import com.gradle.maven.extension.api.scan.BuildScanApi
+import com.gradle.develocity.agent.maven.adapters.BuildScanApiAdapter
 
 /**
  * This Groovy script captures the top-level project name and artifact id,
  * and adds these as custom values.
  */
 
-buildScan.executeOnce('top-level-project') { BuildScanApi buildScanApi ->
+buildScan.executeOnce('top-level-project') { BuildScanApiAdapter buildScanApi ->
     buildScanApi.value 'executionRoot.name', session.topLevelProject.name
     buildScanApi.value 'executionRoot.artifactId', session.topLevelProject.artifactId
 }
diff --git a/common-develocity-maven-configuration/.gitignore b/common-develocity-maven-configuration/.gitignore
index 7eb05c2d5..ac32af16b 100644
--- a/common-develocity-maven-configuration/.gitignore
+++ b/common-develocity-maven-configuration/.gitignore
@@ -1,5 +1,5 @@
 # Ignore Gradle project-specific cache directory
-.mvn/.gradle-enterprise
+.mvn/.develocity
 
 # Ignore Maven build output directory
 target
diff --git a/common-develocity-maven-configuration/.mvn/gradle-enterprise.xml b/common-develocity-maven-configuration/.mvn/develocity.xml
similarity index 75%
rename from common-develocity-maven-configuration/.mvn/gradle-enterprise.xml
rename to common-develocity-maven-configuration/.mvn/develocity.xml
index 995b19bdd..c5cf36fc8 100644
--- a/common-develocity-maven-configuration/.mvn/gradle-enterprise.xml
+++ b/common-develocity-maven-configuration/.mvn/develocity.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 
-<!-- Common gradle-enterprise.xml configuration for Maven shared between CI agents and developers building locally.
+<!-- Common develocity.xml configuration for Maven shared between CI agents and developers building locally.
 
      The build cache credentials required for CI builds to write to the remote build cache are read from environment variables.
      Possibly, the credentials are configured in Jenkins via Credentials plugin (https://plugins.jenkins.io/credentials/) and
@@ -15,17 +15,15 @@
 
            to the specifics of your CI server settings. -->
 
-<gradleEnterprise
-    xmlns="https://www.gradle.com/gradle-enterprise-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="https://www.gradle.com/gradle-enterprise-maven https://www.gradle.com/schema/gradle-enterprise-maven.xsd">
+<develocity
+    xmlns="https://www.gradle.com/develocity-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="https://www.gradle.com/develocity-maven https://www.gradle.com/schema/develocity-maven.xsd">
   <server>
     <url>https://develocity-samples.gradle.com</url> <!-- adjust to your Develocity server -->
     <allowUntrusted>false</allowUntrusted> <!-- ensure a trusted certificate is configured -->
   </server>
   <buildScan>
-    <captureGoalInputFiles>true</captureGoalInputFiles>
     <backgroundBuildScanUpload>#{isFalse(env['CI'])}</backgroundBuildScanUpload> <!-- adjust to your CI provider -->
-    <publish>ALWAYS</publish>
   </buildScan>
   <buildCache>
     <local>
@@ -36,4 +34,4 @@
       <storeEnabled>#{isTrue(env['CI'])}</storeEnabled> <!-- adjust to your CI provider -->
     </remote>
   </buildCache>
-</gradleEnterprise>
+</develocity>
diff --git a/common-develocity-maven-configuration/.mvn/extensions.xml b/common-develocity-maven-configuration/.mvn/extensions.xml
index 94a12e19e..018f7cd53 100644
--- a/common-develocity-maven-configuration/.mvn/extensions.xml
+++ b/common-develocity-maven-configuration/.mvn/extensions.xml
@@ -2,12 +2,12 @@
 <extensions>
     <extension>
         <groupId>com.gradle</groupId>
-        <artifactId>gradle-enterprise-maven-extension</artifactId>
-        <version>1.20.1</version>
+        <artifactId>develocity-maven-extension</artifactId>
+        <version>1.21</version>
     </extension>
     <extension>
         <groupId>com.gradle</groupId>
         <artifactId>common-custom-user-data-maven-extension</artifactId>
-        <version>1.13</version>
+        <version>2.0</version>
     </extension>
 </extensions>
diff --git a/convention-develocity-gradle-plugin/plugins/gradle-2-through-4/settings.gradle b/convention-develocity-gradle-plugin/plugins/gradle-2-through-4/settings.gradle
index f4c6a68a7..c546e80f4 100644
--- a/convention-develocity-gradle-plugin/plugins/gradle-2-through-4/settings.gradle
+++ b/convention-develocity-gradle-plugin/plugins/gradle-2-through-4/settings.gradle
@@ -1,6 +1,6 @@
 plugins {
-    id 'com.gradle.develocity' version '3.17'
-    id 'com.gradle.common-custom-user-data-gradle-plugin' version '2'
+    id 'com.gradle.enterprise' version '3.17'
+    id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.0'
     id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
 }
 
diff --git a/convention-develocity-gradle-plugin/plugins/gradle-5-or-newer/build.gradle b/convention-develocity-gradle-plugin/plugins/gradle-5-or-newer/build.gradle
index a2819b6a1..fcb149b8a 100644
--- a/convention-develocity-gradle-plugin/plugins/gradle-5-or-newer/build.gradle
+++ b/convention-develocity-gradle-plugin/plugins/gradle-5-or-newer/build.gradle
@@ -13,7 +13,7 @@ repositories {
 
 dependencies {
     implementation 'com.gradle:gradle-enterprise-gradle-plugin:3.17'
-    implementation 'com.gradle:common-custom-user-data-gradle-plugin:2'
+    implementation 'com.gradle:common-custom-user-data-gradle-plugin:2.0'
 }
 
 java {
diff --git a/custom-maven-distribution/create-custom-maven-distribution.sh b/custom-maven-distribution/create-custom-maven-distribution.sh
index 8075ae2eb..10e520b5d 100755
--- a/custom-maven-distribution/create-custom-maven-distribution.sh
+++ b/custom-maven-distribution/create-custom-maven-distribution.sh
@@ -5,7 +5,7 @@
 #
 #  - Develocity Maven extension
 #  - Common Custom User Data Maven extension that captures additional build metadata
-#  - gradle-enterprise.xml with typical configuration for CI and developers building locally
+#  - develocity.xml with typical configuration for CI and developers building locally
 #
 # Ideally, the custom Maven distribution is then
 #
@@ -32,13 +32,13 @@ maven_conf=${maven_dir}/conf
 custom_maven_version=1.0.0
 custom_maven_zip=${maven_dir}-sample-${custom_maven_version}-bin.zip
 
-develocity_ext_version=1.20
-develocity_ext_jar=gradle-enterprise-maven-extension-${develocity_ext_version}.jar
+develocity_ext_version=1.21
+develocity_ext_jar=develocity-maven-extension-${develocity_ext_version}.jar
 
-develocity_sample_ext_version=1.13
+develocity_sample_ext_version=2.0
 develocity_sample_ext_jar=common-custom-user-data-maven-extension-${develocity_sample_ext_version}.jar
 
-develocity_sample_ext_xml=gradle-enterprise.xml
+develocity_sample_ext_xml=develocity.xml
 
 server_url=
 
@@ -71,7 +71,7 @@ unzip -q $tmp_dir/$maven_zip -d $out_dir
 
 if [ ! -f "$tmp_dir/$develocity_ext_jar" ]; then
   echo -e "${yellow}Downloading Develocity Maven extension $develocity_ext_version${nc}"
-  develocity_ext_download_url=https://repo1.maven.org/maven2/com/gradle/gradle-enterprise-maven-extension/${develocity_ext_version}/${develocity_ext_jar}
+  develocity_ext_download_url=https://repo1.maven.org/maven2/com/gradle/develocity-maven-extension/${develocity_ext_version}/${develocity_ext_jar}
   wget $develocity_ext_download_url  -P $tmp_dir
 fi
 
@@ -89,21 +89,21 @@ fi
 echo -e "${yellow}Copying common custom user data capturing Maven extension into Maven distribution${nc}"
 cp $tmp_dir/$develocity_sample_ext_jar $out_dir/$maven_lib_ext
 
-### Downloading and embedding common gradle-enterprise.xml configuration for CI builds and developers building locally
+### Downloading and embedding common develocity.xml configuration for CI builds and developers building locally
 
 if [ ! -f "$tmp_dir/$develocity_sample_ext_xml" ]; then
-  echo -e "${yellow}Downloading common gradle-enterprise.xml configuration for CI builds and developers building locally${nc}"
-  develocity_sample_ext_xml_download_url=https://raw.githubusercontent.com/gradle/gradle-enterprise-build-config-samples/master/common-develocity-maven-configuration/.mvn/${develocity_sample_ext_xml}
+  echo -e "${yellow}Downloading common develocity.xml configuration for CI builds and developers building locally${nc}"
+  develocity_sample_ext_xml_download_url=https://raw.githubusercontent.com/gradle/develocity-build-config-samples/master/common-develocity-maven-configuration/.mvn/${develocity_sample_ext_xml}
   wget $develocity_sample_ext_xml_download_url  -P $tmp_dir
 fi
 
-echo -e "${yellow}Copying common gradle-enterprise.xml for developers building locally into Maven distribution${nc}"
+echo -e "${yellow}Copying common develocity.xml for developers building locally into Maven distribution${nc}"
 cp $tmp_dir/$develocity_sample_ext_xml $out_dir/$maven_conf
 
-### If present, replace the default urls in the gradle-enterprise.xml file with the url passed on the command line
+### If present, replace the default urls in the develocity.xml file with the url passed on the command line
 
 if [ -n "$server_url" ]; then
-  echo -e "${yellow}Replacing the urls in gradle-enterprise.xml with ${server_url}${nc}"
+  echo -e "${yellow}Replacing the urls in develocity.xml with ${server_url}${nc}"
   sed -i '' -e 's+https://develocity-samples.gradle.com+'"$server_url"'+g' $out_dir/$maven_conf/$develocity_sample_ext_xml
 fi
 
diff --git a/rollout-maven-extension/.mvn/gradle-enterprise.xml b/rollout-maven-extension/.mvn/develocity.xml
similarity index 64%
rename from rollout-maven-extension/.mvn/gradle-enterprise.xml
rename to rollout-maven-extension/.mvn/develocity.xml
index 0a90d7937..961127050 100644
--- a/rollout-maven-extension/.mvn/gradle-enterprise.xml
+++ b/rollout-maven-extension/.mvn/develocity.xml
@@ -3,17 +3,16 @@
 <!-- The content of this configuration file needs to be adjusted to the specific needs of 
      the entity rolling out Develocity to multiple Maven projects. 
     
-     See https://github.com/gradle/develocity-build-config-samples/blob/master/common-develocity-maven-configuration/.mvn/gradle-enterprise.xml
+     See https://github.com/gradle/develocity-build-config-samples/blob/master/common-develocity-maven-configuration/.mvn/develocity.xml
      for some notes on how to adjust the below template configuration. -->
 
-<gradleEnterprise
-    xmlns="https://www.gradle.com/gradle-enterprise-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="https://www.gradle.com/gradle-enterprise-maven https://www.gradle.com/schema/gradle-enterprise-maven.xsd">
+<develocity
+    xmlns="https://www.gradle.com/develocity-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="https://www.gradle.com/develocity-maven https://www.gradle.com/schema/develocity-maven.xsd">
   <server>
     <url>https://develocity-samples.gradle.com</url>
   </server>
   <buildScan>
-    <captureGoalInputFiles>true</captureGoalInputFiles>
     <backgroundBuildScanUpload>#{isFalse(env['CI'])}</backgroundBuildScanUpload>
   </buildScan>
   <buildCache>
@@ -25,4 +24,4 @@
       <storeEnabled>#{isTrue(env['CI'])}</storeEnabled>
     </remote>
   </buildCache>
-</gradleEnterprise>
+</develocity>
diff --git a/rollout-maven-extension/.mvn/extensions.xml b/rollout-maven-extension/.mvn/extensions.xml
index f02c9b5ab..6fa6f167f 100644
--- a/rollout-maven-extension/.mvn/extensions.xml
+++ b/rollout-maven-extension/.mvn/extensions.xml
@@ -6,12 +6,12 @@
 <extensions>
     <extension>
         <groupId>com.gradle</groupId>
-        <artifactId>gradle-enterprise-maven-extension</artifactId>
-        <version>1.20</version>
+        <artifactId>develocity-maven-extension</artifactId>
+        <version>1.21</version>
     </extension>
     <extension>
         <groupId>com.gradle</groupId>
         <artifactId>common-custom-user-data-maven-extension</artifactId>
-        <version>1.13</version>
+        <version>2.0</version>
     </extension>
 </extensions>
diff --git a/rollout-maven-extension/README.md b/rollout-maven-extension/README.md
index 4fda2188f..f1266f6f0 100644
--- a/rollout-maven-extension/README.md
+++ b/rollout-maven-extension/README.md
@@ -8,10 +8,10 @@ The Develocity Maven Extension rollout script provides a means to automate the a
 
 1. Update the `repositories.txt` file with the list of Git repositories you want to apply the extension on.
    Make sure each line contains a single Git repository URL.
-1. Update the Maven `.mvn/extensions.xml` and the Develocity `.mvn/gradle-enterprise.xml` files with your desired Develocity configuration.
+1. Update the Maven `.mvn/extensions.xml` and the Develocity `.mvn/develocity.xml` files with your desired Develocity configuration.
 1. Run the `./rollout.sh` bash script to execute the Develocity configuration rollout. The script supports the following command line arguments:
    * `-u`: Only update those Git repositories that already contain the `.mvn` folder where the configuration files are stored.
-   * `-f`: Force-override any pre-existing `extensions.xml` and `gradle-enterprise.xml` configuration files in the `.mvn` folder.
+   * `-f`: Force-override any pre-existing `extensions.xml` and `develocity.xml` configuration files in the `.mvn` folder.
    * `-p`: Push the applied changes to the listed Git repositories. Omit the `-p` flag to do a dry run.
 
 ### How it works
@@ -22,7 +22,7 @@ The script creates a temporary folder and clones the listed Git repositories to
 If the `-u` flag is specified, the script only processes those repositories that already contain a `.mvn` folder.
 If the `-u` flag is not specified, the script will process all repositories and create the `.mvn` folder for those repositories that do not already contain it.
 
-For each processed repository, if the `-f` flag is specified, any pre-existing `extensions.xml` and `gradle-enterprise.xml` configuration files in the `.mvn` folder are overridden.
+For each processed repository, if the `-f` flag is specified, any pre-existing `extensions.xml` and `develocity.xml` configuration files in the `.mvn` folder are overridden.
 If the `-f` flag is not specified, any pre-existing configuration files are not modified. The modifications are committed to the cloned repository.
 
 For each repository, if the `-p` flag is specified, the committed changes are pushed to the remote Git repository, and the temporary folder is deleted once all repositories have been processed.
diff --git a/rollout-maven-extension/rollout.sh b/rollout-maven-extension/rollout.sh
index 96894056b..d9c9e8206 100755
--- a/rollout-maven-extension/rollout.sh
+++ b/rollout-maven-extension/rollout.sh
@@ -73,16 +73,16 @@ function process_repository() {
     cp -na "$basedir"/.mvn/. .mvn
   fi
 
-  # update .gitignore file to ignore the .mvn/.gradle-enterprise folder
+  # update .gitignore file to ignore the .mvn/.develocity folder
   if git checkout -- .gitignore >& /dev/null
   then
     # .gitignore file already exists
-    if ! grep -Fxq ".mvn/.gradle-enterprise/" .gitignore ; then
-      echo ".mvn/.gradle-enterprise/" >> .gitignore
+    if ! grep -Fxq ".mvn/.develocity/" .gitignore ; then
+      echo ".mvn/.develocity/" >> .gitignore
     fi
   else
     # .gitignore file does not already exist
-    echo ".mvn/.gradle-enterprise/" > .gitignore
+    echo ".mvn/.develocity/" > .gitignore
   fi
 
   # add changes to staging and commit