renamed yg into graphics.

203 files changed, 1304 insertions, 1304 deletions

diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index c7f59dda8e..bb09502eac 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -55,7 +55,7 @@ LOCAL_SRC_FILES := \
 	nv_time/nv_time.cpp
 
 LOCAL_LDLIBS := -llog -lGLESv2 \
-		-lmap -lgui -lversion -lsearch -lstorage -lindexer -lyg -lplatform -lanim \
+		-lmap -lgui -lversion -lsearch -lstorage -lindexer -lgraphics -lplatform -lanim \
 		-lgeometry -lcoding -lbase -lexpat -lfreetype -lfribidi -lzlib -lbzip2 \
 		-ljansson -ltomcrypt -lprotobuf ./obj/local/$(TARGET_ARCH_ABI)/libgnustl_static.a
 
diff --git a/android/jni/com/mapswithme/core/render_context.cpp b/android/jni/com/mapswithme/core/render_context.cpp
index 901a58aa88..f1de5ca5e4 100644
--- a/android/jni/com/mapswithme/core/render_context.cpp
+++ b/android/jni/com/mapswithme/core/render_context.cpp
@@ -15,7 +15,7 @@ namespace android
   void RenderContext::makeCurrent()
   {}
 
-  shared_ptr<yg::gl::RenderContext> RenderContext::createShared()
+  shared_ptr<graphics::gl::RenderContext> RenderContext::createShared()
   {
     return make_shared_ptr(new RenderContext());
   }
diff --git a/android/jni/com/mapswithme/core/render_context.hpp b/android/jni/com/mapswithme/core/render_context.hpp
index cf328ad4eb..56374cc531 100644
--- a/android/jni/com/mapswithme/core/render_context.hpp
+++ b/android/jni/com/mapswithme/core/render_context.hpp
@@ -7,20 +7,20 @@
 
 #pragma once
 
-#include "../../../../../yg/rendercontext.hpp"
+#include "../../../../../graphics/rendercontext.hpp"
 
 #include "../../../../../std/shared_ptr.hpp"
 
 namespace android
 {
-  class RenderContext : public yg::gl::RenderContext
+  class RenderContext : public graphics::gl::RenderContext
   {
   public:
     RenderContext();
 
     virtual void makeCurrent();
 
-    virtual shared_ptr<yg::gl::RenderContext> createShared();
+    virtual shared_ptr<graphics::gl::RenderContext> createShared();
 
     virtual void endThreadDrawing();
   };
diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp
index b682fccbb7..ce04bd6114 100644
--- a/android/jni/com/mapswithme/maps/Framework.cpp
+++ b/android/jni/com/mapswithme/maps/Framework.cpp
@@ -12,8 +12,8 @@
 
 #include "../../../../../coding/file_container.hpp"
 
-#include "../../../../../yg/framebuffer.hpp"
-#include "../../../../../yg/internal/opengl.hpp"
+#include "../../../../../graphics/framebuffer.hpp"
+#include "../../../../../graphics/internal/opengl.hpp"
 
 #include "../../../../../platform/platform.hpp"
 #include "../../../../../platform/location.hpp"
@@ -102,11 +102,11 @@ namespace android
 
   bool Framework::InitRenderPolicy(int densityDpi, int screenWidth, int screenHeight)
   {
-    yg::ResourceManager::Params rmParams;
+    graphics::ResourceManager::Params rmParams;
 
     rmParams.m_videoMemoryLimit = 30 * 1024 * 1024;
-    rmParams.m_rtFormat = yg::Data8Bpp;
-    rmParams.m_texFormat = yg::Data4Bpp;
+    rmParams.m_rtFormat = graphics::Data8Bpp;
+    rmParams.m_texFormat = graphics::Data4Bpp;
 
     RenderPolicy::Params rpParams;
 
@@ -153,7 +153,7 @@ namespace android
       else
         m_doLoadState = true;
     }
-    catch (yg::gl::platform_unsupported const & e)
+    catch (graphics::gl::platform_unsupported const & e)
     {
       LOG(LINFO, ("This android platform is unsupported, reason:", e.what()));
       return false;
diff --git a/android/jni/com/mapswithme/maps/Framework.hpp b/android/jni/com/mapswithme/maps/Framework.hpp
index 03047e2e95..0cd05c3083 100644
--- a/android/jni/com/mapswithme/maps/Framework.hpp
+++ b/android/jni/com/mapswithme/maps/Framework.hpp
@@ -3,7 +3,7 @@
 #include <jni.h>
 
 #include "../../../../../map/framework.hpp"
-#include "../../../../../map/drawer_yg.hpp"
+#include "../../../../../map/drawer.hpp"
 #include "../../../../../map/window_handle.hpp"
 #include "../../../../../map/feature_vec_model.hpp"
 
diff --git a/android/jni/com/mapswithme/maps/Lifecycle.cpp b/android/jni/com/mapswithme/maps/Lifecycle.cpp
index c8991871d7..8c51782bd7 100644
--- a/android/jni/com/mapswithme/maps/Lifecycle.cpp
+++ b/android/jni/com/mapswithme/maps/Lifecycle.cpp
@@ -18,7 +18,7 @@
 #include "../../../nv_event/nv_event.hpp"
 #include "../../../nv_thread/nv_thread.hpp"
 #include "../../../../../base/logging.hpp"
-#include "../../../../../yg/internal/opengl.hpp"
+#include "../../../../../graphics/internal/opengl.hpp"
 #include "Framework.hpp"
 #include "../platform/Platform.hpp"
 
@@ -77,11 +77,11 @@ bool ShutdownGLESResources()
   {
     NVDEBUG("ShutdownGLESResources: GLES not bound, shutting down EGL to release");
 
-    yg::gl::g_hasContext = false;
+    graphics::gl::g_hasContext = false;
 
     g_framework->DeleteRenderPolicy();
 
-    yg::gl::g_hasContext = true;
+    graphics::gl::g_hasContext = true;
 
     NVDEBUG("Cleaning up EGL");
 
diff --git a/yg/agg_traits.hpp b/graphics/agg_traits.hpp
index 04bd0dfea7..da61009316 100644
--- a/yg/agg_traits.hpp
+++ b/graphics/agg_traits.hpp
@@ -15,13 +15,13 @@ struct AggTraits
 };
 
 template <>
-struct AggTraits<yg::RGBA8Traits>
+struct AggTraits<graphics::RGBA8Traits>
 {
   typedef agg::pixfmt_rgba32 pixfmt_t;
 };
 
 template <>
-struct AggTraits<yg::RGBA4Traits>
+struct AggTraits<graphics::RGBA4Traits>
 {
   typedef agg::pixfmt_rgb4444 pixfmt_t;
 };
diff --git a/yg/area_renderer.cpp b/graphics/area_renderer.cpp
index dbfd3b6e02..f2835609e6 100644
--- a/yg/area_renderer.cpp
+++ b/graphics/area_renderer.cpp
@@ -6,7 +6,7 @@
 
 #include "../base/logging.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
diff --git a/yg/area_renderer.hpp b/graphics/area_renderer.hpp
index 33d13d7b20..856582ed8a 100644
--- a/yg/area_renderer.hpp
+++ b/graphics/area_renderer.hpp
@@ -2,7 +2,7 @@
 
 #include "geometry_batcher.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
diff --git a/yg/base_texture.cpp b/graphics/base_texture.cpp
index b73f566c04..191cf3a358 100644
--- a/yg/base_texture.cpp
+++ b/graphics/base_texture.cpp
@@ -6,7 +6,7 @@
 #include "../base/logging.hpp"
 #include "../std/bind.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
@@ -76,11 +76,11 @@ namespace yg
       return id;
     }
 
-    void BaseTexture::makeCurrent(yg::gl::PacketsQueue * queue) const
+    void BaseTexture::makeCurrent(graphics::gl::PacketsQueue * queue) const
     {
       if (queue)
       {
-        queue->processFn(bind(&BaseTexture::makeCurrent, this, (yg::gl::PacketsQueue*)0));
+        queue->processFn(bind(&BaseTexture::makeCurrent, this, (graphics::gl::PacketsQueue*)0));
         return;
       }
 
diff --git a/yg/base_texture.hpp b/graphics/base_texture.hpp
index 44e57e335e..39c37ffba5 100644
--- a/yg/base_texture.hpp
+++ b/graphics/base_texture.hpp
@@ -5,7 +5,7 @@
 #include "render_target.hpp"
 #include "packets_queue.hpp"
 
-namespace yg
+namespace graphics
 {
   struct Color;
   namespace gl
@@ -34,7 +34,7 @@ namespace yg
         unsigned height() const;
 
         unsigned id() const;
-        void makeCurrent(yg::gl::PacketsQueue * queue = 0) const;
+        void makeCurrent(graphics::gl::PacketsQueue * queue = 0) const;
         void attachToFrameBuffer();
         void detachFromFrameBuffer();
 
@@ -42,7 +42,7 @@ namespace yg
         m2::RectF const mapRect(m2::RectF const & r) const;
         void mapPixel(float & x, float & y) const;
 
-        virtual void fill(yg::Color const & c) = 0;
+        virtual void fill(graphics::Color const & c) = 0;
         virtual void dump(char const * fileName) = 0;
 
         static unsigned current();
diff --git a/yg/blitter.cpp b/graphics/blitter.cpp
index e2a8408701..c1878e9df3 100644
--- a/yg/blitter.cpp
+++ b/graphics/blitter.cpp
@@ -14,7 +14,7 @@
 #include "../geometry/screenbase.hpp"
 #include "../base/logging.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
@@ -49,7 +49,7 @@ namespace yg
       m_texture = texture;
       m_hasTexture = true;
       m_hasColor = false;
-      m_color = yg::Color(255, 255, 255, 255);
+      m_color = graphics::Color(255, 255, 255, 255);
       m_resourceManager = rm;
     }
 
@@ -75,7 +75,7 @@ namespace yg
                        ScreenBase const & from,
                        ScreenBase const & to,
                        bool isSubPixel,
-                       yg::Color const & color,
+                       graphics::Color const & color,
                        m2::RectI const & srcRect,
                        m2::RectU const & texRect)
     {
@@ -111,7 +111,7 @@ namespace yg
         idxData[i * 4 + 3] = i * 4 + 3;
       }
 
-      yg::gl::Storage storage = resourceManager()->multiBlitStorages()->Reserve();
+      graphics::gl::Storage storage = resourceManager()->multiBlitStorages()->Reserve();
 
       if (resourceManager()->multiBlitStorages()->IsCancelled())
       {
@@ -131,12 +131,12 @@ namespace yg
       {
         pointsData[i].pt.x = geomPts[i].x;
         pointsData[i].pt.y = geomPts[i].y;
-        pointsData[i].depth = yg::maxDepth;
+        pointsData[i].depth = graphics::maxDepth;
         pointsData[i].tex.x = texPts[i].x;
         pointsData[i].tex.y = texPts[i].y;
         pointsData[i].normal.x = 0;
         pointsData[i].normal.y = 0;
-//        pointsData[i].color = yg::Color(255, 255, 255, 255);
+//        pointsData[i].color = graphics::Color(255, 255, 255, 255);
       }
 
       memcpy(storage.m_indices->data(), &idxData[0], idxData.size() * sizeof(unsigned short));
@@ -157,14 +157,14 @@ namespace yg
       base_t::freeStorage(storage, resourceManager()->multiBlitStorages());
     }
 
-    void Blitter::blit(shared_ptr<yg::gl::BaseTexture> const & srcSurface,
+    void Blitter::blit(shared_ptr<graphics::gl::BaseTexture> const & srcSurface,
                        math::Matrix<double, 3, 3> const & m,
                        bool isSubPixel)
     {
       blit(srcSurface,
            m,
            isSubPixel,
-           yg::Color(),
+           graphics::Color(),
            m2::RectI(0, 0, srcSurface->width(), srcSurface->height()),
            m2::RectU(0, 0, srcSurface->width(), srcSurface->height()));
     }
@@ -198,10 +198,10 @@ namespace yg
       texPts[3] = srcSurface->mapPixel(m2::PointF(texRect.minX(), texRect.maxY()));
     }
 
-    void Blitter::blit(shared_ptr<yg::gl::BaseTexture> const & srcSurface,
+    void Blitter::blit(shared_ptr<graphics::gl::BaseTexture> const & srcSurface,
                        math::Matrix<double, 3, 3> const & m,
                        bool isSubPixel,
-                       yg::Color const & color,
+                       graphics::Color const & color,
                        m2::RectI const & srcRect,
                        m2::RectU const & texRect)
     {
@@ -222,13 +222,13 @@ namespace yg
            from,
            to,
            isSubPixel,
-           yg::Color(),
+           graphics::Color(),
            m2::RectI(0, 0, srcSurface->width(), srcSurface->height()),
            m2::RectU(0, 0, srcSurface->width(), srcSurface->height()));
     }
 
     void Blitter::immDrawSolidRect(m2::RectF const & rect,
-                                  yg::Color const & color)
+                                  graphics::Color const & color)
     {
       immDrawRect(rect, m2::RectF(), shared_ptr<RGBA8Texture>(), false, color, true);
     }
@@ -237,7 +237,7 @@ namespace yg
                              m2::RectF const & texRect,
                              shared_ptr<BaseTexture> texture,
                              bool hasTexture,
-                             yg::Color const & color,
+                             graphics::Color const & color,
                              bool hasColor)
     {
       m2::PointF rectPoints[4] =
@@ -272,7 +272,7 @@ namespace yg
                                    size_t size,
                                    shared_ptr<BaseTexture> const & texture,
                                    bool hasTexture,
-                                   yg::Color const & color,
+                                   graphics::Color const & color,
                                    bool hasColor)
     {
       shared_ptr<IMMDrawTexturedPrimitives> command(new IMMDrawTexturedPrimitives());
@@ -296,7 +296,7 @@ namespace yg
       if (isDebugging())
         LOG(LINFO, ("performing IMMDrawTexturedPrimitives command"));
 
-      yg::gl::Storage blitStorage = m_resourceManager->blitStorages()->Reserve();
+      graphics::gl::Storage blitStorage = m_resourceManager->blitStorages()->Reserve();
 
       if (m_resourceManager->blitStorages()->IsCancelled())
       {
@@ -316,7 +316,7 @@ namespace yg
       {
         pointsData[i].pt.x = m_pts[i].x;
         pointsData[i].pt.y = m_pts[i].y;
-        pointsData[i].depth = yg::maxDepth;
+        pointsData[i].depth = graphics::maxDepth;
         pointsData[i].tex.x = m_texPts[i].x;
         pointsData[i].tex.y = m_texPts[i].y;
         pointsData[i].normal.x = 0;
diff --git a/yg/blitter.hpp b/graphics/blitter.hpp
index 3e86fc584c..115acceb9e 100644
--- a/yg/blitter.hpp
+++ b/graphics/blitter.hpp
@@ -12,7 +12,7 @@
 
 class ScreenBase;
 
-namespace yg
+namespace graphics
 {
   struct Color;
 
@@ -32,7 +32,7 @@ namespace yg
     {
     private:
 
-      yg::gl::Storage m_blitStorage;
+      graphics::gl::Storage m_blitStorage;
 
     protected:
 
@@ -55,7 +55,7 @@ namespace yg
         unsigned m_ptsCount;
         shared_ptr<BaseTexture> m_texture;
         bool m_hasTexture;
-        yg::Color m_color;
+        graphics::Color m_color;
         bool m_hasColor;
 
         shared_ptr<ResourceManager> m_resourceManager;
@@ -85,7 +85,7 @@ namespace yg
                 ScreenBase const & from,
                 ScreenBase const & to,
                 bool isSubPixel,
-                yg::Color const & color,
+                graphics::Color const & color,
                 m2::RectI const & srcRect,
                 m2::RectU const & texRect);
 
@@ -101,7 +101,7 @@ namespace yg
       void blit(shared_ptr<BaseTexture> const & srcSurface,
                 math::Matrix<double, 3, 3> const & m,
                 bool isSubPixel,
-                yg::Color const & color,
+                graphics::Color const & color,
                 m2::RectI const & srcRect,
                 m2::RectU const & texRect);
 
@@ -110,13 +110,13 @@ namespace yg
                 bool isSubPixel);
 
       void immDrawSolidRect(m2::RectF const & rect,
-                            yg::Color const & color);
+                            graphics::Color const & color);
 
       void immDrawRect(m2::RectF const & rect,
                        m2::RectF const & texRect,
                        shared_ptr<BaseTexture> texture,
                        bool hasTexture,
-                       yg::Color const & color,
+                       graphics::Color const & color,
                        bool hasColor);
 
       void immDrawTexturedPrimitives(m2::PointF const * pts,
@@ -124,7 +124,7 @@ namespace yg
                                      size_t size,
                                      shared_ptr<BaseTexture> const & texture,
                                      bool hasTexture,
-                                     yg::Color const & color,
+                                     graphics::Color const & color,
                                      bool hasColor);
 
       void immDrawTexturedRect(m2::RectF const & rect,
diff --git a/yg/buffer_object.cpp b/graphics/buffer_object.cpp
index be9143fd52..1c316d2429 100644
--- a/yg/buffer_object.cpp
+++ b/graphics/buffer_object.cpp
@@ -8,7 +8,7 @@
 #include "buffer_object.hpp"
 #include "../std/list.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
diff --git a/yg/buffer_object.hpp b/graphics/buffer_object.hpp
index a8e7a70a8f..bdd000db7e 100644
--- a/yg/buffer_object.hpp
+++ b/graphics/buffer_object.hpp
@@ -3,7 +3,7 @@
 #include "../std/vector.hpp"
 #include "../std/shared_ptr.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
diff --git a/yg/circle_element.cpp b/graphics/circle_element.cpp
index 082a906faf..6a7723d610 100644
--- a/yg/circle_element.cpp
+++ b/graphics/circle_element.cpp
@@ -4,7 +4,7 @@
 #include "resource_style.hpp"
 #include "skin.hpp"
 
-namespace yg
+namespace graphics
 {
   CircleElement::CircleElement(Params const & p)
     : base_t(p),
@@ -59,7 +59,7 @@ namespace yg
     r->drawTexturedPolygon(m2::PointD(0.0, 0.0), 0.0,
                           texRect.minX(), texRect.minY(), texRect.maxX(), texRect.maxY(),
                           posPt.x, posPt.y, posPt.x + texRect.SizeX(), posPt.y + texRect.SizeY(),
-                          yg::maxDepth,
+                          graphics::maxDepth,
                           style->m_pipelineID);
   }
 
diff --git a/yg/circle_element.hpp b/graphics/circle_element.hpp
index 5bff330007..6f99c87a05 100644
--- a/yg/circle_element.hpp
+++ b/graphics/circle_element.hpp
@@ -3,13 +3,13 @@
 #include "overlay_element.hpp"
 #include "circle_info.hpp"
 
-namespace yg
+namespace graphics
 {
   class CircleElement : public OverlayElement
   {
   private:
 
-    yg::CircleInfo m_ci;
+    graphics::CircleInfo m_ci;
 
     mutable vector<m2::AnyRectD> m_boundRects;
 
@@ -21,7 +21,7 @@ namespace yg
 
     struct Params : public base_t::Params
     {
-      yg::CircleInfo m_ci;
+      graphics::CircleInfo m_ci;
     };
 
     CircleElement(Params const & p);
diff --git a/yg/circle_info.cpp b/graphics/circle_info.cpp
index 4753a25321..ab5ae7b0eb 100644
--- a/yg/circle_info.cpp
+++ b/graphics/circle_info.cpp
@@ -5,7 +5,7 @@
 #include "../base/math.hpp"
 
 
-namespace yg
+namespace graphics
 {
   CircleInfo::CircleInfo(double radius,
                          Color const & color,
@@ -21,7 +21,7 @@ namespace yg
     if (!m_isOutlined)
     {
       m_outlineWidth = 0;
-      m_outlineColor = yg::Color(0, 0, 0, 0);
+      m_outlineColor = graphics::Color(0, 0, 0, 0);
     }
   }
 
diff --git a/yg/circle_info.hpp b/graphics/circle_info.hpp
index 01477e1c8b..11fa9c7147 100644
--- a/yg/circle_info.hpp
+++ b/graphics/circle_info.hpp
@@ -4,7 +4,7 @@
 
 #include "../geometry/point2d.hpp"
 
-namespace yg
+namespace graphics
 {
   struct CircleInfo
   {
diff --git a/yg/circle_style.cpp b/graphics/circle_style.cpp
index 0dbfef5990..6a379da0fe 100644
--- a/yg/circle_style.cpp
+++ b/graphics/circle_style.cpp
@@ -3,16 +3,16 @@
 #include "agg_traits.hpp"
 #include "data_traits.hpp"
 
-namespace yg
+namespace graphics
 {
-  CircleStyle::CircleStyle(m2::RectU const & texRect, int pipelineID, yg::CircleInfo const & ci)
+  CircleStyle::CircleStyle(m2::RectU const & texRect, int pipelineID, graphics::CircleInfo const & ci)
     : ResourceStyle(ECircleStyle, texRect, pipelineID),
       m_ci(ci)
   {}
 
   void CircleStyle::render(void * dst)
   {
-    yg::CircleInfo & circleInfo = m_ci;
+    graphics::CircleInfo & circleInfo = m_ci;
     m2::RectU const & rect = m_texRect;
 
     DATA_TRAITS::view_t v = gil::interleaved_view(
diff --git a/yg/clipper.cpp b/graphics/clipper.cpp
index 9fbac42638..9fb94e6d88 100644
--- a/yg/clipper.cpp
+++ b/graphics/clipper.cpp
@@ -4,7 +4,7 @@
 #include "../std/bind.hpp"
 #include "../base/logging.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
diff --git a/yg/clipper.hpp b/graphics/clipper.hpp
index c53b36275e..50f4b9ea42 100644
--- a/yg/clipper.hpp
+++ b/graphics/clipper.hpp
@@ -3,7 +3,7 @@
 #include "../geometry/rect2d.hpp"
 #include "renderer.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
diff --git a/yg/color.cpp b/graphics/color.cpp
index 23b32cfd53..b5c543f379 100644
--- a/yg/color.cpp
+++ b/graphics/color.cpp
@@ -1,7 +1,7 @@
 #include "color.hpp"
 
 
-namespace yg
+namespace graphics
 {
   Color::Color(unsigned char r1, unsigned char g1, unsigned char b1, unsigned char a1)
     : r(r1), g(g1), b(b1), a(a1)
diff --git a/yg/color.hpp b/graphics/color.hpp
index c1ead3d778..7c011caa4f 100644
--- a/yg/color.hpp
+++ b/graphics/color.hpp
@@ -2,7 +2,7 @@
 
 #include "../std/stdint.hpp"
 
-namespace yg
+namespace graphics
 {
   struct Color
   {
diff --git a/yg/composite_overlay_element.cpp b/graphics/composite_overlay_element.cpp
index deb501742e..e0dbbf3293 100644
--- a/yg/composite_overlay_element.cpp
+++ b/graphics/composite_overlay_element.cpp
@@ -3,7 +3,7 @@
 #include "composite_overlay_element.hpp"
 #include "overlay_renderer.hpp"
 
-namespace yg
+namespace graphics
 {
   CompositeOverlayElement::CompositeOverlayElement(OverlayElement::Params const & p)
     : OverlayElement(p)
@@ -43,7 +43,7 @@ namespace yg
 
   void CompositeOverlayElement::draw(gl::OverlayRenderer * r, math::Matrix<double, 3, 3> const & m) const
   {
-    r->drawRectangle(roughBoundRect(), yg::Color(255, 255, 0, 64), depth() - 3);
+    r->drawRectangle(roughBoundRect(), graphics::Color(255, 255, 0, 64), depth() - 3);
     for (unsigned i = 0; i < m_elements.size(); ++i)
       m_elements[i]->draw(r, m);
   }
diff --git a/yg/composite_overlay_element.hpp b/graphics/composite_overlay_element.hpp
index 97a50f73ed..97ba118547 100644
--- a/yg/composite_overlay_element.hpp
+++ b/graphics/composite_overlay_element.hpp
@@ -4,7 +4,7 @@
 #include "../std/vector.hpp"
 #include "../std/shared_ptr.hpp"
 
-namespace yg
+namespace graphics
 {
   class CompositeOverlayElement : public OverlayElement
   {
diff --git a/yg/data_formats.cpp b/graphics/data_formats.cpp
index 3056251cf3..14f3fd29f4 100644
--- a/yg/data_formats.cpp
+++ b/graphics/data_formats.cpp
@@ -1,13 +1,13 @@
 #include "data_formats.hpp"
 
-namespace yg
+namespace graphics
 {
   struct DataFormatInfo
   {
-    yg::DataFormat m_fmt;
+    graphics::DataFormat m_fmt;
     unsigned m_size;
     char const * m_name;
-    DataFormatInfo(yg::DataFormat fmt, unsigned size, char const * name)
+    DataFormatInfo(graphics::DataFormat fmt, unsigned size, char const * name)
       : m_fmt(fmt), m_size(size), m_name(name)
     {}
   };
@@ -15,9 +15,9 @@ namespace yg
   DataFormatInfo s_info [] = {DataFormatInfo(Data4Bpp, 2, "Data4Bpp"),
                               DataFormatInfo(Data8Bpp, 4, "Data8Bpp"),
                               DataFormatInfo(Data565Bpp, 2, "Data565Bpp"),
-                              DataFormatInfo((yg::DataFormat)0, 0, "Unknown")};
+                              DataFormatInfo((graphics::DataFormat)0, 0, "Unknown")};
 
-  DataFormatInfo const findInfo(yg::DataFormat const & fmt)
+  DataFormatInfo const findInfo(graphics::DataFormat const & fmt)
   {
     unsigned const cnt = sizeof(s_info) / sizeof(DataFormatInfo);
     for (unsigned i = 0; i < cnt; ++i)
diff --git a/yg/data_formats.hpp b/graphics/data_formats.hpp
index a41b68b796..2f1a1594f9 100644
--- a/yg/data_formats.hpp
+++ b/graphics/data_formats.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace yg
+namespace graphics
 {
   enum DataFormat
   {
diff --git a/yg/data_traits.hpp b/graphics/data_traits.hpp
index 6ebf2492d5..bfe3a7d41e 100644
--- a/yg/data_traits.hpp
+++ b/graphics/data_traits.hpp
@@ -8,7 +8,7 @@
 namespace gil = boost::gil;
 namespace mpl = boost::mpl;
 
-namespace yg
+namespace graphics
 {
   template <unsigned Denom>
   struct DownsampleImpl
@@ -48,7 +48,7 @@ namespace yg
 
     typedef Downsample<8, 8> color_converter;
 
-    static pixel_t const createPixel(yg::Color const & c)
+    static pixel_t const createPixel(graphics::Color const & c)
     {
       return pixel_t((unsigned char)(c.r / 255.0f) * maxChannelVal,
                      (unsigned char)(c.g / 255.0f) * maxChannelVal,
@@ -85,7 +85,7 @@ namespace yg
 
     typedef Downsample<8, 5> color_converter;
 
-    static pixel_t const createPixel(yg::Color const & c)
+    static pixel_t const createPixel(graphics::Color const & c)
     {
       return pixel_t((int)(c.r / 255.0f) * maxChannelVal,
                      (int)(c.g / 255.0f) * maxChannelVal, //< fix this channel
@@ -121,7 +121,7 @@ namespace yg
 
     typedef Downsample<8, 4> color_converter;
 
-    static pixel_t const createPixel(yg::Color const & c)
+    static pixel_t const createPixel(graphics::Color const & c)
     {
       return pixel_t((int)(c.r / 255.0f) * maxChannelVal,
                      (int)(c.g / 255.0f) * maxChannelVal,
@@ -132,9 +132,9 @@ namespace yg
 }
 
 #ifdef OMIM_GL_ES
-  #define DATA_TRAITS yg::RGBA4Traits
-  #define RT_TRAITS yg::RGBA4Traits
+  #define DATA_TRAITS graphics::RGBA4Traits
+  #define RT_TRAITS graphics::RGBA4Traits
 #else
-  #define DATA_TRAITS yg::RGBA8Traits
-  #define RT_TRAITS yg::RGBA8Traits
+  #define DATA_TRAITS graphics::RGBA8Traits
+  #define RT_TRAITS graphics::RGBA8Traits
 #endif
diff --git a/yg/defines.hpp b/graphics/defines.hpp
index 167d631eda..046759874f 100644
--- a/yg/defines.hpp
+++ b/graphics/defines.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace yg
+namespace graphics
 {
   static const int maxDepth = 20000;
 
diff --git a/yg/display_list.cpp b/graphics/display_list.cpp
index df25015d7b..2af5151843 100644
--- a/yg/display_list.cpp
+++ b/graphics/display_list.cpp
@@ -1,7 +1,7 @@
 #include "display_list.hpp"
 #include "internal/opengl.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
diff --git a/yg/display_list.hpp b/graphics/display_list.hpp
index 3e81bc9a91..cfaa5c6b44 100644
--- a/yg/display_list.hpp
+++ b/graphics/display_list.hpp
@@ -2,7 +2,7 @@
 
 #include "geometry_renderer.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
diff --git a/yg/font_desc.cpp b/graphics/font_desc.cpp
index 68a0bd88df..230b24714e 100644
--- a/yg/font_desc.cpp
+++ b/graphics/font_desc.cpp
@@ -6,12 +6,12 @@
 #include "../std/algorithm.hpp"
 
 
-namespace yg
+namespace graphics
 {
   FontDesc const & FontDesc::defaultFont = FontDesc();
 
-  FontDesc::FontDesc(int size, yg::Color const & color,
-                     bool isMasked, yg::Color const & maskColor)
+  FontDesc::FontDesc(int size, graphics::Color const & color,
+                     bool isMasked, graphics::Color const & maskColor)
                      : m_size(size), m_color(color),
                        m_isMasked(isMasked), m_maskColor(maskColor)
   {}
diff --git a/yg/font_desc.hpp b/graphics/font_desc.hpp
index ec9fda67ae..4ea666e6d5 100644
--- a/yg/font_desc.hpp
+++ b/graphics/font_desc.hpp
@@ -2,17 +2,17 @@
 
 #include "color.hpp"
 
-namespace yg
+namespace graphics
 {
   struct FontDesc
   {
     int m_size;
-    yg::Color m_color;
+    graphics::Color m_color;
     bool m_isMasked;
-    yg::Color m_maskColor;
+    graphics::Color m_maskColor;
 
-    FontDesc(int size = -1, yg::Color const & color = yg::Color(0, 0, 0, 255),
-             bool isMasked = false, yg::Color const & maskColor = yg::Color(255, 255, 255, 255));
+    FontDesc(int size = -1, graphics::Color const & color = graphics::Color(0, 0, 0, 255),
+             bool isMasked = false, graphics::Color const & maskColor = graphics::Color(255, 255, 255, 255));
 
     void SetRank(double rank);
     bool IsValid() const;
diff --git a/yg/framebuffer.cpp b/graphics/framebuffer.cpp
index 093eae2310..31a9ec6120 100644
--- a/yg/framebuffer.cpp
+++ b/graphics/framebuffer.cpp
@@ -9,7 +9,7 @@
 #include "../base/logging.hpp"
 #include "../std/list.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
diff --git a/yg/framebuffer.hpp b/graphics/framebuffer.hpp
index c4c9eb0359..cb0973c918 100644
--- a/yg/framebuffer.hpp
+++ b/graphics/framebuffer.hpp
@@ -2,7 +2,7 @@
 
 #include "../std/shared_ptr.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
diff --git a/yg/ft2_debug.cpp b/graphics/ft2_debug.cpp
index 7d08c419b2..7d08c419b2 100644
--- a/yg/ft2_debug.cpp
+++ b/graphics/ft2_debug.cpp
diff --git a/yg/ft2_debug.hpp b/graphics/ft2_debug.hpp
index a813a19c96..a813a19c96 100644
--- a/yg/ft2_debug.hpp
+++ b/graphics/ft2_debug.hpp
diff --git a/yg/geometry_batcher.cpp b/graphics/geometry_batcher.cpp
index 1e6e8c3894..fed5b06fdb 100644
--- a/yg/geometry_batcher.cpp
+++ b/graphics/geometry_batcher.cpp
@@ -18,7 +18,7 @@
 #include "../std/algorithm.hpp"
 #include "../std/bind.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
@@ -197,7 +197,7 @@ namespace yg
      }
    }
 
-   void GeometryBatcher::clear(yg::Color const & c, bool clearRT, float depth, bool clearDepth)
+   void GeometryBatcher::clear(graphics::Color const & c, bool clearRT, float depth, bool clearDepth)
    {
      flush(-1);
      base_t::clear(c, clearRT, depth, clearDepth);
@@ -808,4 +808,4 @@ namespace yg
      base_t::setPixelPrecision(flag);
    }
  } // namespace gl
-} // namespace yg
+} // namespace graphics
diff --git a/yg/geometry_batcher.hpp b/graphics/geometry_batcher.hpp
index 16959b353d..3dac1dea87 100644
--- a/yg/geometry_batcher.hpp
+++ b/graphics/geometry_batcher.hpp
@@ -23,7 +23,7 @@ namespace threads
   class Mutex;
 }
 
-namespace yg
+namespace graphics
 {
   class Skin;
 
@@ -39,7 +39,7 @@ namespace yg
 
       typedef Blitter base_t;
 
-      shared_ptr<yg::Skin> m_skin;
+      shared_ptr<graphics::Skin> m_skin;
 
       struct GeometryPipeline
       {
@@ -62,7 +62,7 @@ namespace yg
         /// @}
 
         bool m_useGuiResources;
-        yg::SkinPage::EType m_type;
+        graphics::SkinPage::EType m_type;
 
         int  verticesLeft();
         int  indicesLeft();
@@ -121,7 +121,7 @@ namespace yg
       void enableClipRect(bool flag);
       void setClipRect(m2::RectI const & rect);
 
-      void clear(yg::Color const & c, bool clearRT = true, float depth = 1.0, bool clearDepth = true);
+      void clear(graphics::Color const & c, bool clearRT = true, float depth = 1.0, bool clearDepth = true);
       /// @}
 
       void setRenderTarget(shared_ptr<RenderTarget> const & rt);
diff --git a/yg/geometry_renderer.cpp b/graphics/geometry_renderer.cpp
index aa1cdb9301..943e074ff8 100644
--- a/yg/geometry_renderer.cpp
+++ b/graphics/geometry_renderer.cpp
@@ -12,7 +12,7 @@
 #include "../std/bind.hpp"
 #include "../base/logging.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
@@ -121,7 +121,7 @@ namespace yg
       /// tracking the number of bytes downloaded onto the texture
       /// in a single shot.
       size_t bytesUploaded = 0;
-      size_t bytesPerPixel = yg::formatSize(resourceManager()->params().m_texFormat);
+      size_t bytesPerPixel = graphics::formatSize(resourceManager()->params().m_texFormat);
       size_t prev = 0;
 
       for (size_t i = 0; i < uploadQueue.size(); ++i)
@@ -382,7 +382,7 @@ namespace yg
       OGLCHECK(glEnableFn(GL_BLEND));
       OGLCHECK(glDepthMask(GL_TRUE));
 
-      if (yg::gl::g_isSeparateBlendFuncSupported)
+      if (graphics::gl::g_isSeparateBlendFuncSupported)
         OGLCHECK(glBlendFuncSeparateFn(GL_SRC_ALPHA,
                                        GL_ONE_MINUS_SRC_ALPHA,
                                        GL_ZERO,
diff --git a/yg/geometry_renderer.hpp b/graphics/geometry_renderer.hpp
index eda0b6f244..c90f469b19 100644
--- a/yg/geometry_renderer.hpp
+++ b/graphics/geometry_renderer.hpp
@@ -8,7 +8,7 @@
 #include "../std/shared_ptr.hpp"
 #include "../std/function.hpp"
 
-namespace yg
+namespace graphics
 {
   struct ResourceStyle;
 
diff --git a/yg/glyph_cache.cpp b/graphics/glyph_cache.cpp
index efeb9f5e63..7ad84d8a8e 100644
--- a/yg/glyph_cache.cpp
+++ b/graphics/glyph_cache.cpp
@@ -21,9 +21,9 @@
 
 namespace gil = boost::gil;
 
-namespace yg
+namespace graphics
 {
-  GlyphKey::GlyphKey(strings::UniChar symbolCode, int fontSize, bool isMask, yg::Color const & color)
+  GlyphKey::GlyphKey(strings::UniChar symbolCode, int fontSize, bool isMask, graphics::Color const & color)
     : m_symbolCode(symbolCode), m_fontSize(fontSize), m_isMask(isMask), m_color(color)
   {}
 
@@ -110,7 +110,7 @@ namespace yg
     double len = 0;
     for (unsigned i = 0; i < s.size(); ++i)
     {
-      GlyphKey k(s[i], static_cast<uint32_t>(fontSize), false, yg::Color(0, 0, 0, 255));
+      GlyphKey k(s[i], static_cast<uint32_t>(fontSize), false, graphics::Color(0, 0, 0, 255));
       len += getGlyphMetrics(k).m_xAdvance;
     }
 
diff --git a/yg/glyph_cache.hpp b/graphics/glyph_cache.hpp
index 75e4c907dc..d18f3e340a 100644
--- a/yg/glyph_cache.hpp
+++ b/graphics/glyph_cache.hpp
@@ -9,7 +9,7 @@
 #include "../std/string.hpp"
 #include "../std/utility.hpp"
 
-namespace yg
+namespace graphics
 {
   /// metrics of the single glyph
   struct GlyphMetrics
@@ -34,7 +34,7 @@ namespace yg
   public:
 
     GlyphMetrics m_metrics;
-    yg::Color m_color;
+    graphics::Color m_color;
 
     /// glyph bitmap in 8bpp grayscale format
     unsigned char * m_bitmapData;
@@ -49,11 +49,11 @@ namespace yg
     strings::UniChar m_symbolCode;
     int m_fontSize;
     bool m_isMask;
-    yg::Color m_color;
+    graphics::Color m_color;
     /// as it's used for fixed fonts only, the color doesn't matter
     /// @TODO REMOVE IT!!! All chars are already 32bit
     uint32_t toUInt32() const;
-    GlyphKey(strings::UniChar symbolCode, int fontSize, bool isMask, yg::Color const & color);
+    GlyphKey(strings::UniChar symbolCode, int fontSize, bool isMask, graphics::Color const & color);
   };
 
   struct Font;
diff --git a/yg/glyph_cache_impl.cpp b/graphics/glyph_cache_impl.cpp
index 29ea339974..81921fc188 100644
--- a/yg/glyph_cache_impl.cpp
+++ b/graphics/glyph_cache_impl.cpp
@@ -10,7 +10,7 @@
 
 #include <freetype/ftcache.h>
 
-namespace yg
+namespace graphics
 {
   struct RawGlyphInfo : public GlyphInfo
   {
@@ -567,7 +567,7 @@ namespace yg
       {
         fakeSymbol.reset(new RawGlyphInfo());
         fakeSymbol->m_metrics = getGlyphMetrics(key);
-        fakeSymbol->m_color = yg::Color(0, 0, 255, 255);
+        fakeSymbol->m_color = graphics::Color(0, 0, 255, 255);
         fakeSymbol->m_bitmapPitch = (fakeSymbol->m_metrics.m_width + 7) / 8 * 8;
         fakeSymbol->m_bitmapData = new unsigned char[fakeSymbol->m_bitmapPitch * fakeSymbol->m_metrics.m_height];
         for (unsigned i = 0; i < fakeSymbol->m_bitmapPitch * fakeSymbol->m_metrics.m_height; ++i)
diff --git a/yg/glyph_cache_impl.hpp b/graphics/glyph_cache_impl.hpp
index 557d417893..fa8bab6e35 100644
--- a/yg/glyph_cache_impl.hpp
+++ b/graphics/glyph_cache_impl.hpp
@@ -13,7 +13,7 @@
 
 #include <freetype/ftsystem.h>
 
-namespace yg
+namespace graphics
 {
   struct Font
   {
diff --git a/yg/glyph_layout.cpp b/graphics/glyph_layout.cpp
index 0ae89a4583..4f727a79d1 100644
--- a/yg/glyph_layout.cpp
+++ b/graphics/glyph_layout.cpp
@@ -10,7 +10,7 @@
 #include "../geometry/any_rect2d.hpp"
 #include "../base/thread.hpp"
 
-namespace yg
+namespace graphics
 {
   double GlyphLayout::getKerning(GlyphLayoutElem const & prevElem, GlyphMetrics const & prevMetrics, GlyphLayoutElem const & curElem, GlyphMetrics const & curMetrics)
   {
@@ -63,7 +63,7 @@ namespace yg
                            FontDesc const & fontDesc,
                            m2::PointD const & pt,
                            strings::UniString const & visText,
-                           yg::EPosition pos)
+                           graphics::EPosition pos)
     : m_firstVisible(0),
       m_lastVisible(visText.size()),
       m_fontDesc(fontDesc),
@@ -162,7 +162,7 @@ namespace yg
                            strings::UniString const & visText,
                            double fullLength,
                            double pathOffset,
-                           yg::EPosition pos)
+                           graphics::EPosition pos)
     : m_firstVisible(0),
       m_lastVisible(0),
       m_path(pts, ptsCount, fullLength, pathOffset),
@@ -176,7 +176,7 @@ namespace yg
       return;
     m_boundRects.push_back(m2::AnyRectD(m2::RectD(0, 0, 0, 0)));
     for (size_t i = 0; i < m_visText.size(); ++i)
-      m_metrics.push_back(glyphCache->getGlyphMetrics(GlyphKey(visText[i], m_fontDesc.m_size, m_fontDesc.m_isMasked, yg::Color(0, 0, 0, 0))));
+      m_metrics.push_back(glyphCache->getGlyphMetrics(GlyphKey(visText[i], m_fontDesc.m_size, m_fontDesc.m_isMasked, graphics::Color(0, 0, 0, 0))));
     recalcAlongPath();
   }
 
@@ -205,13 +205,13 @@ namespace yg
     // offset of the text from path's start
     double offset = (m_path.fullLength() - strLength) / 2.0;
 
-    if (m_pos & yg::EPosLeft)
+    if (m_pos & graphics::EPosLeft)
     {
       offset = 0;
       m_pivot = arrPathStart.m_pt;
     }
 
-    if (m_pos & yg::EPosRight)
+    if (m_pos & graphics::EPosRight)
     {
       offset = (m_path.fullLength() - strLength);
       m_pivot = m_path.get(m_path.size() - 1);
@@ -222,9 +222,9 @@ namespace yg
     // on-path kerning should be done for baseline-centered glyphs
     //double kernOffset = blOffset;
 
-    if (m_pos & yg::EPosUnder)
+    if (m_pos & graphics::EPosUnder)
       blOffset = 2 - m_fontDesc.m_size;
-    if (m_pos & yg::EPosAbove)
+    if (m_pos & graphics::EPosAbove)
       blOffset = 2;
 
     offset -= m_path.pathOffset();
@@ -428,7 +428,7 @@ namespace yg
     m_offset = offset;
   }
 
-  yg::FontDesc const & GlyphLayout::fontDesc() const
+  graphics::FontDesc const & GlyphLayout::fontDesc() const
   {
     return m_fontDesc;
   }
diff --git a/yg/glyph_layout.hpp b/graphics/glyph_layout.hpp
index 532f46ee50..23297666bf 100644
--- a/yg/glyph_layout.hpp
+++ b/graphics/glyph_layout.hpp
@@ -17,7 +17,7 @@
 #include "text_path.hpp"
 #include "font_desc.hpp"
 
-namespace yg
+namespace graphics
 {
   class GlyphCache;
   struct FontDesc;
@@ -41,9 +41,9 @@ namespace yg
     TextPath m_path;
 
     strings::UniString m_visText;
-    yg::EPosition m_pos;
+    graphics::EPosition m_pos;
 
-    yg::FontDesc m_fontDesc;
+    graphics::FontDesc m_fontDesc;
 
     buffer_vector<GlyphMetrics, 32> m_metrics;
     buffer_vector<GlyphLayoutElem, 32> m_entries;
@@ -69,7 +69,7 @@ namespace yg
                 FontDesc const & font,
                 m2::PointD const & pt,
                 strings::UniString const & visText,
-                yg::EPosition pos);
+                graphics::EPosition pos);
 
     GlyphLayout(GlyphCache * glyphCache,
                 FontDesc const & font,
@@ -78,7 +78,7 @@ namespace yg
                 strings::UniString const & visText,
                 double fullLength,
                 double pathOffset,
-                yg::EPosition pos);
+                graphics::EPosition pos);
 
     size_t firstVisible() const;
     size_t lastVisible() const;
@@ -87,7 +87,7 @@ namespace yg
     buffer_vector<GlyphMetrics, 32> const & metrics() const;
     buffer_vector<m2::AnyRectD, 16> const & boundRects() const;
 
-    yg::FontDesc const & fontDesc() const;
+    graphics::FontDesc const & fontDesc() const;
 
     m2::PointD const & pivot() const;
     void setPivot(m2::PointD const & pv);
diff --git a/yg/glyph_style.cpp b/graphics/glyph_style.cpp
index 787b30987e..3ef9d78baa 100644
--- a/yg/glyph_style.cpp
+++ b/graphics/glyph_style.cpp
@@ -4,7 +4,7 @@
 #include "agg_traits.hpp"
 #include "data_traits.hpp"
 
-namespace yg
+namespace graphics
 {
   GlyphStyle::GlyphStyle(m2::RectU const & texRect, int pipelineID, shared_ptr<GlyphInfo> const & gi)
     : ResourceStyle(EGlyphStyle, texRect, pipelineID), m_gi(gi)
diff --git a/yg/yg.pro b/graphics/graphics.pro
index 480bfa1f2f..2b391e915a 100644
--- a/yg/yg.pro
+++ b/graphics/graphics.pro
@@ -1,9 +1,9 @@
-# Yoga graphics or graphics yoga?
+# Graphics library.
 
-TARGET = yg
+TARGET = graphics
 TEMPLATE = lib
 CONFIG += staticlib
-DEFINES += YG_LIBRARY
+DEFINES += GRAPHICS_LIBRARY
 
 ROOT_DIR = ..
 DEPENDENCIES = indexer geometry platform coding base freetype fribidi expat
diff --git a/yg/yg_tests/formats_loading_test.cpp b/graphics/graphics_tests/formats_loading_test.cpp
index 966e1ce769..966e1ce769 100644
--- a/yg/yg_tests/formats_loading_test.cpp
+++ b/graphics/graphics_tests/formats_loading_test.cpp
diff --git a/yg/yg_tests/glyph_cache_test.cpp b/graphics/graphics_tests/glyph_cache_test.cpp
index 492b675f91..c4e2cf4a62 100644
--- a/yg/yg_tests/glyph_cache_test.cpp
+++ b/graphics/graphics_tests/glyph_cache_test.cpp
@@ -5,7 +5,7 @@
 
 UNIT_TEST(GlyphCacheTest_Main)
 {
-  yg::GlyphCache cache(yg::GlyphCache::Params(
+  graphics::GlyphCache cache(graphics::GlyphCache::Params(
     "unicode_blocks.txt",
     "fonts_whitelist.txt",
     "fonts_blacklist.txt",
@@ -15,8 +15,8 @@ UNIT_TEST(GlyphCacheTest_Main)
   string const path = GetPlatform().WritableDir();
 
   cache.addFont((path + "01_dejavusans.ttf").c_str());
-  shared_ptr<yg::GlyphInfo> g1 = cache.getGlyphInfo(yg::GlyphKey('#', 40, true, yg::Color(255, 255, 255, 255)));
+  shared_ptr<graphics::GlyphInfo> g1 = cache.getGlyphInfo(graphics::GlyphKey('#', 40, true, graphics::Color(255, 255, 255, 255)));
   //g1->dump(GetPlatform().WritablePathForFile("#_mask.png").c_str());
-  shared_ptr<yg::GlyphInfo> g2 = cache.getGlyphInfo(yg::GlyphKey('#', 40, false, yg::Color(0, 0, 0, 0)));
+  shared_ptr<graphics::GlyphInfo> g2 = cache.getGlyphInfo(graphics::GlyphKey('#', 40, false, graphics::Color(0, 0, 0, 0)));
   //g2->dump(GetPlatform().WritablePathForFile("#.png").c_str());
 }
diff --git a/yg/yg_tests/yg_tests.pro b/graphics/graphics_tests/graphics_tests.pro
index c464f26104..f6edafe948 100644
--- a/yg/yg_tests/yg_tests.pro
+++ b/graphics/graphics_tests/graphics_tests.pro
@@ -4,7 +4,7 @@ CONFIG -= app_bundle
 TEMPLATE = app
 
 ROOT_DIR = ../..
-DEPENDENCIES = qt_tstfrm map indexer yg platform geometry coding base expat freetype fribidi protobuf
+DEPENDENCIES = qt_tstfrm map indexer graphics platform geometry coding base expat freetype fribidi protobuf
 
 include($$ROOT_DIR/common.pri)
 
diff --git a/yg/yg_tests/opengl_test.cpp b/graphics/graphics_tests/opengl_test.cpp
index 1cdd181540..1cdd181540 100644
--- a/yg/yg_tests/opengl_test.cpp
+++ b/graphics/graphics_tests/opengl_test.cpp
diff --git a/yg/yg_tests/resourcemanager_test.cpp b/graphics/graphics_tests/resourcemanager_test.cpp
index 8c4cd480d6..8c4cd480d6 100644
--- a/yg/yg_tests/resourcemanager_test.cpp
+++ b/graphics/graphics_tests/resourcemanager_test.cpp
diff --git a/yg/yg_tests/screengl_test.cpp b/graphics/graphics_tests/screengl_test.cpp
index 4b6ef51593..8f02659a61 100644
--- a/yg/yg_tests/screengl_test.cpp
+++ b/graphics/graphics_tests/screengl_test.cpp
@@ -1,15 +1,15 @@
 #include "../../base/SRC_FIRST.hpp"
 #include "../../3party/sgitess/interface.h"
 
-#include "../../yg/screen.hpp"
-#include "../../yg/utils.hpp"
-#include "../../yg/internal/opengl.hpp"
-#include "../../yg/skin.hpp"
-#include "../../yg/pen_info.hpp"
-#include "../../yg/circle_info.hpp"
-#include "../../yg/text_element.hpp"
-#include "../../yg/straight_text_element.hpp"
-#include "../../yg/path_text_element.hpp"
+#include "../../graphics/screen.hpp"
+#include "../../graphics/utils.hpp"
+#include "../../graphics/internal/opengl.hpp"
+#include "../../graphics/skin.hpp"
+#include "../../graphics/pen_info.hpp"
+#include "../../graphics/circle_info.hpp"
+#include "../../graphics/text_element.hpp"
+#include "../../graphics/straight_text_element.hpp"
+#include "../../graphics/path_text_element.hpp"
 
 #include "../../qt_tstfrm/macros.hpp"
 
@@ -24,25 +24,25 @@ namespace
 {
   struct TestDrawPoint
   {
-    void DoDraw(shared_ptr<yg::gl::Screen> p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> p)
     {
-      p->drawSymbol(m2::PointD(40, 40), 0, yg::EPosCenter, 0);
-      p->drawSymbol(m2::PointD(40.5, 60), 0, yg::EPosCenter, 0);
-      p->drawSymbol(m2::PointD(41, 80), 0, yg::EPosCenter, 0);
+      p->drawSymbol(m2::PointD(40, 40), 0, graphics::EPosCenter, 0);
+      p->drawSymbol(m2::PointD(40.5, 60), 0, graphics::EPosCenter, 0);
+      p->drawSymbol(m2::PointD(41, 80), 0, graphics::EPosCenter, 0);
     }
   };
 
   struct TestDrawSolidRect
   {
-    void DoDraw(shared_ptr<yg::gl::Screen> p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> p)
     {
-      p->immDrawSolidRect(m2::RectF(0, 0, 100, 100), yg::Color(255, 0, 0, 255));
+      p->immDrawSolidRect(m2::RectF(0, 0, 100, 100), graphics::Color(255, 0, 0, 255));
     }
   };
 
   struct TestDrawLine
   {
-    void DoDraw(shared_ptr<yg::gl::Screen> p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> p)
     {
       m2::PointD pts[3] =
       {
@@ -53,7 +53,7 @@ namespace
 
 //      double pat [] = {7, 7, 10, 10};
       double pat1 [] = {1, 1};
-      p->drawPath(pts, 3, 0, p->skin()->mapPenInfo(yg::PenInfo(yg::Color(0xFF, 0xFF, 0xFF, 0xFF), 2, pat1, 2, 0)), 0);
+      p->drawPath(pts, 3, 0, p->skin()->mapPenInfo(graphics::PenInfo(graphics::Color(0xFF, 0xFF, 0xFF, 0xFF), 2, pat1, 2, 0)), 0);
     }
   };
 
@@ -62,11 +62,11 @@ namespace
     std::vector<std::vector<m2::PointD> > m_pathes;
     std::vector<double> m_pathOffsets;
     //std::vector<std::vector<double> > m_patterns;
-    std::vector<yg::PenInfo> m_penInfos;
+    std::vector<graphics::PenInfo> m_penInfos;
     std::vector<double> m_depthes;
 
     std::vector<double> m_axisPattern;
-    yg::PenInfo m_axisPenInfo;
+    graphics::PenInfo m_axisPenInfo;
     bool m_drawAxis;
 
     void Init()
@@ -75,12 +75,12 @@ namespace
 
       m_axisPattern.push_back(2);
       m_axisPattern.push_back(2);
-      m_axisPenInfo = yg::PenInfo(yg::Color(0xFF, 0, 0, 0xFF), 2, &m_axisPattern[0], m_axisPattern.size(), 0);
+      m_axisPenInfo = graphics::PenInfo(graphics::Color(0xFF, 0, 0, 0xFF), 2, &m_axisPattern[0], m_axisPattern.size(), 0);
     }
 
     void AddTest(std::vector<m2::PointD> const & points,
         std::vector<double> const & pattern,
-        yg::Color const & color = yg::Color(255, 255, 255, 255),
+        graphics::Color const & color = graphics::Color(255, 255, 255, 255),
         double width = 2,
         double depth = 0,
         double pathOffset = 0,
@@ -89,7 +89,7 @@ namespace
       m_pathes.push_back(points);
       m_pathOffsets.push_back(pathOffset);
       //m_patterns.push_back(pattern);
-      m_penInfos.push_back(yg::PenInfo(color, width, pattern.empty() ? 0 : &pattern[0], pattern.size(), penOffset));
+      m_penInfos.push_back(graphics::PenInfo(color, width, pattern.empty() ? 0 : &pattern[0], pattern.size(), penOffset));
       m_depthes.push_back(depth);
     }
 
@@ -98,7 +98,7 @@ namespace
       return m_pathes[i];
     }
 
-    void DoDraw(shared_ptr<yg::gl::Screen> p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> p)
     {
       for (size_t i = 0; i < m_pathes.size(); ++i)
       {
@@ -142,7 +142,7 @@ namespace
           points.clear();
           points.push_back(m2::PointD(100 * j + 10, i * 15 + 20));
           points.push_back(m2::PointD(100 * j + 100, i * 15 + 20));
-          AddTest(points, pattern, yg::Color(128 + 128 / columns * i, 128 + 128 / rows * j, 0, 255), rand() % 15);
+          AddTest(points, pattern, graphics::Color(128 + 128 / columns * i, 128 + 128 / rows * j, 0, 255), rand() % 15);
         }
       }
     }
@@ -167,13 +167,13 @@ namespace
       pts.push_back(m2::PointD(200, 80));
       pts.push_back(m2::PointD(300, 80));
 
-      AddTest(pts, pattern, yg::Color(0, 0, 0, 255), 4, 0, 150);
+      AddTest(pts, pattern, graphics::Color(0, 0, 0, 255), 4, 0, 150);
 
       pts.clear();
       pts.push_back(m2::PointD(200, 90));
       pts.push_back(m2::PointD(300, 90));
 
-      AddTest(pts, pattern, yg::Color(0, 0, 0, 255), 4, 0, -150);
+      AddTest(pts, pattern, graphics::Color(0, 0, 0, 255), 4, 0, -150);
 
       pts.clear();
       pts.push_back(m2::PointD(200, 100));
@@ -181,42 +181,42 @@ namespace
 
 
       /// The path should start from -10px path offset.
-      AddTest(pts, pattern, yg::Color(0, 0, 0, 255), 4, 0, -10);
+      AddTest(pts, pattern, graphics::Color(0, 0, 0, 255), 4, 0, -10);
 
       pts.clear();
       pts.push_back(m2::PointD(200, 110));
       pts.push_back(m2::PointD(400, 110));
 
       /// The path should start from 0px path offset.
-      AddTest(pts, pattern, yg::Color(0, 0, 0, 255), 4, 0, 0);
+      AddTest(pts, pattern, graphics::Color(0, 0, 0, 255), 4, 0, 0);
 
       pts.clear();
       pts.push_back(m2::PointD(200, 120));
       pts.push_back(m2::PointD(400, 120));
 
       /// The path should start from 60px path offset.
-      AddTest(pts, pattern, yg::Color(0, 0, 0, 255), 4, 0, 60);
+      AddTest(pts, pattern, graphics::Color(0, 0, 0, 255), 4, 0, 60);
 
       pts.clear();
       pts.push_back(m2::PointD(200, 130));
       pts.push_back(m2::PointD(400, 130));
 
       /// The path should start from 0px path offset.
-      AddTest(pts, pattern, yg::Color(0, 0, 0, 255), 4, 0, 0, -10);
+      AddTest(pts, pattern, graphics::Color(0, 0, 0, 255), 4, 0, 0, -10);
 
       pts.clear();
       pts.push_back(m2::PointD(200, 140));
       pts.push_back(m2::PointD(400, 140));
 
       /// The path should start from 60px path offset.
-      AddTest(pts, pattern, yg::Color(0, 0, 0, 255), 4, 0, 0, 0);
+      AddTest(pts, pattern, graphics::Color(0, 0, 0, 255), 4, 0, 0, 0);
 
       pts.clear();
       pts.push_back(m2::PointD(200, 150));
       pts.push_back(m2::PointD(400, 150));
 
       /// The path should start from 60px path offset.
-      AddTest(pts, pattern, yg::Color(0, 0, 0, 255), 4, 0, 0, 60);
+      AddTest(pts, pattern, graphics::Color(0, 0, 0, 255), 4, 0, 0, 60);
 
     }
   };
@@ -267,7 +267,7 @@ namespace
       testPoints.push_back(m2::PointD(320, 369));
       testPoints.push_back(m2::PointD(420, 370));
 
-      AddTest(testPoints, testPattern, yg::Color(255, 0, 0, 255), 40);
+      AddTest(testPoints, testPattern, graphics::Color(255, 0, 0, 255), 40);
 
       testPoints.clear();
       testPoints.push_back(m2::PointD(320, 300));
@@ -275,7 +275,7 @@ namespace
       testPoints.push_back(m2::PointD(420, 369));
       testPoints.push_back(m2::PointD(520, 370));
 
-      AddTest(testPoints, testPattern, yg::Color(0, 255, 0, 255), 40);
+      AddTest(testPoints, testPattern, graphics::Color(0, 255, 0, 255), 40);
 
 //      testPoints.clear();
 //
@@ -283,7 +283,7 @@ namespace
 //      testPoints.push_back(m2::PointD(505, 200));
 //      testPoints.push_back(m2::PointD(600, 150));
 //
-//      AddTest(testPoints, testPattern, yg::Color(0, 0, 255, 255), 40);
+//      AddTest(testPoints, testPattern, graphics::Color(0, 0, 255, 255), 40);
 //
 //      testPoints.clear();
 //      testPoints.push_back(m2::PointD(50, 120));
@@ -291,31 +291,31 @@ namespace
 //
 //      testPattern.clear();
 //
-//      AddTest(testPoints, testPattern, yg::Color(0, 0, 0, 255), 60);
+//      AddTest(testPoints, testPattern, graphics::Color(0, 0, 0, 255), 60);
 //
 //      testPoints.clear();
 //      testPoints.push_back(m2::PointD(50, 200));
 //      testPoints.push_back(m2::PointD(50, 350));
 //
-//      AddTest(testPoints, testPattern, yg::Color(0, 0, 0, 255), 60);
+//      AddTest(testPoints, testPattern, graphics::Color(0, 0, 0, 255), 60);
 //
 //      testPoints.clear();
 //      testPoints.push_back(m2::PointD(400, 120));
 //      testPoints.push_back(m2::PointD(250, 120));
 //
-//      AddTest(testPoints, testPattern, yg::Color(0, 0, 0, 255), 60);
+//      AddTest(testPoints, testPattern, graphics::Color(0, 0, 0, 255), 60);
 //
 //      testPoints.clear();
 //      testPoints.push_back(m2::PointD(400, 200));
 //      testPoints.push_back(m2::PointD(400, 350));
 //
-//      AddTest(testPoints, testPattern, yg::Color(0, 0, 0, 255), 60);
+//      AddTest(testPoints, testPattern, graphics::Color(0, 0, 0, 255), 60);
 //
 //      testPoints.clear();
 //      testPoints.push_back(m2::PointD(100, 200));
 //      testPoints.push_back(m2::PointD(240, 220));
 //
-//      AddTest(testPoints, testPattern, yg::Color(0, 0, 0, 255), 60);
+//      AddTest(testPoints, testPattern, graphics::Color(0, 0, 0, 255), 60);
     }
   };
 
@@ -333,7 +333,7 @@ namespace
       testPoints.push_back(m2::PointD(200, 200));
       testPoints.push_back(m2::PointD(300, 200));
 
-      AddTest(testPoints, testPattern, yg::Color(255, 0, 0, 255), 40, 0.5);
+      AddTest(testPoints, testPattern, graphics::Color(255, 0, 0, 255), 40, 0.5);
 
 //      testPattern.push_back(20);
 //      testPattern.push_back(20);
@@ -344,7 +344,7 @@ namespace
       testPoints.push_back(m2::PointD(150, 220));
       testPoints.push_back(m2::PointD(300, 220));
 
-      AddTest(testPoints, testPattern, yg::Color(0, 255, 0, 255), 40, 0.5);
+      AddTest(testPoints, testPattern, graphics::Color(0, 255, 0, 255), 40, 0.5);
 
       testPattern.clear();
       testPoints.clear();
@@ -352,7 +352,7 @@ namespace
       testPoints.push_back(m2::PointD(200, 240));
       testPoints.push_back(m2::PointD(300, 240));
 
-      AddTest(testPoints, testPattern, yg::Color(0, 0, 255, 255), 40, 0);
+      AddTest(testPoints, testPattern, graphics::Color(0, 0, 255, 255), 40, 0);
     }
   };
 
@@ -370,10 +370,10 @@ namespace
       testPoints.push_back(m2::PointD(200, 200));
       testPoints.push_back(m2::PointD(0, 0));
 
-      AddTest(testPoints, testPattern, yg::Color(255, 0, 0, 255), 40, 0.5);
+      AddTest(testPoints, testPattern, graphics::Color(255, 0, 0, 255), 40, 0.5);
     }
 
-    void DoDraw(shared_ptr<yg::gl::Screen> p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> p)
     {
       p->enableClipRect(true);
       p->setClipRect(m2::RectI(50, 70, 150, 150));
@@ -383,7 +383,7 @@ namespace
       p->beginFrame();
       p->setClipRect(r);
       p->enableClipRect(true);
-      p->clear(yg::gl::Screen::s_bgColor);
+      p->clear(graphics::gl::Screen::s_bgColor);
     }
   };
 
@@ -404,7 +404,7 @@ namespace
       for (int i = 0; i < starCount; ++i)
       {
         base_t::makeStar(testPoints, m2::RectD(pt, pt + starSize));
-        AddTest(testPoints, vector<double>(), yg::Color(255, 0, 0, 255), i + 1);
+        AddTest(testPoints, vector<double>(), graphics::Color(255, 0, 0, 255), i + 1);
         pt = pt + m2::PointD(starSize.x + i + 3, 0);
         testPoints.clear();
       }
@@ -418,7 +418,7 @@ namespace
       for (int i = 0; i < starCount; ++i)
       {
         base_t::makeStar(testPoints, m2::RectD(pt, pt + starSize));
-        AddTest(testPoints, pat, yg::Color(255, 0, 0, 255), i + 1);
+        AddTest(testPoints, pat, graphics::Color(255, 0, 0, 255), i + 1);
         pt = pt + m2::PointD(starSize.x + i + 3, 0);
         testPoints.clear();
       }
@@ -440,7 +440,7 @@ namespace
       testPoints.push_back(m2::PointD(80, 100));
       testPoints.push_back(m2::PointD(110, 20));
 
-      AddTest(testPoints, vector<double>(), yg::Color(255, 0, 0, 255), 6);
+      AddTest(testPoints, vector<double>(), graphics::Color(255, 0, 0, 255), 6);
 
       for (unsigned i = 0; i < testPoints.size(); ++i)
         testPoints[i].y += 100;
@@ -449,7 +449,7 @@ namespace
       pat.push_back(10);
       pat.push_back(10);
 
-      AddTest(testPoints, pat, yg::Color(255, 0, 0, 255), 6);
+      AddTest(testPoints, pat, graphics::Color(255, 0, 0, 255), 6);
     }
   };
 
@@ -470,7 +470,7 @@ namespace
       testPoints.push_back(m2::PointD(220, 269));
       testPoints.push_back(m2::PointD(320, 270));
 
-      AddTest(testPoints, testPattern, yg::Color(255, 0, 0, 255), 1);
+      AddTest(testPoints, testPattern, graphics::Color(255, 0, 0, 255), 1);
 
       testPattern.push_back(20);
       testPattern.push_back(20);
@@ -483,7 +483,7 @@ namespace
       testPoints.push_back(m2::PointD(520, 369));
       testPoints.push_back(m2::PointD(620, 370));
 
-      AddTest(testPoints, testPattern, yg::Color(255, 0, 0, 255), 1);
+      AddTest(testPoints, testPattern, graphics::Color(255, 0, 0, 255), 1);
     }
   };
 
@@ -503,7 +503,7 @@ namespace
       testPoints.push_back(m2::PointD(220, 269));
       testPoints.push_back(m2::PointD(320, 270));
 
-      AddTest(testPoints, testPattern, yg::Color(255, 0, 0, 255), 2);
+      AddTest(testPoints, testPattern, graphics::Color(255, 0, 0, 255), 2);
 
       testPattern.push_back(20);
       testPattern.push_back(20);
@@ -516,7 +516,7 @@ namespace
       testPoints.push_back(m2::PointD(520, 369));
       testPoints.push_back(m2::PointD(620, 370));
 
-      AddTest(testPoints, testPattern, yg::Color(255, 0, 0, 255), 2);
+      AddTest(testPoints, testPattern, graphics::Color(255, 0, 0, 255), 2);
     }
   };
 
@@ -537,7 +537,7 @@ namespace
       testPoints.push_back(m2::PointD(220, 269));
       testPoints.push_back(m2::PointD(320, 270));
 
-      AddTest(testPoints, testPattern, yg::Color(255, 0, 0, 255), 40);
+      AddTest(testPoints, testPattern, graphics::Color(255, 0, 0, 255), 40);
 
       testPattern.push_back(20);
       testPattern.push_back(20);
@@ -550,29 +550,29 @@ namespace
       testPoints.push_back(m2::PointD(520, 369));
       testPoints.push_back(m2::PointD(620, 370));
 
-      AddTest(testPoints, testPattern, yg::Color(0, 255, 0, 255), 40);
+      AddTest(testPoints, testPattern, graphics::Color(0, 255, 0, 255), 40);
     }
   };
 
   struct TestDrawPoly
   {
-    void DoDraw(shared_ptr<yg::gl::Screen> p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> p)
     {
 //      m2::PointD ptsStrip[5] = {m2::PointD(10, 10), m2::PointD(40, 10), m2::PointD(70, 10), m2::PointD(90, 60), m2::PointD(130, 30)};
-//      p->drawTriangles(ptsStrip, 5, yg::TriangleStrip, p->skin()->mapColor(yg::Color(255, 0, 0, 255)));
+//      p->drawTriangles(ptsStrip, 5, graphics::TriangleStrip, p->skin()->mapColor(graphics::Color(255, 0, 0, 255)));
 
 //      m2::PointD ptsFan[5] = {m2::PointD(150, 20), m2::PointD(170, 80), m2::PointD(190, 100), m2::PointD(200, 80), m2::PointD(220, 60)};
-//      p->drawTriangles(ptsFan, 5, yg::TriangleFan, p->skin()->mapColor(yg::Color(0, 255, 0, 255)));
+//      p->drawTriangles(ptsFan, 5, graphics::TriangleFan, p->skin()->mapColor(graphics::Color(0, 255, 0, 255)));
 
       m2::PointD ptsList[6] = {m2::PointD(20, 80), m2::PointD(50, 120), m2::PointD(80, 80), m2::PointD(110, 80), m2::PointD(140, 120), m2::PointD(80, 120)};
-      p->drawTrianglesList(ptsList, 6, /*yg::TriangleList, */p->skin()->mapColor(yg::Color(0, 0, 255, 255)), 0);
+      p->drawTrianglesList(ptsList, 6, /*graphics::TriangleList, */p->skin()->mapColor(graphics::Color(0, 0, 255, 255)), 0);
     }
   };
 
   /// Trying to draw polygon with more vertices that fits into internal buffer.
   struct TestDrawPolyOverflow
   {
-    void DoDraw(shared_ptr<yg::gl::Screen> p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> p)
     {
       size_t verticesCount = 30000;
       vector<m2::PointD> vertices;
@@ -601,77 +601,77 @@ namespace
 
       p->drawTrianglesList(&vertices[0],
                            vertices.size(),
-                           p->skin()->mapColor(yg::Color(0, 0, 255, 255)), 0);
+                           p->skin()->mapColor(graphics::Color(0, 0, 255, 255)), 0);
     }
   };
 
   struct TestDrawText
   {
-    void DoDraw(shared_ptr<yg::gl::Screen> p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> p)
     {
       m2::PointD path[2] = {m2::PointD(100, 200), m2::PointD(1000, 200)};
       double pat[2] = {2, 2};
-      p->drawPath(path, sizeof(path) / sizeof(m2::PointD), 0, p->skin()->mapPenInfo(yg::PenInfo(yg::Color(0, 0, 0, 0xFF), 2, pat, 2, 0)), 0);
+      p->drawPath(path, sizeof(path) / sizeof(m2::PointD), 0, p->skin()->mapPenInfo(graphics::PenInfo(graphics::Color(0, 0, 0, 0xFF), 2, pat, 2, 0)), 0);
 
-      yg::FontDesc fontDesc(20, yg::Color(0, 0, 0, 0), true, yg::Color(255, 255, 255, 255));
+      graphics::FontDesc fontDesc(20, graphics::Color(0, 0, 0, 0), true, graphics::Color(255, 255, 255, 255));
 
-      p->drawText(fontDesc, m2::PointD(200, 200), yg::EPosAboveRight, "0", 0, true);
-      p->drawText(fontDesc, m2::PointD(240, 200), yg::EPosAboveRight, "0", 0, true);
-      p->drawText(fontDesc, m2::PointD(280, 200), yg::EPosAboveRight, "0", 0, true);
-      p->drawText(fontDesc, m2::PointD(320, 200), yg::EPosAboveRight, "0", 0, true);
-      p->drawText(fontDesc, m2::PointD(360, 200), yg::EPosAboveRight, "0", 0, true);
-      p->drawText(fontDesc, m2::PointD(40, 50), yg::EPosAboveRight, "Simplicity is the ultimate sophistication", 0, true);
+      p->drawText(fontDesc, m2::PointD(200, 200), graphics::EPosAboveRight, "0", 0, true);
+      p->drawText(fontDesc, m2::PointD(240, 200), graphics::EPosAboveRight, "0", 0, true);
+      p->drawText(fontDesc, m2::PointD(280, 200), graphics::EPosAboveRight, "0", 0, true);
+      p->drawText(fontDesc, m2::PointD(320, 200), graphics::EPosAboveRight, "0", 0, true);
+      p->drawText(fontDesc, m2::PointD(360, 200), graphics::EPosAboveRight, "0", 0, true);
+      p->drawText(fontDesc, m2::PointD(40, 50), graphics::EPosAboveRight, "Simplicity is the ultimate sophistication", 0, true);
     }
   };
 
   struct TestDrawSingleSymbol
   {
-    void DoDraw(shared_ptr<yg::gl::Screen> p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> p)
     {
-      yg::FontDesc fontDesc(20, yg::Color(0, 0, 0, 0), true, yg::Color(255, 255, 255, 255));
-      p->drawText(fontDesc, m2::PointD(40, 50), yg::EPosAboveRight, "X", 1, true);
+      graphics::FontDesc fontDesc(20, graphics::Color(0, 0, 0, 0), true, graphics::Color(255, 255, 255, 255));
+      p->drawText(fontDesc, m2::PointD(40, 50), graphics::EPosAboveRight, "X", 1, true);
     }
   };
 
   struct TestDrawEmptySymbol
   {
-    void DoDraw(shared_ptr<yg::gl::Screen> p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> p)
     {
-      yg::FontDesc fontDesc(20, yg::Color(0, 0, 0, 0), true, yg::Color(255, 255, 255, 255));
-      p->drawText(fontDesc, m2::PointD(40, 50), yg::EPosAboveRight, " ", 1, true);
+      graphics::FontDesc fontDesc(20, graphics::Color(0, 0, 0, 0), true, graphics::Color(255, 255, 255, 255));
+      p->drawText(fontDesc, m2::PointD(40, 50), graphics::EPosAboveRight, " ", 1, true);
     }
   };
 
   struct TestDrawStringOnString
   {
-    void DoDraw(shared_ptr<yg::gl::Screen> p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> p)
     {
       size_t const maxTimes = 10;
       size_t const yStep = 30;
 
-      yg::FontDesc fontDesc(20, yg::Color(0, 0, 0, 0), true, yg::Color(255, 255, 255, 255));
+      graphics::FontDesc fontDesc(20, graphics::Color(0, 0, 0, 0), true, graphics::Color(255, 255, 255, 255));
 
       for (size_t i = 0; i < maxTimes; ++i)
         for (size_t j = 1; j <= i+1; ++j)
-          p->drawText(fontDesc, m2::PointD(40, 10 + yStep * i), yg::EPosAboveRight, "Simplicity is the ultimate sophistication", 0, true);
+          p->drawText(fontDesc, m2::PointD(40, 10 + yStep * i), graphics::EPosAboveRight, "Simplicity is the ultimate sophistication", 0, true);
     }
   };
 
   struct TestDrawSingleSymbolAndSolidPath
   {
-    void DoDraw(shared_ptr<yg::gl::Screen> p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> p)
     {
       vector<m2::PointD> path;
       path.push_back(m2::PointD(40, 50));
       path.push_back(m2::PointD(70, 50));
 
       double pat[] = { 2, 2 };
-      yg::PenInfo penInfo = yg::PenInfo(yg::Color(0, 0, 0, 0xFF), 2, &pat[0], ARRAY_SIZE(pat), 0);
-      yg::PenInfo solidPenInfo = yg::PenInfo(yg::Color(0xFF, 0, 0, 0xFF), 4, 0, 0, 0);
+      graphics::PenInfo penInfo = graphics::PenInfo(graphics::Color(0, 0, 0, 0xFF), 2, &pat[0], ARRAY_SIZE(pat), 0);
+      graphics::PenInfo solidPenInfo = graphics::PenInfo(graphics::Color(0xFF, 0, 0, 0xFF), 4, 0, 0, 0);
 
-      yg::FontDesc fontDesc(20, yg::Color(0, 0, 0, 0), true, yg::Color(255, 255, 255, 255));
+      graphics::FontDesc fontDesc(20, graphics::Color(0, 0, 0, 0), true, graphics::Color(255, 255, 255, 255));
 
-      p->drawText(fontDesc, m2::PointD(40, 50), yg::EPosAboveRight, "S", 0, true);
+      p->drawText(fontDesc, m2::PointD(40, 50), graphics::EPosAboveRight, "S", 0, true);
       p->drawPath(&path[0], path.size(), 0, p->skin()->mapPenInfo(solidPenInfo), 0);
 
     }
@@ -679,105 +679,105 @@ namespace
 
   struct TestDrawMultiLineStringWithPosition
   {
-    void DoDraw(shared_ptr<yg::gl::Screen> p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> p)
     {
-      yg::FontDesc fontDesc(14, yg::Color(0, 0, 0, 0), true, yg::Color(255, 255, 255, 255));
+      graphics::FontDesc fontDesc(14, graphics::Color(0, 0, 0, 0), true, graphics::Color(255, 255, 255, 255));
 
       m2::PointD pt = m2::PointD(50, 150);
 
-      p->drawText(fontDesc, pt, yg::EPosAboveRight, "Simplicity is the ultimate sophistication", yg::maxDepth, true);
-      p->drawRectangle(m2::Inflate(m2::RectD(pt, pt), m2::PointD(2, 2)), yg::Color(0, 0, 0, 255), yg::maxDepth);
+      p->drawText(fontDesc, pt, graphics::EPosAboveRight, "Simplicity is the ultimate sophistication", graphics::maxDepth, true);
+      p->drawRectangle(m2::Inflate(m2::RectD(pt, pt), m2::PointD(2, 2)), graphics::Color(0, 0, 0, 255), graphics::maxDepth);
 
       pt = m2::PointD(50, 300);
 
-      p->drawText(fontDesc, pt, yg::EPosRight, "Simplicity is the ultimate sophistication", yg::maxDepth, true);
-      p->drawRectangle(m2::Inflate(m2::RectD(pt, pt), m2::PointD(2, 2)), yg::Color(0, 0, 0, 255), yg::maxDepth);
+      p->drawText(fontDesc, pt, graphics::EPosRight, "Simplicity is the ultimate sophistication", graphics::maxDepth, true);
+      p->drawRectangle(m2::Inflate(m2::RectD(pt, pt), m2::PointD(2, 2)), graphics::Color(0, 0, 0, 255), graphics::maxDepth);
 
       pt = m2::PointD(50, 450);
 
-      p->drawText(fontDesc, pt, yg::EPosUnderRight, "Simplicity is the ultimate sophistication", yg::maxDepth, true);
-      p->drawRectangle(m2::Inflate(m2::RectD(pt, pt), m2::PointD(2, 2)), yg::Color(0, 0, 0, 255), yg::maxDepth);
+      p->drawText(fontDesc, pt, graphics::EPosUnderRight, "Simplicity is the ultimate sophistication", graphics::maxDepth, true);
+      p->drawRectangle(m2::Inflate(m2::RectD(pt, pt), m2::PointD(2, 2)), graphics::Color(0, 0, 0, 255), graphics::maxDepth);
 
       pt = m2::PointD(400, 150);
 
-      p->drawText(fontDesc, pt, yg::EPosAbove, "Simplicity is the ultimate sophistication", yg::maxDepth, true);
-      p->drawRectangle(m2::Inflate(m2::RectD(pt, pt), m2::PointD(2, 2)), yg::Color(0, 0, 0, 255), yg::maxDepth);
+      p->drawText(fontDesc, pt, graphics::EPosAbove, "Simplicity is the ultimate sophistication", graphics::maxDepth, true);
+      p->drawRectangle(m2::Inflate(m2::RectD(pt, pt), m2::PointD(2, 2)), graphics::Color(0, 0, 0, 255), graphics::maxDepth);
 
       pt = m2::PointD(400, 300);
 
-      p->drawText(fontDesc, pt, yg::EPosCenter, "Simplicity is the ultimate sophistication", yg::maxDepth, true);
-      p->drawRectangle(m2::Inflate(m2::RectD(pt, pt), m2::PointD(2, 2)), yg::Color(0, 0, 0, 255), yg::maxDepth);
+      p->drawText(fontDesc, pt, graphics::EPosCenter, "Simplicity is the ultimate sophistication", graphics::maxDepth, true);
+      p->drawRectangle(m2::Inflate(m2::RectD(pt, pt), m2::PointD(2, 2)), graphics::Color(0, 0, 0, 255), graphics::maxDepth);
 
       pt = m2::PointD(400, 450);
 
-      p->drawText(fontDesc, pt, yg::EPosUnder, "Simplicity is the ultimate sophistication", yg::maxDepth, true);
-      p->drawRectangle(m2::Inflate(m2::RectD(pt, pt), m2::PointD(2, 2)), yg::Color(0, 0, 0, 255), yg::maxDepth);
+      p->drawText(fontDesc, pt, graphics::EPosUnder, "Simplicity is the ultimate sophistication", graphics::maxDepth, true);
+      p->drawRectangle(m2::Inflate(m2::RectD(pt, pt), m2::PointD(2, 2)), graphics::Color(0, 0, 0, 255), graphics::maxDepth);
 
       pt = m2::PointD(750, 150);
 
-      p->drawText(fontDesc, pt, yg::EPosAboveLeft, "Simplicity is the ultimate sophistication", yg::maxDepth, true);
-      p->drawRectangle(m2::Inflate(m2::RectD(pt, pt), m2::PointD(2, 2)), yg::Color(0, 0, 0, 255), yg::maxDepth);
+      p->drawText(fontDesc, pt, graphics::EPosAboveLeft, "Simplicity is the ultimate sophistication", graphics::maxDepth, true);
+      p->drawRectangle(m2::Inflate(m2::RectD(pt, pt), m2::PointD(2, 2)), graphics::Color(0, 0, 0, 255), graphics::maxDepth);
 
       pt = m2::PointD(750, 300);
 
-      p->drawText(fontDesc, pt, yg::EPosLeft, "Simplicity is the ultimate sophistication", yg::maxDepth, true);
-      p->drawRectangle(m2::Inflate(m2::RectD(pt, pt), m2::PointD(2, 2)), yg::Color(0, 0, 0, 255), yg::maxDepth);
+      p->drawText(fontDesc, pt, graphics::EPosLeft, "Simplicity is the ultimate sophistication", graphics::maxDepth, true);
+      p->drawRectangle(m2::Inflate(m2::RectD(pt, pt), m2::PointD(2, 2)), graphics::Color(0, 0, 0, 255), graphics::maxDepth);
 
       pt = m2::PointD(750, 450);
 
-      p->drawText(fontDesc, pt, yg::EPosUnderLeft, "Simplicity is the ultimate sophistication", yg::maxDepth, true);
-      p->drawRectangle(m2::Inflate(m2::RectD(pt, pt), m2::PointD(2, 2)), yg::Color(0, 0, 0, 255), yg::maxDepth);
+      p->drawText(fontDesc, pt, graphics::EPosUnderLeft, "Simplicity is the ultimate sophistication", graphics::maxDepth, true);
+      p->drawRectangle(m2::Inflate(m2::RectD(pt, pt), m2::PointD(2, 2)), graphics::Color(0, 0, 0, 255), graphics::maxDepth);
     }
   };
 
   struct TestDrawString
   {
-    void DoDraw(shared_ptr<yg::gl::Screen> p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> p)
     {
-      yg::FontDesc fontDesc(20, yg::Color(0, 0, 0, 0), true, yg::Color(255, 255, 255, 255));
-      p->drawText(fontDesc, m2::PointD(40, 150), yg::EPosAboveRight, "Simplicity is the ultimate sophistication", 0, true);
+      graphics::FontDesc fontDesc(20, graphics::Color(0, 0, 0, 0), true, graphics::Color(255, 255, 255, 255));
+      p->drawText(fontDesc, m2::PointD(40, 150), graphics::EPosAboveRight, "Simplicity is the ultimate sophistication", 0, true);
     }
   };
 
   struct TestDrawStringWithColor
   {
-    void DoDraw(shared_ptr<yg::gl::Screen> p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> p)
     {
-      yg::FontDesc fontDesc(25, yg::Color(0, 0, 255, 255), true, yg::Color(255, 255, 255, 255));
-      p->drawText(fontDesc, m2::PointD(40, 50), yg::EPosAboveRight, "Simplicity is the ultimate sophistication", 0, true);
+      graphics::FontDesc fontDesc(25, graphics::Color(0, 0, 255, 255), true, graphics::Color(255, 255, 255, 255));
+      p->drawText(fontDesc, m2::PointD(40, 50), graphics::EPosAboveRight, "Simplicity is the ultimate sophistication", 0, true);
     }
   };
 
 
   struct TestDrawUnicodeSymbols
   {
-    void DoDraw(shared_ptr<yg::gl::Screen> p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> p)
     {
-      yg::FontDesc fontDesc(12);
-      p->drawText(fontDesc, m2::PointD(40, 50), yg::EPosAboveRight, "Latin Symbol : A", 0, true);
-      p->drawText(fontDesc, m2::PointD(40, 80), yg::EPosAboveRight, "Cyrillic Symbol : Ы", 0, true);
+      graphics::FontDesc fontDesc(12);
+      p->drawText(fontDesc, m2::PointD(40, 50), graphics::EPosAboveRight, "Latin Symbol : A", 0, true);
+      p->drawText(fontDesc, m2::PointD(40, 80), graphics::EPosAboveRight, "Cyrillic Symbol : Ы", 0, true);
     }
   };
 
   struct TestDrawTextRect : TestDrawString
   {
     typedef TestDrawString base_t;
-    void DoDraw(shared_ptr<yg::gl::Screen> p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> p)
     {
       m2::PointD startPt(40, 50);
 
-      yg::StraightTextElement::Params params;
+      graphics::StraightTextElement::Params params;
       params.m_depth = 0;
-      params.m_fontDesc = yg::FontDesc(20, yg::Color(0, 0, 0, 0), true, yg::Color(255, 255, 255, 255));
+      params.m_fontDesc = graphics::FontDesc(20, graphics::Color(0, 0, 0, 0), true, graphics::Color(255, 255, 255, 255));
       params.m_log2vis = false;
       params.m_pivot = startPt;
-      params.m_position = yg::EPosAboveRight;
+      params.m_position = graphics::EPosAboveRight;
       params.m_glyphCache = p->glyphCache();
       params.m_logText = strings::MakeUniString("Simplicity is the ultimate sophistication");
-      yg::StraightTextElement ste(params);
+      graphics::StraightTextElement ste(params);
 
       m2::RectD r = ste.roughBoundRect();
-      p->drawRectangle(r, yg::Color(0, 0, 255, 255), 0);
+      p->drawRectangle(r, graphics::Color(0, 0, 255, 255), 0);
 
       base_t::DoDraw(p);
     }
@@ -796,7 +796,7 @@ namespace
   {
     vector<m2::PointD> m_path;
     string m_text;
-    yg::PenInfo m_penInfo;
+    graphics::PenInfo m_penInfo;
 
     void Init()
     {
@@ -807,15 +807,15 @@ namespace
       m_text = "Syp";
 
       double pat[2] = {2, 2};
-      m_penInfo = yg::PenInfo(yg::Color(0xFF, 0xFF, 0xFF, 0xFF), 2, &pat[0], ARRAY_SIZE(pat), 0);
+      m_penInfo = graphics::PenInfo(graphics::Color(0xFF, 0xFF, 0xFF, 0xFF), 2, &pat[0], ARRAY_SIZE(pat), 0);
     }
 
-    void DoDraw(shared_ptr<yg::gl::Screen> p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> p)
     {
       p->drawPath(&m_path[0], m_path.size(), 0, p->skin()->mapPenInfo(m_penInfo), 1);
-      yg::FontDesc fontDesc(30);
+      graphics::FontDesc fontDesc(30);
 
-      p->drawPathText(fontDesc, &m_path[0], m_path.size(), m_text, calc_length(m_path), 0.0, yg::EPosLeft, 0);
+      p->drawPathText(fontDesc, &m_path[0], m_path.size(), m_text, calc_length(m_path), 0.0, graphics::EPosLeft, 0);
     }
   };
 
@@ -857,13 +857,13 @@ namespace
 
     }
 
-    void DoDraw(shared_ptr<yg::gl::Screen> p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> p)
     {
-      p->drawPath(&m_testPoints[0], m_testPoints.size(), 0, p->skin()->mapPenInfo(yg::PenInfo(yg::Color(255, 255, 255, 255), 2, 0, 0, 0)), 0);
-      yg::FontDesc fontDesc(20, yg::Color(0, 0, 0, 255), false);
+      p->drawPath(&m_testPoints[0], m_testPoints.size(), 0, p->skin()->mapPenInfo(graphics::PenInfo(graphics::Color(255, 255, 255, 255), 2, 0, 0, 0)), 0);
+      graphics::FontDesc fontDesc(20, graphics::Color(0, 0, 0, 255), false);
       //m_text = "Simplicity is the ultimate sophistication. Leonardo Da Vinci.";
       m_text = "Vinci";
-      p->drawPathText(fontDesc, &m_testPoints[0], m_testPoints.size(), m_text.c_str(), calc_length(m_testPoints), m_pathOffset, yg::EPosLeft, 1);
+      p->drawPathText(fontDesc, &m_testPoints[0], m_testPoints.size(), m_text.c_str(), calc_length(m_testPoints), m_pathOffset, graphics::EPosLeft, 1);
     }
   };
 
@@ -871,7 +871,7 @@ namespace
   {
     std::vector<m2::PointD> m_path;
     std::string m_text;
-    yg::PenInfo m_penInfo;
+    graphics::PenInfo m_penInfo;
 
     TestDrawTextOnPath()
     {
@@ -883,41 +883,41 @@ namespace
       m_text = "Simplicity is the ultimate sophistication. Leonardo Da Vinci.";
 
       double pat[] = { 2, 2 };
-      m_penInfo = yg::PenInfo(yg::Color(0, 0, 0, 0xFF), 2, &pat[0], ARRAY_SIZE(pat), 0);
+      m_penInfo = graphics::PenInfo(graphics::Color(0, 0, 0, 0xFF), 2, &pat[0], ARRAY_SIZE(pat), 0);
     }
 
-    void DoDraw(shared_ptr<yg::gl::Screen> p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> p)
     {
       p->drawPath(&m_path[0], m_path.size(), 0, p->skin()->mapPenInfo(m_penInfo), 0);
-      yg::FontDesc fontDesc(20);
-      p->drawPathText(fontDesc, &m_path[0], m_path.size(), m_text, calc_length(m_path), 0.0, yg::EPosCenter, 0);
+      graphics::FontDesc fontDesc(20);
+      p->drawPathText(fontDesc, &m_path[0], m_path.size(), m_text, calc_length(m_path), 0.0, graphics::EPosCenter, 0);
     }
   };
 
   struct TestDrawStraightTextElement
   {
-    yg::PenInfo m_penInfo;
+    graphics::PenInfo m_penInfo;
     vector<m2::PointD> m_path;
     TestDrawStraightTextElement()
     {
       m_path.push_back(m2::PointD(100, 200));
       m_path.push_back(m2::PointD(500, 200));
       double pat[] = { 2, 2 };
-      m_penInfo = yg::PenInfo(yg::Color(0, 0, 0, 0xFF), 2, &pat[0], ARRAY_SIZE(pat), 0);
+      m_penInfo = graphics::PenInfo(graphics::Color(0, 0, 0, 0xFF), 2, &pat[0], ARRAY_SIZE(pat), 0);
     }
 
-    void DoDraw(shared_ptr<yg::gl::Screen> p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> p)
     {
-      yg::StraightTextElement::Params params;
-      params.m_fontDesc = yg::FontDesc(20);
+      graphics::StraightTextElement::Params params;
+      params.m_fontDesc = graphics::FontDesc(20);
       params.m_logText = strings::MakeUniString("Simplicity is the ultimate sophistication. Leonardo Da Vinci.");
       params.m_depth = 10;
       params.m_log2vis = false;
       params.m_glyphCache = p->glyphCache();
       params.m_pivot = m_path[0];
-      params.m_position = yg::EPosRight;
+      params.m_position = graphics::EPosRight;
 
-      yg::StraightTextElement ste(params);
+      graphics::StraightTextElement ste(params);
 
       p->drawPath(&m_path[0], m_path.size(), 0, p->skin()->mapPenInfo(m_penInfo), 0);
       ste.draw(p.get(), math::Identity<double, 3>());
@@ -927,7 +927,7 @@ namespace
   struct TestDrawPathTextElement
   {
     vector<m2::PointD> m_path;
-    yg::PenInfo m_penInfo;
+    graphics::PenInfo m_penInfo;
 
     TestDrawPathTextElement()
     {
@@ -942,25 +942,25 @@ namespace
       m_path.push_back(m2::PointD(400, 200));
 
       double pat[] = { 2, 2 };
-      m_penInfo = yg::PenInfo(yg::Color(0, 0, 0, 0xFF), 2, &pat[0], ARRAY_SIZE(pat), 0);
+      m_penInfo = graphics::PenInfo(graphics::Color(0, 0, 0, 0xFF), 2, &pat[0], ARRAY_SIZE(pat), 0);
     }
 
-    void DoDraw(shared_ptr<yg::gl::Screen> p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> p)
     {
-      yg::PathTextElement::Params params;
+      graphics::PathTextElement::Params params;
       params.m_pts = &m_path[0];
       params.m_ptsCount = m_path.size();
       params.m_fullLength = calc_length(m_path);
       params.m_pathOffset = 0;
-      params.m_fontDesc = yg::FontDesc(20);
+      params.m_fontDesc = graphics::FontDesc(20);
       params.m_logText = strings::MakeUniString("Simplicity is the ultimate sophistication. Leonardo Da Vinci.");
       params.m_depth = 10;
       params.m_log2vis = false;
       params.m_glyphCache = p->glyphCache();
       params.m_pivot = m_path[0];
-      params.m_position = yg::EPosCenter;
+      params.m_position = graphics::EPosCenter;
 
-      yg::PathTextElement pte(params);
+      graphics::PathTextElement pte(params);
 
       p->drawPath(&m_path[0], m_path.size(), 0, p->skin()->mapPenInfo(m_penInfo), 0);
       pte.draw(p.get(), math::Identity<double, 3>());
@@ -971,7 +971,7 @@ namespace
   {
     std::vector<m2::PointD> m_path;
     std::string m_text;
-    yg::PenInfo m_penInfo;
+    graphics::PenInfo m_penInfo;
 
     TestDrawTextOnPathZigZag()
     {
@@ -987,15 +987,15 @@ namespace
       m_text = "Simplicity is the ultimate sophistication. Leonardo Da Vinci.";
 
       double pat[] = { 2, 2 };
-      m_penInfo = yg::PenInfo(yg::Color(0, 0, 0, 0xFF), 2, &pat[0], ARRAY_SIZE(pat), 0);
+      m_penInfo = graphics::PenInfo(graphics::Color(0, 0, 0, 0xFF), 2, &pat[0], ARRAY_SIZE(pat), 0);
     }
 
-    void DoDraw(shared_ptr<yg::gl::Screen> p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> p)
     {
       p->drawPath(&m_path[0], m_path.size(), 0, p->skin()->mapPenInfo(m_penInfo), 0);
-//      yg::FontDesc fontDesc(false, 10);
-      yg::FontDesc fontDesc(20);
-      p->drawPathText(fontDesc, &m_path[0], m_path.size(), m_text, calc_length(m_path), 0.0, yg::EPosCenter, 0);
+//      graphics::FontDesc fontDesc(false, 10);
+      graphics::FontDesc fontDesc(20);
+      p->drawPathText(fontDesc, &m_path[0], m_path.size(), m_text, calc_length(m_path), 0.0, graphics::EPosCenter, 0);
     }
   };
 
@@ -1015,7 +1015,7 @@ namespace
         m_pathAbove[i].y += 50;
     }
 
-    void DoDraw(shared_ptr<yg::gl::Screen> p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> p)
     {
       TestDrawTextOnPath::DoDraw(p);
 
@@ -1023,16 +1023,16 @@ namespace
       p->drawPath(&m_pathUnder[0], m_pathUnder.size(), 0, p->skin()->mapPenInfo(m_penInfo), 0);
 
       double const len = calc_length(m_path);
-      yg::FontDesc fontDesc(20);
+      graphics::FontDesc fontDesc(20);
 
-      p->drawPathText(fontDesc, &m_pathAbove[0], m_pathAbove.size(), m_text, len, 0.0, yg::EPosAbove, 0);
-      p->drawPathText(fontDesc, &m_pathUnder[0], m_pathUnder.size(), m_text, len, 0.0, yg::EPosUnder, 0);
+      p->drawPathText(fontDesc, &m_pathAbove[0], m_pathAbove.size(), m_text, len, 0.0, graphics::EPosAbove, 0);
+      p->drawPathText(fontDesc, &m_pathUnder[0], m_pathUnder.size(), m_text, len, 0.0, graphics::EPosUnder, 0);
     }
   };
 
   struct TestDrawTextOverflow
   {
-    void DoDraw(shared_ptr<yg::gl::Screen> p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> p)
     {
       int const startSize = 20;
       size_t const sizesCount = 20;
@@ -1040,8 +1040,8 @@ namespace
       int startY = 30;
       for (size_t i = 0; i < sizesCount; ++i)
       {
-        yg::FontDesc fontDesc(startSize + i);
-        p->drawText(fontDesc, m2::PointD(10, startY), yg::EPosAboveRight, "Simplicity is the ultimate sophistication. Leonardo Da Vinci", 0,  true);
+        graphics::FontDesc fontDesc(startSize + i);
+        p->drawText(fontDesc, m2::PointD(10, startY), graphics::EPosAboveRight, "Simplicity is the ultimate sophistication. Leonardo Da Vinci", 0,  true);
         startY += fontDesc.m_size;
       }
     }
@@ -1049,7 +1049,7 @@ namespace
 
   struct TestDrawTextFiltering
   {
-    void DoDraw(shared_ptr<yg::gl::Screen> p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> p)
     {
       int const startSize = 20;
       size_t const sizesCount = 20;
@@ -1057,9 +1057,9 @@ namespace
       int startY = 30;
       for (size_t i = 0; i < sizesCount; ++i)
       {
-        yg::FontDesc fontDesc(startSize);
-        p->drawText(fontDesc, m2::PointD(10, startY), yg::EPosAboveRight, "Simplicity is the ultimate sophistication. Leonardo Da Vinci", 100, true);
-        p->drawText(fontDesc, m2::PointD(5, startY + (startSize + i) / 2), yg::EPosAboveRight, "This text should be filtered", 100, true);
+        graphics::FontDesc fontDesc(startSize);
+        p->drawText(fontDesc, m2::PointD(10, startY), graphics::EPosAboveRight, "Simplicity is the ultimate sophistication. Leonardo Da Vinci", 100, true);
+        p->drawText(fontDesc, m2::PointD(5, startY + (startSize + i) / 2), graphics::EPosAboveRight, "This text should be filtered", 100, true);
         startY += startSize + i;
       }
     }
@@ -1067,7 +1067,7 @@ namespace
 
   struct TestDrawRandomTextFiltering
   {
-    void DoDraw(shared_ptr<yg::gl::Screen> p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> p)
     {
       char const * texts [] = {"Simplicity is the ultimate sophistication", "Leonardo Da Vinci"};
 
@@ -1078,13 +1078,13 @@ namespace
 
       for (int i = 0; i < textsCount; ++i)
       {
-        yg::FontDesc fontDesc(rand() % (endSize - startSize) + startSize,
-                              yg::Color(rand() % 255, rand() % 255, rand() % 255, 255)
+        graphics::FontDesc fontDesc(rand() % (endSize - startSize) + startSize,
+                              graphics::Color(rand() % 255, rand() % 255, rand() % 255, 255)
                               );
         p->drawText(
               fontDesc,
               m2::PointD(rand() % 500, rand() % 500),
-              yg::EPosAboveRight,
+              graphics::EPosAboveRight,
               texts[rand() % (sizeof(texts) / sizeof(char*))],
               rand() % 10,
               true);
@@ -1094,9 +1094,9 @@ namespace
 
   struct TestDrawUtilsRect
   {
-    void DoDraw(shared_ptr<yg::gl::Screen> p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> p)
     {
-      shared_ptr<yg::gl::RGBA8Texture> texture(new yg::gl::RGBA8Texture(512, 512));
+      shared_ptr<graphics::gl::RGBA8Texture> texture(new graphics::gl::RGBA8Texture(512, 512));
       texture->randomize();
 
       p->immDrawRect(
@@ -1104,24 +1104,24 @@ namespace
           m2::RectF(0, 0, 1, 1),
           texture,
           true,
-          yg::Color(255, 0, 0, 255),
+          graphics::Color(255, 0, 0, 255),
           false);
     }
   };
 
   struct TestDrawUtilsRectFilledTexture
   {
-    void DoDraw(shared_ptr<yg::gl::Screen> p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> p)
     {
-      shared_ptr<yg::gl::RGBA8Texture> texture(new yg::gl::RGBA8Texture(512, 512));
-      texture->fill(yg::Color(0, 255, 0, 255));
+      shared_ptr<graphics::gl::RGBA8Texture> texture(new graphics::gl::RGBA8Texture(512, 512));
+      texture->fill(graphics::Color(0, 255, 0, 255));
 
       p->immDrawRect(
           m2::RectF(0, 0, 512, 512),
           m2::RectF(0, 0, 1, 1),
           texture,
           true,
-          yg::Color(255, 0, 0, 255),
+          graphics::Color(255, 0, 0, 255),
           false);
     }
   };
@@ -1129,16 +1129,16 @@ namespace
   struct TestDrawOverlappedSymbolWithText
   {
   public:
-    void DoDraw(shared_ptr<yg::gl::Screen> p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> p)
     {
-      p->setOverlay(make_shared_ptr(new yg::Overlay()));
+      p->setOverlay(make_shared_ptr(new graphics::Overlay()));
       p->overlay()->setCouldOverlap(false);
 
-      p->drawSymbol(m2::PointD(200, 200), "current-position", yg::EPosUnder, yg::maxDepth);
-      p->drawText(yg::FontDesc(12), m2::PointD(200, 200), yg::EPosAbove, "Test Text", yg::maxDepth, true);
+      p->drawSymbol(m2::PointD(200, 200), "current-position", graphics::EPosUnder, graphics::maxDepth);
+      p->drawText(graphics::FontDesc(12), m2::PointD(200, 200), graphics::EPosAbove, "Test Text", graphics::maxDepth, true);
 
-      p->drawSymbol(m2::PointD(180, 200), "current-position", yg::EPosUnder, yg::maxDepth);
-      p->drawText(yg::FontDesc(12), m2::PointD(180, 200), yg::EPosAbove, "Test Text", yg::maxDepth, true);
+      p->drawSymbol(m2::PointD(180, 200), "current-position", graphics::EPosUnder, graphics::maxDepth);
+      p->drawText(graphics::FontDesc(12), m2::PointD(180, 200), graphics::EPosAbove, "Test Text", graphics::maxDepth, true);
 
       p->endFrame();
       p->beginFrame();
@@ -1151,7 +1151,7 @@ namespace
   struct TestDrawAnyRect
   {
   public:
-    void DoDraw(shared_ptr<yg::gl::Screen> p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> p)
     {
       m2::AnyRectD r[3] =
       {
@@ -1160,21 +1160,21 @@ namespace
         m2::AnyRectD(m2::PointD(100, 100), math::pi / 6, m2::RectD(0, -22, 50, -2))
       };
 
-      p->drawRectangle(r[0], yg::Color(255, 0, 0, 128), yg::maxDepth - 2);
+      p->drawRectangle(r[0], graphics::Color(255, 0, 0, 128), graphics::maxDepth - 2);
       if (!r[0].IsIntersect(r[1]))
-        p->drawRectangle(r[1], yg::Color(0, 255, 0, 128), yg::maxDepth - 1);
+        p->drawRectangle(r[1], graphics::Color(0, 255, 0, 128), graphics::maxDepth - 1);
       if (!r[0].IsIntersect(r[2]))
-        p->drawRectangle(r[1], yg::Color(0, 0, 255, 128), yg::maxDepth);
+        p->drawRectangle(r[1], graphics::Color(0, 0, 255, 128), graphics::maxDepth);
     }
   };
 
   struct TestDrawSector
   {
   public:
-    void DoDraw(shared_ptr<yg::gl::Screen> p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> p)
     {
-      p->drawArc(m2::PointD(100, 100), 0, math::pi * 2, 30, yg::Color(0, 0, 255, 128), 12000);
-      p->fillSector(m2::PointD(100, 100), 0, math::pi * 2, 30, yg::Color(0, 0, 255, 64), 12000);
+      p->drawArc(m2::PointD(100, 100), 0, math::pi * 2, 30, graphics::Color(0, 0, 255, 128), 12000);
+      p->fillSector(m2::PointD(100, 100), 0, math::pi * 2, 30, graphics::Color(0, 0, 255, 64), 12000);
     }
   };
 
@@ -1206,22 +1206,22 @@ namespace
       t.endPolygon();
     }
 
-    void DoDraw(shared_ptr<yg::gl::Screen> p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> p)
     {
       double inputDataPat[] = {10, 0};
-      yg::PenInfo inputDataRule(yg::Color::fromARGB(0xFF000000), 6, inputDataPat, 2, 0);
+      graphics::PenInfo inputDataRule(graphics::Color::fromARGB(0xFF000000), 6, inputDataPat, 2, 0);
 
       double triangleFanPat[] = {10, 10};
-      yg::PenInfo triangleFanRule(yg::Color::fromARGB(0xFFFF0000), 5, triangleFanPat, 2, 0);
+      graphics::PenInfo triangleFanRule(graphics::Color::fromARGB(0xFFFF0000), 5, triangleFanPat, 2, 0);
 
       double triangleStripPat[] = {10, 10};
-      yg::PenInfo triangleStripRule(yg::Color::fromARGB(0xFF00FF00), 4, triangleStripPat, 2, 0);
+      graphics::PenInfo triangleStripRule(graphics::Color::fromARGB(0xFF00FF00), 4, triangleStripPat, 2, 0);
 
       double triangleListPat[] = {10, 10};
-      yg::PenInfo triangleListRule(yg::Color::fromARGB(0xFF0000FF), 3, triangleListPat, 2, 0);
+      graphics::PenInfo triangleListRule(graphics::Color::fromARGB(0xFF0000FF), 3, triangleListPat, 2, 0);
 
       double lineLoopPat[] = {2, 2};
-      yg::PenInfo lineLoopRule(yg::Color::fromARGB(0xFF00FFFF), 2, lineLoopPat, 2, 0);
+      graphics::PenInfo lineLoopRule(graphics::Color::fromARGB(0xFF00FFFF), 2, lineLoopPat, 2, 0);
 
       uint32_t inputDataID = p->skin()->mapPenInfo(inputDataRule);
       uint32_t triangleFanID = p->skin()->mapPenInfo(triangleFanRule);
@@ -1314,22 +1314,22 @@ namespace
 
   struct TestDrawSymbolFiltering
   {
-    void DoDraw(shared_ptr<yg::gl::Screen> const & p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> const & p)
     {
       for (int i = 0; i < 40; ++i)
-        p->drawSymbol(m2::PointD(100 + i, 100), "hospital", yg::EPosCenter, 0);
+        p->drawSymbol(m2::PointD(100 + i, 100), "hospital", graphics::EPosCenter, 0);
     }
   };
 
   struct TestDrawCircle
   {
-    void DoDraw(shared_ptr<yg::gl::Screen> const & p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> const & p)
     {
-      yg::CircleInfo ci0(10, yg::Color(255, 0, 0, 255));
-      p->drawCircle(m2::PointD(200, 200), ci0, yg::EPosCenter, 100);
+      graphics::CircleInfo ci0(10, graphics::Color(255, 0, 0, 255));
+      p->drawCircle(m2::PointD(200, 200), ci0, graphics::EPosCenter, 100);
 
-      yg::CircleInfo ci1(10, yg::Color(255, 0, 0, 255), true, 4, yg::Color(255, 255, 255, 255));
-      p->drawCircle(m2::PointD(100, 200), ci1, yg::EPosCenter, 100);
+      graphics::CircleInfo ci1(10, graphics::Color(255, 0, 0, 255), true, 4, graphics::Color(255, 255, 255, 255));
+      p->drawCircle(m2::PointD(100, 200), ci1, graphics::EPosCenter, 100);
     }
   };
 
diff --git a/yg/yg_tests/screenglglobal_test.cpp b/graphics/graphics_tests/screenglglobal_test.cpp
index 4291b49a52..015d1fd4b1 100644
--- a/yg/yg_tests/screenglglobal_test.cpp
+++ b/graphics/graphics_tests/screenglglobal_test.cpp
@@ -1,7 +1,7 @@
 #include "../../base/SRC_FIRST.hpp"
-#include "../../yg/screen.hpp"
-#include "../../yg/skin.hpp"
-#include "../../yg/pen_info.hpp"
+#include "../../graphics/screen.hpp"
+#include "../../graphics/skin.hpp"
+#include "../../graphics/pen_info.hpp"
 #include "../../geometry/screenbase.hpp"
 #include "../../geometry/point2d.hpp"
 #include "../../std/vector.hpp"
@@ -33,7 +33,7 @@ namespace
       TestBase::Init();
     }
 
-    void DoDraw(shared_ptr<yg::gl::Screen> p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> p)
     {
       std::vector<m2::PointD> pts;
 
@@ -45,7 +45,7 @@ namespace
 
       toPixel(pts);
 
-      p->drawPath(&pts[0], pts.size(), 0, p->skin()->mapPenInfo(yg::PenInfo(yg::Color(255, 0, 0, 255), 2, 0, 0, 0)), 0);
+      p->drawPath(&pts[0], pts.size(), 0, p->skin()->mapPenInfo(graphics::PenInfo(graphics::Color(255, 0, 0, 255), 2, 0, 0, 0)), 0);
     }
   };
 
diff --git a/yg/yg_tests/shape_renderer_test.cpp b/graphics/graphics_tests/shape_renderer_test.cpp
index 320b1fc9e3..878882487c 100644
--- a/yg/yg_tests/shape_renderer_test.cpp
+++ b/graphics/graphics_tests/shape_renderer_test.cpp
@@ -2,7 +2,7 @@
 #include "../shape_renderer.hpp"
 #include "../../base/math.hpp"
 
-using namespace yg::gl;
+using namespace graphics::gl;
 
 namespace
 {
diff --git a/yg/yg_tests/skin_loader_test.cpp b/graphics/graphics_tests/skin_loader_test.cpp
index b6053e4b8a..dd3df7ae78 100644
--- a/yg/yg_tests/skin_loader_test.cpp
+++ b/graphics/graphics_tests/skin_loader_test.cpp
@@ -8,6 +8,6 @@
 UNIT_TEST(SkinLoaderTest_Main)
 {
   GL_TEST_START;
-//  shared_ptr<yg::ResourceManager> rm(new yg::ResourceManager(yg::ResourceManager::Params()));
+//  shared_ptr<graphics::ResourceManager> rm(new graphics::ResourceManager(graphics::ResourceManager::Params()));
 //  loadSkin(rm, "basic.skn");
 };
diff --git a/yg/yg_tests/skin_test.cpp b/graphics/graphics_tests/skin_test.cpp
index 25455dd2a0..64656f28a8 100644
--- a/yg/yg_tests/skin_test.cpp
+++ b/graphics/graphics_tests/skin_test.cpp
@@ -10,21 +10,21 @@ UNIT_TEST(SkinTest_Main)
 {
   GL_TEST_START;
 
-  /*shared_ptr<yg::ResourceManager> rm(new yg::ResourceManager(yg::ResourceManager::Params()));
-  yg::Skin * skin = loadSkin(rm, "basic.skn");
+  /*shared_ptr<graphics::ResourceManager> rm(new graphics::ResourceManager(graphics::ResourceManager::Params()));
+  graphics::Skin * skin = loadSkin(rm, "basic.skn");
 
   double p0 [] = {1, 1};
-  yg::PenInfo penInfo0(yg::Color(0xFF, 0, 0, 0xFF), 1, p0, 2, 0);
+  graphics::PenInfo penInfo0(graphics::Color(0xFF, 0, 0, 0xFF), 1, p0, 2, 0);
 //  skin->mapPenInfo(penInfo0);
 
   double p1 [] = {10, 10, 20, 20};
-  yg::PenInfo penInfo1(yg::Color(0xFF, 0, 0, 0xFF), 40, p1, 4, 0);
+  graphics::PenInfo penInfo1(graphics::Color(0xFF, 0, 0, 0xFF), 40, p1, 4, 0);
 
   double p2[] = {15, 15, 15, 40};
-  yg::PenInfo penInfo2(yg::Color(0, 0xFF, 0, 0xFF), 40, p2, 4, 0);
+  graphics::PenInfo penInfo2(graphics::Color(0, 0xFF, 0, 0xFF), 40, p2, 4, 0);
 
   double p3[] = {5, 5, 45, 30};
-  yg::PenInfo penInfo3(yg::Color(0xFF, 0, 0xFF, 0xFF), 35, p3, 4, 0);
+  graphics::PenInfo penInfo3(graphics::Color(0xFF, 0, 0xFF, 0xFF), 35, p3, 4, 0);
 
 //  skin->mapPenInfo(penInfo1);
 //  skin->mapPenInfo(penInfo2);
diff --git a/yg/yg_tests/texture_test.cpp b/graphics/graphics_tests/texture_test.cpp
index 582003dced..f1f2ef4197 100644
--- a/yg/yg_tests/texture_test.cpp
+++ b/graphics/graphics_tests/texture_test.cpp
@@ -7,10 +7,10 @@
 UNIT_TEST(TextureTest_Main)
 {
   GL_TEST_START;
-  yg::gl::RGBA8Texture texture(256, 256);
+  graphics::gl::RGBA8Texture texture(256, 256);
   texture.makeCurrent();
   texture.lock();
-  yg::gl::RGBA8Texture::view_t view = texture.view(256, 256);
+  graphics::gl::RGBA8Texture::view_t view = texture.view(256, 256);
   for (size_t i = 0; i < texture.height(); ++i)
     for (size_t j = 0; j < texture.width(); ++j)
     {
diff --git a/yg/yg_tests/thread_render.cpp b/graphics/graphics_tests/thread_render.cpp
index 9bc131772d..a8deac8860 100644
--- a/yg/yg_tests/thread_render.cpp
+++ b/graphics/graphics_tests/thread_render.cpp
@@ -1,7 +1,7 @@
 #include "../../base/SRC_FIRST.hpp"
-#include "../../yg/screen.hpp"
-#include "../../yg/utils.hpp"
-#include "../../yg/texture.hpp"
+#include "../../graphics/screen.hpp"
+#include "../../graphics/utils.hpp"
+#include "../../graphics/texture.hpp"
 #include "../../std/shared_ptr.hpp"
 #include "../../qt_tstfrm/macros.hpp"
 #include "../../base/thread.hpp"
@@ -10,11 +10,11 @@ namespace
 {
   struct RenderRoutine : public threads::IRoutine
   {
-    shared_ptr<yg::gl::Screen> m_pScreen;
+    shared_ptr<graphics::gl::Screen> m_pScreen;
     shared_ptr<qt::gl::RenderContext> m_renderContext;
     int & m_globalCounter;
 
-    RenderRoutine(shared_ptr<yg::gl::Screen> pScreen,
+    RenderRoutine(shared_ptr<graphics::gl::Screen> pScreen,
                   shared_ptr<qt::gl::RenderContext> renderContext,
                   int & globalCounter)
                     : m_pScreen(pScreen),
@@ -28,13 +28,13 @@ namespace
       for (size_t i = 0; i < 30; ++i)
       {
         m_pScreen->beginFrame();
-        m_pScreen->clear(yg::gl::Screen::s_bgColor);
+        m_pScreen->clear(graphics::gl::Screen::s_bgColor);
         m_pScreen->immDrawRect(
             m2::RectF(i * 15 + 20, 10, i * 15 + 30, 20),
             m2::RectF(),
-            shared_ptr<yg::gl::RGBA8Texture>(),
+            shared_ptr<graphics::gl::RGBA8Texture>(),
             false,
-            yg::Color(0, 0, 255, (m_globalCounter++) * (255 / 60)),
+            graphics::Color(0, 0, 255, (m_globalCounter++) * (255 / 60)),
             true);
         m_pScreen->endFrame();
       }
@@ -51,7 +51,7 @@ namespace
       globalCounter = 0;
     }
 
-    void DoDraw(shared_ptr<yg::gl::Screen> p)
+    void DoDraw(shared_ptr<graphics::gl::Screen> p)
     {
       globalCounter = 0;
       threads::Thread thread;
@@ -59,10 +59,10 @@ namespace
       for (size_t i = 0; i < 30; ++i)
       {
         p->beginFrame();
-        p->clear(yg::gl::Screen::s_bgColor);
+        p->clear(graphics::gl::Screen::s_bgColor);
         p->immDrawSolidRect(
             m2::RectF(i * 15 + 20, 30, i * 15 + 30, 40),
-            yg::Color(0, 0, 255, (globalCounter++) * (255 / 60) ));
+            graphics::Color(0, 0, 255, (globalCounter++) * (255 / 60) ));
 
         p->endFrame();
       }
diff --git a/yg/internal/gl_procedures.inl b/graphics/internal/gl_procedures.inl
index 28bc10f8f9..28bc10f8f9 100644
--- a/yg/internal/gl_procedures.inl
+++ b/graphics/internal/gl_procedures.inl
diff --git a/yg/internal/opengl.cpp b/graphics/internal/opengl.cpp
index 57903454f3..fc5730486d 100644
--- a/yg/internal/opengl.cpp
+++ b/graphics/internal/opengl.cpp
@@ -11,7 +11,7 @@
 #endif
 
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
diff --git a/yg/internal/opengl.hpp b/graphics/internal/opengl.hpp
index 3cce04d7dd..8293066917 100644
--- a/yg/internal/opengl.hpp
+++ b/graphics/internal/opengl.hpp
@@ -51,7 +51,7 @@
 #include "../../std/exception.hpp"
 
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
@@ -190,17 +190,17 @@ namespace yg
 
 #ifdef DEBUG
   #ifdef OMIM_GL_ENABLE_TRACE
-    #define OGLCHECK(f) do { if (yg::gl::g_doLogOGLCalls) LOG(LDEBUG, (#f)); if (yg::gl::g_hasContext) {f; yg::gl::CheckError(SRC());} else LOG(LDEBUG, ("no OGL context. skipping OGL call")); } while(false)
-    #define OGLCHECKAFTER if (yg::gl::g_doLogOGLCalls) LOG(LDEBUG, ("OGLCHECKAFTER")); yg::gl::CheckError(SRC())
-    #define EGLCHECK do { LOG(LDEBUG, ("EGLCHECK")); yg::gl::CheckEGLError(SRC()); } while(false)
+    #define OGLCHECK(f) do { if (graphics::gl::g_doLogOGLCalls) LOG(LDEBUG, (#f)); if (graphics::gl::g_hasContext) {f; graphics::gl::CheckError(SRC());} else LOG(LDEBUG, ("no OGL context. skipping OGL call")); } while(false)
+    #define OGLCHECKAFTER if (graphics::gl::g_doLogOGLCalls) LOG(LDEBUG, ("OGLCHECKAFTER")); graphics::gl::CheckError(SRC())
+    #define EGLCHECK do { LOG(LDEBUG, ("EGLCHECK")); graphics::gl::CheckEGLError(SRC()); } while(false)
   #else
-    #define OGLCHECK(f) do { if (yg::gl::g_hasContext) {f; yg::gl::CheckError(SRC());} else LOG(LDEBUG, ("no OGL context. skipping OGL call.")); } while(false)
-    #define OGLCHECKAFTER yg::gl::CheckError(SRC())
-    #define EGLCHECK do { yg::gl::CheckEGLError(SRC()); } while(false)
+    #define OGLCHECK(f) do { if (graphics::gl::g_hasContext) {f; graphics::gl::CheckError(SRC());} else LOG(LDEBUG, ("no OGL context. skipping OGL call.")); } while(false)
+    #define OGLCHECKAFTER graphics::gl::CheckError(SRC())
+    #define EGLCHECK do { graphics::gl::CheckEGLError(SRC()); } while(false)
   #endif
 
 #else
-#define OGLCHECK(f) do {if (yg::gl::g_hasContext) {f;} else LOG(LDEBUG, ("no OGL context. skipping OGL call."));} while (false)
+#define OGLCHECK(f) do {if (graphics::gl::g_hasContext) {f;} else LOG(LDEBUG, ("no OGL context. skipping OGL call."));} while (false)
 #define OGLCHECKAFTER
 #define EGLCHECK
 #endif
diff --git a/yg/internal/opengl_es.cpp b/graphics/internal/opengl_es.cpp
index 9e2641fb11..9e2641fb11 100644
--- a/yg/internal/opengl_es.cpp
+++ b/graphics/internal/opengl_es.cpp
diff --git a/yg/internal/opengl_ext.cpp b/graphics/internal/opengl_ext.cpp
index 0538edc487..0538edc487 100644
--- a/yg/internal/opengl_ext.cpp
+++ b/graphics/internal/opengl_ext.cpp
diff --git a/yg/internal/opengl_glsl_es2.cpp b/graphics/internal/opengl_glsl_es2.cpp
index 7122ceec6d..2c31e77f34 100644
--- a/yg/internal/opengl_glsl_es2.cpp
+++ b/graphics/internal/opengl_glsl_es2.cpp
@@ -11,7 +11,7 @@
   #include <OpenGLES/ES2/glext.h>
 #endif
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
diff --git a/yg/internal/opengl_glsl_ext.cpp b/graphics/internal/opengl_glsl_ext.cpp
index 8d27a8b46d..51f2e9f3f9 100644
--- a/yg/internal/opengl_glsl_ext.cpp
+++ b/graphics/internal/opengl_glsl_ext.cpp
@@ -5,7 +5,7 @@
 #include "../../base/matrix.hpp"
 #include "../../platform/platform.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
diff --git a/yg/internal/opengl_glsl_impl.cpp b/graphics/internal/opengl_glsl_impl.cpp
index e1d02b481b..339ef4409c 100644
--- a/yg/internal/opengl_glsl_impl.cpp
+++ b/graphics/internal/opengl_glsl_impl.cpp
@@ -7,7 +7,7 @@
 
 #include "../../std/memcpy.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
@@ -293,21 +293,21 @@ namespace yg
 
         void Finalize()
         {
-          if (yg::gl::g_hasContext)
+          if (graphics::gl::g_hasContext)
             ::glDeleteProgram(m_alphaTestProgram.m_program);
-          if (yg::gl::g_hasContext)
+          if (graphics::gl::g_hasContext)
             ::glDeleteProgram(m_noAlphaTestProgram.m_program);
-          if (yg::gl::g_hasContext)
+          if (graphics::gl::g_hasContext)
             ::glDeleteProgram(m_alphaTestSharpProgram.m_program);
-          if (yg::gl::g_hasContext)
+          if (graphics::gl::g_hasContext)
             ::glDeleteProgram(m_noAlphaTestSharpProgram.m_program);
-          if (yg::gl::g_hasContext)
+          if (graphics::gl::g_hasContext)
             ::glDeleteShader(m_vxShader);
-          if (yg::gl::g_hasContext)
+          if (graphics::gl::g_hasContext)
             ::glDeleteShader(m_sharpVxShader);
-          if (yg::gl::g_hasContext)
+          if (graphics::gl::g_hasContext)
             ::glDeleteShader(m_noAlphaTestFrgSh);
-          if (yg::gl::g_hasContext)
+          if (graphics::gl::g_hasContext)
             ::glDeleteShader(m_alphaTestFrgSh);
         }
       };
diff --git a/yg/internal/opengl_glsl_impl.hpp b/graphics/internal/opengl_glsl_impl.hpp
index fab3f4524f..c3f9d50a9b 100644
--- a/yg/internal/opengl_glsl_impl.hpp
+++ b/graphics/internal/opengl_glsl_impl.hpp
@@ -2,7 +2,7 @@
 
 #include "opengl.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
diff --git a/yg/internal/opengl_win32.cpp b/graphics/internal/opengl_win32.cpp
index 8b41fb566d..9b6b525672 100644
--- a/yg/internal/opengl_win32.cpp
+++ b/graphics/internal/opengl_win32.cpp
@@ -5,7 +5,7 @@
 #include "../../base/logging.hpp"
 
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
@@ -57,28 +57,28 @@ namespace yg
 #include "gl_procedures.inl"
 #undef DEFINE_GL_PROC
 
-      yg::gl::g_isBufferObjectsSupported = glBindBufferFn
+      graphics::gl::g_isBufferObjectsSupported = glBindBufferFn
                                         && glGenBuffersFn
                                         && glBufferDataFn
                                         && glBufferSubDataFn
                                         && glDeleteBuffersFn;
 
-      yg::gl::g_isMapBufferSupported =  glMapBufferFn
+      graphics::gl::g_isMapBufferSupported =  glMapBufferFn
                                         && glUnmapBufferFn;
 
-      yg::gl::g_isFramebufferSupported = glBindFramebufferFn
+      graphics::gl::g_isFramebufferSupported = glBindFramebufferFn
                                       && glFramebufferTexture2DFn
                                       && glFramebufferRenderbufferFn
                                       && glGenFramebuffersFn
                                       && glDeleteFramebuffersFn
                                       && glCheckFramebufferStatusFn;
 
-      yg::gl::g_isRenderbufferSupported = glGenRenderbuffersFn
+      graphics::gl::g_isRenderbufferSupported = glGenRenderbuffersFn
                                        && glDeleteRenderbuffersFn
                                        && glBindRenderbufferFn
                                        && glRenderbufferStorageFn;
 
-      yg::gl::g_isSeparateBlendFuncSupported = false;
+      graphics::gl::g_isSeparateBlendFuncSupported = false;
     }
   }
 } // namespace win32
diff --git a/yg/line_style.cpp b/graphics/line_style.cpp
index 37ef36918b..a0248b18c1 100644
--- a/yg/line_style.cpp
+++ b/graphics/line_style.cpp
@@ -3,9 +3,9 @@
 #include "agg_traits.hpp"
 #include "data_traits.hpp"
 
-namespace yg
+namespace graphics
 {
-  LineStyle::LineStyle(bool isWrapped, m2::RectU const & texRect, int pipelineID, yg::PenInfo const & penInfo) :
+  LineStyle::LineStyle(bool isWrapped, m2::RectU const & texRect, int pipelineID, graphics::PenInfo const & penInfo) :
     ResourceStyle(ELineStyle, texRect, pipelineID),
     m_isWrapped(isWrapped),
     m_isSolid(penInfo.m_isSolid),
@@ -47,7 +47,7 @@ namespace yg
 
   void LineStyle::render(void * dst)
   {
-    yg::PenInfo const & penInfo = m_penInfo;
+    graphics::PenInfo const & penInfo = m_penInfo;
     m2::RectU const & rect = m_texRect;
 
     DATA_TRAITS::view_t v = gil::interleaved_view(rect.SizeX(),
@@ -55,7 +55,7 @@ namespace yg
                                                       (DATA_TRAITS::pixel_t*)dst,
                                                       sizeof(DATA_TRAITS::pixel_t) * rect.SizeX());
 
-    yg::Color penInfoColor = penInfo.m_color;
+    graphics::Color penInfoColor = penInfo.m_color;
 
     penInfoColor /= DATA_TRAITS::channelScaleFactor;
 
diff --git a/yg/managed_texture.cpp b/graphics/managed_texture.cpp
index f991cc4afc..5365cddff5 100644
--- a/yg/managed_texture.cpp
+++ b/graphics/managed_texture.cpp
@@ -4,7 +4,7 @@
 #include "managed_texture.hpp"
 #include "../base/shared_buffer_manager.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
diff --git a/yg/managed_texture.hpp b/graphics/managed_texture.hpp
index 9ba6c785bc..c4785c56da 100644
--- a/yg/managed_texture.hpp
+++ b/graphics/managed_texture.hpp
@@ -6,7 +6,7 @@
 #include "../std/vector.hpp"
 #include "../std/shared_ptr.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
diff --git a/yg/overlay.cpp b/graphics/overlay.cpp
index e3eb6607a3..221a559267 100644
--- a/yg/overlay.cpp
+++ b/graphics/overlay.cpp
@@ -11,7 +11,7 @@
 #include "../std/vector.hpp"
 
 
-namespace yg
+namespace graphics
 {
   bool betterOverlayElement(shared_ptr<OverlayElement> const & l,
                             shared_ptr<OverlayElement> const & r)
diff --git a/yg/overlay.hpp b/graphics/overlay.hpp
index 446750805b..2945f4f251 100644
--- a/yg/overlay.hpp
+++ b/graphics/overlay.hpp
@@ -12,7 +12,7 @@
 #include "../std/map.hpp"
 #include "../std/list.hpp"
 
-namespace yg
+namespace graphics
 {
   struct OverlayElementTraits
   {
diff --git a/yg/overlay_element.cpp b/graphics/overlay_element.cpp
index a305457347..3b21b8cee0 100644
--- a/yg/overlay_element.cpp
+++ b/graphics/overlay_element.cpp
@@ -1,13 +1,13 @@
 #include "../base/SRC_FIRST.hpp"
 #include "overlay_element.hpp"
 
-namespace yg
+namespace graphics
 {
   OverlayElement::~OverlayElement()
   {}
 
   OverlayElement::Params::Params()
-    : m_pivot(), m_position(yg::EPosAboveRight), m_depth(yg::maxDepth)
+    : m_pivot(), m_position(graphics::EPosAboveRight), m_depth(graphics::maxDepth)
   {}
 
   OverlayElement::OverlayElement(Params const & p)
@@ -28,7 +28,7 @@ namespace yg
   {
     m2::PointD res;
 
-    yg::EPosition pos = position();
+    graphics::EPosition pos = position();
     m2::PointD pt = pivot() * m;
 
     if (pos & EPosLeft)
@@ -65,12 +65,12 @@ namespace yg
     setIsDirtyRect(true);
   }
 
-  yg::EPosition OverlayElement::position() const
+  graphics::EPosition OverlayElement::position() const
   {
     return m_position;
   }
 
-  void OverlayElement::setPosition(yg::EPosition pos)
+  void OverlayElement::setPosition(graphics::EPosition pos)
   {
     m_position = pos;
     setIsDirtyRect(true);
diff --git a/yg/overlay_element.hpp b/graphics/overlay_element.hpp
index 9d5e8363fe..27e69b333e 100644
--- a/yg/overlay_element.hpp
+++ b/graphics/overlay_element.hpp
@@ -6,7 +6,7 @@
 #include "defines.hpp"
 #include "../std/vector.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
@@ -29,7 +29,7 @@ namespace yg
   private:
 
     m2::PointD m_pivot;
-    yg::EPosition m_position;
+    graphics::EPosition m_position;
     double m_depth;
     UserInfo m_userInfo;
 
@@ -50,7 +50,7 @@ namespace yg
     struct Params
     {
       m2::PointD m_pivot;
-      yg::EPosition m_position;
+      graphics::EPosition m_position;
       double m_depth;
       UserInfo m_userInfo;
       Params();
@@ -73,8 +73,8 @@ namespace yg
 
     void offset(m2::PointD const & offs);
 
-    yg::EPosition position() const;
-    void setPosition(yg::EPosition pos);
+    graphics::EPosition position() const;
+    void setPosition(graphics::EPosition pos);
 
     double depth() const;
     void setDepth(double depth);
diff --git a/yg/overlay_renderer.cpp b/graphics/overlay_renderer.cpp
index 26102d44d5..55d89f4b6a 100644
--- a/yg/overlay_renderer.cpp
+++ b/graphics/overlay_renderer.cpp
@@ -10,7 +10,7 @@
 #include "resource_manager.hpp"
 #include "skin.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
@@ -47,7 +47,7 @@ namespace yg
 
     void OverlayRenderer::drawSymbol(m2::PointD const & pt, string const & symbolName, EPosition pos, int depth)
     {
-      yg::SymbolElement::Params params;
+      graphics::SymbolElement::Params params;
       params.m_depth = depth;
       params.m_position = pos;
       params.m_pivot = pt;
@@ -57,7 +57,7 @@ namespace yg
     }
 
     void OverlayRenderer::drawCircle(m2::PointD const & pt,
-                                     yg::CircleInfo const & ci,
+                                     graphics::CircleInfo const & ci,
                                      EPosition pos,
                                      int depth)
     {
@@ -80,7 +80,7 @@ namespace yg
 
     void OverlayRenderer::drawText(FontDesc const & fontDesc,
                                    m2::PointD const & pt,
-                                   yg::EPosition pos,
+                                   graphics::EPosition pos,
                                    string const & utf8Text,
                                    double depth,
                                    bool log2vis,
@@ -113,7 +113,7 @@ namespace yg
     void OverlayRenderer::drawTextEx(FontDesc const & primaryFont,
                                      FontDesc const & secondaryFont,
                                      m2::PointD const & pt,
-                                     yg::EPosition pos,
+                                     graphics::EPosition pos,
                                      string const & text,
                                      string const & secondaryText,
                                      double depth,
@@ -148,7 +148,7 @@ namespace yg
 
     bool OverlayRenderer::drawPathText(
       FontDesc const & fontDesc, m2::PointD const * path, size_t s, string const & utf8Text,
-      double fullLength, double pathOffset, yg::EPosition pos, double depth)
+      double fullLength, double pathOffset, graphics::EPosition pos, double depth)
     {
       if (!m_drawTexts)
         return false;
diff --git a/yg/overlay_renderer.hpp b/graphics/overlay_renderer.hpp
index 9241ace3b1..bb1bacfa40 100644
--- a/yg/overlay_renderer.hpp
+++ b/graphics/overlay_renderer.hpp
@@ -4,7 +4,7 @@
 #include "../std/shared_ptr.hpp"
 #include "overlay.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
@@ -14,7 +14,7 @@ namespace yg
 
       bool m_drawTexts;
       bool m_drawSymbols;
-      shared_ptr<yg::Overlay> m_overlay;
+      shared_ptr<graphics::Overlay> m_overlay;
 
       typedef map<m2::PointI, shared_ptr<OverlayElement> > TElements;
 
@@ -26,7 +26,7 @@ namespace yg
       {
         bool m_drawTexts;
         bool m_drawSymbols;
-        shared_ptr<yg::Overlay> m_overlay;
+        shared_ptr<graphics::Overlay> m_overlay;
         Params();
       };
 
@@ -37,12 +37,12 @@ namespace yg
       void drawSymbol(m2::PointD const & pt, string const & symbolName, EPosition pos, int depth);
 
       /// Drawing circle
-      void drawCircle(m2::PointD const & pt, yg::CircleInfo const & ci, EPosition pos, int depth);
+      void drawCircle(m2::PointD const & pt, graphics::CircleInfo const & ci, EPosition pos, int depth);
 
       /// drawing straight text
       void drawText(FontDesc const & fontDesc,
                     m2::PointD const & pt,
-                    yg::EPosition pos,
+                    graphics::EPosition pos,
                     string const & utf8Text,
                     double depth,
                     bool log2vis,
@@ -51,7 +51,7 @@ namespace yg
       void drawTextEx(FontDesc const & primaryFont,
                       FontDesc const & secondaryFont,
                       m2::PointD const & pt,
-                      yg::EPosition pos,
+                      graphics::EPosition pos,
                       string const & text,
                       string const & secondaryText,
                       double depth,
@@ -65,7 +65,7 @@ namespace yg
                         string const & utf8Text,
                         double fullLength,
                         double pathOffset,
-                        yg::EPosition pos,
+                        graphics::EPosition pos,
                         double depth);
 
       void setOverlay(shared_ptr<Overlay> const & overlay);
diff --git a/yg/packets_queue.cpp b/graphics/packets_queue.cpp
index a2b369eaa6..83e964e3b0 100644
--- a/yg/packets_queue.cpp
+++ b/graphics/packets_queue.cpp
@@ -1,7 +1,7 @@
 #include "packets_queue.hpp"
 #include "../base/logging.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
diff --git a/yg/packets_queue.hpp b/graphics/packets_queue.hpp
index 93bfeebf2c..bc9957eccb 100644
--- a/yg/packets_queue.hpp
+++ b/graphics/packets_queue.hpp
@@ -8,7 +8,7 @@
 
 #include "../std/shared_ptr.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
diff --git a/yg/path_renderer.cpp b/graphics/path_renderer.cpp
index 6d6a1e7032..2e6c78988e 100644
--- a/yg/path_renderer.cpp
+++ b/graphics/path_renderer.cpp
@@ -6,7 +6,7 @@
 
 #include "../base/logging.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
diff --git a/yg/path_renderer.hpp b/graphics/path_renderer.hpp
index 67a515e2be..648865ecf7 100644
--- a/yg/path_renderer.hpp
+++ b/graphics/path_renderer.hpp
@@ -3,7 +3,7 @@
 #include "area_renderer.hpp"
 #include "../geometry/point2d.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
diff --git a/yg/path_text_element.cpp b/graphics/path_text_element.cpp
index 41dc0ac2f9..9f79389bfb 100644
--- a/yg/path_text_element.cpp
+++ b/graphics/path_text_element.cpp
@@ -2,7 +2,7 @@
 #include "path_text_element.hpp"
 #include "overlay_renderer.hpp"
 
-namespace yg
+namespace graphics
 {
   PathTextElement::PathTextElement(Params const & p)
     : TextElement(p),
@@ -50,31 +50,31 @@ namespace yg
   {
     if (screen->isDebugging())
     {
-      yg::Color c(255, 255, 255, 32);
+      graphics::Color c(255, 255, 255, 32);
 
       if (isFrozen())
-        c = yg::Color(0, 0, 255, 64);
+        c = graphics::Color(0, 0, 255, 64);
       if (isNeedRedraw())
-        c = yg::Color(255, 0, 0, 64);
+        c = graphics::Color(255, 0, 0, 64);
 
-      screen->drawRectangle(roughBoundRect(), yg::Color(255, 255, 0, 64), yg::maxDepth - 3);
+      screen->drawRectangle(roughBoundRect(), graphics::Color(255, 255, 0, 64), graphics::maxDepth - 3);
 
       for (unsigned i = 0; i < boundRects().size(); ++i)
-        screen->drawRectangle(boundRects()[i], c, yg::maxDepth - 3);
+        screen->drawRectangle(boundRects()[i], c, graphics::maxDepth - 3);
     }
 
     if (!isNeedRedraw() || !isVisible() || !isValid())
       return;
 
-    yg::FontDesc desc = m_fontDesc;
+    graphics::FontDesc desc = m_fontDesc;
 
     if (desc.m_isMasked)
     {
-      drawTextImpl(m_glyphLayout, screen, m, false, false, desc, yg::maxDepth - 2);
+      drawTextImpl(m_glyphLayout, screen, m, false, false, desc, graphics::maxDepth - 2);
       desc.m_isMasked = false;
     }
 
-    drawTextImpl(m_glyphLayout, screen, m, false, false, desc, yg::maxDepth - 1);
+    drawTextImpl(m_glyphLayout, screen, m, false, false, desc, graphics::maxDepth - 1);
   }
 
   void PathTextElement::setPivot(m2::PointD const & pivot)
diff --git a/yg/path_text_element.hpp b/graphics/path_text_element.hpp
index 32361d6d22..8f849dd861 100644
--- a/yg/path_text_element.hpp
+++ b/graphics/path_text_element.hpp
@@ -2,7 +2,7 @@
 
 #include "text_element.hpp"
 
-namespace yg
+namespace graphics
 {
   class PathTextElement : public TextElement
   {
diff --git a/yg/pen_info.cpp b/graphics/pen_info.cpp
index e46d02f249..691124a75d 100644
--- a/yg/pen_info.cpp
+++ b/graphics/pen_info.cpp
@@ -6,7 +6,7 @@
 #include "../std/iterator.hpp"
 #include "../std/numeric.hpp"
 
-namespace yg
+namespace graphics
 {
   PenInfo::PenInfo()
   {}
diff --git a/yg/pen_info.hpp b/graphics/pen_info.hpp
index 4ede787adb..b1645b668d 100644
--- a/yg/pen_info.hpp
+++ b/graphics/pen_info.hpp
@@ -6,7 +6,7 @@
 
 #include "../base/buffer_vector.hpp"
 
-namespace yg
+namespace graphics
 {
   /// definition of the line style pattern used as a texture-cache-key
   struct PenInfo
diff --git a/yg/render_state_layer.hpp b/graphics/render_state_layer.hpp
index 015139bcb2..015139bcb2 100644
--- a/yg/render_state_layer.hpp
+++ b/graphics/render_state_layer.hpp
diff --git a/yg/render_target.hpp b/graphics/render_target.hpp
index 09d7ff6aa0..100ba7b78c 100644
--- a/yg/render_target.hpp
+++ b/graphics/render_target.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
diff --git a/yg/renderbuffer.cpp b/graphics/renderbuffer.cpp
index 73969c5a93..fa468f6be3 100644
--- a/yg/renderbuffer.cpp
+++ b/graphics/renderbuffer.cpp
@@ -8,7 +8,7 @@
 
 #include "../std/list.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
diff --git a/yg/renderbuffer.hpp b/graphics/renderbuffer.hpp
index 2099b92740..fcbf6a38a1 100644
--- a/yg/renderbuffer.hpp
+++ b/graphics/renderbuffer.hpp
@@ -3,7 +3,7 @@
 #include "../std/shared_ptr.hpp"
 #include "render_target.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
diff --git a/yg/rendercontext.cpp b/graphics/rendercontext.cpp
index 91f3a239c3..f1e072cc78 100644
--- a/yg/rendercontext.cpp
+++ b/graphics/rendercontext.cpp
@@ -2,7 +2,7 @@
 #include "rendercontext.hpp"
 #include "internal/opengl.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
@@ -10,12 +10,12 @@ namespace yg
     {
       OGLCHECK(glPixelStorei(GL_UNPACK_ALIGNMENT, 1));
       OGLCHECK(glPixelStorei(GL_PACK_ALIGNMENT, 1));
-      yg::gl::InitializeThread();
+      graphics::gl::InitializeThread();
     }
 
     void RenderContext::endThreadDrawing()
     {
-      yg::gl::FinalizeThread();
+      graphics::gl::FinalizeThread();
     }
   }
 }
diff --git a/yg/rendercontext.hpp b/graphics/rendercontext.hpp
index 640caa3629..f0cb992cce 100644
--- a/yg/rendercontext.hpp
+++ b/graphics/rendercontext.hpp
@@ -2,7 +2,7 @@
 
 #include "../std/shared_ptr.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
diff --git a/yg/renderer.cpp b/graphics/renderer.cpp
index 3ae436f99d..7df85142f1 100644
--- a/yg/renderer.cpp
+++ b/graphics/renderer.cpp
@@ -8,11 +8,11 @@
 #include "internal/opengl.hpp"
 #include "../base/logging.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
-    const yg::Color Renderer::s_bgColor(192, 192, 192, 255);
+    const graphics::Color Renderer::s_bgColor(192, 192, 192, 255);
 
     Renderer::Params::Params()
       : m_isDebugging(false),
@@ -166,7 +166,7 @@ namespace yg
       m_depthBuffer.reset();
     }
 
-    Renderer::ClearCommand::ClearCommand(yg::Color const & color,
+    Renderer::ClearCommand::ClearCommand(graphics::Color const & color,
                                          bool clearRT,
                                          float depth,
                                          bool clearDepth)
@@ -201,7 +201,7 @@ namespace yg
       OGLCHECK(glClear(mask));
     }
 
-    void Renderer::clear(yg::Color const & c, bool clearRT, float depth, bool clearDepth)
+    void Renderer::clear(graphics::Color const & c, bool clearRT, float depth, bool clearDepth)
     {
       shared_ptr<ClearCommand> command(new ClearCommand(c, clearRT, depth, clearDepth));
       processCommand(command);
diff --git a/yg/renderer.hpp b/graphics/renderer.hpp
index efcc860cfc..ab7c631a55 100644
--- a/yg/renderer.hpp
+++ b/graphics/renderer.hpp
@@ -10,7 +10,7 @@
 #include "../std/shared_ptr.hpp"
 #include "../geometry/rect2d.hpp"
 
-namespace yg
+namespace graphics
 {
   class ResourceManager;
 
@@ -27,12 +27,12 @@ namespace yg
 
       struct ClearCommand : Command
       {
-        yg::Color m_color;
+        graphics::Color m_color;
         bool m_clearRT;
         float m_depth;
         bool m_clearDepth;
 
-        ClearCommand(yg::Color const & color,
+        ClearCommand(graphics::Color const & color,
                      bool clearRT = true,
                      float depth = 1.0,
                      bool clearDepth = true);
@@ -115,7 +115,7 @@ namespace yg
 
     public:
 
-      static const yg::Color s_bgColor;
+      static const graphics::Color s_bgColor;
 
       Renderer(Params const & params = Params());
 
@@ -145,7 +145,7 @@ namespace yg
       /// @warning this function respects the clipping rect set and enabled(!)
       ///          by the setClipRect/enableClipRect. Whether the clipping is
       ///          not enabled -  the entire currently bound render surface is used.
-      void clear(yg::Color const & c, bool clearRT = true, float depth = 1.0, bool clearDepth = true);
+      void clear(graphics::Color const & c, bool clearRT = true, float depth = 1.0, bool clearDepth = true);
 
       void onSize(unsigned width, unsigned height);
 
diff --git a/yg/resource_manager.cpp b/graphics/resource_manager.cpp
index 905e0bd31d..c997e29ce8 100644
--- a/yg/resource_manager.cpp
+++ b/graphics/resource_manager.cpp
@@ -14,29 +14,29 @@
 #include "../base/logging.hpp"
 #include "../base/exception.hpp"
 
-namespace yg
+namespace graphics
 {
   typedef gl::Texture<DATA_TRAITS, true> TDynamicTexture;
   typedef gl::Texture<DATA_TRAITS, false> TStaticTexture;
 
   DECLARE_EXCEPTION(ResourceManagerException, RootException);
 
-  size_t pixelSize(yg::DataFormat texFormat)
+  size_t pixelSize(graphics::DataFormat texFormat)
   {
     switch (texFormat)
     {
-    case yg::Data8Bpp:
+    case graphics::Data8Bpp:
       return 4;
-    case yg::Data4Bpp:
+    case graphics::Data4Bpp:
       return 2;
-    case yg::Data565Bpp:
+    case graphics::Data565Bpp:
       return 2;
     default:
       return 0;
     }
   }
 
-  TTextureFactory::TTextureFactory(size_t w, size_t h, yg::DataFormat format, char const * resName, size_t batchSize)
+  TTextureFactory::TTextureFactory(size_t w, size_t h, graphics::DataFormat format, char const * resName, size_t batchSize)
     : BasePoolElemFactory(resName, w * h * pixelSize(format), batchSize),
       m_w(w), m_h(h), m_format(format)
   {}
@@ -45,12 +45,12 @@ namespace yg
   {
     switch (m_format)
     {
-    case yg::Data4Bpp:
-      return shared_ptr<gl::BaseTexture>(new gl::Texture<yg::RGBA4Traits, true>(m_w, m_h));
-    case yg::Data8Bpp:
-      return shared_ptr<gl::BaseTexture>(new gl::Texture<yg::RGBA8Traits, true>(m_w, m_h));
-    case yg::Data565Bpp:
-      return shared_ptr<gl::BaseTexture>(new gl::Texture<yg::RGB565Traits, true>(m_w, m_h));
+    case graphics::Data4Bpp:
+      return shared_ptr<gl::BaseTexture>(new gl::Texture<graphics::RGBA4Traits, true>(m_w, m_h));
+    case graphics::Data8Bpp:
+      return shared_ptr<gl::BaseTexture>(new gl::Texture<graphics::RGBA8Traits, true>(m_w, m_h));
+    case graphics::Data565Bpp:
+      return shared_ptr<gl::BaseTexture>(new gl::Texture<graphics::RGB565Traits, true>(m_w, m_h));
     default:
       return shared_ptr<gl::BaseTexture>();
     }
@@ -191,7 +191,7 @@ namespace yg
     : m_texWidth(0),
       m_texHeight(0),
       m_texCount(0),
-      m_format(yg::Data8Bpp),
+      m_format(graphics::Data8Bpp),
       m_isWidthFixed(true),
       m_isHeightFixed(true),
       m_isCountFixed(true),
@@ -204,7 +204,7 @@ namespace yg
   ResourceManager::TexturePoolParams::TexturePoolParams(size_t texWidth,
                                                         size_t texHeight,
                                                         size_t texCount,
-                                                        yg::DataFormat format,
+                                                        graphics::DataFormat format,
                                                         bool isWidthFixed,
                                                         bool isHeightFixed,
                                                         bool isCountFixed,
@@ -240,13 +240,13 @@ namespace yg
     size_t pixelSize = 0;
     switch (m_format)
     {
-    case yg::Data4Bpp:
+    case graphics::Data4Bpp:
       pixelSize = 2;
       break;
-    case yg::Data8Bpp:
+    case graphics::Data8Bpp:
       pixelSize = 4;
       break;
-    case yg::Data565Bpp:
+    case graphics::Data565Bpp:
       pixelSize = 2;
       break;
     }
@@ -372,9 +372,9 @@ namespace
 }
 
   ResourceManager::Params::Params()
-    : m_rtFormat(yg::Data8Bpp),
-      m_texFormat(yg::Data4Bpp),
-      m_texRtFormat(yg::Data4Bpp),
+    : m_rtFormat(graphics::Data8Bpp),
+      m_texFormat(graphics::Data4Bpp),
+      m_texRtFormat(graphics::Data4Bpp),
       m_useSingleThreadedOGL(false),
       m_videoMemoryLimit(0),
       m_primaryStoragesParams("primaryStorage"),
@@ -407,7 +407,7 @@ namespace
   void ResourceManager::Params::checkDeviceCaps()
   {
     /// general case
-    m_texRtFormat = yg::Data4Bpp;
+    m_texRtFormat = graphics::Data4Bpp;
     m_useReadPixelsToSynchronize = false;
 
     if (isGPU("Vivante Corporation", "GC800 core", true))
@@ -415,23 +415,23 @@ namespace
 #ifndef __mips__
       /// glMapBuffer doesn't work on this GPU on non-MIPS devices,
       /// so we're switching to glBufferSubData.
-      yg::gl::g_isMapBufferSupported = false;
+      graphics::gl::g_isMapBufferSupported = false;
 #endif
     }
 
     if (isGPU("Qualcomm", "Adreno", false))
-      m_texRtFormat = yg::Data8Bpp;
+      m_texRtFormat = graphics::Data8Bpp;
 
     if (isGPU("Samsung Electronics", "FIMG-3DSE", false))
-      m_texRtFormat = yg::Data8Bpp;
+      m_texRtFormat = graphics::Data8Bpp;
 
     if (isGPU("Broadcom", "VideoCore IV HW", false))
-      m_texRtFormat = yg::Data8Bpp;
+      m_texRtFormat = graphics::Data8Bpp;
 
     if (isGPU("Imagination Technologies", "PowerVR MBX", false))
     {
-      m_rtFormat = yg::Data8Bpp;
-      m_texRtFormat = yg::Data8Bpp;
+      m_rtFormat = graphics::Data8Bpp;
+      m_texRtFormat = graphics::Data8Bpp;
     }
 
     bool isAndroidDevice = GetPlatform().DeviceName() == "Android";
@@ -441,7 +441,7 @@ namespace
     if (isGPU("Imagination Technologies", "PowerVR", false) && isAndroidDevice)
       m_useReadPixelsToSynchronize = true;
 
-    LOG(LINFO, ("selected", yg::formatName(m_texRtFormat), "format for tile textures"));
+    LOG(LINFO, ("selected", graphics::formatName(m_texRtFormat), "format for tile textures"));
 
     if (m_useReadPixelsToSynchronize)
       LOG(LINFO, ("using ReadPixels instead of glFinish to synchronize"));
@@ -541,7 +541,7 @@ namespace
     initTexturePool(p.m_styleCacheTexturesParams, m_styleCacheTextures);
     initTexturePool(p.m_guiThreadTexturesParams, m_guiThreadTextures);
 
-    if (!yg::gl::g_isBufferObjectsSupported)
+    if (!graphics::gl::g_isBufferObjectsSupported)
       LOG(LINFO, ("buffer objects are unsupported. using client vertex array instead."));
   }
 
@@ -768,7 +768,7 @@ namespace
       m_guiThreadTextures->EnterForeground();
   }
 
-  shared_ptr<yg::gl::BaseTexture> ResourceManager::createRenderTarget(unsigned w, unsigned h)
+  shared_ptr<graphics::gl::BaseTexture> ResourceManager::createRenderTarget(unsigned w, unsigned h)
   {
     switch (m_params.m_rtFormat)
     {
diff --git a/yg/resource_manager.hpp b/graphics/resource_manager.hpp
index af9462e9a2..07dc3a6e89 100644
--- a/yg/resource_manager.hpp
+++ b/graphics/resource_manager.hpp
@@ -13,7 +13,7 @@
 #include "glyph_cache.hpp"
 #include "data_formats.hpp"
 
-namespace yg
+namespace graphics
 {
   class Skin;
 
@@ -30,8 +30,8 @@ namespace yg
   {
     size_t m_w;
     size_t m_h;
-    yg::DataFormat m_format;
-    TTextureFactory(size_t w, size_t h, yg::DataFormat format, char const * resName, size_t batchSize);
+    graphics::DataFormat m_format;
+    TTextureFactory(size_t w, size_t h, graphics::DataFormat format, char const * resName, size_t batchSize);
     shared_ptr<gl::BaseTexture> const Create();
   };
 
@@ -142,7 +142,7 @@ namespace yg
       size_t m_texWidth;
       size_t m_texHeight;
       size_t m_texCount;
-      yg::DataFormat m_format;
+      graphics::DataFormat m_format;
 
       bool m_isWidthFixed;
       bool m_isHeightFixed;
@@ -159,7 +159,7 @@ namespace yg
       TexturePoolParams(size_t texWidth,
                         size_t texHeight,
                         size_t texCount,
-                        yg::DataFormat format,
+                        graphics::DataFormat format,
                         bool isWidthFixed,
                         bool isHeightFixed,
                         bool isCountFixed,
@@ -319,7 +319,7 @@ namespace yg
 
     bool useReadPixelsToSynchronize() const;
 
-    shared_ptr<yg::gl::BaseTexture> createRenderTarget(unsigned w, unsigned h);
+    shared_ptr<graphics::gl::BaseTexture> createRenderTarget(unsigned w, unsigned h);
   };
 
   Skin * loadSkin(shared_ptr<ResourceManager> const & resourceManager,
diff --git a/yg/resource_style.cpp b/graphics/resource_style.cpp
index 327327b7bc..5b243da76a 100644
--- a/yg/resource_style.cpp
+++ b/graphics/resource_style.cpp
@@ -2,7 +2,7 @@
 
 #include "data_traits.hpp"
 
-namespace yg
+namespace graphics
 {
   ResourceStyle::ResourceStyle()
   {}
@@ -34,13 +34,13 @@ namespace yg
   void PointStyle::render(void *dst)
   {}
 
-  ColorStyle::ColorStyle(m2::RectU const & texRect, int pipelineID, yg::Color const & c)
+  ColorStyle::ColorStyle(m2::RectU const & texRect, int pipelineID, graphics::Color const & c)
     : ResourceStyle(EColorStyle, texRect, pipelineID), m_c(c)
   {}
 
   void ColorStyle::render(void * dst)
   {
-    yg::Color c = m_c;
+    graphics::Color c = m_c;
     m2::RectU const & r = m_texRect;
 
     DATA_TRAITS::pixel_t px;
diff --git a/yg/resource_style.hpp b/graphics/resource_style.hpp
index 876c6c0208..ed17b5f79b 100644
--- a/yg/resource_style.hpp
+++ b/graphics/resource_style.hpp
@@ -7,7 +7,7 @@
 
 #include "../std/shared_ptr.hpp"
 
-namespace yg
+namespace graphics
 {
   struct GlyphInfo;
 
@@ -41,10 +41,10 @@ namespace yg
   {
     bool m_isWrapped;
     bool m_isSolid;
-    yg::PenInfo m_penInfo;
+    graphics::PenInfo m_penInfo;
     m2::PointU m_centerColorPixel;
     m2::PointU m_borderColorPixel;
-    LineStyle(bool isWrapped, m2::RectU const & texRect, int pipelineID, yg::PenInfo const & penInfo);
+    LineStyle(bool isWrapped, m2::RectU const & texRect, int pipelineID, graphics::PenInfo const & penInfo);
 
     /// with antialiasing zones
     double geometryTileLen() const;
@@ -75,16 +75,16 @@ namespace yg
 
   struct CircleStyle : public ResourceStyle
   {
-    yg::CircleInfo m_ci;
-    CircleStyle(m2::RectU const & texRect, int pipelineID, yg::CircleInfo const & ci);
+    graphics::CircleInfo m_ci;
+    CircleStyle(m2::RectU const & texRect, int pipelineID, graphics::CircleInfo const & ci);
 
     void render(void * dst);
   };
 
   struct ColorStyle : public ResourceStyle
   {
-    yg::Color m_c;
-    ColorStyle(m2::RectU const & texRect, int pipelineID, yg::Color const & c);
+    graphics::Color m_c;
+    ColorStyle(m2::RectU const & texRect, int pipelineID, graphics::Color const & c);
 
     void render(void * dst);
   };
diff --git a/yg/screen.hpp b/graphics/screen.hpp
index 46bc380756..8d563f4798 100644
--- a/yg/screen.hpp
+++ b/graphics/screen.hpp
@@ -2,7 +2,7 @@
 
 #include "overlay_renderer.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
diff --git a/yg/shape_renderer.cpp b/graphics/shape_renderer.cpp
index fe02c2b4ba..fbeec593d1 100644
--- a/yg/shape_renderer.cpp
+++ b/graphics/shape_renderer.cpp
@@ -9,7 +9,7 @@
 
 #include "../base/logging.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
@@ -17,7 +17,7 @@ namespace yg
     {
     }
 
-    void ShapeRenderer::drawConvexPolygon(m2::PointF const * pts, size_t ptsCount, yg::Color const & color, double depth)
+    void ShapeRenderer::drawConvexPolygon(m2::PointF const * pts, size_t ptsCount, graphics::Color const & color, double depth)
     {
       uint32_t styleID = skin()->mapColor(color);
 
@@ -30,7 +30,7 @@ namespace yg
       drawTrianglesFan(pts, ptsCount, styleID, depth);
     }
 
-    void ShapeRenderer::drawArc(m2::PointD const & center, double startA, double endA, double r, yg::Color const & c, double depth)
+    void ShapeRenderer::drawArc(m2::PointD const & center, double startA, double endA, double r, graphics::Color const & c, double depth)
     {
       vector<m2::PointD> pts;
       approximateArc(center, startA, endA, r, pts);
@@ -38,7 +38,7 @@ namespace yg
       if (pts.size() < 2)
         return;
 
-      drawPath(&pts[0], pts.size(), 0, skin()->mapPenInfo(yg::PenInfo(c, 3, 0, 0, 0)), depth);
+      drawPath(&pts[0], pts.size(), 0, skin()->mapPenInfo(graphics::PenInfo(c, 3, 0, 0, 0)), depth);
     }
 
     void ShapeRenderer::approximateArc(m2::PointD const & center, double startA, double endA, double r, vector<m2::PointD> & pts)
@@ -51,7 +51,7 @@ namespace yg
         pts.push_back(m2::Shift(m2::Rotate(m2::PointD(r, 0), startA + i * sectorA), center));
     }
 
-    void ShapeRenderer::drawSector(m2::PointD const & center, double startA, double endA, double r, yg::Color const & c, double depth)
+    void ShapeRenderer::drawSector(m2::PointD const & center, double startA, double endA, double r, graphics::Color const & c, double depth)
     {
       vector<m2::PointD> pts;
 
@@ -62,10 +62,10 @@ namespace yg
       if (pts.size() < 3)
         return;
 
-      drawPath(&pts[0], pts.size(), 0, skin()->mapPenInfo(yg::PenInfo(c, 2, 0, 0, 0)), depth);
+      drawPath(&pts[0], pts.size(), 0, skin()->mapPenInfo(graphics::PenInfo(c, 2, 0, 0, 0)), depth);
     }
 
-    void ShapeRenderer::fillSector(m2::PointD const & center, double startA, double endA, double r, yg::Color const & c, double depth)
+    void ShapeRenderer::fillSector(m2::PointD const & center, double startA, double endA, double r, graphics::Color const & c, double depth)
     {
       vector<m2::PointD> arcPts;
 
@@ -91,7 +91,7 @@ namespace yg
       drawTrianglesList(&sectorPts[0], sectorPts.size(), skin()->mapColor(c), depth);
     }
 
-    void ShapeRenderer::drawRectangle(m2::AnyRectD const & r, yg::Color const & c, double depth)
+    void ShapeRenderer::drawRectangle(m2::AnyRectD const & r, graphics::Color const & c, double depth)
     {
       ResourceStyle const * style = skin()->fromID(skin()->mapColor(c));
 
@@ -134,7 +134,7 @@ namespace yg
             style->m_pipelineID);
     }
 
-    void ShapeRenderer::drawRectangle(m2::RectD const & r, yg::Color const & c, double depth)
+    void ShapeRenderer::drawRectangle(m2::RectD const & r, graphics::Color const & c, double depth)
     {
       ResourceStyle const * style = skin()->fromID(skin()->mapColor(c));
 
@@ -176,7 +176,7 @@ namespace yg
           );
     }
 
-    void ShapeRenderer::drawRoundedRectangle(m2::RectD const & r, double rad, yg::Color const & c, double depth)
+    void ShapeRenderer::drawRoundedRectangle(m2::RectD const & r, double rad, graphics::Color const & c, double depth)
     {
       ResourceStyle const * style = skin()->fromID(skin()->mapColor(c));
 
diff --git a/yg/shape_renderer.hpp b/graphics/shape_renderer.hpp
index 79170fd7f0..cea20fab0d 100644
--- a/yg/shape_renderer.hpp
+++ b/graphics/shape_renderer.hpp
@@ -4,7 +4,7 @@
 #include "../geometry/rect2d.hpp"
 #include "../geometry/any_rect2d.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
@@ -18,7 +18,7 @@ namespace yg
 
       void drawConvexPolygon(m2::PointF const * points,
                              size_t pointsCount,
-                             yg::Color const & color,
+                             graphics::Color const & color,
                              double depth);
 
       static void approximateArc(m2::PointD const & center,
@@ -31,34 +31,34 @@ namespace yg
                    double startA,
                    double endA,
                    double r,
-                   yg::Color const & c,
+                   graphics::Color const & c,
                    double depth);
 
       void drawSector(m2::PointD const & center,
                       double startA,
                       double endA,
                       double r,
-                      yg::Color const & c,
+                      graphics::Color const & c,
                       double depth);
 
       void fillSector(m2::PointD const & center,
                       double startA,
                       double endA,
                       double r,
-                      yg::Color const & c,
+                      graphics::Color const & c,
                       double depth);
 
       void drawRectangle(m2::AnyRectD const & r,
-                         yg::Color const & c,
+                         graphics::Color const & c,
                          double depth);
 
       void drawRectangle(m2::RectD const & r,
-                         yg::Color const & c,
+                         graphics::Color const & c,
                          double depth);
 
       void drawRoundedRectangle(m2::RectD const & r,
                                 double rad,
-                                yg::Color const & c,
+                                graphics::Color const & c,
                                 double depth);
     };
   }
diff --git a/yg/skin.cpp b/graphics/skin.cpp
index 475e714b1e..caef41da1f 100644
--- a/yg/skin.cpp
+++ b/graphics/skin.cpp
@@ -14,7 +14,7 @@
 #include "internal/opengl.hpp"
 
 
-namespace yg
+namespace graphics
 {
   Skin::Skin(shared_ptr<ResourceManager> const & resourceManager,
              Skin::TSkinPages const & pages)
diff --git a/yg/skin.hpp b/graphics/skin.hpp
index b9d6cc768c..e9bd4277ee 100644
--- a/yg/skin.hpp
+++ b/graphics/skin.hpp
@@ -7,7 +7,7 @@
 #include "../std/vector.hpp"
 #include "../std/queue.hpp"
 
-namespace yg
+namespace graphics
 {
   template <typename pair_t>
   struct first_less
diff --git a/yg/skin_loader.cpp b/graphics/skin_loader.cpp
index 37169e339a..8185ef18ac 100644
--- a/yg/skin_loader.cpp
+++ b/graphics/skin_loader.cpp
@@ -6,7 +6,7 @@
 
 #include "../base/string_utils.hpp"
 
-namespace yg
+namespace graphics
 {
   SkinLoader::SkinLoader(shared_ptr<ResourceManager> const & resourceManager)
     : m_id(-1),
diff --git a/yg/skin_loader.hpp b/graphics/skin_loader.hpp
index b39ad09d8d..6bbff02a34 100644
--- a/yg/skin_loader.hpp
+++ b/graphics/skin_loader.hpp
@@ -29,7 +29,7 @@
 /// </texture>
 /// </skin>
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
diff --git a/yg/skin_page.cpp b/graphics/skin_page.cpp
index a148acb71f..98cf268d31 100644
--- a/yg/skin_page.cpp
+++ b/graphics/skin_page.cpp
@@ -11,7 +11,7 @@
 #include "../std/bind.hpp"
 #include "../std/numeric.hpp"
 
-namespace yg
+namespace graphics
 {
   typedef gl::Texture<DATA_TRAITS, true> TDynamicTexture;
 
@@ -96,7 +96,7 @@ namespace yg
     m_glyphMap.clear();
   }
 
-  uint32_t SkinPage::findColor(yg::Color const & c) const
+  uint32_t SkinPage::findColor(graphics::Color const & c) const
   {
     TColorMap::const_iterator it = m_colorMap.find(c);
     if (it == m_colorMap.end())
@@ -105,7 +105,7 @@ namespace yg
       return it->second;
   }
 
-  uint32_t SkinPage::mapColor(yg::Color const & c)
+  uint32_t SkinPage::mapColor(graphics::Color const & c)
   {
     uint32_t foundHandle = findColor(c);
 
@@ -148,7 +148,7 @@ namespace yg
       return it->second;
   }
 
-  uint32_t SkinPage::mapGlyph(yg::GlyphKey const & g, yg::GlyphCache * glyphCache)
+  uint32_t SkinPage::mapGlyph(graphics::GlyphKey const & g, graphics::GlyphCache * glyphCache)
   {
     uint32_t foundHandle = findGlyph(g);
     if (foundHandle != m_packer.invalidHandle())
diff --git a/yg/skin_page.hpp b/graphics/skin_page.hpp
index 7dbaba2aaa..90e693ae4a 100644
--- a/yg/skin_page.hpp
+++ b/graphics/skin_page.hpp
@@ -11,7 +11,7 @@
 #include "glyph_cache.hpp"
 #include "packets_queue.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
diff --git a/yg/skin_xml_parser.hpp b/graphics/skin_xml_parser.hpp
index f9dc4a1e57..f9dc4a1e57 100644
--- a/yg/skin_xml_parser.hpp
+++ b/graphics/skin_xml_parser.hpp
diff --git a/yg/storage.cpp b/graphics/storage.cpp
index 895b83e9ba..d565dc73d4 100644
--- a/yg/storage.cpp
+++ b/graphics/storage.cpp
@@ -3,7 +3,7 @@
 #include "buffer_object.hpp"
 #include "internal/opengl.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
diff --git a/yg/storage.hpp b/graphics/storage.hpp
index 1403e0af00..f77459b1ac 100644
--- a/yg/storage.hpp
+++ b/graphics/storage.hpp
@@ -2,7 +2,7 @@
 
 #include "../std/shared_ptr.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
diff --git a/yg/straight_text_element.cpp b/graphics/straight_text_element.cpp
index 1c0e842635..1826258b2a 100644
--- a/yg/straight_text_element.cpp
+++ b/graphics/straight_text_element.cpp
@@ -2,7 +2,7 @@
 #include "straight_text_element.hpp"
 #include "overlay_renderer.hpp"
 
-namespace yg
+namespace graphics
 {
   void visSplit(strings::UniString const & visText,
                 buffer_vector<strings::UniString, 3> & res,
@@ -136,7 +136,7 @@ namespace yg
 
     for (unsigned i = 0; i < res.size(); ++i)
     {
-      m_glyphLayouts.push_back(GlyphLayout(p.m_glyphCache, p.m_fontDesc, m2::PointD(0, 0), res[i], yg::EPosCenter));
+      m_glyphLayouts.push_back(GlyphLayout(p.m_glyphCache, p.m_fontDesc, m2::PointD(0, 0), res[i], graphics::EPosCenter));
       m2::RectD r = m_glyphLayouts.back().boundRects().back().GetGlobalRect();
       allElemWidth = max(r.SizeX(), allElemWidth);
       allElemHeight += r.SizeY();
@@ -146,7 +146,7 @@ namespace yg
 
     if (p.m_auxFontDesc.IsValid() && (!auxVisText().empty()))
     {
-      GlyphLayout l(p.m_glyphCache, p.m_auxFontDesc, m2::PointD(0, 0), auxVisText(), yg::EPosCenter);
+      GlyphLayout l(p.m_glyphCache, p.m_auxFontDesc, m2::PointD(0, 0), auxVisText(), graphics::EPosCenter);
       if (l.boundRects().back().GetGlobalRect().SizeX() > allElemWidth)
       {
         // should split
@@ -165,7 +165,7 @@ namespace yg
 
       for (int i = 0; i < auxRes.size(); ++i)
       {
-        m_glyphLayouts.push_back(GlyphLayout(p.m_glyphCache, p.m_auxFontDesc, m2::PointD(0, 0), auxRes[i], yg::EPosCenter));
+        m_glyphLayouts.push_back(GlyphLayout(p.m_glyphCache, p.m_auxFontDesc, m2::PointD(0, 0), auxRes[i], graphics::EPosCenter));
         m2::RectD r = m_glyphLayouts.back().boundRects().back().GetGlobalRect();
         allElemWidth = max(r.SizeX(), allElemWidth);
         allElemHeight += r.SizeY();
@@ -184,19 +184,19 @@ namespace yg
       curShift -= elemSize;
     }
 
-    if (position() & yg::EPosLeft)
+    if (position() & graphics::EPosLeft)
       for (unsigned i = 0; i < m_glyphLayouts.size(); ++i)
         m_glyphLayouts[i].setPivot(m_glyphLayouts[i].pivot() + m2::PointD(-allElemWidth / 2, 0));
 
-    if (position() & yg::EPosRight)
+    if (position() & graphics::EPosRight)
       for (unsigned i = 0; i < m_glyphLayouts.size(); ++i)
         m_glyphLayouts[i].setPivot(m_glyphLayouts[i].pivot() + m2::PointD(allElemWidth / 2, 0));
 
-    if (position() & yg::EPosAbove)
+    if (position() & graphics::EPosAbove)
       for (unsigned i = 0; i < m_glyphLayouts.size(); ++i)
         m_glyphLayouts[i].setPivot(m_glyphLayouts[i].pivot() + m2::PointD(0, -allElemHeight / 2));
 
-    if (position() & yg::EPosUnder)
+    if (position() & graphics::EPosUnder)
       for (unsigned i = 0; i < m_glyphLayouts.size(); ++i)
         m_glyphLayouts[i].setPivot(m_glyphLayouts[i].pivot() + m2::PointD(0, allElemHeight / 2));
 
@@ -252,17 +252,17 @@ namespace yg
   {
     if (screen->isDebugging())
     {
-      yg::Color c(255, 255, 255, 32);
+      graphics::Color c(255, 255, 255, 32);
 
       if (isFrozen())
-        c = yg::Color(0, 0, 255, 64);
+        c = graphics::Color(0, 0, 255, 64);
       if (isNeedRedraw())
-        c = yg::Color(255, 0, 0, 64);
+        c = graphics::Color(255, 0, 0, 64);
 
-      screen->drawRectangle(roughBoundRect(), yg::Color(255, 255, 0, 64), yg::maxDepth - 3);
+      screen->drawRectangle(roughBoundRect(), graphics::Color(255, 255, 0, 64), graphics::maxDepth - 3);
 
       for (unsigned i = 0 ; i < boundRects().size(); ++i)
-        screen->drawRectangle(boundRects()[i], c, yg::maxDepth - 3);
+        screen->drawRectangle(boundRects()[i], c, graphics::maxDepth - 3);
     }
 
     if (!isNeedRedraw())
@@ -271,14 +271,14 @@ namespace yg
     for (unsigned i = 0; i < m_glyphLayouts.size(); ++i)
     {
       if (m_glyphLayouts[i].fontDesc().m_isMasked)
-        drawTextImpl(m_glyphLayouts[i], screen, m, true, true, m_glyphLayouts[i].fontDesc(), yg::maxDepth - 2);
+        drawTextImpl(m_glyphLayouts[i], screen, m, true, true, m_glyphLayouts[i].fontDesc(), graphics::maxDepth - 2);
     }
 
     for (unsigned i = 0; i < m_glyphLayouts.size(); ++i)
     {
-      yg::FontDesc fontDesc = m_glyphLayouts[i].fontDesc();
+      graphics::FontDesc fontDesc = m_glyphLayouts[i].fontDesc();
       fontDesc.m_isMasked = false;
-      drawTextImpl(m_glyphLayouts[i], screen, m, true, true, fontDesc, yg::maxDepth - 1);
+      drawTextImpl(m_glyphLayouts[i], screen, m, true, true, fontDesc, graphics::maxDepth - 1);
     }
   }
 
diff --git a/yg/straight_text_element.hpp b/graphics/straight_text_element.hpp
index 5679fd22dc..55b2100f8e 100644
--- a/yg/straight_text_element.hpp
+++ b/graphics/straight_text_element.hpp
@@ -2,7 +2,7 @@
 
 #include "text_element.hpp"
 
-namespace yg
+namespace graphics
 {
   class StraightTextElement : public TextElement
   {
diff --git a/yg/symbol_element.cpp b/graphics/symbol_element.cpp
index ff5fc05617..133de605a3 100644
--- a/yg/symbol_element.cpp
+++ b/graphics/symbol_element.cpp
@@ -5,7 +5,7 @@
 #include "overlay_renderer.hpp"
 #include "skin.hpp"
 
-namespace yg
+namespace graphics
 {
   SymbolElement::SymbolElement(Params const & p)
     : base_t(p),
@@ -83,7 +83,7 @@ namespace yg
     r->drawStraightTexturedPolygon(pivot(),
                                    texRect.minX(), texRect.minY(), texRect.maxX(), texRect.maxY(),
                                    posPt.x, posPt.y, posPt.x + texRect.SizeX(), posPt.y + texRect.SizeY(),
-                                   yg::maxDepth - 2,
+                                   graphics::maxDepth - 2,
                                    style->m_pipelineID);
   }
 
diff --git a/yg/symbol_element.hpp b/graphics/symbol_element.hpp
index b3430fecea..c7769ff2ac 100644
--- a/yg/symbol_element.hpp
+++ b/graphics/symbol_element.hpp
@@ -2,7 +2,7 @@
 
 #include "overlay_element.hpp"
 
-namespace yg
+namespace graphics
 {
   struct ResourceStyle;
   class Skin;
diff --git a/yg/text_element.cpp b/graphics/text_element.cpp
index fa6beb9efa..32c0dda9ad 100644
--- a/yg/text_element.cpp
+++ b/graphics/text_element.cpp
@@ -8,7 +8,7 @@
 
 #include "../base/logging.hpp"
 
-namespace yg
+namespace graphics
 {
   TextElement::TextElement(Params const & p)
     : OverlayElement(p),
diff --git a/yg/text_element.hpp b/graphics/text_element.hpp
index 65c0425bc8..97af332c64 100644
--- a/yg/text_element.hpp
+++ b/graphics/text_element.hpp
@@ -12,7 +12,7 @@
 #include "glyph_layout.hpp"
 #include "overlay_element.hpp"
 
-namespace yg
+namespace graphics
 {
   class ResourceManager;
   class Skin;
diff --git a/yg/text_path.cpp b/graphics/text_path.cpp
index 41b6853a99..e83beddcc5 100644
--- a/yg/text_path.cpp
+++ b/graphics/text_path.cpp
@@ -4,7 +4,7 @@
 
 #include "../geometry/angles.hpp"
 
-namespace yg
+namespace graphics
 {
   PathPoint::PathPoint(int i, ang::AngleD const & segAngle, m2::PointD const & pt)
     : m_i(i),
diff --git a/yg/text_path.hpp b/graphics/text_path.hpp
index 4adf1ac7fc..e35c4f4fc9 100644
--- a/yg/text_path.hpp
+++ b/graphics/text_path.hpp
@@ -5,7 +5,7 @@
 #include "../base/matrix.hpp"
 #include "glyph_cache.hpp"
 
-namespace yg
+namespace graphics
 {
   struct PathPoint
   {
diff --git a/yg/text_renderer.cpp b/graphics/text_renderer.cpp
index 3be525b126..43c87a3e46 100644
--- a/yg/text_renderer.cpp
+++ b/graphics/text_renderer.cpp
@@ -10,7 +10,7 @@
 #include "../base/string_utils.hpp"
 
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
diff --git a/yg/text_renderer.hpp b/graphics/text_renderer.hpp
index 79e00f1431..5f8e45af22 100644
--- a/yg/text_renderer.hpp
+++ b/graphics/text_renderer.hpp
@@ -10,7 +10,7 @@
 #include "../std/shared_ptr.hpp"
 
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
diff --git a/yg/texture.hpp b/graphics/texture.hpp
index 8ae08b9e94..6bfa592153 100644
--- a/yg/texture.hpp
+++ b/graphics/texture.hpp
@@ -10,7 +10,7 @@
 namespace gil = boost::gil;
 namespace mpl = boost::mpl;
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
@@ -83,7 +83,7 @@ namespace yg
         upload(0);
       }
 
-      void fill(yg::Color const & c)
+      void fill(graphics::Color const & c)
       {
         makeCurrent();
 
@@ -159,7 +159,7 @@ namespace yg
       /// uploaded to the video memory on unlock()
       view_t view(size_t width, size_t height);
 
-      void fill(yg::Color const & c);
+      void fill(graphics::Color const & c);
 
       /// dump the texture into the file.
       void dump(char const * fileName);
@@ -305,7 +305,7 @@ namespace yg
     }
 
     template <typename Traits>
-    void Texture<Traits, true>::fill(yg::Color const & /*c*/)
+    void Texture<Traits, true>::fill(graphics::Color const & /*c*/)
     {
 /*      makeCurrent();
       lock();
diff --git a/yg/utils.cpp b/graphics/utils.cpp
index 84c8820ef4..73139c6edf 100644
--- a/yg/utils.cpp
+++ b/graphics/utils.cpp
@@ -5,7 +5,7 @@
 
 #include "../std/target_os.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
@@ -22,9 +22,9 @@ namespace yg
         OGLCHECK(glLoadIdentityFn());
 
         if (!doSwap)
-          OGLCHECK(glOrthoFn(0, width, 0, height, -yg::maxDepth, yg::maxDepth));
+          OGLCHECK(glOrthoFn(0, width, 0, height, -graphics::maxDepth, graphics::maxDepth));
         else
-          OGLCHECK(glOrthoFn(0, width, height, 0, -yg::maxDepth, yg::maxDepth));
+          OGLCHECK(glOrthoFn(0, width, height, 0, -graphics::maxDepth, graphics::maxDepth));
       }
     }
   }
diff --git a/yg/utils.hpp b/graphics/utils.hpp
index 67ad8e2ede..7441750c64 100644
--- a/yg/utils.hpp
+++ b/graphics/utils.hpp
@@ -2,7 +2,7 @@
 
 #include "../std/stdint.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
diff --git a/yg/vertex.cpp b/graphics/vertex.cpp
index 6362072528..060f3ea1d9 100644
--- a/yg/vertex.cpp
+++ b/graphics/vertex.cpp
@@ -2,7 +2,7 @@
 
 #include "internal/opengl.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
diff --git a/yg/vertex.hpp b/graphics/vertex.hpp
index cebe063f45..c58f877840 100644
--- a/yg/vertex.hpp
+++ b/graphics/vertex.hpp
@@ -4,7 +4,7 @@
 
 #include "../geometry/point2d.hpp"
 
-namespace yg
+namespace graphics
 {
   /// Vertex Data Element
   namespace gl
diff --git a/gui/button.cpp b/gui/button.cpp
index 2be19483cf..785e3e2384 100644
--- a/gui/button.cpp
+++ b/gui/button.cpp
@@ -1,5 +1,5 @@
 #include "button.hpp"
-#include "../yg/overlay_renderer.hpp"
+#include "../graphics/overlay_renderer.hpp"
 
 namespace gui
 {
@@ -9,7 +9,7 @@ namespace gui
 
     tp.m_depth = p.m_depth + 1;
     tp.m_pivot = p.m_pivot;
-    tp.m_position = yg::EPosCenter;
+    tp.m_position = graphics::EPosCenter;
     tp.m_text = p.m_text;
 
     m_textView.reset(new TextView(tp));
@@ -18,11 +18,11 @@ namespace gui
     setMinHeight(p.m_minHeight);
     setText(p.m_text);
 
-    setFont(EActive, yg::FontDesc(12, yg::Color(0, 0, 0, 255)));
-    setFont(EPressed, yg::FontDesc(12, yg::Color(0, 0, 0, 255)));
+    setFont(EActive, graphics::FontDesc(12, graphics::Color(0, 0, 0, 255)));
+    setFont(EPressed, graphics::FontDesc(12, graphics::Color(0, 0, 0, 255)));
 
-    setColor(EActive, yg::Color(yg::Color(192, 192, 192, 255)));
-    setColor(EPressed, yg::Color(yg::Color(64, 64, 64, 255)));
+    setColor(EActive, graphics::Color(graphics::Color(192, 192, 192, 255)));
+    setColor(EPressed, graphics::Color(graphics::Color(64, 64, 64, 255)));
   }
 
   void Button::setOnClickListener(TOnClickListener const & l)
@@ -128,7 +128,7 @@ namespace gui
     return m_boundRects;
   }
 
-  void Button::draw(yg::gl::OverlayRenderer * r, math::Matrix<double, 3, 3> const & m) const
+  void Button::draw(graphics::gl::OverlayRenderer * r, math::Matrix<double, 3, 3> const & m) const
   {
     if (!isVisible())
       return;
@@ -137,7 +137,7 @@ namespace gui
 
     r->drawRoundedRectangle(roughBoundRect(), 10 * k, color(state()), depth());
 
-    yg::FontDesc desc = font(state());
+    graphics::FontDesc desc = font(state());
     desc.m_size *= k;
 
     m_textView->draw(r, m);
@@ -149,13 +149,13 @@ namespace gui
     Element::setPivot(pv);
   }
 
-  void Button::setFont(EState state, yg::FontDesc const & font)
+  void Button::setFont(EState state, graphics::FontDesc const & font)
   {
     m_textView->setFont(state, font);
     Element::setFont(state, font);
   }
 
-  void Button::setColor(EState state, yg::Color const & c)
+  void Button::setColor(EState state, graphics::Color const & c)
   {
     m_textView->setColor(state, c);
     Element::setColor(state, c);
diff --git a/gui/button.hpp b/gui/button.hpp
index 5eedad1ad8..fb5e5d5f68 100644
--- a/gui/button.hpp
+++ b/gui/button.hpp
@@ -7,7 +7,7 @@
 #include "../std/string.hpp"
 #include "../std/scoped_ptr.hpp"
 
-namespace yg
+namespace graphics
 {
   class OverlayElement;
 
@@ -55,8 +55,8 @@ namespace gui
     void setOnClickListener(TOnClickListener const & l);
 
     void setPivot(m2::PointD const & pv);
-    void setFont(EState state, yg::FontDesc const & font);
-    void setColor(EState state, yg::Color const & c);
+    void setFont(EState state, graphics::FontDesc const & font);
+    void setColor(EState state, graphics::Color const & c);
 
     void setText(string const & text);
     string const & text() const;
@@ -73,7 +73,7 @@ namespace gui
     /// @{
 
     vector<m2::AnyRectD> const & boundRects() const;
-    void draw(yg::gl::OverlayRenderer * r, math::Matrix<double, 3, 3> const & m) const;
+    void draw(graphics::gl::OverlayRenderer * r, math::Matrix<double, 3, 3> const & m) const;
 
     /// @}
   };
diff --git a/gui/controller.cpp b/gui/controller.cpp
index 65a7267f96..45155aa945 100644
--- a/gui/controller.cpp
+++ b/gui/controller.cpp
@@ -1,9 +1,9 @@
 #include "controller.hpp"
 #include "element.hpp"
 
-#include "../map/drawer_yg.hpp"
+#include "../map/drawer.hpp"
 
-#include "../yg/overlay.hpp"
+#include "../graphics/overlay.hpp"
 
 #include "../std/bind.hpp"
 
@@ -19,8 +19,8 @@ namespace gui
 
   Controller::RenderParams::RenderParams(double visualScale,
                                          TInvalidateFn invalidateFn,
-                                         yg::GlyphCache * glyphCache,
-                                         yg::gl::Screen * cacheScreen)
+                                         graphics::GlyphCache * glyphCache,
+                                         graphics::gl::Screen * cacheScreen)
     : m_VisualScale(visualScale),
       m_InvalidateFn(invalidateFn),
       m_GlyphCache(glyphCache),
@@ -158,7 +158,7 @@ namespace gui
     PurgeElements();
   }
 
-  void Controller::DrawFrame(yg::gl::Screen * screen)
+  void Controller::DrawFrame(graphics::gl::Screen * screen)
   {
     screen->beginFrame();
 
@@ -178,7 +178,7 @@ namespace gui
       m_InvalidateFn();
   }
 
-  yg::GlyphCache * Controller::GetGlyphCache() const
+  graphics::GlyphCache * Controller::GetGlyphCache() const
   {
     return m_GlyphCache;
   }
@@ -201,7 +201,7 @@ namespace gui
     return m_bundle;
   }
 
-  yg::gl::Screen * Controller::GetCacheScreen() const
+  graphics::gl::Screen * Controller::GetCacheScreen() const
   {
     return m_CacheScreen;
   }
diff --git a/gui/controller.hpp b/gui/controller.hpp
index f6b7e2c83f..37956b91ab 100644
--- a/gui/controller.hpp
+++ b/gui/controller.hpp
@@ -8,7 +8,7 @@
 
 #include "../base/strings_bundle.hpp"
 
-namespace yg
+namespace graphics
 {
   class GlyphCache;
   class OverlayElement;
@@ -37,7 +37,7 @@ namespace gui
     /// element that has focus.
     shared_ptr<Element> m_focusedElement;
 
-    typedef list<shared_ptr<yg::OverlayElement> > base_list_t;
+    typedef list<shared_ptr<graphics::OverlayElement> > base_list_t;
     typedef list<shared_ptr<Element> > elem_list_t;
 
     elem_list_t m_Elements;
@@ -52,13 +52,13 @@ namespace gui
     double m_VisualScale;
 
     /// GlyphCache for text rendering by GUI elements.
-    yg::GlyphCache * m_GlyphCache;
+    graphics::GlyphCache * m_GlyphCache;
 
     /// Localized strings for GUI.
     StringsBundle const * m_bundle;
 
     /// Screen, which is used to cache gui::Elements into display lists.
-    yg::gl::Screen * m_CacheScreen;
+    graphics::gl::Screen * m_CacheScreen;
 
     /// Should we call the onTapEnded when the tap finished(we should
     /// not if the tap was cancelled while moving).
@@ -83,13 +83,13 @@ namespace gui
     {
       double m_VisualScale;
       TInvalidateFn m_InvalidateFn;
-      yg::GlyphCache * m_GlyphCache;
-      yg::gl::Screen * m_CacheScreen;
+      graphics::GlyphCache * m_GlyphCache;
+      graphics::gl::Screen * m_CacheScreen;
       RenderParams();
       RenderParams(double visualScale,
                    TInvalidateFn invalidateFn,
-                   yg::GlyphCache * glyphCache,
-                   yg::gl::Screen * cacheScreen);
+                   graphics::GlyphCache * glyphCache,
+                   graphics::gl::Screen * cacheScreen);
     };
 
     /// Attach GUI Controller to the renderer
@@ -109,12 +109,12 @@ namespace gui
     /// Get localized strings bundle
     StringsBundle const * GetStringsBundle() const;
     /// Get GlyphCache
-    yg::GlyphCache * GetGlyphCache() const;
-    /// Get yg::gl::Screen, which is used to cache gui::Element's
+    graphics::GlyphCache * GetGlyphCache() const;
+    /// Get graphics::gl::Screen, which is used to cache gui::Element's
     /// into display lists.
-    yg::gl::Screen * GetCacheScreen() const;
+    graphics::gl::Screen * GetCacheScreen() const;
     /// Redraw GUI
-    void DrawFrame(yg::gl::Screen * screen);
+    void DrawFrame(graphics::gl::Screen * screen);
     /// Calling gui::Element::update for every element.
     void UpdateElements();
     /// Calling gui::Element::purge for every element.
diff --git a/gui/element.cpp b/gui/element.cpp
index acc3d10928..c183e01602 100644
--- a/gui/element.cpp
+++ b/gui/element.cpp
@@ -1,7 +1,7 @@
 #include "element.hpp"
 #include "controller.hpp"
 
-#include "../yg/overlay_renderer.hpp"
+#include "../graphics/overlay_renderer.hpp"
 
 #include "../base/logging.hpp"
 
@@ -24,22 +24,22 @@ namespace gui
     return m_state;
   }
 
-  void Element::setFont(EState state, yg::FontDesc const & font)
+  void Element::setFont(EState state, graphics::FontDesc const & font)
   {
     m_fonts[state] = font;
   }
 
-  yg::FontDesc const & Element::font(EState state) const
+  graphics::FontDesc const & Element::font(EState state) const
   {
     return m_fonts[state];
   }
 
-  void Element::setColor(EState state, yg::Color const & c)
+  void Element::setColor(EState state, graphics::Color const & c)
   {
     m_colors[state] = c;
   }
 
-  yg::Color const & Element::color(EState state) const
+  graphics::Color const & Element::color(EState state) const
   {
     return m_colors[state];
   }
@@ -81,12 +81,12 @@ namespace gui
     }
   }
 
-  yg::OverlayElement * Element::clone(math::Matrix<double, 3, 3> const & m) const
+  graphics::OverlayElement * Element::clone(math::Matrix<double, 3, 3> const & m) const
   {
     return 0;
   }
 
-  void Element::draw(yg::gl::OverlayRenderer *r, math::Matrix<double, 3, 3> const & m) const
+  void Element::draw(graphics::gl::OverlayRenderer *r, math::Matrix<double, 3, 3> const & m) const
   {
     for (unsigned i = 0; i < boundRects().size(); ++i)
       r->drawRectangle(boundRects()[i], color(state()), depth());
diff --git a/gui/element.hpp b/gui/element.hpp
index 7a1f55a8b2..88ba5dc624 100644
--- a/gui/element.hpp
+++ b/gui/element.hpp
@@ -2,13 +2,13 @@
 
 #include "../geometry/point2d.hpp"
 
-#include "../yg/overlay_element.hpp"
-#include "../yg/color.hpp"
-#include "../yg/font_desc.hpp"
+#include "../graphics/overlay_element.hpp"
+#include "../graphics/color.hpp"
+#include "../graphics/font_desc.hpp"
 
 #include "../std/map.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
@@ -20,7 +20,7 @@ namespace gui
 {
   class Controller;
 
-  class Element : public yg::OverlayElement
+  class Element : public graphics::OverlayElement
   {
   public:
 
@@ -40,8 +40,8 @@ namespace gui
 
     EState m_state;
 
-    mutable map<EState, yg::FontDesc> m_fonts;
-    mutable map<EState, yg::Color> m_colors;
+    mutable map<EState, graphics::FontDesc> m_fonts;
+    mutable map<EState, graphics::Color> m_colors;
 
   public:
 
@@ -52,11 +52,11 @@ namespace gui
     void setState(EState state);
     EState state() const;
 
-    virtual void setFont(EState state, yg::FontDesc const & font);
-    yg::FontDesc const & font(EState state) const;
+    virtual void setFont(EState state, graphics::FontDesc const & font);
+    graphics::FontDesc const & font(EState state) const;
 
-    virtual void setColor(EState state, yg::Color const & c);
-    yg::Color const & color(EState state) const;
+    virtual void setColor(EState state, graphics::Color const & c);
+    graphics::Color const & color(EState state) const;
 
     /// Implement this method to handle single tap on the GUI element.
     virtual bool onTapStarted(m2::PointD const & pt);
@@ -67,8 +67,8 @@ namespace gui
     void invalidate();
     double visualScale() const;
 
-    yg::OverlayElement * clone(math::Matrix<double, 3, 3> const & m) const;
-    void draw(yg::gl::OverlayRenderer * r, math::Matrix<double, 3, 3> const & m) const;
+    graphics::OverlayElement * clone(math::Matrix<double, 3, 3> const & m) const;
+    void draw(graphics::gl::OverlayRenderer * r, math::Matrix<double, 3, 3> const & m) const;
     int visualRank() const;
 
     virtual void cache();
diff --git a/gui/gui.pro b/gui/gui.pro
index ad122da3e1..19d0ba2661 100644
--- a/gui/gui.pro
+++ b/gui/gui.pro
@@ -1,11 +1,11 @@
-# GUI library on top of YG
+# GUI library on top of Graphics
 
 TARGET = gui
 TEMPLATE = lib
 CONFIG += staticlib
 
 ROOT_DIR = ..
-DEPENDENCIES = yg geometry coding base expat
+DEPENDENCIES = graphics geometry coding base expat
 
 include($$ROOT_DIR/common.pri)
 
diff --git a/gui/text_view.cpp b/gui/text_view.cpp
index 68ec235b3c..68ce7742d8 100644
--- a/gui/text_view.cpp
+++ b/gui/text_view.cpp
@@ -8,11 +8,11 @@ namespace gui
   {
     setText(p.m_text);
 
-    setFont(EActive, yg::FontDesc(12, yg::Color(0, 0, 0, 255)));
-    setFont(EPressed, yg::FontDesc(12, yg::Color(0, 0, 0, 255)));
+    setFont(EActive, graphics::FontDesc(12, graphics::Color(0, 0, 0, 255)));
+    setFont(EPressed, graphics::FontDesc(12, graphics::Color(0, 0, 0, 255)));
 
-    setColor(EActive, yg::Color(yg::Color(192, 192, 192, 255)));
-    setColor(EPressed, yg::Color(yg::Color(64, 64, 64, 255)));
+    setColor(EActive, graphics::Color(graphics::Color(192, 192, 192, 255)));
+    setColor(EPressed, graphics::Color(graphics::Color(64, 64, 64, 255)));
   }
 
   void TextView::setText(string const & text)
@@ -32,7 +32,7 @@ namespace gui
 
   void TextView::cache()
   {
-    yg::StraightTextElement::Params params;
+    graphics::StraightTextElement::Params params;
     params.m_depth = depth();
     params.m_fontDesc = font(state());
     params.m_fontDesc.m_size *= visualScale();
@@ -45,10 +45,10 @@ namespace gui
     params.m_delimiters = "\n";
     params.m_useAllParts = true;
 
-    m_elem.reset(new yg::StraightTextElement(params));
+    m_elem.reset(new graphics::StraightTextElement(params));
   }
 
-  void TextView::draw(yg::gl::OverlayRenderer *r, math::Matrix<double, 3, 3> const & m) const
+  void TextView::draw(graphics::gl::OverlayRenderer *r, math::Matrix<double, 3, 3> const & m) const
   {
     checkDirtyDrawing();
     m_elem->draw(r, m);
diff --git a/gui/text_view.hpp b/gui/text_view.hpp
index 459089e7b9..8ec2d6933d 100644
--- a/gui/text_view.hpp
+++ b/gui/text_view.hpp
@@ -4,7 +4,7 @@
 
 #include "../geometry/any_rect2d.hpp"
 
-#include "../yg/straight_text_element.hpp"
+#include "../graphics/straight_text_element.hpp"
 
 #include "element.hpp"
 
@@ -15,7 +15,7 @@ namespace gui
   {
   private:
 
-    shared_ptr<yg::StraightTextElement> m_elem;
+    shared_ptr<graphics::StraightTextElement> m_elem;
 
     string m_text;
 
@@ -36,7 +36,7 @@ namespace gui
     string const & text() const;
 
     vector<m2::AnyRectD> const & boundRects() const;
-    void draw(yg::gl::OverlayRenderer * r, math::Matrix<double, 3, 3> const & m) const;
+    void draw(graphics::gl::OverlayRenderer * r, math::Matrix<double, 3, 3> const & m) const;
 
     bool onTapStarted(m2::PointD const & pt);
     bool onTapMoved(m2::PointD const & pt);
diff --git a/iphone/Maps/Classes/EAGLView.h b/iphone/Maps/Classes/EAGLView.h
index 498fcedea1..2585a3e77a 100644
--- a/iphone/Maps/Classes/EAGLView.h
+++ b/iphone/Maps/Classes/EAGLView.h
@@ -11,7 +11,7 @@ namespace iphone
 	class RenderBuffer;
 }
 
-namespace yg
+namespace graphics
 {
 	namespace gl
 	{
@@ -26,7 +26,7 @@ namespace yg
 {
   VideoTimer * videoTimer;
   shared_ptr<iphone::RenderContext> renderContext;
-  shared_ptr<yg::gl::FrameBuffer> frameBuffer;
+  shared_ptr<graphics::gl::FrameBuffer> frameBuffer;
   shared_ptr<iphone::RenderBuffer> renderBuffer;
   RenderPolicy * renderPolicy;
   // Do not call onSize from layoutSubViews when real size wasn't changed.
diff --git a/iphone/Maps/Classes/EAGLView.mm b/iphone/Maps/Classes/EAGLView.mm
index 00461bd400..a8f704e3e2 100644
--- a/iphone/Maps/Classes/EAGLView.mm
+++ b/iphone/Maps/Classes/EAGLView.mm
@@ -7,9 +7,9 @@
 #include "RenderContext.hpp"
 #include "Framework.h"
 
-#include "../../yg/resource_manager.hpp"
-#include "../../yg/internal/opengl.hpp"
-#include "../../yg/data_formats.hpp"
+#include "../../graphics/resource_manager.hpp"
+#include "../../graphics/internal/opengl.hpp"
+#include "../../graphics/data_formats.hpp"
 
 #include "../../map/render_policy.hpp"
 
@@ -64,10 +64,10 @@
 - (void)initRenderPolicy
 {
   // to avoid grid bug on 3G device
-  yg::DataFormat rtFmt = yg::Data4Bpp;
-  yg::DataFormat texFmt = yg::Data4Bpp;
+  graphics::DataFormat rtFmt = graphics::Data4Bpp;
+  graphics::DataFormat texFmt = graphics::Data4Bpp;
   if ([[NSString stringWithFormat:@"%s", glGetString(GL_RENDERER)] hasPrefix:@"PowerVR MBX"])
-    rtFmt = yg::Data8Bpp;
+    rtFmt = graphics::Data8Bpp;
   
   typedef void (*drawFrameFn)(id, SEL);
   SEL drawFrameSel = @selector(drawFrame);
@@ -75,7 +75,7 @@
 
   videoTimer = CreateIOSVideoTimer(bind(drawFrameImpl, self, drawFrameSel));
   
-  yg::ResourceManager::Params rmParams;
+  graphics::ResourceManager::Params rmParams;
   rmParams.m_videoMemoryLimit = GetPlatform().VideoMemoryLimit();
   rmParams.m_rtFormat = rtFmt;
   rmParams.m_texFormat = texFmt;
@@ -104,7 +104,7 @@
   {
     renderPolicy = CreateRenderPolicy(rpParams);
   }
-  catch (yg::gl::platform_unsupported const & )
+  catch (graphics::gl::platform_unsupported const & )
   {
     /// terminate program (though this situation is unreal :) )
   }
@@ -120,7 +120,7 @@
 {
   frameBuffer->onSize(width, height);
   
-  shared_ptr<yg::gl::Screen> screen = renderPolicy->GetDrawer()->screen();
+  shared_ptr<graphics::gl::Screen> screen = renderPolicy->GetDrawer()->screen();
 
   /// free old render buffer, as we would not create a new one.
   screen->resetRenderTarget();
@@ -135,12 +135,12 @@
 	renderBuffer = make_shared_ptr(new iphone::RenderBuffer(renderContext, (CAEAGLLayer*)self.layer));
   
   screen->setRenderTarget(renderBuffer);
-  screen->setDepthBuffer(make_shared_ptr(new yg::gl::RenderBuffer(width, height, true)));
+  screen->setDepthBuffer(make_shared_ptr(new graphics::gl::RenderBuffer(width, height, true)));
 
   GetFramework().OnSize(width, height);
   
   screen->beginFrame();
-  screen->clear(yg::gl::Screen::s_bgColor);
+  screen->clear(graphics::gl::Screen::s_bgColor);
   screen->endFrame();
 }
 
diff --git a/iphone/Maps/Classes/RenderBuffer.hpp b/iphone/Maps/Classes/RenderBuffer.hpp
index eac348e20c..1505c7ac20 100644
--- a/iphone/Maps/Classes/RenderBuffer.hpp
+++ b/iphone/Maps/Classes/RenderBuffer.hpp
@@ -2,13 +2,13 @@
 
 #include "RenderContext.hpp"
 #include "../../../std/shared_ptr.hpp"
-#include "../../../yg/render_target.hpp"
+#include "../../../graphics/render_target.hpp"
 
 @class CAEAGLLayer;
 
 namespace	iphone
 {
-	class RenderBuffer : public yg::gl::RenderTarget
+	class RenderBuffer : public graphics::gl::RenderTarget
 	{
 	private:
 
diff --git a/iphone/Maps/Classes/RenderBuffer.mm b/iphone/Maps/Classes/RenderBuffer.mm
index eb4c8598b0..029aa3e19c 100644
--- a/iphone/Maps/Classes/RenderBuffer.mm
+++ b/iphone/Maps/Classes/RenderBuffer.mm
@@ -2,8 +2,8 @@
 
 #include "RenderBuffer.hpp"
 
-#include "../../../yg/internal/opengl.hpp"
-#include "../../../yg/utils.hpp"
+#include "../../../graphics/internal/opengl.hpp"
+#include "../../../graphics/utils.hpp"
 
 namespace iphone
 {
@@ -70,7 +70,7 @@ namespace iphone
 																				  GL_COLOR_ATTACHMENT0_OES,
   																				GL_RENDERBUFFER_OES,
 	  																			m_id));
-		yg::gl::utils::setupCoordinates(width(), height(), true);
+		graphics::gl::utils::setupCoordinates(width(), height(), true);
 	}
   
   void RenderBuffer::detachFromFrameBuffer()
diff --git a/iphone/Maps/Classes/RenderContext.hpp b/iphone/Maps/Classes/RenderContext.hpp
index 85c0ab74bd..2ca70a56d3 100644
--- a/iphone/Maps/Classes/RenderContext.hpp
+++ b/iphone/Maps/Classes/RenderContext.hpp
@@ -13,13 +13,13 @@
 #include <OpenGLES/ES1/gl.h>
 #include <OpenGLES/ES1/glext.h>
 
-#include "../../../yg/rendercontext.hpp"
+#include "../../../graphics/rendercontext.hpp"
 #include "../../../std/shared_ptr.hpp"
 
 
 namespace iphone
 {
-  class RenderContext : public yg::gl::RenderContext
+  class RenderContext : public graphics::gl::RenderContext
   {
 	private:
 		/// Pointer to render context.
@@ -34,7 +34,7 @@ namespace iphone
 		/// Make this rendering context current
 		void makeCurrent();
 		/// create a shared render context
-		shared_ptr<yg::gl::RenderContext> createShared();
+		shared_ptr<graphics::gl::RenderContext> createShared();
     /// @TODO
     void endThreadDrawing() {}
 
diff --git a/iphone/Maps/Classes/RenderContext.mm b/iphone/Maps/Classes/RenderContext.mm
index 6677de0a41..f35fea07d8 100644
--- a/iphone/Maps/Classes/RenderContext.mm
+++ b/iphone/Maps/Classes/RenderContext.mm
@@ -29,12 +29,12 @@ namespace iphone
 	void RenderContext::makeCurrent()
 	{
     [EAGLContext setCurrentContext:m_context];
-    yg::gl::RenderContext::initParams();
+    graphics::gl::RenderContext::initParams();
 	}
  
-  shared_ptr<yg::gl::RenderContext> RenderContext::createShared()
+  shared_ptr<graphics::gl::RenderContext> RenderContext::createShared()
 	{
-		return shared_ptr<yg::gl::RenderContext>(new RenderContext(this));
+		return shared_ptr<graphics::gl::RenderContext>(new RenderContext(this));
 	}
 
 	EAGLContext * RenderContext::getEAGLContext()
diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
index 19c7af1975..8438d79b72 100644
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -29,7 +29,7 @@
 		EE12020E11CD464100ABDD5D /* libgeometry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EE12020411CD464100ABDD5D /* libgeometry.a */; };
 		EE12020F11CD464100ABDD5D /* libindexer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EE12020511CD464100ABDD5D /* libindexer.a */; };
 		EE12021011CD464100ABDD5D /* libmap.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EE12020611CD464100ABDD5D /* libmap.a */; };
-		EE12021211CD464100ABDD5D /* libyg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EE12020811CD464100ABDD5D /* libyg.a */; };
+		EE12021211CD464100ABDD5D /* libgraphics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EE12020811CD464100ABDD5D /* libgraphics.a */; };
 		EE164811135CEE4A003B8A3E /* 06_code2000.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EE164810135CEE49003B8A3E /* 06_code2000.ttf */; };
 		EE583CBB12F773F00042CBE3 /* unicode_blocks.txt in Resources */ = {isa = PBXBuildFile; fileRef = EE583CBA12F773F00042CBE3 /* unicode_blocks.txt */; };
 		EE5A34E6156FCB9500E34FFE /* libgui.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EE5A34E5156FCB9500E34FFE /* libgui.a */; };
@@ -1322,7 +1322,7 @@
 		FAFB0905151215EE0041901D /* libgeometry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EE12020411CD464100ABDD5D /* libgeometry.a */; };
 		FAFB0906151215EE0041901D /* libindexer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EE12020511CD464100ABDD5D /* libindexer.a */; };
 		FAFB0907151215EE0041901D /* libmap.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EE12020611CD464100ABDD5D /* libmap.a */; };
-		FAFB0908151215EE0041901D /* libyg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EE12020811CD464100ABDD5D /* libyg.a */; };
+		FAFB0908151215EE0041901D /* libgraphics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EE12020811CD464100ABDD5D /* libgraphics.a */; };
 		FAFB0909151215EE0041901D /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA87151A12B1518F00592DAF /* SystemConfiguration.framework */; };
 		FAFB090A151215EE0041901D /* libstorage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA04373112CAB83F00017494 /* libstorage.a */; };
 		FAFB090B151215EE0041901D /* libfribidi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EEF5745412DE1AD50082F472 /* libfribidi.a */; };
@@ -1367,7 +1367,7 @@
 		EE12020411CD464100ABDD5D /* libgeometry.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgeometry.a; sourceTree = SOURCE_ROOT; };
 		EE12020511CD464100ABDD5D /* libindexer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libindexer.a; sourceTree = SOURCE_ROOT; };
 		EE12020611CD464100ABDD5D /* libmap.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libmap.a; sourceTree = SOURCE_ROOT; };
-		EE12020811CD464100ABDD5D /* libyg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libyg.a; sourceTree = SOURCE_ROOT; };
+		EE12020811CD464100ABDD5D /* libgraphics.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgraphics.a; sourceTree = SOURCE_ROOT; };
 		EE16192B126E374500622BD0 /* RenderContext.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; lineEnding = 0; name = RenderContext.hpp; path = Classes/RenderContext.hpp; sourceTree = SOURCE_ROOT; };
 		EE164810135CEE49003B8A3E /* 06_code2000.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = 06_code2000.ttf; path = ../../data/06_code2000.ttf; sourceTree = SOURCE_ROOT; };
 		EE583CBA12F773F00042CBE3 /* unicode_blocks.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = unicode_blocks.txt; path = ../../data/unicode_blocks.txt; sourceTree = "<group>"; };
@@ -2068,7 +2068,7 @@
 				EE12020E11CD464100ABDD5D /* libgeometry.a in Frameworks */,
 				EE12020F11CD464100ABDD5D /* libindexer.a in Frameworks */,
 				EE12021011CD464100ABDD5D /* libmap.a in Frameworks */,
-				EE12021211CD464100ABDD5D /* libyg.a in Frameworks */,
+				EE12021211CD464100ABDD5D /* libgraphics.a in Frameworks */,
 				FA87151B12B1518F00592DAF /* SystemConfiguration.framework in Frameworks */,
 				FA04373212CAB83F00017494 /* libstorage.a in Frameworks */,
 				EEF5745512DE1AD50082F472 /* libfribidi.a in Frameworks */,
@@ -2100,7 +2100,7 @@
 				FAFB0905151215EE0041901D /* libgeometry.a in Frameworks */,
 				FAFB0906151215EE0041901D /* libindexer.a in Frameworks */,
 				FAFB0907151215EE0041901D /* libmap.a in Frameworks */,
-				FAFB0908151215EE0041901D /* libyg.a in Frameworks */,
+				FAFB0908151215EE0041901D /* libgraphics.a in Frameworks */,
 				FAFB0909151215EE0041901D /* SystemConfiguration.framework in Frameworks */,
 				FAFB090A151215EE0041901D /* libstorage.a in Frameworks */,
 				FAFB090B151215EE0041901D /* libfribidi.a in Frameworks */,
@@ -2313,7 +2313,7 @@
 				EE12020411CD464100ABDD5D /* libgeometry.a */,
 				EE12020511CD464100ABDD5D /* libindexer.a */,
 				EE12020611CD464100ABDD5D /* libmap.a */,
-				EE12020811CD464100ABDD5D /* libyg.a */,
+				EE12020811CD464100ABDD5D /* libgraphics.a */,
 				EEFFB4E715DCDD8A00BACE1C /* libanim.a */,
 			);
 			name = "Static Libraries";
diff --git a/map/basic_tiling_render_policy.cpp b/map/basic_tiling_render_policy.cpp
index ef892c27ae..e4cbe75616 100644
--- a/map/basic_tiling_render_policy.cpp
+++ b/map/basic_tiling_render_policy.cpp
@@ -105,7 +105,7 @@ void BasicTilingRenderPolicy::DrawFrame(shared_ptr<PaintEvent> const & e, Screen
 
   /// rendering current coverage
 
-  DrawerYG * pDrawer = e->drawer();
+  Drawer * pDrawer = e->drawer();
 
   pDrawer->beginFrame();
 
diff --git a/map/basic_tiling_render_policy.hpp b/map/basic_tiling_render_policy.hpp
index 47054a9fe9..ef25199e7e 100644
--- a/map/basic_tiling_render_policy.hpp
+++ b/map/basic_tiling_render_policy.hpp
@@ -5,7 +5,7 @@
 #include "../geometry/screenbase.hpp"
 
 #include "../std/shared_ptr.hpp"
-#include "../yg/overlay.hpp"
+#include "../graphics/overlay.hpp"
 
 class TileRenderer;
 class CoverageGenerator;
diff --git a/map/compass_arrow.cpp b/map/compass_arrow.cpp
index 5505017e77..9251e869b9 100644
--- a/map/compass_arrow.cpp
+++ b/map/compass_arrow.cpp
@@ -9,9 +9,9 @@
 #include "../geometry/any_rect2d.hpp"
 #include "../geometry/transformations.hpp"
 
-#include "../yg/display_list.hpp"
-#include "../yg/screen.hpp"
-#include "../yg/skin.hpp"
+#include "../graphics/display_list.hpp"
+#include "../graphics/screen.hpp"
+#include "../graphics/skin.hpp"
 
 CompassArrow::CompassArrow(Params const & p)
   : base_t(p),
@@ -52,7 +52,7 @@ vector<m2::AnyRectD> const & CompassArrow::boundRects() const
   return m_boundRects;
 }
 
-void CompassArrow::draw(yg::gl::OverlayRenderer * r,
+void CompassArrow::draw(graphics::gl::OverlayRenderer * r,
                         math::Matrix<double, 3, 3> const & m) const
 {
   if (isVisible())
@@ -71,7 +71,7 @@ void CompassArrow::draw(yg::gl::OverlayRenderer * r,
 
 void CompassArrow::cache()
 {
-  yg::gl::Screen * cacheScreen = m_controller->GetCacheScreen();
+  graphics::gl::Screen * cacheScreen = m_controller->GetCacheScreen();
 
   m_displayList.reset();
   m_displayList.reset(cacheScreen->createDisplayList());
@@ -121,7 +121,7 @@ void CompassArrow::cache()
     m2::PointD(halfW, 0)
   };
 
-  yg::PenInfo const outlinePenInfo(yg::Color(0x66, 0x66, 0x66, 0xcc), 1, 0, 0, 0);
+  graphics::PenInfo const outlinePenInfo(graphics::Color(0x66, 0x66, 0x66, 0xcc), 1, 0, 0, 0);
 
   cacheScreen->drawPath(outlinePts, sizeof(outlinePts) / sizeof(m2::PointD), 0, cacheScreen->skin()->mapPenInfo(outlinePenInfo), depth());
 
diff --git a/map/compass_arrow.hpp b/map/compass_arrow.hpp
index 320ffa3ebc..e6acb53fe8 100644
--- a/map/compass_arrow.hpp
+++ b/map/compass_arrow.hpp
@@ -2,8 +2,8 @@
 
 #include "../gui/element.hpp"
 
-#include "../yg/color.hpp"
-#include "../yg/display_list.hpp"
+#include "../graphics/color.hpp"
+#include "../graphics/display_list.hpp"
 
 #include "../geometry/any_rect2d.hpp"
 
@@ -21,13 +21,13 @@ private:
 
   unsigned m_arrowWidth;
   unsigned m_arrowHeight;
-  yg::Color const m_northLeftColor;
-  yg::Color const m_northRightColor;
-  yg::Color const m_southLeftColor;
-  yg::Color const m_southRightColor;
+  graphics::Color const m_northLeftColor;
+  graphics::Color const m_northRightColor;
+  graphics::Color const m_southLeftColor;
+  graphics::Color const m_southRightColor;
   double m_angle;
 
-  scoped_ptr<yg::gl::DisplayList> m_displayList;
+  scoped_ptr<graphics::gl::DisplayList> m_displayList;
 
   mutable vector<m2::AnyRectD> m_boundRects;
 
@@ -52,7 +52,7 @@ public:
   unsigned GetArrowHeight() const;
 
   vector<m2::AnyRectD> const & boundRects() const;
-  void draw(yg::gl::OverlayRenderer * r, math::Matrix<double, 3, 3> const & m) const;
+  void draw(graphics::gl::OverlayRenderer * r, math::Matrix<double, 3, 3> const & m) const;
 
   bool onTapEnded(m2::PointD const & pt);
 
diff --git a/map/country_status_display.cpp b/map/country_status_display.cpp
index e64b36fa0f..5086356a0a 100644
--- a/map/country_status_display.cpp
+++ b/map/country_status_display.cpp
@@ -2,7 +2,7 @@
 
 #include "../gui/controller.hpp"
 
-#include "../yg/overlay_renderer.hpp"
+#include "../graphics/overlay_renderer.hpp"
 
 #include "../platform/platform.hpp"
 
@@ -137,35 +137,35 @@ CountryStatusDisplay::CountryStatusDisplay(Params const & p)
 
   gui::Button::Params bp;
 
-  bp.m_depth = yg::maxDepth - 10;
+  bp.m_depth = graphics::maxDepth - 10;
   bp.m_minWidth = 200;
   bp.m_minHeight = 40;
   bp.m_pivot = m2::PointD(0, 0);
-  bp.m_position = yg::EPosCenter;
+  bp.m_position = graphics::EPosCenter;
   bp.m_text = "Download";
 
   m_downloadButton.reset(new gui::Button(bp));
   m_downloadButton->setOnClickListener(bind(&CountryStatusDisplay::downloadCountry, this));
   m_downloadButton->setIsVisible(false);
-  m_downloadButton->setPosition(yg::EPosCenter);
+  m_downloadButton->setPosition(graphics::EPosCenter);
 
-  m_downloadButton->setFont(EActive, yg::FontDesc(16, yg::Color(255, 255, 255, 255)));
-  m_downloadButton->setFont(EPressed, yg::FontDesc(16, yg::Color(255, 255, 255, 255)));
+  m_downloadButton->setFont(EActive, graphics::FontDesc(16, graphics::Color(255, 255, 255, 255)));
+  m_downloadButton->setFont(EPressed, graphics::FontDesc(16, graphics::Color(255, 255, 255, 255)));
 
-  m_downloadButton->setColor(EActive, yg::Color(yg::Color(0, 0, 0, 0.6 * 255)));
-  m_downloadButton->setColor(EPressed, yg::Color(yg::Color(0, 0, 0, 0.4 * 255)));
+  m_downloadButton->setColor(EActive, graphics::Color(graphics::Color(0, 0, 0, 0.6 * 255)));
+  m_downloadButton->setColor(EPressed, graphics::Color(graphics::Color(0, 0, 0, 0.4 * 255)));
 
   gui::TextView::Params tp;
-  tp.m_depth = yg::maxDepth - 10;
+  tp.m_depth = graphics::maxDepth - 10;
   tp.m_pivot = m2::PointD(0, 0);
   tp.m_text = "Downloading";
 
   m_statusMsg.reset(new gui::TextView(tp));
 
   m_statusMsg->setIsVisible(false);
-  m_statusMsg->setPosition(yg::EPosCenter);
+  m_statusMsg->setPosition(graphics::EPosCenter);
 
-  m_statusMsg->setFont(gui::Element::EActive, yg::FontDesc(18));
+  m_statusMsg->setFont(gui::Element::EActive, graphics::FontDesc(18));
 
   setIsVisible(false);
 
@@ -235,7 +235,7 @@ void CountryStatusDisplay::setCountryName(string const & name)
   }
 }
 
-void CountryStatusDisplay::draw(yg::gl::OverlayRenderer *r,
+void CountryStatusDisplay::draw(graphics::gl::OverlayRenderer *r,
                                 math::Matrix<double, 3, 3> const & m) const
 {
   if (!isVisible())
@@ -243,7 +243,7 @@ void CountryStatusDisplay::draw(yg::gl::OverlayRenderer *r,
 
   checkDirtyDrawing();
 
-  //r->drawRectangle(roughBoundRect(), yg::Color(0, 0, 255, 64), yg::maxDepth);
+  //r->drawRectangle(roughBoundRect(), graphics::Color(0, 0, 255, 64), graphics::maxDepth);
 
   if (m_downloadButton->isVisible())
     m_downloadButton->draw(r, m);
diff --git a/map/country_status_display.hpp b/map/country_status_display.hpp
index 8555bd57c3..683bd958b6 100644
--- a/map/country_status_display.hpp
+++ b/map/country_status_display.hpp
@@ -79,7 +79,7 @@ public:
   /// attach element to controller.
   void setController(gui::Controller *controller);
   /// render element
-  void draw(yg::gl::OverlayRenderer * r, math::Matrix<double, 3, 3> const & m) const;
+  void draw(graphics::gl::OverlayRenderer * r, math::Matrix<double, 3, 3> const & m) const;
   /// get bounding rects
   vector<m2::AnyRectD> const & boundRects() const;
 
diff --git a/map/coverage_generator.cpp b/map/coverage_generator.cpp
index 8f4afb48ed..1d7710ec19 100644
--- a/map/coverage_generator.cpp
+++ b/map/coverage_generator.cpp
@@ -5,8 +5,8 @@
 #include "tile_renderer.hpp"
 #include "tile_set.hpp"
 
-#include "../yg/skin.hpp"
-#include "../yg/rendercontext.hpp"
+#include "../graphics/skin.hpp"
+#include "../graphics/rendercontext.hpp"
 
 #include "../base/logging.hpp"
 
@@ -18,9 +18,9 @@ CoverageGenerator::CoverageGenerator(
     string const & skinName,
     TileRenderer * tileRenderer,
     shared_ptr<WindowHandle> const & windowHandle,
-    shared_ptr<yg::gl::RenderContext> const & primaryRC,
-    shared_ptr<yg::ResourceManager> const & rm,
-    yg::gl::PacketsQueue * glQueue,
+    shared_ptr<graphics::gl::RenderContext> const & primaryRC,
+    shared_ptr<graphics::ResourceManager> const & rm,
+    graphics::gl::PacketsQueue * glQueue,
     RenderPolicy::TCountryNameFn countryNameFn)
   : m_queue(1),
     m_tileRenderer(tileRenderer),
@@ -52,7 +52,7 @@ CoverageGenerator::CoverageGenerator(
 
 ScreenCoverage * CoverageGenerator::CreateCoverage()
 {
-  yg::gl::Screen::Params params;
+  graphics::gl::Screen::Params params;
 
   params.m_resourceManager = m_resourceManager;
   params.m_renderQueue = m_glQueue;
@@ -61,8 +61,8 @@ ScreenCoverage * CoverageGenerator::CreateCoverage()
   params.m_isSynchronized = false;
   params.m_glyphCacheID = m_resourceManager->cacheThreadGlyphCacheID();
 
-  shared_ptr<yg::gl::Screen> screen(new yg::gl::Screen(params));
-  shared_ptr<yg::Skin> skin(loadSkin(m_resourceManager, m_skinName));
+  shared_ptr<graphics::gl::Screen> screen(new graphics::gl::Screen(params));
+  shared_ptr<graphics::Skin> skin(loadSkin(m_resourceManager, m_skinName));
 
   screen->setSkin(skin);
 
@@ -310,7 +310,7 @@ void CoverageGenerator::SetSequenceID(int sequenceID)
   m_sequenceID = sequenceID;
 }
 
-shared_ptr<yg::ResourceManager> const & CoverageGenerator::resourceManager() const
+shared_ptr<graphics::ResourceManager> const & CoverageGenerator::resourceManager() const
 {
   return m_resourceManager;
 }
diff --git a/map/coverage_generator.hpp b/map/coverage_generator.hpp
index 3f8263ffb9..65d22dbc89 100644
--- a/map/coverage_generator.hpp
+++ b/map/coverage_generator.hpp
@@ -7,7 +7,7 @@
 
 #include "../geometry/screenbase.hpp"
 
-#include "../yg/overlay.hpp"
+#include "../graphics/overlay.hpp"
 
 #include "../base/thread.hpp"
 #include "../base/threaded_list.hpp"
@@ -21,7 +21,7 @@ class TileRenderer;
 class TileCache;
 class ScreenCoverage;
 
-namespace yg
+namespace graphics
 {
   class Skin;
 
@@ -45,8 +45,8 @@ private:
 
   TileRenderer * m_tileRenderer;
 
-  shared_ptr<yg::ResourceManager> m_resourceManager;
-  shared_ptr<yg::gl::RenderContext> m_renderContext;
+  shared_ptr<graphics::ResourceManager> m_resourceManager;
+  shared_ptr<graphics::gl::RenderContext> m_renderContext;
 
   ScreenCoverage * m_workCoverage;
   ScreenCoverage * m_currentCoverage;
@@ -60,7 +60,7 @@ private:
 
   RenderPolicy::TCountryNameFn m_countryNameFn;
 
-  yg::gl::PacketsQueue * m_glQueue;
+  graphics::gl::PacketsQueue * m_glQueue;
   string m_skinName;
 
   FenceManager m_fenceManager;
@@ -76,9 +76,9 @@ public:
   CoverageGenerator(string const & skinName,
                     TileRenderer * tileRenderer,
                     shared_ptr<WindowHandle> const & windowHandle,
-                    shared_ptr<yg::gl::RenderContext> const & primaryRC,
-                    shared_ptr<yg::ResourceManager> const & rm,
-                    yg::gl::PacketsQueue * glQueue,
+                    shared_ptr<graphics::gl::RenderContext> const & primaryRC,
+                    shared_ptr<graphics::ResourceManager> const & rm,
+                    graphics::gl::PacketsQueue * glQueue,
                     RenderPolicy::TCountryNameFn countryNameFn);
 
   ~CoverageGenerator();
@@ -126,7 +126,7 @@ public:
 
   threads::Mutex & Mutex();
 
-  shared_ptr<yg::ResourceManager> const & resourceManager() const;
+  shared_ptr<graphics::ResourceManager> const & resourceManager() const;
 
   void SetIsPaused(bool flag);
   void CancelCommands();
diff --git a/map/draw_processor.cpp b/map/draw_processor.cpp
index 81348adfcd..678c7fc83b 100644
--- a/map/draw_processor.cpp
+++ b/map/draw_processor.cpp
@@ -1,5 +1,5 @@
 #include "draw_processor.hpp"
-#include "drawer_yg.hpp"
+#include "drawer.hpp"
 
 #include "../platform/preferred_languages.hpp"
 
@@ -325,7 +325,7 @@ namespace fwork
         f.GetRoadNumber(),
         (m_zoom > worldZoom) ? f.GetPopulationDrawRank() : 0.0));
 
-    DrawerYG * pDrawer = GetDrawer();
+    Drawer * pDrawer = GetDrawer();
 
     using namespace get_pts;
 
diff --git a/map/draw_processor.hpp b/map/draw_processor.hpp
index 41531a460f..c2582b6b27 100644
--- a/map/draw_processor.hpp
+++ b/map/draw_processor.hpp
@@ -15,7 +15,7 @@
 #include "../std/list.hpp"
 #include "../std/limits.hpp"
 
-#include "../yg/glyph_cache.hpp"
+#include "../graphics/glyph_cache.hpp"
 
 class ScreenBase;
 
@@ -328,13 +328,13 @@ namespace fwork
     bool m_hasNonCoast;
     bool m_hasAnyFeature;
 
-    yg::GlyphCache * m_glyphCache;
+    graphics::GlyphCache * m_glyphCache;
 
 #ifdef PROFILER_DRAWING
     size_t m_drawCount;
 #endif
 
-    inline DrawerYG * GetDrawer() const { return m_paintEvent->drawer(); }
+    inline Drawer * GetDrawer() const { return m_paintEvent->drawer(); }
 
     void PreProcessKeys(vector<drule::Key> & keys) const;
 
diff --git a/map/drawer_yg.cpp b/map/drawer.cpp
index adaa7dc603..0a0ff77f97 100644
--- a/map/drawer_yg.cpp
+++ b/map/drawer.cpp
@@ -1,15 +1,15 @@
-#include "drawer_yg.hpp"
-#include "proto_to_yg_styles.hpp"
+#include "drawer.hpp"
+#include "proto_to_styles.hpp"
 
 #include "../std/bind.hpp"
 
 #include "../indexer/drawing_rules.hpp"
 #include "../indexer/scales.hpp"
 
-#include "../yg/defines.hpp"
-#include "../yg/screen.hpp"
-#include "../yg/skin.hpp"
-#include "../yg/resource_manager.hpp"
+#include "../graphics/defines.hpp"
+#include "../graphics/screen.hpp"
+#include "../graphics/skin.hpp"
+#include "../graphics/resource_manager.hpp"
 
 #include "../geometry/screenbase.hpp"
 
@@ -17,7 +17,7 @@
 #include "../base/buffer_vector.hpp"
 
 
-DrawerYG::Params::Params()
+Drawer::Params::Params()
   : m_threadID(0),
     m_visualScale(1)
 {
@@ -51,16 +51,16 @@ void di::DrawRule::SetID(size_t threadID, uint32_t id) const
   m_transparent ? m_rule->SetID2(threadID, id) : m_rule->SetID(threadID, id);
 }
 
-DrawerYG::DrawerYG(Params const & params)
+Drawer::Drawer(Params const & params)
   : m_visualScale(params.m_visualScale), m_threadID(params.m_threadID)
 {
-  m_pScreen = shared_ptr<yg::gl::Screen>(new yg::gl::Screen(params));
+  m_pScreen = shared_ptr<graphics::gl::Screen>(new graphics::gl::Screen(params));
 
   m_pSkin = params.m_skin;
   m_pScreen->setSkin(m_pSkin);
 
   if (m_pSkin)
-    m_pSkin->addClearPageFn(bind(&DrawerYG::ClearSkinPage, m_threadID, _1), 0);
+    m_pSkin->addClearPageFn(bind(&Drawer::ClearSkinPage, m_threadID, _1), 0);
 }
 
 namespace
@@ -84,53 +84,53 @@ namespace
   };
 }
 
-void DrawerYG::ClearSkinPage(size_t threadID, uint8_t pipelineID)
+void Drawer::ClearSkinPage(size_t threadID, uint8_t pipelineID)
 {
   drule::rules().ForEachRule(DoMakeInvalidRule(threadID, pipelineID));
 }
 
-void DrawerYG::beginFrame()
+void Drawer::beginFrame()
 {
   m_pScreen->beginFrame();
 }
 
-void DrawerYG::endFrame()
+void Drawer::endFrame()
 {
   m_pScreen->endFrame();
 }
 
-void DrawerYG::clear(yg::Color const & c, bool clearRT, float depth, bool clearDepth)
+void Drawer::clear(graphics::Color const & c, bool clearRT, float depth, bool clearDepth)
 {
   m_pScreen->clear(c, clearRT, depth, clearDepth);
 }
 
-void DrawerYG::onSize(int w, int h)
+void Drawer::onSize(int w, int h)
 {
   m_pScreen->onSize(w, h);
 }
 
-void DrawerYG::drawSymbol(m2::PointD const & pt, string const & symbolName,
-                          yg::EPosition pos, int depth)
+void Drawer::drawSymbol(m2::PointD const & pt, string const & symbolName,
+                          graphics::EPosition pos, int depth)
 {
   m_pScreen->drawSymbol(pt, symbolName, pos, depth);
 }
 
-void DrawerYG::drawCircle(m2::PointD const & pt, rule_ptr_t pRule,
-                          yg::EPosition pos, int depth, FeatureID const & id)
+void Drawer::drawCircle(m2::PointD const & pt, rule_ptr_t pRule,
+                          graphics::EPosition pos, int depth, FeatureID const & id)
 {
-  yg::CircleInfo ci;
+  graphics::CircleInfo ci;
   ConvertStyle(pRule->GetCircle(), m_visualScale, ci);
 
   m_pScreen->drawCircle(pt, ci, pos, depth);
 }
 
-void DrawerYG::drawSymbol(m2::PointD const & pt, rule_ptr_t pRule,
-                          yg::EPosition pos, int depth, FeatureID const & id)
+void Drawer::drawSymbol(m2::PointD const & pt, rule_ptr_t pRule,
+                          graphics::EPosition pos, int depth, FeatureID const & id)
 {
   string name;
   ConvertStyle(pRule->GetSymbol(), name);
 
-  yg::SymbolElement::Params params;
+  graphics::SymbolElement::Params params;
   params.m_depth = depth;
   params.m_position = pos;
   params.m_pivot = pt;
@@ -141,7 +141,7 @@ void DrawerYG::drawSymbol(m2::PointD const & pt, rule_ptr_t pRule,
   m_pScreen->drawSymbol(params);
 }
 
-void DrawerYG::drawPath(di::PathInfo const & info, di::DrawRule const * rules, size_t count)
+void Drawer::drawPath(di::PathInfo const & info, di::DrawRule const * rules, size_t count)
 {
   // if any rule needs caching - cache as a whole vector
   bool flag = false;
@@ -154,12 +154,12 @@ void DrawerYG::drawPath(di::PathInfo const & info, di::DrawRule const * rules, s
     }
   }
 
-  buffer_vector<yg::PenInfo, 8> penInfos(count);
+  buffer_vector<graphics::PenInfo, 8> penInfos(count);
   buffer_vector<uint32_t, 8> styleIDs(count);
 
   if (flag)
   {
-    // collect yg::PenInfo into array and pack them as a whole
+    // collect graphics::PenInfo into array and pack them as a whole
     for (size_t i = 0; i < count; ++i)
     {
       ConvertStyle(rules[i].m_rule->GetLine(), m_visualScale, penInfos[i]);
@@ -188,12 +188,12 @@ void DrawerYG::drawPath(di::PathInfo const & info, di::DrawRule const * rules, s
     m_pScreen->drawPath(&info.m_path[0], info.m_path.size(), -info.GetOffset(), rules[i].GetID(m_threadID), rules[i].m_depth);
 }
 
-void DrawerYG::drawArea(vector<m2::PointD> const & pts, rule_ptr_t pRule, int depth)
+void Drawer::drawArea(vector<m2::PointD> const & pts, rule_ptr_t pRule, int depth)
 {
   // DO NOT cache 'id' in pRule, because one rule can use in drawPath and drawArea.
   // Leave CBaseRule::m_id for drawPath. mapColor working fast enough.
 
-  yg::Color color;
+  graphics::Color color;
   ConvertStyle(pRule->GetArea(), color);
   uint32_t const id = m_pSkin->mapColor(color);
   ASSERT ( id != -1, () );
@@ -201,12 +201,12 @@ void DrawerYG::drawArea(vector<m2::PointD> const & pts, rule_ptr_t pRule, int de
   m_pScreen->drawTrianglesList(&pts[0], pts.size()/*, res*/, id, depth);
 }
 
-uint8_t DrawerYG::get_text_font_size(rule_ptr_t pRule) const
+uint8_t Drawer::get_text_font_size(rule_ptr_t pRule) const
 {
   return GetFontSize(pRule->GetCaption(0)) * m_visualScale;
 }
 
-bool DrawerYG::filter_text_size(rule_ptr_t pRule) const
+bool Drawer::filter_text_size(rule_ptr_t pRule) const
 {
   if (pRule->GetCaption(0))
     return (GetFontSize(pRule->GetCaption(0)) < 3);
@@ -217,14 +217,14 @@ bool DrawerYG::filter_text_size(rule_ptr_t pRule) const
   }
 }
 
-void DrawerYG::drawText(m2::PointD const & pt, di::DrawInfo const * pInfo, rule_ptr_t pRule,
-                        yg::EPosition pos, int depth, FeatureID const & id)
+void Drawer::drawText(m2::PointD const & pt, di::DrawInfo const * pInfo, rule_ptr_t pRule,
+                        graphics::EPosition pos, int depth, FeatureID const & id)
 {
-  yg::FontDesc font;
+  graphics::FontDesc font;
   ConvertStyle(pRule->GetCaption(0), m_visualScale, font);
   font.SetRank(pInfo->m_rank);
 
-  yg::FontDesc smallFont;
+  graphics::FontDesc smallFont;
   if (pRule->GetCaption(1))
   {
     ConvertStyle(pRule->GetCaption(1), m_visualScale, smallFont);
@@ -236,9 +236,9 @@ void DrawerYG::drawText(m2::PointD const & pt, di::DrawInfo const * pInfo, rule_
                         depth, true, true);
 }
 
-bool DrawerYG::drawPathText(di::PathInfo const & info, di::DrawInfo const * pInfo, rule_ptr_t pRule, int depth)
+bool Drawer::drawPathText(di::PathInfo const & info, di::DrawInfo const * pInfo, rule_ptr_t pRule, int depth)
 {
-  yg::FontDesc font;
+  graphics::FontDesc font;
   ConvertStyle(pRule->GetCaption(0), m_visualScale, font);
 
   return m_pScreen->drawPathText(font,
@@ -247,11 +247,11 @@ bool DrawerYG::drawPathText(di::PathInfo const & info, di::DrawInfo const * pInf
                                  pInfo->GetPathName(),
                                  info.GetFullLength(),
                                  info.GetOffset(),
-                                 yg::EPosCenter,
+                                 graphics::EPosCenter,
                                  depth);
 }
 
-void DrawerYG::drawPathNumber(di::PathInfo const & path, di::DrawInfo const * pInfo)
+void Drawer::drawPathNumber(di::PathInfo const & path, di::DrawInfo const * pInfo)
 {
   int const textHeight = static_cast<int>(12 * m_visualScale);
   m2::PointD pt;
@@ -264,34 +264,34 @@ void DrawerYG::drawPathNumber(di::PathInfo const & path, di::DrawInfo const * pI
     {
       if (path.GetSmPoint(double(j) / double(count), pt))
       {
-        yg::FontDesc fontDesc(
+        graphics::FontDesc fontDesc(
           textHeight,
-          yg::Color(150, 75, 0, 255),   // brown
+          graphics::Color(150, 75, 0, 255),   // brown
           true,
-          yg::Color(255, 255, 255, 255));
+          graphics::Color(255, 255, 255, 255));
 
-        m_pScreen->drawText(fontDesc, pt, yg::EPosCenter, pInfo->m_road, yg::maxDepth, true);
+        m_pScreen->drawText(fontDesc, pt, graphics::EPosCenter, pInfo->m_road, graphics::maxDepth, true);
       }
     }
   }
 }
 
-shared_ptr<yg::gl::Screen> DrawerYG::screen() const
+shared_ptr<graphics::gl::Screen> Drawer::screen() const
 {
   return m_pScreen;
 }
 
-double DrawerYG::VisualScale() const
+double Drawer::VisualScale() const
 {
   return m_visualScale;
 }
 
-void DrawerYG::SetScale(int level)
+void Drawer::SetScale(int level)
 {
   m_level = level;
 }
 
-void DrawerYG::Draw(di::DrawInfo const * pInfo, di::DrawRule const * rules, size_t count,
+void Drawer::Draw(di::DrawInfo const * pInfo, di::DrawRule const * rules, size_t count,
                     FeatureID const & id)
 {
   buffer_vector<di::DrawRule, 8> pathRules;
@@ -343,7 +343,7 @@ void DrawerYG::Draw(di::DrawInfo const * pInfo, di::DrawRule const * rules, size
           if (isFill)
             drawArea(i->m_path, pRule, depth);
           else if (hasSym)
-            drawSymbol(i->GetCenter() + m2::PointD(0.0, sm), pRule, yg::EPosUnder, depth, id);
+            drawSymbol(i->GetCenter() + m2::PointD(0.0, sm), pRule, graphics::EPosUnder, depth, id);
         }
       }
 
@@ -351,9 +351,9 @@ void DrawerYG::Draw(di::DrawInfo const * pInfo, di::DrawRule const * rules, size
       if (!isPath && !isArea && ((pRule->GetType() & drule::node) != 0))
       {
         if (hasSymbol)
-          drawSymbol(pInfo->m_point + m2::PointD(0.0, sm), pRule, yg::EPosUnder, depth, id);
+          drawSymbol(pInfo->m_point + m2::PointD(0.0, sm), pRule, graphics::EPosUnder, depth, id);
         else if (isCircle)
-          drawCircle(pInfo->m_point + m2::PointD(0.0, sm), pRule, yg::EPosUnder, depth, id);
+          drawCircle(pInfo->m_point + m2::PointD(0.0, sm), pRule, graphics::EPosUnder, depth, id);
       }
     }
     else
@@ -366,7 +366,7 @@ void DrawerYG::Draw(di::DrawInfo const * pInfo, di::DrawRule const * rules, size
         if (isArea/* && isN*/)
         {
           for (list<di::AreaInfo>::const_iterator i = pInfo->m_areas.begin(); i != pInfo->m_areas.end(); ++i)
-            drawText(i->GetCenter(), pInfo, pRule, yg::EPosAbove, depth, id);
+            drawText(i->GetCenter(), pInfo, pRule, graphics::EPosAbove, depth, id);
         }
 
         // draw way name
@@ -379,7 +379,7 @@ void DrawerYG::Draw(di::DrawInfo const * pInfo, di::DrawRule const * rules, size
         // draw point text
         isN = ((pRule->GetType() & drule::node) != 0);
         if (!isPath && !isArea && isN)
-          drawText(pInfo->m_point, pInfo, pRule, yg::EPosAbove, depth, id);
+          drawText(pInfo->m_point, pInfo, pRule, graphics::EPosAbove, depth, id);
       }
     }
   }
diff --git a/map/drawer_yg.hpp b/map/drawer.hpp
index a4d9b36358..729e26aa94 100644
--- a/map/drawer_yg.hpp
+++ b/map/drawer.hpp
@@ -2,8 +2,8 @@
 
 #include "draw_info.hpp"
 
-#include "../yg/color.hpp"
-#include "../yg/screen.hpp"
+#include "../graphics/color.hpp"
+#include "../graphics/screen.hpp"
 
 #include "../std/list.hpp"
 #include "../std/string.hpp"
@@ -14,7 +14,7 @@
 class ScreenBase;
 namespace drule { class BaseRule; }
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
@@ -65,7 +65,7 @@ namespace di
   };
 }
 
-class DrawerYG
+class Drawer
 {
   typedef di::DrawRule::rule_ptr_t rule_ptr_t;
 
@@ -73,8 +73,8 @@ class DrawerYG
   int m_level;
   size_t m_threadID;
 
-  shared_ptr<yg::gl::Screen> m_pScreen;
-  shared_ptr<yg::Skin> m_pSkin;
+  shared_ptr<graphics::gl::Screen> m_pScreen;
+  shared_ptr<graphics::Skin> m_pSkin;
 
   static void ClearSkinPage(size_t threadID, uint8_t pipelineID);
 
@@ -82,41 +82,41 @@ class DrawerYG
 
 protected:
   void drawSymbol(m2::PointD const & pt, rule_ptr_t pRule,
-                  yg::EPosition pos, int depth, FeatureID const & id);
+                  graphics::EPosition pos, int depth, FeatureID const & id);
   void drawCircle(m2::PointD const & pt, rule_ptr_t pRule,
-                  yg::EPosition pos, int depth, FeatureID const & id);
+                  graphics::EPosition pos, int depth, FeatureID const & id);
   void drawPath(di::PathInfo const & info, di::DrawRule const * rules, size_t count);
   void drawArea(vector<m2::PointD> const & pts, rule_ptr_t pRule, int depth);
 
   void drawText(m2::PointD const & pt, di::DrawInfo const * pInfo, rule_ptr_t pRule,
-                yg::EPosition pos, int depth, FeatureID const & id);
+                graphics::EPosition pos, int depth, FeatureID const & id);
   bool drawPathText(di::PathInfo const & info, di::DrawInfo const * pInfo, rule_ptr_t pRule, int depth);
   void drawPathNumber(di::PathInfo const & path, di::DrawInfo const * pInfo);
 
-  typedef shared_ptr<yg::gl::BaseTexture> texture_t;
-  typedef shared_ptr<yg::gl::FrameBuffer> frame_buffer_t;
+  typedef shared_ptr<graphics::gl::BaseTexture> texture_t;
+  typedef shared_ptr<graphics::gl::FrameBuffer> frame_buffer_t;
 
 public:
-  struct Params : yg::gl::Screen::Params
+  struct Params : graphics::gl::Screen::Params
   {
     size_t m_threadID;
     double m_visualScale;
-    shared_ptr<yg::Skin> m_skin;
+    shared_ptr<graphics::Skin> m_skin;
     Params();
   };
 
-  DrawerYG(Params const & params = Params());
+  Drawer(Params const & params = Params());
 
-  void drawSymbol(m2::PointD const & pt, string const & symbolName, yg::EPosition pos, int depth);
+  void drawSymbol(m2::PointD const & pt, string const & symbolName, graphics::EPosition pos, int depth);
 
   void beginFrame();
   void endFrame();
 
-  void clear(yg::Color const & c = yg::Color(187, 187, 187, 255), bool clearRT = true, float depth = 1.0f, bool clearDepth = true);
+  void clear(graphics::Color const & c = graphics::Color(187, 187, 187, 255), bool clearRT = true, float depth = 1.0f, bool clearDepth = true);
 
   void onSize(int w, int h);
 
-  shared_ptr<yg::gl::Screen> screen() const;
+  shared_ptr<graphics::gl::Screen> screen() const;
 
   double VisualScale() const;
   void SetScale(int level);
diff --git a/map/events.cpp b/map/events.cpp
index 990506ee39..a9276962f8 100644
--- a/map/events.cpp
+++ b/map/events.cpp
@@ -1,6 +1,6 @@
 #include "events.hpp"
 
-PaintEvent::PaintEvent(DrawerYG * drawer,
+PaintEvent::PaintEvent(Drawer * drawer,
                        core::CommandsQueue::Environment const * env)
     : m_drawer(drawer),
       m_env(env),
@@ -8,7 +8,7 @@ PaintEvent::PaintEvent(DrawerYG * drawer,
       m_isEmptyDrawing(true)
 {}
 
-DrawerYG * PaintEvent::drawer() const
+Drawer * PaintEvent::drawer() const
 {
   return m_drawer;
 }
diff --git a/map/events.hpp b/map/events.hpp
index da5a0237cc..9edf67657e 100644
--- a/map/events.hpp
+++ b/map/events.hpp
@@ -48,20 +48,20 @@ public:
   inline double ScaleFactor() const { return m_factor; }
 };
 
-class DrawerYG;
+class Drawer;
 
 class PaintEvent
 {
 
-  DrawerYG * m_drawer;
+  Drawer * m_drawer;
   core::CommandsQueue::Environment const * m_env;
   bool m_isCancelled;
   bool m_isEmptyDrawing;
 
 public:
 
-  PaintEvent(DrawerYG * drawer, core::CommandsQueue::Environment const * env = 0);
-  DrawerYG * drawer() const;
+  PaintEvent(Drawer * drawer, core::CommandsQueue::Environment const * env = 0);
+  Drawer * drawer() const;
   void cancel();
   bool isCancelled() const;
   bool isEmptyDrawing() const;
diff --git a/map/framework.cpp b/map/framework.cpp
index a0ab414f4f..d4fd203f2c 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -1,6 +1,6 @@
 #include "framework.hpp"
 #include "draw_processor.hpp"
-#include "drawer_yg.hpp"
+#include "drawer.hpp"
 #include "benchmark_provider.hpp"
 #include "benchmark_engine.hpp"
 #include "geourl_process.hpp"
@@ -26,7 +26,7 @@
 
 #include "../coding/internal/file_data.hpp"
 
-#include "../yg/rendercontext.hpp"
+#include "../graphics/rendercontext.hpp"
 
 #include "../geometry/angles.hpp"
 #include "../geometry/distance_on_sphere.hpp"
@@ -704,8 +704,8 @@ void Framework::DrawAdditionalInfo(shared_ptr<PaintEvent> const & e)
   // m_informationDisplay is set and drawn after the m_renderPolicy
   ASSERT ( m_renderPolicy, () );
 
-  DrawerYG * pDrawer = e->drawer();
-  yg::gl::Screen * pScreen = pDrawer->screen().get();
+  Drawer * pDrawer = e->drawer();
+  graphics::gl::Screen * pScreen = pDrawer->screen().get();
 
   pScreen->beginFrame();
 
@@ -1271,7 +1271,7 @@ void Framework::SetRenderPolicy(RenderPolicy * renderPolicy)
     m_navigator.SetMinScreenParams(static_cast<unsigned>(m_minRulerWidth * renderPolicy->VisualScale()),
                                    m_metresMinWidth);
 
-    yg::gl::RenderContext::initParams();
+    graphics::gl::RenderContext::initParams();
   }
 
   m_guiController->ResetRenderParams();
@@ -1419,13 +1419,13 @@ void Framework::SaveFacebookDialogResult(int result)
   }
 }
 
-shared_ptr<yg::OverlayElement> const GetClosestToPivot(list<shared_ptr<yg::OverlayElement> > const & l,
+shared_ptr<graphics::OverlayElement> const GetClosestToPivot(list<shared_ptr<graphics::OverlayElement> > const & l,
                                                        m2::PointD const & pxPoint)
 {
   double dist = numeric_limits<double>::max();
-  shared_ptr<yg::OverlayElement> res;
+  shared_ptr<graphics::OverlayElement> res;
 
-  for (list<shared_ptr<yg::OverlayElement> >::const_iterator it = l.begin();
+  for (list<shared_ptr<graphics::OverlayElement> >::const_iterator it = l.begin();
        it != l.end();
        ++it)
   {
@@ -1445,7 +1445,7 @@ bool Framework::GetVisiblePOI(m2::PointD const & pxPoint, m2::PointD & pxPivot,
   m2::PointD const pt = m_navigator.ShiftPoint(pxPoint);
   double const halfSize = TOUCH_PIXEL_RADIUS * GetVisualScale();
 
-  typedef yg::OverlayElement ElementT;
+  typedef graphics::OverlayElement ElementT;
 
   list<shared_ptr<ElementT> > candidates;
   m2::RectD rect(pt.x - halfSize, pt.y - halfSize,
diff --git a/map/framework.hpp b/map/framework.hpp
index 6138a0eb7c..10cf27ca16 100644
--- a/map/framework.hpp
+++ b/map/framework.hpp
@@ -18,9 +18,9 @@
 
 #include "../platform/location.hpp"
 
-#include "../yg/defines.hpp"
-#include "../yg/screen.hpp"
-#include "../yg/color.hpp"
+#include "../graphics/defines.hpp"
+#include "../graphics/screen.hpp"
+#include "../graphics/color.hpp"
 
 #include "../geometry/rect2d.hpp"
 #include "../geometry/screenbase.hpp"
diff --git a/map/information_display.cpp b/map/information_display.cpp
index 5b1ec1751f..04224f3ce2 100644
--- a/map/information_display.cpp
+++ b/map/information_display.cpp
@@ -1,5 +1,5 @@
 #include "information_display.hpp"
-#include "drawer_yg.hpp"
+#include "drawer.hpp"
 #include "country_status_display.hpp"
 #include "compass_arrow.hpp"
 #include "framework.hpp"
@@ -9,10 +9,10 @@
 #include "../gui/controller.hpp"
 #include "../gui/button.hpp"
 
-#include "../yg/defines.hpp"
-#include "../yg/skin.hpp"
-#include "../yg/pen_info.hpp"
-#include "../yg/straight_text_element.hpp"
+#include "../graphics/defines.hpp"
+#include "../graphics/skin.hpp"
+#include "../graphics/pen_info.hpp"
+#include "../graphics/straight_text_element.hpp"
 
 #include "../base/string_utils.hpp"
 #include "../base/logging.hpp"
@@ -38,23 +38,23 @@ InformationDisplay::InformationDisplay(Framework * framework)
     m_bottomShift(0),
     m_visualScale(1)
 {
-  m_fontDesc.m_color = yg::Color(0x44, 0x44, 0x44, 0xFF);
+  m_fontDesc.m_color = graphics::Color(0x44, 0x44, 0x44, 0xFF);
 
-  m_ruler.setDepth(yg::maxDepth);
+  m_ruler.setDepth(graphics::maxDepth);
 
   CountryStatusDisplay::Params p;
 
   p.m_pivot = m2::PointD(0, 0);
-  p.m_position = yg::EPosCenter;
-  p.m_depth = yg::maxDepth;
+  p.m_position = graphics::EPosCenter;
+  p.m_depth = graphics::maxDepth;
   p.m_storage = &framework->Storage();
 
   m_countryStatusDisplay.reset(new CountryStatusDisplay(p));
 
   CompassArrow::Params cap;
 
-  cap.m_position = yg::EPosCenter;
-  cap.m_depth = yg::maxDepth;
+  cap.m_position = graphics::EPosCenter;
+  cap.m_depth = graphics::maxDepth;
   cap.m_arrowHeight = 50;
   cap.m_arrowWidth = 16;
   cap.m_pivot = m2::PointD(0, 0);
@@ -64,12 +64,12 @@ InformationDisplay::InformationDisplay(Framework * framework)
 
   location::State::Params lsp;
 
-  lsp.m_position = yg::EPosCenter;
-  lsp.m_depth = yg::maxDepth;
+  lsp.m_position = graphics::EPosCenter;
+  lsp.m_depth = graphics::maxDepth;
   lsp.m_pivot = m2::PointD(0, 0);
-  lsp.m_compassAreaColor = yg::Color(255, 255, 255, 192);
-  lsp.m_compassBorderColor = yg::Color(255, 255, 255, 96);
-  lsp.m_locationAreaColor =   yg::Color(11, 97, 210, 48);
+  lsp.m_compassAreaColor = graphics::Color(255, 255, 255, 192);
+  lsp.m_compassBorderColor = graphics::Color(255, 255, 255, 96);
+  lsp.m_locationAreaColor =   graphics::Color(11, 97, 210, 48);
   lsp.m_framework = framework;
 
   m_locationState.reset(new location::State(lsp));
@@ -136,13 +136,13 @@ void InformationDisplay::setDebugPoint(int pos, m2::PointD const & pt)
   m_DebugPts[pos] = pt;
 }
 
-void InformationDisplay::drawDebugPoints(DrawerYG * pDrawer)
+void InformationDisplay::drawDebugPoints(Drawer * pDrawer)
 {
   for (int i = 0; i < sizeof(m_DebugPts) / sizeof(m2::PointD); ++i)
     if (m_DebugPts[i] != m2::PointD(0, 0))
     {
-    pDrawer->screen()->drawArc(m_DebugPts[i], 0, math::pi * 2, 30, yg::Color(0, 0, 255, 32), yg::maxDepth);
-    pDrawer->screen()->fillSector(m_DebugPts[i], 0, math::pi * 2, 30, yg::Color(0, 0, 255, 32), yg::maxDepth);
+    pDrawer->screen()->drawArc(m_DebugPts[i], 0, math::pi * 2, 30, graphics::Color(0, 0, 255, 32), graphics::maxDepth);
+    pDrawer->screen()->fillSector(m_DebugPts[i], 0, math::pi * 2, 30, graphics::Color(0, 0, 255, 32), graphics::maxDepth);
   }
 }
 
@@ -158,16 +158,16 @@ void InformationDisplay::setRulerParams(unsigned pxMinWidth, double metresMinWid
   m_ruler.setMaxMetersWidth(metresMaxWidth);
 }
 
-void InformationDisplay::drawRuler(DrawerYG * pDrawer)
+void InformationDisplay::drawRuler(Drawer * pDrawer)
 {
-  yg::FontDesc rulerFont = m_fontDesc;
+  graphics::FontDesc rulerFont = m_fontDesc;
 
   m_ruler.setFontDesc(rulerFont);
   m_ruler.setVisualScale(m_visualScale);
 
   m2::PointD pivot(m2::PointD(m_displayRect.maxX() - 5 * m_visualScale,
                               m_displayRect.maxY() - 4 * m_visualScale));
-  m_ruler.setPosition(yg::EPosAboveLeft);
+  m_ruler.setPosition(graphics::EPosAboveLeft);
   m_ruler.setPivot(pivot);
   m_ruler.update();
 
@@ -191,7 +191,7 @@ void InformationDisplay::setCenter(m2::PointD const & pt)
   m_centerPtLonLat = pt;
 }
 
-void InformationDisplay::drawCenter(DrawerYG * drawer)
+void InformationDisplay::drawCenter(Drawer * drawer)
 {
   ostringstream out;
 
@@ -202,27 +202,27 @@ void InformationDisplay::drawCenter(DrawerYG * drawer)
       << m_centerPtLonLat.x
          ;
 
-  yg::StraightTextElement::Params params;
+  graphics::StraightTextElement::Params params;
 
-  params.m_depth = yg::maxDepth;
+  params.m_depth = graphics::maxDepth;
   params.m_fontDesc = m_fontDesc;
   params.m_log2vis = false;
 
   params.m_pivot = m2::PointD(m_displayRect.maxX() - 4 * m_visualScale,
                               m_displayRect.maxY() - 30 * m_visualScale);
-  params.m_position = yg::EPosUnderLeft;
+  params.m_position = graphics::EPosUnderLeft;
 
   params.m_glyphCache = drawer->screen()->glyphCache();
   params.m_logText = strings::MakeUniString(out.str());
 
-  yg::StraightTextElement ste(params);
+  graphics::StraightTextElement ste(params);
 
 //  m2::RectD bgRect = m2::Inflate(ste.roughBoundRect(), 5.0, 5.0);
 
 //  drawer->screen()->drawRectangle(
 //        bgRect,
-//        yg::Color(187, 187, 187, 128),
-//        yg::maxDepth - 1);
+//        graphics::Color(187, 187, 187, 128),
+//        graphics::maxDepth - 1);
 
   ste.draw(drawer->screen().get(), math::Identity<double, 3>());
 }
@@ -238,7 +238,7 @@ void InformationDisplay::setDebugInfo(double frameDuration, int currentScale)
   m_currentScale = currentScale;
 }
 
-void InformationDisplay::drawDebugInfo(DrawerYG * drawer)
+void InformationDisplay::drawDebugInfo(Drawer * drawer)
 {
   ostringstream out;
   out << "Scale : " << m_currentScale;
@@ -255,9 +255,9 @@ void InformationDisplay::drawDebugInfo(DrawerYG * drawer)
 
   drawer->screen()->drawText(m_fontDesc,
                              pos,
-                             yg::EPosAboveRight,
+                             graphics::EPosAboveRight,
                              out.str(),
-                             yg::maxDepth,
+                             graphics::maxDepth,
                              false);
 }
 
@@ -272,7 +272,7 @@ void InformationDisplay::memoryWarning()
   m_lastMemoryWarning = my::Timer();
 }
 
-void InformationDisplay::drawMemoryWarning(DrawerYG * drawer)
+void InformationDisplay::drawMemoryWarning(Drawer * drawer)
 {
   m_yOffset += 20;
   m2::PointD pos(m_displayRect.minX() + 10, m_displayRect.minY() + m_yOffset);
@@ -282,18 +282,18 @@ void InformationDisplay::drawMemoryWarning(DrawerYG * drawer)
 
   drawer->screen()->drawText(m_fontDesc,
                              pos,
-                             yg::EPosAboveRight,
+                             graphics::EPosAboveRight,
                              out.str(),
-                             yg::maxDepth,
+                             graphics::maxDepth,
                              false);
 
   if (m_lastMemoryWarning.ElapsedSeconds() > 5)
     enableMemoryWarning(false);
 }
 
-void InformationDisplay::drawPlacemark(DrawerYG * pDrawer, string const & symbol, m2::PointD const & pt)
+void InformationDisplay::drawPlacemark(Drawer * pDrawer, string const & symbol, m2::PointD const & pt)
 {
-  pDrawer->drawSymbol(pt, symbol, yg::EPosAbove, yg::maxDepth);
+  pDrawer->drawSymbol(pt, symbol, graphics::EPosAbove, graphics::maxDepth);
 }
 
 /*
@@ -346,7 +346,7 @@ void InformationDisplay::enableLog(bool doEnable, WindowHandle * windowHandle)
   }
 }
 
-void InformationDisplay::drawLog(DrawerYG * drawer)
+void InformationDisplay::drawLog(Drawer * drawer)
 {
   threads::MutexGuard guard(s_logMutex);
 
@@ -356,21 +356,21 @@ void InformationDisplay::drawLog(DrawerYG * drawer)
 
     m2::PointD startPt(m_displayRect.minX() + 10, m_displayRect.minY() + m_yOffset);
 
-    yg::StraightTextElement::Params params;
-    params.m_depth = yg::maxDepth;
+    graphics::StraightTextElement::Params params;
+    params.m_depth = graphics::maxDepth;
     params.m_fontDesc = m_fontDesc;
     params.m_log2vis = false;
     params.m_pivot = startPt;
-    params.m_position = yg::EPosAboveRight;
+    params.m_position = graphics::EPosAboveRight;
     params.m_glyphCache = drawer->screen()->glyphCache();
     params.m_logText = strings::MakeUniString(*it);
 
-    yg::StraightTextElement ste(params);
+    graphics::StraightTextElement ste(params);
 
     drawer->screen()->drawRectangle(
         m2::Inflate(ste.roughBoundRect(), m2::PointD(2, 2)),
-        yg::Color(0, 0, 0, 128),
-        yg::maxDepth - 1
+        graphics::Color(0, 0, 0, 128),
+        graphics::maxDepth - 1
         );
 
     ste.draw(drawer->screen().get(), math::Identity<double, 3>());
@@ -432,15 +432,15 @@ bool InformationDisplay::addBenchmarkInfo(string const & name, m2::RectD const &
   return true;
 }
 
-void InformationDisplay::drawBenchmarkInfo(DrawerYG * pDrawer)
+void InformationDisplay::drawBenchmarkInfo(Drawer * pDrawer)
 {
   m_yOffset += 20;
   m2::PointD pos(m_displayRect.minX() + 10, m_displayRect.minY() + m_yOffset);
   pDrawer->screen()->drawText(m_fontDesc,
                               pos,
-                              yg::EPosAboveRight,
+                              graphics::EPosAboveRight,
                               "benchmark info :",
-                              yg::maxDepth,
+                              graphics::maxDepth,
                               false);
 
   for (unsigned i = max(0, (int)m_benchmarkInfo.size() - 5); i < m_benchmarkInfo.size(); ++i)
@@ -457,9 +457,9 @@ void InformationDisplay::drawBenchmarkInfo(DrawerYG * pDrawer)
     pos.y += 20;
     pDrawer->screen()->drawText(m_fontDesc,
                                 pos,
-                                yg::EPosAboveRight,
+                                graphics::EPosAboveRight,
                                 out.str(),
-                                yg::maxDepth,
+                                graphics::maxDepth,
                                 false
                                 );
   }
@@ -471,7 +471,7 @@ void InformationDisplay::setupRuler()
   m_ruler.setup();
 }
 
-void InformationDisplay::doDraw(DrawerYG *drawer)
+void InformationDisplay::doDraw(Drawer *drawer)
 {
   m_yOffset = 0;
   if (m_isDebugPointsEnabled)
diff --git a/map/information_display.hpp b/map/information_display.hpp
index 665c7af4ed..906cd9515f 100644
--- a/map/information_display.hpp
+++ b/map/information_display.hpp
@@ -14,7 +14,7 @@ namespace location
   class State;
 }
 
-class DrawerYG;
+class Drawer;
 
 namespace gui
 {
@@ -32,7 +32,7 @@ class InformationDisplay
 {
 private:
 
-  yg::FontDesc m_fontDesc;
+  graphics::FontDesc m_fontDesc;
 
   ScreenBase m_screen;
   m2::RectI m_displayRect;
@@ -97,36 +97,36 @@ public:
 
   void enableDebugPoints(bool doEnable);
   void setDebugPoint(int pos, m2::PointD const & pt);
-  void drawDebugPoints(DrawerYG * pDrawer);
+  void drawDebugPoints(Drawer * pDrawer);
 
   void enableRuler(bool doEnable);
-  void drawRuler(DrawerYG * pDrawer);
+  void drawRuler(Drawer * pDrawer);
   void setRulerParams(unsigned pxMinWidth, double metresMinWidth, double metresMaxWidth);
   void setupRuler();
 
   void enableCenter(bool doEnable);
   void setCenter(m2::PointD const & latLongPt);
-  void drawCenter(DrawerYG * pDrawer);
+  void drawCenter(Drawer * pDrawer);
 
   void enableDebugInfo(bool doEnable);
   void setDebugInfo(double frameDuration, int currentScale);
-  void drawDebugInfo(DrawerYG * pDrawer);
+  void drawDebugInfo(Drawer * pDrawer);
 
   void enableMemoryWarning(bool doEnable);
   void memoryWarning();
-  void drawMemoryWarning(DrawerYG * pDrawer);
+  void drawMemoryWarning(Drawer * pDrawer);
 
-  void drawPlacemark(DrawerYG * pDrawer, string const & symbol, m2::PointD const & pt);
+  void drawPlacemark(Drawer * pDrawer, string const & symbol, m2::PointD const & pt);
 
   void enableBenchmarkInfo(bool doEnable);
   bool addBenchmarkInfo(string const & name, m2::RectD const & globalRect, double frameDuration);
-  void drawBenchmarkInfo(DrawerYG * pDrawer);
+  void drawBenchmarkInfo(Drawer * pDrawer);
 
-  void doDraw(DrawerYG * drawer);
+  void doDraw(Drawer * drawer);
 
   void enableLog(bool doEnable, WindowHandle * windowHandle);
   void setLogSize(size_t logSize);
-  void drawLog(DrawerYG * pDrawer);
+  void drawLog(Drawer * pDrawer);
 
   void enableCompassArrow(bool doEnable);
   void setCompassArrowAngle(double angle);
diff --git a/map/location_state.cpp b/map/location_state.cpp
index 98d544e338..7777c10e34 100644
--- a/map/location_state.cpp
+++ b/map/location_state.cpp
@@ -5,8 +5,8 @@
 #include "change_viewport_task.hpp"
 #include "move_screen_task.hpp"
 
-#include "../yg/display_list.hpp"
-#include "../yg/skin.hpp"
+#include "../graphics/display_list.hpp"
+#include "../graphics/skin.hpp"
 
 #include "../anim/controller.hpp"
 #include "../anim/angle_interpolation.hpp"
@@ -58,8 +58,8 @@ namespace location
 
     m_boundRects.resize(1);
 
-    setColor(EActive, yg::Color(65, 136, 210, 255));
-    setColor(EPressed, yg::Color(102, 163, 210, 255));
+    setColor(EActive, graphics::Color(65, 136, 210, 255));
+    setColor(EPressed, graphics::Color(102, 163, 210, 255));
     setState(EActive);
     setIsVisible(false);
   }
@@ -214,9 +214,9 @@ namespace location
 
   void State::cacheArrowBorder(EState state)
   {
-    yg::gl::Screen * cacheScreen = m_controller->GetCacheScreen();
+    graphics::gl::Screen * cacheScreen = m_controller->GetCacheScreen();
 
-    shared_ptr<yg::gl::DisplayList> & dl = m_arrowBorderLists[state];
+    shared_ptr<graphics::gl::DisplayList> & dl = m_arrowBorderLists[state];
 
     dl.reset();
     dl.reset(cacheScreen->createDisplayList());
@@ -224,7 +224,7 @@ namespace location
     cacheScreen->beginFrame();
     cacheScreen->setDisplayList(dl.get());
 
-    shared_ptr<yg::Skin> const & skin = cacheScreen->skin();
+    shared_ptr<graphics::Skin> const & skin = cacheScreen->skin();
 
     double k = m_controller->GetVisualScale();
 
@@ -238,9 +238,9 @@ namespace location
       m2::PointD(0, -m_arrowHeight * k + m_arrowBackHeight * k),
     };
 
-    yg::Color const borderColor = color(state);
+    graphics::Color const borderColor = color(state);
 
-    uint32_t penStyle = skin->mapPenInfo(yg::PenInfo(borderColor, 1 * k, 0, 0, 0));
+    uint32_t penStyle = skin->mapPenInfo(graphics::PenInfo(borderColor, 1 * k, 0, 0, 0));
 
     cacheScreen->drawPath(ptsD, ARRAY_SIZE(ptsD), 0, penStyle, depth());
 
@@ -250,9 +250,9 @@ namespace location
 
   void State::cacheArrowBody(EState state)
   {
-    yg::gl::Screen * cacheScreen = m_controller->GetCacheScreen();
+    graphics::gl::Screen * cacheScreen = m_controller->GetCacheScreen();
 
-    shared_ptr<yg::gl::DisplayList> & dl = m_arrowBodyLists[state];
+    shared_ptr<graphics::gl::DisplayList> & dl = m_arrowBodyLists[state];
 
     dl.reset();
     dl.reset(cacheScreen->createDisplayList());
@@ -270,10 +270,10 @@ namespace location
       m2::PointD((m_arrowWidth * k) / 2, m_arrowBackHeight * k),
     };
 
-    shared_ptr<yg::Skin> const & skin = cacheScreen->skin();
+    shared_ptr<graphics::Skin> const & skin = cacheScreen->skin();
 
-    yg::Color const baseColor = color(state);
-    yg::Color const lightColor = yg::Color(min(255, (baseColor.r * 5) >> 2),
+    graphics::Color const baseColor = color(state);
+    graphics::Color const lightColor = graphics::Color(min(255, (baseColor.r * 5) >> 2),
                                            min(255, (baseColor.g * 5) >> 2),
                                            min(255, (baseColor.b * 5) >> 2),
                                            baseColor.a);
@@ -290,7 +290,7 @@ namespace location
 
   void State::cacheLocationMark()
   {
-    yg::gl::Screen * cacheScreen = m_controller->GetCacheScreen();
+    graphics::gl::Screen * cacheScreen = m_controller->GetCacheScreen();
 
     m_locationMarkDL.reset();
     m_locationMarkDL.reset(cacheScreen->createDisplayList());
@@ -311,7 +311,7 @@ namespace location
 
     cacheScreen->drawSymbol(m2::PointD(0, 0),
                             "current-position",
-                            yg::EPosCenter,
+                            graphics::EPosCenter,
                             depth() - 1);
 
     cacheScreen->setDisplayList(0);
@@ -366,7 +366,7 @@ namespace location
     }
   }
 
-  void State::draw(yg::gl::OverlayRenderer * r,
+  void State::draw(graphics::gl::OverlayRenderer * r,
                    math::Matrix<double, 3, 3> const & m) const
   {
     if (isVisible())
@@ -395,7 +395,7 @@ namespace location
                   screenAngle + headingRad),
                 pivot());
 
-          map<EState, shared_ptr<yg::gl::DisplayList> >::const_iterator it;
+          map<EState, shared_ptr<graphics::gl::DisplayList> >::const_iterator it;
           it = m_arrowBodyLists.find(state());
 
           if (it != m_arrowBodyLists.end())
@@ -429,7 +429,7 @@ namespace location
         /// and then arrow border
         if (m_hasCompass)
         {
-          map<EState, shared_ptr<yg::gl::DisplayList> >::const_iterator it;
+          map<EState, shared_ptr<graphics::gl::DisplayList> >::const_iterator it;
           it = m_arrowBorderLists.find(state());
 
           if (it != m_arrowBorderLists.end())
diff --git a/map/location_state.hpp b/map/location_state.hpp
index 74a1f142ab..552bf3890a 100644
--- a/map/location_state.hpp
+++ b/map/location_state.hpp
@@ -20,7 +20,7 @@ namespace anim
   class AngleInterpolation;
 }
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
@@ -77,10 +77,10 @@ namespace location
 
     typedef gui::Element base_t;
 
-    yg::Color m_locationAreaColor;
+    graphics::Color m_locationAreaColor;
 
-    yg::Color m_compassAreaColor;
-    yg::Color m_compassBorderColor;
+    graphics::Color m_compassAreaColor;
+    graphics::Color m_compassBorderColor;
 
     Framework * m_framework;
 
@@ -92,10 +92,10 @@ namespace location
     double m_arrowBackHeight;
     double m_arrowScale;
 
-    map<EState, shared_ptr<yg::gl::DisplayList> > m_arrowBodyLists;
-    map<EState, shared_ptr<yg::gl::DisplayList> > m_arrowBorderLists;
-    scoped_ptr<yg::gl::DisplayList> m_locationMarkDL;
-    scoped_ptr<yg::gl::DisplayList> m_positionMarkDL;
+    map<EState, shared_ptr<graphics::gl::DisplayList> > m_arrowBodyLists;
+    map<EState, shared_ptr<graphics::gl::DisplayList> > m_arrowBorderLists;
+    scoped_ptr<graphics::gl::DisplayList> m_locationMarkDL;
+    scoped_ptr<graphics::gl::DisplayList> m_positionMarkDL;
 
     /// @}
 
@@ -126,9 +126,9 @@ namespace location
 
     struct Params : base_t::Params
     {
-      yg::Color m_locationAreaColor;
-      yg::Color m_compassAreaColor;
-      yg::Color m_compassBorderColor;
+      graphics::Color m_locationAreaColor;
+      graphics::Color m_compassAreaColor;
+      graphics::Color m_compassBorderColor;
       Framework * m_framework;
       Params();
     };
@@ -174,10 +174,10 @@ namespace location
     void OnCompassUpdate(location::CompassInfo const & info);
     //@}
 
-    /// yg::OverlayElement and gui::Element related methods
+    /// graphics::OverlayElement and gui::Element related methods
     // @{
     vector<m2::AnyRectD> const & boundRects() const;
-    void draw(yg::gl::OverlayRenderer * r, math::Matrix<double, 3, 3> const & m) const;
+    void draw(graphics::gl::OverlayRenderer * r, math::Matrix<double, 3, 3> const & m) const;
     bool hitTest(m2::PointD const & pt) const;
     bool onTapEnded(m2::PointD const & p);
     /// @}
diff --git a/map/map.pro b/map/map.pro
index 4b686c79af..08704c9245 100644
--- a/map/map.pro
+++ b/map/map.pro
@@ -6,7 +6,7 @@ CONFIG += staticlib
 INCLUDEPATH += ../3party/protobuf/src
 
 ROOT_DIR = ..
-DEPENDENCIES = search gui yg indexer anim geometry coding base expat
+DEPENDENCIES = search gui graphics indexer anim geometry coding base expat
 
 include($$ROOT_DIR/common.pri)
 
@@ -15,7 +15,7 @@ HEADERS += \
     feature_vec_model.hpp \
     events.hpp \
     navigator.hpp \
-    drawer_yg.hpp \
+    drawer.hpp \
     draw_processor.hpp \
     draw_info.hpp \
     window_handle.hpp \
@@ -35,7 +35,7 @@ HEADERS += \
     ruler.hpp \
     measurement_utils.hpp \
     simple_render_policy.hpp \
-    proto_to_yg_styles.hpp \
+    proto_to_styles.hpp \
     test_render_policy.hpp \
     queued_renderer.hpp \
     basic_tiling_render_policy.hpp \
@@ -54,7 +54,7 @@ SOURCES += \
     feature_vec_model.cpp \
     framework.cpp \
     navigator.cpp \
-    drawer_yg.cpp \
+    drawer.cpp \
     draw_processor.cpp \
     tile_renderer.cpp \
     information_display.cpp \
@@ -73,7 +73,7 @@ SOURCES += \
     measurement_utils.cpp \
     window_handle.cpp \
     simple_render_policy.cpp \
-    proto_to_yg_styles.cpp \
+    proto_to_styles.cpp \
     test_render_policy.cpp \
     queued_renderer.cpp \
     events.cpp \
diff --git a/map/map_tests/map_tests.pro b/map/map_tests/map_tests.pro
index 2043941e63..cc0072e67d 100644
--- a/map/map_tests/map_tests.pro
+++ b/map/map_tests/map_tests.pro
@@ -6,7 +6,7 @@ CONFIG -= app_bundle
 TEMPLATE = app
 
 ROOT_DIR = ../..
-DEPENDENCIES = map gui search storage yg indexer platform anim geometry coding base \
+DEPENDENCIES = map gui search storage graphics indexer platform anim geometry coding base \
                freetype fribidi expat protobuf tomcrypt jansson
 
 include($$ROOT_DIR/common.pri)
diff --git a/map/proto_to_yg_styles.cpp b/map/proto_to_styles.cpp
index 7f6c085ed0..0f64ddfff8 100644
--- a/map/proto_to_yg_styles.cpp
+++ b/map/proto_to_styles.cpp
@@ -1,4 +1,4 @@
-#include "proto_to_yg_styles.hpp"
+#include "proto_to_styles.hpp"
 
 #ifdef OMIM_PRODUCTION
   #include "../indexer/drules_struct_lite.pb.h"
@@ -12,9 +12,9 @@
 
 namespace
 {
-  yg::Color ConvertColor(int c)
+  graphics::Color ConvertColor(int c)
   {
-    return yg::Color::fromXRGB(c, 255 - (c >> 24));
+    return graphics::Color::fromXRGB(c, 255 - (c >> 24));
   }
 
   double ConvertWidth(double w, double scale)
@@ -24,7 +24,7 @@ namespace
 }
 
 
-void ConvertStyle(LineDefProto const * pSrc, double scale, yg::PenInfo & dest)
+void ConvertStyle(LineDefProto const * pSrc, double scale, graphics::PenInfo & dest)
 {
   double offset = 0.0;
   vector<double> v;
@@ -42,13 +42,13 @@ void ConvertStyle(LineDefProto const * pSrc, double scale, yg::PenInfo & dest)
       offset = dd.offset() * scale;
   }
 
-  dest = yg::PenInfo(
+  dest = graphics::PenInfo(
         ConvertColor(pSrc->color()),
         ConvertWidth(pSrc->width(), scale),
         v.empty() ? 0 : &v[0], v.size(), offset);
 }
 
-void ConvertStyle(AreaRuleProto const * pSrc, yg::Color & dest)
+void ConvertStyle(AreaRuleProto const * pSrc, graphics::Color & dest)
 {
   dest = ConvertColor(pSrc->color());
 }
@@ -58,14 +58,14 @@ void ConvertStyle(SymbolRuleProto const * pSrc, string & dest)
   dest = pSrc->name();
 }
 
-void ConvertStyle(CircleRuleProto const * pSrc, double scale, yg::CircleInfo & dest)
+void ConvertStyle(CircleRuleProto const * pSrc, double scale, graphics::CircleInfo & dest)
 {
-  dest = yg::CircleInfo(min(max(pSrc->radius(), 3.0), 6.0) * scale,
+  dest = graphics::CircleInfo(min(max(pSrc->radius(), 3.0), 6.0) * scale,
                         ConvertColor(pSrc->color()));
 
   if (pSrc->has_border())
   {
-    yg::PenInfo pen;
+    graphics::PenInfo pen;
     ConvertStyle(&(pSrc->border()), scale, pen);
 
     dest.m_isOutlined = true;
@@ -74,12 +74,12 @@ void ConvertStyle(CircleRuleProto const * pSrc, double scale, yg::CircleInfo & d
   }
 }
 
-void ConvertStyle(CaptionDefProto const * pSrc, double scale, yg::FontDesc & dest)
+void ConvertStyle(CaptionDefProto const * pSrc, double scale, graphics::FontDesc & dest)
 {
   uint8_t const h = max(static_cast<int>(pSrc->height() * scale),
                         static_cast<int>(8 * scale));    // replace 12 to 8 as it defined in drawing rules
 
-  dest = yg::FontDesc(h, ConvertColor(pSrc->color()));
+  dest = graphics::FontDesc(h, ConvertColor(pSrc->color()));
 
   if (pSrc->has_stroke_color())
   {
diff --git a/map/proto_to_styles.hpp b/map/proto_to_styles.hpp
new file mode 100644
index 0000000000..7c9f4a1bc0
--- /dev/null
+++ b/map/proto_to_styles.hpp
@@ -0,0 +1,21 @@
+#pragma once
+
+#include "../graphics/pen_info.hpp"
+#include "../graphics/circle_info.hpp"
+#include "../graphics/font_desc.hpp"
+
+
+class LineDefProto;
+class AreaRuleProto;
+class SymbolRuleProto;
+class CaptionDefProto;
+class CircleRuleProto;
+
+
+void ConvertStyle(LineDefProto const * pSrc, double scale, graphics::PenInfo & dest);
+void ConvertStyle(AreaRuleProto const * pSrc, graphics::Color & dest);
+void ConvertStyle(SymbolRuleProto const * pSrc, string & dest);
+void ConvertStyle(CircleRuleProto const * pSrc, double scale, graphics::CircleInfo & dest);
+void ConvertStyle(CaptionDefProto const * pSrc, double scale, graphics::FontDesc & dest);
+
+uint8_t GetFontSize(CaptionDefProto const * pSrc);
diff --git a/map/proto_to_yg_styles.hpp b/map/proto_to_yg_styles.hpp
deleted file mode 100644
index ace0f16ec0..0000000000
--- a/map/proto_to_yg_styles.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include "../yg/pen_info.hpp"
-#include "../yg/circle_info.hpp"
-#include "../yg/font_desc.hpp"
-
-
-class LineDefProto;
-class AreaRuleProto;
-class SymbolRuleProto;
-class CaptionDefProto;
-class CircleRuleProto;
-
-
-void ConvertStyle(LineDefProto const * pSrc, double scale, yg::PenInfo & dest);
-void ConvertStyle(AreaRuleProto const * pSrc, yg::Color & dest);
-void ConvertStyle(SymbolRuleProto const * pSrc, string & dest);
-void ConvertStyle(CircleRuleProto const * pSrc, double scale, yg::CircleInfo & dest);
-void ConvertStyle(CaptionDefProto const * pSrc, double scale, yg::FontDesc & dest);
-
-uint8_t GetFontSize(CaptionDefProto const * pSrc);
diff --git a/map/qgl_render_context.cpp b/map/qgl_render_context.cpp
index d465c0b53c..b666ec54a4 100644
--- a/map/qgl_render_context.cpp
+++ b/map/qgl_render_context.cpp
@@ -29,18 +29,18 @@ namespace qt
     void RenderContext::makeCurrent()
     {
       m_context->makeCurrent();
-      yg::gl::RenderContext::initParams();
+      graphics::gl::RenderContext::initParams();
     }
 
-    shared_ptr<yg::gl::RenderContext> RenderContext::createShared()
+    shared_ptr<graphics::gl::RenderContext> RenderContext::createShared()
     {
-      return shared_ptr<yg::gl::RenderContext>(new RenderContext(this));
+      return shared_ptr<graphics::gl::RenderContext>(new RenderContext(this));
     }
 
     void RenderContext::endThreadDrawing()
     {
       m_context.reset();
-      yg::gl::RenderContext::endThreadDrawing();
+      graphics::gl::RenderContext::endThreadDrawing();
     }
 
     RenderContext::RenderContext(RenderContext * renderContext)
diff --git a/map/qgl_render_context.hpp b/map/qgl_render_context.hpp
index 8a0fbd7cda..bd8c788e6d 100644
--- a/map/qgl_render_context.hpp
+++ b/map/qgl_render_context.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../yg/rendercontext.hpp"
+#include "../graphics/rendercontext.hpp"
 
 #include "../std/shared_ptr.hpp"
 
@@ -13,7 +13,7 @@ namespace qt
 {
   namespace gl
   {
-    class RenderContext : public yg::gl::RenderContext
+    class RenderContext : public graphics::gl::RenderContext
     {
     private:
       shared_ptr<QGLContext> m_context;
@@ -31,7 +31,7 @@ namespace qt
       /// Make this rendering context current
       void makeCurrent();
 
-      shared_ptr<yg::gl::RenderContext> createShared();
+      shared_ptr<graphics::gl::RenderContext> createShared();
 
       /// Leave previous logic, but fix thread widget deletion error.
       void endThreadDrawing();
diff --git a/map/queued_renderer.cpp b/map/queued_renderer.cpp
index 7fed052676..3931ec181e 100644
--- a/map/queued_renderer.cpp
+++ b/map/queued_renderer.cpp
@@ -1,5 +1,5 @@
 #include "queued_renderer.hpp"
-#include "../yg/internal/opengl.hpp"
+#include "../graphics/internal/opengl.hpp"
 
 QueuedRenderer::QueuedRenderer(int pipelinesCount)
 {
@@ -73,7 +73,7 @@ bool QueuedRenderer::RenderQueuedCommands(int pipelineNum)
 {
   /// logging only calls that is made while rendering tiles.
 //  if ((pipelineNum == 0) && (m_IsDebugging))
-//    yg::gl::g_doLogOGLCalls = true;
+//    graphics::gl::g_doLogOGLCalls = true;
 
   if (m_IsDebugging)
     LOG(LINFO, ("--- Processing Pipeline #", pipelineNum, " ---"));
@@ -87,12 +87,12 @@ bool QueuedRenderer::RenderQueuedCommands(int pipelineNum)
 
   cmdProcessed = m_Pipelines[pipelineNum].m_FrameCommands.size();
 
-  list<yg::gl::Packet>::iterator it;
+  list<graphics::gl::Packet>::iterator it;
 
   bool res = !m_Pipelines[pipelineNum].m_FrameCommands.empty();
   bool partialExecution = m_Pipelines[pipelineNum].m_CouldExecutePartially;
 
-  yg::gl::Packet::EType bucketType = m_Pipelines[pipelineNum].m_Type;
+  graphics::gl::Packet::EType bucketType = m_Pipelines[pipelineNum].m_Type;
 
   while (!m_Pipelines[pipelineNum].m_FrameCommands.empty())
   {
@@ -100,20 +100,20 @@ bool QueuedRenderer::RenderQueuedCommands(int pipelineNum)
     if (it->m_command)
       it->m_command->setIsDebugging(m_IsDebugging);
 
-    if (bucketType == yg::gl::Packet::ECancelPoint)
+    if (bucketType == graphics::gl::Packet::ECancelPoint)
     {
       if (it->m_command)
         it->m_command->cancel();
     }
     else
     {
-      ASSERT(bucketType == yg::gl::Packet::EFramePoint, ());
+      ASSERT(bucketType == graphics::gl::Packet::EFramePoint, ());
 
       if (it->m_command)
         it->m_command->perform();
     }
 
-    bool isCheckpoint = (it->m_type == yg::gl::Packet::ECheckPoint);
+    bool isCheckpoint = (it->m_type == graphics::gl::Packet::ECheckPoint);
 
     m_Pipelines[pipelineNum].m_FrameCommands.pop_front();
 
@@ -133,27 +133,27 @@ bool QueuedRenderer::RenderQueuedCommands(int pipelineNum)
   return res;
 
 //  if ((pipelineNum == 0) && (m_IsDebugging))
-//    yg::gl::g_doLogOGLCalls = false;
+//    graphics::gl::g_doLogOGLCalls = false;
 }
 
-void QueuedRenderer::PacketsPipeline::FillFrameCommands(list<yg::gl::Packet> & renderQueue, int maxFrames)
+void QueuedRenderer::PacketsPipeline::FillFrameCommands(list<graphics::gl::Packet> & renderQueue, int maxFrames)
 {
   ASSERT(m_FrameCommands.empty(), ());
 
   /// searching for "delimiter" markers
 
-  list<yg::gl::Packet>::iterator first = renderQueue.begin();
-  list<yg::gl::Packet>::iterator last = renderQueue.begin();
+  list<graphics::gl::Packet>::iterator first = renderQueue.begin();
+  list<graphics::gl::Packet>::iterator last = renderQueue.begin();
 
   /// checking whether there are a CancelPoint packet in the queue.
   /// In this case - fill m_FrameCommands till this packet
 
-  for (list<yg::gl::Packet>::iterator it = renderQueue.begin();
+  for (list<graphics::gl::Packet>::iterator it = renderQueue.begin();
        it != renderQueue.end();
        ++it)
   {
-    yg::gl::Packet p = *it;
-    if (p.m_type == yg::gl::Packet::ECancelPoint)
+    graphics::gl::Packet p = *it;
+    if (p.m_type == graphics::gl::Packet::ECancelPoint)
     {
       copy(first, ++it, back_inserter(m_FrameCommands));
       renderQueue.erase(first, it);
@@ -170,9 +170,9 @@ void QueuedRenderer::PacketsPipeline::FillFrameCommands(list<yg::gl::Packet> & r
 
   while ((framesLeft != 0) && (packetsLeft != 0) && (last != renderQueue.end()))
   {
-    yg::gl::Packet p = *last;
+    graphics::gl::Packet p = *last;
 
-    if (p.m_type == yg::gl::Packet::EFramePoint)
+    if (p.m_type == graphics::gl::Packet::EFramePoint)
     {
       /// found frame boundary, copying
       copy(first, ++last, back_inserter(m_FrameCommands));
@@ -190,7 +190,7 @@ void QueuedRenderer::PacketsPipeline::FillFrameCommands(list<yg::gl::Packet> & r
   }
 }
 
-void QueuedRenderer::CopyQueuedCommands(list<yg::gl::Packet> &l, list<yg::gl::Packet> &r)
+void QueuedRenderer::CopyQueuedCommands(list<graphics::gl::Packet> &l, list<graphics::gl::Packet> &r)
 {
   swap(l, r);
 }
@@ -202,20 +202,20 @@ void QueuedRenderer::CancelQueuedCommands(int pipelineNum)
 
   m_Pipelines[pipelineNum].m_Queue.cancel();
 
-  list<yg::gl::Packet> l;
+  list<graphics::gl::Packet> l;
 
   m_Pipelines[pipelineNum].m_Queue.processList(bind(&QueuedRenderer::CopyQueuedCommands, this, _1, ref(l)));
 
-  for (list<yg::gl::Packet>::iterator it = l.begin(); it != l.end(); ++it)
+  for (list<graphics::gl::Packet>::iterator it = l.begin(); it != l.end(); ++it)
   {
-    yg::gl::Packet p = *it;
+    graphics::gl::Packet p = *it;
 
     if (p.m_command)
       p.m_command->cancel();
   }
 }
 
-yg::gl::PacketsQueue * QueuedRenderer::GetPacketsQueue(int pipelineNum)
+graphics::gl::PacketsQueue * QueuedRenderer::GetPacketsQueue(int pipelineNum)
 {
   return &m_Pipelines[pipelineNum].m_Queue;
 }
diff --git a/map/queued_renderer.hpp b/map/queued_renderer.hpp
index 22b0dbbcae..63fcda5cc8 100644
--- a/map/queued_renderer.hpp
+++ b/map/queued_renderer.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../base/threaded_list.hpp"
-#include "../yg/renderer.hpp"
+#include "../graphics/renderer.hpp"
 
 /// Mixture-class for rendering policies, used on the
 /// devices that do not support OpenGL context sharing
@@ -15,9 +15,9 @@ private:
   /// of "heavy" commands.
   struct PacketsPipeline
   {
-    yg::gl::PacketsQueue m_Queue; //< all enqueued commands
-    list<yg::gl::Packet> m_FrameCommands; //< list of commands to execute on current frame
-    yg::gl::Packet::EType m_Type; //< type of the actions to perform with FrameCommands
+    graphics::gl::PacketsQueue m_Queue; //< all enqueued commands
+    list<graphics::gl::Packet> m_FrameCommands; //< list of commands to execute on current frame
+    graphics::gl::Packet::EType m_Type; //< type of the actions to perform with FrameCommands
 
     bool m_CouldExecutePartially;
 
@@ -26,10 +26,10 @@ private:
     /// skipping empty frames.
     /// - if there are a CancelPoint in the QueueData than the packets are copied up to
     ///   CancelPoint packet ignoring maxCheckPoints param
-    void FillFrameCommands(list<yg::gl::Packet> & QueueData, int maxCheckPoints);
+    void FillFrameCommands(list<graphics::gl::Packet> & QueueData, int maxCheckPoints);
   };
 
-  /// couldn't use vector here as PacketsPipeline holds non-copyable yg::gl::PacketsQueue
+  /// couldn't use vector here as PacketsPipeline holds non-copyable graphics::gl::PacketsQueue
   PacketsPipeline * m_Pipelines;
   int m_PipelinesCount;
 
@@ -50,7 +50,7 @@ public:
   QueuedRenderer(int pipelinesCount);
   ~QueuedRenderer();
 
-  void CopyQueuedCommands(list<yg::gl::Packet> & l, list<yg::gl::Packet> & r);
+  void CopyQueuedCommands(list<graphics::gl::Packet> & l, list<graphics::gl::Packet> & r);
 
   bool RenderQueuedCommands(int pipelineNum);
   void CancelQueuedCommands(int pipelineNum);
@@ -64,5 +64,5 @@ public:
   bool NeedRedraw() const;
   void SetSinglePipelineProcessing(bool flag);
 
-  yg::gl::PacketsQueue * GetPacketsQueue(int pipelineNum);
+  graphics::gl::PacketsQueue * GetPacketsQueue(int pipelineNum);
 };
diff --git a/map/render_policy.cpp b/map/render_policy.cpp
index 7c0370b22e..ce82e3616b 100644
--- a/map/render_policy.cpp
+++ b/map/render_policy.cpp
@@ -10,8 +10,8 @@
 #include "../anim/controller.hpp"
 #include "../anim/task.hpp"
 
-#include "../yg/internal/opengl.hpp"
-#include "../yg/skin.hpp"
+#include "../graphics/internal/opengl.hpp"
+#include "../graphics/skin.hpp"
 
 #include "../indexer/scales.hpp"
 #include "../indexer/drawing_rules.hpp"
@@ -24,7 +24,7 @@ RenderPolicy::~RenderPolicy()
 {
   LOG(LDEBUG, ("clearing cached drawing rules"));
   drule::rules().ClearCaches();
-  yg::gl::FinalizeThread();
+  graphics::gl::FinalizeThread();
 }
 
 RenderPolicy::RenderPolicy(Params const & p,
@@ -39,14 +39,14 @@ RenderPolicy::RenderPolicy(Params const & p,
 {
   LOG(LDEBUG, ("each BaseRule will hold up to", idCacheSize, "cached values"));
   drule::rules().ResizeCaches(idCacheSize);
-  yg::gl::InitExtensions();
-  yg::gl::InitializeThread();
-  yg::gl::CheckExtensionSupport();
+  graphics::gl::InitExtensions();
+  graphics::gl::InitializeThread();
+  graphics::gl::CheckExtensionSupport();
 }
 
 void RenderPolicy::InitCacheScreen()
 {
-  yg::gl::Screen::Params cp;
+  graphics::gl::Screen::Params cp;
 
   cp.m_doUnbindRT = false;
   cp.m_glyphCacheID = m_resourceManager->guiThreadGlyphCacheID();
@@ -54,7 +54,7 @@ void RenderPolicy::InitCacheScreen()
   cp.m_isSynchronized = false;
   cp.m_resourceManager = m_resourceManager;
 
-  m_cacheScreen = make_shared_ptr(new yg::gl::Screen(cp));
+  m_cacheScreen = make_shared_ptr(new graphics::gl::Screen(cp));
 
   m_cacheScreen->setSkin(m_skin);
 }
@@ -143,7 +143,7 @@ bool RenderPolicy::IsTiling() const
   return false;
 }
 
-shared_ptr<DrawerYG> const & RenderPolicy::GetDrawer() const
+shared_ptr<Drawer> const & RenderPolicy::GetDrawer() const
 {
   return m_drawer;
 }
@@ -153,7 +153,7 @@ shared_ptr<WindowHandle> const & RenderPolicy::GetWindowHandle() const
   return m_windowHandle;
 }
 
-yg::GlyphCache * RenderPolicy::GetGlyphCache() const
+graphics::GlyphCache * RenderPolicy::GetGlyphCache() const
 {
   return m_resourceManager->glyphCache(m_resourceManager->guiThreadGlyphCacheID());
 }
@@ -239,32 +239,32 @@ void RenderPolicy::SetAnimController(anim::Controller * controller)
   m_controller = controller;
 }
 
-void RenderPolicy::SetOverlay(shared_ptr<yg::Overlay> const & overlay)
+void RenderPolicy::SetOverlay(shared_ptr<graphics::Overlay> const & overlay)
 {
   m_overlay = overlay;
 }
 
-shared_ptr<yg::Overlay> const RenderPolicy::GetOverlay() const
+shared_ptr<graphics::Overlay> const RenderPolicy::GetOverlay() const
 {
   return m_overlay;
 }
 
-yg::Color const RenderPolicy::GetBgColor() const
+graphics::Color const RenderPolicy::GetBgColor() const
 {
   return m_bgColor;
 }
 
-shared_ptr<yg::gl::Screen> const & RenderPolicy::GetCacheScreen() const
+shared_ptr<graphics::gl::Screen> const & RenderPolicy::GetCacheScreen() const
 {
   return m_cacheScreen;
 }
 
-void RenderPolicy::SetSkin(shared_ptr<yg::Skin> const & skin)
+void RenderPolicy::SetSkin(shared_ptr<graphics::Skin> const & skin)
 {
   m_skin = skin;
 }
 
-shared_ptr<yg::Skin> const & RenderPolicy::GetSkin() const
+shared_ptr<graphics::Skin> const & RenderPolicy::GetSkin() const
 {
   return m_skin;
 }
diff --git a/map/render_policy.hpp b/map/render_policy.hpp
index d96a78692b..e5360e3096 100644
--- a/map/render_policy.hpp
+++ b/map/render_policy.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "drawer_yg.hpp"
+#include "drawer.hpp"
 
-#include "../yg/color.hpp"
+#include "../graphics/color.hpp"
 
 #include "../std/function.hpp"
 #include "../std/shared_ptr.hpp"
@@ -18,7 +18,7 @@ namespace anim
   class Controller;
 }
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
@@ -54,13 +54,13 @@ public:
 
 protected:
 
-  yg::Color m_bgColor;
-  shared_ptr<yg::ResourceManager> m_resourceManager;
-  shared_ptr<yg::Skin> m_skin;
-  shared_ptr<yg::gl::Screen> m_cacheScreen;
-  shared_ptr<yg::gl::RenderContext> m_primaryRC;
+  graphics::Color m_bgColor;
+  shared_ptr<graphics::ResourceManager> m_resourceManager;
+  shared_ptr<graphics::Skin> m_skin;
+  shared_ptr<graphics::gl::Screen> m_cacheScreen;
+  shared_ptr<graphics::gl::RenderContext> m_primaryRC;
   shared_ptr<WindowHandle> m_windowHandle;
-  shared_ptr<DrawerYG> m_drawer;
+  shared_ptr<Drawer> m_drawer;
   TRenderFn m_renderFn;
   TCountryNameFn m_countryNameFn;
   bool m_doSupportRotation;
@@ -69,9 +69,9 @@ protected:
   double m_visualScale;
   string m_skinName;
   anim::Controller * m_controller;
-  shared_ptr<yg::Overlay> m_overlay;
+  shared_ptr<graphics::Overlay> m_overlay;
 
-  void SetOverlay(shared_ptr<yg::Overlay> const & overlay);
+  void SetOverlay(shared_ptr<graphics::Overlay> const & overlay);
 
   void InitCacheScreen();
 
@@ -81,8 +81,8 @@ public:
   {
     VideoTimer * m_videoTimer;
     bool m_useDefaultFB;
-    yg::ResourceManager::Params m_rmParams;
-    shared_ptr<yg::gl::RenderContext> m_primaryRC;
+    graphics::ResourceManager::Params m_rmParams;
+    shared_ptr<graphics::gl::RenderContext> m_primaryRC;
     double m_visualScale;
     string m_skinName;
     size_t m_screenWidth;
@@ -139,9 +139,9 @@ public:
   void SetInvalidRect(m2::AnyRectD const & glbRect);
   m2::AnyRectD const & GetInvalidRect() const;
 
-  shared_ptr<DrawerYG> const & GetDrawer() const;
+  shared_ptr<Drawer> const & GetDrawer() const;
   shared_ptr<WindowHandle> const & GetWindowHandle() const;
-  yg::GlyphCache * GetGlyphCache() const;
+  graphics::GlyphCache * GetGlyphCache() const;
 
   virtual size_t ScaleEtalonSize() const;
 
@@ -152,13 +152,13 @@ public:
   virtual int InsertBenchmarkFence();
   virtual void JoinBenchmarkFence(int fenceID);
 
-  virtual shared_ptr<yg::Overlay> const GetOverlay() const;
-  yg::Color const GetBgColor() const;
+  virtual shared_ptr<graphics::Overlay> const GetOverlay() const;
+  graphics::Color const GetBgColor() const;
 
-  shared_ptr<yg::gl::Screen> const & GetCacheScreen() const;
+  shared_ptr<graphics::gl::Screen> const & GetCacheScreen() const;
 
-  virtual void SetSkin(shared_ptr<yg::Skin> const & skin);
-  shared_ptr<yg::Skin> const & GetSkin() const;
+  virtual void SetSkin(shared_ptr<graphics::Skin> const & skin);
+  shared_ptr<graphics::Skin> const & GetSkin() const;
 };
 
 RenderPolicy * CreateRenderPolicy(RenderPolicy::Params const & params);
diff --git a/map/ruler.cpp b/map/ruler.cpp
index 308ea9c43b..e545cd607a 100644
--- a/map/ruler.cpp
+++ b/map/ruler.cpp
@@ -3,8 +3,8 @@
 
 #include "../platform/settings.hpp"
 
-#include "../yg/overlay_renderer.hpp"
-#include "../yg/skin.hpp"
+#include "../graphics/overlay_renderer.hpp"
+#include "../graphics/skin.hpp"
 
 #include "../indexer/mercator.hpp"
 #include "../geometry/distance_on_sphere.hpp"
@@ -192,7 +192,7 @@ void Ruler::setVisualScale(double visualScale)
   m_visualScale = visualScale;
 }
 
-void Ruler::setFontDesc(yg::FontDesc const & fontDesc)
+void Ruler::setFontDesc(graphics::FontDesc const & fontDesc)
 {
   m_fontDesc = fontDesc;
 }
@@ -240,16 +240,16 @@ void Ruler::update()
 
     m2::PointD scalerOrg = pivot() + m2::PointD(-scalerWidthInPx / 2, rulerHeight / 2);
 
-    if (position() & yg::EPosLeft)
+    if (position() & graphics::EPosLeft)
       scalerOrg.x -= scalerWidthInPx / 2;
 
-    if (position() & yg::EPosRight)
+    if (position() & graphics::EPosRight)
       scalerOrg.x += scalerWidthInPx / 2;
 
-    if (position() & yg::EPosAbove)
+    if (position() & graphics::EPosAbove)
       scalerOrg.y -= rulerHeight / 2;
 
-    if (position() & yg::EPosUnder)
+    if (position() & graphics::EPosUnder)
       scalerOrg.y += rulerHeight / 2;
 
     m_path.clear();
@@ -268,27 +268,27 @@ vector<m2::AnyRectD> const & Ruler::boundRects() const
   return m_boundRects;
 }
 
-void Ruler::draw(yg::gl::OverlayRenderer * s, math::Matrix<double, 3, 3> const & m) const
+void Ruler::draw(graphics::gl::OverlayRenderer * s, math::Matrix<double, 3, 3> const & m) const
 {
   if (m_isInitialized)
   {
     s->drawPath(
         &m_path[0], m_path.size(), 0,
-          s->skin()->mapPenInfo(yg::PenInfo(yg::Color(0, 0, 0, 0x99), 4 * m_visualScale, 0, 0, 0)),
+          s->skin()->mapPenInfo(graphics::PenInfo(graphics::Color(0, 0, 0, 0x99), 4 * m_visualScale, 0, 0, 0)),
         depth());
 
-    if (position() & yg::EPosLeft)
+    if (position() & graphics::EPosLeft)
       s->drawText(m_fontDesc,
                   m_path[1] + m2::PointD(1 * m_visualScale, -2 * m_visualScale),
-                  yg::EPosAboveLeft,
+                  graphics::EPosAboveLeft,
                   m_scalerText,
                   depth(),
                   false);
     else
-      if (position() & yg::EPosRight)
+      if (position() & graphics::EPosRight)
         s->drawText(m_fontDesc,
                     m_path[0] + m2::PointD(7 * m_visualScale, -4 * m_visualScale),
-                    yg::EPosAboveRight,
+                    graphics::EPosAboveRight,
                     m_scalerText,
                     depth(),
                     false);
@@ -296,7 +296,7 @@ void Ruler::draw(yg::gl::OverlayRenderer * s, math::Matrix<double, 3, 3> const &
         s->drawText(m_fontDesc,
                     (m_path[0] + m_path[1]) * 0.5
                     + m2::PointD(7 * m_visualScale, -4 * m_visualScale),
-                    yg::EPosAbove,
+                    graphics::EPosAbove,
                     m_scalerText,
                     depth(),
                     false);
@@ -308,7 +308,7 @@ int Ruler::visualRank() const
   return 0;
 }
 
-yg::OverlayElement * Ruler::clone(math::Matrix<double, 3, 3> const & m) const
+graphics::OverlayElement * Ruler::clone(math::Matrix<double, 3, 3> const & m) const
 {
   return new Ruler(*this);
 }
diff --git a/map/ruler.hpp b/map/ruler.hpp
index 8698f51c32..e9d696a572 100644
--- a/map/ruler.hpp
+++ b/map/ruler.hpp
@@ -3,10 +3,10 @@
 #include "../geometry/screenbase.hpp"
 #include "../geometry/point2d.hpp"
 #include "../geometry/any_rect2d.hpp"
-#include "../yg/overlay_element.hpp"
-#include "../yg/font_desc.hpp"
+#include "../graphics/overlay_element.hpp"
+#include "../graphics/font_desc.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
@@ -15,7 +15,7 @@ namespace yg
   }
 }
 
-class Ruler : public yg::OverlayElement
+class Ruler : public graphics::OverlayElement
 {
 private:
 
@@ -30,7 +30,7 @@ private:
 
   double m_visualScale;
 
-  yg::FontDesc m_fontDesc;
+  graphics::FontDesc m_fontDesc;
   ScreenBase m_screen;
 
   /// Current diff in units between two endpoints of the ruler.
@@ -74,12 +74,12 @@ public:
   void setMinMetersWidth(double v);
   void setMaxMetersWidth(double v);
   void setVisualScale(double visualScale);
-  void setFontDesc(yg::FontDesc const & fontDesc);
+  void setFontDesc(graphics::FontDesc const & fontDesc);
 
   vector<m2::AnyRectD> const & boundRects() const;
 
-  void draw(yg::gl::OverlayRenderer * r, math::Matrix<double, 3, 3> const & m) const;
+  void draw(graphics::gl::OverlayRenderer * r, math::Matrix<double, 3, 3> const & m) const;
 
   int visualRank() const;
-  yg::OverlayElement * clone(math::Matrix<double, 3, 3> const & m) const;
+  graphics::OverlayElement * clone(math::Matrix<double, 3, 3> const & m) const;
 };
diff --git a/map/screen_coverage.cpp b/map/screen_coverage.cpp
index 1ea195b4f7..1049f5d881 100644
--- a/map/screen_coverage.cpp
+++ b/map/screen_coverage.cpp
@@ -8,10 +8,10 @@
 
 #include "../indexer/scales.hpp"
 
-#include "../yg/screen.hpp"
-#include "../yg/display_list.hpp"
-#include "../yg/skin.hpp"
-#include "../yg/base_texture.hpp"
+#include "../graphics/screen.hpp"
+#include "../graphics/display_list.hpp"
+#include "../graphics/skin.hpp"
+#include "../graphics/base_texture.hpp"
 
 #include "screen_coverage.hpp"
 #include "tile_renderer.hpp"
@@ -20,7 +20,7 @@
 
 ScreenCoverage::ScreenCoverage()
   : m_tiler(),
-    m_overlay(new yg::Overlay()),
+    m_overlay(new graphics::Overlay()),
     m_isEmptyDrawingCoverage(false),
     m_isEmptyModelAtCoverageCenter(true),
     m_leafTilesToRender(0)
@@ -30,10 +30,10 @@ ScreenCoverage::ScreenCoverage()
 
 ScreenCoverage::ScreenCoverage(TileRenderer * tileRenderer,
                                CoverageGenerator * coverageGenerator,
-                               shared_ptr<yg::gl::Screen> const & cacheScreen)
+                               shared_ptr<graphics::gl::Screen> const & cacheScreen)
   : m_tileRenderer(tileRenderer),
     m_coverageGenerator(coverageGenerator),
-    m_overlay(new yg::Overlay()),
+    m_overlay(new graphics::Overlay()),
     m_isEmptyDrawingCoverage(false),
     m_isEmptyModelAtCoverageCenter(true),
     m_leafTilesToRender(0),
@@ -146,7 +146,7 @@ void ScreenCoverage::Merge(Tiler::RectInfo const & ri)
   {
     if (m_tiler.isLeaf(ri))
     {
-      yg::Overlay * tileOverlayCopy = tile->m_overlay->clone();
+      graphics::Overlay * tileOverlayCopy = tile->m_overlay->clone();
       m_overlay->merge(*tileOverlayCopy,
                         tile->m_tileScreen.PtoGMatrix() * m_screen.GtoPMatrix());
 
@@ -155,8 +155,8 @@ void ScreenCoverage::Merge(Tiler::RectInfo const & ri)
   }
 }
 
-void FilterElementsBySharpness(shared_ptr<yg::OverlayElement> const & e,
-                               vector<shared_ptr<yg::OverlayElement> > & v,
+void FilterElementsBySharpness(shared_ptr<graphics::OverlayElement> const & e,
+                               vector<shared_ptr<graphics::OverlayElement> > & v,
                                bool flag)
 {
   if (e->hasSharpGeometry() == flag)
@@ -178,7 +178,7 @@ bool ScreenCoverage::Cache(core::CommandsQueue::Environment const & env)
   m_cacheScreen->beginFrame();
   m_cacheScreen->setDisplayList(m_primaryDL.get());
 
-  vector<yg::gl::BlitInfo> infos;
+  vector<graphics::gl::BlitInfo> infos;
 
   for (TTileSet::const_iterator it = m_tiles.begin(); it != m_tiles.end(); ++it)
   {
@@ -187,7 +187,7 @@ bool ScreenCoverage::Cache(core::CommandsQueue::Environment const & env)
     size_t tileWidth = tile->m_renderTarget->width();
     size_t tileHeight = tile->m_renderTarget->height();
 
-    yg::gl::BlitInfo bi;
+    graphics::gl::BlitInfo bi;
 
     bi.m_matrix = tile->m_tileScreen.PtoGMatrix() * m_screen.GtoPMatrix();
     bi.m_srcRect = m2::RectI(0, 0, tileWidth - 2, tileHeight - 2);
@@ -204,7 +204,7 @@ bool ScreenCoverage::Cache(core::CommandsQueue::Environment const & env)
 
   // selecting and rendering non-sharp elements.
 
-  vector<shared_ptr<yg::OverlayElement> > nonSharpElements;
+  vector<shared_ptr<graphics::OverlayElement> > nonSharpElements;
   m_overlay->forEach(bind(&FilterElementsBySharpness, _1, ref(nonSharpElements), false));
 
   for (unsigned i = 0; i < nonSharpElements.size(); ++i)
@@ -212,7 +212,7 @@ bool ScreenCoverage::Cache(core::CommandsQueue::Environment const & env)
 
   // selecting and rendering sharp elements
 
-  vector<shared_ptr<yg::OverlayElement> > sharpElements;
+  vector<shared_ptr<graphics::OverlayElement> > sharpElements;
   m_overlay->forEach(bind(&FilterElementsBySharpness, _1, ref(sharpElements), true));
 
   m_cacheScreen->setDisplayList(m_sharpTextDL.get());
@@ -412,7 +412,7 @@ ScreenCoverage::~ScreenCoverage()
   Clear();
 }
 
-void ScreenCoverage::Draw(yg::gl::Screen * s, ScreenBase const & screen)
+void ScreenCoverage::Draw(graphics::gl::Screen * s, ScreenBase const & screen)
 {
   math::Matrix<double, 3, 3> m = m_screen.PtoGMatrix() * screen.GtoPMatrix();
 
@@ -427,7 +427,7 @@ void ScreenCoverage::Draw(yg::gl::Screen * s, ScreenBase const & screen)
   s->setPixelPrecision(false);
 }
 
-shared_ptr<yg::Overlay> const & ScreenCoverage::GetOverlay() const
+shared_ptr<graphics::Overlay> const & ScreenCoverage::GetOverlay() const
 {
   return m_overlay;
 }
@@ -516,7 +516,7 @@ void ScreenCoverage::MergeOverlay()
     Tiler::RectInfo const & ri = (*it)->m_rectInfo;
     if (m_tiler.isLeaf(ri))
     {
-      scoped_ptr<yg::Overlay> copy((*it)->m_overlay->clone());
+      scoped_ptr<graphics::Overlay> copy((*it)->m_overlay->clone());
       m_overlay->merge(*copy.get(), (*it)->m_tileScreen.PtoGMatrix() * m_screen.GtoPMatrix());
     }
   }
diff --git a/map/screen_coverage.hpp b/map/screen_coverage.hpp
index 6a9cf77628..cf5ed32f15 100644
--- a/map/screen_coverage.hpp
+++ b/map/screen_coverage.hpp
@@ -4,7 +4,7 @@
 
 #include "../geometry/screenbase.hpp"
 
-#include "../yg/overlay.hpp"
+#include "../graphics/overlay.hpp"
 
 #include "tile.hpp"
 #include "tiler.hpp"
@@ -12,7 +12,7 @@
 
 class TileRenderer;
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
@@ -52,7 +52,7 @@ private:
   /// from TileCache while drawing them
   TTileSet m_tiles;
   /// Overlay composed of overlays for visible tiles
-  shared_ptr<yg::Overlay> m_overlay;
+  shared_ptr<graphics::Overlay> m_overlay;
 
   /// State flags
 
@@ -68,12 +68,12 @@ private:
   /// quick check.
   int m_leafTilesToRender;
   /// Screen, which is used for caching of this ScreenCoverage into DisplayList
-  shared_ptr<yg::gl::Screen> m_cacheScreen;
+  shared_ptr<graphics::gl::Screen> m_cacheScreen;
   /// DisplayList which holds cached ScreenCoverage
-  shared_ptr<yg::gl::DisplayList> m_primaryDL;
+  shared_ptr<graphics::gl::DisplayList> m_primaryDL;
   /// DisplayList to cache all straight texts.
   /// They are drawn with different shader.
-  shared_ptr<yg::gl::DisplayList> m_sharpTextDL;
+  shared_ptr<graphics::gl::DisplayList> m_sharpTextDL;
 
   /// Direct copying is prohibited.
   ScreenCoverage(ScreenCoverage const & src);
@@ -89,7 +89,7 @@ public:
   /// Constructor
   ScreenCoverage(TileRenderer * tileRenderer,
                  CoverageGenerator * coverageGenerator,
-                 shared_ptr<yg::gl::Screen> const & cacheScreen);
+                 shared_ptr<graphics::gl::Screen> const & cacheScreen);
   /// Destructor
   ~ScreenCoverage();
   /// Copy all needed information into specified ScreenCoverage
@@ -114,7 +114,7 @@ public:
   /// Check, whether the model is empty at the center of the coverage.
   void CheckEmptyModelAtCoverageCenter();
   /// Getter for Overlay
-  shared_ptr<yg::Overlay> const & GetOverlay() const;
+  shared_ptr<graphics::Overlay> const & GetOverlay() const;
   /// Cache coverage in display list
   /// @return true - if the coverage was cached successfully,
   ///         false - otherwise(p.e. the caching was cancelled)
@@ -124,7 +124,7 @@ public:
   /// recalculate screen coverage, using as much info from prev coverage as possible
   void SetScreen(ScreenBase const & screen);
   /// draw screen coverage
-  void Draw(yg::gl::Screen * s, ScreenBase const & currentScreen);
+  void Draw(graphics::gl::Screen * s, ScreenBase const & currentScreen);
   /// get draw scale for the tiles in the current coverage
   /// Not all tiles in coverage could correspond to this value,
   /// as there could be tiles from lower and higher level in the
diff --git a/map/simple_render_policy.cpp b/map/simple_render_policy.cpp
index fe2338015e..92c29e880b 100644
--- a/map/simple_render_policy.cpp
+++ b/map/simple_render_policy.cpp
@@ -1,10 +1,10 @@
 #include "simple_render_policy.hpp"
 #include "events.hpp"
-#include "drawer_yg.hpp"
+#include "drawer.hpp"
 #include "window_handle.hpp"
-#include "../yg/overlay.hpp"
-#include "../yg/internal/opengl.hpp"
-#include "../yg/skin.hpp"
+#include "../graphics/overlay.hpp"
+#include "../graphics/internal/opengl.hpp"
+#include "../graphics/skin.hpp"
 
 #include "../indexer/scales.hpp"
 #include "../geometry/screenbase.hpp"
@@ -14,12 +14,12 @@
 SimpleRenderPolicy::SimpleRenderPolicy(Params const & p)
   : RenderPolicy(p, false, 1)
 {
-  yg::ResourceManager::Params rmp = p.m_rmParams;
+  graphics::ResourceManager::Params rmp = p.m_rmParams;
 
   rmp.checkDeviceCaps();
 
-  rmp.m_primaryStoragesParams = yg::ResourceManager::StoragePoolParams(50000 * sizeof(yg::gl::Vertex),
-                                                                       sizeof(yg::gl::Vertex),
+  rmp.m_primaryStoragesParams = graphics::ResourceManager::StoragePoolParams(50000 * sizeof(graphics::gl::Vertex),
+                                                                       sizeof(graphics::gl::Vertex),
                                                                        10000 * sizeof(unsigned short),
                                                                        sizeof(unsigned short),
                                                                        15,
@@ -30,8 +30,8 @@ SimpleRenderPolicy::SimpleRenderPolicy(Params const & p)
                                                                        false,
                                                                        false);
 
-  rmp.m_smallStoragesParams = yg::ResourceManager::StoragePoolParams(5000 * sizeof(yg::gl::Vertex),
-                                                                     sizeof(yg::gl::Vertex),
+  rmp.m_smallStoragesParams = graphics::ResourceManager::StoragePoolParams(5000 * sizeof(graphics::gl::Vertex),
+                                                                     sizeof(graphics::gl::Vertex),
                                                                      10000 * sizeof(unsigned short),
                                                                      sizeof(unsigned short),
                                                                      100,
@@ -42,8 +42,8 @@ SimpleRenderPolicy::SimpleRenderPolicy(Params const & p)
                                                                      false,
                                                                      false);
 
-  rmp.m_blitStoragesParams = yg::ResourceManager::StoragePoolParams(10 * sizeof(yg::gl::Vertex),
-                                                                    sizeof(yg::gl::Vertex),
+  rmp.m_blitStoragesParams = graphics::ResourceManager::StoragePoolParams(10 * sizeof(graphics::gl::Vertex),
+                                                                    sizeof(graphics::gl::Vertex),
                                                                     10 * sizeof(unsigned short),
                                                                     sizeof(unsigned short),
                                                                     50,
@@ -54,7 +54,7 @@ SimpleRenderPolicy::SimpleRenderPolicy(Params const & p)
                                                                     false,
                                                                     false);
 
-  rmp.m_primaryTexturesParams = yg::ResourceManager::TexturePoolParams(512,
+  rmp.m_primaryTexturesParams = graphics::ResourceManager::TexturePoolParams(512,
                                                                        256,
                                                                        10,
                                                                        rmp.m_texFormat,
@@ -66,7 +66,7 @@ SimpleRenderPolicy::SimpleRenderPolicy(Params const & p)
                                                                        false,
                                                                        false);
 
-  rmp.m_fontTexturesParams = yg::ResourceManager::TexturePoolParams(512,
+  rmp.m_fontTexturesParams = graphics::ResourceManager::TexturePoolParams(512,
                                                                     256,
                                                                     5,
                                                                     rmp.m_texFormat,
@@ -78,7 +78,7 @@ SimpleRenderPolicy::SimpleRenderPolicy(Params const & p)
                                                                     false,
                                                                     false);
 
-  rmp.m_glyphCacheParams = yg::ResourceManager::GlyphCacheParams("unicode_blocks.txt",
+  rmp.m_glyphCacheParams = graphics::ResourceManager::GlyphCacheParams("unicode_blocks.txt",
                                                                  "fonts_whitelist.txt",
                                                                  "fonts_blacklist.txt",
                                                                  2 * 1024 * 1024,
@@ -89,23 +89,23 @@ SimpleRenderPolicy::SimpleRenderPolicy(Params const & p)
   rmp.m_useSingleThreadedOGL = false;
   rmp.fitIntoLimits();
 
-  m_resourceManager.reset(new yg::ResourceManager(rmp));
+  m_resourceManager.reset(new graphics::ResourceManager(rmp));
 
   Platform::FilesList fonts;
   GetPlatform().GetFontNames(fonts);
   m_resourceManager->addFonts(fonts);
 
-  DrawerYG::Params dp;
+  Drawer::Params dp;
 
-  dp.m_frameBuffer = make_shared_ptr(new yg::gl::FrameBuffer(p.m_useDefaultFB));
+  dp.m_frameBuffer = make_shared_ptr(new graphics::gl::FrameBuffer(p.m_useDefaultFB));
   dp.m_resourceManager = m_resourceManager;
   dp.m_glyphCacheID = m_resourceManager->guiThreadGlyphCacheID();
-  dp.m_skin = make_shared_ptr(yg::loadSkin(m_resourceManager, SkinName()));
+  dp.m_skin = make_shared_ptr(graphics::loadSkin(m_resourceManager, SkinName()));
   dp.m_visualScale = VisualScale();
   dp.m_isSynchronized = true;
   dp.m_fastSolidPath = false;
 
-  m_drawer.reset(new DrawerYG(dp));
+  m_drawer.reset(new Drawer(dp));
 
   m_windowHandle.reset(new WindowHandle());
 
@@ -126,9 +126,9 @@ void SimpleRenderPolicy::DrawFrame(shared_ptr<PaintEvent> const & e,
                    pxCenter + m2::PointD(scaleEtalonSize / 2, scaleEtalonSize / 2)),
          glbRect);
 
-  shared_ptr<yg::Overlay> overlay(new yg::Overlay());
+  shared_ptr<graphics::Overlay> overlay(new graphics::Overlay());
 
-  DrawerYG * pDrawer = e->drawer();
+  Drawer * pDrawer = e->drawer();
 
   pDrawer->screen()->setOverlay(overlay);
   pDrawer->screen()->beginFrame();
diff --git a/map/test_render_policy.cpp b/map/test_render_policy.cpp
index f6a9768df1..2e5435db5d 100644
--- a/map/test_render_policy.cpp
+++ b/map/test_render_policy.cpp
@@ -1,12 +1,12 @@
 #include "test_render_policy.hpp"
 #include "events.hpp"
-#include "drawer_yg.hpp"
+#include "drawer.hpp"
 #include "window_handle.hpp"
 
-#include "../yg/base_texture.hpp"
-#include "../yg/internal/opengl.hpp"
-#include "../yg/utils.hpp"
-#include "../yg/skin.hpp"
+#include "../graphics/base_texture.hpp"
+#include "../graphics/internal/opengl.hpp"
+#include "../graphics/utils.hpp"
+#include "../graphics/skin.hpp"
 
 #include "../geometry/screenbase.hpp"
 #include "../platform/platform.hpp"
@@ -16,12 +16,12 @@
 TestRenderPolicy::TestRenderPolicy(Params const & p)
   : RenderPolicy(p, false, 1)
 {
-  yg::ResourceManager::Params rmp = p.m_rmParams;
+  graphics::ResourceManager::Params rmp = p.m_rmParams;
 
   rmp.checkDeviceCaps();
 
-  rmp.m_primaryStoragesParams = yg::ResourceManager::StoragePoolParams(50000 * sizeof(yg::gl::Vertex),
-                                                                       sizeof(yg::gl::Vertex),
+  rmp.m_primaryStoragesParams = graphics::ResourceManager::StoragePoolParams(50000 * sizeof(graphics::gl::Vertex),
+                                                                       sizeof(graphics::gl::Vertex),
                                                                        10000 * sizeof(unsigned short),
                                                                        sizeof(unsigned short),
                                                                        15,
@@ -32,8 +32,8 @@ TestRenderPolicy::TestRenderPolicy(Params const & p)
                                                                        false,
                                                                        false);
 
-  rmp.m_smallStoragesParams = yg::ResourceManager::StoragePoolParams(5000 * sizeof(yg::gl::Vertex),
-                                                                     sizeof(yg::gl::Vertex),
+  rmp.m_smallStoragesParams = graphics::ResourceManager::StoragePoolParams(5000 * sizeof(graphics::gl::Vertex),
+                                                                     sizeof(graphics::gl::Vertex),
                                                                      10000 * sizeof(unsigned short),
                                                                      sizeof(unsigned short),
                                                                      100,
@@ -44,8 +44,8 @@ TestRenderPolicy::TestRenderPolicy(Params const & p)
                                                                      false,
                                                                      false);
 
-  rmp.m_blitStoragesParams = yg::ResourceManager::StoragePoolParams(10 * sizeof(yg::gl::Vertex),
-                                                                    sizeof(yg::gl::Vertex),
+  rmp.m_blitStoragesParams = graphics::ResourceManager::StoragePoolParams(10 * sizeof(graphics::gl::Vertex),
+                                                                    sizeof(graphics::gl::Vertex),
                                                                     10 * sizeof(unsigned short),
                                                                     sizeof(unsigned short),
                                                                     50,
@@ -56,7 +56,7 @@ TestRenderPolicy::TestRenderPolicy(Params const & p)
                                                                     false,
                                                                     false);
 
-  rmp.m_primaryTexturesParams = yg::ResourceManager::TexturePoolParams(512,
+  rmp.m_primaryTexturesParams = graphics::ResourceManager::TexturePoolParams(512,
                                                                        256,
                                                                        10,
                                                                        rmp.m_texFormat,
@@ -68,7 +68,7 @@ TestRenderPolicy::TestRenderPolicy(Params const & p)
                                                                        false,
                                                                        false);
 
-  rmp.m_fontTexturesParams = yg::ResourceManager::TexturePoolParams(512,
+  rmp.m_fontTexturesParams = graphics::ResourceManager::TexturePoolParams(512,
                                                                     256,
                                                                     5,
                                                                     rmp.m_texFormat,
@@ -80,7 +80,7 @@ TestRenderPolicy::TestRenderPolicy(Params const & p)
                                                                     false,
                                                                     false);
 
-  rmp.m_glyphCacheParams = yg::ResourceManager::GlyphCacheParams("unicode_blocks.txt",
+  rmp.m_glyphCacheParams = graphics::ResourceManager::GlyphCacheParams("unicode_blocks.txt",
                                                                  "fonts_whitelist.txt",
                                                                  "fonts_blacklist.txt",
                                                                  2 * 1024 * 1024,
@@ -91,24 +91,24 @@ TestRenderPolicy::TestRenderPolicy(Params const & p)
   rmp.m_useSingleThreadedOGL = false;
   rmp.fitIntoLimits();
 
-  m_resourceManager.reset(new yg::ResourceManager(rmp));
+  m_resourceManager.reset(new graphics::ResourceManager(rmp));
 
   Platform::FilesList fonts;
   GetPlatform().GetFontNames(fonts);
   m_resourceManager->addFonts(fonts);
 
-  DrawerYG::Params dp;
+  Drawer::Params dp;
 
-  m_primaryFrameBuffer = make_shared_ptr(new yg::gl::FrameBuffer(p.m_useDefaultFB));
+  m_primaryFrameBuffer = make_shared_ptr(new graphics::gl::FrameBuffer(p.m_useDefaultFB));
 
   dp.m_frameBuffer = m_primaryFrameBuffer;
   dp.m_resourceManager = m_resourceManager;
   dp.m_glyphCacheID = m_resourceManager->guiThreadGlyphCacheID();
-  dp.m_skin = make_shared_ptr(yg::loadSkin(m_resourceManager, SkinName()));
+  dp.m_skin = make_shared_ptr(graphics::loadSkin(m_resourceManager, SkinName()));
   dp.m_visualScale = VisualScale();
   dp.m_isSynchronized = true;
 
-  m_drawer.reset(new DrawerYG(dp));
+  m_drawer.reset(new Drawer(dp));
 
   m_windowHandle.reset(new WindowHandle());
 
@@ -117,10 +117,10 @@ TestRenderPolicy::TestRenderPolicy(Params const & p)
   m_windowHandle->setRenderPolicy(this);
   m_windowHandle->setRenderContext(p.m_primaryRC);
 
-  m_auxFrameBuffer = make_shared_ptr(new yg::gl::FrameBuffer());
-  m_frameBuffer = make_shared_ptr(new yg::gl::FrameBuffer());
+  m_auxFrameBuffer = make_shared_ptr(new graphics::gl::FrameBuffer());
+  m_frameBuffer = make_shared_ptr(new graphics::gl::FrameBuffer());
 
-  m_depthBuffer = make_shared_ptr(new yg::gl::RenderBuffer(512, 512, true));
+  m_depthBuffer = make_shared_ptr(new graphics::gl::RenderBuffer(512, 512, true));
   m_backBuffer = m_resourceManager->createRenderTarget(512, 512);
   m_actualTarget = m_resourceManager->createRenderTarget(512, 512);
 
@@ -138,7 +138,7 @@ void TestRenderPolicy::DrawFrame(shared_ptr<PaintEvent> const & e,
     m_hasScreen = true;
   }
 
-  using namespace yg::gl;
+  using namespace graphics::gl;
 
   OGLCHECK(glBindFramebufferFn(GL_FRAMEBUFFER_MWM, m_frameBuffer->id()));
   utils::setupCoordinates(512, 512, false);
@@ -150,14 +150,14 @@ void TestRenderPolicy::DrawFrame(shared_ptr<PaintEvent> const & e,
 
   /// drawing with Z-order
 
-  DrawerYG * pDrawer = e->drawer();
+  Drawer * pDrawer = e->drawer();
 
   for (unsigned i = 0; i < 40; ++i)
     pDrawer->screen()->drawRectangle(m2::RectD(10 + i, 10 + i, 110 + i, 110 + i),
-                                         yg::Color(255 - (i * 2) % 255, i * 2 % 255, 0, 255),
+                                         graphics::Color(255 - (i * 2) % 255, i * 2 % 255, 0, 255),
                                          200 - i);
 
-  pDrawer->screen()->drawRectangle(m2::RectD(80, 80, 180, 180), yg::Color(0, 255, 0, 255), 100);
+  pDrawer->screen()->drawRectangle(m2::RectD(80, 80, 180, 180), graphics::Color(0, 255, 0, 255), 100);
   pDrawer->screen()->flush(-1);
 
   /// performing updateActualTarget
@@ -187,8 +187,8 @@ void TestRenderPolicy::DrawFrame(shared_ptr<PaintEvent> const & e,
 
   /// drawing with Z-order
 
-  pDrawer->screen()->drawRectangle(m2::RectD(110, 110, 210, 210), yg::Color(0, 0, 255, 255), 50);
-  pDrawer->screen()->drawRectangle(m2::RectD(140, 140, 240, 240), yg::Color(0, 255, 255, 255), 25);
+  pDrawer->screen()->drawRectangle(m2::RectD(110, 110, 210, 210), graphics::Color(0, 0, 255, 255), 50);
+  pDrawer->screen()->drawRectangle(m2::RectD(140, 140, 240, 240), graphics::Color(0, 255, 255, 255), 25);
   pDrawer->screen()->flush(-1);
 
   /// performing last updateActualTarget
@@ -214,8 +214,8 @@ void TestRenderPolicy::DrawFrame(shared_ptr<PaintEvent> const & e,
 
   OGLCHECK(glFramebufferTexture2DFn(GL_FRAMEBUFFER_MWM, GL_COLOR_ATTACHMENT0_MWM, GL_TEXTURE_2D, m_backBuffer->id(), 0));
 
-  pDrawer->screen()->drawRectangle(m2::RectD(90, 150, 190, 250), yg::Color(255, 0, 255, 255), 20);
-  pDrawer->screen()->drawRectangle(m2::RectD(120, 180, 220, 280), yg::Color(128, 128, 255, 255), 10);
+  pDrawer->screen()->drawRectangle(m2::RectD(90, 150, 190, 250), graphics::Color(255, 0, 255, 255), 20);
+  pDrawer->screen()->drawRectangle(m2::RectD(120, 180, 220, 280), graphics::Color(128, 128, 255, 255), 10);
   pDrawer->screen()->flush(-1);
 
   /// performing updateActualTarget
diff --git a/map/test_render_policy.hpp b/map/test_render_policy.hpp
index b9d326fdcc..77e963bcbd 100644
--- a/map/test_render_policy.hpp
+++ b/map/test_render_policy.hpp
@@ -6,15 +6,15 @@
 class TestRenderPolicy : public RenderPolicy
 {
 private:
-  shared_ptr<yg::gl::FrameBuffer> m_primaryFrameBuffer;
-  shared_ptr<yg::gl::FrameBuffer> m_auxFrameBuffer;
-  shared_ptr<yg::gl::FrameBuffer> m_frameBuffer;
-  shared_ptr<yg::gl::RenderBuffer> m_depthBuffer;
-  shared_ptr<yg::gl::BaseTexture> m_actualTarget;
-  shared_ptr<yg::gl::BaseTexture> m_backBuffer;
+  shared_ptr<graphics::gl::FrameBuffer> m_primaryFrameBuffer;
+  shared_ptr<graphics::gl::FrameBuffer> m_auxFrameBuffer;
+  shared_ptr<graphics::gl::FrameBuffer> m_frameBuffer;
+  shared_ptr<graphics::gl::RenderBuffer> m_depthBuffer;
+  shared_ptr<graphics::gl::BaseTexture> m_actualTarget;
+  shared_ptr<graphics::gl::BaseTexture> m_backBuffer;
 
-  shared_ptr<yg::gl::Screen> m_auxScreen;
-  shared_ptr<yg::gl::Screen> m_drawerScreen;
+  shared_ptr<graphics::gl::Screen> m_auxScreen;
+  shared_ptr<graphics::gl::Screen> m_drawerScreen;
 
   bool m_hasScreen;
   ScreenBase m_screen;
diff --git a/map/tile.cpp b/map/tile.cpp
index b880f90992..961d0a1d35 100644
--- a/map/tile.cpp
+++ b/map/tile.cpp
@@ -2,13 +2,13 @@
 
 #include "tile.hpp"
 
-#include "../yg/base_texture.hpp"
+#include "../graphics/base_texture.hpp"
 
 Tile::Tile()
 {}
 
-Tile::Tile(shared_ptr<yg::gl::BaseTexture> const & renderTarget,
-           shared_ptr<yg::Overlay> const & overlay,
+Tile::Tile(shared_ptr<graphics::gl::BaseTexture> const & renderTarget,
+           shared_ptr<graphics::Overlay> const & overlay,
            ScreenBase const & tileScreen,
            Tiler::RectInfo const & rectInfo,
            double duration,
diff --git a/map/tile.hpp b/map/tile.hpp
index c0715c40c2..51c07f16fe 100644
--- a/map/tile.hpp
+++ b/map/tile.hpp
@@ -6,7 +6,7 @@
 
 #include "../std/shared_ptr.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
@@ -17,8 +17,8 @@ namespace yg
 
 struct Tile
 {
-  shared_ptr<yg::gl::BaseTexture> m_renderTarget; //< taken from resource manager
-  shared_ptr<yg::Overlay> m_overlay;  //< text and POI's
+  shared_ptr<graphics::gl::BaseTexture> m_renderTarget; //< taken from resource manager
+  shared_ptr<graphics::Overlay> m_overlay;  //< text and POI's
   ScreenBase m_tileScreen; //< cached to calculate it once, cause tile blitting
                            //< is performed on GUI thread.
   Tiler::RectInfo m_rectInfo; //< taken from tiler
@@ -27,8 +27,8 @@ struct Tile
 
   Tile();
 
-  Tile(shared_ptr<yg::gl::BaseTexture> const & renderTarget,
-       shared_ptr<yg::Overlay> const & overlay,
+  Tile(shared_ptr<graphics::gl::BaseTexture> const & renderTarget,
+       shared_ptr<graphics::Overlay> const & overlay,
        ScreenBase const & tileScreen,
        Tiler::RectInfo const & rectInfo,
        double duration,
diff --git a/map/tile_cache.cpp b/map/tile_cache.cpp
index 4ccb5fb8e0..85a4bf3540 100644
--- a/map/tile_cache.cpp
+++ b/map/tile_cache.cpp
@@ -9,7 +9,7 @@ void TileCache::EntryValueTraits::Evict(Entry &val)
 TileCache::Entry::Entry()
 {}
 
-TileCache::Entry::Entry(Tile const & tile, shared_ptr<yg::ResourceManager> const & rm)
+TileCache::Entry::Entry(Tile const & tile, shared_ptr<graphics::ResourceManager> const & rm)
   : m_tile(tile), m_rm(rm)
 {}
 
diff --git a/map/tile_cache.hpp b/map/tile_cache.hpp
index a4efa0e42d..68b6941e7a 100644
--- a/map/tile_cache.hpp
+++ b/map/tile_cache.hpp
@@ -3,7 +3,7 @@
 #include "tile.hpp"
 #include "tiler.hpp"
 
-#include "../yg/resource_manager.hpp"
+#include "../graphics/resource_manager.hpp"
 
 #include "../base/mru_cache.hpp"
 #include "../base/mutex.hpp"
@@ -19,9 +19,9 @@ public:
   struct Entry
   {
     Tile m_tile;
-    shared_ptr<yg::ResourceManager> m_rm;
+    shared_ptr<graphics::ResourceManager> m_rm;
     Entry();
-    Entry(Tile const & tile, shared_ptr<yg::ResourceManager> const & rm);
+    Entry(Tile const & tile, shared_ptr<graphics::ResourceManager> const & rm);
   };
 
   struct EntryValueTraits
diff --git a/map/tile_renderer.cpp b/map/tile_renderer.cpp
index 89c1d02578..798c24b9a0 100644
--- a/map/tile_renderer.cpp
+++ b/map/tile_renderer.cpp
@@ -3,11 +3,11 @@
 #include "tile_renderer.hpp"
 #include "window_handle.hpp"
 
-#include "../yg/internal/opengl.hpp"
-#include "../yg/rendercontext.hpp"
-#include "../yg/base_texture.hpp"
-#include "../yg/packets_queue.hpp"
-#include "../yg/skin.hpp"
+#include "../graphics/internal/opengl.hpp"
+#include "../graphics/rendercontext.hpp"
+#include "../graphics/base_texture.hpp"
+#include "../graphics/packets_queue.hpp"
+#include "../graphics/skin.hpp"
 
 #include "../std/bind.hpp"
 
@@ -21,12 +21,12 @@ TileRenderer::TileRenderer(
     size_t tileSize,
     string const & skinName,
     unsigned executorsCount,
-    yg::Color const & bgColor,
+    graphics::Color const & bgColor,
     RenderPolicy::TRenderFn const & renderFn,
-    shared_ptr<yg::gl::RenderContext> const & primaryRC,
-    shared_ptr<yg::ResourceManager> const & rm,
+    shared_ptr<graphics::gl::RenderContext> const & primaryRC,
+    shared_ptr<graphics::ResourceManager> const & rm,
     double visualScale,
-    yg::gl::PacketsQueue ** packetsQueues
+    graphics::gl::PacketsQueue ** packetsQueues
   ) : m_queue(executorsCount),
       m_tileSize(tileSize),
       m_renderFn(renderFn),
@@ -48,10 +48,10 @@ TileRenderer::TileRenderer(
 
   for (unsigned i = 0; i < m_threadData.size(); ++i)
   {
-    DrawerYG::Params params;
+    Drawer::Params params;
 
     params.m_resourceManager = m_resourceManager;
-    params.m_frameBuffer = make_shared_ptr(new yg::gl::FrameBuffer());
+    params.m_frameBuffer = make_shared_ptr(new graphics::gl::FrameBuffer());
 
     params.m_glyphCacheID = m_resourceManager->renderThreadGlyphCacheID(i);
     params.m_threadID = i;
@@ -60,7 +60,7 @@ TileRenderer::TileRenderer(
       params.m_renderQueue = packetsQueues[i];
     params.m_doUnbindRT = false;
     params.m_isSynchronized = false;
-    params.m_skin = make_shared_ptr(yg::loadSkin(m_resourceManager, m_skinName));
+    params.m_skin = make_shared_ptr(graphics::loadSkin(m_resourceManager, m_skinName));
   /*  params.m_isDebugging = true;
     params.m_drawPathes = false ;
     params.m_drawAreas = false;
@@ -73,7 +73,7 @@ TileRenderer::TileRenderer(
       m_threadData[i].m_renderContext = m_primaryContext->createShared();
 
     m_threadData[i].m_dummyRT = m_resourceManager->createRenderTarget(2, 2);
-    m_threadData[i].m_depthBuffer = make_shared_ptr(new yg::gl::RenderBuffer(tileWidth, tileHeight, true));
+    m_threadData[i].m_depthBuffer = make_shared_ptr(new graphics::gl::RenderBuffer(tileWidth, tileHeight, true));
   }
 
   m_queue.AddInitCommand(bind(&TileRenderer::InitializeThreadGL, this, _1));
@@ -102,7 +102,7 @@ void TileRenderer::InitializeThreadGL(core::CommandsQueue::Environment const & e
 
   if (threadData.m_renderContext)
     threadData.m_renderContext->makeCurrent();
-  threadData.m_drawer = new DrawerYG(threadData.m_drawerParams);
+  threadData.m_drawer = new Drawer(threadData.m_drawerParams);
   threadData.m_drawer->onSize(tileWidth, tileHeight);
   threadData.m_drawer->screen()->setDepthBuffer(threadData.m_depthBuffer);
 }
@@ -115,15 +115,15 @@ void TileRenderer::FinalizeThreadGL(core::CommandsQueue::Environment const & env
     threadData.m_renderContext->endThreadDrawing();
 }
 
-void TileRenderer::ReadPixels(yg::gl::PacketsQueue * glQueue, core::CommandsQueue::Environment const & env)
+void TileRenderer::ReadPixels(graphics::gl::PacketsQueue * glQueue, core::CommandsQueue::Environment const & env)
 {
   ThreadData & threadData = m_threadData[env.threadNum()];
 
-  DrawerYG * drawer = threadData.m_drawer;
+  Drawer * drawer = threadData.m_drawer;
 
   if (glQueue)
   {
-    glQueue->processFn(bind(&TileRenderer::ReadPixels, this, (yg::gl::PacketsQueue*)0, ref(env)), true);
+    glQueue->processFn(bind(&TileRenderer::ReadPixels, this, (graphics::gl::PacketsQueue*)0, ref(env)), true);
     return;
   }
 
@@ -154,9 +154,9 @@ void TileRenderer::DrawTile(core::CommandsQueue::Environment const & env,
 
   ThreadData & threadData = m_threadData[env.threadNum()];
 
-  yg::gl::PacketsQueue * glQueue = threadData.m_drawerParams.m_renderQueue;
+  graphics::gl::PacketsQueue * glQueue = threadData.m_drawerParams.m_renderQueue;
 
-  DrawerYG * drawer = threadData.m_drawer;
+  Drawer * drawer = threadData.m_drawer;
 
   ScreenBase frameScreen;
 
@@ -171,14 +171,14 @@ void TileRenderer::DrawTile(core::CommandsQueue::Environment const & env,
 
   my::Timer timer;
 
-  shared_ptr<yg::gl::BaseTexture> tileTarget = m_resourceManager->renderTargetTextures()->Reserve();
+  shared_ptr<graphics::gl::BaseTexture> tileTarget = m_resourceManager->renderTargetTextures()->Reserve();
 
   if (m_resourceManager->renderTargetTextures()->IsCancelled())
     return;
 
   drawer->screen()->setRenderTarget(tileTarget);
 
-  shared_ptr<yg::Overlay> tileOverlay(new yg::Overlay());
+  shared_ptr<graphics::Overlay> tileOverlay(new graphics::Overlay());
   tileOverlay->setCouldOverlap(true);
 
   drawer->screen()->setOverlay(tileOverlay);
@@ -188,18 +188,18 @@ void TileRenderer::DrawTile(core::CommandsQueue::Environment const & env,
   threadData.m_dummyRT->makeCurrent(glQueue);
 
   drawer->beginFrame();
-  drawer->clear(yg::Color(m_bgColor.r, m_bgColor.g, m_bgColor.b, 0));
+  drawer->clear(graphics::Color(m_bgColor.r, m_bgColor.g, m_bgColor.b, 0));
   drawer->screen()->setClipRect(renderRect);
   drawer->clear(m_bgColor);
 
-/*  drawer->clear(yg::Color(rand() % 32 + 128, rand() % 64 + 128, rand() % 32 + 128, 255));
+/*  drawer->clear(graphics::Color(rand() % 32 + 128, rand() % 64 + 128, rand() % 32 + 128, 255));
 
   std::stringstream out;
   out << rectInfo.m_y << ", " << rectInfo.m_x << ", " << rectInfo.m_tileScale;
 
-  drawer->screen()->drawText(yg::FontDesc(12, yg::Color(0, 0, 0, 255), true),
+  drawer->screen()->drawText(graphics::FontDesc(12, graphics::Color(0, 0, 0, 255), true),
                              renderRect.Center(),
-                             yg::EPosCenter,
+                             graphics::EPosCenter,
                              out.str(),
                              0,
                              false);*/
diff --git a/map/tile_renderer.hpp b/map/tile_renderer.hpp
index d15c6efe8c..7664176efc 100644
--- a/map/tile_renderer.hpp
+++ b/map/tile_renderer.hpp
@@ -4,7 +4,7 @@
 #include "tiler.hpp"
 #include "tile_cache.hpp"
 #include "tile_set.hpp"
-#include "drawer_yg.hpp"
+#include "drawer.hpp"
 
 #include "../geometry/screenbase.hpp"
 
@@ -15,7 +15,7 @@
 #include "../std/shared_ptr.hpp"
 #include "../std/vector.hpp"
 
-namespace yg
+namespace graphics
 {
   class ResourceManager;
   namespace gl
@@ -26,7 +26,7 @@ namespace yg
 }
 
 class WindowHandle;
-class DrawerYG;
+class Drawer;
 
 class TileRenderer
 {
@@ -34,20 +34,20 @@ protected:
 
   core::CommandsQueue m_queue;
 
-  shared_ptr<yg::ResourceManager> m_resourceManager;
+  shared_ptr<graphics::ResourceManager> m_resourceManager;
 
   struct ThreadData
   {
-    DrawerYG * m_drawer;
-    DrawerYG::Params m_drawerParams;
-    shared_ptr<yg::gl::BaseTexture> m_dummyRT;
-    shared_ptr<yg::gl::RenderContext> m_renderContext;
-    shared_ptr<yg::gl::RenderBuffer> m_depthBuffer;
+    Drawer * m_drawer;
+    Drawer::Params m_drawerParams;
+    shared_ptr<graphics::gl::BaseTexture> m_dummyRT;
+    shared_ptr<graphics::gl::RenderContext> m_renderContext;
+    shared_ptr<graphics::gl::RenderBuffer> m_depthBuffer;
   };
 
   buffer_vector<ThreadData, 4> m_threadData;
 
-  shared_ptr<yg::gl::RenderContext> m_primaryContext;
+  shared_ptr<graphics::gl::RenderContext> m_primaryContext;
 
   TileCache m_tileCache;
 
@@ -59,7 +59,7 @@ protected:
 
   RenderPolicy::TRenderFn m_renderFn;
   string m_skinName;
-  yg::Color m_bgColor;
+  graphics::Color m_bgColor;
   int m_sequenceID;
   bool m_isExiting;
 
@@ -77,7 +77,7 @@ protected:
                         Tiler::RectInfo const & rectInfo,
                         int sequenceID);
 
-  void ReadPixels(yg::gl::PacketsQueue * glQueue, core::CommandsQueue::Environment const & env);
+  void ReadPixels(graphics::gl::PacketsQueue * glQueue, core::CommandsQueue::Environment const & env);
 
 public:
 
@@ -85,12 +85,12 @@ public:
   TileRenderer(size_t tileSize,
                string const & skinName,
                unsigned tasksCount,
-               yg::Color const & bgColor,
+               graphics::Color const & bgColor,
                RenderPolicy::TRenderFn const & renderFn,
-               shared_ptr<yg::gl::RenderContext> const & primaryRC,
-               shared_ptr<yg::ResourceManager> const & rm,
+               shared_ptr<graphics::gl::RenderContext> const & primaryRC,
+               shared_ptr<graphics::ResourceManager> const & rm,
                double visualScale,
-               yg::gl::PacketsQueue ** packetsQueue);
+               graphics::gl::PacketsQueue ** packetsQueue);
   /// destructor.
   virtual ~TileRenderer();
   /// add command to the commands queue.
diff --git a/map/tiling_render_policy_mt.cpp b/map/tiling_render_policy_mt.cpp
index c80ff369e5..a8273f1f5f 100644
--- a/map/tiling_render_policy_mt.cpp
+++ b/map/tiling_render_policy_mt.cpp
@@ -2,8 +2,8 @@
 
 #include "../platform/platform.hpp"
 
-#include "../yg/internal/opengl.hpp"
-#include "../yg/skin.hpp"
+#include "../graphics/internal/opengl.hpp"
+#include "../graphics/skin.hpp"
 
 #include "window_handle.hpp"
 #include "tile_renderer.hpp"
@@ -13,11 +13,11 @@ TilingRenderPolicyMT::TilingRenderPolicyMT(Params const & p)
   : BasicTilingRenderPolicy(p,
                             false)
 {
-  yg::ResourceManager::Params rmp = p.m_rmParams;
+  graphics::ResourceManager::Params rmp = p.m_rmParams;
 
   rmp.checkDeviceCaps();
 
-  rmp.m_primaryTexturesParams = yg::ResourceManager::TexturePoolParams(512,
+  rmp.m_primaryTexturesParams = graphics::ResourceManager::TexturePoolParams(512,
                                                                        256,
                                                                        1,
                                                                        rmp.m_texFormat,
@@ -29,7 +29,7 @@ TilingRenderPolicyMT::TilingRenderPolicyMT(Params const & p)
                                                                        false,
                                                                        true);
 
-  rmp.m_fontTexturesParams = yg::ResourceManager::TexturePoolParams(256,
+  rmp.m_fontTexturesParams = graphics::ResourceManager::TexturePoolParams(256,
                                                                     256,
                                                                     1,
                                                                     rmp.m_texFormat,
@@ -41,8 +41,8 @@ TilingRenderPolicyMT::TilingRenderPolicyMT(Params const & p)
                                                                     true,
                                                                     true);
 
-  rmp.m_primaryStoragesParams = yg::ResourceManager::StoragePoolParams(50000 * sizeof(yg::gl::Vertex),
-                                                                       sizeof(yg::gl::Vertex),
+  rmp.m_primaryStoragesParams = graphics::ResourceManager::StoragePoolParams(50000 * sizeof(graphics::gl::Vertex),
+                                                                       sizeof(graphics::gl::Vertex),
                                                                        100000 * sizeof(unsigned short),
                                                                        sizeof(unsigned short),
                                                                        5,
@@ -53,8 +53,8 @@ TilingRenderPolicyMT::TilingRenderPolicyMT(Params const & p)
                                                                        false,
                                                                        true);
 
-  rmp.m_smallStoragesParams = yg::ResourceManager::StoragePoolParams(6000 * sizeof(yg::gl::Vertex),
-                                                                     sizeof(yg::gl::Vertex),
+  rmp.m_smallStoragesParams = graphics::ResourceManager::StoragePoolParams(6000 * sizeof(graphics::gl::Vertex),
+                                                                     sizeof(graphics::gl::Vertex),
                                                                      9000 * sizeof(unsigned short),
                                                                      sizeof(unsigned short),
                                                                      1,
@@ -65,8 +65,8 @@ TilingRenderPolicyMT::TilingRenderPolicyMT(Params const & p)
                                                                      true,
                                                                      true);
 
-  rmp.m_multiBlitStoragesParams = yg::ResourceManager::StoragePoolParams(500 * sizeof(yg::gl::Vertex),
-                                                                         sizeof(yg::gl::Vertex),
+  rmp.m_multiBlitStoragesParams = graphics::ResourceManager::StoragePoolParams(500 * sizeof(graphics::gl::Vertex),
+                                                                         sizeof(graphics::gl::Vertex),
                                                                          750 * sizeof(unsigned short),
                                                                          sizeof(unsigned short),
                                                                          1,
@@ -77,7 +77,7 @@ TilingRenderPolicyMT::TilingRenderPolicyMT(Params const & p)
                                                                          false,
                                                                          true);
 
-  rmp.m_renderTargetTexturesParams = yg::ResourceManager::TexturePoolParams(TileSize(),
+  rmp.m_renderTargetTexturesParams = graphics::ResourceManager::TexturePoolParams(TileSize(),
                                                                             TileSize(),
                                                                             1,
                                                                             rmp.m_texRtFormat,
@@ -89,8 +89,8 @@ TilingRenderPolicyMT::TilingRenderPolicyMT(Params const & p)
                                                                             false,
                                                                             true);
 
-  rmp.m_guiThreadStoragesParams = yg::ResourceManager::StoragePoolParams(2000 * sizeof(yg::gl::Vertex),
-                                                                         sizeof(yg::gl::Vertex),
+  rmp.m_guiThreadStoragesParams = graphics::ResourceManager::StoragePoolParams(2000 * sizeof(graphics::gl::Vertex),
+                                                                         sizeof(graphics::gl::Vertex),
                                                                          4000 * sizeof(unsigned short),
                                                                          sizeof(unsigned short),
                                                                          5,
@@ -101,7 +101,7 @@ TilingRenderPolicyMT::TilingRenderPolicyMT(Params const & p)
                                                                          true,
                                                                          true);
 
-  rmp.m_guiThreadTexturesParams = yg::ResourceManager::TexturePoolParams(256,
+  rmp.m_guiThreadTexturesParams = graphics::ResourceManager::TexturePoolParams(256,
                                                                          128,
                                                                          4,
                                                                          rmp.m_texFormat,
@@ -113,7 +113,7 @@ TilingRenderPolicyMT::TilingRenderPolicyMT(Params const & p)
                                                                          true,
                                                                          true);
 
-  rmp.m_glyphCacheParams = yg::ResourceManager::GlyphCacheParams("unicode_blocks.txt",
+  rmp.m_glyphCacheParams = graphics::ResourceManager::GlyphCacheParams("unicode_blocks.txt",
                                                                  "fonts_whitelist.txt",
                                                                  "fonts_blacklist.txt",
                                                                  2 * 1024 * 1024,
@@ -124,17 +124,17 @@ TilingRenderPolicyMT::TilingRenderPolicyMT(Params const & p)
   rmp.m_useSingleThreadedOGL = false;
   rmp.fitIntoLimits();
 
-  m_resourceManager.reset(new yg::ResourceManager(rmp));
+  m_resourceManager.reset(new graphics::ResourceManager(rmp));
 
   Platform::FilesList fonts;
   GetPlatform().GetFontNames(fonts);
   m_resourceManager->addFonts(fonts);
 
-  SetSkin(make_shared_ptr(yg::loadSkin(m_resourceManager, SkinName())));
+  SetSkin(make_shared_ptr(graphics::loadSkin(m_resourceManager, SkinName())));
 
-  DrawerYG::Params dp;
+  Drawer::Params dp;
 
-  dp.m_frameBuffer = make_shared_ptr(new yg::gl::FrameBuffer(p.m_useDefaultFB));
+  dp.m_frameBuffer = make_shared_ptr(new graphics::gl::FrameBuffer(p.m_useDefaultFB));
   dp.m_resourceManager = m_resourceManager;
   dp.m_glyphCacheID = m_resourceManager->guiThreadGlyphCacheID();
   dp.m_skin = GetSkin();
@@ -143,7 +143,7 @@ TilingRenderPolicyMT::TilingRenderPolicyMT(Params const & p)
   dp.m_isSynchronized = false;
   dp.m_fastSolidPath = true;
 
-  m_drawer.reset(new DrawerYG(dp));
+  m_drawer.reset(new Drawer(dp));
 
   InitCacheScreen();
 
diff --git a/map/tiling_render_policy_mt.hpp b/map/tiling_render_policy_mt.hpp
index d3940bc916..587569018c 100644
--- a/map/tiling_render_policy_mt.hpp
+++ b/map/tiling_render_policy_mt.hpp
@@ -2,7 +2,7 @@
 
 #include "basic_tiling_render_policy.hpp"
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
diff --git a/map/tiling_render_policy_st.cpp b/map/tiling_render_policy_st.cpp
index 02b7592cee..db746b94e0 100644
--- a/map/tiling_render_policy_st.cpp
+++ b/map/tiling_render_policy_st.cpp
@@ -2,8 +2,8 @@
 
 #include "../platform/platform.hpp"
 
-#include "../yg/internal/opengl.hpp"
-#include "../yg/skin.hpp"
+#include "../graphics/internal/opengl.hpp"
+#include "../graphics/skin.hpp"
 
 #include "window_handle.hpp"
 #include "queued_renderer.hpp"
@@ -16,11 +16,11 @@ TilingRenderPolicyST::TilingRenderPolicyST(Params const & p)
 {
   int cpuCores = GetPlatform().CpuCores();
 
-  yg::ResourceManager::Params rmp = p.m_rmParams;
+  graphics::ResourceManager::Params rmp = p.m_rmParams;
 
   rmp.checkDeviceCaps();
 
-  rmp.m_primaryTexturesParams = yg::ResourceManager::TexturePoolParams(512,
+  rmp.m_primaryTexturesParams = graphics::ResourceManager::TexturePoolParams(512,
                                                                        256,
                                                                        1,
                                                                        rmp.m_texFormat,
@@ -32,7 +32,7 @@ TilingRenderPolicyST::TilingRenderPolicyST(Params const & p)
                                                                        true,
                                                                        true);
 
-  rmp.m_fontTexturesParams = yg::ResourceManager::TexturePoolParams(256,
+  rmp.m_fontTexturesParams = graphics::ResourceManager::TexturePoolParams(256,
                                                                     256,
                                                                     10,
                                                                     rmp.m_texFormat,
@@ -44,8 +44,8 @@ TilingRenderPolicyST::TilingRenderPolicyST(Params const & p)
                                                                     true,
                                                                     true);
 
-  rmp.m_primaryStoragesParams = yg::ResourceManager::StoragePoolParams(6000 * sizeof(yg::gl::Vertex),
-                                                                       sizeof(yg::gl::Vertex),
+  rmp.m_primaryStoragesParams = graphics::ResourceManager::StoragePoolParams(6000 * sizeof(graphics::gl::Vertex),
+                                                                       sizeof(graphics::gl::Vertex),
                                                                        9000 * sizeof(unsigned short),
                                                                        sizeof(unsigned short),
                                                                        10,
@@ -56,8 +56,8 @@ TilingRenderPolicyST::TilingRenderPolicyST(Params const & p)
                                                                        true,
                                                                        true);
 
-  rmp.m_smallStoragesParams = yg::ResourceManager::StoragePoolParams(6000 * sizeof(yg::gl::Vertex),
-                                                                     sizeof(yg::gl::Vertex),
+  rmp.m_smallStoragesParams = graphics::ResourceManager::StoragePoolParams(6000 * sizeof(graphics::gl::Vertex),
+                                                                     sizeof(graphics::gl::Vertex),
                                                                      9000 * sizeof(unsigned short),
                                                                      sizeof(unsigned short),
                                                                      1,
@@ -68,8 +68,8 @@ TilingRenderPolicyST::TilingRenderPolicyST(Params const & p)
                                                                      true,
                                                                      true);
 
-  rmp.m_multiBlitStoragesParams = yg::ResourceManager::StoragePoolParams(1500 * sizeof(yg::gl::Vertex),
-                                                                         sizeof(yg::gl::Vertex),
+  rmp.m_multiBlitStoragesParams = graphics::ResourceManager::StoragePoolParams(1500 * sizeof(graphics::gl::Vertex),
+                                                                         sizeof(graphics::gl::Vertex),
                                                                          2500 * sizeof(unsigned short),
                                                                          sizeof(unsigned short),
                                                                          1,
@@ -80,7 +80,7 @@ TilingRenderPolicyST::TilingRenderPolicyST(Params const & p)
                                                                          true,
                                                                          true);
 
-  rmp.m_renderTargetTexturesParams = yg::ResourceManager::TexturePoolParams(TileSize(),
+  rmp.m_renderTargetTexturesParams = graphics::ResourceManager::TexturePoolParams(TileSize(),
                                                                             TileSize(),
                                                                             1,
                                                                             rmp.m_texRtFormat,
@@ -92,8 +92,8 @@ TilingRenderPolicyST::TilingRenderPolicyST(Params const & p)
                                                                             true,
                                                                             true);
 
-  rmp.m_guiThreadStoragesParams = yg::ResourceManager::StoragePoolParams(2000 * sizeof(yg::gl::Vertex),
-                                                                         sizeof(yg::gl::Vertex),
+  rmp.m_guiThreadStoragesParams = graphics::ResourceManager::StoragePoolParams(2000 * sizeof(graphics::gl::Vertex),
+                                                                         sizeof(graphics::gl::Vertex),
                                                                          4000 * sizeof(unsigned short),
                                                                          sizeof(unsigned short),
                                                                          5,
@@ -104,7 +104,7 @@ TilingRenderPolicyST::TilingRenderPolicyST(Params const & p)
                                                                          true,
                                                                          true);
 
-  rmp.m_guiThreadTexturesParams = yg::ResourceManager::TexturePoolParams(256,
+  rmp.m_guiThreadTexturesParams = graphics::ResourceManager::TexturePoolParams(256,
                                                                     128,
                                                                     2,
                                                                     rmp.m_texFormat,
@@ -122,7 +122,7 @@ TilingRenderPolicyST::TilingRenderPolicyST(Params const & p)
 
   debuggingFlags[0] = true;*/
 
-  rmp.m_glyphCacheParams = yg::ResourceManager::GlyphCacheParams("unicode_blocks.txt",
+  rmp.m_glyphCacheParams = graphics::ResourceManager::GlyphCacheParams("unicode_blocks.txt",
                                                                  "fonts_whitelist.txt",
                                                                  "fonts_blacklist.txt",
                                                                  2 * 1024 * 1024,
@@ -137,7 +137,7 @@ TilingRenderPolicyST::TilingRenderPolicyST(Params const & p)
 
   m_maxTilesCount = rmp.m_renderTargetTexturesParams.m_texCount;
 
-  m_resourceManager.reset(new yg::ResourceManager(rmp));
+  m_resourceManager.reset(new graphics::ResourceManager(rmp));
 
   m_QueuedRenderer->SetSinglePipelineProcessing(m_resourceManager->useReadPixelsToSynchronize());
 
@@ -145,11 +145,11 @@ TilingRenderPolicyST::TilingRenderPolicyST(Params const & p)
   GetPlatform().GetFontNames(fonts);
   m_resourceManager->addFonts(fonts);
 
-  SetSkin(make_shared_ptr(yg::loadSkin(m_resourceManager, SkinName())));
+  SetSkin(make_shared_ptr(graphics::loadSkin(m_resourceManager, SkinName())));
 
-  DrawerYG::Params dp;
+  Drawer::Params dp;
 
-  dp.m_frameBuffer = make_shared_ptr(new yg::gl::FrameBuffer(p.m_useDefaultFB));
+  dp.m_frameBuffer = make_shared_ptr(new graphics::gl::FrameBuffer(p.m_useDefaultFB));
   dp.m_resourceManager = m_resourceManager;
   dp.m_glyphCacheID = m_resourceManager->guiThreadGlyphCacheID();
   dp.m_skin = GetSkin();
@@ -159,7 +159,7 @@ TilingRenderPolicyST::TilingRenderPolicyST(Params const & p)
   dp.m_fastSolidPath = true;
 //  p.m_isDebugging = true;
 
-  m_drawer.reset(new DrawerYG(dp));
+  m_drawer.reset(new Drawer(dp));
 
   InitCacheScreen();
 
@@ -216,7 +216,7 @@ void TilingRenderPolicyST::SetRenderFn(TRenderFn renderFn)
   int cpuCores = GetPlatform().CpuCores();
   string skinName = SkinName();
 
-  yg::gl::PacketsQueue ** queues = new yg::gl::PacketsQueue*[cpuCores];
+  graphics::gl::PacketsQueue ** queues = new graphics::gl::PacketsQueue*[cpuCores];
 
   for (unsigned i = 0; i < cpuCores; ++i)
     queues[i] = m_QueuedRenderer->GetPacketsQueue(i);
diff --git a/map/window_handle.cpp b/map/window_handle.cpp
index b1b0fff36e..df2a4c0a52 100644
--- a/map/window_handle.cpp
+++ b/map/window_handle.cpp
@@ -71,12 +71,12 @@ void WindowHandle::setNeedRedraw(bool flag)
     checkTimer();
 }
 
-shared_ptr<yg::gl::RenderContext> const & WindowHandle::renderContext()
+shared_ptr<graphics::gl::RenderContext> const & WindowHandle::renderContext()
 {
   return m_renderContext;
 }
 
-void WindowHandle::setRenderContext(shared_ptr<yg::gl::RenderContext> const & renderContext)
+void WindowHandle::setRenderContext(shared_ptr<graphics::gl::RenderContext> const & renderContext)
 {
   m_renderContext = renderContext;
 }
diff --git a/map/window_handle.hpp b/map/window_handle.hpp
index b8a403d818..c6e5e26a32 100644
--- a/map/window_handle.hpp
+++ b/map/window_handle.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "events.hpp"
-#include "drawer_yg.hpp"
+#include "drawer.hpp"
 
 #include "../platform/video_timer.hpp"
 
@@ -10,7 +10,7 @@
 #include "../std/shared_ptr.hpp"
 
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
@@ -22,7 +22,7 @@ class RenderPolicy;
 
 class WindowHandle
 {
-  shared_ptr<yg::gl::RenderContext> m_renderContext;
+  shared_ptr<graphics::gl::RenderContext> m_renderContext;
   RenderPolicy * m_renderPolicy;
 
   bool m_hasPendingUpdates;
@@ -49,9 +49,9 @@ public:
 
   void setNeedRedraw(bool flag);
 
-  shared_ptr<yg::gl::RenderContext> const & renderContext();
+  shared_ptr<graphics::gl::RenderContext> const & renderContext();
 
-  void setRenderContext(shared_ptr<yg::gl::RenderContext> const & renderContext);
+  void setRenderContext(shared_ptr<graphics::gl::RenderContext> const & renderContext);
 
   bool setUpdatesEnabled(bool doEnable);
 
diff --git a/omim.pro b/omim.pro
index a27449fe38..dd6d845728 100644
--- a/omim.pro
+++ b/omim.pro
@@ -17,7 +17,7 @@ SUBDIRS = 3party \
           geometry/geometry_tests \
           platform/platform_tests \
           anim \
-          yg \
+          graphics \
           gui \
           storage storage/storage_tests \
           search search/search_tests \
@@ -26,7 +26,7 @@ SUBDIRS = 3party \
           generator/generator_tool \
           qt_tstfrm \
           indexer/indexer_tests \
-          yg/yg_tests \
+          graphics/graphics_tests \
           qt
 } else {
   # libraries which are used on mobile devices
@@ -39,7 +39,7 @@ SUBDIRS = 3party \
             anim \
             indexer \
             storage \
-            yg \
+            graphics \
             gui \
             search \
             map \
diff --git a/qt/draw_widget.cpp b/qt/draw_widget.cpp
index dbb5eca908..3da8b3b89a 100644
--- a/qt/draw_widget.cpp
+++ b/qt/draw_widget.cpp
@@ -6,7 +6,7 @@
 
 #include "../gui/controller.hpp"
 
-#include "../yg/internal/opengl.hpp"
+#include "../graphics/internal/opengl.hpp"
 
 #include "../platform/settings.hpp"
 #include "../platform/platform.hpp"
@@ -217,10 +217,10 @@ namespace qt
 
       shared_ptr<qt::gl::RenderContext> primaryRC(new qt::gl::RenderContext(this));
 
-      yg::ResourceManager::Params rmParams;
-      rmParams.m_rtFormat = yg::Data8Bpp;
-      rmParams.m_texFormat = yg::Data8Bpp;
-      rmParams.m_texRtFormat = yg::Data4Bpp;
+      graphics::ResourceManager::Params rmParams;
+      rmParams.m_rtFormat = graphics::Data8Bpp;
+      rmParams.m_texFormat = graphics::Data8Bpp;
+      rmParams.m_texRtFormat = graphics::Data4Bpp;
       rmParams.m_videoMemoryLimit = GetPlatform().VideoMemoryLimit();
 
       RenderPolicy::Params rpParams;
@@ -239,7 +239,7 @@ namespace qt
       {
         m_framework->SetRenderPolicy(CreateRenderPolicy(rpParams));
       }
-      catch (yg::gl::platform_unsupported const & e)
+      catch (graphics::gl::platform_unsupported const & e)
       {
         LOG(LERROR, ("OpenGL platform is unsupported, reason: ", e.what()));
         /// @todo Show "Please Update Drivers" dialog and close the program.
diff --git a/qt/qt.pro b/qt/qt.pro
index 34386d4979..cf0842a5a0 100644
--- a/qt/qt.pro
+++ b/qt/qt.pro
@@ -1,6 +1,6 @@
 # Main application in qt.
 ROOT_DIR = ..
-DEPENDENCIES = map gui search storage indexer yg platform anim geometry coding base \
+DEPENDENCIES = map gui search storage indexer graphics platform anim geometry coding base \
                bzip2 freetype expat fribidi tomcrypt jansson version protobuf
 
 include($$ROOT_DIR/common.pri)
diff --git a/qt/widgets.cpp b/qt/widgets.cpp
index 3e3c82ad20..903663b2bf 100644
--- a/qt/widgets.cpp
+++ b/qt/widgets.cpp
@@ -2,17 +2,17 @@
 
 #include "../qt_tstfrm/widgets_impl.hpp"
 
-#include "../map/drawer_yg.hpp"
+#include "../map/drawer.hpp"
 
 #include "../platform/platform.hpp"
 
-#include "../yg/rendercontext.hpp"
-#include "../yg/internal/opengl.hpp"
+#include "../graphics/rendercontext.hpp"
+#include "../graphics/internal/opengl.hpp"
 
 
 namespace qt
 {
-  template class GLDrawWidgetT<DrawerYG>;
+  template class GLDrawWidgetT<Drawer>;
 
   GLDrawWidget::GLDrawWidget(QWidget * pParent)
     : base_type(pParent)
@@ -35,12 +35,12 @@ namespace qt
   {
   }
 
-  shared_ptr<yg::gl::RenderContext> const & GLDrawWidget::renderContext()
+  shared_ptr<graphics::gl::RenderContext> const & GLDrawWidget::renderContext()
   {
     return m_renderContext;
   }
 
-  shared_ptr<yg::ResourceManager> const & GLDrawWidget::resourceManager()
+  shared_ptr<graphics::ResourceManager> const & GLDrawWidget::resourceManager()
   {
     return m_resourceManager;
   }
diff --git a/qt/widgets.hpp b/qt/widgets.hpp
index 505cac429b..e48d52c112 100644
--- a/qt/widgets.hpp
+++ b/qt/widgets.hpp
@@ -2,12 +2,12 @@
 
 //#include "../qt_tstfrm/widgets.hpp"
 /*#include "../map/qgl_render_context.hpp"
-#include "../yg/resource_manager.hpp"
+#include "../graphics/resource_manager.hpp"
 
-class DrawerYG;
+class Drawer;
 class VideoTimer;
 
-namespace yg
+namespace graphics
 {
   namespace gl
   {
@@ -17,25 +17,25 @@ namespace yg
 
 namespace qt
 {
-  /// Widget uses yg for drawing.
-  class GLDrawWidget : public GLDrawWidgetT<DrawerYG>
+  /// Widget uses our graphics library for drawing.
+  class GLDrawWidget : public GLDrawWidgetT<Drawer>
   {
 
-    typedef GLDrawWidgetT<DrawerYG> base_type;
-    shared_ptr<yg::gl::RenderContext> m_renderContext;
+    typedef GLDrawWidgetT<Drawer> base_type;
+    shared_ptr<graphics::gl::RenderContext> m_renderContext;
 
   protected:
 
-    shared_ptr<yg::ResourceManager> m_resourceManager;
+    shared_ptr<graphics::ResourceManager> m_resourceManager;
 
   public:
-    typedef DrawerYG drawer_t;
+    typedef Drawer drawer_t;
 
     GLDrawWidget(QWidget * pParent);
     ~GLDrawWidget();
 
-    shared_ptr<yg::gl::RenderContext> const & renderContext();
-    shared_ptr<yg::ResourceManager> const & resourceManager();
+    shared_ptr<graphics::gl::RenderContext> const & renderContext();
+    shared_ptr<graphics::ResourceManager> const & resourceManager();
 
     shared_ptr<drawer_t> const & GetDrawer() const;
 
diff --git a/qt_tstfrm/macros.hpp b/qt_tstfrm/macros.hpp
index 10f0ce3ee5..ac85415562 100644
--- a/qt_tstfrm/macros.hpp
+++ b/qt_tstfrm/macros.hpp
@@ -109,10 +109,10 @@ class GLTestWidget : public tst::GLDrawWidget
 
 public:
 
-  virtual void DoDraw(shared_ptr<yg::gl::Screen> p)
+  virtual void DoDraw(shared_ptr<graphics::gl::Screen> p)
   {
     p->beginFrame();
-    p->clear(yg::gl::Screen::s_bgColor);
+    p->clear(graphics::gl::Screen::s_bgColor);
     test.DoDraw(p);
     p->endFrame();
   }
diff --git a/qt_tstfrm/qt_tstfrm.pro b/qt_tstfrm/qt_tstfrm.pro
index 172b935503..d9b39b5609 100644
--- a/qt_tstfrm/qt_tstfrm.pro
+++ b/qt_tstfrm/qt_tstfrm.pro
@@ -3,7 +3,7 @@ TEMPLATE = lib
 CONFIG += staticlib
 
 ROOT_DIR = ..
-DEPENDENCIES = map yg geometry coding base
+DEPENDENCIES = map graphics geometry coding base
 
 include($$ROOT_DIR/common.pri)
 
diff --git a/qt_tstfrm/tstwidgets.cpp b/qt_tstfrm/tstwidgets.cpp
index f3974c9e68..c7f69d3156 100644
--- a/qt_tstfrm/tstwidgets.cpp
+++ b/qt_tstfrm/tstwidgets.cpp
@@ -2,18 +2,18 @@
 #include "widgets_impl.hpp"
 #include "screen_qt.hpp"
 
-#include "../yg/screen.hpp"
-#include "../yg/utils.hpp"
-#include "../yg/skin.hpp"
-#include "../yg/framebuffer.hpp"
-#include "../yg/renderbuffer.hpp"
-#include "../yg/resource_manager.hpp"
-#include "../yg/internal/opengl.hpp"
+#include "../graphics/screen.hpp"
+#include "../graphics/utils.hpp"
+#include "../graphics/skin.hpp"
+#include "../graphics/framebuffer.hpp"
+#include "../graphics/renderbuffer.hpp"
+#include "../graphics/resource_manager.hpp"
+#include "../graphics/internal/opengl.hpp"
 
 #include "../platform/platform.hpp"
 
 
-template class qt::GLDrawWidgetT<yg::gl::Screen>;
+template class qt::GLDrawWidgetT<graphics::gl::Screen>;
 
 namespace tst {
 
@@ -23,32 +23,32 @@ GLDrawWidget::GLDrawWidget() : base_type(0)
 
 GLDrawWidget::~GLDrawWidget()
 {
-  yg::gl::FinalizeThread();
+  graphics::gl::FinalizeThread();
 }
 
 void GLDrawWidget::initializeGL()
 {
   try
   {
-    yg::gl::InitExtensions();
-    yg::gl::CheckExtensionSupport();
-    yg::gl::InitializeThread();
+    graphics::gl::InitExtensions();
+    graphics::gl::CheckExtensionSupport();
+    graphics::gl::InitializeThread();
   }
-  catch (yg::gl::platform_unsupported & e)
+  catch (graphics::gl::platform_unsupported & e)
   {
     /// TODO: Show "Please Update Drivers" dialog and close the program.
   }
 
   m_primaryContext = make_shared_ptr(new qt::gl::RenderContext(this));
 
-  yg::ResourceManager::Params rmp;
+  graphics::ResourceManager::Params rmp;
 
-  rmp.m_rtFormat = yg::Data8Bpp;
-  rmp.m_texFormat = yg::Data8Bpp;
+  rmp.m_rtFormat = graphics::Data8Bpp;
+  rmp.m_texFormat = graphics::Data8Bpp;
 
   rmp.m_videoMemoryLimit = 20 * 1024 * 1024;
-  rmp.m_primaryStoragesParams = yg::ResourceManager::StoragePoolParams(30000 * sizeof(yg::gl::Vertex),
-                                                                       sizeof(yg::gl::Vertex),
+  rmp.m_primaryStoragesParams = graphics::ResourceManager::StoragePoolParams(30000 * sizeof(graphics::gl::Vertex),
+                                                                       sizeof(graphics::gl::Vertex),
                                                                        50000 * sizeof(unsigned short),
                                                                        sizeof(unsigned short),
                                                                        20,
@@ -59,8 +59,8 @@ void GLDrawWidget::initializeGL()
                                                                        false,
                                                                        false);
 
-  rmp.m_smallStoragesParams = yg::ResourceManager::StoragePoolParams(3000 * sizeof(yg::gl::Vertex),
-                                                                     sizeof(yg::gl::Vertex),
+  rmp.m_smallStoragesParams = graphics::ResourceManager::StoragePoolParams(3000 * sizeof(graphics::gl::Vertex),
+                                                                     sizeof(graphics::gl::Vertex),
                                                                      5000 * sizeof(unsigned short),
                                                                      sizeof(unsigned short),
                                                                      100,
@@ -71,8 +71,8 @@ void GLDrawWidget::initializeGL()
                                                                      false,
                                                                      false);
 
-  rmp.m_blitStoragesParams = yg::ResourceManager::StoragePoolParams(10 * sizeof(yg::gl::Vertex),
-                                                                    sizeof(yg::gl::Vertex),
+  rmp.m_blitStoragesParams = graphics::ResourceManager::StoragePoolParams(10 * sizeof(graphics::gl::Vertex),
+                                                                    sizeof(graphics::gl::Vertex),
                                                                     10 * sizeof(unsigned short),
                                                                     sizeof(unsigned short),
                                                                     30,
@@ -83,8 +83,8 @@ void GLDrawWidget::initializeGL()
                                                                     false,
                                                                     false);
 
-  rmp.m_multiBlitStoragesParams = yg::ResourceManager::StoragePoolParams(500 * sizeof(yg::gl::Vertex),
-                                                                         sizeof(yg::gl::Vertex),
+  rmp.m_multiBlitStoragesParams = graphics::ResourceManager::StoragePoolParams(500 * sizeof(graphics::gl::Vertex),
+                                                                         sizeof(graphics::gl::Vertex),
                                                                          500 * sizeof(unsigned short),
                                                                          sizeof(unsigned short),
                                                                          10,
@@ -95,7 +95,7 @@ void GLDrawWidget::initializeGL()
                                                                          false,
                                                                          false);
 
-  rmp.m_primaryTexturesParams = yg::ResourceManager::TexturePoolParams(512,
+  rmp.m_primaryTexturesParams = graphics::ResourceManager::TexturePoolParams(512,
                                                                        256,
                                                                        10,
                                                                        rmp.m_texFormat,
@@ -107,7 +107,7 @@ void GLDrawWidget::initializeGL()
                                                                        false,
                                                                        false);
 
-  rmp.m_fontTexturesParams = yg::ResourceManager::TexturePoolParams(512,
+  rmp.m_fontTexturesParams = graphics::ResourceManager::TexturePoolParams(512,
                                                                     256,
                                                                     5,
                                                                     rmp.m_texFormat,
@@ -119,7 +119,7 @@ void GLDrawWidget::initializeGL()
                                                                     false,
                                                                     false);
 
-  rmp.m_glyphCacheParams = yg::ResourceManager::GlyphCacheParams("unicode_blocks.txt",
+  rmp.m_glyphCacheParams = graphics::ResourceManager::GlyphCacheParams("unicode_blocks.txt",
                                                                  "fonts_whitelist.txt",
                                                                  "fonts_blacklist.txt",
                                                                  2 * 1024 * 1024,
@@ -128,28 +128,28 @@ void GLDrawWidget::initializeGL()
 
   rmp.m_useSingleThreadedOGL = false;
 
-  m_resourceManager.reset(new yg::ResourceManager(rmp));
+  m_resourceManager.reset(new graphics::ResourceManager(rmp));
 
   Platform::FilesList fonts;
   GetPlatform().GetFontNames(fonts);
   m_resourceManager->addFonts(fonts);
 
-  m_frameBuffer = make_shared_ptr(new yg::gl::FrameBuffer());
+  m_frameBuffer = make_shared_ptr(new graphics::gl::FrameBuffer());
 
-  DrawerYG::Params params;
+  Drawer::Params params;
   params.m_resourceManager = m_resourceManager;
   params.m_frameBuffer = m_frameBuffer;
   params.m_glyphCacheID = m_resourceManager->guiThreadGlyphCacheID();
 
-  m_p = make_shared_ptr(new yg::gl::Screen(params));
+  m_p = make_shared_ptr(new graphics::gl::Screen(params));
 
-  m_primaryFrameBuffer = make_shared_ptr(new yg::gl::FrameBuffer(true));
+  m_primaryFrameBuffer = make_shared_ptr(new graphics::gl::FrameBuffer(true));
 
-  m_skin = shared_ptr<yg::Skin>(loadSkin(m_resourceManager, "basic_mdpi.skn"));
+  m_skin = shared_ptr<graphics::Skin>(loadSkin(m_resourceManager, "basic_mdpi.skn"));
   m_p->setSkin(m_skin);
 
   params.m_frameBuffer = m_primaryFrameBuffer;
-  m_primaryScreen = make_shared_ptr(new yg::gl::Screen(params));
+  m_primaryScreen = make_shared_ptr(new graphics::gl::Screen(params));
 }
 
 void GLDrawWidget::resizeGL(int w, int h)
@@ -161,11 +161,11 @@ void GLDrawWidget::resizeGL(int w, int h)
   m_primaryFrameBuffer->onSize(w, h);
 
   m_depthBuffer.reset();
-  m_depthBuffer = make_shared_ptr(new yg::gl::RenderBuffer(w, h, true));
+  m_depthBuffer = make_shared_ptr(new graphics::gl::RenderBuffer(w, h, true));
   m_frameBuffer->setDepthBuffer(m_depthBuffer);
 
   m_renderTarget.reset();
-  m_renderTarget = make_shared_ptr(new yg::gl::RGBA8Texture(w, h));
+  m_renderTarget = make_shared_ptr(new graphics::gl::RGBA8Texture(w, h));
   m_p->setRenderTarget(m_renderTarget);
 }
 
@@ -174,7 +174,7 @@ void GLDrawWidget::paintGL()
 //  m_renderTarget->dump("renderTarget.png");
 
   m_p->beginFrame();
-  m_p->clear(yg::Color(182, 182, 182, 255));
+  m_p->clear(graphics::Color(182, 182, 182, 255));
   DoDraw(m_p);
   m_p->endFrame();
 
diff --git a/qt_tstfrm/tstwidgets.hpp b/qt_tstfrm/tstwidgets.hpp
index 545140d1da..93a4f62b33 100644
--- a/qt_tstfrm/tstwidgets.hpp
+++ b/qt_tstfrm/tstwidgets.hpp
@@ -2,16 +2,16 @@
 
 #include "widgets.hpp"
 
-#include "../yg/texture.hpp"
-#include "../yg/resource_manager.hpp"
-#include "../yg/renderbuffer.hpp"
-#include "../map/drawer_yg.hpp"
+#include "../graphics/texture.hpp"
+#include "../graphics/resource_manager.hpp"
+#include "../graphics/renderbuffer.hpp"
+#include "../map/drawer.hpp"
 #include "../map/qgl_render_context.hpp"
 
 #include "../std/shared_ptr.hpp"
 
 
-namespace yg
+namespace graphics
 {
   class Skin;
   namespace gl
@@ -24,20 +24,20 @@ namespace qt { class Screen; }
 
 namespace tst
 {
-  class GLDrawWidget : public qt::GLDrawWidgetT<yg::gl::Screen>
+  class GLDrawWidget : public qt::GLDrawWidgetT<graphics::gl::Screen>
   {
   protected:
-    typedef qt::GLDrawWidgetT<yg::gl::Screen> base_type;
+    typedef qt::GLDrawWidgetT<graphics::gl::Screen> base_type;
 
-    shared_ptr<yg::ResourceManager> m_resourceManager;
+    shared_ptr<graphics::ResourceManager> m_resourceManager;
 
-    shared_ptr<yg::gl::FrameBuffer> m_primaryFrameBuffer;
-    shared_ptr<yg::gl::FrameBuffer> m_frameBuffer;
-    shared_ptr<yg::gl::RGBA8Texture> m_renderTarget;
-    shared_ptr<yg::gl::RenderBuffer> m_depthBuffer;
-    shared_ptr<yg::Skin> m_skin;
+    shared_ptr<graphics::gl::FrameBuffer> m_primaryFrameBuffer;
+    shared_ptr<graphics::gl::FrameBuffer> m_frameBuffer;
+    shared_ptr<graphics::gl::RGBA8Texture> m_renderTarget;
+    shared_ptr<graphics::gl::RenderBuffer> m_depthBuffer;
+    shared_ptr<graphics::Skin> m_skin;
     shared_ptr<qt::gl::RenderContext> m_primaryContext;
-    shared_ptr<yg::gl::Screen> m_primaryScreen;
+    shared_ptr<graphics::gl::Screen> m_primaryScreen;
 
   public:
 
diff --git a/qt_tstfrm/widgets.hpp b/qt_tstfrm/widgets.hpp
index 50ca28f3f9..eb67d83af1 100644
--- a/qt_tstfrm/widgets.hpp
+++ b/qt_tstfrm/widgets.hpp
@@ -2,7 +2,7 @@
 
 #include <QtOpenGL/qgl.h>
 
-#include "../map/drawer_yg.hpp"
+#include "../map/drawer.hpp"
 
 #include "../std/shared_ptr.hpp"
 
@@ -27,7 +27,7 @@ namespace qt
     //@}
   };
 
-  /// Widget uses yg for drawing.
+  /// Widget uses our graphics library for drawing.
   template <class T> class GLDrawWidgetT : public BaseDrawWidget<T, QGLWidget>
   {
     typedef BaseDrawWidget<T, QGLWidget> base_type;