diff --git a/indexer/indexer.pro b/indexer/indexer.pro
index c05a86e8af..272e104e6c 100644
--- a/indexer/indexer.pro
+++ b/indexer/indexer.pro
@@ -80,5 +80,5 @@ HEADERS += \
     feature_loader_base.hpp \
     feature_loader.hpp \
     search_trie.hpp \
-    string_search_utils.hpp \
+    search_string_utils.hpp \
     search_delimiters.hpp \
diff --git a/indexer/search_delimiters.cpp b/indexer/search_delimiters.cpp
index 6c70a79bd9..237942dc5b 100644
--- a/indexer/search_delimiters.cpp
+++ b/indexer/search_delimiters.cpp
@@ -1,4 +1,4 @@
-#include "delimiters.hpp"
+#include "search_delimiters.hpp"
 
 namespace search
 {
diff --git a/indexer/search_index_builder.cpp b/indexer/search_index_builder.cpp
index 74a5c47d0c..e542c3fa3b 100644
--- a/indexer/search_index_builder.cpp
+++ b/indexer/search_index_builder.cpp
@@ -1,7 +1,7 @@
 #include "search_index_builder.hpp"
 #include "features_vector.hpp"
 #include "search_trie.hpp"
-#include "string_search_utils.hpp"
+#include "search_string_utils.hpp"
 
 #include "../defines.hpp"
 
diff --git a/indexer/string_search_utils.hpp b/indexer/search_string_utils.hpp
similarity index 100%
rename from indexer/string_search_utils.hpp
rename to indexer/search_string_utils.hpp
diff --git a/search/approximate_string_match.hpp b/search/approximate_string_match.hpp
index edc8ab0f71..493b643ff0 100644
--- a/search/approximate_string_match.hpp
+++ b/search/approximate_string_match.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "../indexer/string_search_utils.hpp"
+#include "../indexer/search_string_utils.hpp"
 #include "../base/base.hpp"
 #include "../base/buffer_vector.hpp"
 #include "../std/queue.hpp"
diff --git a/search/keyword_matcher.cpp b/search/keyword_matcher.cpp
index 6f6ec51a81..c8137ed8ed 100644
--- a/search/keyword_matcher.cpp
+++ b/search/keyword_matcher.cpp
@@ -1,6 +1,6 @@
 #include "keyword_matcher.hpp"
 #include "../indexer/search_delimiters.hpp"
-#include "../indexer/string_search_utils.hpp"
+#include "../indexer/search_string_utils.hpp"
 #include "../base/logging.hpp"
 #include "../base/string_utils.hpp"
 #include "../std/bind.hpp"
diff --git a/search/query.cpp b/search/query.cpp
index ddbaf6a42b..1aa6262f72 100644
--- a/search/query.cpp
+++ b/search/query.cpp
@@ -6,7 +6,7 @@
 #include "../indexer/feature_visibility.hpp"
 #include "../indexer/scales.hpp"
 #include "../indexer/search_delimiters.hpp"
-#include "../indexer/string_search_utils.hpp"
+#include "../indexer/search_string_utils.hpp"
 
 #include "../base/exception.hpp"
 #include "../base/stl_add.hpp"
diff --git a/search/search_tests/keyword_matcher_test.cpp b/search/search_tests/keyword_matcher_test.cpp
index fa8e3356ca..94181f50e1 100644
--- a/search/search_tests/keyword_matcher_test.cpp
+++ b/search/search_tests/keyword_matcher_test.cpp
@@ -2,7 +2,7 @@
 #include "../keyword_matcher.hpp"
 #include "match_cost_mock.hpp"
 #include "../approximate_string_match.hpp"
-#include "../../indexer/string_search_utils.hpp"
+#include "../../indexer/search_string_utils.hpp"
 #include "../../testing/testing_utils.hpp"
 #include "../../base/string_utils.hpp"
 #include "../../std/scoped_ptr.hpp"
diff --git a/search/search_trie_matching.cpp b/search/search_trie_matching.cpp
index 00ac3901e8..eea1d24e3b 100644
--- a/search/search_trie_matching.cpp
+++ b/search/search_trie_matching.cpp
@@ -2,7 +2,7 @@
 #include "query.hpp"
 
 #include "../indexer/feature_visibility.hpp"
-#include "../indexer/string_search_utils.hpp"
+#include "../indexer/search_string_utils.hpp"
 
 #include "../std/algorithm.hpp"
 #include "../std/functional.hpp"