diff --git a/defines.hpp b/defines.hpp
index 92dc4ab4b4..dc0204f3f1 100644
--- a/defines.hpp
+++ b/defines.hpp
@@ -55,7 +55,7 @@
 #define UGC_FILE_TAG "ugc"
 #define CITY_ROADS_FILE_TAG "city_roads"
 #define DESCRIPTIONS_FILE_TAG "descriptions"
-#define MAXSPEED_FILE_TAG "maxspeed"
+#define MAXSPEEDS_FILE_TAG "maxspeeds"
 
 #define LOCALITY_DATA_FILE_TAG "locdata"
 #define GEO_OBJECTS_INDEX_FILE_TAG "locidx"
@@ -103,7 +103,7 @@
 #define ROAD_ACCESS_FILENAME "road_access.csv"
 #define METALINES_FILENAME "metalines.bin"
 #define CAMERAS_TO_WAYS_FILENAME "cameras_to_ways.bin"
-#define MAXSPEED_FILENAME "maxspeed.csv"
+#define MAXSPEEDS_FILENAME "maxspeeds.csv"
 
 #define TRAFFIC_FILE_EXTENSION ".traffic"
 
diff --git a/generator/generator_tool/generator_tool.cpp b/generator/generator_tool/generator_tool.cpp
index 6d893b320f..13c790047e 100644
--- a/generator/generator_tool/generator_tool.cpp
+++ b/generator/generator_tool/generator_tool.cpp
@@ -530,8 +530,8 @@ int main(int argc, char ** argv)
 
     if (FLAGS_generate_maxspeed)
     {
-      LOG(LINFO, ("Generating maxspeed section for", datFile));
-      string const maxspeedFilename = genInfo.GetIntermediateFileName(MAXSPEED_FILENAME);
+      LOG(LINFO, ("Generating maxspeeds section for", datFile));
+      string const maxspeedFilename = genInfo.GetIntermediateFileName(MAXSPEEDS_FILENAME);
       routing::BuildMaxspeedSection(datFile, osmToFeatureFilename, maxspeedFilename);
     }
 
diff --git a/generator/maxspeed_builder.cpp b/generator/maxspeed_builder.cpp
index b6246c72b5..1d8457d8b9 100644
--- a/generator/maxspeed_builder.cpp
+++ b/generator/maxspeed_builder.cpp
@@ -57,7 +57,7 @@ FeatureMaxspeed ToFeatureMaxspeed(uint32_t featureId, Maxspeed const & maxspeed)
                          maxspeed.GetBackward());
 }
 
