diff --git a/indexer/indexer_tool/feature_bucketer.hpp b/indexer/indexer_tool/feature_bucketer.hpp
index ecfcbc4f58..dd54ca9121 100644
--- a/indexer/indexer_tool/feature_bucketer.hpp
+++ b/indexer/indexer_tool/feature_bucketer.hpp
@@ -8,13 +8,12 @@
 
 #include "../../indexer/feature.hpp"
 #include "../../indexer/feature_visibility.hpp"
+#include "../../storage/defines.hpp"
 
 #include "../../std/string.hpp"
 
 #include <boost/scoped_ptr.hpp>
 
-#define WORLD_FILE_NAME "world"
-
 namespace feature
 {
 
diff --git a/storage/defines.hpp b/storage/defines.hpp
index 72ff795b07..1b55202d1c 100644
--- a/storage/defines.hpp
+++ b/storage/defines.hpp
@@ -8,9 +8,11 @@
 #define INDEX_FILE_TAG "idx"
 #define HEADER_FILE_TAG "header"
 
-
-//#define WORLD_DATA_FILE "world" DATA_FILE_EXTENSION
-
-#define COUNTRIES_FILE  "countries_poly.txt"
+// used with "file name = country name" engine
+//#define COUNTRIES_FILE  "countries_poly.txt"
+// used with bucket storage engine
+#define COUNTRIES_FILE  "countries.txt"
 #define UPDATE_CHECK_FILE "maps.update"
 #define UPDATE_BASE_URL "http://melnichek.ath.cx:34568/maps/"
+
+#define WORLD_FILE_NAME "World"