diff --git a/android/jni/com/mapswithme/platform/GuiThread.cpp b/android/jni/com/mapswithme/platform/GuiThread.cpp
index e3e5cd7275..b6e31694a2 100644
--- a/android/jni/com/mapswithme/platform/GuiThread.cpp
+++ b/android/jni/com/mapswithme/platform/GuiThread.cpp
@@ -35,7 +35,7 @@ base::TaskLoop::PushResult GuiThread::Push(Task && task)
   // Pointer will be deleted in ProcessTask.
   auto t = new Task(std::move(task));
   jni::GetEnv()->CallVoidMethod(m_object, m_method, reinterpret_cast<jlong>(t));
-  return {true, kIncorrectId};
+  return {true, kNoId};
 }
 
 base::TaskLoop::PushResult GuiThread::Push(Task const & task)
@@ -43,6 +43,6 @@ base::TaskLoop::PushResult GuiThread::Push(Task const & task)
   // Pointer will be deleted in ProcessTask.
   auto t = new Task(task);
   jni::GetEnv()->CallVoidMethod(m_object, m_method, reinterpret_cast<jlong>(t));
-  return {true, kIncorrectId};
+  return {true, kNoId};
 }
 }  // namespace android
diff --git a/base/base_tests/thread_pool_delayed_tests.cpp b/base/base_tests/thread_pool_delayed_tests.cpp
index 48dcc4df79..66b9175527 100644
--- a/base/base_tests/thread_pool_delayed_tests.cpp
+++ b/base/base_tests/thread_pool_delayed_tests.cpp
@@ -42,15 +42,15 @@ UNIT_TEST(ThreadPoolDelayed_SimpleSync)
   ThreadPool thread;
   auto pushResult = thread.Push([&value]() { ++value; });
   TEST(pushResult.m_isSuccess, ());
-  TEST_NOT_EQUAL(pushResult.m_id, ThreadPool::kIncorrectId, ());
+  TEST_NOT_EQUAL(pushResult.m_id, ThreadPool::kNoId, ());
 
   pushResult = thread.Push([&value]() { value *= 2; });
   TEST(pushResult.m_isSuccess, ());
-  TEST_NOT_EQUAL(pushResult.m_id, ThreadPool::kIncorrectId, ());
+  TEST_NOT_EQUAL(pushResult.m_id, ThreadPool::kNoId, ());
 
   pushResult = thread.Push([&value]() { value = value * value * value; });
   TEST(pushResult.m_isSuccess, ());
-  TEST_NOT_EQUAL(pushResult.m_id, ThreadPool::kIncorrectId, ());
+  TEST_NOT_EQUAL(pushResult.m_id, ThreadPool::kNoId, ());
 
   pushResult = thread.Push([&]() {
     lock_guard<mutex> lk(mu);
@@ -58,7 +58,7 @@ UNIT_TEST(ThreadPoolDelayed_SimpleSync)
     cv.notify_one();
   });
   TEST(pushResult.m_isSuccess, ());
-  TEST_NOT_EQUAL(pushResult.m_id, ThreadPool::kIncorrectId, ());
+  TEST_NOT_EQUAL(pushResult.m_id, ThreadPool::kNoId, ());
 
   {
     unique_lock<mutex> lk(mu);
@@ -75,14 +75,14 @@ UNIT_TEST(ThreadPoolDelayed_SimpleFlush)
     ThreadPool thread;
     auto pushResult = thread.Push([&value]() { ++value; });
     TEST(pushResult.m_isSuccess, ());
-    TEST_NOT_EQUAL(pushResult.m_id, ThreadPool::kIncorrectId, ());
+    TEST_NOT_EQUAL(pushResult.m_id, ThreadPool::kNoId, ());
 
     pushResult = thread.Push([&value]() {
       for (int i = 0; i < 10; ++i)
         value *= 2;
     });
     TEST(pushResult.m_isSuccess, ());
-    TEST_NOT_EQUAL(pushResult.m_id, ThreadPool::kIncorrectId, ());
+    TEST_NOT_EQUAL(pushResult.m_id, ThreadPool::kNoId, ());
 
     TEST(thread.Shutdown(ThreadPool::Exit::ExecPending), ());
   }
@@ -101,10 +101,10 @@ UNIT_TEST(ThreadPoolDelayed_PushFromPendingTask)
     f.get();
     auto const pushResult = thread.Push([]() { TEST(false, ("This task should not be executed")); });
     TEST(!pushResult.m_isSuccess, ());
