diff --git a/platform/darwin/http_request_nsurl.mm b/platform/darwin/http_request_nsurl.mm
index 119cc6caa..33f5f043e 100644
--- a/platform/darwin/http_request_nsurl.mm
+++ b/platform/darwin/http_request_nsurl.mm
@@ -1,4 +1,4 @@
-#include <mbgl/storage/http_context.hpp>
+#include <mbgl/storage/http_context_base.hpp>
 #include <mbgl/storage/http_request_base.hpp>
 #include <mbgl/storage/resource.hpp>
 #include <mbgl/storage/response.hpp>
@@ -49,7 +49,7 @@ private:
 
 // -------------------------------------------------------------------------------------------------
 
-class HTTPNSURLContext : public HTTPContext {
+class HTTPNSURLContext : public HTTPContextBase {
 public:
     HTTPNSURLContext(uv_loop_t *loop);
     ~HTTPNSURLContext();
@@ -64,7 +64,7 @@ public:
     NSInteger accountType = 0;
 };
 
-HTTPNSURLContext::HTTPNSURLContext(uv_loop_t *loop_) : HTTPContext(loop_) {
+HTTPNSURLContext::HTTPNSURLContext(uv_loop_t *loop_) : HTTPContextBase(loop_) {
     @autoreleasepool {
         NSURLSessionConfiguration *sessionConfig =
                 [NSURLSessionConfiguration defaultSessionConfiguration];
@@ -333,7 +333,7 @@ void HTTPNSURLRequest::retry() {
     }
 }
 
-std::unique_ptr<HTTPContext> HTTPContext::createContext(uv_loop_t* loop) {
+std::unique_ptr<HTTPContextBase> HTTPContextBase::createContext(uv_loop_t* loop) {
     return std::make_unique<HTTPNSURLContext>(loop);
 }
 
diff --git a/platform/default/http_request_curl.cpp b/platform/default/http_request_curl.cpp
index 2c4b60652..6b2c38e77 100644
--- a/platform/default/http_request_curl.cpp
+++ b/platform/default/http_request_curl.cpp
@@ -1,4 +1,4 @@
-#include <mbgl/storage/http_context.hpp>
+#include <mbgl/storage/http_context_base.hpp>
 #include <mbgl/storage/http_request_base.hpp>
 #include <mbgl/storage/resource.hpp>
 #include <mbgl/storage/response.hpp>
@@ -37,7 +37,7 @@ namespace mbgl {
 
 class HTTPCURLRequest;
 
-class HTTPCURLContext : public HTTPContext {
+class HTTPCURLContext : public HTTPContextBase {
     MBGL_STORE_THREAD(tid)
 
 public:
@@ -167,7 +167,7 @@ private:
 // -------------------------------------------------------------------------------------------------
 
 HTTPCURLContext::HTTPCURLContext(uv_loop_t *loop_)
-    : HTTPContext(loop_),
+    : HTTPContextBase(loop_),
       loop(loop_) {
     if (curl_global_init(CURL_GLOBAL_ALL)) {
         throw std::runtime_error("Could not init cURL");
@@ -713,7 +713,7 @@ void HTTPCURLRequest::handleResult(CURLcode code) {
     throw std::runtime_error("Response hasn't been handled");
 }
 
-std::unique_ptr<HTTPContext> HTTPContext::createContext(uv_loop_t* loop) {
+std::unique_ptr<HTTPContextBase> HTTPContextBase::createContext(uv_loop_t* loop) {
     return std::make_unique<HTTPCURLContext>(loop);
 }
 
diff --git a/src/mbgl/storage/default_file_source.cpp b/src/mbgl/storage/default_file_source.cpp
index a9908c450..b3761cd5b 100644
--- a/src/mbgl/storage/default_file_source.cpp
+++ b/src/mbgl/storage/default_file_source.cpp
@@ -1,7 +1,7 @@
 #include <mbgl/storage/default_file_source_impl.hpp>
 #include <mbgl/storage/request.hpp>
 #include <mbgl/storage/asset_context.hpp>
-#include <mbgl/storage/http_context.hpp>
+#include <mbgl/storage/http_context_base.hpp>
 
 #include <mbgl/storage/response.hpp>
 #include <mbgl/platform/platform.hpp>
@@ -76,7 +76,7 @@ DefaultFileSource::Impl::Impl(FileCache* cache_, const std::string& root)
       cache(cache_),
       assetRoot(root.empty() ? platform::assetRoot() : root),
       assetContext(AssetContext::createContext(loop)),
-      httpContext(HTTPContext::createContext(loop)) {
+      httpContext(HTTPContextBase::createContext(loop)) {
 }
 
 DefaultFileRequest* DefaultFileSource::Impl::find(const Resource& resource) {
diff --git a/src/mbgl/storage/default_file_source_impl.hpp b/src/mbgl/storage/default_file_source_impl.hpp
index 06fe3e39b..6f3e10c55 100644
--- a/src/mbgl/storage/default_file_source_impl.hpp
+++ b/src/mbgl/storage/default_file_source_impl.hpp
@@ -3,7 +3,7 @@
 
 #include <mbgl/storage/default_file_source.hpp>
 #include <mbgl/storage/asset_context.hpp>
-#include <mbgl/storage/http_context.hpp>
+#include <mbgl/storage/http_context_base.hpp>
 
 #include <set>
 #include <unordered_map>
@@ -48,7 +48,7 @@ private:
     FileCache* cache = nullptr;
     const std::string assetRoot;
     std::unique_ptr<AssetContext> assetContext;
-    std::unique_ptr<HTTPContext> httpContext;
+    std::unique_ptr<HTTPContextBase> httpContext;
 };
 
 }
diff --git a/src/mbgl/storage/http_context.cpp b/src/mbgl/storage/http_context_base.cpp
similarity index 55%
rename from src/mbgl/storage/http_context.cpp
rename to src/mbgl/storage/http_context_base.cpp
index 969ff94d3..8b09fc4dc 100644
--- a/src/mbgl/storage/http_context.cpp
+++ b/src/mbgl/storage/http_context_base.cpp
@@ -1,27 +1,27 @@
-#include <mbgl/storage/http_context.hpp>
+#include <mbgl/storage/http_context_base.hpp>
 
 namespace mbgl {
 
-HTTPContext::HTTPContext(uv_loop_t* loop_)
+HTTPContextBase::HTTPContextBase(uv_loop_t* loop_)
     : reachability(loop_, [this] { retryRequests(); }) {
     NetworkStatus::Subscribe(reachability.get());
     reachability.unref();
 }
 
-HTTPContext::~HTTPContext() {
+HTTPContextBase::~HTTPContextBase() {
     assert(requests.empty());
     NetworkStatus::Unsubscribe(reachability.get());
 }
 
-void HTTPContext::addRequest(HTTPRequestBase* request) {
+void HTTPContextBase::addRequest(HTTPRequestBase* request) {
     requests.insert(request);
 }
 
-void HTTPContext::removeRequest(HTTPRequestBase* request) {
+void HTTPContextBase::removeRequest(HTTPRequestBase* request) {
     requests.erase(request);
 }
 
-void HTTPContext::retryRequests() {
+void HTTPContextBase::retryRequests() {
     for (auto request : requests) {
         request->retry();
     }
diff --git a/src/mbgl/storage/http_context.hpp b/src/mbgl/storage/http_context_base.hpp
similarity index 73%
rename from src/mbgl/storage/http_context.hpp
rename to src/mbgl/storage/http_context_base.hpp
index 3d5380cdc..66da59bb1 100644
--- a/src/mbgl/storage/http_context.hpp
+++ b/src/mbgl/storage/http_context_base.hpp
@@ -1,5 +1,5 @@
-#ifndef MBGL_STORAGE_DEFAULT_HTTP_CONTEXT
-#define MBGL_STORAGE_DEFAULT_HTTP_CONTEXT
+#ifndef MBGL_STORAGE_HTTP_CONTEXT_BASE
+#define MBGL_STORAGE_HTTP_CONTEXT_BASE
 
 #include <mbgl/storage/request_base.hpp>
 #include <mbgl/storage/http_request_base.hpp>
@@ -10,12 +10,12 @@
 
 namespace mbgl {
 
-class HTTPContext {
+class HTTPContextBase {
 public:
-    static std::unique_ptr<HTTPContext> createContext(uv_loop_t*);
+    static std::unique_ptr<HTTPContextBase> createContext(uv_loop_t*);
 
-    HTTPContext(uv_loop_t*);
-    virtual ~HTTPContext();
+    HTTPContextBase(uv_loop_t*);
+    virtual ~HTTPContextBase();
 
     virtual HTTPRequestBase* createRequest(const Resource&,
                                        RequestBase::Callback,
@@ -36,6 +36,6 @@ private:
     std::set<HTTPRequestBase*> requests;
 };
 
-}
+} // namespace mbgl
 
-#endif
+#endif // MBGL_STORAGE_HTTP_CONTEXT_BASE