diff --git a/CMakeLists.txt b/CMakeLists.txt
index 81a66e89ad..c592c983f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -271,7 +271,6 @@ add_subdirectory(coding)
 add_subdirectory(drape)
 add_subdirectory(drape_frontend)
 add_subdirectory(editor)
-add_subdirectory(eye)
 add_subdirectory(generator/mwm_diff)
 add_subdirectory(geocoder)
 add_subdirectory(geometry)
@@ -279,6 +278,7 @@ add_subdirectory(indexer)
 add_subdirectory(kml)
 add_subdirectory(local_ads)
 add_subdirectory(map)
+add_subdirectory(metrics)
 add_subdirectory(partners_api)
 add_subdirectory(platform)
 add_subdirectory(routing)
diff --git a/android/jni/CMakeLists.txt b/android/jni/CMakeLists.txt
index 4f2a61fe7c..85517b3c5d 100644
--- a/android/jni/CMakeLists.txt
+++ b/android/jni/CMakeLists.txt
@@ -117,7 +117,7 @@ target_link_libraries(
   kml
   editor
   indexer
-  eye
+  metrics
   platform
   partners_api
   local_ads
diff --git a/map/framework.hpp b/map/framework.hpp
index 6e403a64dd..21b1d3b0e1 100644
--- a/map/framework.hpp
+++ b/map/framework.hpp
@@ -58,7 +58,7 @@
 #include "partners_api/taxi_engine.hpp"
 #include "partners_api/viator_api.hpp"
 
-#include "eye/eye_info.hpp"
+#include "metrics/eye_info.hpp"
 
 #include "platform/country_defines.hpp"
 #include "platform/location.hpp"
diff --git a/map/map_tests/CMakeLists.txt b/map/map_tests/CMakeLists.txt
index d9a2b89ba6..ce114728e5 100644
--- a/map/map_tests/CMakeLists.txt
+++ b/map/map_tests/CMakeLists.txt
@@ -30,7 +30,7 @@ omim_add_test(${PROJECT_NAME} ${SRC})
 
 omim_link_libraries(
   ${PROJECT_NAME}
-  eye_tests_support
+  metrics_tests_support
   search_tests_support
   editor_tests_support
   generator_tests_support
@@ -46,7 +46,7 @@ omim_link_libraries(
   routing_common
   search
   storage
-  eye
+  metrics
   mwm_diff
   bsdiff
   ugc
diff --git a/map/map_tests/tips_tests.cpp b/map/map_tests/tips_tests.cpp
index 66df525f90..bf0b01f489 100644
--- a/map/map_tests/tips_tests.cpp
+++ b/map/map_tests/tips_tests.cpp
@@ -2,9 +2,9 @@
 
 #include "map/tips_api.hpp"
 
-#include "eye/eye_tests_support/eye_for_testing.hpp"
+#include "metrics/metrics_tests_support/eye_for_testing.hpp"
 
-#include "eye/eye.hpp"
+#include "metrics/eye.hpp"
 
 #include <algorithm>
 
diff --git a/map/tips_api.cpp b/map/tips_api.cpp
index 6d0bd8fed0..5c1c477bd0 100644
--- a/map/tips_api.cpp
+++ b/map/tips_api.cpp
@@ -1,6 +1,6 @@
 #include "map/tips_api.hpp"
 
-#include "eye/eye.hpp"
+#include "metrics/eye.hpp"
 
 #include "platform/platform.hpp"
 
diff --git a/map/tips_api.hpp b/map/tips_api.hpp
index a9ed04799d..c48ba90af3 100644
--- a/map/tips_api.hpp
+++ b/map/tips_api.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "eye/eye_info.hpp"
+#include "metrics/eye_info.hpp"
 
 #include <array>
 #include <chrono>
diff --git a/eye/CMakeLists.txt b/metrics/CMakeLists.txt
similarity index 66%
rename from eye/CMakeLists.txt
rename to metrics/CMakeLists.txt
index bd3101f95e..d29c30fb99 100644
--- a/eye/CMakeLists.txt
+++ b/metrics/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(eye)
+project(metrics)
 
 include_directories(${OMIM_ROOT}/3party/jansson/src)
 
@@ -15,5 +15,5 @@ set(
 
 omim_add_library(${PROJECT_NAME} ${SRC})
 
-omim_add_test_subdirectory(eye_tests)
-omim_add_test_subdirectory(eye_tests_support)
+omim_add_test_subdirectory(metrics_tests)
+omim_add_test_subdirectory(metrics_tests_support)
diff --git a/eye/eye.cpp b/metrics/eye.cpp
similarity index 95%
rename from eye/eye.cpp
rename to metrics/eye.cpp
index b5d6cd1e10..7015a86dd5 100644
--- a/eye/eye.cpp
+++ b/metrics/eye.cpp
@@ -1,6 +1,6 @@
-#include "eye/eye.hpp"
-#include "eye/eye_serdes.hpp"
-#include "eye/eye_storage.hpp"
+#include "metrics/eye.hpp"
+#include "metrics/eye_serdes.hpp"
+#include "metrics/eye_storage.hpp"
 
 #include "platform/platform.hpp"
 
diff --git a/eye/eye.hpp b/metrics/eye.hpp
similarity index 96%
rename from eye/eye.hpp
rename to metrics/eye.hpp
index c9330ba7e9..7ec0d6a5e2 100644
--- a/eye/eye.hpp
+++ b/metrics/eye.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "eye/eye_info.hpp"
+#include "metrics/eye_info.hpp"
 
 #include "base/atomic_shared_ptr.hpp"
 #include "base/macros.hpp"
diff --git a/eye/eye_info.hpp b/metrics/eye_info.hpp
similarity index 100%
rename from eye/eye_info.hpp
rename to metrics/eye_info.hpp
diff --git a/eye/eye_serdes.cpp b/metrics/eye_serdes.cpp
similarity index 97%
rename from eye/eye_serdes.cpp
rename to metrics/eye_serdes.cpp
index 262031e86d..edb6ee44b3 100644
--- a/eye/eye_serdes.cpp
+++ b/metrics/eye_serdes.cpp
@@ -1,4 +1,4 @@
-#include "eye/eye_serdes.hpp"
+#include "metrics/eye_serdes.hpp"
 
 #include "coding/reader.hpp"
 #include "coding/serdes_json.hpp"
diff --git a/eye/eye_serdes.hpp b/metrics/eye_serdes.hpp
similarity index 91%
rename from eye/eye_serdes.hpp
rename to metrics/eye_serdes.hpp
index b37d9c6f40..46e72d04f8 100644
--- a/eye/eye_serdes.hpp
+++ b/metrics/eye_serdes.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "eye/eye_info.hpp"
+#include "metrics/eye_info.hpp"
 
 #include "base/exception.hpp"
 
diff --git a/eye/eye_storage.cpp b/metrics/eye_storage.cpp
similarity index 96%
rename from eye/eye_storage.cpp
rename to metrics/eye_storage.cpp
index 31e44fff02..4bba92b3db 100644
--- a/eye/eye_storage.cpp
+++ b/metrics/eye_storage.cpp
@@ -1,4 +1,4 @@
-#include "eye/eye_storage.hpp"
+#include "metrics/eye_storage.hpp"
 
 #include "platform/platform.hpp"
 
diff --git a/eye/eye_storage.hpp b/metrics/eye_storage.hpp
similarity index 100%
rename from eye/eye_storage.hpp
rename to metrics/eye_storage.hpp
diff --git a/eye/eye_tests/CMakeLists.txt b/metrics/metrics_tests/CMakeLists.txt
similarity index 78%
rename from eye/eye_tests/CMakeLists.txt
rename to metrics/metrics_tests/CMakeLists.txt
index 30cfb458d7..95ddec4488 100644
--- a/eye/eye_tests/CMakeLists.txt
+++ b/metrics/metrics_tests/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(eye_tests)
+project(metrics_tests)
 
 set(
   SRC
@@ -8,8 +8,8 @@ set(
 omim_add_test(${PROJECT_NAME} ${SRC})
 omim_link_libraries(
   ${PROJECT_NAME}
-  eye_tests_support
-  eye
+  metrics_tests_support
+  metrics
   platform
   coding
   base
diff --git a/eye/eye_tests/eye_tests.cpp b/metrics/metrics_tests/eye_tests.cpp
similarity index 95%
rename from eye/eye_tests/eye_tests.cpp
rename to metrics/metrics_tests/eye_tests.cpp
index a537138351..fb29e950a1 100644
--- a/eye/eye_tests/eye_tests.cpp
+++ b/metrics/metrics_tests/eye_tests.cpp
@@ -1,11 +1,11 @@
 #include "testing/testing.hpp"
 
-#include "eye/eye.hpp"
-#include "eye/eye_info.hpp"
-#include "eye/eye_serdes.hpp"
-#include "eye/eye_storage.hpp"
+#include "metrics/eye.hpp"
+#include "metrics/eye_info.hpp"
+#include "metrics/eye_serdes.hpp"
+#include "metrics/eye_storage.hpp"
 
-#include "eye/eye_tests_support/eye_for_testing.hpp"
+#include "metrics/metrics_tests_support/eye_for_testing.hpp"
 
 using namespace eye;
 
diff --git a/eye/eye_tests_support/CMakeLists.txt b/metrics/metrics_tests_support/CMakeLists.txt
similarity index 76%
rename from eye/eye_tests_support/CMakeLists.txt
rename to metrics/metrics_tests_support/CMakeLists.txt
index a4da979689..8622ec56aa 100644
--- a/eye/eye_tests_support/CMakeLists.txt
+++ b/metrics/metrics_tests_support/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(eye_tests_support)
+project(metrics_tests_support)
 
 set(
   SRC
diff --git a/eye/eye_tests_support/eye_for_testing.cpp b/metrics/metrics_tests_support/eye_for_testing.cpp
similarity index 80%
rename from eye/eye_tests_support/eye_for_testing.cpp
rename to metrics/metrics_tests_support/eye_for_testing.cpp
index 7f77ba5c71..9131dd38c5 100644
--- a/eye/eye_tests_support/eye_for_testing.cpp
+++ b/metrics/metrics_tests_support/eye_for_testing.cpp
@@ -1,7 +1,7 @@
-#include "eye/eye_tests_support/eye_for_testing.hpp"
+#include "metrics/metrics_tests_support/eye_for_testing.hpp"
 
-#include "eye/eye.hpp"
-#include "eye/eye_storage.hpp"
+#include "metrics/eye.hpp"
+#include "metrics/eye_storage.hpp"
 
 #include "coding/internal/file_data.hpp"
 
diff --git a/eye/eye_tests_support/eye_for_testing.hpp b/metrics/metrics_tests_support/eye_for_testing.hpp
similarity index 91%
rename from eye/eye_tests_support/eye_for_testing.hpp
rename to metrics/metrics_tests_support/eye_for_testing.hpp
index 98f6d3897e..448d063e55 100644
--- a/eye/eye_tests_support/eye_for_testing.hpp
+++ b/metrics/metrics_tests_support/eye_for_testing.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "eye/eye_info.hpp"
+#include "metrics/eye_info.hpp"
 
 namespace eye
 {
diff --git a/xcode/eye/eye.xcodeproj/project.pbxproj b/xcode/eye/metrics.xcodeproj/project.pbxproj
similarity index 89%
rename from xcode/eye/eye.xcodeproj/project.pbxproj
rename to xcode/eye/metrics.xcodeproj/project.pbxproj
index 82b1342e4e..78ee1c2119 100644
--- a/xcode/eye/eye.xcodeproj/project.pbxproj
+++ b/xcode/eye/metrics.xcodeproj/project.pbxproj
@@ -17,8 +17,8 @@
 		3D4F457221354E3A0005E765 /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D4F457121354E3A0005E765 /* libbase.a */; };
 		3D4F457421354E430005E765 /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D4F457321354E430005E765 /* libcoding.a */; };
 		3D4F457621354E4B0005E765 /* libplatform.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D4F457521354E4B0005E765 /* libplatform.a */; };
-		3D4F457721354E530005E765 /* libeye_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D4F4564213542130005E765 /* libeye_tests_support.a */; };
-		3D4F457821354E530005E765 /* libeye.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D4F44FB21345FC50005E765 /* libeye.a */; };
+		3D4F457721354E530005E765 /* libmetrics_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D4F4564213542130005E765 /* libmetrics_tests_support.a */; };
+		3D4F457821354E530005E765 /* libmetrics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D4F44FB21345FC50005E765 /* libmetrics.a */; };
 		3D4F457A21354EB70005E765 /* libalohalitics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D4F457921354EB70005E765 /* libalohalitics.a */; };
 		3D4F457C21354F150005E765 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D4F457B21354F150005E765 /* libz.tbd */; };
 /* End PBXBuildFile section */