-    TEST_EQUAL(pushResult.m_id, ThreadPool::kIncorrectId, ());
+    TEST_EQUAL(pushResult.m_id, ThreadPool::kNoId, ());
   });
   TEST(pushResult.m_isSuccess, ());
-  TEST_NOT_EQUAL(pushResult.m_id, ThreadPool::kIncorrectId, ());
+  TEST_NOT_EQUAL(pushResult.m_id, ThreadPool::kNoId, ());
 
   thread.Shutdown(ThreadPool::Exit::ExecPending);
   p.set_value();
@@ -135,7 +135,7 @@ UNIT_TEST(ThreadPoolDelayed_DelayedAndImmediateTasks)
 
       auto const pushResult = thread.PushDelayed(entry.m_delay, [&]() { entry.m_end = thread.Now(); });
       TEST(pushResult.m_isSuccess, ());
-      TEST_NOT_EQUAL(pushResult.m_id, ThreadPool::kIncorrectId, ());
+      TEST_NOT_EQUAL(pushResult.m_id, ThreadPool::kNoId, ());
     }
 
     for (int i = 0; i < kNumTasks; ++i)
@@ -144,7 +144,7 @@ UNIT_TEST(ThreadPoolDelayed_DelayedAndImmediateTasks)
       auto const pushResult = thread.Push([&]() { entry = thread.Now(); });
 
       TEST(pushResult.m_isSuccess, ());
-      TEST_NOT_EQUAL(pushResult.m_id, ThreadPool::kIncorrectId, ());
+      TEST_NOT_EQUAL(pushResult.m_id, ThreadPool::kNoId, ());
     }
 
     thread.Shutdown(ThreadPool::Exit::ExecPending);
diff --git a/base/task_loop.hpp b/base/task_loop.hpp
index fee08aa393..2fcdd41b65 100644
--- a/base/task_loop.hpp
+++ b/base/task_loop.hpp
@@ -11,14 +11,15 @@ public:
   using Task = std::function<void()>;
   using TaskId = uint64_t;
 
-  static TaskId constexpr kIncorrectId = 0;
+  static TaskId constexpr kNoId = 0;
 
   struct PushResult
   {
     // Contains true when task is posted successfully.
     bool m_isSuccess = false;
-    // Contains id of posted task.
-    TaskId m_id = kIncorrectId;
+    // Contains id of posted task which can be used to access the task to cancel/suspend/etc it.
+    // kNoId is returned for tasks that cannot be accessed.
+    TaskId m_id = kNoId;
   };
 
   virtual ~TaskLoop() = default;
diff --git a/base/thread_pool_delayed.cpp b/base/thread_pool_delayed.cpp
index 3cfc91ee1c..5bab6538a9 100644
--- a/base/thread_pool_delayed.cpp
+++ b/base/thread_pool_delayed.cpp
@@ -187,7 +187,7 @@ bool ThreadPool::Cancel(TaskId id)
 {
   lock_guard<mutex> lk(m_mu);
 
-  if (m_shutdown || id == kIncorrectId)
+  if (m_shutdown || id == kNoId)
     return false;
 
   if (id <= kImmediateMaxId)
diff --git a/base/thread_pool_delayed.hpp b/base/thread_pool_delayed.hpp
index e90f9f5763..2bc1ab9105 100644
--- a/base/thread_pool_delayed.hpp
+++ b/base/thread_pool_delayed.hpp
@@ -114,7 +114,7 @@ private:
     }
     bool operator>(DelayedTask const & rhs) const { return rhs < *this; }
 
-    TaskId m_id = kIncorrectId;
+    TaskId m_id = kNoId;
     TimePoint m_when = {};
     Task m_task = {};
   };
diff --git a/map/guides_manager.cpp b/map/guides_manager.cpp
index 048ed18dde..f5f7165c0c 100644
--- a/map/guides_manager.cpp
+++ b/map/guides_manager.cpp
@@ -195,9 +195,9 @@ void GuidesManager::RequestGuides(bool suggestZoom)
       std::bind(&GuidesManager::OnRequestSucceed, this, _1, suggestZoom, requestNumber),
       std::bind(&GuidesManager::OnRequestError, this));
 
