diff --git a/indexer/feature.hpp b/indexer/feature.hpp
index 83cd069d45..d1a43e1c8a 100644
--- a/indexer/feature.hpp
+++ b/indexer/feature.hpp
@@ -258,3 +258,6 @@ inline string debug_print(FeatureGeom const & f)
 {
   return f.DebugString();
 }
+
+
+typedef FeatureGeom FeatureType;
diff --git a/indexer/features_vector.hpp b/indexer/features_vector.hpp
index 5aa1d748ad..81d62abdc8 100644
--- a/indexer/features_vector.hpp
+++ b/indexer/features_vector.hpp
@@ -11,8 +11,6 @@
 template <typename ReaderT>
 class FeaturesVector
 {
-  typedef FeatureGeom feature_t;
-
 public:
   typedef ReaderT ReaderType;
 
@@ -20,7 +18,7 @@ public:
   {
   }
 
-  void Get(uint64_t pos, feature_t & feature) const
+  void Get(uint64_t pos, FeatureType & feature) const
   {
     vector<char> record;
     uint32_t offset;
@@ -30,14 +28,14 @@ public:
 
   template <class TDo> void ForEachOffset(TDo const & toDo) const
   {
-    feature_t f;
+    FeatureType f;
     m_RecordReader.ForEachRecord(
         bind<void>(toDo, bind(&FeaturesVector<ReaderT>::DeserializeFeature, this, _2, _3, &f), _1));
   }
 
   template <class TDo> void ForEach(TDo const & toDo) const
   {
-    feature_t f;
+    FeatureType f;
     m_RecordReader.ForEachRecord(
         bind<void>(toDo, bind(&FeaturesVector<ReaderT>::DeserializeFeature, this, _2, _3, &f)));
   }
@@ -48,7 +46,7 @@ public:
   }
 
 private:
-  feature_t const & DeserializeFeature(char const * data, uint32_t size, feature_t * pFeature) const
+  FeatureType const & DeserializeFeature(char const * data, uint32_t size, FeatureType * pFeature) const
   {
     vector<char> data1(data, data + size);
     pFeature->Deserialize(data1);
diff --git a/indexer/index.hpp b/indexer/index.hpp
index f3a11484f0..144a002bb5 100644
--- a/indexer/index.hpp
+++ b/indexer/index.hpp
@@ -152,8 +152,6 @@ private:
   template <typename F>
   class OffsetToFeatureReplacer
   {
-    typedef FeatureGeom feature_t;
-
     FeatureVectorT const & m_V;
     F const & m_F;
 
@@ -161,7 +159,7 @@ private:
     OffsetToFeatureReplacer(FeatureVectorT const & v, F const & f) : m_V(v), m_F(f) {}
     void operator() (uint32_t offset) const
     {
-      feature_t feature;
+      FeatureType feature;
       m_V.Get(offset, feature);
       m_F(feature);
     }
diff --git a/indexer/indexer_tests/feature_bucketer_test.cpp b/indexer/indexer_tests/feature_bucketer_test.cpp
index 44d68b3b31..b36f7c5766 100644
--- a/indexer/indexer_tests/feature_bucketer_test.cpp
+++ b/indexer/indexer_tests/feature_bucketer_test.cpp
@@ -11,8 +11,6 @@
 
 namespace
 {
-  typedef FeatureGeom feature_t;
-
   class PushBackFeatureDebugStringOutput
   {
   public:
@@ -21,7 +19,7 @@ namespace
     PushBackFeatureDebugStringOutput(string const & name, InitDataType const & initData)
       : m_pContainer(&((*initData)[name])) {}
 
-    void operator() (feature_t const & feature)
+    void operator() (FeatureType const & feature)
     {
       m_pContainer->push_back(feature.DebugString());
     }
@@ -37,11 +35,11 @@ namespace
       RectId
   > FeatureBucketer;
 
-  feature_t MakeFeature(FeatureBuilder const & fb)
+  FeatureType MakeFeature(FeatureBuilder const & fb)
   {
     vector<char> data;
     fb.Serialize(data);
-    return feature_t(data, 0);
+    return FeatureType(data, 0);
   }
 }
 
diff --git a/indexer/indexer_tests/feature_test.cpp b/indexer/indexer_tests/feature_test.cpp
index 47fca3b5c3..375d1eb160 100644
--- a/indexer/indexer_tests/feature_test.cpp
+++ b/indexer/indexer_tests/feature_test.cpp
@@ -34,8 +34,6 @@ namespace
 
 UNIT_TEST(Feature_Deserialize)
 {
-  typedef FeatureGeom feature_t;
-
   vector<int> a;
   a.push_back(1);
   a.push_back(2);
@@ -71,7 +69,7 @@ UNIT_TEST(Feature_Deserialize)
   vector<char> serial;
   builder.Serialize(serial);
   vector<char> serial1 = serial;
-  feature_t f(serial1);
+  FeatureType f(serial1);
 
   TEST_EQUAL(f.GetFeatureType(), FeatureBase::FEATURE_TYPE_AREA, ());
 
@@ -103,5 +101,5 @@ UNIT_TEST(Feature_Deserialize)
   builder2.Serialize(serial2);
 
   TEST_EQUAL(serial, serial2,
-             (f.DebugString(), feature_t(serial2).DebugString()));
+             (f.DebugString(), FeatureType(serial2).DebugString()));
 }
diff --git a/indexer/indexer_tool/feature_bucketer.hpp b/indexer/indexer_tool/feature_bucketer.hpp
index afa6b4fbf0..a63eec2f39 100644
--- a/indexer/indexer_tool/feature_bucketer.hpp
+++ b/indexer/indexer_tool/feature_bucketer.hpp
@@ -22,8 +22,6 @@ namespace feature
 template <class FeatureOutT, class FeatureClipperT, class BoundsT, typename CellIdT>
 class CellFeatureBucketer
 {
-  typedef FeatureGeom feature_t;
-
 public:
   CellFeatureBucketer(int level, typename FeatureOutT::InitDataType const & featureOutInitData,
                       int maxWorldZoom = -1)
@@ -45,7 +43,7 @@ public:
     }
   }
 
-  void operator () (feature_t const & f)
+  void operator () (FeatureType const & f)
   {
     // separately store features needed for world map
     if (m_worldBucket && m_maxWorldZoom >= feature::MinDrawableScaleForFeature(f))
@@ -60,7 +58,7 @@ public:
       // Clipper may (or may not) do a better intersection.
       if (m_Buckets[i].m_Rect.IsIntersect(limitRect))
       {
-        feature_t clippedFeature;
+        FeatureType clippedFeature;
         if (clipper(m_Buckets[i].m_Rect, clippedFeature))
         {
           if (!m_Buckets[i].m_pOut)
@@ -76,7 +74,7 @@ public:
   {
     vector<char> data;
     fb.Serialize(data);
-    feature_t f;
+    FeatureType f;
     f.Deserialize(data);
     this->operator()(f);
   }
@@ -113,21 +111,19 @@ private:
 
 class SimpleFeatureClipper
 {
-  typedef FeatureGeom feature_t;
-
 public:
-  explicit SimpleFeatureClipper(feature_t const & f) : m_Feature(f)
+  explicit SimpleFeatureClipper(FeatureType const & f) : m_Feature(f)
   {
   }
 
-  bool operator () (m2::RectD const & /*rect*/, feature_t & clippedFeature) const
+  bool operator () (m2::RectD const & /*rect*/, FeatureType & clippedFeature) const
   {
     clippedFeature = m_Feature;
     return true;
   }
 
 private:
-  feature_t const & m_Feature;
+  FeatureType const & m_Feature;
 };
 
 }
diff --git a/indexer/indexer_tool/feature_generator.cpp b/indexer/indexer_tool/feature_generator.cpp
index 91789a0369..2a8f6b1376 100644
--- a/indexer/indexer_tool/feature_generator.cpp
+++ b/indexer/indexer_tool/feature_generator.cpp
@@ -166,12 +166,12 @@ void FeaturesCollector::operator() (FeatureBuilder const & f)
     WriteVarUint(m_datFile, sz);
     m_datFile.Write(&bytes[0], sz);
 
-    feature_t f(bytes);
+    FeatureType f(bytes);
     m_bounds.Add(f.GetLimitRect());
   }
 }
 
-void FeaturesCollector::operator() (feature_t const & f)
+void FeaturesCollector::operator() (FeatureType const & f)
 {
   FeatureBuilder fb;
   f.InitFeatureBuilder(fb);
diff --git a/indexer/indexer_tool/feature_generator.hpp b/indexer/indexer_tool/feature_generator.hpp
index 3f786f5422..aeeec514c6 100644
--- a/indexer/indexer_tool/feature_generator.hpp
+++ b/indexer/indexer_tool/feature_generator.hpp
@@ -1,6 +1,7 @@
 
 #pragma once
 #include "../../indexer/osm_decl.hpp"
+#include "../../indexer/feature.hpp"
 
 #include "../../geometry/rect2d.hpp"
 
@@ -37,8 +38,6 @@ namespace feature
 
     void Init();
 
-    typedef FeatureGeom feature_t;
-
   public:
     ~FeaturesCollector();
 
@@ -49,6 +48,6 @@ namespace feature
     FeaturesCollector(string const & bucketName, InitDataType const & datFilePrefixSuffix);
 
     void operator() (FeatureBuilder const & f);
-    void operator() (feature_t const & f);
+    void operator() (FeatureType const & f);
   };
 }
diff --git a/map/framework.cpp b/map/framework.cpp
index 6d940aa071..e257429b68 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -98,7 +98,7 @@ namespace fwork
     }                                                   \
   }
 
