diff --git a/drape_frontend/gui/layer_render.cpp b/drape_frontend/gui/layer_render.cpp
index e7b41c5c94..3f2ce8202e 100644
--- a/drape_frontend/gui/layer_render.cpp
+++ b/drape_frontend/gui/layer_render.cpp
@@ -46,7 +46,7 @@ void LayerRenderer::Merge(ref_ptr<LayerRenderer> other)
     if (it != m_renderers.end())
     {
       it->second = move(r.second);
-      if (m_activeOverlay != nullptr && m_activeOverlayRenderer == r.first)
+      if (m_activeOverlay != nullptr && m_activeOverlayWidget == r.first)
       {
         m_activeOverlay->OnTapEnd();
         m_activeOverlay = nullptr;
@@ -91,7 +91,7 @@ bool LayerRenderer::OnTouchDown(m2::RectD const & touchArea)
     m_activeOverlay = r.second->ProcessTapEvent(touchArea);
     if (m_activeOverlay != nullptr)
     {
-      m_activeOverlayRenderer = r.first;
+      m_activeOverlayWidget = r.first;
       m_activeOverlay->OnTapBegin();
       return true;
     }
diff --git a/drape_frontend/gui/layer_render.hpp b/drape_frontend/gui/layer_render.hpp
index cc4eb579a8..7d27dbb600 100644
--- a/drape_frontend/gui/layer_render.hpp
+++ b/drape_frontend/gui/layer_render.hpp
@@ -46,7 +46,7 @@ private:
   TRenderers m_renderers;
 
   ref_ptr<gui::Handle> m_activeOverlay;
-  EWidget m_activeOverlayRenderer = EWidget::WIDGET_RULER;
+  EWidget m_activeOverlayWidget = EWidget::WIDGET_RULER;
 };
 
 class LayerCacher