-  if (pushResult.m_id != base::TaskLoop::kIncorrectId)
+  if (pushResult.m_id != base::TaskLoop::kNoId)
   {
-    if (m_previousRequestsId != base::TaskLoop::kIncorrectId)
+    if (m_previousRequestsId != base::TaskLoop::kNoId)
       GetPlatform().CancelTask(Platform::Thread::Network, m_previousRequestsId);
 
     m_previousRequestsId = pushResult.m_id;
@@ -211,10 +211,10 @@ void GuidesManager::OnRequestSucceed(guides_on_map::GuidesOnMap const & guides,
     return;
 
   m_errorRequestsCount = 0;
-  if (m_retryAfterErrorRequestId != base::TaskLoop::kIncorrectId)
+  if (m_retryAfterErrorRequestId != base::TaskLoop::kNoId)
   {
     GetPlatform().CancelTask(Platform::Thread::Background, m_retryAfterErrorRequestId);
-    m_retryAfterErrorRequestId = base::TaskLoop::kIncorrectId;
+    m_retryAfterErrorRequestId = base::TaskLoop::kNoId;
   }
 
   if (requestNumber != m_requestCounter)
@@ -259,7 +259,7 @@ void GuidesManager::OnRequestSucceed(guides_on_map::GuidesOnMap const & guides,
 void GuidesManager::OnRequestError()
 {
   if (m_state == GuidesState::Disabled || m_state == GuidesState::FatalNetworkError ||
-      m_retryAfterErrorRequestId != base::TaskLoop::kIncorrectId)
+      m_retryAfterErrorRequestId != base::TaskLoop::kNoId)
   {
     return;
   }
@@ -282,7 +282,7 @@ void GuidesManager::OnRequestError()
           if (m_state != GuidesState::NetworkError)
             return;
 
-          m_retryAfterErrorRequestId = base::TaskLoop::kIncorrectId;
+          m_retryAfterErrorRequestId = base::TaskLoop::kNoId;
           RequestGuides();
         });
       });
diff --git a/map/guides_manager.hpp b/map/guides_manager.hpp
index 76f85d8b26..6edc629383 100644
--- a/map/guides_manager.hpp
+++ b/map/guides_manager.hpp
@@ -147,8 +147,8 @@ private:
 
   uint64_t m_requestCounter = 0;
   uint8_t m_errorRequestsCount = 0;
-  base::TaskLoop::TaskId m_retryAfterErrorRequestId = base::TaskLoop::kIncorrectId;
-  base::TaskLoop::TaskId m_previousRequestsId = base::TaskLoop::kIncorrectId;
+  base::TaskLoop::TaskId m_retryAfterErrorRequestId = base::TaskLoop::kNoId;
+  base::TaskLoop::TaskId m_previousRequestsId = base::TaskLoop::kNoId;
 
   guides_on_map::Api m_api;
   guides_on_map::GuidesOnMap m_guides;
diff --git a/platform/gui_thread_apple.mm b/platform/gui_thread_apple.mm
index 13e7f5360b..a76d846947 100644
--- a/platform/gui_thread_apple.mm
+++ b/platform/gui_thread_apple.mm
@@ -20,12 +20,12 @@ namespace platform
 base::TaskLoop::PushResult GuiThread::Push(Task && task)
 {
   dispatch_async_f(dispatch_get_main_queue(), new Task(std::move(task)), &PerformImpl);
-  return {true, TaskLoop::kIncorrectId};
+  return {true, TaskLoop::kNoId};
 }
 
 base::TaskLoop::PushResult GuiThread::Push(Task const & task)
 {
   dispatch_async_f(dispatch_get_main_queue(), new Task(task), &PerformImpl);
-  return {true, TaskLoop::kIncorrectId};
+  return {true, TaskLoop::kNoId};
 }
 }  // namespace platform
diff --git a/platform/gui_thread_linux.cpp b/platform/gui_thread_linux.cpp
index 1a347d5862..91b4d26dd3 100644
--- a/platform/gui_thread_linux.cpp
+++ b/platform/gui_thread_linux.cpp
@@ -13,7 +13,7 @@ base::TaskLoop::PushResult GuiThread::Push(Task && task)
   QObject source;
   QObject::connect(&source, &QObject::destroyed, QCoreApplication::instance(), std::move(task));
 
-  return {true, base::TaskLoop::kIncorrectId};
+  return {true, base::TaskLoop::kNoId};
 }
 
 base::TaskLoop::PushResult GuiThread::Push(Task const & task)
@@ -23,6 +23,6 @@ base::TaskLoop::PushResult GuiThread::Push(Task const & task)
   QObject source;
   QObject::connect(&source, &QObject::destroyed, QCoreApplication::instance(), task);
 
-  return {true, base::TaskLoop::kIncorrectId};
+  return {true, base::TaskLoop::kNoId};
 }
 }  // namespace platform