-/// \brief Collects all maxspeed tag value of specified mwm based on maxspeed.csv file.
+/// \brief Collects all maxspeed tag value of specified mwm based on maxspeeds.csv file.
 class MaxspeedMwmCollector
 {
 public:
@@ -165,7 +165,7 @@ void SerializeMaxspeeds(string const & dataPath, vector<FeatureMaxspeed> && spee
     return;
 
   FilesContainerW cont(dataPath, FileWriter::OP_WRITE_EXISTING);
-  FileWriter writer = cont.GetWriter(MAXSPEED_FILE_TAG);
+  FileWriter writer = cont.GetWriter(MAXSPEEDS_FILE_TAG);
 
   MaxspeedsSerializer::Serialize(speeds, writer);
   LOG(LINFO, ("SerializeMaxspeeds(", dataPath, ", ...) serialized:", speeds.size(), "maxspeed tags."));
diff --git a/generator/maxspeed_builder.hpp b/generator/maxspeed_builder.hpp
index fe955dea4a..b18cc59405 100644
--- a/generator/maxspeed_builder.hpp
+++ b/generator/maxspeed_builder.hpp
@@ -19,14 +19,14 @@ using OsmIdToMaxspeed = std::map<base::GeoObjectId, Maxspeed>;
 /// \note There's a detailed description of the csv file in generator/maxspeed_collector.hpp.
 bool ParseMaxspeeds(std::string const & maxspeedFilename, OsmIdToMaxspeed & osmIdToMaxspeed);
 
-/// \brief Writes |speeds| to maxspeed section to mwm with |dataPath|.
+/// \brief Writes |speeds| to maxspeeds section to mwm with |dataPath|.
 void SerializeMaxspeeds(std::string const & dataPath, std::vector<FeatureMaxspeed> && speeds);
 
 void BuildMaxspeedSection(std::string const & dataPath,
                           std::map<uint32_t, base::GeoObjectId> const & featureIdToOsmId,
                           std::string const & maxspeedFilename);
 
-/// \brief Builds maxspeed section in mwm with |dataPath|. This section contains max speed limits
+/// \brief Builds maxspeeds section in mwm with |dataPath|. This section contains max speed limits
 /// if they are available in file |maxspeedFilename|.
 /// \param maxspeedFilename file name to csv file with maxspeed tag values.
 /// \note To start building the section, the following data must be ready:
diff --git a/generator/translator_planet.cpp b/generator/translator_planet.cpp
index d58ce90081..bd018986d4 100644
--- a/generator/translator_planet.cpp
+++ b/generator/translator_planet.cpp
@@ -27,7 +27,7 @@ TranslatorPlanet::TranslatorPlanet(std::shared_ptr<EmitterInterface> emitter,
   : m_emitter(emitter)
   , m_cache(holder)
   , m_coastType(info.m_makeCoasts ? classif().GetCoastType() : 0)
-  , m_routingTagsProcessor(info.GetIntermediateFileName(MAXSPEED_FILENAME))
+  , m_routingTagsProcessor(info.GetIntermediateFileName(MAXSPEEDS_FILENAME))
   , m_nodeRelations(m_routingTagsProcessor)
   , m_wayRelations(m_routingTagsProcessor)
   , m_metalinesBuilder(info.GetIntermediateFileName(METALINES_FILENAME))
diff --git a/routing/geometry.cpp b/routing/geometry.cpp
index 1ca21a5a7e..8be0665c29 100644
--- a/routing/geometry.cpp
+++ b/routing/geometry.cpp
@@ -106,13 +106,13 @@ FileGeometryLoader::FileGeometryLoader(string const & fileName,
     if (cont.IsExist(CITY_ROADS_FILE_TAG))
       LoadCityRoads(fileName, cont.GetReader(CITY_ROADS_FILE_TAG), m_cityRoads);
 
-    if (cont.IsExist(MAXSPEED_FILE_TAG))
-      LoadMaxspeeds(cont.GetReader(MAXSPEED_FILE_TAG), m_maxspeeds);
+    if (cont.IsExist(MAXSPEEDS_FILE_TAG))
+      LoadMaxspeeds(cont.GetReader(MAXSPEEDS_FILE_TAG), m_maxspeeds);
   }
   catch (Reader::OpenException const & e)
   {
     LOG(LERROR, ("File", cont.GetFileName(), "Error while reading", CITY_ROADS_FILE_TAG, "or",
-                 MAXSPEED_FILE_TAG, "section.", e.Msg()));
+                 MAXSPEEDS_FILE_TAG, "section.", e.Msg()));
   }
 
   CHECK(m_vehicleModel, ());
diff --git a/routing/maxspeeds.cpp b/routing/maxspeeds.cpp
index 7b912b92bf..b13cce5815 100644
--- a/routing/maxspeeds.cpp
+++ b/routing/maxspeeds.cpp
@@ -73,16 +73,16 @@ std::unique_ptr<Maxspeeds> LoadMaxspeeds(DataSource const & dataSource,
   auto const value = handle.GetValue<MwmValue>();
   CHECK(value, ());
   auto const & mwmValue = *value;
-  if (!mwmValue.m_cont.IsExist(MAXSPEED_FILE_TAG))
+  if (!mwmValue.m_cont.IsExist(MAXSPEEDS_FILE_TAG))
     return maxspeeds;
 
   try
   {
-    LoadMaxspeeds(mwmValue.m_cont.GetReader(MAXSPEED_FILE_TAG), *maxspeeds);
+    LoadMaxspeeds(mwmValue.m_cont.GetReader(MAXSPEEDS_FILE_TAG), *maxspeeds);
   }
   catch (Reader::OpenException const & e)
   {
-    LOG(LERROR, ("File", mwmValue.GetCountryFileName(), "Error while reading", MAXSPEED_FILE_TAG,
+    LOG(LERROR, ("File", mwmValue.GetCountryFileName(), "Error while reading", MAXSPEEDS_FILE_TAG,
         "section.", e.Msg()));
     return std::make_unique<Maxspeeds>();
   }
diff --git a/routing/maxspeeds_serialization.hpp b/routing/maxspeeds_serialization.hpp
index 6bd98bedba..facca76d7c 100644
--- a/routing/maxspeeds_serialization.hpp
+++ b/routing/maxspeeds_serialization.hpp
@@ -27,7 +27,7 @@ void GetForwardMaxspeedStats(std::vector<FeatureMaxspeed> const & speeds,
                              size_t & forwardMaxspeedsNumber, uint32_t & maxForwardFeatureId);
 
 /// \brief
-/// Section name: "maxspeed".
+/// Section name: "maxspeeds".
 /// Description: keeping value of maxspeed tag for roads.
 /// Section tables:
 /// * header