diff --git a/routing/fake_edges_container.hpp b/routing/fake_edges_container.hpp
index 6957ff30e7..9b9a7567cb 100644
--- a/routing/fake_edges_container.hpp
+++ b/routing/fake_edges_container.hpp
@@ -34,6 +34,6 @@ public:
 private:
   // Finish ending.
   IndexGraphStarter::Ending m_finish;
-  FakeGraph<Segment, FakeVertex, Segment> m_fake;
+  FakeGraph<Segment, FakeVertex> m_fake;
 };
 }  // namespace routing
diff --git a/routing/fake_graph.hpp b/routing/fake_graph.hpp
index 5db2a2e356..89481b0016 100644
--- a/routing/fake_graph.hpp
+++ b/routing/fake_graph.hpp
@@ -11,7 +11,7 @@
 
 namespace routing
 {
-template <typename SegmentType, typename VertexType, typename RealType>
+template <typename SegmentType, typename VertexType>
 class FakeGraph final
 {
 public:
@@ -27,7 +27,7 @@ public:
   // mapping if isPartOfReal is true.
   void AddVertex(SegmentType const & existentSegment, SegmentType const & newSegment,
                  VertexType const & newVertex, bool isOutgoing, bool isPartOfReal,
-                 RealType const & real)
+                 SegmentType const & real)
   {
     AddStandaloneVertex(newSegment, newVertex);
     auto const & segmentFrom = isOutgoing ? existentSegment : newSegment;
@@ -103,7 +103,7 @@ public:
 
   size_t GetSize() const { return m_segmentToVertex.size(); }
 
-  std::set<SegmentType> const & GetFake(RealType const & real) const
+  std::set<SegmentType> const & GetFake(SegmentType const & real) const
   {
     auto const it = m_realToFake.find(real);
     if (it != m_realToFake.end())
@@ -112,7 +112,7 @@ public:
     return kEmptySet;
   }
 
-  bool FindReal(SegmentType const & fake, RealType & real) const
+  bool FindReal(SegmentType const & fake, SegmentType & real) const
   {
     auto const it = m_fakeToReal.find(fake);
     if (it == m_fakeToReal.end())
@@ -142,10 +142,10 @@ private:
   // Key is fake vertex value is fake segment which corresponds fake vertex.
   std::map<VertexType, SegmentType> m_vertexToSegment;
   // Key is fake segment of type VertexType::Type::PartOfReal, value is corresponding real segment.
-  std::map<SegmentType, RealType> m_fakeToReal;
+  std::map<SegmentType, SegmentType> m_fakeToReal;
   // Key is real segment, value is set of fake segments with type VertexType::Type::PartOfReal
   // which are parts of this real segment.
-  std::map<RealType, std::set<SegmentType>> m_realToFake;
+  std::map<SegmentType, std::set<SegmentType>> m_realToFake;
   // To return empty set by const reference.
   std::set<SegmentType> const kEmptySet = std::set<SegmentType>();
 };
diff --git a/routing/index_graph_starter.hpp b/routing/index_graph_starter.hpp
index e8e54fe712..259a540980 100644
--- a/routing/index_graph_starter.hpp
+++ b/routing/index_graph_starter.hpp
@@ -157,6 +157,6 @@ private:
   // Finish segment id
   Ending m_finish;
   double m_startToFinishDistanceM;
-  FakeGraph<Segment, FakeVertex, Segment> m_fake;
+  FakeGraph<Segment, FakeVertex> m_fake;
 };
 }  // namespace routing
diff --git a/routing/routing_tests/fake_graph_test.cpp b/routing/routing_tests/fake_graph_test.cpp
index dc7fd9df4d..75827e2f13 100644
--- a/routing/routing_tests/fake_graph_test.cpp
+++ b/routing/routing_tests/fake_graph_test.cpp
@@ -15,10 +15,10 @@ namespace
 // Constructs simple fake graph where vertex (i + 1) is child of vertex (i) with |numFake| fake
 // vertices and |numReal| real vertices. Checks vetex-to-segment, segment-to-vertex, fake-to-real,
 // real-to-fake mappings for each vertex. Checks ingoing and outgoing sets.
-FakeGraph<int32_t /* SegmentType */, m2::PointD /* VertexType */, int32_t /* RealType */>
+FakeGraph<int32_t /* SegmentType */, m2::PointD /* VertexType */>
 ConstructFakeGraph(uint32_t numerationStart, uint32_t numFake, uint32_t numReal)
 {
-  FakeGraph<int32_t, m2::PointD, int32_t> fakeGraph;
+  FakeGraph<int32_t, m2::PointD> fakeGraph;
 
   TEST_EQUAL(fakeGraph.GetSize(), 0, ("Constructed fake graph not empty"));
   if (numFake < 1)
diff --git a/routing/transit_graph.hpp b/routing/transit_graph.hpp
index 9a7f45ef02..e572c6300e 100644
--- a/routing/transit_graph.hpp
+++ b/routing/transit_graph.hpp
@@ -68,7 +68,7 @@ private:
 
   NumMwmId const m_mwmId = kFakeNumMwmId;
   std::shared_ptr<EdgeEstimator> m_estimator;
-  FakeGraph<Segment, FakeVertex, Segment> m_fake;
+  FakeGraph<Segment, FakeVertex> m_fake;
   std::map<Segment, transit::Edge> m_segmentToEdge;
   std::map<Segment, transit::Gate> m_segmentToGate;
   std::map<transit::LineId, double> m_transferPenalties;