diff --git a/persistence-modules/spring-data-jpa-query-2/README.md b/persistence-modules/spring-data-jpa-query-2/README.md
index db1d0cd4c7..a433727a56 100644
--- a/persistence-modules/spring-data-jpa-query-2/README.md
+++ b/persistence-modules/spring-data-jpa-query-2/README.md
@@ -4,7 +4,6 @@ This module contains articles about querying data using Spring Data JPA .
 
 ### Relevant Articles:
 
-- [Use Criteria Queries in a Spring Data Application](https://www.baeldung.com/spring-data-criteria-queries)
 - [Hibernate Pagination](https://www.baeldung.com/hibernate-pagination)
 - [Sorting with Hibernate](https://www.baeldung.com/hibernate-sort)
 - [Stored Procedures with Hibernate](https://www.baeldung.com/stored-procedures-with-hibernate-tutorial)
diff --git a/persistence-modules/spring-data-jpa-query/README.md b/persistence-modules/spring-data-jpa-query/README.md
index db923dd56a..d3958fa183 100644
--- a/persistence-modules/spring-data-jpa-query/README.md
+++ b/persistence-modules/spring-data-jpa-query/README.md
@@ -9,6 +9,7 @@ This module contains articles about querying data using Spring Data JPA
 - [Spring Data JPA Query by Example](https://www.baeldung.com/spring-data-query-by-example)
 - [JPA Join Types](https://www.baeldung.com/jpa-join-types)
 - [Spring Data JPA and Named Entity Graphs](https://www.baeldung.com/spring-data-jpa-named-entity-graphs)
+- [Use Criteria Queries in a Spring Data Application](https://www.baeldung.com/spring-data-criteria-queries)
 - More articles: [[more -->]](../spring-data-jpa-query-2)
 
 ### Eclipse Config 
diff --git a/persistence-modules/spring-data-jpa-query-2/src/main/java/com/baeldung/criteriaquery/Book.java b/persistence-modules/spring-data-jpa-query/src/main/java/com/baeldung/criteriaquery/Book.java
similarity index 100%
rename from persistence-modules/spring-data-jpa-query-2/src/main/java/com/baeldung/criteriaquery/Book.java
rename to persistence-modules/spring-data-jpa-query/src/main/java/com/baeldung/criteriaquery/Book.java
diff --git a/persistence-modules/spring-data-jpa-query-2/src/main/java/com/baeldung/criteriaquery/BookRepository.java b/persistence-modules/spring-data-jpa-query/src/main/java/com/baeldung/criteriaquery/BookRepository.java
similarity index 100%
rename from persistence-modules/spring-data-jpa-query-2/src/main/java/com/baeldung/criteriaquery/BookRepository.java
rename to persistence-modules/spring-data-jpa-query/src/main/java/com/baeldung/criteriaquery/BookRepository.java
diff --git a/persistence-modules/spring-data-jpa-query-2/src/main/java/com/baeldung/criteriaquery/BookRepositoryCustom.java b/persistence-modules/spring-data-jpa-query/src/main/java/com/baeldung/criteriaquery/BookRepositoryCustom.java
similarity index 100%
rename from persistence-modules/spring-data-jpa-query-2/src/main/java/com/baeldung/criteriaquery/BookRepositoryCustom.java
rename to persistence-modules/spring-data-jpa-query/src/main/java/com/baeldung/criteriaquery/BookRepositoryCustom.java
diff --git a/persistence-modules/spring-data-jpa-query-2/src/main/java/com/baeldung/criteriaquery/BookRepositoryImpl.java b/persistence-modules/spring-data-jpa-query/src/main/java/com/baeldung/criteriaquery/BookRepositoryImpl.java
similarity index 100%
rename from persistence-modules/spring-data-jpa-query-2/src/main/java/com/baeldung/criteriaquery/BookRepositoryImpl.java
rename to persistence-modules/spring-data-jpa-query/src/main/java/com/baeldung/criteriaquery/BookRepositoryImpl.java
diff --git a/persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/criteriaquery/CriteriaQueryIntegrationTest.java b/persistence-modules/spring-data-jpa-query/src/test/java/com/baeldung/criteriaquery/CriteriaQueryIntegrationTest.java
similarity index 100%
rename from persistence-modules/spring-data-jpa-query-2/src/test/java/com/baeldung/criteriaquery/CriteriaQueryIntegrationTest.java
rename to persistence-modules/spring-data-jpa-query/src/test/java/com/baeldung/criteriaquery/CriteriaQueryIntegrationTest.java