diff --git a/persistence-modules/spring-data-elasticsearch/src/main/java/com/baeldung/spring/data/es/termsqueries/config/ElasticsearchConfiguration.java b/persistence-modules/spring-data-elasticsearch-2/src/main/java/com/baeldung/termsqueries/config/ElasticsearchConfiguration.java
similarity index 96%
rename from persistence-modules/spring-data-elasticsearch/src/main/java/com/baeldung/spring/data/es/termsqueries/config/ElasticsearchConfiguration.java
rename to persistence-modules/spring-data-elasticsearch-2/src/main/java/com/baeldung/termsqueries/config/ElasticsearchConfiguration.java
index fa4d7413bd7e..881968e524d6 100644
--- a/persistence-modules/spring-data-elasticsearch/src/main/java/com/baeldung/spring/data/es/termsqueries/config/ElasticsearchConfiguration.java
+++ b/persistence-modules/spring-data-elasticsearch-2/src/main/java/com/baeldung/termsqueries/config/ElasticsearchConfiguration.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring.data.es.termsqueries.config;
+package com.baeldung.termsqueries.config;
 
 import co.elastic.clients.elasticsearch.ElasticsearchClient;
 import co.elastic.clients.json.jackson.JacksonJsonpMapper;
diff --git a/persistence-modules/spring-data-elasticsearch/src/main/java/com/baeldung/spring/data/es/termsqueries/model/User.java b/persistence-modules/spring-data-elasticsearch-2/src/main/java/com/baeldung/termsqueries/model/User.java
similarity index 91%
rename from persistence-modules/spring-data-elasticsearch/src/main/java/com/baeldung/spring/data/es/termsqueries/model/User.java
rename to persistence-modules/spring-data-elasticsearch-2/src/main/java/com/baeldung/termsqueries/model/User.java
index ab42fce3fee4..b71ff6d52069 100644
--- a/persistence-modules/spring-data-elasticsearch/src/main/java/com/baeldung/spring/data/es/termsqueries/model/User.java
+++ b/persistence-modules/spring-data-elasticsearch-2/src/main/java/com/baeldung/termsqueries/model/User.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring.data.es.termsqueries.model;
+package com.baeldung.termsqueries.model;
 
 import lombok.Data;
 import org.springframework.data.annotation.Id;
diff --git a/persistence-modules/spring-data-elasticsearch/src/main/java/com/baeldung/spring/data/es/termsqueries/repository/UserRepository.java b/persistence-modules/spring-data-elasticsearch-2/src/main/java/com/baeldung/termsqueries/repository/UserRepository.java
similarity index 68%
rename from persistence-modules/spring-data-elasticsearch/src/main/java/com/baeldung/spring/data/es/termsqueries/repository/UserRepository.java
rename to persistence-modules/spring-data-elasticsearch-2/src/main/java/com/baeldung/termsqueries/repository/UserRepository.java
index 780bf1bdfc11..2bdc79f69a36 100644
--- a/persistence-modules/spring-data-elasticsearch/src/main/java/com/baeldung/spring/data/es/termsqueries/repository/UserRepository.java
+++ b/persistence-modules/spring-data-elasticsearch-2/src/main/java/com/baeldung/termsqueries/repository/UserRepository.java
@@ -1,6 +1,6 @@
-package com.baeldung.spring.data.es.termsqueries.repository;
+package com.baeldung.termsqueries.repository;
 
-import com.baeldung.spring.data.es.termsqueries.model.User;
+import com.baeldung.termsqueries.model.User;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
 
 import java.util.List;
diff --git a/persistence-modules/spring-data-elasticsearch/src/test/java/com/baeldung/spring/data/es/termsqueries/ElasticSearchTermsQueriesManualTest.java b/persistence-modules/spring-data-elasticsearch-2/src/test/java/com/baeldung/termsqueries/ElasticSearchTermsQueriesManualTest.java
similarity index 91%
rename from persistence-modules/spring-data-elasticsearch/src/test/java/com/baeldung/spring/data/es/termsqueries/ElasticSearchTermsQueriesManualTest.java
rename to persistence-modules/spring-data-elasticsearch-2/src/test/java/com/baeldung/termsqueries/ElasticSearchTermsQueriesManualTest.java
index ef32f87fa81c..a0224db70a31 100644
--- a/persistence-modules/spring-data-elasticsearch/src/test/java/com/baeldung/spring/data/es/termsqueries/ElasticSearchTermsQueriesManualTest.java
+++ b/persistence-modules/spring-data-elasticsearch-2/src/test/java/com/baeldung/termsqueries/ElasticSearchTermsQueriesManualTest.java
@@ -1,4 +1,4 @@
-package com.baeldung.spring.data.es.termsqueries;
+package com.baeldung.termsqueries;
 
 import co.elastic.clients.elasticsearch.ElasticsearchClient;
 import co.elastic.clients.elasticsearch._types.aggregations.Aggregation;
@@ -10,9 +10,9 @@
 import co.elastic.clients.elasticsearch.core.SearchRequest;
 import co.elastic.clients.elasticsearch.core.SearchResponse;
 import co.elastic.clients.elasticsearch.core.search.Hit;
-import com.baeldung.spring.data.es.termsqueries.config.ElasticsearchConfiguration;
-import com.baeldung.spring.data.es.termsqueries.model.User;
-import com.baeldung.spring.data.es.termsqueries.repository.UserRepository;
+import com.baeldung.termsqueries.config.ElasticsearchConfiguration;
+import com.baeldung.termsqueries.model.User;
+import com.baeldung.termsqueries.repository.UserRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,8 +57,7 @@ void givenAdminRoleAndActiveStatusFilter_whenSearch_thenReturnsOnlyActiveAdmins(
           .satisfies(source -> {
             assertThat(source)
               .isNotNull()
-              .values()
-              .containsExactly("1", "Alice", "admin", true);
+              .containsValues("1", "Alice", "admin", true);
           });
     }
 
diff --git a/persistence-modules/spring-data-elasticsearch/src/test/resources/application.yml b/persistence-modules/spring-data-elasticsearch-2/src/test/resources/application.yml
similarity index 100%
rename from persistence-modules/spring-data-elasticsearch/src/test/resources/application.yml
rename to persistence-modules/spring-data-elasticsearch-2/src/test/resources/application.yml