diff --git a/jdbc/basics/src/main/java/example/springdata/jdbc/basics/simpleentity/Category.java b/jdbc/basics/src/main/java/example/springdata/jdbc/basics/simpleentity/Category.java
index b3ac203c..d8232a16 100644
--- a/jdbc/basics/src/main/java/example/springdata/jdbc/basics/simpleentity/Category.java
+++ b/jdbc/basics/src/main/java/example/springdata/jdbc/basics/simpleentity/Category.java
@@ -26,7 +26,7 @@ import lombok.With;
 import java.time.LocalDateTime;
 
 import org.springframework.data.annotation.Id;
-import org.springframework.data.annotation.PersistenceConstructor;
+import org.springframework.data.annotation.PersistenceCreator;
 
 /**
  * Coarse classification for {@link LegoSet}s, like "Car", "Plane", "Building" and so on.
@@ -34,7 +34,7 @@ import org.springframework.data.annotation.PersistenceConstructor;
  * @author Jens Schauder
  */
 @Data
-@AllArgsConstructor(access = AccessLevel.PRIVATE, onConstructor = @__(@PersistenceConstructor))
+@AllArgsConstructor(access = AccessLevel.PRIVATE, onConstructor = @__(@PersistenceCreator))
 public class Category {
 
 	private final @Id @With Long id;
diff --git a/jdbc/howto/bidirectionalinternal/src/main/java/example/springdata/jdbc/howto/bidirectionalinternal/Minion.java b/jdbc/howto/bidirectionalinternal/src/main/java/example/springdata/jdbc/howto/bidirectionalinternal/Minion.java
index 7e3aca72..a5905b26 100644
--- a/jdbc/howto/bidirectionalinternal/src/main/java/example/springdata/jdbc/howto/bidirectionalinternal/Minion.java
+++ b/jdbc/howto/bidirectionalinternal/src/main/java/example/springdata/jdbc/howto/bidirectionalinternal/Minion.java
@@ -20,7 +20,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.springframework.data.annotation.Id;
-import org.springframework.data.annotation.PersistenceConstructor;
+import org.springframework.data.annotation.PersistenceCreator;
 
 class Minion {
 	@Id
@@ -32,7 +32,7 @@ class Minion {
 		this.name = name;
 	}
 
-	@PersistenceConstructor
+	@PersistenceCreator
 	private Minion(Long id, String name, Collection<Toy> toys) {
 
 		this.id = id;
diff --git a/jdbc/howto/selectiveupdate/src/main/java/example.springdata/jdbc/howto/selectiveupdate/Minion.java b/jdbc/howto/selectiveupdate/src/main/java/example.springdata/jdbc/howto/selectiveupdate/Minion.java
index 78c10529..cf8ed6d9 100644
--- a/jdbc/howto/selectiveupdate/src/main/java/example.springdata/jdbc/howto/selectiveupdate/Minion.java
+++ b/jdbc/howto/selectiveupdate/src/main/java/example.springdata/jdbc/howto/selectiveupdate/Minion.java
@@ -20,7 +20,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.springframework.data.annotation.Id;
-import org.springframework.data.annotation.PersistenceConstructor;
+import org.springframework.data.annotation.PersistenceCreator;
 import org.springframework.data.annotation.Version;
 
 
@@ -41,7 +41,7 @@ class Minion {
 		this.name = name;
 	}
 
-	@PersistenceConstructor
+	@PersistenceCreator
 	private Minion(Long id, String name, Collection<Toy> toys, int version) {
 
 		this.id = id;
diff --git a/jdbc/jmolecules/src/main/java/example/springdata/jdbc/jmolecules/customer/Customer.java b/jdbc/jmolecules/src/main/java/example/springdata/jdbc/jmolecules/customer/Customer.java
index 98dafb05..27d1a44f 100644
--- a/jdbc/jmolecules/src/main/java/example/springdata/jdbc/jmolecules/customer/Customer.java
+++ b/jdbc/jmolecules/src/main/java/example/springdata/jdbc/jmolecules/customer/Customer.java
@@ -28,7 +28,7 @@ import java.util.UUID;
 
 import org.jmolecules.ddd.types.AggregateRoot;
 import org.jmolecules.ddd.types.Identifier;
-import org.springframework.data.annotation.PersistenceConstructor;
+import org.springframework.data.annotation.PersistenceCreator;
 import org.springframework.util.Assert;
 
 /**
@@ -36,7 +36,7 @@ import org.springframework.util.Assert;
  */
 @Getter
 @ToString
-@AllArgsConstructor(access = AccessLevel.PRIVATE, onConstructor = @__(@PersistenceConstructor))
+@AllArgsConstructor(access = AccessLevel.PRIVATE, onConstructor = @__(@PersistenceCreator))
 public class Customer implements AggregateRoot<Customer, CustomerId> {
 
 	private final CustomerId id;
diff --git a/mongodb/aggregation/src/main/java/example/springdata/mongodb/aggregation/LineItem.java b/mongodb/aggregation/src/main/java/example/springdata/mongodb/aggregation/LineItem.java
index 3aae1337..0626835a 100644
--- a/mongodb/aggregation/src/main/java/example/springdata/mongodb/aggregation/LineItem.java
+++ b/mongodb/aggregation/src/main/java/example/springdata/mongodb/aggregation/LineItem.java
@@ -15,7 +15,7 @@
  */
 package example.springdata.mongodb.aggregation;
 
-import org.springframework.data.annotation.PersistenceConstructor;
+import org.springframework.data.annotation.PersistenceCreator;
 
 /**
  * A line item.
@@ -26,7 +26,7 @@ import org.springframework.data.annotation.PersistenceConstructor;
 
 public record LineItem(String caption, double price, int quantity) {
 
-	@PersistenceConstructor
+	@PersistenceCreator
 	public LineItem {
 	}
 
diff --git a/mongodb/aggregation/src/main/java/example/springdata/mongodb/aggregation/Order.java b/mongodb/aggregation/src/main/java/example/springdata/mongodb/aggregation/Order.java
index 1149e33b..ef038e74 100644
--- a/mongodb/aggregation/src/main/java/example/springdata/mongodb/aggregation/Order.java
+++ b/mongodb/aggregation/src/main/java/example/springdata/mongodb/aggregation/Order.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import org.springframework.data.annotation.PersistenceConstructor;
+import org.springframework.data.annotation.PersistenceCreator;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 /**
@@ -34,7 +34,7 @@ import org.springframework.data.mongodb.core.mapping.Document;
  * @author Mark Paluch
  */
 @Data
-@AllArgsConstructor(onConstructor = @__(@PersistenceConstructor))
+@AllArgsConstructor(onConstructor = @__(@PersistenceCreator))
 @Document
 public class Order {
 
diff --git a/mongodb/jmolecules/src/main/java/example/springdata/mongodb/customer/Customer.java b/mongodb/jmolecules/src/main/java/example/springdata/mongodb/customer/Customer.java
index 722bcbf9..6533a27d 100644
--- a/mongodb/jmolecules/src/main/java/example/springdata/mongodb/customer/Customer.java
+++ b/mongodb/jmolecules/src/main/java/example/springdata/mongodb/customer/Customer.java
@@ -27,7 +27,7 @@ import java.util.UUID;
 
 import org.jmolecules.ddd.types.AggregateRoot;
 import org.jmolecules.ddd.types.Identifier;
-import org.springframework.data.annotation.PersistenceConstructor;
+import org.springframework.data.annotation.PersistenceCreator;
 import org.springframework.util.Assert;
 
 /**
@@ -35,7 +35,7 @@ import org.springframework.util.Assert;
  */
 @Getter
 @ToString
-@AllArgsConstructor(access = AccessLevel.PRIVATE, onConstructor = @__(@PersistenceConstructor))
+@AllArgsConstructor(access = AccessLevel.PRIVATE, onConstructor = @__(@PersistenceCreator))
 public class Customer implements AggregateRoot<Customer, CustomerId> {
 
 	private final CustomerId id;
diff --git a/mongodb/kotlin/src/main/kotlin/example/springdata/mongodb/people/Person.kt b/mongodb/kotlin/src/main/kotlin/example/springdata/mongodb/people/Person.kt
index 5780ad56..4b5d6d0a 100644
--- a/mongodb/kotlin/src/main/kotlin/example/springdata/mongodb/people/Person.kt
+++ b/mongodb/kotlin/src/main/kotlin/example/springdata/mongodb/people/Person.kt
@@ -16,13 +16,13 @@
 package example.springdata.mongodb.people
 
 import org.springframework.data.annotation.Id
-import org.springframework.data.annotation.PersistenceConstructor
+import org.springframework.data.annotation.PersistenceCreator
 
 /**
  * An entity to represent a Person.
  *
  * @author Mark Paluch
  */
-data class Person @PersistenceConstructor constructor(@Id val id: String?, val firstname: String? = "Walter", val lastname: String = "") {
+data class Person @PersistenceCreator constructor(@Id val id: String?, val firstname: String? = "Walter", val lastname: String = "") {
 	constructor(firstname: String?, lastname: String) : this(null, firstname, lastname);
 }
diff --git a/mongodb/reactive/src/main/java/example/springdata/mongodb/people/Person.java b/mongodb/reactive/src/main/java/example/springdata/mongodb/people/Person.java
index 638d477d..e52d67f6 100644
--- a/mongodb/reactive/src/main/java/example/springdata/mongodb/people/Person.java
+++ b/mongodb/reactive/src/main/java/example/springdata/mongodb/people/Person.java
@@ -16,7 +16,7 @@
 package example.springdata.mongodb.people;
 
 import org.springframework.data.annotation.Id;
-import org.springframework.data.annotation.PersistenceConstructor;
+import org.springframework.data.annotation.PersistenceCreator;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 /**
@@ -27,7 +27,7 @@ import org.springframework.data.mongodb.core.mapping.Document;
 @Document
 public record Person(@Id String id, String firstname, String lastname, int age) {
 
-	@PersistenceConstructor
+	@PersistenceCreator 
 	public Person {
 	}
 
diff --git a/mongodb/security/src/main/java/example/springdata/mongodb/security/Person.java b/mongodb/security/src/main/java/example/springdata/mongodb/security/Person.java
index 484cf668..7dce7944 100644
--- a/mongodb/security/src/main/java/example/springdata/mongodb/security/Person.java
+++ b/mongodb/security/src/main/java/example/springdata/mongodb/security/Person.java
@@ -16,7 +16,7 @@
 package example.springdata.mongodb.security;
 
 import org.springframework.data.annotation.Id;
-import org.springframework.data.annotation.PersistenceConstructor;
+import org.springframework.data.annotation.PersistenceCreator;
 
 /**
  * An entity to represent a {@link Person}.
@@ -25,7 +25,7 @@ import org.springframework.data.annotation.PersistenceConstructor;
  */
 public record Person(@Id String id, String firstname, String lastname) {
 
-	@PersistenceConstructor
+	@PersistenceCreator
 	public Person {
 	}
 
diff --git a/multi-store/src/main/java/example/springdata/multistore/shop/LineItem.java b/multi-store/src/main/java/example/springdata/multistore/shop/LineItem.java
index edfe5b23..bfab0078 100644
--- a/multi-store/src/main/java/example/springdata/multistore/shop/LineItem.java
+++ b/multi-store/src/main/java/example/springdata/multistore/shop/LineItem.java
@@ -18,7 +18,7 @@ package example.springdata.multistore.shop;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 
-import org.springframework.data.annotation.PersistenceConstructor;
+import org.springframework.data.annotation.PersistenceCreator;
 
 /**
  * A line item.
@@ -27,7 +27,7 @@ import org.springframework.data.annotation.PersistenceConstructor;
  * @author Oliver Gierke
  */
 @Data
-@RequiredArgsConstructor(onConstructor = @__(@PersistenceConstructor))
+@RequiredArgsConstructor(onConstructor = @__(@PersistenceCreator))
 public class LineItem {
 
 	private final String caption;
diff --git a/multi-store/src/main/java/example/springdata/multistore/shop/Order.java b/multi-store/src/main/java/example/springdata/multistore/shop/Order.java
index d1f8d7ae..2065201e 100644
--- a/multi-store/src/main/java/example/springdata/multistore/shop/Order.java
+++ b/multi-store/src/main/java/example/springdata/multistore/shop/Order.java
@@ -22,7 +22,7 @@ import java.util.List;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 
-import org.springframework.data.annotation.PersistenceConstructor;
+import org.springframework.data.annotation.PersistenceCreator;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 /**
@@ -33,7 +33,7 @@ import org.springframework.data.mongodb.core.mapping.Document;
  * @author Oliver Gierke
  */
 @Data
-@RequiredArgsConstructor(onConstructor = @__(@PersistenceConstructor))
+@RequiredArgsConstructor(onConstructor = @__(@PersistenceCreator))
 @Document
 public class Order {
 
diff --git a/neo4j/example/src/main/java/example/springdata/neo4j/Roles.java b/neo4j/example/src/main/java/example/springdata/neo4j/Roles.java
index 578e9eae..40755c71 100644
--- a/neo4j/example/src/main/java/example/springdata/neo4j/Roles.java
+++ b/neo4j/example/src/main/java/example/springdata/neo4j/Roles.java
@@ -19,7 +19,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.springframework.data.annotation.PersistenceConstructor;
+import org.springframework.data.annotation.PersistenceCreator;
 import org.springframework.data.neo4j.core.schema.GeneratedValue;
 import org.springframework.data.neo4j.core.schema.Id;
 import org.springframework.data.neo4j.core.schema.RelationshipProperties;
@@ -47,7 +47,7 @@ public class Roles {
 		this(Collections.emptyList());
 	}
 
-	@PersistenceConstructor
+	@PersistenceCreator
 	public Roles(List<String> roles) {
 		this.roles = new ArrayList<>(roles);
 	}