diff --git a/generator/transit_generator.cpp b/generator/transit_generator.cpp
index aadab9fb9a..61188ad2b1 100644
--- a/generator/transit_generator.cpp
+++ b/generator/transit_generator.cpp
@@ -282,7 +282,7 @@ void BuildTransit(string const & mwmDir, string const & countryId,
 
   auto const startOffset = w.Pos();
   Serializer<FileWriter> serializer(w);
-  FixSizeNumberSerializer<FileWriter> numberSerializer(w);
+  FixedSizeSerializer<FileWriter> numberSerializer(w);
   header.Visit(numberSerializer);
 
   vector<Stop> stops;
diff --git a/routing/transit_graph_loader.cpp b/routing/transit_graph_loader.cpp
index 96552e1a02..bed3f454f6 100644
--- a/routing/transit_graph_loader.cpp
+++ b/routing/transit_graph_loader.cpp
@@ -59,7 +59,7 @@ unique_ptr<TransitGraph> TransitGraphLoader::CreateTransitGraph(NumMwmId numMwmI
     FilesContainerR::TReader reader(mwmValue.m_cont.GetReader(TRANSIT_FILE_TAG));
     ReaderSource<FilesContainerR::TReader> src(reader);
     transit::Deserializer<ReaderSource<FilesContainerR::TReader>> deserializer(src);
-    transit::FixSizeNumberDeserializer<ReaderSource<FilesContainerR::TReader>> numberDeserializer(src);
+    transit::FixedSizeDeserializer<ReaderSource<FilesContainerR::TReader>> numberDeserializer(src);
 
     transit::TransitHeader header;
     header.Visit(numberDeserializer);
diff --git a/routing_common/routing_common_tests/transit_test.cpp b/routing_common/routing_common_tests/transit_test.cpp
index 49fcb1ecee..a7ea03433e 100644
--- a/routing_common/routing_common_tests/transit_test.cpp
+++ b/routing_common/routing_common_tests/transit_test.cpp
@@ -37,8 +37,8 @@ void TestCommonSerialization(Obj const & obj)
 
 void TestSerialization(TransitHeader const & header)
 {
-  TestCommonSerialization<FixSizeNumberSerializer<MemWriter<vector<uint8_t>>>,
-                          FixSizeNumberDeserializer<ReaderSource<MemReader>>>(header);
+  TestCommonSerialization<FixedSizeSerializer<MemWriter<vector<uint8_t>>>,
+                          FixedSizeDeserializer<ReaderSource<MemReader>>>(header);
 }
 
 template<class Obj>
@@ -60,8 +60,8 @@ UNIT_TEST(Transit_HeaderRewriting)
   MemWriter<vector<uint8_t>> writer(buffer);
 
   // Writing.
-  auto const startOffset = writer.Pos();
-  FixSizeNumberSerializer<MemWriter<vector<uint8_t>>> serializer(writer);
+  uint64_t constexpr startOffset = 0;
+  FixedSizeSerializer<MemWriter<vector<uint8_t>>> serializer(writer);
   header.Visit(serializer);
   auto const endOffset = writer.Pos();
 
@@ -70,13 +70,13 @@ UNIT_TEST(Transit_HeaderRewriting)
 
   writer.Seek(startOffset);
   header.Visit(serializer);
-  writer.Seek(endOffset);
+  TEST_EQUAL(writer.Pos(), endOffset, ());
 
   // Reading.
   MemReader reader(buffer.data(), buffer.size());
   ReaderSource<MemReader> src(reader);
   TransitHeader deserializedHeader;
-  FixSizeNumberDeserializer<ReaderSource<MemReader>> deserializer(src);
+  FixedSizeDeserializer<ReaderSource<MemReader>> deserializer(src);
   deserializedHeader.Visit(deserializer);
 
   TEST(deserializedHeader.IsEqualForTesting(bigHeader), (deserializedHeader, bigHeader));
diff --git a/routing_common/transit_serdes.hpp b/routing_common/transit_serdes.hpp
index 05772d27fc..0f843d09bc 100644
--- a/routing_common/transit_serdes.hpp
+++ b/routing_common/transit_serdes.hpp
@@ -221,14 +221,14 @@ private:
 };
 
 template <typename Sink>
-class FixSizeNumberSerializer
+class FixedSizeSerializer
 {
 public:
-  explicit FixSizeNumberSerializer(Sink & sink) : m_sink(sink) {}
+  explicit FixedSizeSerializer(Sink & sink) : m_sink(sink) {}
 
   template <typename T>
-  typename enable_if<is_integral<T>::value || is_enum<T>::value, void>::type operator()(
-      T const & t, char const * /* name */ = nullptr)
+  typename std::enable_if<std::is_integral<T>::value || std::is_enum<T>::value, void>::type
+  operator()(T const & t, char const * /* name */ = nullptr)
   {
     WriteToSink(m_sink, t);
   }
@@ -238,14 +238,14 @@ private:
 };
 
 template <typename Source>
-class FixSizeNumberDeserializer
+class FixedSizeDeserializer
 {
 public:
-  explicit FixSizeNumberDeserializer(Source & source) : m_source(source) {}
+  explicit FixedSizeDeserializer(Source & source) : m_source(source) {}
 
   template <typename T>
-  typename enable_if<is_integral<T>::value || is_enum<T>::value, void>::type operator()(
-      T & t, char const * name = nullptr)
+  typename std::enable_if<std::is_integral<T>::value || std::is_enum<T>::value, void>::type
+  operator()(T & t, char const * name = nullptr)
   {
     ReadPrimitiveFromSource(m_source, t);
   }
diff --git a/routing_common/transit_types.hpp b/routing_common/transit_types.hpp
index 915132ed69..411cf06706 100644
--- a/routing_common/transit_types.hpp
+++ b/routing_common/transit_types.hpp
@@ -49,7 +49,7 @@ Weight constexpr kInvalidWeight = -1.0;
                            std::string const & transitDir);                           \
   template <class Ser, class Deser, class Obj>                                        \
   friend void TestCommonSerialization(Obj const & obj);                               \
-  friend void UnitTest_Transit_HeaderRewriting();                                   \
+  friend void UnitTest_Transit_HeaderRewriting();                                     \
 
 struct TransitHeader
 {