@@ -45,7 +45,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		3D4F44FB21345FC50005E765 /* libeye.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libeye.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		3D4F44FB21345FC50005E765 /* libmetrics.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libmetrics.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		3D4F450E2134606B0005E765 /* eye_serdes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = eye_serdes.cpp; sourceTree = "<group>"; };
 		3D4F450F2134606B0005E765 /* eye_storage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = eye_storage.cpp; sourceTree = "<group>"; };
 		3D4F45152134606B0005E765 /* eye_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = eye_info.hpp; sourceTree = "<group>"; };
@@ -55,10 +55,10 @@
 		3D4F45202134606B0005E765 /* eye_serdes.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = eye_serdes.hpp; sourceTree = "<group>"; };
 		3D4F453621353F290005E765 /* common-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = "<group>"; };
 		3D4F453721353F290005E765 /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = "<group>"; };
-		3D4F4541213540F50005E765 /* eye_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = eye_tests.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		3D4F4541213540F50005E765 /* metrics_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = metrics_tests.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		3D4F4553213541280005E765 /* eye_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = eye_tests.cpp; sourceTree = "<group>"; };
 		3D4F4555213541460005E765 /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = "<group>"; };
-		3D4F4564213542130005E765 /* libeye_tests_support.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libeye_tests_support.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		3D4F4564213542130005E765 /* libmetrics_tests_support.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libmetrics_tests_support.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		3D4F4566213542700005E765 /* eye_for_testing.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = eye_for_testing.cpp; sourceTree = "<group>"; };
 		3D4F4567213542700005E765 /* eye_for_testing.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = eye_for_testing.hpp; sourceTree = "<group>"; };
 		3D4F456F21354E0C0005E765 /* libjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libjansson.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -81,8 +81,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				3D4F457721354E530005E765 /* libeye_tests_support.a in Frameworks */,