-  bool DrawProcessor::operator()(feature_t const & f)
+  bool DrawProcessor::operator()(FeatureType const & f)
   {
     if (m_paintEvent->isCancelled())
       throw redraw_operation_cancelled();
diff --git a/map/framework.hpp b/map/framework.hpp
index 6babfd65b8..8d5ddf4c47 100644
--- a/map/framework.hpp
+++ b/map/framework.hpp
@@ -9,6 +9,7 @@
 #include "../indexer/data_header_reader.hpp"
 #include "../indexer/data_header.hpp"
 #include "../indexer/scales.hpp"
+#include "../indexer/feature.hpp"
 
 #include "../platform/platform.hpp"
 
@@ -35,8 +36,6 @@
 #include "../base/start_mem_debug.hpp"
 
 
-class FeatureGeom;
-
 namespace di { class DrawInfo; }
 namespace drule { class BaseRule; }
 
@@ -44,8 +43,6 @@ class redraw_operation_cancelled {};
 
 namespace fwork
 {
-  typedef FeatureGeom feature_t;
-
   class DrawProcessor
   {
     m2::RectD m_rect;
@@ -71,7 +68,8 @@ namespace fwork
                   shared_ptr<PaintEvent> paintEvent,
                   int scaleLevel);
 
-    bool operator() (feature_t const & f);
+
+    bool operator() (FeatureType const & f);
   };
 }
 
