GL is the library, SDK is the product

7 files changed, 8 insertions, 59 deletions

diff --git a/ios/FAQ.md b/ios/FAQ.md
deleted file mode 100644
index 19ae74fdba..0000000000
--- a/ios/FAQ.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# Mapbox GL for iOS FAQ
-
-Mapbox GL is a completely new renderer technology which will eventually replace and/or merge Mapbox's existing iOS toolsets, the [Mapbox iOS SDK](http://www.mapbox.com/mapbox-ios-sdk/) and [MBXMapKit](https://www.mapbox.com/mbxmapkit/). This FAQ shares our current plans for that migration. The plans are subject to change as Mapbox GL matures, but we wanted to both clarify our thinking as well as set expectations for where things are headed. 
-
-### When will Mapbox GL be released? 
-
-The library is [open source](https://github.com/mapbox/mapbox-gl-native) right now, but an official, production-recommended release will come later in 2015. 
-
-### What iOS versions will be supported? 
-
-Mapbox GL currently supports iOS 7 and later. This will continue to be the case. MBXMapKit also supports iOS 7 and greater, but this does mean that moving from the iOS SDK will leave behind iOS 5 and 6. 
-
-### Will the API be similar to the Mapbox iOS SDK/MBXMapKit/MapKit? 
-
-Yes. We are shooting for bringing the Mapbox GL API in line with Apple's MapKit for the easiest transition ability. 
-
-MBXMapKit is already an add-on to MapKit, so Apple's `MKMapView` API is used directly. 
-
-The Mapbox iOS SDK is "workalike", since it descends from an [upstream open source project](https://github.com/Alpstein/route-me) that predates Apple's own MapKit. It uses similar concepts like annotations (with the difference that the map view delegate provides `CALayer` instances instead of `UIView`, the intention being that Mapbox GL will support `UIView`), similar API for managing the map view center, bounds, and zoom levels, and an `RMUserLocation` API that is very much like `MKUserLocation`. But the Mapbox iOS SDK also features unique APIs like extensible tile sources, offline caching, UTFGrid interactivity, and point annotation clustering. 
-
-### Will the iOS SDK's extra APIs make it over to Mapbox GL? 
-
-The intention is yes. This includes: 
-
-#### Tile sources
-
-The SDK uses the `RMTileSource` protocol to allow for extensible remote and local raster tile sources, as well as custom on-the-fly raster tile generation. We are planning to build a transitional API in Mapbox GL that acts as a wrapper to `RMTileSource` so that existing sources can be used to plug into the main Mapbox GL source API. 
-
-#### Offline caching
-
-Both the Mapbox iOS SDK and MBXMapKit feature robust support for offline caching of raster tiles and the SDK features support for [MBTiles](http://mbtiles.org) tile sources. 
-
-We're likely going to take a similar approach to both performance caching and offline maps as is done with the `0.3.0` release of MBXMapKit. That is, `NSURLCache` will be used for performance caching and specific, separate offline map database management will be used for fetching areas of map tiles. This is a cleaner design than exists in the SDK, which combines performance and offline caches and has a non-intuitive configuration API. 
-
-We will likely also port over MBTiles support to Mapbox GL. 
-
-#### UTFGrid interactivity
-
-[UTFGrid](https://github.com/mapbox/utfgrid-spec) is a technology for enabling interactive features in raster tiles. Support for the technology is provided in the Mapbox iOS SDK with categories in `RMInteractiveSource` in combination with either `RMMapboxSource` or `RMMBTilesSource`. 
-
-Mapbox GL obsoletes this sort of pixel-based interactivity since the source data used for rendering can be queried on-device, so we are unlikely to port UTFGrid over to GL. 
-
-#### Annotation clustering
-
-We're planning on adding support for point clustering to Mapbox GL and it will likely have a similar API to the SDK's. Clustering will happen on an individual style layer level. The performance for clustering, as well as annotations in general, will hopefully be better than in the SDK, since it will be done with direct OpenGL rendering instead of Core Animation layers. 
-  
-### What will the migration path look like? 
-
-Ideally, the migration will be pretty lightweight because of the APIs supported above. There may be slight syntax changes, but they likely won't be more than would be expected from something like Mapbox iOS SDK version `1.x` to a hypothetical `2.x`. 
diff --git a/ios/MapboxGL.podspec b/ios/Mapbox-iOS-SDK.podspec
index 296b6ca212..7b30444c96 100644
--- a/ios/MapboxGL.podspec
+++ b/ios/Mapbox-iOS-SDK.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |m|
 
-  m.name    = 'MapboxGL'
+  m.name    = 'Mapbox-iOS-SDK'
   m.version = '0.5.4-symbols'
 
   m.summary          = 'Open source vector map solution for iOS with full styling capabilities.'
@@ -24,8 +24,9 @@ Pod::Spec.new do |m|
 
   m.preserve_paths = '**'
   m.source_files = 'Headers/*.h', 'MGLDummy.m'
-  m.resource_bundle = { 'MapboxGL' => 'MapboxGL.bundle/*' }
-  m.vendored_library = 'libMapboxGL.a'
+  m.resource_bundle = { 'Mapbox' => 'Mapbox.bundle/*' }
+  m.vendored_library = 'libMapbox.a'
+  m.module_name = 'Mapbox'
 
   m.frameworks = 'CoreLocation', 'CoreTelephony', 'GLKit', 'ImageIO', 'MobileCoreServices', 'QuartzCore', 'SystemConfiguration'
   m.libraries = 'c++', 'sqlite3', 'z'
diff --git a/ios/app/MBXAppDelegate.m b/ios/app/MBXAppDelegate.m
index b09235a278..bca039739a 100644
--- a/ios/app/MBXAppDelegate.m
+++ b/ios/app/MBXAppDelegate.m
@@ -1,6 +1,6 @@
 #import "MBXAppDelegate.h"
 #import "MBXViewController.h"
-#import <mbgl/ios/MapboxGL.h>
+#import <mbgl/ios/Mapbox.h>
 
 @implementation MBXAppDelegate
 
diff --git a/ios/app/MBXViewController.mm b/ios/app/MBXViewController.mm
index d260f5cabb..f5ec262bf4 100644
--- a/ios/app/MBXViewController.mm
+++ b/ios/app/MBXViewController.mm
@@ -1,6 +1,6 @@
 #import "MBXViewController.h"
 
-#import <mbgl/ios/MapboxGL.h>
+#import <mbgl/ios/Mapbox.h>
 
 #import <mbgl/platform/darwin/settings_nsuserdefaults.hpp>
 
diff --git a/ios/app/README.md b/ios/app/README.md
deleted file mode 100644
index 325670f1ea..0000000000
--- a/ios/app/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-This is the app for use in the development of Mapbox GL for iOS. 
-
-If you want to run this app, head up to [`mapbox-gl-native`](https://github.com/mapbox/mapbox-gl-native) and follow the iOS installation instructions there. 
\ No newline at end of file
diff --git a/ios/docs/install_docs.sh b/ios/docs/install_docs.sh
index 1a5f97a8d3..9af3368c11 100755
--- a/ios/docs/install_docs.sh
+++ b/ios/docs/install_docs.sh
@@ -26,7 +26,7 @@ perl \
     /tmp/mbgl/ios/*.h
 appledoc \
     --output ${OUTPUT} \
-    --project-name "Mapbox GL for iOS ${VERSION}" \
+    --project-name "Mapbox iOS SDK ${VERSION}" \
     --project-company Mapbox \
     --create-docset \
     --company-id com.mapbox \
diff --git a/ios/README.md b/ios/docs/pod-README.md
index 545cd51080..7ffbf3b2c0 100644
--- a/ios/README.md
+++ b/ios/docs/pod-README.md
@@ -1,4 +1,4 @@
-# Mapbox GL for iOS
+# Mapbox iOS SDK
 
 An open source OpenGL-based vector map solution for iOS with full styling capabilities and Cocoa bindings.