diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index dd9a0da4..7100c787 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,19 +1,21 @@
-# Contributing to Eclipse Jakarta Bean Validation
+# Contributing to Eclipse Jakarta Validation
 
 Thanks for your interest in this project.
 
 ## Project description
 
-Bean Validation defines a metadata model and API for JavaBean and method validation.
+Validation defines a metadata model and API for JavaBean and method validation.
 
 * https://beanvalidation.org/
 * https://projects.eclipse.org/projects/ee4j.bean-validation
 
+   See https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/3497 for progress of rename.
+
 ## Developer resources
 
-Contributions from the community are essential in keeping Jakarta Bean Validation strong and successful.
+Contributions from the community are essential in keeping Jakarta Validation strong and successful.
 
-Please see the following pages to learn more about contributing to the Jakarta Bean Validation spec, its API, TCK and website:
+Please see the following pages to learn more about contributing to the Jakarta Validation spec, its API, TCK and website:
 
 * [General contribution guide](https://beanvalidation.org/contribute/)
 * [Contributing to the specification](https://beanvalidation.org/contribute/specification/)
@@ -25,9 +27,9 @@ e.g. by sending a mail to the [bean-validation-dev](https://accounts.eclipse.org
 
 The project maintains the following source code repositories:
 
- * [The specification repository](https://github.com/eclipse-ee4j/beanvalidation-spec)
- * [The API repository](https://github.com/eclipse-ee4j/beanvalidation-api)
- * [The TCK repository](https://github.com/eclipse-ee4j/beanvalidation-tck)
+* [The specification repository](https://github.com/jakartaee/validation-spec)
+* [The API repository](https://github.com/jakartaee/validation)
+* [The TCK repository](https://github.com/jakartaee/validation-tck)
 
 ## Eclipse Contributor Agreement
 
diff --git a/NOTICE.md b/NOTICE.md
index fede039d..8f958f59 100644
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -1,13 +1,15 @@
-# Notices for Eclipse Jakarta Bean Validation
+# Notices for Eclipse Jakarta Validation
 
-This content is produced and maintained by the Eclipse Jakarta Bean Validation
+This content is produced and maintained by the Eclipse Jakarta Validation
 project.
 
 * Project home: https://projects.eclipse.org/projects/ee4j.bean-validation
 
+   See https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/3497 for progress of rename.
+
 ## Trademarks
 
- Jakarta Bean Validation is a trademark of the Eclipse Foundation.
+ Jakarta Validation is a trademark of the Eclipse Foundation.
 
 ## Copyright
 
@@ -27,9 +29,9 @@ SPDX-License-Identifier: Apache-2.0
 
 The project maintains the following source code repositories:
 
- * [The specification repository](https://github.com/eclipse-ee4j/beanvalidation-spec)
- * [The API repository](https://github.com/eclipse-ee4j/beanvalidation-api)
- * [The TCK repository](https://github.com/eclipse-ee4j/beanvalidation-tck)
+* [The specification repository](https://github.com/jakartaee/validation-spec)
+* [The API repository](https://github.com/jakartaee/validation)
+* [The TCK repository](https://github.com/jakartaee/validation-tck)
 
 ## Third-party Content
 
diff --git a/README.md b/README.md
index a35a0f68..1fa4026d 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-# Jakarta Bean Validation API
+# Jakarta Validation API
 
-This repository contains the Java Jakarta Bean Validation 3.0 API.
+This repository contains the Java Jakarta Validation 3.0 API.
 
-Jakarta Bean Validation defines a metadata model and API for JavaBean and method validation.
+Jakarta Validation defines a metadata model and API for JavaBean and method validation.
 
 You can learn more about it here:
 * Official website: <https://beanvalidation.org/>
@@ -15,19 +15,19 @@ JDK 8.
 
 ## Licensing
 
-The Jakarta Bean Validation API is provided and distributed under the Apache Software License 2.0.
-Refer to [license.txt](https://github.com/eclipse-ee4j/beanvalidation-api/blob/master/license.txt) for more information.
+The Jakarta Validation API is provided and distributed under the Apache Software License 2.0.
+Refer to [license.txt](https://github.com/jakartaee/validation/blob/master/license.txt) for more information.
 
 ## Build from Source
 
-You can build the Jakarta Bean Validation API from source by cloning the git repository https://github.com/eclipse-ee4j/beanvalidation-api.git.
+You can build the Jakarta Validation API from source by cloning the git repository https://github.com/jakartaee/validation
 You will also need a JDK 8 and Maven 3 (>= 3.0.3). With these prerequisites in place you can compile the source via:
 
     mvn clean install
 
 ## Contribute
 
-Want to join us? You can find all the relevant information about contributing to Jakarta Bean Validation on the [website](https://beanvalidation.org/contribute/).
+Want to join us? You can find all the relevant information about contributing to Jakarta Validation on the [website](https://beanvalidation.org/contribute/).
 
 ## Continuous Integration
 
diff --git a/license/java-header-style.xml b/license/java-header-style.xml
index 632288da..555c41a0 100644
--- a/license/java-header-style.xml
+++ b/license/java-header-style.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!--
-  ~ Jakarta Bean Validation API
+  ~ Jakarta Validation API
   ~
   ~ License: Apache License, Version 2.0
   ~ See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/license/license.header b/license/license.header
index af22bca6..39feb566 100644
--- a/license/license.header
+++ b/license/license.header
@@ -1,4 +1,4 @@
-Jakarta Bean Validation API
+Jakarta Validation API
 
 License: Apache License, Version 2.0
 See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/license/xml-header-style.xml b/license/xml-header-style.xml
index 7fb84fef..03a6e28a 100644
--- a/license/xml-header-style.xml
+++ b/license/xml-header-style.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!--
-  ~ Jakarta Bean Validation API
+  ~ Jakarta Validation API
   ~
   ~ License: Apache License, Version 2.0
   ~ See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/pom.xml b/pom.xml
index b5e1d30d..9d5653ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Jakarta Bean Validation API
+  ~ Jakarta Validation API
   ~
   ~ License: Apache License, Version 2.0
   ~ See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
@@ -17,11 +17,11 @@
     <artifactId>jakarta.validation-api</artifactId>
     <version>3.0.3-SNAPSHOT</version>
     <packaging>jar</packaging>
-    <name>Jakarta Bean Validation API</name>
+    <name>Jakarta Validation API</name>
     <url>https://beanvalidation.org</url>
 
     <description>
-        Jakarta Bean Validation API
+        Jakarta Validation API
     </description>
 
     <developers>
@@ -77,9 +77,9 @@
     </licenses>
 
     <scm>
-        <connection>scm:git:git://github.com/eclipse-ee4j/beanvalidation-api.git</connection>
-        <developerConnection>scm:git:git@github.com:eclipse-ee4j/beanvalidation-api.git</developerConnection>
-        <url>https://github.com/eclipse-ee4j/beanvalidation-api</url>
+        <connection>scm:git:git://github.com/jakartaee/validation.git</connection>
+        <developerConnection>scm:git:git@github.com:jakartaee/validation.git</developerConnection>
+        <url>https://github.com/jakartaee/validation</url>
         <tag>HEAD</tag>
     </scm>
 
@@ -202,9 +202,9 @@
                 <configuration>
                     <source>8</source>
                     <detectJavaApiLink>false</detectJavaApiLink>
-                    <packagesheader>Jakarta Bean Validation API Packages</packagesheader>
-                    <doctitle>Jakarta Bean Validation API ${project.version}</doctitle>
-                    <windowtitle>Jakarta Bean Validation API ${project.version}</windowtitle>
+                    <packagesheader>Jakarta Validation API Packages</packagesheader>
+                    <doctitle>Jakarta Validation API ${project.version}</doctitle>
+                    <windowtitle>Jakarta Validation API ${project.version}</windowtitle>
                     <bottom><![CDATA[
 Comments to: <a href="mailto:bean-validation-dev@eclipse.org">bean-validation-dev@eclipse.org</a>.<br>
 Copyright &#169; 2019,2020 Eclipse Foundation.<br>
diff --git a/src/main/java/jakarta/validation/BootstrapConfiguration.java b/src/main/java/jakarta/validation/BootstrapConfiguration.java
index fdf44b0f..da16bb4c 100644
--- a/src/main/java/jakarta/validation/BootstrapConfiguration.java
+++ b/src/main/java/jakarta/validation/BootstrapConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/ClockProvider.java b/src/main/java/jakarta/validation/ClockProvider.java
index e9fcf1a5..9fd25b3d 100644
--- a/src/main/java/jakarta/validation/ClockProvider.java
+++ b/src/main/java/jakarta/validation/ClockProvider.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/Configuration.java b/src/main/java/jakarta/validation/Configuration.java
index ec4b4457..1a8ef478 100755
--- a/src/main/java/jakarta/validation/Configuration.java
+++ b/src/main/java/jakarta/validation/Configuration.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
@@ -14,7 +14,7 @@
 
 /**
  * Receives configuration information, selects the appropriate
- * Jakarta Bean Validation provider and builds the appropriate {@link ValidatorFactory}.
+ * Jakarta Validation provider and builds the appropriate {@link ValidatorFactory}.
  * <p>
  * Usage:
  * <pre>
@@ -146,18 +146,18 @@ public interface Configuration<T extends Configuration<T>> {
 	T addValueExtractor(ValueExtractor<?> extractor);
 
 	/**
-	 * Add a stream describing constraint mapping in the Jakarta Bean Validation XML
+	 * Add a stream describing constraint mapping in the Jakarta Validation XML
 	 * format.
 	 * <p>
 	 * The stream should be closed by the client API after the
-	 * {@link ValidatorFactory} has been built. The Jakarta Bean Validation provider
+	 * {@link ValidatorFactory} has been built. The Jakarta Validation provider
 	 * must not close the stream.
 	 *
 	 * @param stream
 	 *        XML mapping stream; the given stream should support the
 	 *        mark/reset contract (see {@link InputStream#markSupported()});
 	 *        if it doesn't, it will be wrapped into a stream supporting the
-	 *        mark/reset contract by the Jakarta Bean Validation provider
+	 *        mark/reset contract by the Jakarta Validation provider
 	 *
 	 * @return {@code this} following the chaining method pattern
 	 * @throws IllegalArgumentException if {@code stream} is null
diff --git a/src/main/java/jakarta/validation/Constraint.java b/src/main/java/jakarta/validation/Constraint.java
index 2a103ba3..d5e7fe56 100644
--- a/src/main/java/jakarta/validation/Constraint.java
+++ b/src/main/java/jakarta/validation/Constraint.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
@@ -17,7 +17,7 @@
 import jakarta.validation.constraintvalidation.ValidationTarget;
 
 /**
- * Marks an annotation as being a Jakarta Bean Validation constraint.
+ * Marks an annotation as being a Jakarta Validation constraint.
  * <p>
  * A given constraint annotation must be annotated by a {@code @Constraint}
  * annotation which refers to its list of constraint validation implementations.
diff --git a/src/main/java/jakarta/validation/ConstraintDeclarationException.java b/src/main/java/jakarta/validation/ConstraintDeclarationException.java
index 176de219..38a55963 100644
--- a/src/main/java/jakarta/validation/ConstraintDeclarationException.java
+++ b/src/main/java/jakarta/validation/ConstraintDeclarationException.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/ConstraintDefinitionException.java b/src/main/java/jakarta/validation/ConstraintDefinitionException.java
index 54ec890c..b68a42ee 100644
--- a/src/main/java/jakarta/validation/ConstraintDefinitionException.java
+++ b/src/main/java/jakarta/validation/ConstraintDefinitionException.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/ConstraintTarget.java b/src/main/java/jakarta/validation/ConstraintTarget.java
index cbb759b5..2db89114 100644
--- a/src/main/java/jakarta/validation/ConstraintTarget.java
+++ b/src/main/java/jakarta/validation/ConstraintTarget.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/ConstraintValidator.java b/src/main/java/jakarta/validation/ConstraintValidator.java
index 970c14d2..468e54ff 100644
--- a/src/main/java/jakarta/validation/ConstraintValidator.java
+++ b/src/main/java/jakarta/validation/ConstraintValidator.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/ConstraintValidatorContext.java b/src/main/java/jakarta/validation/ConstraintValidatorContext.java
index f0672816..d12eeb8c 100644
--- a/src/main/java/jakarta/validation/ConstraintValidatorContext.java
+++ b/src/main/java/jakarta/validation/ConstraintValidatorContext.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
@@ -173,7 +173,7 @@ public interface ConstraintValidatorContext {
 
 	/**
 	 * Returns an instance of the specified type allowing access to
-	 * provider-specific APIs. If the Jakarta Bean Validation provider
+	 * provider-specific APIs. If the Jakarta Validation provider
 	 * implementation does not support the specified class,
 	 * {@link ValidationException} is thrown.
 	 *
diff --git a/src/main/java/jakarta/validation/ConstraintValidatorFactory.java b/src/main/java/jakarta/validation/ConstraintValidatorFactory.java
index 5f3d1a18..d9a729df 100644
--- a/src/main/java/jakarta/validation/ConstraintValidatorFactory.java
+++ b/src/main/java/jakarta/validation/ConstraintValidatorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
@@ -27,7 +27,7 @@ public interface ConstraintValidatorFactory {
 
 	/**
 	 * Signals {@code ConstraintValidatorFactory} that the instance is no longer
-	 * being used by the Jakarta Bean Validation provider.
+	 * being used by the Jakarta Validation provider.
 	 *
 	 * @param instance validator being released
 	 *
diff --git a/src/main/java/jakarta/validation/ConstraintViolation.java b/src/main/java/jakarta/validation/ConstraintViolation.java
index e3bb96b0..f0e46458 100644
--- a/src/main/java/jakarta/validation/ConstraintViolation.java
+++ b/src/main/java/jakarta/validation/ConstraintViolation.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
@@ -130,7 +130,7 @@ public interface ConstraintViolation<T> {
 
 	/**
 	 * Returns an instance of the specified type allowing access to
-	 * provider-specific APIs. If the Jakarta Bean Validation provider
+	 * provider-specific APIs. If the Jakarta Validation provider
 	 * implementation does not support the specified class,
 	 * {@link ValidationException} is thrown.
 	 *
diff --git a/src/main/java/jakarta/validation/ConstraintViolationException.java b/src/main/java/jakarta/validation/ConstraintViolationException.java
index c65a1353..dc118e32 100644
--- a/src/main/java/jakarta/validation/ConstraintViolationException.java
+++ b/src/main/java/jakarta/validation/ConstraintViolationException.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/ElementKind.java b/src/main/java/jakarta/validation/ElementKind.java
index 7de92b0d..004c60fb 100644
--- a/src/main/java/jakarta/validation/ElementKind.java
+++ b/src/main/java/jakarta/validation/ElementKind.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
@@ -7,7 +7,7 @@
 package jakarta.validation;
 
 /**
- * Enum of possible kinds of elements encountered in Jakarta Bean Validation.
+ * Enum of possible kinds of elements encountered in Jakarta Validation.
  * <p>
  * Mostly elements that can be constrained and described in the metadata
  * but also elements that can be part of a {@link Path} and represented
diff --git a/src/main/java/jakarta/validation/GroupDefinitionException.java b/src/main/java/jakarta/validation/GroupDefinitionException.java
index f6a2bf56..79f4aaa1 100644
--- a/src/main/java/jakarta/validation/GroupDefinitionException.java
+++ b/src/main/java/jakarta/validation/GroupDefinitionException.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/GroupSequence.java b/src/main/java/jakarta/validation/GroupSequence.java
index 92036ee7..24555e78 100644
--- a/src/main/java/jakarta/validation/GroupSequence.java
+++ b/src/main/java/jakarta/validation/GroupSequence.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/MessageInterpolator.java b/src/main/java/jakarta/validation/MessageInterpolator.java
index a3e5b70c..20cb4055 100644
--- a/src/main/java/jakarta/validation/MessageInterpolator.java
+++ b/src/main/java/jakarta/validation/MessageInterpolator.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
@@ -63,7 +63,7 @@ interface Context {
 
 		/**
 		 * Returns an instance of the specified type allowing access to
-		 * provider-specific APIs. If the Jakarta Bean Validation provider
+		 * provider-specific APIs. If the Jakarta Validation provider
 		 * implementation does not support the specified class,
 		 * {@link ValidationException} is thrown.
 		 *
diff --git a/src/main/java/jakarta/validation/NoProviderFoundException.java b/src/main/java/jakarta/validation/NoProviderFoundException.java
index 1b129974..df400ed3 100644
--- a/src/main/java/jakarta/validation/NoProviderFoundException.java
+++ b/src/main/java/jakarta/validation/NoProviderFoundException.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
@@ -7,7 +7,7 @@
 package jakarta.validation;
 
 /**
- * Exception raised if no Jakarta Bean Validation provider could be found.
+ * Exception raised if no Jakarta Validation provider could be found.
  *
  * @author Gunnar Morling
  *
diff --git a/src/main/java/jakarta/validation/OverridesAttribute.java b/src/main/java/jakarta/validation/OverridesAttribute.java
index 07a52d42..d9ba955f 100644
--- a/src/main/java/jakarta/validation/OverridesAttribute.java
+++ b/src/main/java/jakarta/validation/OverridesAttribute.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/ParameterNameProvider.java b/src/main/java/jakarta/validation/ParameterNameProvider.java
index 4dc605b1..a00f3d19 100644
--- a/src/main/java/jakarta/validation/ParameterNameProvider.java
+++ b/src/main/java/jakarta/validation/ParameterNameProvider.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
@@ -13,7 +13,7 @@
 /**
  * Provides names for method and constructor parameters.
  * <p>
- * Used by the Jakarta Bean Validation runtime when creating constraint violation
+ * Used by the Jakarta Validation runtime when creating constraint violation
  * objects for violated method constraints.
  * <p>
  * Implementations must be thread-safe.
diff --git a/src/main/java/jakarta/validation/Path.java b/src/main/java/jakarta/validation/Path.java
index 1e9df198..aa4567d7 100644
--- a/src/main/java/jakarta/validation/Path.java
+++ b/src/main/java/jakarta/validation/Path.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/Payload.java b/src/main/java/jakarta/validation/Payload.java
index db4f84ac..3d24e327 100644
--- a/src/main/java/jakarta/validation/Payload.java
+++ b/src/main/java/jakarta/validation/Payload.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/ReportAsSingleViolation.java b/src/main/java/jakarta/validation/ReportAsSingleViolation.java
index cb0f59ca..403ddd9f 100644
--- a/src/main/java/jakarta/validation/ReportAsSingleViolation.java
+++ b/src/main/java/jakarta/validation/ReportAsSingleViolation.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/TraversableResolver.java b/src/main/java/jakarta/validation/TraversableResolver.java
index a1f10441..b8252268 100644
--- a/src/main/java/jakarta/validation/TraversableResolver.java
+++ b/src/main/java/jakarta/validation/TraversableResolver.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
@@ -11,7 +11,7 @@
 import java.lang.annotation.ElementType;
 
 /**
- * Contract determining if a property can be accessed by the Jakarta Bean Validation provider.
+ * Contract determining if a property can be accessed by the Jakarta Validation provider.
  * This contract is called for each property that is being either validated or cascaded.
  * <p>
  * A traversable resolver implementation must be thread-safe.
@@ -20,7 +20,7 @@
  */
 public interface TraversableResolver {
 	/**
-	 * Determines if the Jakarta Bean Validation provider is allowed to reach the property state.
+	 * Determines if the Jakarta Validation provider is allowed to reach the property state.
 	 *
 	 * @param traversableObject object hosting {@code traversableProperty}
 	 *        or {@code null} if {@code validateValue} is called
@@ -29,9 +29,9 @@ public interface TraversableResolver {
 	 *        or hosting the method or constructor validated
 	 * @param pathToTraversableObject path from the root object to
 	 *        {@code traversableObject}
-	 *        (using the path specification defined by Bean Validation)
+	 *        (using the path specification defined by Validation)
 	 * @param elementType either {@code FIELD} or {@code METHOD}
-	 * @return {@code true} if the Jakarta Bean Validation provider is allowed to
+	 * @return {@code true} if the Jakarta Validation provider is allowed to
 	 *         reach the property state, {@code false} otherwise
 	 */
 	boolean isReachable(Object traversableObject,
@@ -41,7 +41,7 @@ boolean isReachable(Object traversableObject,
 						ElementType elementType);
 
 	/**
-	 * Determines if the Jakarta Bean Validation provider is allowed to cascade validation on
+	 * Determines if the Jakarta Validation provider is allowed to cascade validation on
 	 * the bean instance returned by the property value
 	 * marked as {@code @Valid}.
 	 * <p>
@@ -57,9 +57,9 @@ boolean isReachable(Object traversableObject,
 	 *        or hosting the method or constructor validated
 	 * @param pathToTraversableObject path from the root object to
 	 *        {@code traversableObject}
-	 *        (using the path specification defined by Bean Validation)
+	 *        (using the path specification defined by Validation)
 	 * @param elementType either {@code FIELD} or {@code METHOD}
-	 * @return {@code true} if the Jakarta Bean Validation provider is allowed to
+	 * @return {@code true} if the Jakarta Validation provider is allowed to
 	 *         cascade validation, {@code false} otherwise
 	 */
 	boolean isCascadable(Object traversableObject,
diff --git a/src/main/java/jakarta/validation/UnexpectedTypeException.java b/src/main/java/jakarta/validation/UnexpectedTypeException.java
index c8974329..0d2d1157 100644
--- a/src/main/java/jakarta/validation/UnexpectedTypeException.java
+++ b/src/main/java/jakarta/validation/UnexpectedTypeException.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/Valid.java b/src/main/java/jakarta/validation/Valid.java
index 81f8b8bb..a181a090 100644
--- a/src/main/java/jakarta/validation/Valid.java
+++ b/src/main/java/jakarta/validation/Valid.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/Validation.java b/src/main/java/jakarta/validation/Validation.java
index bf3b30b7..637c7a4b 100755
--- a/src/main/java/jakarta/validation/Validation.java
+++ b/src/main/java/jakarta/validation/Validation.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
@@ -22,7 +22,7 @@
 import jakarta.validation.spi.ValidationProvider;
 
 /**
- * This class is the entry point for Jakarta Bean Validation.
+ * This class is the entry point for Jakarta Validation.
  * <p>
  * There are three ways to bootstrap it:
  * <ul>
@@ -85,7 +85,7 @@ public class Validation {
 
 	/**
 	 * Builds and returns a {@link ValidatorFactory} instance based on the
-	 * default Jakarta Bean Validation provider and following the XML configuration.
+	 * default Jakarta Validation provider and following the XML configuration.
 	 * <p>
 	 * The provider list is resolved using the default validation provider resolver
 	 * logic.
@@ -95,8 +95,8 @@ public class Validation {
 	 *
 	 * @return {@code ValidatorFactory} instance
 	 *
-	 * @throws NoProviderFoundException if no Jakarta Bean Validation provider was found
-	 * @throws ValidationException if a Jakarta Bean Validation provider was found but the
+	 * @throws NoProviderFoundException if no Jakarta Validation provider was found
+	 * @throws ValidationException if a Jakarta Validation provider was found but the
 	 * {@code ValidatorFactory} cannot be built
 	 */
 	public static ValidatorFactory buildDefaultValidatorFactory() {
@@ -138,7 +138,7 @@ public static GenericBootstrap byDefaultProvider() {
 	 * </pre>,
 	 * where {@code ACMEConfiguration} is the
 	 * {@code Configuration} sub interface uniquely identifying the
-	 * ACME Jakarta Bean Validation provider. and {@code ACMEProvider} is the
+	 * ACME Jakarta Validation provider. and {@code ACMEProvider} is the
 	 * {@link ValidationProvider} implementation of the ACME provider.
 	 *
 	 * @param providerType the {@code ValidationProvider} implementation type
@@ -155,7 +155,7 @@ ProviderSpecificBootstrap<T> byProvider(Class<U> providerType) {
 	}
 
 	/**
-	 * Not a public API; it can be used reflectively by code that integrates with Jakarta Bean Validation, e.g. application
+	 * Not a public API; it can be used reflectively by code that integrates with Jakarta Validation, e.g. application
 	 * servers, to clear the provider cache maintained by the default provider resolver.
 	 * <p>
 	 * This is a strictly unsupported API, its definition may be changed or removed at any time. Its purpose is to
@@ -286,7 +286,7 @@ public Configuration<?> configure() {
 			}
 
 			if ( validationProviders.isEmpty() ) {
-				String msg = "Unable to create a Configuration, because no Jakarta Bean Validation provider could be found." +
+				String msg = "Unable to create a Configuration, because no Jakarta Validation provider could be found." +
 						" Add a provider like Hibernate Validator (RI) to your classpath.";
 				throw new NoProviderFoundException( msg );
 			}
@@ -305,7 +305,7 @@ public Configuration<?> configure() {
 
 	/**
 	 * Finds {@link ValidationProvider} according to the default {@link ValidationProviderResolver} defined in the
-	 * Jakarta Bean Validation specification. This implementation first uses thread's context classloader to locate providers.
+	 * Jakarta Validation specification. This implementation first uses thread's context classloader to locate providers.
 	 * If no suitable provider is found using the aforementioned class loader, it uses current class loader.
 	 * If it still does not find any suitable provider, it tries to locate the built-in provider using the current
 	 * class loader.
diff --git a/src/main/java/jakarta/validation/ValidationException.java b/src/main/java/jakarta/validation/ValidationException.java
index 98f626ed..7b49c485 100755
--- a/src/main/java/jakarta/validation/ValidationException.java
+++ b/src/main/java/jakarta/validation/ValidationException.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
@@ -7,7 +7,7 @@
 package jakarta.validation;
 
 /**
- * Base exception of all Jakarta Bean Validation "unexpected" problems.
+ * Base exception of all Jakarta Validation "unexpected" problems.
  *
  * @author Emmanuel Bernard
  */
diff --git a/src/main/java/jakarta/validation/ValidationProviderResolver.java b/src/main/java/jakarta/validation/ValidationProviderResolver.java
index ea7202be..e4a9ae5a 100644
--- a/src/main/java/jakarta/validation/ValidationProviderResolver.java
+++ b/src/main/java/jakarta/validation/ValidationProviderResolver.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
@@ -11,9 +11,9 @@
 import jakarta.validation.spi.ValidationProvider;
 
 /**
- * Determines the list of Jakarta Bean Validation providers available in the runtime environment
+ * Determines the list of Jakarta Validation providers available in the runtime environment
  * <p>
- * Jakarta Bean Validation providers are identified by the presence of
+ * Jakarta Validation providers are identified by the presence of
  * {@code META-INF/services/jakarta.validation.spi.ValidationProvider}
  * files following the Service Provider pattern described
  * <a href="http://docs.oracle.com/javase/8/docs/technotes/guides/jar/jar.html#Service_Provider">here</a>.
diff --git a/src/main/java/jakarta/validation/Validator.java b/src/main/java/jakarta/validation/Validator.java
index a886acfd..b3c15688 100644
--- a/src/main/java/jakarta/validation/Validator.java
+++ b/src/main/java/jakarta/validation/Validator.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
@@ -102,7 +102,7 @@ <T> Set<ConstraintViolation<T>> validateValue(Class<T> beanType,
 	 * Returns an instance of the specified type allowing access to
 	 * provider-specific APIs.
 	 * <p>
-	 * If the Jakarta Bean Validation provider implementation does not support
+	 * If the Jakarta Validation provider implementation does not support
 	 * the specified class, {@link ValidationException} is thrown.
 	 *
 	 * @param type the class of the object to be returned
diff --git a/src/main/java/jakarta/validation/ValidatorContext.java b/src/main/java/jakarta/validation/ValidatorContext.java
index 545950c4..3d40e6f1 100644
--- a/src/main/java/jakarta/validation/ValidatorContext.java
+++ b/src/main/java/jakarta/validation/ValidatorContext.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/ValidatorFactory.java b/src/main/java/jakarta/validation/ValidatorFactory.java
index 690092d5..843b99f0 100755
--- a/src/main/java/jakarta/validation/ValidatorFactory.java
+++ b/src/main/java/jakarta/validation/ValidatorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
@@ -89,7 +89,7 @@ public interface ValidatorFactory extends AutoCloseable {
 
 	/**
 	 * Returns an instance of the specified type allowing access to
-	 * provider-specific APIs. If the Jakarta Bean Validation provider
+	 * provider-specific APIs. If the Jakarta Validation provider
 	 * implementation does not support the specified class, a
 	 * {@code ValidationException} is thrown.
 	 *
diff --git a/src/main/java/jakarta/validation/bootstrap/GenericBootstrap.java b/src/main/java/jakarta/validation/bootstrap/GenericBootstrap.java
index 6b34c626..07b9e175 100644
--- a/src/main/java/jakarta/validation/bootstrap/GenericBootstrap.java
+++ b/src/main/java/jakarta/validation/bootstrap/GenericBootstrap.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
@@ -13,7 +13,7 @@
 import jakarta.validation.ValidatorFactory;
 
 /**
- * Defines the state used to bootstrap Jakarta Bean Validation and
+ * Defines the state used to bootstrap Jakarta Validation and
  * creates a provider agnostic {@link Configuration}.
  *
  * @author Emmanuel Bernard
@@ -42,8 +42,8 @@ public interface GenericBootstrap {
 	 * returned by the {@link ValidationProviderResolver} strategy.
 	 *
 	 * @return a {@code Configuration} implementation compliant with the bootstrap state
-	 * @throws NoProviderFoundException if no Jakarta Bean Validation provider was found
-	 * @throws ValidationException if a Jakarta Bean Validation provider was found but the
+	 * @throws NoProviderFoundException if no Jakarta Validation provider was found
+	 * @throws ValidationException if a Jakarta Validation provider was found but the
 	 *         {@code Configuration} object cannot be built; this is generally due to an
 	 *         issue with the {@code ValidationProviderResolver}
 	 */
diff --git a/src/main/java/jakarta/validation/bootstrap/ProviderSpecificBootstrap.java b/src/main/java/jakarta/validation/bootstrap/ProviderSpecificBootstrap.java
index 52465c00..ae3e3c16 100644
--- a/src/main/java/jakarta/validation/bootstrap/ProviderSpecificBootstrap.java
+++ b/src/main/java/jakarta/validation/bootstrap/ProviderSpecificBootstrap.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
@@ -12,7 +12,7 @@
 import jakarta.validation.spi.ValidationProvider;
 
 /**
- * Defines the state used to bootstrap Jakarta Bean Validation and
+ * Defines the state used to bootstrap Jakarta Validation and
  * creates a provider specific {@link Configuration}
  * of type {@code T}.
  * <p>
diff --git a/src/main/java/jakarta/validation/bootstrap/package-info.java b/src/main/java/jakarta/validation/bootstrap/package-info.java
index b708061c..f5f6629c 100644
--- a/src/main/java/jakarta/validation/bootstrap/package-info.java
+++ b/src/main/java/jakarta/validation/bootstrap/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/constraints/AssertFalse.java b/src/main/java/jakarta/validation/constraints/AssertFalse.java
index 3d63bbc0..716f8a17 100644
--- a/src/main/java/jakarta/validation/constraints/AssertFalse.java
+++ b/src/main/java/jakarta/validation/constraints/AssertFalse.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/constraints/AssertTrue.java b/src/main/java/jakarta/validation/constraints/AssertTrue.java
index 258eb72e..c293917e 100644
--- a/src/main/java/jakarta/validation/constraints/AssertTrue.java
+++ b/src/main/java/jakarta/validation/constraints/AssertTrue.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/constraints/DecimalMax.java b/src/main/java/jakarta/validation/constraints/DecimalMax.java
index d6f2bfe6..811a1928 100644
--- a/src/main/java/jakarta/validation/constraints/DecimalMax.java
+++ b/src/main/java/jakarta/validation/constraints/DecimalMax.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/constraints/DecimalMin.java b/src/main/java/jakarta/validation/constraints/DecimalMin.java
index 104ee1ca..6616bc49 100644
--- a/src/main/java/jakarta/validation/constraints/DecimalMin.java
+++ b/src/main/java/jakarta/validation/constraints/DecimalMin.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/constraints/Digits.java b/src/main/java/jakarta/validation/constraints/Digits.java
index e3ba331d..35a00d7f 100644
--- a/src/main/java/jakarta/validation/constraints/Digits.java
+++ b/src/main/java/jakarta/validation/constraints/Digits.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/constraints/Email.java b/src/main/java/jakarta/validation/constraints/Email.java
index 1fa4d248..0ab425e3 100644
--- a/src/main/java/jakarta/validation/constraints/Email.java
+++ b/src/main/java/jakarta/validation/constraints/Email.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
@@ -25,7 +25,7 @@
 
 /**
  * The string has to be a well-formed email address. Exact semantics of what makes up a valid
- * email address are left to Jakarta Bean Validation providers. Accepts {@code CharSequence}.
+ * email address are left to Jakarta Validation providers. Accepts {@code CharSequence}.
  * <p>
  * {@code null} elements are considered valid.
  *
diff --git a/src/main/java/jakarta/validation/constraints/Future.java b/src/main/java/jakarta/validation/constraints/Future.java
index 4c82d73c..5c047717 100644
--- a/src/main/java/jakarta/validation/constraints/Future.java
+++ b/src/main/java/jakarta/validation/constraints/Future.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/constraints/FutureOrPresent.java b/src/main/java/jakarta/validation/constraints/FutureOrPresent.java
index abf81571..907924b3 100644
--- a/src/main/java/jakarta/validation/constraints/FutureOrPresent.java
+++ b/src/main/java/jakarta/validation/constraints/FutureOrPresent.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/constraints/Max.java b/src/main/java/jakarta/validation/constraints/Max.java
index 6dbb9f55..21f8ea9e 100644
--- a/src/main/java/jakarta/validation/constraints/Max.java
+++ b/src/main/java/jakarta/validation/constraints/Max.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/constraints/Min.java b/src/main/java/jakarta/validation/constraints/Min.java
index fb327dee..a7bd7f29 100644
--- a/src/main/java/jakarta/validation/constraints/Min.java
+++ b/src/main/java/jakarta/validation/constraints/Min.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/constraints/Negative.java b/src/main/java/jakarta/validation/constraints/Negative.java
index 54f895b2..43ed7def 100644
--- a/src/main/java/jakarta/validation/constraints/Negative.java
+++ b/src/main/java/jakarta/validation/constraints/Negative.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/constraints/NegativeOrZero.java b/src/main/java/jakarta/validation/constraints/NegativeOrZero.java
index 8b526028..6b7d8871 100644
--- a/src/main/java/jakarta/validation/constraints/NegativeOrZero.java
+++ b/src/main/java/jakarta/validation/constraints/NegativeOrZero.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/constraints/NotBlank.java b/src/main/java/jakarta/validation/constraints/NotBlank.java
index 5566fb94..45de2eec 100644
--- a/src/main/java/jakarta/validation/constraints/NotBlank.java
+++ b/src/main/java/jakarta/validation/constraints/NotBlank.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/constraints/NotEmpty.java b/src/main/java/jakarta/validation/constraints/NotEmpty.java
index f84bf1ad..a88d34d1 100644
--- a/src/main/java/jakarta/validation/constraints/NotEmpty.java
+++ b/src/main/java/jakarta/validation/constraints/NotEmpty.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/constraints/NotNull.java b/src/main/java/jakarta/validation/constraints/NotNull.java
index 2c3ba2ae..948e29a1 100644
--- a/src/main/java/jakarta/validation/constraints/NotNull.java
+++ b/src/main/java/jakarta/validation/constraints/NotNull.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/constraints/Null.java b/src/main/java/jakarta/validation/constraints/Null.java
index 6251aadb..1110df6b 100644
--- a/src/main/java/jakarta/validation/constraints/Null.java
+++ b/src/main/java/jakarta/validation/constraints/Null.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/constraints/Past.java b/src/main/java/jakarta/validation/constraints/Past.java
index d7aa0d7c..050f4f3b 100644
--- a/src/main/java/jakarta/validation/constraints/Past.java
+++ b/src/main/java/jakarta/validation/constraints/Past.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/constraints/PastOrPresent.java b/src/main/java/jakarta/validation/constraints/PastOrPresent.java
index 7ff9cbc8..3d6aca1e 100644
--- a/src/main/java/jakarta/validation/constraints/PastOrPresent.java
+++ b/src/main/java/jakarta/validation/constraints/PastOrPresent.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/constraints/Pattern.java b/src/main/java/jakarta/validation/constraints/Pattern.java
index c037034d..c3682c53 100644
--- a/src/main/java/jakarta/validation/constraints/Pattern.java
+++ b/src/main/java/jakarta/validation/constraints/Pattern.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/constraints/Positive.java b/src/main/java/jakarta/validation/constraints/Positive.java
index a0e9c4c5..8bf91bfa 100644
--- a/src/main/java/jakarta/validation/constraints/Positive.java
+++ b/src/main/java/jakarta/validation/constraints/Positive.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/constraints/PositiveOrZero.java b/src/main/java/jakarta/validation/constraints/PositiveOrZero.java
index a6a10420..0eaedbe9 100644
--- a/src/main/java/jakarta/validation/constraints/PositiveOrZero.java
+++ b/src/main/java/jakarta/validation/constraints/PositiveOrZero.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/constraints/Size.java b/src/main/java/jakarta/validation/constraints/Size.java
index e5b46152..8616f9e4 100644
--- a/src/main/java/jakarta/validation/constraints/Size.java
+++ b/src/main/java/jakarta/validation/constraints/Size.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/constraints/package-info.java b/src/main/java/jakarta/validation/constraints/package-info.java
index 9bddc3d9..77bff3c6 100644
--- a/src/main/java/jakarta/validation/constraints/package-info.java
+++ b/src/main/java/jakarta/validation/constraints/package-info.java
@@ -1,11 +1,11 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
  */
 /**
- * Contains all the Jakarta Bean Validation provided constraints
+ * Contains all the Jakarta Validation provided constraints
  * also called built-in constraints.
  * <p>
  * These constraints do not cover all functional use cases but do represent
diff --git a/src/main/java/jakarta/validation/constraintvalidation/SupportedValidationTarget.java b/src/main/java/jakarta/validation/constraintvalidation/SupportedValidationTarget.java
index cbd972b0..fd99335f 100644
--- a/src/main/java/jakarta/validation/constraintvalidation/SupportedValidationTarget.java
+++ b/src/main/java/jakarta/validation/constraintvalidation/SupportedValidationTarget.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/constraintvalidation/ValidationTarget.java b/src/main/java/jakarta/validation/constraintvalidation/ValidationTarget.java
index 54e77ff9..5ec1abb5 100644
--- a/src/main/java/jakarta/validation/constraintvalidation/ValidationTarget.java
+++ b/src/main/java/jakarta/validation/constraintvalidation/ValidationTarget.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/constraintvalidation/package-info.java b/src/main/java/jakarta/validation/constraintvalidation/package-info.java
index fbf39866..46579c65 100644
--- a/src/main/java/jakarta/validation/constraintvalidation/package-info.java
+++ b/src/main/java/jakarta/validation/constraintvalidation/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/executable/ExecutableType.java b/src/main/java/jakarta/validation/executable/ExecutableType.java
index 7be00106..0690f993 100644
--- a/src/main/java/jakarta/validation/executable/ExecutableType.java
+++ b/src/main/java/jakarta/validation/executable/ExecutableType.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/executable/ExecutableValidator.java b/src/main/java/jakarta/validation/executable/ExecutableValidator.java
index c61163d1..0f2fad54 100644
--- a/src/main/java/jakarta/validation/executable/ExecutableValidator.java
+++ b/src/main/java/jakarta/validation/executable/ExecutableValidator.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/executable/ValidateOnExecution.java b/src/main/java/jakarta/validation/executable/ValidateOnExecution.java
index 8523032f..9d362851 100644
--- a/src/main/java/jakarta/validation/executable/ValidateOnExecution.java
+++ b/src/main/java/jakarta/validation/executable/ValidateOnExecution.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/executable/package-info.java b/src/main/java/jakarta/validation/executable/package-info.java
index 93492c2b..eff8edfd 100644
--- a/src/main/java/jakarta/validation/executable/package-info.java
+++ b/src/main/java/jakarta/validation/executable/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/groups/ConvertGroup.java b/src/main/java/jakarta/validation/groups/ConvertGroup.java
index d8274f14..e8f3c26a 100644
--- a/src/main/java/jakarta/validation/groups/ConvertGroup.java
+++ b/src/main/java/jakarta/validation/groups/ConvertGroup.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/groups/Default.java b/src/main/java/jakarta/validation/groups/Default.java
index b8757c99..915f1a52 100644
--- a/src/main/java/jakarta/validation/groups/Default.java
+++ b/src/main/java/jakarta/validation/groups/Default.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
@@ -7,7 +7,7 @@
 package jakarta.validation.groups;
 
 /**
- * Default Jakarta Bean Validation group.
+ * Default Jakarta Validation group.
  * <p>
  * Unless a list of groups is explicitly defined:
  * <ul>
diff --git a/src/main/java/jakarta/validation/groups/package-info.java b/src/main/java/jakarta/validation/groups/package-info.java
index 296643a6..2bd34258 100644
--- a/src/main/java/jakarta/validation/groups/package-info.java
+++ b/src/main/java/jakarta/validation/groups/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/metadata/BeanDescriptor.java b/src/main/java/jakarta/validation/metadata/BeanDescriptor.java
index 0adb70de..0cb5a975 100644
--- a/src/main/java/jakarta/validation/metadata/BeanDescriptor.java
+++ b/src/main/java/jakarta/validation/metadata/BeanDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/metadata/CascadableDescriptor.java b/src/main/java/jakarta/validation/metadata/CascadableDescriptor.java
index 4e2f015a..470cd31c 100644
--- a/src/main/java/jakarta/validation/metadata/CascadableDescriptor.java
+++ b/src/main/java/jakarta/validation/metadata/CascadableDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/metadata/ConstraintDescriptor.java b/src/main/java/jakarta/validation/metadata/ConstraintDescriptor.java
index 0ef1add0..fd53ab15 100644
--- a/src/main/java/jakarta/validation/metadata/ConstraintDescriptor.java
+++ b/src/main/java/jakarta/validation/metadata/ConstraintDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
@@ -119,7 +119,7 @@ public interface ConstraintDescriptor<T extends Annotation> {
 	/**
 	 * Returns an instance of the specified type allowing access to provider-specific APIs.
 	 * <p>
-	 * If the Jakarta Bean Validation provider implementation does not support the specified class,
+	 * If the Jakarta Validation provider implementation does not support the specified class,
 	 * a {@link ValidationException} is thrown.
 	 *
 	 * @param type the class of the object to be returned
diff --git a/src/main/java/jakarta/validation/metadata/ConstructorDescriptor.java b/src/main/java/jakarta/validation/metadata/ConstructorDescriptor.java
index 818d7edc..ef51fb06 100644
--- a/src/main/java/jakarta/validation/metadata/ConstructorDescriptor.java
+++ b/src/main/java/jakarta/validation/metadata/ConstructorDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/metadata/ContainerDescriptor.java b/src/main/java/jakarta/validation/metadata/ContainerDescriptor.java
index 55847249..d6f00694 100644
--- a/src/main/java/jakarta/validation/metadata/ContainerDescriptor.java
+++ b/src/main/java/jakarta/validation/metadata/ContainerDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/metadata/ContainerElementTypeDescriptor.java b/src/main/java/jakarta/validation/metadata/ContainerElementTypeDescriptor.java
index 411f7947..2e901ba6 100644
--- a/src/main/java/jakarta/validation/metadata/ContainerElementTypeDescriptor.java
+++ b/src/main/java/jakarta/validation/metadata/ContainerElementTypeDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/metadata/CrossParameterDescriptor.java b/src/main/java/jakarta/validation/metadata/CrossParameterDescriptor.java
index 8c70cf32..1d9d63fa 100644
--- a/src/main/java/jakarta/validation/metadata/CrossParameterDescriptor.java
+++ b/src/main/java/jakarta/validation/metadata/CrossParameterDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/metadata/ElementDescriptor.java b/src/main/java/jakarta/validation/metadata/ElementDescriptor.java
index 8a5f723a..dad29ca4 100644
--- a/src/main/java/jakarta/validation/metadata/ElementDescriptor.java
+++ b/src/main/java/jakarta/validation/metadata/ElementDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/metadata/ExecutableDescriptor.java b/src/main/java/jakarta/validation/metadata/ExecutableDescriptor.java
index ff88942c..9d78686d 100644
--- a/src/main/java/jakarta/validation/metadata/ExecutableDescriptor.java
+++ b/src/main/java/jakarta/validation/metadata/ExecutableDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/metadata/GroupConversionDescriptor.java b/src/main/java/jakarta/validation/metadata/GroupConversionDescriptor.java
index 82c058ce..c447e464 100644
--- a/src/main/java/jakarta/validation/metadata/GroupConversionDescriptor.java
+++ b/src/main/java/jakarta/validation/metadata/GroupConversionDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/metadata/MethodDescriptor.java b/src/main/java/jakarta/validation/metadata/MethodDescriptor.java
index 932c9e5f..1d43bdaf 100644
--- a/src/main/java/jakarta/validation/metadata/MethodDescriptor.java
+++ b/src/main/java/jakarta/validation/metadata/MethodDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/metadata/MethodType.java b/src/main/java/jakarta/validation/metadata/MethodType.java
index 043304b8..d83f2bc0 100644
--- a/src/main/java/jakarta/validation/metadata/MethodType.java
+++ b/src/main/java/jakarta/validation/metadata/MethodType.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/metadata/ParameterDescriptor.java b/src/main/java/jakarta/validation/metadata/ParameterDescriptor.java
index 911d8368..4d83d2a7 100644
--- a/src/main/java/jakarta/validation/metadata/ParameterDescriptor.java
+++ b/src/main/java/jakarta/validation/metadata/ParameterDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/metadata/PropertyDescriptor.java b/src/main/java/jakarta/validation/metadata/PropertyDescriptor.java
index ecad97f8..940df6c5 100644
--- a/src/main/java/jakarta/validation/metadata/PropertyDescriptor.java
+++ b/src/main/java/jakarta/validation/metadata/PropertyDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/metadata/ReturnValueDescriptor.java b/src/main/java/jakarta/validation/metadata/ReturnValueDescriptor.java
index 535ccc30..b8887cf5 100644
--- a/src/main/java/jakarta/validation/metadata/ReturnValueDescriptor.java
+++ b/src/main/java/jakarta/validation/metadata/ReturnValueDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/metadata/Scope.java b/src/main/java/jakarta/validation/metadata/Scope.java
index 257ed8fc..b6103b20 100644
--- a/src/main/java/jakarta/validation/metadata/Scope.java
+++ b/src/main/java/jakarta/validation/metadata/Scope.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/metadata/ValidateUnwrappedValue.java b/src/main/java/jakarta/validation/metadata/ValidateUnwrappedValue.java
index 5b1a30f1..f187372d 100644
--- a/src/main/java/jakarta/validation/metadata/ValidateUnwrappedValue.java
+++ b/src/main/java/jakarta/validation/metadata/ValidateUnwrappedValue.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/metadata/package-info.java b/src/main/java/jakarta/validation/metadata/package-info.java
index 41bbad77..160b5c02 100644
--- a/src/main/java/jakarta/validation/metadata/package-info.java
+++ b/src/main/java/jakarta/validation/metadata/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/package-info.java b/src/main/java/jakarta/validation/package-info.java
index ec524f61..467e205e 100644
--- a/src/main/java/jakarta/validation/package-info.java
+++ b/src/main/java/jakarta/validation/package-info.java
@@ -1,16 +1,16 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
  */
 /**
- * Top level package of the Jakarta Bean Validation API.
+ * Top level package of the Jakarta Validation API.
  *
  * The main runtime artifacts are:
  * <ul>
- *     <li>{@link jakarta.validation.Validation}: the entry point to bootstrap Jakarta Bean Validation</li>
- *     <li>{@link jakarta.validation.ValidatorFactory}: the bootstrapped Jakarta Bean Validation engine</li>
+ *     <li>{@link jakarta.validation.Validation}: the entry point to bootstrap Jakarta Validation</li>
+ *     <li>{@link jakarta.validation.ValidatorFactory}: the bootstrapped Jakarta Validation engine</li>
  *     <li>{@link jakarta.validation.Validator}: contract to validate beans and access the metadata</li>
  *     <li>{@link jakarta.validation.ConstraintViolation}: constraint violation report</li>
  * </ul>
diff --git a/src/main/java/jakarta/validation/spi/BootstrapState.java b/src/main/java/jakarta/validation/spi/BootstrapState.java
index fd38c2cc..1a2c2f8d 100644
--- a/src/main/java/jakarta/validation/spi/BootstrapState.java
+++ b/src/main/java/jakarta/validation/spi/BootstrapState.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/spi/ConfigurationState.java b/src/main/java/jakarta/validation/spi/ConfigurationState.java
index bd5821f9..2cf41bfc 100755
--- a/src/main/java/jakarta/validation/spi/ConfigurationState.java
+++ b/src/main/java/jakarta/validation/spi/ConfigurationState.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
@@ -76,7 +76,7 @@ public interface ConfigurationState {
 	 * {@code Configuration} implementation after the {@link ValidatorFactory}
 	 * creation (or if an exception occurs). All streams are guaranteed to
 	 * adhere to the mark/reset contract (see {@link InputStream#markSupported()}
-	 * by the Jakarta Bean Validation provider.
+	 * by the Jakarta Validation provider.
 	 *
 	 * @return set of input stream
 	 */
diff --git a/src/main/java/jakarta/validation/spi/ValidationProvider.java b/src/main/java/jakarta/validation/spi/ValidationProvider.java
index 3655a60d..7210fa92 100644
--- a/src/main/java/jakarta/validation/spi/ValidationProvider.java
+++ b/src/main/java/jakarta/validation/spi/ValidationProvider.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/spi/package-info.java b/src/main/java/jakarta/validation/spi/package-info.java
index d81bc2d0..72516aa6 100644
--- a/src/main/java/jakarta/validation/spi/package-info.java
+++ b/src/main/java/jakarta/validation/spi/package-info.java
@@ -1,11 +1,11 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
  */
 /**
  * Package containing objects specific to the interaction between the
- * Jakarta Bean Validation bootstrapping process and Jakarta Bean Validation providers.
+ * Jakarta Validation bootstrapping process and Jakarta Validation providers.
  */
 package jakarta.validation.spi;
diff --git a/src/main/java/jakarta/validation/valueextraction/ExtractedValue.java b/src/main/java/jakarta/validation/valueextraction/ExtractedValue.java
index 01f57530..da4e2496 100644
--- a/src/main/java/jakarta/validation/valueextraction/ExtractedValue.java
+++ b/src/main/java/jakarta/validation/valueextraction/ExtractedValue.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/valueextraction/UnwrapByDefault.java b/src/main/java/jakarta/validation/valueextraction/UnwrapByDefault.java
index d941b182..a2a5f284 100644
--- a/src/main/java/jakarta/validation/valueextraction/UnwrapByDefault.java
+++ b/src/main/java/jakarta/validation/valueextraction/UnwrapByDefault.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/valueextraction/Unwrapping.java b/src/main/java/jakarta/validation/valueextraction/Unwrapping.java
index 8c8790ec..2f914a29 100644
--- a/src/main/java/jakarta/validation/valueextraction/Unwrapping.java
+++ b/src/main/java/jakarta/validation/valueextraction/Unwrapping.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/valueextraction/ValueExtractor.java b/src/main/java/jakarta/validation/valueextraction/ValueExtractor.java
index 54a65a9e..db97f847 100644
--- a/src/main/java/jakarta/validation/valueextraction/ValueExtractor.java
+++ b/src/main/java/jakarta/validation/valueextraction/ValueExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/valueextraction/ValueExtractorDeclarationException.java b/src/main/java/jakarta/validation/valueextraction/ValueExtractorDeclarationException.java
index 4291cd5d..c00c3cbe 100644
--- a/src/main/java/jakarta/validation/valueextraction/ValueExtractorDeclarationException.java
+++ b/src/main/java/jakarta/validation/valueextraction/ValueExtractorDeclarationException.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/valueextraction/ValueExtractorDefinitionException.java b/src/main/java/jakarta/validation/valueextraction/ValueExtractorDefinitionException.java
index 9b8de956..41643357 100644
--- a/src/main/java/jakarta/validation/valueextraction/ValueExtractorDefinitionException.java
+++ b/src/main/java/jakarta/validation/valueextraction/ValueExtractorDefinitionException.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/jakarta/validation/valueextraction/package-info.java b/src/main/java/jakarta/validation/valueextraction/package-info.java
index 926583ec..89810865 100644
--- a/src/main/java/jakarta/validation/valueextraction/package-info.java
+++ b/src/main/java/jakarta/validation/valueextraction/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index df03f249..031d1735 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/scripts/gencopyright.sh b/src/main/scripts/gencopyright.sh
index 234578a8..5c6b78b7 100755
--- a/src/main/scripts/gencopyright.sh
+++ b/src/main/scripts/gencopyright.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Jakarta Bean Validation API
+# Jakarta Validation API
 #
 # License: Apache License, Version 2.0
 # See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/xsd/validation-configuration-1.0.xsd b/src/main/xsd/validation-configuration-1.0.xsd
index be70a5cc..3275ea69 100644
--- a/src/main/xsd/validation-configuration-1.0.xsd
+++ b/src/main/xsd/validation-configuration-1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Jakarta Bean Validation API
+  ~ Jakarta Validation API
   ~
   ~ License: Apache License, Version 2.0
   ~ See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/main/xsd/validation-configuration-1.1.xsd b/src/main/xsd/validation-configuration-1.1.xsd
index 6e08b63a..352c5175 100644
--- a/src/main/xsd/validation-configuration-1.1.xsd
+++ b/src/main/xsd/validation-configuration-1.1.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Jakarta Bean Validation API
+  ~ Jakarta Validation API
   ~
   ~ License: Apache License, Version 2.0
   ~ See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
@@ -14,10 +14,10 @@
 
     <xs:annotation>
         <xs:documentation><![CDATA[
-            This is the XML Schema for the Jakarta Bean Validation configuration file.
+            This is the XML Schema for the Jakarta Validation configuration file.
             The configuration file must be named "META-INF/validation.xml".
 
-            Jakarta Bean Validation configuration files must indicate the Jakarta Bean Validation
+            Jakarta Validation configuration files must indicate the Jakarta Validation
             XML schema by using the validation namespace:
 
             http://jboss.org/xml/ns/javax/validation/configuration
diff --git a/src/main/xsd/validation-configuration-2.0.xsd b/src/main/xsd/validation-configuration-2.0.xsd
index 6e538110..6095ba03 100644
--- a/src/main/xsd/validation-configuration-2.0.xsd
+++ b/src/main/xsd/validation-configuration-2.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Jakarta Bean Validation API
+  ~ Jakarta Validation API
   ~
   ~ License: Apache License, Version 2.0
   ~ See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
@@ -14,10 +14,10 @@
 
     <xs:annotation>
         <xs:documentation><![CDATA[
-            This is the XML Schema for the Jakarta Bean Validation configuration file.
+            This is the XML Schema for the Jakarta Validation configuration file.
             The configuration file must be named "META-INF/validation.xml".
 
-            Jakarta Bean Validation configuration files must indicate the Jakarta Bean Validation
+            Jakarta Validation configuration files must indicate the Jakarta Validation
             XML schema by using the validation namespace:
 
             http://xmlns.jcp.org/xml/ns/validation/configuration
diff --git a/src/main/xsd/validation-configuration-3.0.xsd b/src/main/xsd/validation-configuration-3.0.xsd
index 6b482b0e..44ed09f2 100644
--- a/src/main/xsd/validation-configuration-3.0.xsd
+++ b/src/main/xsd/validation-configuration-3.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Jakarta Bean Validation API
+  ~ Jakarta Validation API
   ~
   ~ License: Apache License, Version 2.0
   ~ See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
@@ -14,10 +14,10 @@
 
     <xs:annotation>
         <xs:documentation><![CDATA[
-            This is the XML Schema for the Jakarta Bean Validation configuration file.
+            This is the XML Schema for the Jakarta Validation configuration file.
             The configuration file must be named "META-INF/validation.xml".
 
-            Jakarta Bean Validation configuration files must indicate the Jakarta Bean Validation
+            Jakarta Validation configuration files must indicate the Jakarta Validation
             XML schema by using the validation namespace:
 
             https://jakarta.ee/xml/ns/validation/configuration
diff --git a/src/main/xsd/validation-mapping-1.0.xsd b/src/main/xsd/validation-mapping-1.0.xsd
index 8ea14336..3073e657 100644
--- a/src/main/xsd/validation-mapping-1.0.xsd
+++ b/src/main/xsd/validation-mapping-1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Jakarta Bean Validation API
+  ~ Jakarta Validation API
   ~
   ~ License: Apache License, Version 2.0
   ~ See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
@@ -156,4 +156,4 @@
         <xs:attribute type="xs:string" name="name" use="required"/>
         <xs:attribute type="xs:boolean" name="ignore-annotations" use="optional"/>
     </xs:complexType>
-</xs:schema>
\ No newline at end of file
+</xs:schema>
diff --git a/src/main/xsd/validation-mapping-1.1.xsd b/src/main/xsd/validation-mapping-1.1.xsd
index 807b4950..d4029370 100644
--- a/src/main/xsd/validation-mapping-1.1.xsd
+++ b/src/main/xsd/validation-mapping-1.1.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Jakarta Bean Validation API
+  ~ Jakarta Validation API
   ~
   ~ License: Apache License, Version 2.0
   ~ See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
@@ -14,9 +14,9 @@
 
     <xs:annotation>
         <xs:documentation><![CDATA[
-            This is the XML Schema for Jakarta Bean Validation constraint mapping files.
+            This is the XML Schema for Jakarta Validation constraint mapping files.
 
-            Jakarta Bean Validation constraint mapping files must indicate the Jakarta Bean Validation
+            Jakarta Validation constraint mapping files must indicate the Jakarta Validation
             XML schema by using the constraint mapping namespace:
 
             http://jboss.org/xml/ns/javax/validation/mapping
diff --git a/src/main/xsd/validation-mapping-2.0.xsd b/src/main/xsd/validation-mapping-2.0.xsd
index 61ea6efb..6503064e 100644
--- a/src/main/xsd/validation-mapping-2.0.xsd
+++ b/src/main/xsd/validation-mapping-2.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Jakarta Bean Validation API
+  ~ Jakarta Validation API
   ~
   ~ License: Apache License, Version 2.0
   ~ See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
@@ -14,9 +14,9 @@
 
     <xs:annotation>
         <xs:documentation><![CDATA[
-            This is the XML Schema for Jakarta Bean Validation constraint mapping files.
+            This is the XML Schema for Jakarta Validation constraint mapping files.
 
-            Jakarta Bean Validation constraint mapping files must indicate the Jakarta Bean Validation
+            Jakarta Validation constraint mapping files must indicate the Jakarta Validation
             XML schema by using the constraint mapping namespace:
 
             http://xmlns.jcp.org/xml/ns/validation/mapping
diff --git a/src/main/xsd/validation-mapping-3.0.xsd b/src/main/xsd/validation-mapping-3.0.xsd
index 77834b7c..7ea5e7dc 100644
--- a/src/main/xsd/validation-mapping-3.0.xsd
+++ b/src/main/xsd/validation-mapping-3.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Jakarta Bean Validation API
+  ~ Jakarta Validation API
   ~
   ~ License: Apache License, Version 2.0
   ~ See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
@@ -14,9 +14,9 @@
 
     <xs:annotation>
         <xs:documentation><![CDATA[
-            This is the XML Schema for Jakarta Bean Validation constraint mapping files.
+            This is the XML Schema for Jakarta Validation constraint mapping files.
 
-            Jakarta Bean Validation constraint mapping files must indicate the Jakarta Bean Validation
+            Jakarta Validation constraint mapping files must indicate the Jakarta Validation
             XML schema by using the constraint mapping namespace:
 
             https://jakarta.ee/xml/ns/validation/mapping
diff --git a/src/test/java/jakarta/validation/BarValidationProvider.java b/src/test/java/jakarta/validation/BarValidationProvider.java
index cb917440..e4aea96e 100644
--- a/src/test/java/jakarta/validation/BarValidationProvider.java
+++ b/src/test/java/jakarta/validation/BarValidationProvider.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/test/java/jakarta/validation/ConstraintViolationExceptionTest.java b/src/test/java/jakarta/validation/ConstraintViolationExceptionTest.java
index 9b7415be..6a0f8850 100644
--- a/src/test/java/jakarta/validation/ConstraintViolationExceptionTest.java
+++ b/src/test/java/jakarta/validation/ConstraintViolationExceptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/test/java/jakarta/validation/FooValidationProvider.java b/src/test/java/jakarta/validation/FooValidationProvider.java
index cc921b13..3561f52b 100644
--- a/src/test/java/jakarta/validation/FooValidationProvider.java
+++ b/src/test/java/jakarta/validation/FooValidationProvider.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/test/java/jakarta/validation/NonRegisteredValidationProvider.java b/src/test/java/jakarta/validation/NonRegisteredValidationProvider.java
index 79ca2b14..c709f62d 100644
--- a/src/test/java/jakarta/validation/NonRegisteredValidationProvider.java
+++ b/src/test/java/jakarta/validation/NonRegisteredValidationProvider.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/test/java/jakarta/validation/ValidationTest.java b/src/test/java/jakarta/validation/ValidationTest.java
index f02e94b8..40f8896b 100644
--- a/src/test/java/jakarta/validation/ValidationTest.java
+++ b/src/test/java/jakarta/validation/ValidationTest.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/test/java/jakarta/validation/examples/ConstraintValidationNodeBuilderTest.java b/src/test/java/jakarta/validation/examples/ConstraintValidationNodeBuilderTest.java
index c0226011..82283765 100644
--- a/src/test/java/jakarta/validation/examples/ConstraintValidationNodeBuilderTest.java
+++ b/src/test/java/jakarta/validation/examples/ConstraintValidationNodeBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
diff --git a/src/test/java/jakarta/validation/examples/NodeTraversalTest.java b/src/test/java/jakarta/validation/examples/NodeTraversalTest.java
index 0df8494d..4414efa2 100644
--- a/src/test/java/jakarta/validation/examples/NodeTraversalTest.java
+++ b/src/test/java/jakarta/validation/examples/NodeTraversalTest.java
@@ -1,5 +1,5 @@
 /*
- * Jakarta Bean Validation API
+ * Jakarta Validation API
  *
  * License: Apache License, Version 2.0
  * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.