5 files changed, 26 insertions, 26 deletions
diff --git a/src/text/collision.cpp b/src/text/collision.cpp
index 0b4c65885a..54b47e438b 100644
--- a/src/text/collision.cpp
+++ b/src/text/collision.cpp
@@ -1,6 +1,6 @@
-#include <llmr/text/collision.hpp>
-#include <llmr/text/rotation_range.hpp>
-#include <llmr/util/math.hpp>
+#include <mbgl/text/collision.hpp>
+#include <mbgl/text/rotation_range.hpp>
+#include <mbgl/util/math.hpp>
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
@@ -14,7 +14,7 @@
 #include <boost/geometry/index/rtree.hpp>
 #pragma GCC diagnostic pop
 
-namespace llmr {
+namespace mbgl {
 namespace bg = boost::geometry;
 namespace bgm = bg::model;
 namespace bgi = bg::index;
@@ -24,7 +24,7 @@ typedef std::pair<Box, PlacementBox> PlacementValue;
 typedef bgi::rtree<PlacementValue, bgi::rstar<16>> Tree;
 }
 
-using namespace llmr;
+using namespace mbgl;
 
 Collision::~Collision() {
     delete ((Tree *)cTree);
diff --git a/src/text/glyph.cpp b/src/text/glyph.cpp
index 32f7e7ccc3..7dea7246d7 100644
--- a/src/text/glyph.cpp
+++ b/src/text/glyph.cpp
@@ -1,6 +1,6 @@
-#include <llmr/text/glyph.hpp>
+#include <mbgl/text/glyph.hpp>
 
-namespace llmr {
+namespace mbgl {
 
 // Note: this only works for the BMP
 // Note: we could use a binary lookup table to get averaged constant time lookups, however,
diff --git a/src/text/glyph_store.cpp b/src/text/glyph_store.cpp
index f83d810899..edcecde7ff 100644
--- a/src/text/glyph_store.cpp
+++ b/src/text/glyph_store.cpp
@@ -1,16 +1,16 @@
-#include <llmr/text/glyph_store.hpp>
-
-#include <llmr/util/std.hpp>
-#include <llmr/util/string.hpp>
-#include <llmr/util/utf.hpp>
-#include <llmr/util/pbf.hpp>
-#include <llmr/util/constants.hpp>
-#include <llmr/util/token.hpp>
-#include <llmr/platform/platform.hpp>
+#include <mbgl/text/glyph_store.hpp>
+
+#include <mbgl/util/std.hpp>
+#include <mbgl/util/string.hpp>
+#include <mbgl/util/utf.hpp>
+#include <mbgl/util/pbf.hpp>
+#include <mbgl/util/constants.hpp>
+#include <mbgl/util/token.hpp>
+#include <mbgl/platform/platform.hpp>
 #include <uv.h>
 #include <algorithm>
 
-namespace llmr {
+namespace mbgl {
 
 
 void FontStack::insert(uint32_t id, const SDFGlyph &glyph) {
diff --git a/src/text/placement.cpp b/src/text/placement.cpp
index aef5288bf2..e33a4bdec6 100644
--- a/src/text/placement.cpp
+++ b/src/text/placement.cpp
@@ -1,13 +1,13 @@
-#include <llmr/text/placement.hpp>
-#include <llmr/map/vector_tile.hpp>
-#include <llmr/geometry/interpolate.hpp>
-#include <llmr/renderer/text_bucket.hpp>
-#include <llmr/util/math.hpp>
-#include <llmr/util/constants.hpp>
+#include <mbgl/text/placement.hpp>
+#include <mbgl/map/vector_tile.hpp>
+#include <mbgl/geometry/interpolate.hpp>
+#include <mbgl/renderer/text_bucket.hpp>
+#include <mbgl/util/math.hpp>
+#include <mbgl/util/constants.hpp>
 
 #include <algorithm>
 
-using namespace llmr;
+using namespace mbgl;
 
 const int Placement::tileExtent = 4096;
 const int Placement::glyphSize =
diff --git a/src/text/rotation_range.cpp b/src/text/rotation_range.cpp
index 9cbf958b71..943253a3da 100644
--- a/src/text/rotation_range.cpp
+++ b/src/text/rotation_range.cpp
@@ -1,9 +1,9 @@
-#include <llmr/text/rotation_range.hpp>
+#include <mbgl/text/rotation_range.hpp>
 
 #include <cassert>
 #include <algorithm>
 
-namespace llmr {
+namespace mbgl {
 
 /*
  * Combine an array of collision ranges to form a continuous