diff --git a/jpa/aot-generation/pom.xml b/jpa/aot-optimization/pom.xml
similarity index 90%
rename from jpa/aot-generation/pom.xml
rename to jpa/aot-optimization/pom.xml
index c8c2e9cf..b72d3040 100644
--- a/jpa/aot-generation/pom.xml
+++ b/jpa/aot-optimization/pom.xml
@@ -10,11 +10,12 @@
 	</parent>
 
 	<groupId>org.example</groupId>
-	<artifactId>aot-generation</artifactId>
+	<artifactId>spring-data-jpa-aot-optimization</artifactId>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<hibernate.version>7.0.0.Beta5</hibernate.version>
+		<spring-data-bom.version>2025.1.0-SNAPSHOT</spring-data-bom.version>
 	</properties>
 
 	<dependencies>
@@ -24,6 +25,12 @@
 			<version>1.0.0</version>
 		</dependency>
 
+		<dependency>
+			<groupId>jakarta.persistence</groupId>
+			<artifactId>jakarta.persistence-api</artifactId>
+			<version>3.2.0</version>
+		</dependency>
+
 		<dependency>
 			<groupId>com.querydsl</groupId>
 			<artifactId>querydsl-jpa</artifactId>
diff --git a/jpa/aot-generation/src/main/java/example/springdata/aot/AotJpaApp.java b/jpa/aot-optimization/src/main/java/example/springdata/aot/AotJpaApp.java
similarity index 94%
rename from jpa/aot-generation/src/main/java/example/springdata/aot/AotJpaApp.java
rename to jpa/aot-optimization/src/main/java/example/springdata/aot/AotJpaApp.java
index 5256d51e..14dfadba 100644
--- a/jpa/aot-generation/src/main/java/example/springdata/aot/AotJpaApp.java
+++ b/jpa/aot-optimization/src/main/java/example/springdata/aot/AotJpaApp.java
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/jpa/aot-generation/src/main/java/example/springdata/aot/CLR.java b/jpa/aot-optimization/src/main/java/example/springdata/aot/CLR.java
similarity index 100%
rename from jpa/aot-generation/src/main/java/example/springdata/aot/CLR.java
rename to jpa/aot-optimization/src/main/java/example/springdata/aot/CLR.java
diff --git a/jpa/aot-generation/src/main/java/example/springdata/aot/Post.java b/jpa/aot-optimization/src/main/java/example/springdata/aot/Post.java
similarity index 96%
rename from jpa/aot-generation/src/main/java/example/springdata/aot/Post.java
rename to jpa/aot-optimization/src/main/java/example/springdata/aot/Post.java
index e950f2aa..5909cd1a 100644
--- a/jpa/aot-generation/src/main/java/example/springdata/aot/Post.java
+++ b/jpa/aot-optimization/src/main/java/example/springdata/aot/Post.java
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,14 +15,14 @@
  */
 package example.springdata.aot;
 
-import java.time.Instant;
-import java.time.temporal.ChronoUnit;
-import java.util.Random;
-
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.Random;
+
 /**
  * @author Christoph Strobl
  * @since 2025/01
diff --git a/jpa/aot-generation/src/main/java/example/springdata/aot/User.java b/jpa/aot-optimization/src/main/java/example/springdata/aot/User.java
similarity index 97%
rename from jpa/aot-generation/src/main/java/example/springdata/aot/User.java
rename to jpa/aot-optimization/src/main/java/example/springdata/aot/User.java
index 2a5d37d6..4f9f3357 100644
--- a/jpa/aot-generation/src/main/java/example/springdata/aot/User.java
+++ b/jpa/aot-optimization/src/main/java/example/springdata/aot/User.java
@@ -15,13 +15,11 @@
  */
 package example.springdata.aot;
 
