3 files changed, 6 insertions, 8 deletions
diff --git a/search/search_tests/house_numbers_matcher_test.cpp b/search/search_tests/house_numbers_matcher_test.cpp
index 6a4573f0bf..90485b0755 100644
--- a/search/search_tests/house_numbers_matcher_test.cpp
+++ b/search/search_tests/house_numbers_matcher_test.cpp
@@ -1,13 +1,13 @@
 #include "testing/testing.hpp"
 
-#include "search/v2/house_numbers_matcher.hpp"
+#include "search/house_numbers_matcher.hpp"
 
 #include "std/vector.hpp"
 
 #include "base/string_utils.hpp"
 
 using namespace strings;
-using namespace search::v2;
+using namespace search;
 
 namespace
 {
@@ -28,7 +28,7 @@ bool HouseNumbersMatch(string const & houseNumber, string const & query, bool qu
 {
   vector<Parse> queryParses;
   ParseQuery(MakeUniString(query), queryIsPrefix, queryParses);
-  return search::v2::HouseNumbersMatch(MakeUniString(houseNumber), queryParses);
+  return search::HouseNumbersMatch(MakeUniString(houseNumber), queryParses);
 }
 
 bool CheckTokenizer(string const & utf8s, vector<string> const & expected)
diff --git a/search/search_tests/locality_scorer_test.cpp b/search/search_tests/locality_scorer_test.cpp
index 5021e24af7..7223c73431 100644
--- a/search/search_tests/locality_scorer_test.cpp
+++ b/search/search_tests/locality_scorer_test.cpp
@@ -1,6 +1,6 @@
 #include "testing/testing.hpp"
 
-#include "search/v2/locality_scorer.hpp"
+#include "search/locality_scorer.hpp"
 
 #include "indexer/search_delimiters.hpp"
 #include "indexer/search_string_utils.hpp"
@@ -15,7 +15,6 @@
 #include "std/unordered_map.hpp"
 #include "std/vector.hpp"
 
-using namespace search::v2;
 using namespace search;
 using namespace strings;
 
diff --git a/search/search_tests/ranking_tests.cpp b/search/search_tests/ranking_tests.cpp
index bc92c2a4b9..7c1df97352 100644
--- a/search/search_tests/ranking_tests.cpp
+++ b/search/search_tests/ranking_tests.cpp
@@ -1,8 +1,8 @@
 #include "testing/testing.hpp"
 
 #include "search/query_params.hpp"
-#include "search/v2/ranking_utils.hpp"
-#include "search/v2/token_slice.hpp"
+#include "search/ranking_utils.hpp"
+#include "search/token_slice.hpp"
 
 #include "indexer/search_delimiters.hpp"
 #include "indexer/search_string_utils.hpp"
@@ -13,7 +13,6 @@
 #include "std/string.hpp"
 
 using namespace search;
-using namespace search::v2;
 using namespace strings;
 
 namespace