diff --git a/map/map_tests/map_foreach_test.cpp b/map/map_tests/map_foreach_test.cpp
index b199b9662c..d2099f3cd6 100644
--- a/map/map_tests/map_foreach_test.cpp
+++ b/map/map_tests/map_foreach_test.cpp
@@ -22,8 +22,7 @@
 #include "../../base/start_mem_debug.hpp"
 
 
-typedef FeatureGeom feature_t;
-typedef vector<pair<feature_t, string> > feature_cont_t;
+typedef vector<pair<FeatureType, string> > feature_cont_t;
 
 class AccumulatorBase
 {
@@ -32,12 +31,12 @@ class AccumulatorBase
   feature_cont_t & m_cont;
 
 protected:
-  bool is_drawable(feature_t const & f) const
+  bool is_drawable(FeatureType const & f) const
   {
     return feature::IsDrawableForIndex(f, m_scale);
   }
 
-  void add(feature_t const & f) const
+  void add(FeatureType const & f) const
   {
     string const s = f.DebugString();
     m_cont.push_back(make_pair(f, s));
@@ -50,7 +49,7 @@ public:
     m_scale = scales::GetScaleLevel(r);
   }
 
-  void operator() (feature_t const & f) const
+  void operator() (FeatureType const & f) const
   {
     ASSERT ( f.DebugString() == f.DebugString(), () );
 
@@ -98,7 +97,7 @@ class AccumulatorEtalon : public AccumulatorBase
 
   m2::RectD m_rect;
 
-  bool is_intersect(feature_t const & f) const
+  bool is_intersect(FeatureType const & f) const
   {
     IntersectCheck check(m_rect);
     f.ForEachPointRef(check);
@@ -111,7 +110,7 @@ public:
   {
   }
 
-  void operator() (feature_t const & f, uint64_t /*offset*/) const
+  void operator() (FeatureType const & f, uint64_t /*offset*/) const
   {
     ASSERT ( f.DebugString() == f.DebugString(), () );
 
@@ -216,11 +215,11 @@ namespace
 {
   class FindOffset
   {
-    pair<feature_t, string> const & m_test;
+    pair<FeatureType, string> const & m_test;
   public:
-    FindOffset(pair<feature_t, string> const & test) : m_test(test) {}
+    FindOffset(pair<FeatureType, string> const & test) : m_test(test) {}
 
-    void operator() (feature_t const & f, uint64_t offset)
+    void operator() (FeatureType const & f, uint64_t offset)
     {
       if (f.DebugString() == m_test.second)
       {
diff --git a/qt/searchwindow.cpp b/qt/searchwindow.cpp
index fb545d4068..7ad497295e 100644
--- a/qt/searchwindow.cpp
+++ b/qt/searchwindow.cpp
@@ -25,7 +25,7 @@ FindTableWnd::FindTableWnd(QWidget * pParent, FindEditorWnd * pEditor, model_t *
   connect(m_pEditor, SIGNAL(textChanged(QString const &)), this, SLOT(OnTextChanged(QString const &)));
 }
 
-bool FindTableWnd::AddFeature(feature_t const & f)
+bool FindTableWnd::AddFeature(FeatureType const & f)
 {
   string name = f.GetName();
 
@@ -61,7 +61,7 @@ void FindTableWnd::OnTextChanged(QString const & s)
   }
 }
 
-FindTableWnd::feature_t const & FindTableWnd::GetFeature(size_t row) const
+FeatureType const & FindTableWnd::GetFeature(size_t row) const
 {
   ASSERT ( row < m_features.size(), (row, m_features.size()) );
   return m_features[row];
diff --git a/qt/searchwindow.hpp b/qt/searchwindow.hpp
index d0f52f24e6..794d9c973d 100644
--- a/qt/searchwindow.hpp
+++ b/qt/searchwindow.hpp
@@ -31,20 +31,18 @@ namespace qt
     FindEditorWnd * m_pEditor;
     model_t * m_pModel;
 
-    typedef FeatureGeom feature_t;
-
   public:
     FindTableWnd(QWidget * pParent, FindEditorWnd * pEditor, model_t * pModel);
 
-    feature_t const & GetFeature(size_t row) const;
+    FeatureType const & GetFeature(size_t row) const;
 
   protected:
-    bool AddFeature(feature_t const & f);
+    bool AddFeature(FeatureType const & f);
 
   protected Q_SLOTS:
     void OnTextChanged(QString const & s);
 
   private:
-    vector<feature_t> m_features;
+    vector<FeatureType> m_features;
   };
 }