-				3D4F457821354E530005E765 /* libeye.a in Frameworks */,
+				3D4F457721354E530005E765 /* libmetrics_tests_support.a in Frameworks */,
+				3D4F457821354E530005E765 /* libmetrics.a in Frameworks */,
 				3D4F457621354E4B0005E765 /* libplatform.a in Frameworks */,
 				3D4F457421354E430005E765 /* libcoding.a in Frameworks */,
 				3D4F457221354E3A0005E765 /* libbase.a in Frameworks */,
@@ -105,11 +105,11 @@
 		3D4F44F221345FC50005E765 = {
 			isa = PBXGroup;
 			children = (
-				3D4F4565213542480005E765 /* eye_tests_support */,
 				3D4F453621353F290005E765 /* common-debug.xcconfig */,
 				3D4F453721353F290005E765 /* common-release.xcconfig */,
-				3D4F450D2134606B0005E765 /* eye */,
-				3D4F4542213540F50005E765 /* eye_tests */,
+				3D4F450D2134606B0005E765 /* metrics */,
+				3D4F4542213540F50005E765 /* metrics_tests */,
+				3D4F4565213542480005E765 /* metrics_tests_support */,
 				3D4F44FC21345FC50005E765 /* Products */,
 				3D4F456E21354E0C0005E765 /* Frameworks */,
 			);
@@ -118,14 +118,14 @@
 		3D4F44FC21345FC50005E765 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				3D4F44FB21345FC50005E765 /* libeye.a */,
-				3D4F4541213540F50005E765 /* eye_tests.app */,
-				3D4F4564213542130005E765 /* libeye_tests_support.a */,
+				3D4F44FB21345FC50005E765 /* libmetrics.a */,
+				3D4F4541213540F50005E765 /* metrics_tests.app */,
+				3D4F4564213542130005E765 /* libmetrics_tests_support.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
-		3D4F450D2134606B0005E765 /* eye */ = {
+		3D4F450D2134606B0005E765 /* metrics */ = {
 			isa = PBXGroup;
 			children = (
 				3D4F450E2134606B0005E765 /* eye_serdes.cpp */,
@@ -136,28 +136,28 @@
 				3D4F451F2134606B0005E765 /* eye_storage.hpp */,
 				3D4F45202134606B0005E765 /* eye_serdes.hpp */,
 			);
-			name = eye;
-			path = ../../eye;
+			name = metrics;
+			path = ../../metrics;
 			sourceTree = "<group>";
 		};
-		3D4F4542213540F50005E765 /* eye_tests */ = {
+		3D4F4542213540F50005E765 /* metrics_tests */ = {
 			isa = PBXGroup;
 			children = (
 				3D4F4555213541460005E765 /* testingmain.cpp */,
 				3D4F4553213541280005E765 /* eye_tests.cpp */,
 			);
-			name = eye_tests;
-			path = ../../eye/eye_tests;
+			name = metrics_tests;
+			path = ../../metrics/metrics_tests;
 			sourceTree = "<group>";
 		};
-		3D4F4565213542480005E765 /* eye_tests_support */ = {
+		3D4F4565213542480005E765 /* metrics_tests_support */ = {
 			isa = PBXGroup;
 			children = (
 				3D4F4566213542700005E765 /* eye_for_testing.cpp */,
 				3D4F4567213542700005E765 /* eye_for_testing.hpp */,
 			);
-			name = eye_tests_support;
-			path = ../../eye/eye_tests_support;
+			name = metrics_tests_support;
+			path = ../../metrics/metrics_tests_support;
 			sourceTree = "<group>";
 		};
 		3D4F456E21354E0C0005E765 /* Frameworks */ = {
@@ -176,9 +176,9 @@
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		3D4F44FA21345FC50005E765 /* eye */ = {
+		3D4F44FA21345FC50005E765 /* metrics */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 3D4F450421345FC60005E765 /* Build configuration list for PBXNativeTarget "eye" */;
+			buildConfigurationList = 3D4F450421345FC60005E765 /* Build configuration list for PBXNativeTarget "metrics" */;
 			buildPhases = (
 				3D4F44F721345FC50005E765 /* Sources */,
 				3D4F44F821345FC50005E765 /* Frameworks */,
@@ -188,14 +188,14 @@
 			);
 			dependencies = (
 			);
-			name = eye;
+			name = metrics;
 			productName = eye;
-			productReference = 3D4F44FB21345FC50005E765 /* libeye.a */;
+			productReference = 3D4F44FB21345FC50005E765 /* libmetrics.a */;
 			productType = "com.apple.product-type.library.static";
 		};
-		3D4F4540213540F50005E765 /* eye_tests */ = {
+		3D4F4540213540F50005E765 /* metrics_tests */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 3D4F454F213540F70005E765 /* Build configuration list for PBXNativeTarget "eye_tests" */;
+			buildConfigurationList = 3D4F454F213540F70005E765 /* Build configuration list for PBXNativeTarget "metrics_tests" */;
 			buildPhases = (
 				3D4F453D213540F50005E765 /* Sources */,
 				3D4F453E213540F50005E765 /* Frameworks */,
@@ -205,14 +205,14 @@
 			);
 			dependencies = (
 			);
-			name = eye_tests;
+			name = metrics_tests;
 			productName = eye_tests;
-			productReference = 3D4F4541213540F50005E765 /* eye_tests.app */;
+			productReference = 3D4F4541213540F50005E765 /* metrics_tests.app */;
 			productType = "com.apple.product-type.application";
 		};
-		3D4F4557213542130005E765 /* eye_tests_support */ = {
+		3D4F4557213542130005E765 /* metrics_tests_support */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 3D4F4560213542130005E765 /* Build configuration list for PBXNativeTarget "eye_tests_support" */;
+			buildConfigurationList = 3D4F4560213542130005E765 /* Build configuration list for PBXNativeTarget "metrics_tests_support" */;
 			buildPhases = (
 				3D4F4558213542130005E765 /* Sources */,
 				3D4F455E213542130005E765 /* Frameworks */,
@@ -222,9 +222,9 @@
 			);
 			dependencies = (
 			);
-			name = eye_tests_support;
+			name = metrics_tests_support;
 			productName = eye;
-			productReference = 3D4F4564213542130005E765 /* libeye_tests_support.a */;
+			productReference = 3D4F4564213542130005E765 /* libmetrics_tests_support.a */;
 			productType = "com.apple.product-type.library.static";
 		};
 /* End PBXNativeTarget section */
@@ -244,7 +244,7 @@
 					};
 				};
 			};
-			buildConfigurationList = 3D4F44F621345FC50005E765 /* Build configuration list for PBXProject "eye" */;
+			buildConfigurationList = 3D4F44F621345FC50005E765 /* Build configuration list for PBXProject "metrics" */;
 			compatibilityVersion = "Xcode 9.3";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
@@ -257,9 +257,9 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				3D4F44FA21345FC50005E765 /* eye */,
-				3D4F4540213540F50005E765 /* eye_tests */,
-				3D4F4557213542130005E765 /* eye_tests_support */,
+				3D4F44FA21345FC50005E765 /* metrics */,
+				3D4F4540213540F50005E765 /* metrics_tests */,
+				3D4F4557213542130005E765 /* metrics_tests_support */,
 			);
 		};
 /* End PBXProject section */
