diff --git a/spring-data-elasticsearch/src/main/java/com/baeldung/config/Config.java b/spring-data-elasticsearch/src/main/java/com/baeldung/config/Config.java
index eb65e38f65..a67ec64534 100644
--- a/spring-data-elasticsearch/src/main/java/com/baeldung/config/Config.java
+++ b/spring-data-elasticsearch/src/main/java/com/baeldung/config/Config.java
@@ -17,7 +17,7 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 
 @Configuration
-@EnableElasticsearchRepositories(basePackages = "com.baeldung.dao")
+@EnableElasticsearchRepositories(basePackages = "com.baeldung.repository")
 @ComponentScan(basePackages = {"com.baeldung.service"})
 public class Config {
 
diff --git a/spring-data-elasticsearch/src/main/java/com/baeldung/model/Article.java b/spring-data-elasticsearch/src/main/java/com/baeldung/model/Article.java
index 17580ca0db..dee1d0817e 100644
--- a/spring-data-elasticsearch/src/main/java/com/baeldung/model/Article.java
+++ b/spring-data-elasticsearch/src/main/java/com/baeldung/model/Article.java
@@ -8,7 +8,7 @@ import org.springframework.data.elasticsearch.annotations.FieldType;
 
 import java.util.List;
 
-@Document(indexName = "article", type = "article")
+@Document(indexName = "blog", type = "article")
 public class Article {
 
     @Id
diff --git a/spring-data-elasticsearch/src/main/java/com/baeldung/repository/ArticleRepository.java b/spring-data-elasticsearch/src/main/java/com/baeldung/repository/ArticleRepository.java
new file mode 100644
index 0000000000..1cb74889c5
--- /dev/null
+++ b/spring-data-elasticsearch/src/main/java/com/baeldung/repository/ArticleRepository.java
@@ -0,0 +1,15 @@
+package com.baeldung.repository;
+
+import com.baeldung.model.Article;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.elasticsearch.annotations.Query;
+import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
+
+public interface ArticleRepository extends ElasticsearchRepository<Article, String> {
+
+    Page<Article> findByAuthorsName(String name, Pageable pageable);
+
+    @Query("{\"bool\": {\"must\": [{\"match\": {\"authors.name\": \"?0\"}}]}}")
+    Page<Article> findByAuthorsNameUsingCustomQuery(String name, Pageable pageable);
+}
diff --git a/spring-data-elasticsearch/src/main/java/com/baeldung/service/ArticleServiceImpl.java b/spring-data-elasticsearch/src/main/java/com/baeldung/service/ArticleServiceImpl.java
index 4dc100ec22..59feb2816c 100644
--- a/spring-data-elasticsearch/src/main/java/com/baeldung/service/ArticleServiceImpl.java
+++ b/spring-data-elasticsearch/src/main/java/com/baeldung/service/ArticleServiceImpl.java
@@ -1,6 +1,6 @@
 package com.baeldung.service;
 
-import com.baeldung.dao.ArticleRepository;
+import com.baeldung.repository.ArticleRepository;
 import com.baeldung.model.Article;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;