rename llmr => mbgl

112 files changed, 556 insertions, 556 deletions

diff --git a/include/llmr/geometry/interpolate.hpp b/include/llmr/geometry/interpolate.hpp
deleted file mode 100644
index 0014d56aad..0000000000
--- a/include/llmr/geometry/interpolate.hpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef LLMR_GEOMETRY_INTERPOLATE
-#define LLMR_GEOMETRY_INTERPOLATE
-
-#include <llmr/geometry/anchor.hpp>
-#include <llmr/util/math.hpp>
-
-namespace llmr {
-
-Anchors interpolate(const std::vector<Coordinate> &vertices, float spacing,
-                    float minScale = 0.0f, int start = 0);
-}
-
-#endif
diff --git a/include/llmr/style/property_value.hpp b/include/llmr/style/property_value.hpp
deleted file mode 100644
index 3e2a675b53..0000000000
--- a/include/llmr/style/property_value.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef LLMR_STYLE_PROPERTY_VALUE
-#define LLMR_STYLE_PROPERTY_VALUE
-
-#include <llmr/util/variant.hpp>
-#include <llmr/style/function_properties.hpp>
-#include <llmr/style/types.hpp>
-
-namespace llmr {
-
-typedef util::variant<
-    std::string,
-    TranslateAnchorType,
-    RotateAnchorType,
-    Function<bool>,
-    Function<float>,
-    Function<Color>
-> PropertyValue;
-
-}
-
-#endif
diff --git a/include/llmr/geometry/anchor.hpp b/include/mbgl/geometry/anchor.hpp
index dd97c507f2..ab006530ff 100644
--- a/include/llmr/geometry/anchor.hpp
+++ b/include/mbgl/geometry/anchor.hpp
@@ -1,9 +1,9 @@
-#ifndef LLMR_GEOMETRY_ANCHOR
-#define LLMR_GEOMETRY_ANCHOR
+#ifndef MBGL_GEOMETRY_ANCHOR
+#define MBGL_GEOMETRY_ANCHOR
 
 #include <vector>
 
