diff --git a/generator/generator_tests/intermediate_data_test.cpp b/generator/generator_tests/intermediate_data_test.cpp
index 3cb6812f6e..84c56f9ba6 100644
--- a/generator/generator_tests/intermediate_data_test.cpp
+++ b/generator/generator_tests/intermediate_data_test.cpp
@@ -136,10 +136,10 @@ UNIT_TEST(Intermediate_Data_way_element_save_load_test)
 
 UNIT_TEST(Intermediate_Data_relation_element_save_load_test)
 {
-  RelationElement::TMembers testData = {{1, "inner"},
-                                        {2, "outer"},
-                                        {3, "unknown"},
-                                        {4, "inner role"}};
+  std::vector<RelationElement::Member> testData = {{1, "inner"},
+                                                   {2, "outer"},
+                                                   {3, "unknown"},
+                                                   {4, "inner role"}};
 
   RelationElement e1;
 
diff --git a/generator/intermediate_elements.hpp b/generator/intermediate_elements.hpp
index 3a18367a69..0beeb35419 100644
--- a/generator/intermediate_elements.hpp
+++ b/generator/intermediate_elements.hpp
@@ -87,10 +87,10 @@ struct WayElement
 class RelationElement
 {
 public:
-  using TMembers = std::vector<std::pair<uint64_t, std::string>>;
+  using Member = std::pair<uint64_t, std::string>;
 
-  TMembers nodes;
-  TMembers ways;
+  std::vector<Member> nodes;
+  std::vector<Member> ways;
   std::map<std::string, std::string> tags;
 
   bool IsValid() const { return !(nodes.empty() && ways.empty()); }
@@ -147,7 +147,7 @@ public:
       writer.Write(str.data(), sz);
     };
 
-    auto MembersWriter = [&writer, &StringWriter](TMembers const & members)
+    auto MembersWriter = [&writer, &StringWriter](std::vector<Member> const & members)
     {
       uint64_t count = members.size();
       WriteVarUint(writer, count);
@@ -187,7 +187,7 @@ public:
       r.Read(&str[0], sz);
     };
 
-    auto MembersReader = [&r, &StringReader](TMembers & members)
+    auto MembersReader = [&r, &StringReader](std::vector<Member> & members)
     {
       uint64_t count = ReadVarUint<uint64_t>(r);
       members.resize(count);
@@ -237,7 +237,7 @@ public:
   }
 
 protected:
-  bool FindRoleImpl(TMembers const & container, uint64_t id, std::string & role) const
+  bool FindRoleImpl(std::vector<Member> const & container, uint64_t id, std::string & role) const
   {
     for (auto const & e : container)
     {