@@ -581,7 +581,7 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		3D4F44F621345FC50005E765 /* Build configuration list for PBXProject "eye" */ = {
+		3D4F44F621345FC50005E765 /* Build configuration list for PBXProject "metrics" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				3D4F450221345FC60005E765 /* Debug */,
@@ -591,7 +591,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		3D4F450421345FC60005E765 /* Build configuration list for PBXNativeTarget "eye" */ = {
+		3D4F450421345FC60005E765 /* Build configuration list for PBXNativeTarget "metrics" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				3D4F450521345FC60005E765 /* Debug */,
@@ -601,7 +601,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		3D4F454F213540F70005E765 /* Build configuration list for PBXNativeTarget "eye_tests" */ = {
+		3D4F454F213540F70005E765 /* Build configuration list for PBXNativeTarget "metrics_tests" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				3D4F4550213540F70005E765 /* Debug */,
@@ -611,7 +611,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		3D4F4560213542130005E765 /* Build configuration list for PBXNativeTarget "eye_tests_support" */ = {
+		3D4F4560213542130005E765 /* Build configuration list for PBXNativeTarget "metrics_tests_support" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				3D4F4561213542130005E765 /* Debug */,
diff --git a/xcode/map/map.xcodeproj/project.pbxproj b/xcode/map/map.xcodeproj/project.pbxproj
index e7fba7d9f4..f4d7008983 100644
--- a/xcode/map/map.xcodeproj/project.pbxproj
+++ b/xcode/map/map.xcodeproj/project.pbxproj
@@ -34,8 +34,6 @@
 		3D4E99A51FB4A6410025B48C /* booking_filter.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D4E99A11FB4A6410025B48C /* booking_filter.hpp */; };
 		3D4F44BB21345D270005E765 /* tips_api.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D4F44B921345D270005E765 /* tips_api.hpp */; };
 		3D4F44BC21345D270005E765 /* tips_api.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D4F44BA21345D270005E765 /* tips_api.cpp */; };
-		3D4F457E21354F720005E765 /* libeye_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D4F457D21354F720005E765 /* libeye_tests_support.a */; };
-		3D4F458021354F720005E765 /* libeye.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D4F457F21354F720005E765 /* libeye.a */; };
 		3D4F4582213552AD0005E765 /* tips_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D4F4581213552AD0005E765 /* tips_tests.cpp */; };
 		3D62CBCC20F4DFD600E7BB6E /* search_product_info.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3D62CBCB20F4DFD600E7BB6E /* search_product_info.hpp */; };
 		3D62CBD920FF6C8B00E7BB6E /* discovery_search.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3D62CBD720FF6C8B00E7BB6E /* discovery_search.cpp */; };
