diff --git a/map/traffic_manager.cpp b/map/traffic_manager.cpp
index 5b3353166b..280bfa7d50 100644
--- a/map/traffic_manager.cpp
+++ b/map/traffic_manager.cpp
@@ -320,7 +320,7 @@ void TrafficManager::OnTrafficDataResponse(traffic::TrafficInfo && info)
   // Update cache.
   size_t constexpr kElementSize = sizeof(traffic::TrafficInfo::RoadSegmentId) + sizeof(traffic::SpeedGroup);
 
-  // Note. It's necessary to multiply by two because routing and rendering use individual caches.
+  // Note. It's necessary to multiply by two because routing and rendering use separate caches.
   size_t const dataSize = 2 * info.GetColoring().size() * kElementSize;
   it->second.m_isLoaded = true;
   m_currentCacheSizeBytes += (dataSize - it->second.m_dataSize);
diff --git a/routing/routing_tests/applying_traffic_test.cpp b/routing/routing_tests/applying_traffic_test.cpp
index d2010553a5..bcb0568b26 100644
--- a/routing/routing_tests/applying_traffic_test.cpp
+++ b/routing/routing_tests/applying_traffic_test.cpp
@@ -85,10 +85,10 @@ unique_ptr<IndexGraph> BuildXXGraph(shared_ptr<EdgeEstimator> estimator)
   return graph;
 }
 
-class ApplingTrafficTest
+class ApplyingTrafficTest
 {
 public:
-  ApplingTrafficTest()
+  ApplyingTrafficTest()
   {
     classificator::Load();
     m_estimator = EdgeEstimator::CreateForCar(*make_shared<CarModelFactory>()->GetVehicleModel());
@@ -98,7 +98,7 @@ public:
 };
 
 // Route through XX graph without any traffic info.
-UNIT_CLASS_TEST(ApplingTrafficTest, XXGraph_EmptyTrafficColoring)
+UNIT_CLASS_TEST(ApplyingTrafficTest, XXGraph_EmptyTrafficColoring)
 {
   unique_ptr<IndexGraph> graph = BuildXXGraph(m_estimator);
   IndexGraphStarter starter(*graph, RoadPoint(1, 0) /* start */, RoadPoint(6, 1) /* finish */);
@@ -107,7 +107,7 @@ UNIT_CLASS_TEST(ApplingTrafficTest, XXGraph_EmptyTrafficColoring)
 }
 
 // Route through XX graph with SpeedGroup::G0 on F3.
-UNIT_CLASS_TEST(ApplingTrafficTest, XXGraph_G0onF3)
+UNIT_CLASS_TEST(ApplyingTrafficTest, XXGraph_G0onF3)
 {
   TrafficInfo::Coloring coloring = {
       {{3 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection},
@@ -123,7 +123,7 @@ UNIT_CLASS_TEST(ApplingTrafficTest, XXGraph_G0onF3)
 }
 
 // Route through XX graph with SpeedGroup::G0 in reverse direction on F3.
-UNIT_CLASS_TEST(ApplingTrafficTest, XXGraph_G0onF3ReverseDir)
+UNIT_CLASS_TEST(ApplyingTrafficTest, XXGraph_G0onF3ReverseDir)
 {
   TrafficInfo::Coloring coloring = {
       {{3 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kReverseDirection},
@@ -139,7 +139,7 @@ UNIT_CLASS_TEST(ApplingTrafficTest, XXGraph_G0onF3ReverseDir)
 }
 
 // Route through XX graph SpeedGroup::G1 on F3 and F6, SpeedGroup::G4 on F8 and F4.
-UNIT_CLASS_TEST(ApplingTrafficTest, XXGraph_G0onF3andF6andG4onF8andF4)
+UNIT_CLASS_TEST(ApplyingTrafficTest, XXGraph_G0onF3andF6andG4onF8andF4)
 {
   TrafficInfo::Coloring coloring = {
       {{3 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection},