diff --git a/coding/coding_tests/fixed_bits_ddvector_test.cpp b/coding/coding_tests/fixed_bits_ddvector_test.cpp
index 4a8a998952..4919bf82ad 100644
--- a/coding/coding_tests/fixed_bits_ddvector_test.cpp
+++ b/coding/coding_tests/fixed_bits_ddvector_test.cpp
@@ -32,8 +32,8 @@ template <size_t Bits> void TestWithData(vector<uint32_t> const & lst)
       builder.PushBack(v);
     }
 
-    pair<uint32_t, uint32_t> exp(optCount, lst.size());
-    TEST_EQUAL(builder.GetCount(), exp, ());
+    pair<uint32_t, uint32_t> expected(optCount, lst.size());
+    TEST_EQUAL(builder.GetCount(), expected, ());
   }
 
   MemReader reader(buf.data(), buf.size());
diff --git a/coding/fixed_bits_ddvector.hpp b/coding/fixed_bits_ddvector.hpp
index b535be9b73..f0a65b197a 100644
--- a/coding/fixed_bits_ddvector.hpp
+++ b/coding/fixed_bits_ddvector.hpp
@@ -19,7 +19,7 @@
 /// - value (1 << Bits) - 1 tells that actual value is stored in the exceptions table below.
 /// Buffer with exceptions table, e.g. vector of (index, value) pairs till the end of the reader,
 /// sorted by index parameter.
-/// Component works in little endian without any host conversions.
+/// Component is stored and used in host's endianness, without any conversions.
 
 template
 <
diff --git a/indexer/search_index_builder.cpp b/indexer/search_index_builder.cpp
index d274e13599..d97f70c089 100644
--- a/indexer/search_index_builder.cpp
+++ b/indexer/search_index_builder.cpp
@@ -292,7 +292,7 @@ void BuildAddressTable(FilesContainerR & container, Writer & writer)
   search::ReverseGeocoder rgc(mwmIndex);
 
   {
-    FixedBitsDDVector<3, FileReader>::Builder<Writer> b2sBuilder(writer);
+    FixedBitsDDVector<3, FileReader>::Builder<Writer> building2Street(writer);
 
     FeaturesVectorTest features(container);
     while (src.Size() > 0)
@@ -325,10 +325,10 @@ void BuildAddressTable(FilesContainerR & container, Writer & writer)
       }
 
       ++index;
-      b2sBuilder.PushBack(ind);
+      building2Street.PushBack(ind);
     }
 
-    LOG(LINFO, ("Address: Building -> Street (opt, all)", b2sBuilder.GetCount()));
+    LOG(LINFO, ("Address: Building -> Street (opt, all)", building2Street.GetCount()));
   }
 
   LOG(LINFO, ("Address: Matched percent", 100 * (1.0 - missing/double(address))));
@@ -350,10 +350,12 @@ bool BuildSearchIndexFromDataFile(string const & filename, bool forceRebuild)
   my::GetNameFromFullPath(mwmName);
   my::GetNameWithoutExt(mwmName);
 
-  string const indexFilePath = platform.WritablePathForFile(mwmName + "." + string(SEARCH_INDEX_FILE_TAG) + ".tmp");
+  string const indexFilePath = platform.WritablePathForFile(
+        mwmName + "." SEARCH_INDEX_FILE_TAG EXTENSION_TMP);
   MY_SCOPE_GUARD(indexFileGuard, bind(&FileWriter::DeleteFileX, indexFilePath));
 
-  string const addrFilePath = platform.WritablePathForFile(mwmName + "." + string(SEARCH_ADDRESS_FILE_TAG) + ".tmp");
+  string const addrFilePath = platform.WritablePathForFile(
+        mwmName + "." SEARCH_ADDRESS_FILE_TAG EXTENSION_TMP);
   MY_SCOPE_GUARD(addrFileGuard, bind(&FileWriter::DeleteFileX, addrFilePath));
 
   try