@@ -80,6 +78,8 @@
 		3DA5723120C195ED007BDE27 /* everywhere_search_callback.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 3DA5722D20C195EC007BDE27 /* everywhere_search_callback.hpp */; };
 		3DA5723220C195ED007BDE27 /* everywhere_search_callback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DA5722E20C195EC007BDE27 /* everywhere_search_callback.cpp */; };
 		3DA5723320C195ED007BDE27 /* viewport_search_callback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3DA5722F20C195EC007BDE27 /* viewport_search_callback.cpp */; };
+		3DD122BB2135708900EDFB53 /* libmetrics_tests_support.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DD122BA2135708900EDFB53 /* libmetrics_tests_support.a */; };
+		3DD122BD2135708900EDFB53 /* libmetrics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DD122BC2135708900EDFB53 /* libmetrics.a */; };
 		4503559A21245A4100FDFEA5 /* subscription.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4503559821245A4000FDFEA5 /* subscription.hpp */; };
 		4503559B21245A4100FDFEA5 /* subscription.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4503559921245A4000FDFEA5 /* subscription.cpp */; };
 		45201E931CE4AC90008A4842 /* api_mark_point.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45201E921CE4AC90008A4842 /* api_mark_point.cpp */; };
@@ -304,6 +304,8 @@
 		3DA5722D20C195EC007BDE27 /* everywhere_search_callback.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = everywhere_search_callback.hpp; sourceTree = "<group>"; };
 		3DA5722E20C195EC007BDE27 /* everywhere_search_callback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = everywhere_search_callback.cpp; sourceTree = "<group>"; };
 		3DA5722F20C195EC007BDE27 /* viewport_search_callback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = viewport_search_callback.cpp; sourceTree = "<group>"; };
+		3DD122BA2135708900EDFB53 /* libmetrics_tests_support.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libmetrics_tests_support.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		3DD122BC2135708900EDFB53 /* libmetrics.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libmetrics.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		4503559821245A4000FDFEA5 /* subscription.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = subscription.hpp; sourceTree = "<group>"; };
 		4503559921245A4000FDFEA5 /* subscription.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = subscription.cpp; sourceTree = "<group>"; };
 		45201E921CE4AC90008A4842 /* api_mark_point.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = api_mark_point.cpp; sourceTree = "<group>"; };
@@ -496,8 +498,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				3D4F457E21354F720005E765 /* libeye_tests_support.a in Frameworks */,
-				3D4F458021354F720005E765 /* libeye.a in Frameworks */,
+				3DD122BB2135708900EDFB53 /* libmetrics_tests_support.a in Frameworks */,
+				3DD122BD2135708900EDFB53 /* libmetrics.a in Frameworks */,
 				475BD61B211C5FDC00E298C6 /* libshaders.a in Frameworks */,
 				671ED39120D4046D00D4317E /* libeditor_tests_support.a in Frameworks */,
 				47A9D82420A19EC300E4671B /* libkml.a in Frameworks */,
