diff --git a/gyp/platform-ios.gypi b/gyp/platform-ios.gypi
index f3191659a..43c51d61b 100644
--- a/gyp/platform-ios.gypi
+++ b/gyp/platform-ios.gypi
@@ -16,8 +16,8 @@
         '../platform/darwin/asset_root.mm',
         '../platform/darwin/image.mm',
         '../platform/darwin/reachability.m',
-        '../include/mbgl/ios/MBLocationManager.h',
-        '../platform/ios/MBLocationManager.m',
+        '../include/mbgl/ios/MGLMetricsLocationManager.h',
+        '../platform/ios/MGLMetricsLocationManager.m',
         '../include/mbgl/ios/MGLMapView.h',
         '../platform/ios/MGLMapView.mm',
         '../include/mbgl/ios/MGLStyleFunctionValue.h',
diff --git a/include/mbgl/ios/MBLocationManager.h b/include/mbgl/ios/MGLMetricsLocationManager.h
similarity index 84%
rename from include/mbgl/ios/MBLocationManager.h
rename to include/mbgl/ios/MGLMetricsLocationManager.h
index 84a847c9e..1630b848a 100644
--- a/include/mbgl/ios/MBLocationManager.h
+++ b/include/mbgl/ios/MGLMetricsLocationManager.h
@@ -9,7 +9,7 @@
 #import <Foundation/Foundation.h>
 #import "CoreLocation/CoreLocation.h"
 
-@interface MBLocationManager : NSObject <CLLocationManagerDelegate>
+@interface MGLMetricsLocationManager : NSObject <CLLocationManagerDelegate>
 
 + (id)sharedManager;
 
diff --git a/platform/ios/MGLMapView.mm b/platform/ios/MGLMapView.mm
index 0592683d6..6136eeb3c 100644
--- a/platform/ios/MGLMapView.mm
+++ b/platform/ios/MGLMapView.mm
@@ -21,7 +21,7 @@
 #import "NSArray+MGLAdditions.h"
 #import "NSDictionary+MGLAdditions.h"
 
-#import "MBLocationManager.h"
+#import "MGLMetricsLocationManager.h"
 
 
 // Returns the path to the default cache database on this system.
@@ -341,7 +341,7 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(appWillForeground:) name:UIApplicationWillEnterForegroundNotification object:nil];
 
     // Setup MBLocationManager for metrics
-    [MBLocationManager sharedManager];
+    [MGLMetricsLocationManager sharedManager];
     
     // set initial position
     //
diff --git a/platform/ios/MBLocationManager.m b/platform/ios/MGLMetricsLocationManager.m
similarity index 90%
rename from platform/ios/MBLocationManager.m
rename to platform/ios/MGLMetricsLocationManager.m
index 9aa235fc2..0732c04e3 100644
--- a/platform/ios/MBLocationManager.m
+++ b/platform/ios/MGLMetricsLocationManager.m
@@ -9,20 +9,20 @@
 //  Copyright (c) 2015 Mapbox. All rights reserved.
 //
 
-#import "MBLocationManager.h"
+#import "MGLMetricsLocationManager.h"
 #import "CoreLocation/CoreLocation.h"
 
-@interface MBLocationManager()
+@interface MGLMetricsLocationManager()
 
 @property (atomic) CLLocationManager *locationManager;
 @property (atomic) BOOL isBackground;
 
 @end
 
-@implementation MBLocationManager
+@implementation MGLMetricsLocationManager
 
 
-static MBLocationManager *sharedManager = nil;
+static MGLMetricsLocationManager *sharedManager = nil;
 
 - (id) init {
     if (self = [super init]) {
@@ -119,24 +119,24 @@ static MBLocationManager *sharedManager = nil;
             break;
         case kCLAuthorizationStatusDenied:
             newStatus = @"User Explcitly Denied";
-            [[MBLocationManager sharedManager] stopUpdatingLocation];
+            [[MGLMetricsLocationManager sharedManager] stopUpdatingLocation];
             break;
         case kCLAuthorizationStatusAuthorized:
             newStatus = @"User Has Authorized / Authorized Always";
-            [[MBLocationManager sharedManager] startUpdatingLocation];
+            [[MGLMetricsLocationManager sharedManager] startUpdatingLocation];
             break;
             //        case kCLAuthorizationStatusAuthorizedAlways:
             //            newStatus = @"Not Determined";
             //            break;
         case kCLAuthorizationStatusAuthorizedWhenInUse:
             newStatus = @"User Has Authorized When In Use Only";
-            [[MBLocationManager sharedManager] startUpdatingLocation];
+            [[MGLMetricsLocationManager sharedManager] startUpdatingLocation];
             break;
         default:
             newStatus = @"Unknown";
             break;
     }
-    NSLog(@"MBLocationManager didChangeAuthorizationStatus() called.  New Status = %@", newStatus);
+    NSLog(@"MGLMetricsLocationManager didChangeAuthorizationStatus() called.  New Status = %@", newStatus);
 }
 
 @end