diff --git a/platform/default/sqlite_cache.cpp b/platform/default/sqlite_cache.cpp
index e618c960c..dfb629054 100644
--- a/platform/default/sqlite_cache.cpp
+++ b/platform/default/sqlite_cache.cpp
@@ -16,7 +16,7 @@ namespace mbgl {
 using namespace mapbox::sqlite;
 
 SQLiteCache::SQLiteCache(const std::string& path_)
-    : thread(std::make_unique<util::Thread<Impl>>(util::ThreadContext{"SQLite Cache", util::ThreadType::Unknown, util::ThreadPriority::Low}, path_)) {
+    : thread(std::make_unique<util::Thread<Impl>>(util::ThreadContext{"SQLiteCache", util::ThreadType::Unknown, util::ThreadPriority::Low}, path_)) {
 }
 
 SQLiteCache::~SQLiteCache() = default;
diff --git a/src/mbgl/util/thread.hpp b/src/mbgl/util/thread.hpp
index b0d17bd52..d7611254c 100644
--- a/src/mbgl/util/thread.hpp
+++ b/src/mbgl/util/thread.hpp
@@ -93,8 +93,10 @@ Thread<Object>::Thread(const ThreadContext& context, Args&&... args) {
     std::tuple<Args...> params = std::forward_as_tuple(::std::forward<Args>(args)...);
 
     thread = std::thread([&] {
-        #ifdef __APPLE__
+        #if defined( __APPLE__)
         pthread_setname_np(context.name.c_str());
+        #elif defined(__linux__)
+        pthread_setname_np(pthread_self(), context.name.c_str());
         #endif
 
         if (context.priority == ThreadPriority::Low) {