diff --git a/routing/bicycle_directions.cpp b/routing/bicycle_directions.cpp
index 88a540ad97..6850154859 100644
--- a/routing/bicycle_directions.cpp
+++ b/routing/bicycle_directions.cpp
@@ -154,14 +154,14 @@ BicycleDirectionsEngine::BicycleDirectionsEngine(Index const & index,
 void BicycleDirectionsEngine::Generate(RoadGraphBase const & graph, vector<Junction> const & path,
                                        my::Cancellable const & cancellable, Route::TTimes & times,
                                        Route::TTurns & turns, vector<Junction> & routeGeometry,
-                                       vector<Segment> & trafficSegs)
+                                       vector<Segment> & segments)
 {
   times.clear();
   turns.clear();
   routeGeometry.clear();
   m_adjacentEdges.clear();
   m_pathSegments.clear();
-  trafficSegs.clear();
+  segments.clear();
 
   size_t const pathSize = path.size();
   if (pathSize == 0)
@@ -210,13 +210,13 @@ void BicycleDirectionsEngine::Generate(RoadGraphBase const & graph, vector<Junct
   Route::TStreets streetNames;
 
   MakeTurnAnnotation(resultGraph, delegate, routeGeometry, turns, dummyTimes, streetNames,
-                     trafficSegs);
+                     segments);
   CHECK_EQUAL(routeGeometry.size(), pathSize, ());
   // In case of bicycle routing |m_pathSegments| may have an empty
-  // |LoadedPathSegment::m_trafficSegs| fields. In that case |trafficSegs| is empty
-  // so size of |trafficSegs| is not equal to size of |routeEdges|.
-  if (!trafficSegs.empty())
-    CHECK_EQUAL(trafficSegs.size(), routeEdges.size(), ());
+  // |LoadedPathSegment::m_trafficSegs| fields. In that case |segments| is empty
+  // so size of |segments| is not equal to size of |routeEdges|.
+  if (!segments.empty())
+    CHECK_EQUAL(segments.size(), routeEdges.size(), ());
 }
 
 Index::FeaturesLoaderGuard & BicycleDirectionsEngine::GetLoader(MwmSet::MwmId const & id)
diff --git a/routing/bicycle_directions.hpp b/routing/bicycle_directions.hpp
index 99e8e2583d..569752ce26 100644
--- a/routing/bicycle_directions.hpp
+++ b/routing/bicycle_directions.hpp
@@ -31,7 +31,7 @@ public:
   // IDirectionsEngine override:
   void Generate(RoadGraphBase const & graph, vector<Junction> const & path,
                 my::Cancellable const & cancellable, Route::TTimes & times, Route::TTurns & turns,
-                vector<Junction> & routeGeometry, vector<Segment> & trafficSegs) override;
+                vector<Junction> & routeGeometry, vector<Segment> & segments) override;
 
 private:
   Index::FeaturesLoaderGuard & GetLoader(MwmSet::MwmId const & id);
diff --git a/routing/directions_engine.hpp b/routing/directions_engine.hpp
index 1a9adcd18b..40638418d6 100644
--- a/routing/directions_engine.hpp
+++ b/routing/directions_engine.hpp
@@ -21,7 +21,7 @@ public:
   virtual void Generate(RoadGraphBase const & graph, vector<Junction> const & path,
                         my::Cancellable const & cancellable, Route::TTimes & times,
                         Route::TTurns & turns, vector<Junction> & routeGeometry,
-                        vector<Segment> & trafficSegs) = 0;
+                        vector<Segment> & segments) = 0;
 
 protected:
   /// \brief constructs route based on |graph| and |path|. Fills |routeEdges| with the route.