@@ -561,6 +563,8 @@
 		34DDA17E1DBE5DF40088A609 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				3DD122BA2135708900EDFB53 /* libmetrics_tests_support.a */,
+				3DD122BC2135708900EDFB53 /* libmetrics.a */,
 				3D4F457D21354F720005E765 /* libeye_tests_support.a */,
 				3D4F457F21354F720005E765 /* libeye.a */,
 				475BD61A211C5FDC00E298C6 /* libshaders.a */,
diff --git a/xcode/omim.xcworkspace/contents.xcworkspacedata b/xcode/omim.xcworkspace/contents.xcworkspacedata
index 78ec8a9fb9..7ab94ae97d 100644
--- a/xcode/omim.xcworkspace/contents.xcworkspacedata
+++ b/xcode/omim.xcworkspace/contents.xcworkspacedata
@@ -265,9 +265,6 @@
    <FileRef
       location = "container:editor/editor.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:eye/eye.xcodeproj">
-   </FileRef>
    <FileRef
       location = "container:geometry/geometry.xcodeproj">
    </FileRef>
@@ -292,6 +289,9 @@
    <FileRef
       location = "container:mapshot/mapshot.xcodeproj">
    </FileRef>
+   <FileRef
+      location = "group:/Users/a.milchakov/projects/omim/xcode/eye/metrics.xcodeproj">
+   </FileRef>
    <FileRef
       location = "container:openlr/openlr.xcodeproj">
    </FileRef>