-namespace llmr {
+namespace mbgl {
 
 struct Anchor {
     float x = 0.0f;
diff --git a/include/llmr/geometry/binpack.hpp b/include/mbgl/geometry/binpack.hpp
index 11536ee8b3..9aadaa202c 100644
--- a/include/llmr/geometry/binpack.hpp
+++ b/include/mbgl/geometry/binpack.hpp
@@ -1,12 +1,12 @@
-#ifndef LLMR_GEOMETRY_BINPACK
-#define LLMR_GEOMETRY_BINPACK
+#ifndef MBGL_GEOMETRY_BINPACK
+#define MBGL_GEOMETRY_BINPACK
 
-#include <llmr/util/noncopyable.hpp>
-#include <llmr/util/rect.hpp>
+#include <mbgl/util/noncopyable.hpp>
+#include <mbgl/util/rect.hpp>
 #include <cstdint>
 #include <list>
 
-namespace llmr {
+namespace mbgl {
 
 template <typename T>
 class BinPack : private util::noncopyable {
diff --git a/include/llmr/geometry/buffer.hpp b/include/mbgl/geometry/buffer.hpp
index 607f902bf1..20489cb33c 100644
--- a/include/llmr/geometry/buffer.hpp
+++ b/include/mbgl/geometry/buffer.hpp
@@ -1,14 +1,14 @@
-#ifndef LLMR_GEOMETRY_BUFFER
-#define LLMR_GEOMETRY_BUFFER
+#ifndef MBGL_GEOMETRY_BUFFER
+#define MBGL_GEOMETRY_BUFFER
 
-#include <llmr/platform/gl.hpp>
-#include <llmr/util/noncopyable.hpp>
+#include <mbgl/platform/gl.hpp>
+#include <mbgl/util/noncopyable.hpp>
 
 #include <cstdlib>
 #include <cassert>
 #include <stdexcept>
 
-namespace llmr {
+namespace mbgl {
 
 template <
     size_t item_size,
diff --git a/include/llmr/geometry/debug_font_buffer.hpp b/include/mbgl/geometry/debug_font_buffer.hpp
index 15f6daf07f..7cceb0f576 100644
--- a/include/llmr/geometry/debug_font_buffer.hpp
+++ b/include/mbgl/geometry/debug_font_buffer.hpp
@@ -1,9 +1,9 @@
-#ifndef LLMR_GEOMETRY_DEBUG_FONT_BUFFER
-#define LLMR_GEOMETRY_DEBUG_FONT_BUFFER
+#ifndef MBGL_GEOMETRY_DEBUG_FONT_BUFFER
+#define MBGL_GEOMETRY_DEBUG_FONT_BUFFER
 
 #include "buffer.hpp"
 
-namespace llmr {
+namespace mbgl {
 
 class DebugFontBuffer : public Buffer<
     4 // 2 bytes per coordinate, 2 coordinates
diff --git a/include/llmr/geometry/elements_buffer.hpp b/include/mbgl/geometry/elements_buffer.hpp
index a058312bda..ed60338e08 100644
--- a/include/llmr/geometry/elements_buffer.hpp
+++ b/include/mbgl/geometry/elements_buffer.hpp
@@ -1,10 +1,10 @@
-#ifndef LLMR_GEOMETRY_TRIANGLE_ELEMENTS_BUFFER
-#define LLMR_GEOMETRY_TRIANGLE_ELEMENTS_BUFFER
+#ifndef MBGL_GEOMETRY_TRIANGLE_ELEMENTS_BUFFER
+#define MBGL_GEOMETRY_TRIANGLE_ELEMENTS_BUFFER
 
-#include <llmr/geometry/buffer.hpp>
-#include <llmr/geometry/vao.hpp>
+#include <mbgl/geometry/buffer.hpp>
+#include <mbgl/geometry/vao.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 struct ElementGroup {
     VertexArrayObject array;
diff --git a/include/llmr/geometry/fill_buffer.hpp b/include/mbgl/geometry/fill_buffer.hpp
index 9aebe35abf..4a3d5a5b38 100644
--- a/include/llmr/geometry/fill_buffer.hpp
+++ b/include/mbgl/geometry/fill_buffer.hpp
@@ -1,11 +1,11 @@
-#ifndef LLMR_GEOMETRY_FILL_BUFFER
-#define LLMR_GEOMETRY_FILL_BUFFER
+#ifndef MBGL_GEOMETRY_FILL_BUFFER
+#define MBGL_GEOMETRY_FILL_BUFFER
 
 #include "buffer.hpp"
 #include <vector>
 #include <cstdint>
 
-namespace llmr {
+namespace mbgl {
 
 class FillVertexBuffer : public Buffer<
     4 // bytes per coordinates (2 * unsigned short == 4 bytes)
diff --git a/include/llmr/geometry/geometry.hpp b/include/mbgl/geometry/geometry.hpp
index 2f321934a7..47981ce83b 100644
--- a/include/llmr/geometry/geometry.hpp
+++ b/include/mbgl/geometry/geometry.hpp
@@ -1,12 +1,12 @@
-#ifndef LLMR_GEOMETRY_GEOMETRY
-#define LLMR_GEOMETRY_GEOMETRY
+#ifndef MBGL_GEOMETRY_GEOMETRY
+#define MBGL_GEOMETRY_GEOMETRY
 
-#include <llmr/util/pbf.hpp>
-#include <llmr/util/noncopyable.hpp>
+#include <mbgl/util/pbf.hpp>
+#include <mbgl/util/noncopyable.hpp>
 
 #include <cstdlib>
 
-namespace llmr {
+namespace mbgl {
 
 class Geometry : private util::noncopyable {
 
diff --git a/include/llmr/geometry/glyph_atlas.hpp b/include/mbgl/geometry/glyph_atlas.hpp
index 0aada6a733..e05cbe3b90 100644
--- a/include/llmr/geometry/glyph_atlas.hpp
+++ b/include/mbgl/geometry/glyph_atlas.hpp
@@ -1,8 +1,8 @@
-#ifndef LLMR_GEOMETRY_GLYPH_ATLAS
-#define LLMR_GEOMETRY_GLYPH_ATLAS
+#ifndef MBGL_GEOMETRY_GLYPH_ATLAS
+#define MBGL_GEOMETRY_GLYPH_ATLAS
 
-#include <llmr/geometry/binpack.hpp>
-#include <llmr/text/glyph_store.hpp>
+#include <mbgl/geometry/binpack.hpp>
+#include <mbgl/text/glyph_store.hpp>
 
 #include <string>
 #include <set>
@@ -10,7 +10,7 @@
 #include <mutex>
 #include <atomic>
 
-namespace llmr {
+namespace mbgl {
 
 class GlyphAtlas {
 public:
diff --git a/include/llmr/geometry/icon_buffer.hpp b/include/mbgl/geometry/icon_buffer.hpp
index 6bb0ec30c1..346b3b5f06 100644
--- a/include/llmr/geometry/icon_buffer.hpp
+++ b/include/mbgl/geometry/icon_buffer.hpp
@@ -1,9 +1,9 @@
-#ifndef LLMR_GEOMETRY_ICON_BUFFER
-#define LLMR_GEOMETRY_ICON_BUFFER
+#ifndef MBGL_GEOMETRY_ICON_BUFFER
+#define MBGL_GEOMETRY_ICON_BUFFER
 
 #include "buffer.hpp"
 
-namespace llmr {
+namespace mbgl {
 
     class IconVertexBuffer : public Buffer<
     4 + // int16 x/y coordinates per vertex (== 4 bytes)
diff --git a/include/mbgl/geometry/interpolate.hpp b/include/mbgl/geometry/interpolate.hpp
new file mode 100644
index 0000000000..cebbcc7028
--- /dev/null
+++ b/include/mbgl/geometry/interpolate.hpp
@@ -0,0 +1,13 @@
+#ifndef MBGL_GEOMETRY_INTERPOLATE
+#define MBGL_GEOMETRY_INTERPOLATE
+
+#include <mbgl/geometry/anchor.hpp>
+#include <mbgl/util/math.hpp>
+
+namespace mbgl {
+
+Anchors interpolate(const std::vector<Coordinate> &vertices, float spacing,
+                    float minScale = 0.0f, int start = 0);
+}
+
+#endif
diff --git a/include/llmr/geometry/line_buffer.hpp b/include/mbgl/geometry/line_buffer.hpp
index 289f1bc6eb..5012bb12ac 100644
--- a/include/llmr/geometry/line_buffer.hpp
+++ b/include/mbgl/geometry/line_buffer.hpp
@@ -1,9 +1,9 @@
-#ifndef LLMR_GEOMETRY_LINE_BUFFER
-#define LLMR_GEOMETRY_LINE_BUFFER
+#ifndef MBGL_GEOMETRY_LINE_BUFFER
+#define MBGL_GEOMETRY_LINE_BUFFER
 
 #include "buffer.hpp"
 
-namespace llmr {
+namespace mbgl {
 
 class LineVertexBuffer : public Buffer<
     8 // 2 coordinates per vertex + 1 linesofar + 1 extrude coord pair == 4 (== 8 bytes)
diff --git a/include/llmr/geometry/sprite_atlas.hpp b/include/mbgl/geometry/sprite_atlas.hpp
index 13b85e5480..4b55540cc8 100644
--- a/include/llmr/geometry/sprite_atlas.hpp
+++ b/include/mbgl/geometry/sprite_atlas.hpp
@@ -1,7 +1,7 @@
-#ifndef LLMR_GEOMETRY_SPRITE_ATLAS
-#define LLMR_GEOMETRY_SPRITE_ATLAS
+#ifndef MBGL_GEOMETRY_SPRITE_ATLAS
+#define MBGL_GEOMETRY_SPRITE_ATLAS
 
-#include <llmr/geometry/binpack.hpp>
+#include <mbgl/geometry/binpack.hpp>
 
 #include <string>
 #include <map>
@@ -9,7 +9,7 @@
 #include <atomic>
 #include <set>
 
-namespace llmr {
+namespace mbgl {
 
 class Sprite;
 class SpritePosition;
diff --git a/include/llmr/geometry/text_buffer.hpp b/include/mbgl/geometry/text_buffer.hpp
index 8d4cba2856..159f3207a8 100644
--- a/include/llmr/geometry/text_buffer.hpp
+++ b/include/mbgl/geometry/text_buffer.hpp
@@ -1,10 +1,10 @@
-#ifndef LLMR_GEOMETRY_TEXT_BUFFER
-#define LLMR_GEOMETRY_TEXT_BUFFER
+#ifndef MBGL_GEOMETRY_TEXT_BUFFER
+#define MBGL_GEOMETRY_TEXT_BUFFER
 
 #include "buffer.hpp"
 #include <array>
 
-namespace llmr {
+namespace mbgl {
 
 class TextVertexBuffer : public Buffer <
     16,
diff --git a/include/llmr/geometry/vao.hpp b/include/mbgl/geometry/vao.hpp
index 64b324372c..71d7ff89fe 100644
--- a/include/llmr/geometry/vao.hpp
+++ b/include/mbgl/geometry/vao.hpp
@@ -1,11 +1,11 @@
-#ifndef LLMR_GEOMETRY_VAO
-#define LLMR_GEOMETRY_VAO
+#ifndef MBGL_GEOMETRY_VAO
+#define MBGL_GEOMETRY_VAO
 
-#include <llmr/platform/gl.hpp>
+#include <mbgl/platform/gl.hpp>
 
 #include <stdexcept>
 
-namespace llmr {
+namespace mbgl {
 
 class VertexArrayObject {
 public:
diff --git a/include/llmr/geometry/vertex_buffer.hpp b/include/mbgl/geometry/vertex_buffer.hpp
index 9478d7b15f..58fd4a9d03 100644
--- a/include/llmr/geometry/vertex_buffer.hpp
+++ b/include/mbgl/geometry/vertex_buffer.hpp
@@ -1,12 +1,12 @@
-#ifndef LLMR_GEOMETRY_VERTEX_BUFFER
-#define LLMR_GEOMETRY_VERTEX_BUFFER
+#ifndef MBGL_GEOMETRY_VERTEX_BUFFER
+#define MBGL_GEOMETRY_VERTEX_BUFFER
 
 #include <vector>
 #include <cstddef>
 #include <cstdint>
 #include <cmath>
 
-namespace llmr {
+namespace mbgl {
 
 class VertexBuffer {
 public:
diff --git a/include/llmr/map/map.hpp b/include/mbgl/map/map.hpp
index af4250c357..774e5e1292 100644
--- a/include/llmr/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -1,23 +1,23 @@
 
-#ifndef LLMR_MAP_MAP
-#define LLMR_MAP_MAP
+#ifndef MBGL_MAP_MAP
+#define MBGL_MAP_MAP
 
 #include <uv.h>
 
-#include <llmr/map/view.hpp>
-#include <llmr/map/transform.hpp>
-#include <llmr/style/style.hpp>
-#include <llmr/geometry/glyph_atlas.hpp>
-#include <llmr/text/glyph_store.hpp>
-#include <llmr/renderer/painter.hpp>
-#include <llmr/util/noncopyable.hpp>
-#include <llmr/util/texturepool.hpp>
+#include <mbgl/map/view.hpp>
+#include <mbgl/map/transform.hpp>
+#include <mbgl/style/style.hpp>
+#include <mbgl/geometry/glyph_atlas.hpp>
+#include <mbgl/text/glyph_store.hpp>
+#include <mbgl/renderer/painter.hpp>
+#include <mbgl/util/noncopyable.hpp>
+#include <mbgl/util/texturepool.hpp>
 
 #include <cstdint>
 #include <string>
 #include <map>
 
-namespace llmr {
+namespace mbgl {
 
 class Source;
 class SpriteAtlas;
diff --git a/include/llmr/map/raster_tile_data.hpp b/include/mbgl/map/raster_tile_data.hpp
index f84b540d48..976faa91bc 100644
--- a/include/llmr/map/raster_tile_data.hpp
+++ b/include/mbgl/map/raster_tile_data.hpp
@@ -1,12 +1,12 @@
-#ifndef LLMR_MAP_RASTER_TILE_DATA
-#define LLMR_MAP_RASTER_TILE_DATA
+#ifndef MBGL_MAP_RASTER_TILE_DATA
+#define MBGL_MAP_RASTER_TILE_DATA
 
-#include <llmr/map/tile_data.hpp>
+#include <mbgl/map/tile_data.hpp>
 
-#include <llmr/renderer/raster_bucket.hpp>
+#include <mbgl/renderer/raster_bucket.hpp>
 
 
-namespace llmr {
+namespace mbgl {
 
 class RasterTileData : public TileData {
     friend class TileParser;
diff --git a/include/llmr/map/source.hpp b/include/mbgl/map/source.hpp
index b8ffc27f52..be5fad3af8 100644
--- a/include/llmr/map/source.hpp
+++ b/include/mbgl/map/source.hpp
@@ -1,12 +1,12 @@
-#ifndef LLMR_MAP_SOURCE
-#define LLMR_MAP_SOURCE
+#ifndef MBGL_MAP_SOURCE
+#define MBGL_MAP_SOURCE
 
-#include <llmr/map/tile.hpp>
-#include <llmr/map/tile_data.hpp>
-#include <llmr/util/noncopyable.hpp>
-#include <llmr/util/time.hpp>
-#include <llmr/style/style_source.hpp>
-#include <llmr/style/types.hpp>
+#include <mbgl/map/tile.hpp>
+#include <mbgl/map/tile_data.hpp>
+#include <mbgl/util/noncopyable.hpp>
+#include <mbgl/util/time.hpp>
+#include <mbgl/style/style_source.hpp>
+#include <mbgl/style/types.hpp>
 
 #include <list>
 #include <forward_list>
@@ -16,7 +16,7 @@
 #include <map>
 #include <set>
 
-namespace llmr {
+namespace mbgl {
 
 class TransformState;
 class Texturepool;
diff --git a/include/llmr/map/sprite.hpp b/include/mbgl/map/sprite.hpp
index 079f0decc0..22126eb6a1 100644
--- a/include/llmr/map/sprite.hpp
+++ b/include/mbgl/map/sprite.hpp
@@ -1,8 +1,8 @@
-#ifndef LLMR_STYLE_SPRITE
-#define LLMR_STYLE_SPRITE
+#ifndef MBGL_STYLE_SPRITE
+#define MBGL_STYLE_SPRITE
 
-#include <llmr/util/raster.hpp>
-#include <llmr/util/vec.hpp>
+#include <mbgl/util/raster.hpp>
+#include <mbgl/util/vec.hpp>
 
 #include <string>
 #include <mutex>
@@ -10,7 +10,7 @@
 #include <atomic>
 #include <unordered_map>
 
-namespace llmr {
+namespace mbgl {
 
 class Map;
 
diff --git a/include/llmr/map/tile.hpp b/include/mbgl/map/tile.hpp
index 9681c36374..7e868afad9 100644
--- a/include/llmr/map/tile.hpp
+++ b/include/mbgl/map/tile.hpp
@@ -1,9 +1,9 @@
-#ifndef LLMR_MAP_TILE
-#define LLMR_MAP_TILE
+#ifndef MBGL_MAP_TILE
+#define MBGL_MAP_TILE
 
-#include <llmr/util/vec.hpp>
-#include <llmr/util/mat4.hpp>
-#include <llmr/util/noncopyable.hpp>
+#include <mbgl/util/vec.hpp>
+#include <mbgl/util/mat4.hpp>
+#include <mbgl/util/noncopyable.hpp>
 
 #include <cstdint>
 #include <forward_list>
@@ -11,7 +11,7 @@
 #include <bitset>
 #include <memory>
 
-namespace llmr {
+namespace mbgl {
 
 class TileData;
 
diff --git a/include/llmr/map/tile_data.hpp b/include/mbgl/map/tile_data.hpp
index 09f36d59b0..a4b73c339f 100644
--- a/include/llmr/map/tile_data.hpp
+++ b/include/mbgl/map/tile_data.hpp
@@ -1,18 +1,18 @@
-#ifndef LLMR_MAP_TILE_DATA
-#define LLMR_MAP_TILE_DATA
+#ifndef MBGL_MAP_TILE_DATA
+#define MBGL_MAP_TILE_DATA
 
-#include <llmr/map/tile.hpp>
-#include <llmr/util/noncopyable.hpp>
-#include <llmr/platform/platform.hpp>
-#include <llmr/geometry/vao.hpp>
-#include <llmr/renderer/debug_bucket.hpp>
+#include <mbgl/map/tile.hpp>
+#include <mbgl/util/noncopyable.hpp>
+#include <mbgl/platform/platform.hpp>
+#include <mbgl/geometry/vao.hpp>
+#include <mbgl/renderer/debug_bucket.hpp>
 
 #include <cstdint>
 #include <string>
 #include <memory>
 #include <atomic>
 
-namespace llmr {
+namespace mbgl {
 
 class Map;
 class Painter;
diff --git a/include/llmr/map/tile_parser.hpp b/include/mbgl/map/tile_parser.hpp
index e18c2746af..14e00946b8 100644
--- a/include/llmr/map/tile_parser.hpp
+++ b/include/mbgl/map/tile_parser.hpp
@@ -1,14 +1,14 @@
-#ifndef LLMR_MAP_TILE_PARSER
-#define LLMR_MAP_TILE_PARSER
+#ifndef MBGL_MAP_TILE_PARSER
+#define MBGL_MAP_TILE_PARSER
 
-#include <llmr/map/vector_tile.hpp>
-#include <llmr/text/placement.hpp>
-#include <llmr/text/glyph_store.hpp>
-#include <llmr/text/glyph.hpp>
-#include <llmr/util/utf.hpp>
-#include <llmr/style/filter_expression.hpp>
+#include <mbgl/map/vector_tile.hpp>
+#include <mbgl/text/placement.hpp>
+#include <mbgl/text/glyph_store.hpp>
+#include <mbgl/text/glyph.hpp>
+#include <mbgl/util/utf.hpp>
+#include <mbgl/style/filter_expression.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 class Style;
 class GlyphAtlas;
diff --git a/include/llmr/map/transform.hpp b/include/mbgl/map/transform.hpp
index 16e5b21e87..61bef76563 100644
--- a/include/llmr/map/transform.hpp
+++ b/include/mbgl/map/transform.hpp
@@ -1,16 +1,16 @@
-#ifndef LLMR_MAP_TRANSFORM
-#define LLMR_MAP_TRANSFORM
+#ifndef MBGL_MAP_TRANSFORM
+#define MBGL_MAP_TRANSFORM
 
-#include <llmr/util/transition.hpp>
-#include <llmr/util/noncopyable.hpp>
-#include <llmr/util/uv.hpp>
+#include <mbgl/util/transition.hpp>
+#include <mbgl/util/noncopyable.hpp>
+#include <mbgl/util/uv.hpp>
 
 #include "view.hpp"
 #include "transform_state.hpp"
 
 #include <forward_list>
 
-namespace llmr {
+namespace mbgl {
 
 struct box;
 
diff --git a/include/llmr/map/transform_state.hpp b/include/mbgl/map/transform_state.hpp
index 29d0f59c46..85dd2eb87d 100644
--- a/include/llmr/map/transform_state.hpp
+++ b/include/mbgl/map/transform_state.hpp
@@ -1,12 +1,12 @@
-#ifndef LLMR_MAP_TRANSFORM_STATE
-#define LLMR_MAP_TRANSFORM_STATE
+#ifndef MBGL_MAP_TRANSFORM_STATE
+#define MBGL_MAP_TRANSFORM_STATE
 
-#include <llmr/util/mat4.hpp>
-#include <llmr/map/tile.hpp>
+#include <mbgl/util/mat4.hpp>
+#include <mbgl/map/tile.hpp>
 
 #include <cstdint>
 
-namespace llmr {
+namespace mbgl {
 
 class Transform;
 
diff --git a/include/llmr/map/vector_tile.hpp b/include/mbgl/map/vector_tile.hpp
index 4a77f83172..77e379865f 100644
--- a/include/llmr/map/vector_tile.hpp
+++ b/include/mbgl/map/vector_tile.hpp
@@ -1,18 +1,18 @@
-#ifndef LLMR_MAP_VECTOR_TILE
-#define LLMR_MAP_VECTOR_TILE
-
-#include <llmr/util/pbf.hpp>
-#include <llmr/util/vec.hpp>
-#include <llmr/style/value.hpp>
-#include <llmr/text/glyph.hpp>
-#include <llmr/style/filter_expression.hpp>
+#ifndef MBGL_MAP_VECTOR_TILE
+#define MBGL_MAP_VECTOR_TILE
+
+#include <mbgl/util/pbf.hpp>
+#include <mbgl/util/vec.hpp>
+#include <mbgl/style/value.hpp>
+#include <mbgl/text/glyph.hpp>
+#include <mbgl/style/filter_expression.hpp>
 #include <vector>
 #include <map>
 #include <unordered_map>
 #include <set>
 #include <limits>
 
-namespace llmr {
+namespace mbgl {
 
 class BucketDescription;
 class VectorTileLayer;
diff --git a/include/llmr/map/vector_tile_data.hpp b/include/mbgl/map/vector_tile_data.hpp
index d6f5391c22..dd55e8dae1 100644
--- a/include/llmr/map/vector_tile_data.hpp
+++ b/include/mbgl/map/vector_tile_data.hpp
@@ -1,22 +1,22 @@
-#ifndef LLMR_MAP_VECTOR_TILE_DATA
-#define LLMR_MAP_VECTOR_TILE_DATA
+#ifndef MBGL_MAP_VECTOR_TILE_DATA
+#define MBGL_MAP_VECTOR_TILE_DATA
 
-#include <llmr/map/tile_data.hpp>
+#include <mbgl/map/tile_data.hpp>
 
 
-#include <llmr/renderer/bucket.hpp>
+#include <mbgl/renderer/bucket.hpp>
 
-#include <llmr/geometry/vertex_buffer.hpp>
-#include <llmr/geometry/elements_buffer.hpp>
-#include <llmr/geometry/fill_buffer.hpp>
-#include <llmr/geometry/line_buffer.hpp>
-#include <llmr/geometry/icon_buffer.hpp>
-#include <llmr/geometry/text_buffer.hpp>
-#include <llmr/map/tile_parser.hpp>
+#include <mbgl/geometry/vertex_buffer.hpp>
+#include <mbgl/geometry/elements_buffer.hpp>
+#include <mbgl/geometry/fill_buffer.hpp>
+#include <mbgl/geometry/line_buffer.hpp>
+#include <mbgl/geometry/icon_buffer.hpp>
+#include <mbgl/geometry/text_buffer.hpp>
+#include <mbgl/map/tile_parser.hpp>
 
 #include <unordered_map>
 
-namespace llmr {
+namespace mbgl {
 
 
 class VectorTileData : public TileData {
diff --git a/include/llmr/map/view.hpp b/include/mbgl/map/view.hpp
index d1fa58aa71..92d60d4d02 100644
--- a/include/llmr/map/view.hpp
+++ b/include/mbgl/map/view.hpp
@@ -1,9 +1,9 @@
-#ifndef LLMR_MAP_VIEW
-#define LLMR_MAP_VIEW
+#ifndef MBGL_MAP_VIEW
+#define MBGL_MAP_VIEW
 
-#include <llmr/util/time.hpp>
+#include <mbgl/util/time.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 class Map;
 
@@ -47,7 +47,7 @@ public:
     virtual void notify_map_change(MapChange change, timestamp delay = 0) = 0;
 
 protected:
-    llmr::Map *map = nullptr;
+    mbgl::Map *map = nullptr;
 };
 }
 
diff --git a/include/llmr/llmr.hpp b/include/mbgl/mbgl.hpp
index 349b15d8c9..90abd4e11e 100644
--- a/include/llmr/llmr.hpp
+++ b/include/mbgl/mbgl.hpp
@@ -1,5 +1,5 @@
-#ifndef LLMR_MAIN
-#define LLMR_MAIN
+#ifndef MBGL_MAIN
+#define MBGL_MAIN
 
 #include "map/map.hpp"
 #include "map/view.hpp"
diff --git a/include/llmr/platform/event.hpp b/include/mbgl/platform/event.hpp
index 81b3e1d029..b55c721c99 100644
--- a/include/llmr/platform/event.hpp
+++ b/include/mbgl/platform/event.hpp
@@ -1,11 +1,11 @@
-#ifndef LLMR_PLATFORM_EVENT
-#define LLMR_PLATFORM_EVENT
+#ifndef MBGL_PLATFORM_EVENT
+#define MBGL_PLATFORM_EVENT
 
-#include <llmr/util/enum.hpp>
+#include <mbgl/util/enum.hpp>
 
 #include <cstdint>
 
-namespace llmr {
+namespace mbgl {
 
 enum class EventSeverity : uint8_t {
     Debug,
@@ -15,7 +15,7 @@ enum class EventSeverity : uint8_t {
     Error,
 };
 
-LLMR_DEFINE_ENUM_CLASS(EventSeverityClass, EventSeverity, {
+MBGL_DEFINE_ENUM_CLASS(EventSeverityClass, EventSeverity, {
     { EventSeverity::Debug, "DEBUG" },
     { EventSeverity::Info, "INFO" },
     { EventSeverity::Test, "TEST" },
@@ -35,7 +35,7 @@ enum class Event : uint8_t {
     Sprite,
 };
 
-LLMR_DEFINE_ENUM_CLASS(EventClass, Event, {
+MBGL_DEFINE_ENUM_CLASS(EventClass, Event, {
     { Event::General, "General" },
     { Event::Setup, "Setup" },
     { Event::Shader, "Shader" },
diff --git a/include/llmr/platform/gl.hpp b/include/mbgl/platform/gl.hpp
index b1e2d5d5a4..a29b230dbf 100644
--- a/include/llmr/platform/gl.hpp
+++ b/include/mbgl/platform/gl.hpp
@@ -1,5 +1,5 @@
-#ifndef LLMR_RENDERER_GL
-#define LLMR_RENDERER_GL
+#ifndef MBGL_RENDERER_GL
+#define MBGL_RENDERER_GL
 
 #include <string>
 
@@ -39,7 +39,7 @@
     #include <GL/glext.h>
 #endif
 
-namespace llmr {
+namespace mbgl {
 namespace gl {
 // Debug group markers, useful for debuggin on iOS
 #if defined(__APPLE__) && defined(DEBUG) && defined(GL_EXT_debug_marker)
diff --git a/include/llmr/platform/log.hpp b/include/mbgl/platform/log.hpp
index 7b39370046..dc000b4d52 100644
--- a/include/llmr/platform/log.hpp
+++ b/include/mbgl/platform/log.hpp
@@ -1,12 +1,12 @@
-#ifndef LLMR_PLATFORM_LOG
-#define LLMR_PLATFORM_LOG
+#ifndef MBGL_PLATFORM_LOG
+#define MBGL_PLATFORM_LOG
 
 #include "event.hpp"
 
 #include <memory>
 #include <string>
 
-namespace llmr {
+namespace mbgl {
 
 class LogBackend {
 public:
diff --git a/include/llmr/platform/platform.hpp b/include/mbgl/platform/platform.hpp
index 30c6e048bc..02aeb594b6 100644
--- a/include/llmr/platform/platform.hpp
+++ b/include/mbgl/platform/platform.hpp
@@ -1,5 +1,5 @@
-#ifndef LLMR_PLATFORM_PLATFORM
-#define LLMR_PLATFORM_PLATFORM
+#ifndef MBGL_PLATFORM_PLATFORM
+#define MBGL_PLATFORM_PLATFORM
 
 #include <memory>
 #include <functional>
@@ -11,7 +11,7 @@ namespace uv {
 class loop;
 }
 
-namespace llmr {
+namespace mbgl {
 namespace platform {
 
 class Request;
diff --git a/include/llmr/platform/request.hpp b/include/mbgl/platform/request.hpp
index 5ba00830b8..7d2da8888c 100644
--- a/include/llmr/platform/request.hpp
+++ b/include/mbgl/platform/request.hpp
@@ -1,12 +1,12 @@
-#ifndef LLMR_PLATFORM_REQUEST
-#define LLMR_PLATFORM_REQUEST
+#ifndef MBGL_PLATFORM_REQUEST
+#define MBGL_PLATFORM_REQUEST
 
 #include <string>
 #include <functional>
 #include <memory>
 #include <atomic>
 
-#include <llmr/util/noncopyable.hpp>
+#include <mbgl/util/noncopyable.hpp>
 
 // Forward definition.
 typedef struct uv_loop_s uv_loop_t;
@@ -16,7 +16,7 @@ namespace uv {
 class loop;
 }
 
-namespace llmr {
+namespace mbgl {
 namespace platform {
 
 struct Response;
diff --git a/include/llmr/renderer/bucket.hpp b/include/mbgl/renderer/bucket.hpp
index c135b8ee16..18f58ee464 100644
--- a/include/llmr/renderer/bucket.hpp
+++ b/include/mbgl/renderer/bucket.hpp
@@ -1,13 +1,13 @@
-#ifndef LLMR_RENDERER_BUCKET
-#define LLMR_RENDERER_BUCKET
+#ifndef MBGL_RENDERER_BUCKET
+#define MBGL_RENDERER_BUCKET
 
 #include <string>
 #include <memory>
-#include <llmr/map/tile.hpp>
-#include <llmr/util/noncopyable.hpp>
-#include <llmr/renderer/prerendered_texture.hpp>
+#include <mbgl/map/tile.hpp>
+#include <mbgl/util/noncopyable.hpp>
+#include <mbgl/renderer/prerendered_texture.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 class Painter;
 class StyleLayer;
diff --git a/include/llmr/renderer/debug_bucket.hpp b/include/mbgl/renderer/debug_bucket.hpp
index d72a645eee..ac4f18cc2c 100644
--- a/include/llmr/renderer/debug_bucket.hpp
+++ b/include/mbgl/renderer/debug_bucket.hpp
@@ -1,9 +1,9 @@
-#ifndef LLMR_RENDERER_DEBUGBUCKET
-#define LLMR_RENDERER_DEBUGBUCKET
+#ifndef MBGL_RENDERER_DEBUGBUCKET
+#define MBGL_RENDERER_DEBUGBUCKET
 
-#include <llmr/renderer/bucket.hpp>
-#include <llmr/geometry/debug_font_buffer.hpp>
-#include <llmr/geometry/vao.hpp>
+#include <mbgl/renderer/bucket.hpp>
+#include <mbgl/geometry/debug_font_buffer.hpp>
+#include <mbgl/geometry/vao.hpp>
 
 #include <vector>
 #include <memory>
@@ -12,7 +12,7 @@
 #define BUFFER_OFFSET(i) ((char *)nullptr + (i))
 #endif
 
-namespace llmr {
+namespace mbgl {
 
 class PlainShader;
 
diff --git a/include/llmr/renderer/fill_bucket.hpp b/include/mbgl/renderer/fill_bucket.hpp
index db0e9c1042..9193b09149 100644
--- a/include/llmr/renderer/fill_bucket.hpp
+++ b/include/mbgl/renderer/fill_bucket.hpp
@@ -1,10 +1,10 @@
-#ifndef LLMR_RENDERER_FILLBUCKET
-#define LLMR_RENDERER_FILLBUCKET
+#ifndef MBGL_RENDERER_FILLBUCKET
+#define MBGL_RENDERER_FILLBUCKET
 
-#include <llmr/renderer/bucket.hpp>
-#include <llmr/geometry/elements_buffer.hpp>
-#include <llmr/geometry/fill_buffer.hpp>
-#include <llmr/style/style_bucket.hpp>
+#include <mbgl/renderer/bucket.hpp>
+#include <mbgl/geometry/elements_buffer.hpp>
+#include <mbgl/geometry/fill_buffer.hpp>
+#include <mbgl/style/style_bucket.hpp>
 
 #include <clipper/clipper.hpp>
 #include <libtess2/tesselator.h>
@@ -16,7 +16,7 @@
 #define BUFFER_OFFSET(i) ((char *)nullptr + (i))
 #endif
 
-namespace llmr {
+namespace mbgl {
 
 class Style;
 class FillVertexBuffer;
diff --git a/include/llmr/renderer/frame_history.hpp b/include/mbgl/renderer/frame_history.hpp
index 35ef3cdf47..a5dbe21bca 100644
--- a/include/llmr/renderer/frame_history.hpp
+++ b/include/mbgl/renderer/frame_history.hpp
@@ -1,14 +1,14 @@
-#ifndef LLMR_RENDERER_FRAME_HISTORY
-#define LLMR_RENDERER_FRAME_HISTORY
+#ifndef MBGL_RENDERER_FRAME_HISTORY
+#define MBGL_RENDERER_FRAME_HISTORY
 
 #include <deque>
 #include <cassert>
 #include <cmath>
 
-#include <llmr/platform/platform.hpp>
-#include <llmr/util/time.hpp>
+#include <mbgl/platform/platform.hpp>
+#include <mbgl/util/time.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 struct FrameSnapshot {
     explicit inline FrameSnapshot(timestamp t, float z) : t(t), z(z) {}
diff --git a/include/llmr/renderer/icon_bucket.hpp b/include/mbgl/renderer/icon_bucket.hpp
index d13f53586b..e3b311332d 100644
--- a/include/llmr/renderer/icon_bucket.hpp
+++ b/include/mbgl/renderer/icon_bucket.hpp
@@ -1,10 +1,10 @@
-#ifndef LLMR_RENDERER_ICONBUCKET
-#define LLMR_RENDERER_ICONBUCKET
+#ifndef MBGL_RENDERER_ICONBUCKET
+#define MBGL_RENDERER_ICONBUCKET
 
-#include <llmr/renderer/bucket.hpp>
-#include <llmr/geometry/elements_buffer.hpp>
-#include <llmr/geometry/icon_buffer.hpp>
-#include <llmr/style/style_bucket.hpp>
+#include <mbgl/renderer/bucket.hpp>
+#include <mbgl/geometry/elements_buffer.hpp>
+#include <mbgl/geometry/icon_buffer.hpp>
+#include <mbgl/style/style_bucket.hpp>
 
 #include <vector>
 #include <memory>
@@ -13,7 +13,7 @@
 #define BUFFER_OFFSET(i) ((char *)nullptr + (i))
 #endif
 
-namespace llmr {
+namespace mbgl {
 
 class Style;
 class IconVertexBuffer;
diff --git a/include/llmr/renderer/line_bucket.hpp b/include/mbgl/renderer/line_bucket.hpp
index 881bd23ebb..d42b10bfb7 100644
--- a/include/llmr/renderer/line_bucket.hpp
+++ b/include/mbgl/renderer/line_bucket.hpp
@@ -1,16 +1,16 @@
-#ifndef LLMR_RENDERER_LINEBUCKET
-#define LLMR_RENDERER_LINEBUCKET
+#ifndef MBGL_RENDERER_LINEBUCKET
+#define MBGL_RENDERER_LINEBUCKET
 
 #include "bucket.hpp"
-#include <llmr/geometry/vao.hpp>
-#include <llmr/geometry/elements_buffer.hpp>
-#include <llmr/geometry/line_buffer.hpp>
-#include <llmr/style/style_bucket.hpp>
+#include <mbgl/geometry/vao.hpp>
+#include <mbgl/geometry/elements_buffer.hpp>
+#include <mbgl/geometry/line_buffer.hpp>
+#include <mbgl/style/style_bucket.hpp>
 
 #include <memory>
 #include <vector>
 
-namespace llmr {
+namespace mbgl {
 
 class Style;
 class LineVertexBuffer;
diff --git a/include/llmr/renderer/painter.hpp b/include/mbgl/renderer/painter.hpp
index ef160eddd2..9868b5d9da 100644
--- a/include/llmr/renderer/painter.hpp
+++ b/include/mbgl/renderer/painter.hpp
@@ -1,33 +1,33 @@
-#ifndef LLMR_RENDERER_PAINTER
-#define LLMR_RENDERER_PAINTER
-
-#include <llmr/map/tile_data.hpp>
-#include <llmr/geometry/vao.hpp>
-#include <llmr/geometry/vertex_buffer.hpp>
-#include <llmr/util/mat4.hpp>
-#include <llmr/util/noncopyable.hpp>
-#include <llmr/renderer/frame_history.hpp>
-#include <llmr/style/types.hpp>
-
-#include <llmr/shader/plain_shader.hpp>
-#include <llmr/shader/outline_shader.hpp>
-#include <llmr/shader/pattern_shader.hpp>
-#include <llmr/shader/line_shader.hpp>
-#include <llmr/shader/linejoin_shader.hpp>
-#include <llmr/shader/icon_shader.hpp>
-#include <llmr/shader/raster_shader.hpp>
-#include <llmr/shader/text_shader.hpp>
-#include <llmr/shader/dot_shader.hpp>
-#include <llmr/shader/composite_shader.hpp>
-#include <llmr/shader/gaussian_shader.hpp>
-
-#include <llmr/map/transform_state.hpp>
+#ifndef MBGL_RENDERER_PAINTER
+#define MBGL_RENDERER_PAINTER
+
+#include <mbgl/map/tile_data.hpp>
+#include <mbgl/geometry/vao.hpp>
+#include <mbgl/geometry/vertex_buffer.hpp>
+#include <mbgl/util/mat4.hpp>
+#include <mbgl/util/noncopyable.hpp>
+#include <mbgl/renderer/frame_history.hpp>
+#include <mbgl/style/types.hpp>
+
+#include <mbgl/shader/plain_shader.hpp>
+#include <mbgl/shader/outline_shader.hpp>
+#include <mbgl/shader/pattern_shader.hpp>
+#include <mbgl/shader/line_shader.hpp>
+#include <mbgl/shader/linejoin_shader.hpp>
+#include <mbgl/shader/icon_shader.hpp>
+#include <mbgl/shader/raster_shader.hpp>
+#include <mbgl/shader/text_shader.hpp>
+#include <mbgl/shader/dot_shader.hpp>
+#include <mbgl/shader/composite_shader.hpp>
+#include <mbgl/shader/gaussian_shader.hpp>
+
+#include <mbgl/map/transform_state.hpp>
 
 #include <map>
 #include <unordered_map>
 #include <set>
 
-namespace llmr {
+namespace mbgl {
 
 class Transform;
 class Style;
diff --git a/include/llmr/renderer/prerendered_texture.hpp b/include/mbgl/renderer/prerendered_texture.hpp
index 168284e1de..9c72e14b88 100644
--- a/include/llmr/renderer/prerendered_texture.hpp
+++ b/include/mbgl/renderer/prerendered_texture.hpp
@@ -1,11 +1,11 @@
-#ifndef LLMR_RENDERER_PRERENDERED_TEXTURE
-#define LLMR_RENDERER_PRERENDERED_TEXTURE
+#ifndef MBGL_RENDERER_PRERENDERED_TEXTURE
+#define MBGL_RENDERER_PRERENDERED_TEXTURE
 
-#include <llmr/util/noncopyable.hpp>
-#include <llmr/platform/gl.hpp>
-#include <llmr/style/rasterize_properties.hpp>
+#include <mbgl/util/noncopyable.hpp>
+#include <mbgl/platform/gl.hpp>
+#include <mbgl/style/rasterize_properties.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 class Painter;
 
diff --git a/include/llmr/renderer/raster_bucket.hpp b/include/mbgl/renderer/raster_bucket.hpp
index 86bb1d925d..c111193126 100644
--- a/include/llmr/renderer/raster_bucket.hpp
+++ b/include/mbgl/renderer/raster_bucket.hpp
@@ -1,10 +1,10 @@
-#ifndef LLMR_RENDERER_RASTERBUCKET
-#define LLMR_RENDERER_RASTERBUCKET
+#ifndef MBGL_RENDERER_RASTERBUCKET
+#define MBGL_RENDERER_RASTERBUCKET
 
-#include <llmr/renderer/bucket.hpp>
-#include <llmr/util/raster.hpp>
+#include <mbgl/renderer/bucket.hpp>
+#include <mbgl/util/raster.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 class RasterShader;
 class VertexBuffer;
diff --git a/include/llmr/renderer/text_bucket.hpp b/include/mbgl/renderer/text_bucket.hpp
index 4d9bf382d6..cb4b8f2cda 100644
--- a/include/llmr/renderer/text_bucket.hpp
+++ b/include/mbgl/renderer/text_bucket.hpp
@@ -1,19 +1,19 @@
-#ifndef LLMR_RENDERER_TEXTBUCKET
-#define LLMR_RENDERER_TEXTBUCKET
+#ifndef MBGL_RENDERER_TEXTBUCKET
+#define MBGL_RENDERER_TEXTBUCKET
 
 #include "bucket.hpp"
-#include <llmr/geometry/vao.hpp>
-#include <llmr/geometry/elements_buffer.hpp>
-#include <llmr/map/vector_tile.hpp>
-#include <llmr/text/types.hpp>
-#include <llmr/text/glyph.hpp>
-#include <llmr/style/style_bucket.hpp>
+#include <mbgl/geometry/vao.hpp>
+#include <mbgl/geometry/elements_buffer.hpp>
+#include <mbgl/map/vector_tile.hpp>
+#include <mbgl/text/types.hpp>
+#include <mbgl/text/glyph.hpp>
+#include <mbgl/style/style_bucket.hpp>
 
 #include <memory>
 #include <map>
 #include <vector>
 
-namespace llmr {
+namespace mbgl {
 
 class Style;
 class TextVertexBuffer;
diff --git a/include/llmr/shader/composite_shader.hpp b/include/mbgl/shader/composite_shader.hpp
index 31156485c4..c0c1704f3d 100644
--- a/include/llmr/shader/composite_shader.hpp
+++ b/include/mbgl/shader/composite_shader.hpp
@@ -1,9 +1,9 @@
-#ifndef LLMR_SHADER_COMPOSITE_SHADER
-#define LLMR_SHADER_COMPOSITE_SHADER
+#ifndef MBGL_SHADER_COMPOSITE_SHADER
+#define MBGL_SHADER_COMPOSITE_SHADER
 
-#include <llmr/shader/shader.hpp>
+#include <mbgl/shader/shader.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 class CompositeShader : public Shader {
 public:
diff --git a/include/llmr/shader/dot_shader.hpp b/include/mbgl/shader/dot_shader.hpp
index 5e817c09c1..d8d649db9c 100644
--- a/include/llmr/shader/dot_shader.hpp
+++ b/include/mbgl/shader/dot_shader.hpp
@@ -1,9 +1,9 @@
-#ifndef LLMR_SHADER_SHADER_DOT
-#define LLMR_SHADER_SHADER_DOT
+#ifndef MBGL_SHADER_SHADER_DOT
+#define MBGL_SHADER_SHADER_DOT
 
-#include <llmr/shader/shader.hpp>
+#include <mbgl/shader/shader.hpp>
 
-namespace llmr {
+namespace mbgl {
 
     class DotShader : public Shader {
     public:
diff --git a/include/llmr/shader/gaussian_shader.hpp b/include/mbgl/shader/gaussian_shader.hpp
index c3589c1534..a4b9d09f3a 100644
--- a/include/llmr/shader/gaussian_shader.hpp
+++ b/include/mbgl/shader/gaussian_shader.hpp
@@ -1,9 +1,9 @@
-#ifndef LLMR_RENDERER_SHADER_GAUSSIAN
-#define LLMR_RENDERER_SHADER_GAUSSIAN
+#ifndef MBGL_RENDERER_SHADER_GAUSSIAN
+#define MBGL_RENDERER_SHADER_GAUSSIAN
 
-#include <llmr/shader/shader.hpp>
+#include <mbgl/shader/shader.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 class GaussianShader : public Shader {
 public:
diff --git a/include/llmr/shader/icon_shader.hpp b/include/mbgl/shader/icon_shader.hpp
index daf37b374a..b97b3c2be3 100644
--- a/include/llmr/shader/icon_shader.hpp
+++ b/include/mbgl/shader/icon_shader.hpp
@@ -1,9 +1,9 @@
-#ifndef LLMR_SHADER_SHADER_ICON
-#define LLMR_SHADER_SHADER_ICON
+#ifndef MBGL_SHADER_SHADER_ICON
+#define MBGL_SHADER_SHADER_ICON
 
-#include <llmr/shader/shader.hpp>
+#include <mbgl/shader/shader.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 class IconShader : public Shader {
 public:
diff --git a/include/llmr/shader/line_shader.hpp b/include/mbgl/shader/line_shader.hpp
index 234c70a649..38efe0b71f 100644
--- a/include/llmr/shader/line_shader.hpp
+++ b/include/mbgl/shader/line_shader.hpp
@@ -1,9 +1,9 @@
-#ifndef LLMR_SHADER_SHADER_LINE
-#define LLMR_SHADER_SHADER_LINE
+#ifndef MBGL_SHADER_SHADER_LINE
+#define MBGL_SHADER_SHADER_LINE
 
-#include <llmr/shader/shader.hpp>
+#include <mbgl/shader/shader.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 class LineShader : public Shader {
 public:
diff --git a/include/llmr/shader/linejoin_shader.hpp b/include/mbgl/shader/linejoin_shader.hpp
index 82ec3b59aa..5a5c97e921 100644
--- a/include/llmr/shader/linejoin_shader.hpp
+++ b/include/mbgl/shader/linejoin_shader.hpp
@@ -1,9 +1,9 @@
-#ifndef LLMR_SHADER_SHADER_LINEJOIN
-#define LLMR_SHADER_SHADER_LINEJOIN
+#ifndef MBGL_SHADER_SHADER_LINEJOIN
+#define MBGL_SHADER_SHADER_LINEJOIN
 
-#include <llmr/shader/shader.hpp>
+#include <mbgl/shader/shader.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 class LinejoinShader : public Shader {
 public:
diff --git a/include/llmr/shader/outline_shader.hpp b/include/mbgl/shader/outline_shader.hpp
index 5b52b30054..551e31ca57 100644
--- a/include/llmr/shader/outline_shader.hpp
+++ b/include/mbgl/shader/outline_shader.hpp
@@ -1,9 +1,9 @@
-#ifndef LLMR_SHADER_SHADER_OUTLINE
-#define LLMR_SHADER_SHADER_OUTLINE
+#ifndef MBGL_SHADER_SHADER_OUTLINE
+#define MBGL_SHADER_SHADER_OUTLINE
 
-#include <llmr/shader/shader.hpp>
+#include <mbgl/shader/shader.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 class OutlineShader : public Shader {
 public:
diff --git a/include/llmr/shader/pattern_shader.hpp b/include/mbgl/shader/pattern_shader.hpp
index d0142ebca4..b1b49b54df 100644
--- a/include/llmr/shader/pattern_shader.hpp
+++ b/include/mbgl/shader/pattern_shader.hpp
@@ -1,9 +1,9 @@
-#ifndef LLMR_SHADER_SHADER_PATTERN
-#define LLMR_SHADER_SHADER_PATTERN
+#ifndef MBGL_SHADER_SHADER_PATTERN
+#define MBGL_SHADER_SHADER_PATTERN
 
-#include <llmr/shader/shader.hpp>
+#include <mbgl/shader/shader.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 class PatternShader : public Shader {
 public:
diff --git a/include/llmr/shader/plain_shader.hpp b/include/mbgl/shader/plain_shader.hpp
index bf768f8845..277788431f 100644
--- a/include/llmr/shader/plain_shader.hpp
+++ b/include/mbgl/shader/plain_shader.hpp
@@ -1,9 +1,9 @@
-#ifndef LLMR_SHADER_SHADER_PLAIN
-#define LLMR_SHADER_SHADER_PLAIN
+#ifndef MBGL_SHADER_SHADER_PLAIN
+#define MBGL_SHADER_SHADER_PLAIN
 
-#include <llmr/shader/shader.hpp>
+#include <mbgl/shader/shader.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 class PlainShader : public Shader {
 public:
diff --git a/include/llmr/shader/raster_shader.hpp b/include/mbgl/shader/raster_shader.hpp
index adc945e460..ec69fa7238 100644
--- a/include/llmr/shader/raster_shader.hpp
+++ b/include/mbgl/shader/raster_shader.hpp
@@ -1,9 +1,9 @@
-#ifndef LLMR_RENDERER_SHADER_RASTER
-#define LLMR_RENDERER_SHADER_RASTER
+#ifndef MBGL_RENDERER_SHADER_RASTER
+#define MBGL_RENDERER_SHADER_RASTER
 
-#include <llmr/shader/shader.hpp>
+#include <mbgl/shader/shader.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 class RasterShader : public Shader {
 public:
diff --git a/include/llmr/shader/shader.hpp b/include/mbgl/shader/shader.hpp
index f4713c59f6..2398cb12e3 100644
--- a/include/llmr/shader/shader.hpp
+++ b/include/mbgl/shader/shader.hpp
@@ -1,11 +1,11 @@
-#ifndef LLMR_RENDERER_SHADER
-#define LLMR_RENDERER_SHADER
+#ifndef MBGL_RENDERER_SHADER
+#define MBGL_RENDERER_SHADER
 
 #include <cstdint>
 #include <array>
-#include <llmr/util/noncopyable.hpp>
+#include <mbgl/util/noncopyable.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 class Shader : private util::noncopyable {
 public:
diff --git a/include/llmr/shader/text_shader.hpp b/include/mbgl/shader/text_shader.hpp
index d232ef9a0c..554b890fb0 100644
--- a/include/llmr/shader/text_shader.hpp
+++ b/include/mbgl/shader/text_shader.hpp
@@ -1,9 +1,9 @@
-#ifndef LLMR_SHADER_TEXT_SHADER
-#define LLMR_SHADER_TEXT_SHADER
+#ifndef MBGL_SHADER_TEXT_SHADER
+#define MBGL_SHADER_TEXT_SHADER
 
 #include "shader.hpp"
 
-namespace llmr {
+namespace mbgl {
 
 class TextShader : public Shader {
 public:
diff --git a/include/llmr/style/applied_class_properties.hpp b/include/mbgl/style/applied_class_properties.hpp
index 20edadc0a7..827f15a2a1 100644
--- a/include/llmr/style/applied_class_properties.hpp
+++ b/include/mbgl/style/applied_class_properties.hpp
@@ -1,13 +1,13 @@
-#ifndef LLMR_STYLE_APPLIED_CLASS_PROPERTIES
-#define LLMR_STYLE_APPLIED_CLASS_PROPERTIES
+#ifndef MBGL_STYLE_APPLIED_CLASS_PROPERTIES
+#define MBGL_STYLE_APPLIED_CLASS_PROPERTIES
 
-#include <llmr/style/property_value.hpp>
-#include <llmr/style/class_dictionary.hpp>
-#include <llmr/util/time.hpp>
+#include <mbgl/style/property_value.hpp>
+#include <mbgl/style/class_dictionary.hpp>
+#include <mbgl/util/time.hpp>
 
 #include <list>
 
-namespace llmr {
+namespace mbgl {
 
 class AppliedClassProperty {
 public:
diff --git a/include/llmr/style/class_dictionary.hpp b/include/mbgl/style/class_dictionary.hpp
index 772eb9c70e..c7f9c6a284 100644
--- a/include/llmr/style/class_dictionary.hpp
+++ b/include/mbgl/style/class_dictionary.hpp
@@ -1,11 +1,11 @@
-#ifndef LLMR_STYLE_CLASS_DICTIONARY
-#define LLMR_STYLE_CLASS_DICTIONARY
+#ifndef MBGL_STYLE_CLASS_DICTIONARY
+#define MBGL_STYLE_CLASS_DICTIONARY
 
 #include <cstdint>
 #include <string>
 #include <unordered_map>
 
-namespace llmr {
+namespace mbgl {
 
 enum class ClassID : uint32_t {
     Fallback = 0, // These values are from the fallback properties
diff --git a/include/llmr/style/class_properties.hpp b/include/mbgl/style/class_properties.hpp
index 55d6aa2cc6..84b6f483bd 100644
--- a/include/llmr/style/class_properties.hpp
+++ b/include/mbgl/style/class_properties.hpp
@@ -1,13 +1,13 @@
-#ifndef LLMR_STYLE_CLASS_PROPERTIES
-#define LLMR_STYLE_CLASS_PROPERTIES
+#ifndef MBGL_STYLE_CLASS_PROPERTIES
+#define MBGL_STYLE_CLASS_PROPERTIES
 
-#include <llmr/style/property_key.hpp>
-#include <llmr/style/property_value.hpp>
-#include <llmr/style/property_transition.hpp>
+#include <mbgl/style/property_key.hpp>
+#include <mbgl/style/property_value.hpp>
+#include <mbgl/style/property_transition.hpp>
 
 #include <map>
 
-namespace llmr {
+namespace mbgl {
 
 class ClassProperties {
 public:
diff --git a/include/llmr/style/filter_comparison.hpp b/include/mbgl/style/filter_comparison.hpp
index 0e7a929e1c..bf48744f1e 100644
--- a/include/llmr/style/filter_comparison.hpp
+++ b/include/mbgl/style/filter_comparison.hpp
@@ -1,13 +1,13 @@
-#ifndef LLMR_STYLE_FILTER_COMPARISON
-#define LLMR_STYLE_FILTER_COMPARISON
+#ifndef MBGL_STYLE_FILTER_COMPARISON
+#define MBGL_STYLE_FILTER_COMPARISON
 
-#include <llmr/style/value.hpp>
+#include <mbgl/style/value.hpp>
 
 #include <vector>
 #include <string>
 #include <iosfwd>
 
-namespace llmr {
+namespace mbgl {
 
 class FilterComparison {
 public:
diff --git a/include/llmr/style/filter_comparison_private.hpp b/include/mbgl/style/filter_comparison_private.hpp
index d778097730..6486832424 100644
--- a/include/llmr/style/filter_comparison_private.hpp
+++ b/include/mbgl/style/filter_comparison_private.hpp
@@ -1,9 +1,9 @@
-#ifndef LLMR_STYLE_FILTER_COMPARISON_PRIVATE
-#define LLMR_STYLE_FILTER_COMPARISON_PRIVATE
+#ifndef MBGL_STYLE_FILTER_COMPARISON_PRIVATE
+#define MBGL_STYLE_FILTER_COMPARISON_PRIVATE
 
 #include "filter_comparison.hpp"
 
-namespace llmr {
+namespace mbgl {
 
 template <typename Extractor>
 inline bool FilterComparison::compare(const Extractor &extractor) const {
diff --git a/include/llmr/style/filter_expression.hpp b/include/mbgl/style/filter_expression.hpp
index db67aa43a1..2a6a2927e7 100644
--- a/include/llmr/style/filter_expression.hpp
+++ b/include/mbgl/style/filter_expression.hpp
@@ -1,12 +1,12 @@
-#ifndef LLMR_STYLE_FILTER_EXPRESSION
-#define LLMR_STYLE_FILTER_EXPRESSION
+#ifndef MBGL_STYLE_FILTER_EXPRESSION
+#define MBGL_STYLE_FILTER_EXPRESSION
 
-#include <llmr/style/filter_comparison.hpp>
-#include <llmr/util/recursive_wrapper.hpp>
+#include <mbgl/style/filter_comparison.hpp>
+#include <mbgl/util/recursive_wrapper.hpp>
 
 #include <iosfwd>
 
-namespace llmr {
+namespace mbgl {
 
 class FilterExpression {
 public:
diff --git a/include/llmr/style/filter_expression_private.hpp b/include/mbgl/style/filter_expression_private.hpp
index 91c434e6ff..9379d250ba 100644
--- a/include/llmr/style/filter_expression_private.hpp
+++ b/include/mbgl/style/filter_expression_private.hpp
@@ -1,10 +1,10 @@
-#ifndef LLMR_STYLE_FILTER_EXPRESSION_PRIVATE
-#define LLMR_STYLE_FILTER_EXPRESSION_PRIVATE
+#ifndef MBGL_STYLE_FILTER_EXPRESSION_PRIVATE
+#define MBGL_STYLE_FILTER_EXPRESSION_PRIVATE
 
 #include "filter_expression.hpp"
 #include "filter_comparison_private.hpp"
 
-namespace llmr {
+namespace mbgl {
 
 template <typename Extractor>
 bool FilterExpression::compare(const Extractor &extractor) const {
diff --git a/include/llmr/style/function_properties.hpp b/include/mbgl/style/function_properties.hpp
index e72ced0b02..74ac80f83c 100644
--- a/include/llmr/style/function_properties.hpp
+++ b/include/mbgl/style/function_properties.hpp
@@ -1,11 +1,11 @@
-#ifndef LLMR_STYLE_FUNCTION_PROPERTIES
-#define LLMR_STYLE_FUNCTION_PROPERTIES
+#ifndef MBGL_STYLE_FUNCTION_PROPERTIES
+#define MBGL_STYLE_FUNCTION_PROPERTIES
 
-#include <llmr/util/variant.hpp>
+#include <mbgl/util/variant.hpp>
 
 #include <vector>
 
-namespace llmr {
+namespace mbgl {
 
 template <typename T>
 struct ConstantFunction {
diff --git a/include/llmr/style/property_fallback.hpp b/include/mbgl/style/property_fallback.hpp
index eb6bb15c9c..5c5eae0cd6 100644
--- a/include/llmr/style/property_fallback.hpp
+++ b/include/mbgl/style/property_fallback.hpp
@@ -1,12 +1,12 @@
-#ifndef LLMR_STYLE_PROPERTY_FALLBACK
-#define LLMR_STYLE_PROPERTY_FALLBACK
+#ifndef MBGL_STYLE_PROPERTY_FALLBACK
+#define MBGL_STYLE_PROPERTY_FALLBACK
 
-#include <llmr/style/property_key.hpp>
-#include <llmr/style/property_value.hpp>
+#include <mbgl/style/property_key.hpp>
+#include <mbgl/style/property_value.hpp>
 
 #include <map>
 
-namespace llmr {
+namespace mbgl {
 
 class PropertyFallbackValue {
 public:
diff --git a/include/llmr/style/property_key.hpp b/include/mbgl/style/property_key.hpp
index e52c33ad17..d9005f2f4a 100644
--- a/include/llmr/style/property_key.hpp
+++ b/include/mbgl/style/property_key.hpp
@@ -1,7 +1,7 @@
-#ifndef LLMR_STYLE_PROPERTY_KEY
-#define LLMR_STYLE_PROPERTY_KEY
+#ifndef MBGL_STYLE_PROPERTY_KEY
+#define MBGL_STYLE_PROPERTY_KEY
 
-namespace llmr {
+namespace mbgl {
 
 enum class PropertyKey {
     FillAntialias,
diff --git a/include/llmr/style/property_transition.hpp b/include/mbgl/style/property_transition.hpp
index 0175274436..07b7cfe288 100644
--- a/include/llmr/style/property_transition.hpp
+++ b/include/mbgl/style/property_transition.hpp
@@ -1,9 +1,9 @@
-#ifndef LLMR_STYLE_PROPERTY_TRANSITION
-#define LLMR_STYLE_PROPERTY_TRANSITION
+#ifndef MBGL_STYLE_PROPERTY_TRANSITION
+#define MBGL_STYLE_PROPERTY_TRANSITION
 
 #include <cstdint>
 
-namespace llmr {
+namespace mbgl {
 
 struct PropertyTransition {
     uint16_t duration = 0;
diff --git a/include/mbgl/style/property_value.hpp b/include/mbgl/style/property_value.hpp
new file mode 100644
index 0000000000..4d148dc029
--- /dev/null
+++ b/include/mbgl/style/property_value.hpp
@@ -0,0 +1,21 @@
+#ifndef MBGL_STYLE_PROPERTY_VALUE
+#define MBGL_STYLE_PROPERTY_VALUE
+
+#include <mbgl/util/variant.hpp>
+#include <mbgl/style/function_properties.hpp>
+#include <mbgl/style/types.hpp>
+
+namespace mbgl {
+
+typedef util::variant<
+    std::string,
+    TranslateAnchorType,
+    RotateAnchorType,
+    Function<bool>,
+    Function<float>,
+    Function<Color>
+> PropertyValue;
+
+}
+
+#endif
diff --git a/include/llmr/style/rasterize_properties.hpp b/include/mbgl/style/rasterize_properties.hpp
index 440f3e530f..aea90dfbdd 100644
--- a/include/llmr/style/rasterize_properties.hpp
+++ b/include/mbgl/style/rasterize_properties.hpp
@@ -1,9 +1,9 @@
-#ifndef LLMR_STYLE_RASTERIZE_PROPERTIES
-#define LLMR_STYLE_RASTERIZE_PROPERTIES
+#ifndef MBGL_STYLE_RASTERIZE_PROPERTIES
+#define MBGL_STYLE_RASTERIZE_PROPERTIES
 
-#include <llmr/style/function_properties.hpp>
+#include <mbgl/style/function_properties.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 // The calculated properties for a layer in a tile.
 class RasterizedProperties {
diff --git a/include/llmr/style/style.hpp b/include/mbgl/style/style.hpp
index cf091ad814..6aab71a4c6 100644
--- a/include/llmr/style/style.hpp
+++ b/include/mbgl/style/style.hpp
@@ -1,11 +1,11 @@
-#ifndef LLMR_STYLE_STYLE
-#define LLMR_STYLE_STYLE
+#ifndef MBGL_STYLE_STYLE
+#define MBGL_STYLE_STYLE
 
-#include <llmr/style/property_transition.hpp>
-#include <llmr/style/style_source.hpp>
+#include <mbgl/style/property_transition.hpp>
+#include <mbgl/style/style_source.hpp>
 
-#include <llmr/util/time.hpp>
-#include <llmr/util/uv.hpp>
+#include <mbgl/util/time.hpp>
+#include <mbgl/util/uv.hpp>
 
 #include <cstdint>
 #include <map>
@@ -15,7 +15,7 @@
 #include <set>
 #include <memory>
 
-namespace llmr {
+namespace mbgl {
 
 class Sprite;
 class StyleLayer;
diff --git a/include/llmr/style/style_bucket.hpp b/include/mbgl/style/style_bucket.hpp
index 5d8c9d6bb9..62f072d9cd 100644
--- a/include/llmr/style/style_bucket.hpp
+++ b/include/mbgl/style/style_bucket.hpp
@@ -1,16 +1,16 @@
-#ifndef LLMR_STYLE_STYLE_BUCKET
-#define LLMR_STYLE_STYLE_BUCKET
+#ifndef MBGL_STYLE_STYLE_BUCKET
+#define MBGL_STYLE_STYLE_BUCKET
 
-#include <llmr/style/types.hpp>
-#include <llmr/style/filter_expression.hpp>
-#include <llmr/style/style_source.hpp>
-#include <llmr/util/vec.hpp>
-#include <llmr/util/variant.hpp>
+#include <mbgl/style/types.hpp>
+#include <mbgl/style/filter_expression.hpp>
+#include <mbgl/style/style_source.hpp>
+#include <mbgl/util/vec.hpp>
+#include <mbgl/util/variant.hpp>
 
 #include <memory>
 #include <forward_list>
 
-namespace llmr {
+namespace mbgl {
 
 class Source;
 
diff --git a/include/llmr/style/style_layer.hpp b/include/mbgl/style/style_layer.hpp
index 4d6b8d1fa8..14d60ed9b6 100644
--- a/include/llmr/style/style_layer.hpp
+++ b/include/mbgl/style/style_layer.hpp
@@ -1,11 +1,11 @@
-#ifndef LLMR_STYLE_STYLE_LAYER
-#define LLMR_STYLE_STYLE_LAYER
+#ifndef MBGL_STYLE_STYLE_LAYER
+#define MBGL_STYLE_STYLE_LAYER
 
-#include <llmr/style/class_dictionary.hpp>
-#include <llmr/style/class_properties.hpp>
-#include <llmr/style/style_properties.hpp>
-#include <llmr/style/rasterize_properties.hpp>
-#include <llmr/style/applied_class_properties.hpp>
+#include <mbgl/style/class_dictionary.hpp>
+#include <mbgl/style/class_properties.hpp>
+#include <mbgl/style/style_properties.hpp>
+#include <mbgl/style/rasterize_properties.hpp>
+#include <mbgl/style/applied_class_properties.hpp>
 
 #include <vector>
 #include <memory>
@@ -13,7 +13,7 @@
 #include <map>
 #include <set>
 
-namespace llmr {
+namespace mbgl {
 
 class StyleBucket;
 class StyleLayerGroup;
diff --git a/include/llmr/style/style_layer_group.hpp b/include/mbgl/style/style_layer_group.hpp
index 90c02bc1f2..983dd136f0 100644
--- a/include/llmr/style/style_layer_group.hpp
+++ b/include/mbgl/style/style_layer_group.hpp
@@ -1,11 +1,11 @@
-#ifndef LLMR_STYLE_STYLE_LAYER_GROUP
-#define LLMR_STYLE_STYLE_LAYER_GROUP
+#ifndef MBGL_STYLE_STYLE_LAYER_GROUP
+#define MBGL_STYLE_STYLE_LAYER_GROUP
 
-#include <llmr/style/style_layer.hpp>
+#include <mbgl/style/style_layer.hpp>
 
 #include <vector>
 
-namespace llmr {
+namespace mbgl {
 
 class StyleLayerGroup {
 public:
diff --git a/include/llmr/style/style_parser.hpp b/include/mbgl/style/style_parser.hpp
index eb3b39eb04..431e3af8db 100644
--- a/include/llmr/style/style_parser.hpp
+++ b/include/mbgl/style/style_parser.hpp
@@ -1,19 +1,19 @@
-#ifndef LLMR_STYLE_STYLE_PARSER
-#define LLMR_STYLE_STYLE_PARSER
+#ifndef MBGL_STYLE_STYLE_PARSER
+#define MBGL_STYLE_STYLE_PARSER
 
 #include <rapidjson/document.h>
-#include <llmr/style/style.hpp>
-#include <llmr/style/style_source.hpp>
-#include <llmr/style/filter_expression.hpp>
-#include <llmr/style/class_properties.hpp>
-#include <llmr/style/rasterize_properties.hpp>
-#include <llmr/style/style_bucket.hpp>
+#include <mbgl/style/style.hpp>
+#include <mbgl/style/style_source.hpp>
+#include <mbgl/style/filter_expression.hpp>
+#include <mbgl/style/class_properties.hpp>
+#include <mbgl/style/rasterize_properties.hpp>
+#include <mbgl/style/style_bucket.hpp>
 
 #include <unordered_map>
 #include <forward_list>
 #include <tuple>
 
-namespace llmr {
+namespace mbgl {
 
 enum class ClassID : uint32_t;
 
diff --git a/include/llmr/style/style_properties.hpp b/include/mbgl/style/style_properties.hpp
index bc46e2d854..c7606be254 100644
--- a/include/llmr/style/style_properties.hpp
+++ b/include/mbgl/style/style_properties.hpp
@@ -1,16 +1,16 @@
-#ifndef LLMR_STYLE_STYLE_PROPERTIES
-#define LLMR_STYLE_STYLE_PROPERTIES
+#ifndef MBGL_STYLE_STYLE_PROPERTIES
+#define MBGL_STYLE_STYLE_PROPERTIES
 
-#include <llmr/util/variant.hpp>
-#include <llmr/style/types.hpp>
-#include <llmr/style/function_properties.hpp>
+#include <mbgl/util/variant.hpp>
+#include <mbgl/style/types.hpp>
+#include <mbgl/style/function_properties.hpp>
 
 #include <array>
 #include <string>
 #include <type_traits>
 #include <memory>
 
-namespace llmr {
+namespace mbgl {
 
 struct FillProperties {
     FillProperties() {}
diff --git a/include/llmr/style/style_source.hpp b/include/mbgl/style/style_source.hpp
index 25a8218df9..6b86c30907 100644
--- a/include/llmr/style/style_source.hpp
+++ b/include/mbgl/style/style_source.hpp
@@ -1,11 +1,11 @@
-#ifndef LLMR_STYLE_STYLE_SOURCE
-#define LLMR_STYLE_STYLE_SOURCE
+#ifndef MBGL_STYLE_STYLE_SOURCE
+#define MBGL_STYLE_STYLE_SOURCE
 
-#include <llmr/style/types.hpp>
+#include <mbgl/style/types.hpp>
 
 #include <memory>
 
-namespace llmr {
+namespace mbgl {
 
 class Source;
 
diff --git a/include/llmr/style/types.hpp b/include/mbgl/style/types.hpp
index 82632849ac..ca2061fa91 100644
--- a/include/llmr/style/types.hpp
+++ b/include/mbgl/style/types.hpp
@@ -1,12 +1,12 @@
-#ifndef LLMR_STYLE_TYPES
-#define LLMR_STYLE_TYPES
+#ifndef MBGL_STYLE_TYPES
+#define MBGL_STYLE_TYPES
 
-#include <llmr/util/enum.hpp>
+#include <mbgl/util/enum.hpp>
 
 #include <string>
 #include <array>
 
-namespace llmr {
+namespace mbgl {
 
 // Stores a premultiplied color, with all four channels ranging from 0..1
 typedef std::array<float, 4> Color;
@@ -22,7 +22,7 @@ enum class StyleLayerType : uint8_t {
     Background
 };
 
-LLMR_DEFINE_ENUM_CLASS(StyleLayerTypeClass, StyleLayerType, {
+MBGL_DEFINE_ENUM_CLASS(StyleLayerTypeClass, StyleLayerType, {
     { StyleLayerType::Unknown, "unknown" },
     { StyleLayerType::Fill, "fill" },
     { StyleLayerType::Line, "line" },
diff --git a/include/llmr/style/value.hpp b/include/mbgl/style/value.hpp
index ed14c233e1..5e6260e5a6 100644
--- a/include/llmr/style/value.hpp
+++ b/include/mbgl/style/value.hpp
@@ -1,13 +1,13 @@
-#ifndef LLMR_STYLE_VALUE
-#define LLMR_STYLE_VALUE
+#ifndef MBGL_STYLE_VALUE
+#define MBGL_STYLE_VALUE
 
-#include <llmr/util/variant.hpp>
-#include <llmr/util/pbf.hpp>
+#include <mbgl/util/variant.hpp>
+#include <mbgl/util/pbf.hpp>
 
 #include <cstdlib>
 #include <cerrno>
 
-namespace llmr {
+namespace mbgl {
 
 typedef util::variant<bool, int64_t, uint64_t, double, std::string> Value;
 
diff --git a/include/llmr/style/value_comparison.hpp b/include/mbgl/style/value_comparison.hpp
index 4386fae595..41c1d44123 100644
--- a/include/llmr/style/value_comparison.hpp
+++ b/include/mbgl/style/value_comparison.hpp
@@ -1,11 +1,11 @@
-#ifndef LLMR_STYLE_VALUE_COMPARISON
-#define LLMR_STYLE_VALUE_COMPARISON
+#ifndef MBGL_STYLE_VALUE_COMPARISON
+#define MBGL_STYLE_VALUE_COMPARISON
 
 #include "value.hpp"
 #include <cstdlib>
 #include <cerrno>
 
-namespace llmr {
+namespace mbgl {
 
 namespace util {
 
diff --git a/include/llmr/text/collision.hpp b/include/mbgl/text/collision.hpp
index c9dafdd386..31103a7439 100644
--- a/include/llmr/text/collision.hpp
+++ b/include/mbgl/text/collision.hpp
@@ -1,9 +1,9 @@
-#ifndef LLMR_TEXT_COLLISION
-#define LLMR_TEXT_COLLISION
+#ifndef MBGL_TEXT_COLLISION
+#define MBGL_TEXT_COLLISION
 
-#include <llmr/text/types.hpp>
+#include <mbgl/text/types.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 class Collision {
 
diff --git a/include/llmr/text/glyph.hpp b/include/mbgl/text/glyph.hpp
index 99c8964701..899c8fffee 100644
--- a/include/llmr/text/glyph.hpp
+++ b/include/mbgl/text/glyph.hpp
@@ -1,13 +1,13 @@
-#ifndef LLMR_TEXT_GLYPH
-#define LLMR_TEXT_GLYPH
+#ifndef MBGL_TEXT_GLYPH
+#define MBGL_TEXT_GLYPH
 
-#include <llmr/util/rect.hpp>
+#include <mbgl/util/rect.hpp>
 
 #include <cstdint>
 #include <vector>
 #include <map>
 
-namespace llmr {
+namespace mbgl {
 
 typedef std::pair<uint16_t, uint16_t> GlyphRange;
 
diff --git a/include/llmr/text/glyph_store.hpp b/include/mbgl/text/glyph_store.hpp
index a1d1046b7f..9c874b31b0 100644
--- a/include/llmr/text/glyph_store.hpp
+++ b/include/mbgl/text/glyph_store.hpp
@@ -1,8 +1,8 @@
-#ifndef LLMR_TEXT_GLYPH_STORE
-#define LLMR_TEXT_GLYPH_STORE
+#ifndef MBGL_TEXT_GLYPH_STORE
+#define MBGL_TEXT_GLYPH_STORE
 
-#include <llmr/text/glyph.hpp>
-#include <llmr/util/pbf.hpp>
+#include <mbgl/text/glyph.hpp>
+#include <mbgl/util/pbf.hpp>
 
 #include <cstdint>
 #include <vector>
@@ -11,7 +11,7 @@
 #include <set>
 #include <unordered_map>
 
-namespace llmr {
+namespace mbgl {
 
 
 class SDFGlyph {
diff --git a/include/llmr/text/placement.hpp b/include/mbgl/text/placement.hpp
index c245e260f0..69a1a10b72 100644
--- a/include/llmr/text/placement.hpp
+++ b/include/mbgl/text/placement.hpp
@@ -1,13 +1,13 @@
-#ifndef LLMR_TEXT_PLACEMENT
-#define LLMR_TEXT_PLACEMENT
+#ifndef MBGL_TEXT_PLACEMENT
+#define MBGL_TEXT_PLACEMENT
 
-#include <llmr/text/collision.hpp>
-#include <llmr/geometry/geometry.hpp>
-#include <llmr/util/vec.hpp>
-#include <llmr/text/glyph.hpp>
+#include <mbgl/text/collision.hpp>
+#include <mbgl/geometry/geometry.hpp>
+#include <mbgl/util/vec.hpp>
+#include <mbgl/text/glyph.hpp>
 #include <vector>
 
-namespace llmr {
+namespace mbgl {
 
 class TextBucket;
 class StyleBucketText;
diff --git a/include/llmr/text/rotation_range.hpp b/include/mbgl/text/rotation_range.hpp
index dcdcc0143c..4968fda164 100644
--- a/include/llmr/text/rotation_range.hpp
+++ b/include/mbgl/text/rotation_range.hpp
@@ -1,13 +1,13 @@
-#ifndef LLMR_TEXT_ROTATION_RANGE
-#define LLMR_TEXT_ROTATION_RANGE
+#ifndef MBGL_TEXT_ROTATION_RANGE
+#define MBGL_TEXT_ROTATION_RANGE
 
-#include <llmr/util/math.hpp>
-#include <llmr/text/types.hpp>
+#include <mbgl/util/math.hpp>
+#include <mbgl/text/types.hpp>
 
 #include <vector>
 #include <cassert>
 
-namespace llmr {
+namespace mbgl {
 
 /*
  * Combine an array of collision ranges to form a continuous
diff --git a/include/llmr/text/types.hpp b/include/mbgl/text/types.hpp
index 46a130d0e3..9a9284b588 100644
--- a/include/llmr/text/types.hpp
+++ b/include/mbgl/text/types.hpp
@@ -1,12 +1,12 @@
-#ifndef LLMR_TEXT_TYPES
-#define LLMR_TEXT_TYPES
+#ifndef MBGL_TEXT_TYPES
+#define MBGL_TEXT_TYPES
 
-#include <llmr/util/vec.hpp>
-#include <llmr/util/rect.hpp>
+#include <mbgl/util/vec.hpp>
+#include <mbgl/util/rect.hpp>
 #include <array>
 #include <vector>
 
-namespace llmr {
+namespace mbgl {
 
 typedef vec2<float> CollisionPoint;
 typedef vec2<float> CollisionAnchor;
diff --git a/include/llmr/util/clip_ids.hpp b/include/mbgl/util/clip_ids.hpp
index 4e4d0abe34..748d3d8f5f 100644
--- a/include/llmr/util/clip_ids.hpp
+++ b/include/mbgl/util/clip_ids.hpp
@@ -1,12 +1,12 @@
-#ifndef LLMR_UTIL_CLIP_IDS
-#define LLMR_UTIL_CLIP_IDS
+#ifndef MBGL_UTIL_CLIP_IDS
+#define MBGL_UTIL_CLIP_IDS
 
-#include <llmr/map/tile.hpp>
+#include <mbgl/map/tile.hpp>
 #include <list>
 #include <set>
 #include <map>
 
-namespace llmr {
+namespace mbgl {
 
 static constexpr uint8_t clipMask[9] { 0x00, 0x80, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC, 0xFE, 0xFF };
 
diff --git a/include/llmr/util/constants.hpp b/include/mbgl/util/constants.hpp
index 999ef05fcc..89e8af2ef1 100644
--- a/include/llmr/util/constants.hpp
+++ b/include/mbgl/util/constants.hpp
@@ -1,11 +1,11 @@
-#ifndef LLMR_UTIL_CONSTANTS
-#define LLMR_UTIL_CONSTANTS
+#ifndef MBGL_UTIL_CONSTANTS
+#define MBGL_UTIL_CONSTANTS
 
 #include <cmath>
 
 #include "vec.hpp"
 
-namespace llmr {
+namespace mbgl {
 
 namespace util {
 
diff --git a/include/llmr/util/enum.hpp b/include/mbgl/util/enum.hpp
index 85a2d7c896..195aaab5a5 100644
--- a/include/llmr/util/enum.hpp
+++ b/include/mbgl/util/enum.hpp
@@ -1,10 +1,10 @@
-#ifndef LLMR_UTIL_ENUM
-#define LLMR_UTIL_ENUM
+#ifndef MBGL_UTIL_ENUM
+#define MBGL_UTIL_ENUM
 
 #include <iosfwd>
 #include <string>
 
-namespace llmr {
+namespace mbgl {
 
 template <typename Type>
 struct EnumValue {
@@ -44,9 +44,9 @@ public:
     inline constexpr operator Type() const { return value; }
 };
 
-#define LLMR_DEFINE_ENUM_CLASS(name, type, strings...) \
-    const constexpr ::llmr::EnumValue<type> type##_names[] = strings; \
-    using name = ::llmr::Enum<type, type##_names, sizeof(type##_names) / sizeof(::llmr::EnumValue<type>)>; \
+#define MBGL_DEFINE_ENUM_CLASS(name, type, strings...) \
+    const constexpr ::mbgl::EnumValue<type> type##_names[] = strings; \
+    using name = ::mbgl::Enum<type, type##_names, sizeof(type##_names) / sizeof(::mbgl::EnumValue<type>)>; \
     inline std::ostream& operator<<(std::ostream& os, type t) { return os << name(t).str(); }
 
 }
diff --git a/include/llmr/util/error.hpp b/include/mbgl/util/error.hpp
index 95106ff2cd..99e27f770c 100644
--- a/include/llmr/util/error.hpp
+++ b/include/mbgl/util/error.hpp
@@ -1,10 +1,10 @@
-#ifndef LLMR_UTIL_ERROR
-#define LLMR_UTIL_ERROR
+#ifndef MBGL_UTIL_ERROR
+#define MBGL_UTIL_ERROR
 
 #include <stdexcept>
 #include <string>
 
-namespace llmr {
+namespace mbgl {
 namespace error {
 
 struct style_parse : std::exception {
diff --git a/include/llmr/util/image.hpp b/include/mbgl/util/image.hpp
index ac20473e82..dc8f6a8150 100644
--- a/include/llmr/util/image.hpp
+++ b/include/mbgl/util/image.hpp
@@ -1,11 +1,11 @@
-#ifndef LLMR_UTIL_IMAGE
-#define LLMR_UTIL_IMAGE
+#ifndef MBGL_UTIL_IMAGE
+#define MBGL_UTIL_IMAGE
 
 #include <string>
 #include <cstring>
 #include <stdexcept>
 
-namespace llmr {
+namespace mbgl {
 namespace util {
 
 std::string compress_png(int width, int height, void *rgba, bool flip = false);
diff --git a/include/llmr/util/io.hpp b/include/mbgl/util/io.hpp
index cdad979134..e95fc16d9d 100644
--- a/include/llmr/util/io.hpp
+++ b/include/mbgl/util/io.hpp
@@ -1,9 +1,9 @@
-#ifndef LLMR_UTIL_IO
-#define LLMR_UTIL_IO
+#ifndef MBGL_UTIL_IO
+#define MBGL_UTIL_IO
 
 #include <string>
 
-namespace llmr {
+namespace mbgl {
 namespace util {
 
 void write_file(const std::string &filename, const std::string &data);
diff --git a/include/llmr/util/mat4.hpp b/include/mbgl/util/mat4.hpp
index a5dc83f7d1..4279113d21 100644
--- a/include/llmr/util/mat4.hpp
+++ b/include/mbgl/util/mat4.hpp
@@ -20,12 +20,12 @@
 //
 // 3. This notice may not be removed or altered from any source distribution.
 
-#ifndef LLMR_UTIL_MAT4
-#define LLMR_UTIL_MAT4
+#ifndef MBGL_UTIL_MAT4
+#define MBGL_UTIL_MAT4
 
 #include <array>
 
-namespace llmr {
+namespace mbgl {
 
 typedef std::array<float, 16> mat4;
 
diff --git a/include/llmr/util/math.hpp b/include/mbgl/util/math.hpp
index ab8e392c48..277fdc8fc3 100644
--- a/include/llmr/util/math.hpp
+++ b/include/mbgl/util/math.hpp
@@ -1,12 +1,12 @@
-#ifndef LLMR_UTIL_MATH
-#define LLMR_UTIL_MATH
+#ifndef MBGL_UTIL_MATH
+#define MBGL_UTIL_MATH
 
 #include <cmath>
 #include <array>
 
 #include "vec.hpp"
 
-namespace llmr {
+namespace mbgl {
 namespace util {
 
 
diff --git a/include/llmr/util/noncopyable.hpp b/include/mbgl/util/noncopyable.hpp
index 7891e529e3..ada701efc6 100644
--- a/include/llmr/util/noncopyable.hpp
+++ b/include/mbgl/util/noncopyable.hpp
@@ -1,7 +1,7 @@
-#ifndef LLMR_UTIL_NONCOPYABLE
-#define LLMR_UTIL_NONCOPYABLE
+#ifndef MBGL_UTIL_NONCOPYABLE
+#define MBGL_UTIL_NONCOPYABLE
 
-namespace llmr { namespace util {
+namespace mbgl { namespace util {
 
 namespace non_copyable_
 {
@@ -20,4 +20,4 @@ typedef non_copyable_::noncopyable noncopyable;
 
 }}
 
-#endif //LLMR_UTIL_NONCOPYABLE
+#endif
diff --git a/include/llmr/util/pbf.hpp b/include/mbgl/util/pbf.hpp
index 13fe8d6ee1..1f78a0072f 100644
--- a/include/llmr/util/pbf.hpp
+++ b/include/mbgl/util/pbf.hpp
@@ -1,5 +1,5 @@
-#ifndef LLMR_UTIL_PBF
-#define LLMR_UTIL_PBF
+#ifndef MBGL_UTIL_PBF
+#define MBGL_UTIL_PBF
 
 /*
  * Some parts are from upb - a minimalist implementation of protocol buffers.
@@ -11,7 +11,7 @@
 #include <string>
 #include <cstring>
 
-namespace llmr {
+namespace mbgl {
 
 struct pbf {
     struct exception : std::exception { const char *what() const noexcept { return "pbf exception"; } };
@@ -179,6 +179,6 @@ void pbf::skipBytes(uint32_t bytes) {
     data += bytes;
 }
 
-} // end namespace llmr
+} // end namespace mbgl
 
 #endif
diff --git a/include/llmr/util/raster.hpp b/include/mbgl/util/raster.hpp
index cbc342d562..04c85169e2 100644
--- a/include/llmr/util/raster.hpp
+++ b/include/mbgl/util/raster.hpp
@@ -1,9 +1,9 @@
-#ifndef LLMR_UTIL_RASTER
-#define LLMR_UTIL_RASTER
+#ifndef MBGL_UTIL_RASTER
+#define MBGL_UTIL_RASTER
 
-#include <llmr/util/transition.hpp>
-#include <llmr/util/texturepool.hpp>
-#include <llmr/util/image.hpp>
+#include <mbgl/util/transition.hpp>
+#include <mbgl/util/texturepool.hpp>
+#include <mbgl/util/image.hpp>
 
 #include <string>
 #include <mutex>
@@ -11,7 +11,7 @@
 
 typedef struct uv_loop_s uv_loop_t;
 
-namespace llmr {
+namespace mbgl {
 
 class Raster : public std::enable_shared_from_this<Raster> {
 
diff --git a/include/llmr/util/rect.hpp b/include/mbgl/util/rect.hpp
index 2e142c3018..a216b8e145 100644
--- a/include/llmr/util/rect.hpp
+++ b/include/mbgl/util/rect.hpp
@@ -1,7 +1,7 @@
-#ifndef LLMR_UTIL_RECT
-#define LLMR_UTIL_RECT
+#ifndef MBGL_UTIL_RECT
+#define MBGL_UTIL_RECT
 
-namespace llmr {
+namespace mbgl {
 
 template <typename T>
 struct Rect {
diff --git a/include/llmr/util/recursive_wrapper.hpp b/include/mbgl/util/recursive_wrapper.hpp
index b87dc5699a..a616805c0f 100644
--- a/include/llmr/util/recursive_wrapper.hpp
+++ b/include/mbgl/util/recursive_wrapper.hpp
@@ -3,7 +3,7 @@
 
 #include <utility>
 
-namespace llmr { namespace util {
+namespace mbgl { namespace util {
 
 template <typename T>
 class recursive_wrapper
diff --git a/include/llmr/util/std.hpp b/include/mbgl/util/std.hpp
index fad3380bc4..051f89bb60 100644
--- a/include/llmr/util/std.hpp
+++ b/include/mbgl/util/std.hpp
@@ -1,5 +1,5 @@
-#ifndef LLMR_UTIL_STD
-#define LLMR_UTIL_STD
+#ifndef MBGL_UTIL_STD
+#define MBGL_UTIL_STD
 
 #include <memory>
 
@@ -13,7 +13,7 @@ template<typename T, typename ...Args>
 
 }
 
-namespace llmr {
+namespace mbgl {
 namespace util {
 
 template <typename Container, typename ForwardIterator, typename Predicate>
diff --git a/include/llmr/util/string.hpp b/include/mbgl/util/string.hpp
index 50293b9f40..f17d55cec3 100644
--- a/include/llmr/util/string.hpp
+++ b/include/mbgl/util/string.hpp
@@ -1,9 +1,9 @@
-#ifndef LLMR_UTIL_STRING
-#define LLMR_UTIL_STRING
+#ifndef MBGL_UTIL_STRING
+#define MBGL_UTIL_STRING
 
 #include <string>
 
-namespace llmr {
+namespace mbgl {
 namespace util {
 
 template<size_t max, typename... Args>
diff --git a/include/llmr/util/texturepool.hpp b/include/mbgl/util/texturepool.hpp
index 348d25d29a..566d8c1750 100644
--- a/include/llmr/util/texturepool.hpp
+++ b/include/mbgl/util/texturepool.hpp
@@ -1,13 +1,13 @@
-#ifndef LLMR_UTIL_TEXTUREPOOL
-#define LLMR_UTIL_TEXTUREPOOL
+#ifndef MBGL_UTIL_TEXTUREPOOL
+#define MBGL_UTIL_TEXTUREPOOL
 
-#include <llmr/util/noncopyable.hpp>
-#include <llmr/platform/gl.hpp>
+#include <mbgl/util/noncopyable.hpp>
+#include <mbgl/platform/gl.hpp>
 
 #include <set>
 #include <mutex>
 
-namespace llmr {
+namespace mbgl {
 
 class Texturepool : private util::noncopyable {
 
diff --git a/include/llmr/util/threadpool.hpp b/include/mbgl/util/threadpool.hpp
index c3649c60e5..497d4e3083 100644
--- a/include/llmr/util/threadpool.hpp
+++ b/include/mbgl/util/threadpool.hpp
@@ -1,11 +1,11 @@
-#ifndef LLMR_UTIL_THREADPOOL
-#define LLMR_UTIL_THREADPOOL
+#ifndef MBGL_UTIL_THREADPOOL
+#define MBGL_UTIL_THREADPOOL
 
 #include <pthread.h>
 #include <forward_list>
 #include <queue>
 
-namespace llmr {
+namespace mbgl {
 namespace util {
 
 class Threadpool {
diff --git a/include/llmr/util/time.hpp b/include/mbgl/util/time.hpp
index 9a27cdbe31..eacee2c982 100644
--- a/include/llmr/util/time.hpp
+++ b/include/mbgl/util/time.hpp
@@ -1,9 +1,9 @@
-#ifndef LLMR_UTIL_TIME
-#define LLMR_UTIL_TIME
+#ifndef MBGL_UTIL_TIME
+#define MBGL_UTIL_TIME
 
 #include <uv.h>
 
-namespace llmr {
+namespace mbgl {
 
 typedef uint64_t timestamp;
 
diff --git a/include/llmr/util/timer.hpp b/include/mbgl/util/timer.hpp
index 5dc0cfaf3f..8171c2f5d1 100644
--- a/include/llmr/util/timer.hpp
+++ b/include/mbgl/util/timer.hpp
@@ -1,11 +1,11 @@
-#ifndef LLMR_UTIL_TIMER
-#define LLMR_UTIL_TIMER
+#ifndef MBGL_UTIL_TIMER
+#define MBGL_UTIL_TIMER
 
-#include <llmr/platform/event.hpp>
+#include <mbgl/platform/event.hpp>
 
 #include <string>
 
-namespace llmr {
+namespace mbgl {
 namespace util {
 
 #ifndef DISABLE_TIMER
diff --git a/include/llmr/util/token.hpp b/include/mbgl/util/token.hpp
index 6795b97d12..a794e0489c 100644
--- a/include/llmr/util/token.hpp
+++ b/include/mbgl/util/token.hpp
@@ -1,5 +1,5 @@
-#ifndef LLMR_UTIL_TOKEN
-#define LLMR_UTIL_TOKEN
+#ifndef MBGL_UTIL_TOKEN
+#define MBGL_UTIL_TOKEN
 
 #ifdef __linux__
 #include <boost/regex.hpp>
@@ -11,7 +11,7 @@ namespace regex_impl = std;
 
 #include <map>
 
-namespace llmr {
+namespace mbgl {
 namespace util {
 
 namespace detail {
@@ -47,6 +47,6 @@ inline std::string replaceTokens(const std::string &source, const std::map<std::
 }
 
 } // end namespace util
-} // end namespace llmr
+} // end namespace mbgl
 
 #endif
diff --git a/include/llmr/util/transition.hpp b/include/mbgl/util/transition.hpp
index fbf33d10f9..b12527124e 100644
--- a/include/llmr/util/transition.hpp
+++ b/include/mbgl/util/transition.hpp
@@ -1,11 +1,11 @@
-#ifndef LLMR_UTIL_TRANSITION
-#define LLMR_UTIL_TRANSITION
+#ifndef MBGL_UTIL_TRANSITION
+#define MBGL_UTIL_TRANSITION
 
-#include <llmr/util/noncopyable.hpp>
-#include <llmr/util/time.hpp>
-#include <llmr/style/types.hpp>
+#include <mbgl/util/noncopyable.hpp>
+#include <mbgl/util/time.hpp>
+#include <mbgl/style/types.hpp>
 
-namespace llmr {
+namespace mbgl {
 namespace util {
 
 class transition : private noncopyable {
diff --git a/include/llmr/util/unitbezier.hpp b/include/mbgl/util/unitbezier.hpp
index 6acae7a3de..095e15f809 100644
--- a/include/llmr/util/unitbezier.hpp
+++ b/include/mbgl/util/unitbezier.hpp
@@ -23,12 +23,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef LLMR_UTIL_UNITBEZIER
-#define LLMR_UTIL_UNITBEZIER
+#ifndef MBGL_UTIL_UNITBEZIER
+#define MBGL_UTIL_UNITBEZIER
 
 #include <cmath>
 
-namespace llmr {
+namespace mbgl {
 namespace util {
 
 struct UnitBezier {
diff --git a/include/llmr/util/utf.hpp b/include/mbgl/util/utf.hpp
index fc9fb57d58..5dfc4ad2d1 100644
--- a/include/llmr/util/utf.hpp
+++ b/include/mbgl/util/utf.hpp
@@ -1,5 +1,5 @@
-#ifndef LLMR_UTIL_UTF
-#define LLMR_UTIL_UTF
+#ifndef MBGL_UTIL_UTF
+#define MBGL_UTIL_UTF
 
 #include <memory>
 
@@ -16,7 +16,7 @@
 #include <locale>
 #endif
 
-namespace llmr {
+namespace mbgl {
 
 namespace util {
 
diff --git a/include/llmr/util/uv.hpp b/include/mbgl/util/uv.hpp
index 69d1e8ef98..f36da83e4d 100644
--- a/include/llmr/util/uv.hpp
+++ b/include/mbgl/util/uv.hpp
@@ -1,5 +1,5 @@
-#ifndef LLMR_UTIL_UV
-#define LLMR_UTIL_UV
+#ifndef MBGL_UTIL_UV
+#define MBGL_UTIL_UV
 
 #include <uv.h>
 #include <functional>
diff --git a/include/llmr/util/variant.hpp b/include/mbgl/util/variant.hpp
index 57f8593439..ddc82ee311 100644
--- a/include/llmr/util/variant.hpp
+++ b/include/mbgl/util/variant.hpp
@@ -35,7 +35,7 @@
 // translates to 100
 #define VARIANT_VERSION (VARIANT_MAJOR_VERSION*100000) + (VARIANT_MINOR_VERSION*100) + (VARIANT_PATCH_VERSION)
 
-namespace llmr { namespace util { namespace detail {
+namespace mbgl { namespace util { namespace detail {
 
 static constexpr std::size_t invalid_value = std::size_t(-1);
 
diff --git a/include/llmr/util/vec.hpp b/include/mbgl/util/vec.hpp
index 828a6a5fb2..0b9bf63d53 100644
--- a/include/llmr/util/vec.hpp
+++ b/include/mbgl/util/vec.hpp
@@ -1,5 +1,5 @@
-#ifndef LLMR_UTIL_VEC
-#define LLMR_UTIL_VEC
+#ifndef MBGL_UTIL_VEC
+#define MBGL_UTIL_VEC
 
 #include <limits>
 #include <type_traits>
@@ -7,7 +7,7 @@
 #include <cstdint>
 #include <array>
 
-namespace llmr {
+namespace mbgl {
 
 template <typename T = double>
 struct vec2 {