diff --git a/android/jni/com/mapswithme/core/jni_helper.cpp b/android/jni/com/mapswithme/core/jni_helper.cpp
index 953aac16de..59e9a48c24 100644
--- a/android/jni/com/mapswithme/core/jni_helper.cpp
+++ b/android/jni/com/mapswithme/core/jni_helper.cpp
@@ -291,20 +291,20 @@ void DumpDalvikReferenceTables()
 
 jobject ToKeyValue(JNIEnv * env, std::pair<std::string, std::string> src)
 {
-  static jmethodID const PairInit = jni::GetConstructorID(
+  static jmethodID const keyValueInit = jni::GetConstructorID(
     env, g_keyValueClazz, "(Ljava/lang/String;Ljava/lang/String;)V");
 
   jni::TScopedLocalRef key(env, jni::ToJavaString(env, src.first));
   jni::TScopedLocalRef value(env, jni::ToJavaString(env, src.second));
 
-  return env->NewObject(g_keyValueClazz, PairInit, key.get(), value.get());
+  return env->NewObject(g_keyValueClazz, keyValueInit, key.get(), value.get());
 }
 
 std::pair<std::string, std::string> ToNativeKeyValue(JNIEnv * env, jobject pairOfStrings)
 {
-  static jfieldID const keyId = env->GetFieldID(g_keyValueClazz, "key",
+  static jfieldID const keyId = env->GetFieldID(g_keyValueClazz, "mKey",
                                                   "Ljava/lang/String;");
-  static jfieldID const valueId = env->GetFieldID(g_keyValueClazz, "value",
+  static jfieldID const valueId = env->GetFieldID(g_keyValueClazz, "mValue",
                                                    "Ljava/lang/String;");
 
   jni::ScopedLocalRef<jstring> const key(
diff --git a/android/src/com/mapswithme/util/HttpClient.java b/android/src/com/mapswithme/util/HttpClient.java
index 596acb1ac9..67b71dc798 100644
--- a/android/src/com/mapswithme/util/HttpClient.java
+++ b/android/src/com/mapswithme/util/HttpClient.java
@@ -99,7 +99,7 @@ public final class HttpClient
 
       for (KeyValue header : p.headers)
       {
-        connection.setRequestProperty(header.key, header.value);
+        connection.setRequestProperty(header.mKey, header.mValue);
       }
 
       if (!TextUtils.isEmpty(p.inputFilePath) || p.data != null)
diff --git a/android/src/com/mapswithme/util/HttpUploader.java b/android/src/com/mapswithme/util/HttpUploader.java
index 7f3dad2146..fc45b15eab 100644
--- a/android/src/com/mapswithme/util/HttpUploader.java
+++ b/android/src/com/mapswithme/util/HttpUploader.java
@@ -4,6 +4,7 @@ import android.support.annotation.NonNull;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 
 final class HttpUploader
 {
@@ -12,9 +13,9 @@ final class HttpUploader
   @NonNull
   private final String mUrl;
   @NonNull
-  private final ArrayList<KeyValue> mParams;
+  private final List<KeyValue> mParams;
   @NonNull
-  private final ArrayList<KeyValue> mHeaders;
+  private final List<KeyValue> mHeaders;
   @NonNull
   private final String mFileKey;
   @NonNull
diff --git a/android/src/com/mapswithme/util/KeyValue.java b/android/src/com/mapswithme/util/KeyValue.java
index ce052e5e81..d4d7d9fc90 100644
--- a/android/src/com/mapswithme/util/KeyValue.java
+++ b/android/src/com/mapswithme/util/KeyValue.java
@@ -6,12 +6,12 @@ final class KeyValue
 {
   KeyValue(@NonNull String key, @NonNull String value)
   {
-    this.key = key;
-    this.value = value;
+    mKey = key;
+    mValue = value;
   }
 
   @NonNull
-  public final String key;
+  public final String mKey;
   @NonNull
-  public final String value;
+  public final String mValue;
 }