-import java.time.Instant;
-import java.util.List;
-
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
-import jakarta.persistence.OneToMany;
+
+import java.time.Instant;
 
 /**
  * @author Christoph Strobl
diff --git a/jpa/aot-generation/src/main/java/example/springdata/aot/UserProjection.java b/jpa/aot-optimization/src/main/java/example/springdata/aot/UserProjection.java
similarity index 100%
rename from jpa/aot-generation/src/main/java/example/springdata/aot/UserProjection.java
rename to jpa/aot-optimization/src/main/java/example/springdata/aot/UserProjection.java
diff --git a/jpa/aot-generation/src/main/java/example/springdata/aot/UserRepository.java b/jpa/aot-optimization/src/main/java/example/springdata/aot/UserRepository.java
similarity index 100%
rename from jpa/aot-generation/src/main/java/example/springdata/aot/UserRepository.java
rename to jpa/aot-optimization/src/main/java/example/springdata/aot/UserRepository.java
diff --git a/jpa/aot-generation/src/main/resources/application.properties b/jpa/aot-optimization/src/main/resources/application.properties
similarity index 100%
rename from jpa/aot-generation/src/main/resources/application.properties
rename to jpa/aot-optimization/src/main/resources/application.properties
diff --git a/jpa/pom.xml b/jpa/pom.xml
index 622bb759..9b94d586 100644
--- a/jpa/pom.xml
+++ b/jpa/pom.xml
@@ -17,6 +17,7 @@
 	<inceptionYear>2011</inceptionYear>
 
 	<modules>
+		<module>aot-optimization</module>
 		<module>deferred</module>
 		<module>envers</module>
 		<module>example</module>
@@ -29,7 +30,6 @@
 		<module>vavr</module>
 		<module>multitenant</module>
 		<module>graalvm-native</module>
-		<module>aot-generation</module>
 	</modules>
 
 	<dependencies>
@@ -42,19 +42,16 @@
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-commons</artifactId>
-			<version>4.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-jpa</artifactId>
-			<version>4.0.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>jakarta.persistence</groupId>
 			<artifactId>jakarta.persistence-api</artifactId>
-			<version>3.2.0</version>
 		</dependency>
 
 		<dependency>
diff --git a/mongodb/aot-generation/pom.xml b/mongodb/aot-optimization/pom.xml
similarity index 59%
rename from mongodb/aot-generation/pom.xml
rename to mongodb/aot-optimization/pom.xml
index c7105144..675920bf 100644
--- a/mongodb/aot-generation/pom.xml
+++ b/mongodb/aot-optimization/pom.xml
@@ -10,45 +10,21 @@
     </parent>
 
     <groupId>org.example</groupId>
-    <artifactId>aot-generation</artifactId>
+    <artifactId>spring-data-mongodb-aot-optimization</artifactId>
 
     <properties>
         <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <spring-data-bom.version>2025.1.0-SNAPSHOT</spring-data-bom.version>
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-commons</artifactId>
-            <version>4.0.x-GENERATED-REPOSITORIES-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-mongodb</artifactId>
-            <version>5.0.0-GENERATED-REPOSITORIES-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mongodb</groupId>
-            <artifactId>bson</artifactId>
-            <version>5.3.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mongodb</groupId>
-            <artifactId>mongodb-driver-core</artifactId>
-            <version>5.3.1</version>
-        </dependency>   
-        <dependency>
-            <groupId>org.mongodb</groupId>
-            <artifactId>mongodb-driver-sync</artifactId>
-            <version>5.3.1</version>
-        </dependency> 
         <dependency>
             <groupId>org.jspecify</groupId>
             <artifactId>jspecify</artifactId>
             <version>1.0.0</version>
-        </dependency> 
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/mongodb/aot-generation/src/main/java/example/springdata/aot/App.java b/mongodb/aot-optimization/src/main/java/example/springdata/aot/App.java
similarity index 94%
rename from mongodb/aot-generation/src/main/java/example/springdata/aot/App.java
rename to mongodb/aot-optimization/src/main/java/example/springdata/aot/App.java
index b63c97cd..1f3c478a 100644
--- a/mongodb/aot-generation/src/main/java/example/springdata/aot/App.java
+++ b/mongodb/aot-optimization/src/main/java/example/springdata/aot/App.java
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/mongodb/aot-generation/src/main/java/example/springdata/aot/CLR.java b/mongodb/aot-optimization/src/main/java/example/springdata/aot/CLR.java
similarity index 100%
rename from mongodb/aot-generation/src/main/java/example/springdata/aot/CLR.java
rename to mongodb/aot-optimization/src/main/java/example/springdata/aot/CLR.java
diff --git a/mongodb/aot-generation/src/main/java/example/springdata/aot/Post.java b/mongodb/aot-optimization/src/main/java/example/springdata/aot/Post.java
similarity index 96%
rename from mongodb/aot-generation/src/main/java/example/springdata/aot/Post.java
rename to mongodb/aot-optimization/src/main/java/example/springdata/aot/Post.java
index 9ca0d2f6..10f5068b 100644
--- a/mongodb/aot-generation/src/main/java/example/springdata/aot/Post.java
+++ b/mongodb/aot-optimization/src/main/java/example/springdata/aot/Post.java
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/mongodb/aot-generation/src/main/java/example/springdata/aot/User.java b/mongodb/aot-optimization/src/main/java/example/springdata/aot/User.java
similarity index 100%
rename from mongodb/aot-generation/src/main/java/example/springdata/aot/User.java
rename to mongodb/aot-optimization/src/main/java/example/springdata/aot/User.java
diff --git a/mongodb/aot-generation/src/main/java/example/springdata/aot/UserProjection.java b/mongodb/aot-optimization/src/main/java/example/springdata/aot/UserProjection.java
similarity index 100%
rename from mongodb/aot-generation/src/main/java/example/springdata/aot/UserProjection.java
rename to mongodb/aot-optimization/src/main/java/example/springdata/aot/UserProjection.java
diff --git a/mongodb/aot-generation/src/main/java/example/springdata/aot/UserRepository.java b/mongodb/aot-optimization/src/main/java/example/springdata/aot/UserRepository.java
similarity index 68%
rename from mongodb/aot-generation/src/main/java/example/springdata/aot/UserRepository.java
rename to mongodb/aot-optimization/src/main/java/example/springdata/aot/UserRepository.java
index 0565148a..6a935551 100644
--- a/mongodb/aot-generation/src/main/java/example/springdata/aot/UserRepository.java
+++ b/mongodb/aot-optimization/src/main/java/example/springdata/aot/UserRepository.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package example.springdata.aot;
 
 import java.util.List;
diff --git a/mongodb/aot-generation/src/main/resources/spring.properties b/mongodb/aot-optimization/src/main/resources/application.properties
similarity index 100%
rename from mongodb/aot-generation/src/main/resources/spring.properties
rename to mongodb/aot-optimization/src/main/resources/application.properties
diff --git a/mongodb/aot-generation/src/main/resources/logback.xml b/mongodb/aot-optimization/src/main/resources/logback.xml
similarity index 100%
rename from mongodb/aot-generation/src/main/resources/logback.xml
rename to mongodb/aot-optimization/src/main/resources/logback.xml
diff --git a/mongodb/pom.xml b/mongodb/pom.xml
index 920f82fa..04d2c282 100644
--- a/mongodb/pom.xml
+++ b/mongodb/pom.xml
@@ -17,7 +17,8 @@
 	<inceptionYear>2011</inceptionYear>
 
 	<modules>
-	    <module>aggregation</module>
+		<module>aot-optimization</module>
+		<module>aggregation</module>
 		<!-- <module>change-streams</module> -->
 		<module>example</module>
 		<module>fluent-api</module>
@@ -36,7 +37,6 @@
 		<module>linking</module>
 		<module>util</module>
 		<module>fragment-spi</module>
-        <module>aot-generation</module>
     </modules>
 
 	<dependencyManagement>
diff --git a/pom.xml b/pom.xml
index d2ab97b6..9924b6c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,6 @@
 		<maven.compiler.source>21</maven.compiler.source>
 		<maven.compiler.target>21</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-data-bom.version>2025.1.0-SNAPSHOT</spring-data-bom.version>
 	</properties>
 
 	<profiles>