diff --git a/routing/pedestrian_directions.cpp b/routing/pedestrian_directions.cpp
index fe4d60c45d..81954f791f 100644
--- a/routing/pedestrian_directions.cpp
+++ b/routing/pedestrian_directions.cpp
@@ -38,7 +38,7 @@ void PedestrianDirectionsEngine::Generate(RoadGraphBase const & graph,
                                           my::Cancellable const & cancellable,
                                           Route::TTimes & times, Route::TTurns & turns,
                                           vector<Junction> & routeGeometry,
-                                          vector<Segment> & /* trafficSegs */)
+                                          vector<Segment> & /* segments */)
 {
   times.clear();
   turns.clear();
diff --git a/routing/pedestrian_directions.hpp b/routing/pedestrian_directions.hpp
index d77a1b59e2..4a3fda5dd8 100644
--- a/routing/pedestrian_directions.hpp
+++ b/routing/pedestrian_directions.hpp
@@ -13,7 +13,7 @@ public:
   // IDirectionsEngine override:
   void Generate(RoadGraphBase const & graph, vector<Junction> const & path,
                 my::Cancellable const & cancellable, Route::TTimes & times, Route::TTurns & turns,
-                vector<Junction> & routeGeometry, vector<Segment> & /* trafficSegs */) override;
+                vector<Junction> & routeGeometry, vector<Segment> & /* segments */) override;
 
 private:
   void CalculateTurns(RoadGraphBase const & graph, vector<Edge> const & routeEdges,
diff --git a/routing/routing_helpers.cpp b/routing/routing_helpers.cpp
index c1fb78e68e..f369cb6c9f 100644
--- a/routing/routing_helpers.cpp
+++ b/routing/routing_helpers.cpp
@@ -29,8 +29,8 @@ void ReconstructRoute(IDirectionsEngine & engine, RoadGraphBase const & graph,
   vector<Junction> junctions;
   // @TODO(bykoianko) streetNames is not filled in Generate(). It should be done.
   Route::TStreets streetNames;
-  vector<Segment> trafficSegs;
-  engine.Generate(graph, path, cancellable, times, turnsDir, junctions, trafficSegs);
+  vector<Segment> segments;
+  engine.Generate(graph, path, cancellable, times, turnsDir, junctions, segments);
 
   if (cancellable.IsCancelled())
     return;
@@ -43,7 +43,7 @@ void ReconstructRoute(IDirectionsEngine & engine, RoadGraphBase const & graph,
   }
 
   // @TODO(bykoianko) If the start and the finish of a route lies on the same road segment
-  // engine->Generate() fills with empty vectors |times|, |turnsDir|, |junctions| and |trafficSegs|.
+  // engine->Generate() fills with empty vectors |times|, |turnsDir|, |junctions| and |segments|.
   // It's not correct and should be fixed. It's necessary to work corrrectly with such routes.
 
   vector<m2::PointD> routeGeometry;
@@ -61,10 +61,10 @@ void ReconstructRoute(IDirectionsEngine & engine, RoadGraphBase const & graph,
   }
 
   vector<traffic::SpeedGroup> traffic;
-  if (trafficStash && !trafficSegs.empty())
+  if (trafficStash && !segments.empty())
   {
-    traffic.reserve(trafficSegs.size());
-    for (Segment const & seg : trafficSegs)
+    traffic.reserve(segments.size());
+    for (Segment const & seg : segments)
     {
       traffic::TrafficInfo::RoadSegmentId roadSegment(
           seg.GetFeatureId(), seg.GetSegmentIdx(),
@@ -80,7 +80,7 @@ void ReconstructRoute(IDirectionsEngine & engine, RoadGraphBase const & graph,
       }
       traffic.push_back(segTraffic);
     }
-    CHECK_EQUAL(trafficSegs.size(), traffic.size(), ());
+    CHECK_EQUAL(segments.size(), traffic.size(), ());
   }
 
   route.SetTraffic(move(traffic));
diff --git a/routing/segment.hpp b/routing/segment.hpp
index b1f629cd0f..cd476c7e7b 100644
--- a/routing/segment.hpp
+++ b/routing/segment.hpp
@@ -42,8 +42,6 @@ public:
 
   RoadPoint GetRoadPoint(bool front) const { return RoadPoint(m_featureId, GetPointId(front)); }
 
-  bool IsValid() const { return m_mwmId == kFakeNumMwmId; }
-
   bool operator<(Segment const & seg) const
   {
     if (m_featureId != seg.m_featureId)