From 061854990ffe495910a5f0dc7c6bb5d394f772e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= <mxn@1ec5.org>
Date: Mon, 13 Jun 2016 14:47:13 -0700
Subject: [PATCH] [macos] Renamed OS X SDK to macOS SDK

Also renamed as many references to OS X as possible to macOS in documentation.

Cherry-picked from b9702ef41a4cfdd0ab3107cfe5cec16ba3a4c230.
---
 .gitignore                                    |   2 +-
 .ycm_extra_conf.py                            |   2 +-
 ARCHITECTURE.md                               |   4 +-
 CHANGELOG.md                                  |   2 +-
 CONTRIBUTING.md                               |   4 +-
 INSTALL.md                                    |   4 +-
 Makefile                                      |  58 +++++++++---------
 README.md                                     |   6 +-
 bin/offline.sh                                |   2 +-
 configure                                     |   4 ++
 deps/ninja/{ninja-osx => ninja-macos}         | Bin
 ...TRIBUTING_OSX.md => CONTRIBUTING_MACOS.md} |   2 +-
 platform/android/README.md                    |   2 +-
 platform/darwin/README.md                     |   6 +-
 platform/darwin/src/http_file_source.mm       |   4 +-
 platform/ios/DEVELOPING.md                    |  10 +--
 platform/{osx => macos}/CHANGELOG.md          |   3 +-
 platform/{osx => macos}/DEVELOPING.md         |  24 ++++----
 platform/{osx => macos}/INSTALL.md            |  14 ++---
 platform/{osx => macos}/README.md             |  10 +--
 .../WorkspaceSettings.xcsettings              |   0
 platform/{osx => macos}/app/AppDelegate.h     |   0
 platform/{osx => macos}/app/AppDelegate.m     |   0
 .../AppIcon.appiconset/AppIcon128x128.png     | Bin
 .../AppIcon.appiconset/AppIcon16x16.png       | Bin
 .../AppIcon.appiconset/AppIcon256x256-1.png   | Bin
 .../AppIcon.appiconset/AppIcon256x256.png     | Bin
 .../AppIcon.appiconset/AppIcon32x32-1.png     | Bin
 .../AppIcon.appiconset/AppIcon32x32.png       | Bin
 .../AppIcon.appiconset/AppIcon512x512-1.png   | Bin
 .../AppIcon.appiconset/AppIcon512x512.png     | Bin
 .../AppIcon.appiconset/Contents.json          |   0
 .../AppIcon.appiconset/icon-1.png             | Bin
 .../AppIcon.appiconset/icon.png               | Bin
 .../app/Assets.xcassets/Contents.json         |   0
 .../app/Base.lproj/MainMenu.xib               |   0
 .../app/Base.lproj/MapDocument.xib            |   0
 platform/{osx => macos}/app/Credits.rtf       |   0
 .../{osx => macos}/app/DroppedPinAnnotation.h |   0
 .../{osx => macos}/app/DroppedPinAnnotation.m |   0
 platform/{osx => macos}/app/Info.plist        |   0
 .../app/LocationCoordinate2DTransformer.h     |   0
 .../app/LocationCoordinate2DTransformer.m     |   0
 platform/{osx => macos}/app/MapDocument.h     |   0
 platform/{osx => macos}/app/MapDocument.m     |   0
 .../app/OfflinePackNameValueTransformer.h     |   0
 .../app/OfflinePackNameValueTransformer.m     |   0
 .../app/TimeIntervalTransformer.h             |   0
 .../app/TimeIntervalTransformer.m             |   0
 platform/{osx => macos}/app/main.m            |   0
 platform/{osx => macos}/bitrise.yml           |   8 +--
 platform/macos/docs/doc-README.md             |   9 +++
 platform/{osx => macos}/docs/pod-README.md    |  12 ++--
 platform/{osx => macos}/jazzy.yml             |   0
 .../macos.xcodeproj}/project.pbxproj          |  28 ++++-----
 .../contents.xcworkspacedata                  |   2 +-
 .../xcshareddata/xcschemes/CI.xcscheme        |  22 +++----
 .../xcshareddata/xcschemes/dynamic.xcscheme   |  12 ++--
 .../xcshareddata/xcschemes/macosapp.xcscheme} |  18 +++---
 .../contents.xcworkspacedata                  |   4 +-
 .../xcdebugger/Breakpoints_v2.xcbkptlist      |   0
 .../xcschemes/mbgl-offline.xcscheme           |   8 +--
 .../xcschemes/mbgl-render.xcscheme            |   8 +--
 .../xcshareddata/xcschemes/test.xcscheme      |   8 +--
 platform/{osx => macos}/platform.gyp          |   4 +-
 platform/{osx => macos}/screenshot.png        | Bin
 platform/{osx => macos}/scripts/configure.sh  |   0
 platform/{osx => macos}/scripts/document.sh   |  16 ++---
 .../scripts/macostest.xcscheme}               |   6 +-
 platform/{osx => macos}/scripts/package.sh    |  12 ++--
 .../sdk/Base.lproj/Localizable.strings        |   0
 .../sdk/Base.lproj/MGLAnnotationCallout.xib   |   0
 platform/{osx => macos}/sdk/Info.plist        |   0
 .../{osx => macos}/sdk/default_marker.pdf     | Bin
 platform/{osx => macos}/sdk/mapbox.pdf        | Bin
 .../{osx => macos}/src/MGLAnnotationImage.h   |   0
 .../{osx => macos}/src/MGLAnnotationImage.m   |   0
 .../src/MGLAnnotationImage_Private.h          |   0
 .../{osx => macos}/src/MGLAttributionButton.h |   0
 .../{osx => macos}/src/MGLAttributionButton.m |   0
 platform/{osx => macos}/src/MGLCompassCell.h  |   0
 platform/{osx => macos}/src/MGLCompassCell.m  |   0
 .../src/MGLMapView+IBAdditions.h              |   0
 .../src/MGLMapView+IBAdditions.m              |   0
 platform/{osx => macos}/src/MGLMapView.h      |   0
 platform/{osx => macos}/src/MGLMapView.mm     |   6 +-
 .../{osx => macos}/src/MGLMapViewDelegate.h   |   0
 .../{osx => macos}/src/MGLMapView_Private.h   |   0
 platform/{osx => macos}/src/MGLOpenGLLayer.h  |   0
 platform/{osx => macos}/src/MGLOpenGLLayer.mm |   0
 platform/{osx => macos}/src/Mapbox.h          |   0
 platform/{osx => macos}/test/Info.plist       |   0
 platform/node/README.md                       |   2 +-
 platform/node/bitrise.yml                     |   4 +-
 platform/osx/docs/doc-README.md               |   9 ---
 platform/qt/README.md                         |   6 +-
 platform/qt/bitrise-qt4.yml                   |   4 +-
 platform/qt/bitrise-qt5.yml                   |   4 +-
 scripts/collect-coverage.sh                   |   2 +-
 99 files changed, 191 insertions(+), 186 deletions(-)
 rename deps/ninja/{ninja-osx => ninja-macos} (100%)
 rename platform/android/{CONTRIBUTING_OSX.md => CONTRIBUTING_MACOS.md} (98%)
 rename platform/{osx => macos}/CHANGELOG.md (94%)
 rename platform/{osx => macos}/DEVELOPING.md (70%)
 rename platform/{osx => macos}/INSTALL.md (72%)
 rename platform/{osx => macos}/README.md (55%)
 rename platform/{osx => macos}/WorkspaceSettings.xcsettings (100%)
 rename platform/{osx => macos}/app/AppDelegate.h (100%)
 rename platform/{osx => macos}/app/AppDelegate.m (100%)
 rename platform/{osx => macos}/app/Assets.xcassets/AppIcon.appiconset/AppIcon128x128.png (100%)
 rename platform/{osx => macos}/app/Assets.xcassets/AppIcon.appiconset/AppIcon16x16.png (100%)
 rename platform/{osx => macos}/app/Assets.xcassets/AppIcon.appiconset/AppIcon256x256-1.png (100%)
 rename platform/{osx => macos}/app/Assets.xcassets/AppIcon.appiconset/AppIcon256x256.png (100%)
 rename platform/{osx => macos}/app/Assets.xcassets/AppIcon.appiconset/AppIcon32x32-1.png (100%)
 rename platform/{osx => macos}/app/Assets.xcassets/AppIcon.appiconset/AppIcon32x32.png (100%)
 rename platform/{osx => macos}/app/Assets.xcassets/AppIcon.appiconset/AppIcon512x512-1.png (100%)
 rename platform/{osx => macos}/app/Assets.xcassets/AppIcon.appiconset/AppIcon512x512.png (100%)
 rename platform/{osx => macos}/app/Assets.xcassets/AppIcon.appiconset/Contents.json (100%)
 rename platform/{osx => macos}/app/Assets.xcassets/AppIcon.appiconset/icon-1.png (100%)
 rename platform/{osx => macos}/app/Assets.xcassets/AppIcon.appiconset/icon.png (100%)
 rename platform/{osx => macos}/app/Assets.xcassets/Contents.json (100%)
 rename platform/{osx => macos}/app/Base.lproj/MainMenu.xib (100%)
 rename platform/{osx => macos}/app/Base.lproj/MapDocument.xib (100%)
 rename platform/{osx => macos}/app/Credits.rtf (100%)
 rename platform/{osx => macos}/app/DroppedPinAnnotation.h (100%)
 rename platform/{osx => macos}/app/DroppedPinAnnotation.m (100%)
 rename platform/{osx => macos}/app/Info.plist (100%)
 rename platform/{osx => macos}/app/LocationCoordinate2DTransformer.h (100%)
 rename platform/{osx => macos}/app/LocationCoordinate2DTransformer.m (100%)
 rename platform/{osx => macos}/app/MapDocument.h (100%)
 rename platform/{osx => macos}/app/MapDocument.m (100%)
 rename platform/{osx => macos}/app/OfflinePackNameValueTransformer.h (100%)
 rename platform/{osx => macos}/app/OfflinePackNameValueTransformer.m (100%)
 rename platform/{osx => macos}/app/TimeIntervalTransformer.h (100%)
 rename platform/{osx => macos}/app/TimeIntervalTransformer.m (100%)
 rename platform/{osx => macos}/app/main.m (100%)
 rename platform/{osx => macos}/bitrise.yml (93%)
 create mode 100644 platform/macos/docs/doc-README.md
 rename platform/{osx => macos}/docs/pod-README.md (59%)
 rename platform/{osx => macos}/jazzy.yml (100%)
 rename platform/{osx/osx.xcodeproj => macos/macos.xcodeproj}/project.pbxproj (98%)
 rename platform/{osx/osx.xcodeproj => macos/macos.xcodeproj}/project.xcworkspace/contents.xcworkspacedata (87%)
 rename platform/{osx/osx.xcodeproj => macos/macos.xcodeproj}/xcshareddata/xcschemes/CI.xcscheme (86%)
 rename platform/{osx/osx.xcodeproj => macos/macos.xcodeproj}/xcshareddata/xcschemes/dynamic.xcscheme (90%)
 rename platform/{osx/osx.xcodeproj/xcshareddata/xcschemes/osxapp.xcscheme => macos/macos.xcodeproj/xcshareddata/xcschemes/macosapp.xcscheme} (87%)
 rename platform/{osx/osx.xcworkspace => macos/macos.xcworkspace}/contents.xcworkspacedata (52%)
 rename platform/{osx/osx.xcworkspace => macos/macos.xcworkspace}/xcshareddata/xcdebugger/Breakpoints_v2.xcbkptlist (100%)
 rename platform/{osx/osx.xcworkspace => macos/macos.xcworkspace}/xcshareddata/xcschemes/mbgl-offline.xcscheme (88%)
 rename platform/{osx/osx.xcworkspace => macos/macos.xcworkspace}/xcshareddata/xcschemes/mbgl-render.xcscheme (88%)
 rename platform/{osx/osx.xcworkspace => macos/macos.xcworkspace}/xcshareddata/xcschemes/test.xcscheme (88%)
 rename platform/{osx => macos}/platform.gyp (96%)
 rename platform/{osx => macos}/screenshot.png (100%)
 rename platform/{osx => macos}/scripts/configure.sh (100%)
 rename platform/{osx => macos}/scripts/document.sh (67%)
 rename platform/{osx/scripts/osxtest.xcscheme => macos/scripts/macostest.xcscheme} (89%)
 rename platform/{osx => macos}/scripts/package.sh (82%)
 rename platform/{osx => macos}/sdk/Base.lproj/Localizable.strings (100%)
 rename platform/{osx => macos}/sdk/Base.lproj/MGLAnnotationCallout.xib (100%)
 rename platform/{osx => macos}/sdk/Info.plist (100%)
 rename platform/{osx => macos}/sdk/default_marker.pdf (100%)
 rename platform/{osx => macos}/sdk/mapbox.pdf (100%)
 rename platform/{osx => macos}/src/MGLAnnotationImage.h (100%)
 rename platform/{osx => macos}/src/MGLAnnotationImage.m (100%)
 rename platform/{osx => macos}/src/MGLAnnotationImage_Private.h (100%)
 rename platform/{osx => macos}/src/MGLAttributionButton.h (100%)
 rename platform/{osx => macos}/src/MGLAttributionButton.m (100%)
 rename platform/{osx => macos}/src/MGLCompassCell.h (100%)
 rename platform/{osx => macos}/src/MGLCompassCell.m (100%)
 rename platform/{osx => macos}/src/MGLMapView+IBAdditions.h (100%)
 rename platform/{osx => macos}/src/MGLMapView+IBAdditions.m (100%)
 rename platform/{osx => macos}/src/MGLMapView.h (100%)
 rename platform/{osx => macos}/src/MGLMapView.mm (99%)
 rename platform/{osx => macos}/src/MGLMapViewDelegate.h (100%)
 rename platform/{osx => macos}/src/MGLMapView_Private.h (100%)
 rename platform/{osx => macos}/src/MGLOpenGLLayer.h (100%)
 rename platform/{osx => macos}/src/MGLOpenGLLayer.mm (100%)
 rename platform/{osx => macos}/src/Mapbox.h (100%)
 rename platform/{osx => macos}/test/Info.plist (100%)
 delete mode 100644 platform/osx/docs/doc-README.md

diff --git a/.gitignore b/.gitignore
index 09216b63e14..16fd2451073 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,4 +24,4 @@ xcuserdata
 /platform/ios/benchmark/assets/glyphs/DIN*
 /platform/ios/benchmark/assets/tiles/mapbox.mapbox-terrain-v2,mapbox.mapbox-streets-v6
 **/token
-/platform/osx/osx.xcworkspace/xcshareddata/osx.xcscmblueprint
+/platform/macos/macos.xcworkspace/xcshareddata/macos.xcscmblueprint
diff --git a/.ycm_extra_conf.py b/.ycm_extra_conf.py
index 632686f3d66..f9b40af237a 100644
--- a/.ycm_extra_conf.py
+++ b/.ycm_extra_conf.py
@@ -37,7 +37,7 @@
 
 compilation_database_folders = [
   'build/linux-x86_64/Release',
-  'build/osx/Release',
+  'build/macos/Release',
 ]
 
 subprocess.call(['make compdb'], shell=True)
diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md
index a4405e6bafb..590ea977221 100644
--- a/ARCHITECTURE.md
+++ b/ARCHITECTURE.md
@@ -2,7 +2,7 @@ This document aims to outline at a high level the various parts that make up map
 
 # Repository structure
 
-mapbox-gl-native uses a monolithic that houses both core C++ code and code that wraps the C++ core with SDKs for Android, iOS, OS X, Node.js, and Qt. A "monorepo" allows us to:
+mapbox-gl-native uses a monolithic that houses both core C++ code and code that wraps the C++ core with SDKs for Android, iOS, macOS, Node.js, and Qt. A "monorepo" allows us to:
 
  * Make changes to the core API and SDKs simultaneously, ensuring no platform falls behind.
  * Ensure that core changes do not inadvertently break SDK tests.
@@ -42,7 +42,7 @@ We track mason dependencies for a given platform in the file `platform/<platform
 
 Outside of the core C++ static library, platform SDKs typically rely on platform-native build tooling to complete the job.
 
-* For iOS and OS X this means Xcode and the xcodebuild command line tool.
+* For iOS and macOS this means Xcode and the xcodebuild command line tool.
 * For Android, Gradle and Android Studio.
 * For Qt, `qmake`.
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ad2d51ad86..5034146cae0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,5 +4,5 @@ Each Mapbox GL Native SDK has a separate changelog that highlights changes relev
 
 * [Mapbox Android SDK](platform/android/CHANGELOG.md)
 * [Mapbox iOS SDK](platform/ios/CHANGELOG.md)
-* [Mapbox OS X SDK](platform/osx/CHANGELOG.md)
+* [Mapbox macOS SDK](platform/macos/CHANGELOG.md)
 * [node-mapbox-gl-native](platform/node/CHANGELOG.md)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0df51bd174d..3bb6186890d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -11,10 +11,10 @@ If you want to contribute code:
 1. Pull requests are gladly accepted. If there are any changes that developers using one of the GL SDKs should be aware of, please update the **master** section of the relevant changelog(s):
   * [Mapbox Android SDK](platform/android/CHANGELOG.md)
   * [Mapbox iOS SDK](platform/ios/CHANGELOG.md)
-  * [Mapbox OS X SDK](platform/osx/CHANGELOG.md)
+  * [Mapbox macOS SDK](platform/macos/CHANGELOG.md)
   * [node-mapbox-gl-native](platform/node/CHANGELOG.md)
 
-1. Prefix your commit messages with the platform(s) your changes affect: `[core]`, `[android]`, `[ios]`, `[osx]`, `[node]`, or `[qt]`.
+1. Prefix your commit messages with the platform(s) your changes affect: `[core]`, `[android]`, `[ios]`, `[macos]`, `[node]`, or `[qt]`.
 
 # Code of conduct
 Everyone is invited to participate in Mapbox’s open source projects and public discussions: we want to create a welcoming and friendly environment. Harassment of participants or other unethical and unprofessional behavior will not be tolerated in our spaces. The [Contributor Covenant](http://contributor-covenant.org) applies to all projects under the Mapbox organization and we ask that you please read [the full text](http://contributor-covenant.org/version/1/2/0/).
diff --git a/INSTALL.md b/INSTALL.md
index b16dcafb406..66cfe49f447 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -37,7 +37,7 @@ dependencies:
 
  - [`libcurl`](http://curl.haxx.se/libcurl/) (depends on OpenSSL)
 
-### Additional Dependencies for OS X
+### Additional Dependencies for macOS
 
  - Apple Command Line Tools (available at [Apple Developer](https://developer.apple.com/downloads))
  - [Homebrew](http://brew.sh)
@@ -50,7 +50,7 @@ See the relevant SDK documentation for next steps:
 
 * [Mapbox Android SDK](platform/android/)
 * [Mapbox iOS SDK](platform/ios/)
-* [Mapbox OS X SDK](platform/osx/)
+* [Mapbox macOS SDK](platform/macos/)
 * [Mapbox Qt SDK](platform/qt/)
 * [Mapbox GL Native on Linux](platform/linux/)
 * [node-mapbox-gl-native](platform/node/)
diff --git a/Makefile b/Makefile
index ad1ebba7931..4d90697b383 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 export BUILDTYPE ?= Debug
 
 ifeq ($(shell uname -s), Darwin)
-  HOST_PLATFORM = osx
+  HOST_PLATFORM = macos
   export JOBS ?= $(shell sysctl -n hw.ncpu)
 else ifeq ($(shell uname -s), Linux)
   HOST_PLATFORM = linux
@@ -36,54 +36,54 @@ CONFIG_DEPENDENCIES = .mason/mason configure
 # files are added or removed.
 GYP_DEPENDENCIES = mbgl.gypi test/test.gypi benchmark/benchmark.gypi bin/*.gypi $(shell find src include -type d) node_modules
 
-#### OS X targets ##############################################################
+#### macOS targets ##############################################################
 
-OSX_OUTPUT_PATH = build/osx
-OSX_PROJ_PATH = $(OSX_OUTPUT_PATH)/platform/osx/platform.xcodeproj
-OSX_WORK_PATH = platform/osx/osx.xcworkspace
-OSX_USER_DATA_PATH = $(OSX_WORK_PATH)/xcuserdata/$(USER).xcuserdatad
+MACOS_OUTPUT_PATH = build/macos
+MACOS_PROJ_PATH = $(MACOS_OUTPUT_PATH)/platform/macos/platform.xcodeproj
+MACOS_WORK_PATH = platform/macos/macos.xcworkspace
+MACOS_USER_DATA_PATH = $(MACOS_WORK_PATH)/xcuserdata/$(USER).xcuserdatad
 
-$(OSX_OUTPUT_PATH)/config.gypi: platform/osx/scripts/configure.sh $(CONFIG_DEPENDENCIES)
-	./configure $< $@ osx
+$(MACOS_OUTPUT_PATH)/config.gypi: platform/macos/scripts/configure.sh $(CONFIG_DEPENDENCIES)
+	./configure $< $@ macos
 
-$(OSX_OUTPUT_PATH)/mbgl.xcconfig: $(OSX_OUTPUT_PATH)/config.gypi
+$(MACOS_OUTPUT_PATH)/mbgl.xcconfig: $(MACOS_OUTPUT_PATH)/config.gypi
 	./scripts/export-xcconfig.py $< $@
 
-$(OSX_PROJ_PATH): platform/osx/platform.gyp $(OSX_OUTPUT_PATH)/config.gypi $(OSX_OUTPUT_PATH)/mbgl.xcconfig $(GYP_DEPENDENCIES)
-	$(GYP) -f xcode --generator-output=$(OSX_OUTPUT_PATH) $<
+$(MACOS_PROJ_PATH): platform/macos/platform.gyp $(MACOS_OUTPUT_PATH)/config.gypi $(MACOS_OUTPUT_PATH)/mbgl.xcconfig $(GYP_DEPENDENCIES)
+	$(GYP) -f xcode --generator-output=$(MACOS_OUTPUT_PATH) $<
 
-osx: $(OSX_PROJ_PATH)
+macos: $(MACOS_PROJ_PATH)
 	set -o pipefail && xcodebuild \
-	  -derivedDataPath $(OSX_OUTPUT_PATH) \
+	  -derivedDataPath $(MACOS_OUTPUT_PATH) \
 	  -configuration $(BUILDTYPE) \
-	  -workspace $(OSX_WORK_PATH) -scheme CI build $(XCPRETTY)
+	  -workspace $(MACOS_WORK_PATH) -scheme CI build $(XCPRETTY)
 
-xproj: $(OSX_PROJ_PATH) $(OSX_WORK_PATH)
-	mkdir -p "$(OSX_USER_DATA_PATH)"
-	cp platform/osx/WorkspaceSettings.xcsettings "$(OSX_USER_DATA_PATH)/WorkspaceSettings.xcsettings"
-	open $(OSX_WORK_PATH)
+xproj: $(MACOS_PROJ_PATH) $(MACOS_WORK_PATH)
+	mkdir -p "$(MACOS_USER_DATA_PATH)"
+	cp platform/macos/WorkspaceSettings.xcsettings "$(MACOS_USER_DATA_PATH)/WorkspaceSettings.xcsettings"
+	open $(MACOS_WORK_PATH)
 
-test-osx: osx node_modules
-	ulimit -c unlimited && ($(OSX_OUTPUT_PATH)/Build/Products/$(BUILDTYPE)/test & pid=$$! && wait $$pid \
+test-macos: macos node_modules
+	ulimit -c unlimited && ($(MACOS_OUTPUT_PATH)/Build/Products/$(BUILDTYPE)/test & pid=$$! && wait $$pid \
 	  || (lldb -c /cores/core.$$pid --batch --one-line 'thread backtrace all' --one-line 'quit' && exit 1))
 	set -o pipefail && xcodebuild \
-	  -derivedDataPath $(OSX_OUTPUT_PATH) \
+	  -derivedDataPath $(MACOS_OUTPUT_PATH) \
 	  -configuration $(BUILDTYPE) \
-	  -workspace $(OSX_WORK_PATH) -scheme CI test $(XCPRETTY)
+	  -workspace $(MACOS_WORK_PATH) -scheme CI test $(XCPRETTY)
 
-xpackage: $(OSX_PROJ_PATH)
-	SYMBOLS=$(SYMBOLS) ./platform/osx/scripts/package.sh
+xpackage: $(MACOS_PROJ_PATH)
+	SYMBOLS=$(SYMBOLS) ./platform/macos/scripts/package.sh
 
 xdocument:
-	OUTPUT=$(OUTPUT) ./platform/osx/scripts/document.sh
+	OUTPUT=$(OUTPUT) ./platform/macos/scripts/document.sh
 
 genstrings:
-	genstrings -u -o platform/osx/sdk/Base.lproj platform/darwin/src/*.{m,mm}
-	genstrings -u -o platform/osx/sdk/Base.lproj platform/osx/src/*.{m,mm}
+	genstrings -u -o platform/macos/sdk/Base.lproj platform/darwin/src/*.{m,mm}
+	genstrings -u -o platform/macos/sdk/Base.lproj platform/macos/src/*.{m,mm}
 	genstrings -u -o platform/ios/resources/Base.lproj platform/ios/src/*.{m,mm}
-	-find platform/ios/resources platform/osx/sdk -path '*/Base.lproj/*.strings' -exec \
+	-find platform/ios/resources platform/macos/sdk -path '*/Base.lproj/*.strings' -exec \
 		textutil -convert txt -extension strings -inputencoding UTF-16 -encoding UTF-8 {} \;
-	mv platform/osx/sdk/Base.lproj/Foundation.strings platform/darwin/resources/Base.lproj/
+	mv platform/macos/sdk/Base.lproj/Foundation.strings platform/darwin/resources/Base.lproj/
 
 #### iOS targets ##############################################################
 
diff --git a/README.md b/README.md
index 7e181140253..3808f31ded5 100644
--- a/README.md
+++ b/README.md
@@ -4,15 +4,15 @@ A library for embedding interactive, customizable vector maps into native applic
 
 ## The Mapbox GL ecosystem
 
-This repository hosts the cross-platform Mapbox GL Native library, plus convenient SDKs for several platforms. The cross-platform library comes with a [GLFW](https://github.com/glfw/glfw)-based demo application for Ubuntu Linux and OS X. The SDKs target the usual languages on their respective platforms:
+This repository hosts the cross-platform Mapbox GL Native library, plus convenient SDKs for several platforms. The cross-platform library comes with a [GLFW](https://github.com/glfw/glfw)-based demo application for Ubuntu Linux and macOS. The SDKs target the usual languages on their respective platforms:
 
 SDK | Languages | Build status
 ----|-----------|-------------
 [Mapbox GL Native](INSTALL.md) | C++14 | [![Travis](https://travis-ci.org/mapbox/mapbox-gl-native.svg?branch=master)](https://travis-ci.org/mapbox/mapbox-gl-native/builds) [![Coverage Status](https://coveralls.io/repos/github/mapbox/mapbox-gl-native/badge.svg?branch=master)](https://coveralls.io/github/mapbox/mapbox-gl-native?branch=master)
 [Mapbox Android SDK](platform/android/) | Java | [![Bitrise](https://www.bitrise.io/app/79cdcbdc42de4303.svg?token=_InPF8bII6W7J6kFr-L8QQ&branch=master)](https://www.bitrise.io/app/79cdcbdc42de4303)
 [Mapbox iOS SDK](platform/ios/) | Objective-C or Swift | [![Bitrise](https://www.bitrise.io/app/7514e4cf3da2cc57.svg?token=OwqZE5rSBR9MVWNr_lf4sA&branch=master)](https://www.bitrise.io/app/7514e4cf3da2cc57)
-[Mapbox OS X SDK](platform/osx/) | Objective-C or Swift | [![Bitrise](https://www.bitrise.io/app/155ef7da24b38dcd.svg?token=4KSOw_gd6WxTnvGE2rMttg&branch=master)](https://www.bitrise.io/app/155ef7da24b38dcd)
-[node-mapbox-gl-native](platform/node/) | Node.js | [![Linux](https://travis-ci.org/mapbox/mapbox-gl-native.svg?branch=master)](https://travis-ci.org/mapbox/mapbox-gl-native/builds) [![OS X](https://www.bitrise.io/app/55e3a9bf71202106.svg?token=5qf5ZUcKVN3LDnHhW7rO0w)](https://www.bitrise.io/app/55e3a9bf71202106)
+[Mapbox macOS SDK](platform/macos/) | Objective-C or Swift | [![Bitrise](https://www.bitrise.io/app/155ef7da24b38dcd.svg?token=4KSOw_gd6WxTnvGE2rMttg&branch=master)](https://www.bitrise.io/app/155ef7da24b38dcd)
+[node-mapbox-gl-native](platform/node/) | Node.js | [![Linux](https://travis-ci.org/mapbox/mapbox-gl-native.svg?branch=master)](https://travis-ci.org/mapbox/mapbox-gl-native/builds) [![macOS](https://www.bitrise.io/app/55e3a9bf71202106.svg?token=5qf5ZUcKVN3LDnHhW7rO0w)](https://www.bitrise.io/app/55e3a9bf71202106)
 [Mapbox Qt SDK](platform/qt) | C++03 | [![Travis](https://travis-ci.org/mapbox/mapbox-gl-native.svg?branch=master)](https://travis-ci.org/mapbox/mapbox-gl-native/builds) [![Bitrise](https://www.bitrise.io/app/96cfbc97e0245c22.svg?token=GxsqIOGPXhn0F23sSVSsYA&branch=master)](https://www.bitrise.io/app/96cfbc97e0245c22)
 
 Additional Mapbox GL Native–based libraries are developed outside of this repository:
diff --git a/bin/offline.sh b/bin/offline.sh
index f85cb1194ba..99ce2185e87 100755
--- a/bin/offline.sh
+++ b/bin/offline.sh
@@ -3,7 +3,7 @@
 set -e
 set -o pipefail
 
-OFFLINE=./build/osx/Release/mbgl-offline
+OFFLINE=./build/macos/Release/mbgl-offline
 
 # Barcelona
 $OFFLINE --north 41.4664 --west 2.0407 --south 41.2724 --east 2.2680 --output barcelona.db
diff --git a/configure b/configure
index 69acbde0105..3c90c5ebbe3 100755
--- a/configure
+++ b/configure
@@ -7,6 +7,10 @@ OUTPUT_FILE=$2
 export MASON_PLATFORM=$3
 export MASON_PLATFORM_VERSION=${4:-}
 
+if [ "${MASON_PLATFORM}" = "macos" ]; then
+    export MASON_PLATFORM=osx
+fi
+
 if [ -z ${INPUT_FILE} ]; then
     abort 'You need to specify an input path for the configure.sh file'
 fi
diff --git a/deps/ninja/ninja-osx b/deps/ninja/ninja-macos
similarity index 100%
rename from deps/ninja/ninja-osx
rename to deps/ninja/ninja-macos
diff --git a/platform/android/CONTRIBUTING_OSX.md b/platform/android/CONTRIBUTING_MACOS.md
similarity index 98%
rename from platform/android/CONTRIBUTING_OSX.md
rename to platform/android/CONTRIBUTING_MACOS.md
index 3154ac1087b..447e989d6f5 100644
--- a/platform/android/CONTRIBUTING_OSX.md
+++ b/platform/android/CONTRIBUTING_MACOS.md
@@ -1,4 +1,4 @@
-# Contributing to the Android SDK on OS X
+# Contributing to the Android SDK on macOS
 
 Install Oracle JDK 7+ and Android Studio:
 
diff --git a/platform/android/README.md b/platform/android/README.md
index 895cf846884..3f583700973 100644
--- a/platform/android/README.md
+++ b/platform/android/README.md
@@ -15,7 +15,7 @@ A library based on [Mapbox GL Native](../../README.md) for embedding interactive
 Building the SDK yourself requires [a number of dependencies and steps](../../INSTALL.md) that are unnecessary for developing production applications.
 
 * [Contributing on Linux](CONTRIBUTING_LINUX.md)
-* [Contributing on OS X](CONTRIBUTING_OSX.md)
+* [Contributing on macOS](CONTRIBUTING_MACOS.md)
 
 ### Setting up the Android emulator
 
diff --git a/platform/darwin/README.md b/platform/darwin/README.md
index 43e229028c4..349c9a00c04 100644
--- a/platform/darwin/README.md
+++ b/platform/darwin/README.md
@@ -1,10 +1,10 @@
 # Darwin
 
 The code in the Darwin platform targets Apple platforms but is not specific
-to iOS or OS X. This code is not distributed as an SDK in itself, but is required
+to iOS or macOS. This code is not distributed as an SDK in itself, but is required
 by the [Mapbox iOS SDK](https://github.com/mapbox/mapbox-gl-native/tree/master/platform/ios)
-and [Mapbox OS X SDK](https://github.com/mapbox/mapbox-gl-native/tree/master/platform/osx).
+and [Mapbox macOS SDK](https://github.com/mapbox/mapbox-gl-native/tree/master/platform/macos).
 
 These files depend on the Foundation and Core Foundation frameworks but do not
-depend on iOS- or OS X–specific frameworks, such as UIKit or AppKit. Any
+depend on iOS- or macOS–specific frameworks, such as UIKit or AppKit. Any
 non-cross-platform code is guarded by TargetConditionals.h macros.
diff --git a/platform/darwin/src/http_file_source.mm b/platform/darwin/src/http_file_source.mm
index eb751258c8e..a678b6e5cbe 100644
--- a/platform/darwin/src/http_file_source.mm
+++ b/platform/darwin/src/http_file_source.mm
@@ -130,7 +130,7 @@ void cancel() {
         }
     }
     
-    // Avoid %s here because it inserts hidden bidirectional markers on OS X when the system
+    // Avoid %s here because it inserts hidden bidirectional markers on macOS when the system
     // language is set to a right-to-left language.
     [userAgentComponents addObject:[NSString stringWithFormat:@"MapboxGL/%@ (%@)",
                                     CFSTR(MBGL_VERSION_STRING), CFSTR(MBGL_VERSION_REV)]];
@@ -139,7 +139,7 @@ void cancel() {
 #if TARGET_OS_IPHONE
     systemName = @"iOS";
 #elif TARGET_OS_MAC
-    systemName = @"OS X";
+    systemName = @"macOS";
 #elif TARGET_OS_WATCH
     systemName = @"watchOS";
 #elif TARGET_OS_TV
diff --git a/platform/ios/DEVELOPING.md b/platform/ios/DEVELOPING.md
index d771f7541b1..4efc6af4806 100644
--- a/platform/ios/DEVELOPING.md
+++ b/platform/ios/DEVELOPING.md
@@ -4,7 +4,7 @@ This document explains how to build the Mapbox iOS SDK from source. It is intend
 
 ## Requirements
 
-The Mapbox iOS SDK and iosapp demo application build against the iOS 7.0 SDK. The SDK is intended to run on iOS 7.0 and above, while iosapp is intended to run on iOS 8.0 and above due to the use of a dynamic framework. Both require Xcode on a computer running OS X.
+The Mapbox iOS SDK and iosapp demo application build against the iOS 7.0 SDK. The SDK is intended to run on iOS 7.0 and above, while iosapp is intended to run on iOS 8.0 and above due to the use of a dynamic framework. Both require Xcode on a computer running macOS.
 
 ## Building the SDK
 
@@ -69,14 +69,14 @@ To add an Objective-C header or implementation file to the iOS SDK:
 
 1. Add the file to the Headers or Compile Sources build phase, as appropriate, of both the “dynamic” and “static” targets. You can either use the Build Phases tab of the project editor or the Target Membership section of the File inspector.
 1. _(Optional.)_ If it’s a public header, change its visibility from Project to Public and import it in [the iOS SDK’s umbrella header](./src/Mapbox.h).
-1. _(Optional.)_ If the file would also be used by the OS X SDK, make sure it’s in [platform/darwin/src/](../darwin/src/), then consult [the companion OS X document](../osx/DEVELOPING.md#adding-a-source-code-file) for further instructions.
+1. _(Optional.)_ If the file would also be used by the macOS SDK, make sure it’s in [platform/darwin/src/](../darwin/src/), then consult [the companion macOS document](../macos/DEVELOPING.md#adding-a-source-code-file) for further instructions.
 
 ### Adding a resource
 
 To add a resource (such as an image, SSL certificate, property list, or strings table) to the iOS SDK:
 
 1. Add the header to the Copy Bundle Resources build phase of both the “dynamic” and “bundle” targets. You can either use the Build Phases tab of the project editor or the Target Membership section of the File inspector.
-1. _(Optional.)_ If the resource would also be used by the OS X SDK, make sure it’s in [platform/darwin/resources/](../darwin/resources/), then consult [the companion OS X document](../osx/DEVELOPING.md#adding-a-resource) for further instructions.
+1. _(Optional.)_ If the resource would also be used by the macOS SDK, make sure it’s in [platform/darwin/resources/](../darwin/resources/), then consult [the companion macOS document](../macos/DEVELOPING.md#adding-a-resource) for further instructions.
 
 ### Adding user-facing text
 
@@ -85,11 +85,11 @@ To add or update text that the user may see in the iOS SDK:
 1. Make sure the implementation file imports [NSBundle+MGLAdditions.h](../darwin/src/NSBundle+MGLAdditions.h).
 1. Use the `NSLocalizedStringWithDefaultValue()` macro:
   * `key` is a unique identifier that won’t change if the user-facing text ever needs to change.
-  * `tbl` is `Foundation` in code shared between the iOS and OS X SDKs, or `nil` otherwise.
+  * `tbl` is `Foundation` in code shared between the iOS and macOS SDKs, or `nil` otherwise.
   * `bundle` is `nil`; the redefined macro looks for the SDK bundle at runtime and ignores this argument.
   * `val` is the English string.
 1. _(Optional.)_ When dealing with a number followed by a pluralized word, do not split the string. Instead, use a format string and make `val` ambiguous, like `%d file(s)`. Then pluralize for English in the appropriate [.stringsdict file](https://developer.apple.com/library/ios/documentation/MacOSX/Conceptual/BPInternational/StringsdictFileFormat/StringsdictFileFormat.html). See [platform/darwin/resources/en.lproj/Foundation.stringsdict](../darwin/resources/en.lproj/Foundation.stringsdict) for an example. Localizers should do likewise for their languages.
-1. Run `make genstrings` and commit any changes it makes to .strings files. The make rule also updates the OS X SDK’s strings tables.
+1. Run `make genstrings` and commit any changes it makes to .strings files. The make rule also updates the macOS SDK’s strings tables.
 
 ## Testing
 
diff --git a/platform/osx/CHANGELOG.md b/platform/macos/CHANGELOG.md
similarity index 94%
rename from platform/osx/CHANGELOG.md
rename to platform/macos/CHANGELOG.md
index f2e1be966f5..95cb154201b 100644
--- a/platform/osx/CHANGELOG.md
+++ b/platform/macos/CHANGELOG.md
@@ -1,7 +1,8 @@
-# Changelog for Mapbox OS X SDK
+# Changelog for Mapbox macOS SDK
 
 ## master
 
+* Renamed the SDK to the Mapbox macOS SDK.
 * Fixed an issue in which Mapbox.framework was nested inside another folder named Mapbox.framework. ([#4998](https://github.com/mapbox/mapbox-gl-native/pull/4998))
 * Added methods to MGLMapView for obtaining the underlying map data rendered by the current style, along with additional classes to represent complex geometry in that data. ([#5110](https://github.com/mapbox/mapbox-gl-native/pull/5110))
 * An MGLPolygon can now have interior polygons, representing holes knocked out of the overall shape. ([#5110](https://github.com/mapbox/mapbox-gl-native/pull/5110))
diff --git a/platform/osx/DEVELOPING.md b/platform/macos/DEVELOPING.md
similarity index 70%
rename from platform/osx/DEVELOPING.md
rename to platform/macos/DEVELOPING.md
index dcba9db1a14..fc7b0330a3a 100644
--- a/platform/osx/DEVELOPING.md
+++ b/platform/macos/DEVELOPING.md
@@ -1,42 +1,42 @@
-# Contributing to the Mapbox OS X SDK
+# Contributing to the Mapbox macOS SDK
 
-This document explains how to build the Mapbox OS X SDK from source. It is intended for advanced developers who wish to contribute to Mapbox GL and the Mapbox iOS SDK.
+This document explains how to build the Mapbox macOS SDK from source. It is intended for advanced developers who wish to contribute to Mapbox GL and the Mapbox iOS SDK.
 
 ## Requirements
 
-The Mapbox OS X SDK and the osxapp demo application run on OS X 10.10.0 and above.
+The Mapbox macOS SDK and the macosapp demo application run on macOS 10.10.0 and above.
 
 ## Building the SDK
 
 1. [Install core dependencies](../../INSTALL.md).
 1. Run `make xproj`.
-1. Switch to the “dynamic” or “osxapp” scheme. The former builds just the Cocoa framework, while the latter also builds a Cocoa demo application based on it.
+1. Switch to the “dynamic” or “macosapp” scheme. The former builds just the Cocoa framework, while the latter also builds a Cocoa demo application based on it.
 
 ## Contributing
 
 ### Adding a source code file
 
-To add an Objective-C header or implementation file to the OS X SDK:
+To add an Objective-C header or implementation file to the macOS SDK:
 
 1. Add the file to the “dynamic” target’s Headers or Compile Sources build phase, as appropriate. You can either use the Build Phases tab of the project editor or the Target Membership section of the File inspector.
-1. _(Optional.)_ If it’s a public header, change its visibility from Project to Public and import it in [the OS X SDK’s umbrella header](./src/Mapbox.h).
+1. _(Optional.)_ If it’s a public header, change its visibility from Project to Public and import it in [the macOS SDK’s umbrella header](./src/Mapbox.h).
 1. _(Optional.)_ If the file would also be used by the iOS SDK, make sure it’s in [platform/darwin/src/](../darwin/src/), then consult [the companion iOS document](../ios/DEVELOPING.md#adding-a-source-code-file) for further instructions.
 
 ### Adding a resource
 
-To add a resource (such as an image, SSL certificate, property list, or strings table) to the OS X SDK:
+To add a resource (such as an image, SSL certificate, property list, or strings table) to the macOS SDK:
 
 1. Add the header to the Copy Bundle Resources build phase of the “dynamic” target. You can either use the Build Phases tab of the project editor or the Target Membership section of the File inspector.
 1. _(Optional.)_ If the resource would also be used by the iOS SDK, make sure it’s in [platform/darwin/resources/](../darwin/resources/), then consult [the companion iOS document](../ios/DEVELOPING.md#adding-a-resource) for further instructions.
 
 ### Adding user-facing text
 
-To add or update text that the user may see in the OS X SDK:
+To add or update text that the user may see in the macOS SDK:
 
 1. Make sure the implementation file imports [NSBundle+MGLAdditions.h](../darwin/src/NSBundle+MGLAdditions.h).
 1. Use the `NSLocalizedStringWithDefaultValue()` macro:
   * `key` is a unique identifier that won’t change if the user-facing text ever needs to change.
-  * `tbl` is `Foundation` in code shared between the iOS and OS X SDKs, or `nil` otherwise.
+  * `tbl` is `Foundation` in code shared between the iOS and macOS SDKs, or `nil` otherwise.
   * `bundle` is `nil`; the redefined macro looks for the SDK bundle at runtime and ignores this argument.
   * `val` is the English string.
 1. _(Optional.)_ When dealing with a number followed by a pluralized word, do not split the string. Instead, use a format string and make `val` ambiguous, like `%d file(s)`. Then pluralize for English in the appropriate [.stringsdict file](https://developer.apple.com/library/mac/documentation/MacOSX/Conceptual/BPInternational/StringsdictFileFormat/StringsdictFileFormat.html). See [platform/darwin/resources/en.lproj/Foundation.stringsdict](../darwin/resources/en.lproj/Foundation.stringsdict) for an example. Localizers should do likewise for their languages.
@@ -46,8 +46,8 @@ To add or update text that the user may see in the OS X SDK:
 
 The demo applications use Mapbox vector tiles, which require a Mapbox account and API access token. Obtain an access token on the [Mapbox account page](https://www.mapbox.com/studio/account/tokens/). You will be prompted for this access token the first time you launch the demo application.
 
-## Using osxapp
+## Using macosapp
 
-Through the OS X SDK, the demo application supports a variety of standard gestures and keyboard shortcuts. For more details, open Mapbox GL Help from the Help menu.
+Through the macOS SDK, the demo application supports a variety of standard gestures and keyboard shortcuts. For more details, open Mapbox GL Help from the Help menu.
 
-You can also [integrate the Mapbox OS X SDK into your own Cocoa application](INSTALL.md).
+You can also [integrate the Mapbox macOS SDK into your own Cocoa application](INSTALL.md).
diff --git a/platform/osx/INSTALL.md b/platform/macos/INSTALL.md
similarity index 72%
rename from platform/osx/INSTALL.md
rename to platform/macos/INSTALL.md
index 8a4323aa8eb..42896d380d2 100644
--- a/platform/osx/INSTALL.md
+++ b/platform/macos/INSTALL.md
@@ -1,23 +1,23 @@
-# Integrating the Mapbox OS X SDK into your application
+# Integrating the Mapbox macOS SDK into your application
 
-This document explains how to build the Mapbox OS X SDK and integrate it into your own Cocoa application.
+This document explains how to build the Mapbox macOS SDK and integrate it into your own Cocoa application.
 
 ### Requirements
 
-The Mapbox OS X SDK requires the OS X 10.10.0 SDK or above.
+The Mapbox macOS SDK requires the macOS 10.10.0 SDK or above.
 
 ### Building the SDK
 
-Grab a [prebuilt release](https://github.com/mapbox/mapbox-gl-native/releases/) – look for the releases that begin with “osx-” – or build the SDK from source:
+Grab a [prebuilt release](https://github.com/mapbox/mapbox-gl-native/releases/) – look for the releases that begin with “macos-” – or build the SDK from source:
 
 1. [Install core dependencies](../../INSTALL.md).
-1. Run `make xpackage`, which produces a `Mapbox.framework` in the `build/osx/pkg/` folder.
+1. Run `make xpackage`, which produces a `Mapbox.framework` in the `build/macos/pkg/` folder.
 
 ### Installation
 
 1. Open the project editor, select your application target, then go to the General tab. Drag Mapbox.framework into the “Embedded Binaries” section. (Don’t drag it into the “Linked Frameworks and Libraries” section; Xcode will add it there automatically.) In the sheet that appears, make sure “Copy items if needed” is checked, then click Finish.
 
-1. Mapbox vector tiles require a Mapbox account and API access token. In the project editor, select the application target, then go to the Info tab. Under the “Custom OS X Application Target Properties” section, set `MGLMapboxAccessToken` to your access token. You can obtain an access token from the [Mapbox account page](https://www.mapbox.com/studio/account/tokens/).
+1. Mapbox vector tiles require a Mapbox account and API access token. In the project editor, select the application target, then go to the Info tab. Under the “Custom macOS Application Target Properties” section, set `MGLMapboxAccessToken` to your access token. You can obtain an access token from the [Mapbox account page](https://www.mapbox.com/studio/account/tokens/).
 
 ## Usage
 
@@ -47,4 +47,4 @@ class ViewController: NSViewController {
 }
 ```
 
-Run `make xdocument` to generate complete API documentation. The [Mapbox iOS SDK](https://www.mapbox.com/ios-sdk/)’s [API documentation](https://www.mapbox.com/ios-sdk/api/) and [online examples](https://www.mapbox.com/ios-sdk/examples/) apply to the Mapbox OS X SDK with few differences, mostly around unimplemented features like user location tracking.
+Run `make xdocument` to generate complete API documentation. The [Mapbox iOS SDK](https://www.mapbox.com/ios-sdk/)’s [API documentation](https://www.mapbox.com/ios-sdk/api/) and [online examples](https://www.mapbox.com/ios-sdk/examples/) apply to the Mapbox macOS SDK with few differences, mostly around unimplemented features like user location tracking.
diff --git a/platform/osx/README.md b/platform/macos/README.md
similarity index 55%
rename from platform/osx/README.md
rename to platform/macos/README.md
index 75c8c3453a8..211b238d55b 100644
--- a/platform/osx/README.md
+++ b/platform/macos/README.md
@@ -1,12 +1,12 @@
-# Mapbox OS X SDK
+# Mapbox macOS SDK
 
 [![Bitrise](https://www.bitrise.io/app/155ef7da24b38dcd.svg?token=4KSOw_gd6WxTnvGE2rMttg&branch=master)](https://www.bitrise.io/app/155ef7da24b38dcd)
 
-A library based on [Mapbox GL Native](../../README.md) for embedding interactive map views with scalable, customizable vector maps into Cocoa applications on OS X 10.10.0 and above using Objective-C, Swift, or Interface Builder.
+A library based on [Mapbox GL Native](../../README.md) for embedding interactive map views with scalable, customizable vector maps into Cocoa applications on macOS 10.10.0 and above using Objective-C, Swift, or Interface Builder.
 
-This SDK is analogous to the Mapbox iOS SDK, and much of the iOS SDK documentation applies here. Mapbox does not officially support the OS X SDK to the same extent as the iOS SDK; however, bug reports and pull requests are certainly welcome.
+This SDK is analogous to the Mapbox iOS SDK, and much of the iOS SDK documentation applies here. Mapbox does not officially support the macOS SDK to the same extent as the iOS SDK; however, bug reports and pull requests are certainly welcome.
 
-* [Integrating the Mapbox OS X SDK into your application](INSTALL.md)
-* [Contributing to the Mapbox OS X SDK](DEVELOPING.md)
+* [Integrating the Mapbox macOS SDK into your application](INSTALL.md)
+* [Contributing to the Mapbox macOS SDK](DEVELOPING.md)
 
 <img alt="" src="screenshot.png" width="645">
diff --git a/platform/osx/WorkspaceSettings.xcsettings b/platform/macos/WorkspaceSettings.xcsettings
similarity index 100%
rename from platform/osx/WorkspaceSettings.xcsettings
rename to platform/macos/WorkspaceSettings.xcsettings
diff --git a/platform/osx/app/AppDelegate.h b/platform/macos/app/AppDelegate.h
similarity index 100%
rename from platform/osx/app/AppDelegate.h
rename to platform/macos/app/AppDelegate.h
diff --git a/platform/osx/app/AppDelegate.m b/platform/macos/app/AppDelegate.m
similarity index 100%
rename from platform/osx/app/AppDelegate.m
rename to platform/macos/app/AppDelegate.m
diff --git a/platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon128x128.png b/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon128x128.png
similarity index 100%
rename from platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon128x128.png
rename to platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon128x128.png
diff --git a/platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon16x16.png b/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon16x16.png
similarity index 100%
rename from platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon16x16.png
rename to platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon16x16.png
diff --git a/platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon256x256-1.png b/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon256x256-1.png
similarity index 100%
rename from platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon256x256-1.png
rename to platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon256x256-1.png
diff --git a/platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon256x256.png b/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon256x256.png
similarity index 100%
rename from platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon256x256.png
rename to platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon256x256.png
diff --git a/platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon32x32-1.png b/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon32x32-1.png
similarity index 100%
rename from platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon32x32-1.png
rename to platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon32x32-1.png
diff --git a/platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon32x32.png b/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon32x32.png
similarity index 100%
rename from platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon32x32.png
rename to platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon32x32.png
diff --git a/platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon512x512-1.png b/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon512x512-1.png
similarity index 100%
rename from platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon512x512-1.png
rename to platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon512x512-1.png
diff --git a/platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon512x512.png b/platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon512x512.png
similarity index 100%
rename from platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon512x512.png
rename to platform/macos/app/Assets.xcassets/AppIcon.appiconset/AppIcon512x512.png
diff --git a/platform/osx/app/Assets.xcassets/AppIcon.appiconset/Contents.json b/platform/macos/app/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from platform/osx/app/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to platform/macos/app/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/platform/osx/app/Assets.xcassets/AppIcon.appiconset/icon-1.png b/platform/macos/app/Assets.xcassets/AppIcon.appiconset/icon-1.png
similarity index 100%
rename from platform/osx/app/Assets.xcassets/AppIcon.appiconset/icon-1.png
rename to platform/macos/app/Assets.xcassets/AppIcon.appiconset/icon-1.png
diff --git a/platform/osx/app/Assets.xcassets/AppIcon.appiconset/icon.png b/platform/macos/app/Assets.xcassets/AppIcon.appiconset/icon.png
similarity index 100%
rename from platform/osx/app/Assets.xcassets/AppIcon.appiconset/icon.png
rename to platform/macos/app/Assets.xcassets/AppIcon.appiconset/icon.png
diff --git a/platform/osx/app/Assets.xcassets/Contents.json b/platform/macos/app/Assets.xcassets/Contents.json
similarity index 100%
rename from platform/osx/app/Assets.xcassets/Contents.json
rename to platform/macos/app/Assets.xcassets/Contents.json
diff --git a/platform/osx/app/Base.lproj/MainMenu.xib b/platform/macos/app/Base.lproj/MainMenu.xib
similarity index 100%
rename from platform/osx/app/Base.lproj/MainMenu.xib
rename to platform/macos/app/Base.lproj/MainMenu.xib
diff --git a/platform/osx/app/Base.lproj/MapDocument.xib b/platform/macos/app/Base.lproj/MapDocument.xib
similarity index 100%
rename from platform/osx/app/Base.lproj/MapDocument.xib
rename to platform/macos/app/Base.lproj/MapDocument.xib
diff --git a/platform/osx/app/Credits.rtf b/platform/macos/app/Credits.rtf
similarity index 100%
rename from platform/osx/app/Credits.rtf
rename to platform/macos/app/Credits.rtf
diff --git a/platform/osx/app/DroppedPinAnnotation.h b/platform/macos/app/DroppedPinAnnotation.h
similarity index 100%
rename from platform/osx/app/DroppedPinAnnotation.h
rename to platform/macos/app/DroppedPinAnnotation.h
diff --git a/platform/osx/app/DroppedPinAnnotation.m b/platform/macos/app/DroppedPinAnnotation.m
similarity index 100%
rename from platform/osx/app/DroppedPinAnnotation.m
rename to platform/macos/app/DroppedPinAnnotation.m
diff --git a/platform/osx/app/Info.plist b/platform/macos/app/Info.plist
similarity index 100%
rename from platform/osx/app/Info.plist
rename to platform/macos/app/Info.plist
diff --git a/platform/osx/app/LocationCoordinate2DTransformer.h b/platform/macos/app/LocationCoordinate2DTransformer.h
similarity index 100%
rename from platform/osx/app/LocationCoordinate2DTransformer.h
rename to platform/macos/app/LocationCoordinate2DTransformer.h
diff --git a/platform/osx/app/LocationCoordinate2DTransformer.m b/platform/macos/app/LocationCoordinate2DTransformer.m
similarity index 100%
rename from platform/osx/app/LocationCoordinate2DTransformer.m
rename to platform/macos/app/LocationCoordinate2DTransformer.m
diff --git a/platform/osx/app/MapDocument.h b/platform/macos/app/MapDocument.h
similarity index 100%
rename from platform/osx/app/MapDocument.h
rename to platform/macos/app/MapDocument.h
diff --git a/platform/osx/app/MapDocument.m b/platform/macos/app/MapDocument.m
similarity index 100%
rename from platform/osx/app/MapDocument.m
rename to platform/macos/app/MapDocument.m
diff --git a/platform/osx/app/OfflinePackNameValueTransformer.h b/platform/macos/app/OfflinePackNameValueTransformer.h
similarity index 100%
rename from platform/osx/app/OfflinePackNameValueTransformer.h
rename to platform/macos/app/OfflinePackNameValueTransformer.h
diff --git a/platform/osx/app/OfflinePackNameValueTransformer.m b/platform/macos/app/OfflinePackNameValueTransformer.m
similarity index 100%
rename from platform/osx/app/OfflinePackNameValueTransformer.m
rename to platform/macos/app/OfflinePackNameValueTransformer.m
diff --git a/platform/osx/app/TimeIntervalTransformer.h b/platform/macos/app/TimeIntervalTransformer.h
similarity index 100%
rename from platform/osx/app/TimeIntervalTransformer.h
rename to platform/macos/app/TimeIntervalTransformer.h
diff --git a/platform/osx/app/TimeIntervalTransformer.m b/platform/macos/app/TimeIntervalTransformer.m
similarity index 100%
rename from platform/osx/app/TimeIntervalTransformer.m
rename to platform/macos/app/TimeIntervalTransformer.m
diff --git a/platform/osx/app/main.m b/platform/macos/app/main.m
similarity index 100%
rename from platform/osx/app/main.m
rename to platform/macos/app/main.m
diff --git a/platform/osx/bitrise.yml b/platform/macos/bitrise.yml
similarity index 93%
rename from platform/osx/bitrise.yml
rename to platform/macos/bitrise.yml
index fdf9ebb6544..ce622ef0f89 100644
--- a/platform/osx/bitrise.yml
+++ b/platform/macos/bitrise.yml
@@ -31,8 +31,8 @@ workflows:
             set -eu -o pipefail
             gem install xcpretty --no-rdoc --no-ri
             export BUILDTYPE=Debug
-            make osx
-            make test-osx
+            make macos
+            make test-macos
         - is_debug: 'yes'
     - slack:
         title: Post to Slack
@@ -40,8 +40,8 @@ workflows:
         inputs:
         - webhook_url: "$SLACK_HOOK_URL"
         - channel: "#gl-bots"
-        - from_username: 'Bitrise OS X'
-        - from_username_on_error: 'Bitrise OS X'
+        - from_username: 'Bitrise macOS'
+        - from_username_on_error: 'Bitrise macOS'
         - message: '<${BITRISE_BUILD_URL}|Build #${BITRISE_BUILD_NUMBER}>
             for <https://github.com/mapbox/mapbox-gl-native/compare/${BITRISE_GIT_BRANCH}|mapbox/mapbox-gl-native@${BITRISE_GIT_BRANCH}>
             by ${GIT_CLONE_COMMIT_COMMITER_NAME}
diff --git a/platform/macos/docs/doc-README.md b/platform/macos/docs/doc-README.md
new file mode 100644
index 00000000000..b037da19d42
--- /dev/null
+++ b/platform/macos/docs/doc-README.md
@@ -0,0 +1,9 @@
+# [Mapbox macOS SDK](https://github.com/mapbox/mapbox-gl-native/tree/master/platform/macos/)
+
+The Mapbox macOS SDK is an open-source framework for embedding interactive map views with scalable, customizable vector maps into Cocoa applications on macOS 10.10.0 and above using Objective-C, Swift, or Interface Builder. It takes stylesheets that conform to the [Mapbox GL Style Specification](https://www.mapbox.com/mapbox-gl-style-spec/), applies them to vector tiles that conform to the [Mapbox Vector Tile Specification](https://www.mapbox.com/developers/vector-tiles/), and renders them using OpenGL.
+
+<img alt="" src="https://raw.githubusercontent.com/mapbox/mapbox-gl-native/master/platform/macos/screenshot.png" width="645">
+
+For setup information, consult the README.md that comes with this documentation. The [Mapbox iOS SDK](https://www.mapbox.com/ios-sdk/)’s [API documentation](https://www.mapbox.com/ios-sdk/api/) and [online examples](https://www.mapbox.com/ios-sdk/examples/) apply to the Mapbox macOS SDK with few differences, mostly around unimplemented features like user location tracking. A [full changelog](https://github.com/mapbox/mapbox-gl-native/blob/master/platform/macos/CHANGELOG.md) is also available.
+
+Mapbox does not officially support the macOS SDK to the same extent as the iOS SDK; however, [bug reports and pull requests](https://github.com/mapbox/mapbox-gl-native/issues/) are certainly welcome.
diff --git a/platform/osx/docs/pod-README.md b/platform/macos/docs/pod-README.md
similarity index 59%
rename from platform/osx/docs/pod-README.md
rename to platform/macos/docs/pod-README.md
index 28c783cf562..70d98ecdb9c 100644
--- a/platform/osx/docs/pod-README.md
+++ b/platform/macos/docs/pod-README.md
@@ -1,14 +1,14 @@
-# [Mapbox OS X SDK](https://github.com/mapbox/mapbox-gl-native/tree/master/platform/osx/)
+# [Mapbox macOS SDK](https://github.com/mapbox/mapbox-gl-native/tree/master/platform/macos/)
 
-The Mapbox OS X SDK is an open-source framework for embedding interactive map views with scalable, customizable vector maps into Cocoa applications on OS X 10.10.0 and above using Objective-C, Swift, or Interface Builder. It takes stylesheets that conform to the [Mapbox GL Style Specification](https://www.mapbox.com/mapbox-gl-style-spec/), applies them to vector tiles that conform to the [Mapbox Vector Tile Specification](https://www.mapbox.com/developers/vector-tiles/), and renders them using OpenGL.
+The Mapbox macOS SDK is an open-source framework for embedding interactive map views with scalable, customizable vector maps into Cocoa applications on macOS 10.10.0 and above using Objective-C, Swift, or Interface Builder. It takes stylesheets that conform to the [Mapbox GL Style Specification](https://www.mapbox.com/mapbox-gl-style-spec/), applies them to vector tiles that conform to the [Mapbox Vector Tile Specification](https://www.mapbox.com/developers/vector-tiles/), and renders them using OpenGL.
 
-<img alt="" src="https://raw.githubusercontent.com/mapbox/mapbox-gl-native/master/platform/osx/screenshot.png" width="645">
+<img alt="" src="https://raw.githubusercontent.com/mapbox/mapbox-gl-native/master/platform/macos/screenshot.png" width="645">
 
 ## Installation
 
 1. Open the project editor, select your application target, then go to the General tab. Drag Mapbox.framework from the `dynamic` folder into the “Embedded Binaries” section. (Don’t drag it into the “Linked Frameworks and Libraries” section; Xcode will add it there automatically.) In the sheet that appears, make sure “Copy items if needed” is checked, then click Finish.
 
-1. Mapbox vector tiles require a Mapbox account and API access token. In the project editor, select the application target, then go to the Info tab. Under the “Custom iOS Target Properties” section, set `MGLMapboxAccessToken` to your access token. You can obtain an access token from the [Mapbox account page](https://www.mapbox.com/studio/account/tokens/).
+1. Mapbox vector tiles require a Mapbox account and API access token. In the project editor, select the application target, then go to the Info tab. Under the “Custom macOS Target Properties” section, set `MGLMapboxAccessToken` to your access token. You can obtain an access token from the [Mapbox account page](https://www.mapbox.com/studio/account/tokens/).
 
 ## Usage
 
@@ -38,6 +38,6 @@ class ViewController: NSViewController {
 }
 ```
 
-Full API documentation is included in this package, within the `documentation` folder. The [Mapbox iOS SDK](https://www.mapbox.com/ios-sdk/)’s [API documentation](https://www.mapbox.com/ios-sdk/api/) and [online examples](https://www.mapbox.com/ios-sdk/examples/) apply to the Mapbox OS X SDK with few differences, mostly around unimplemented features like user location tracking.
+Full API documentation is included in this package, within the `documentation` folder. The [Mapbox iOS SDK](https://www.mapbox.com/ios-sdk/)’s [API documentation](https://www.mapbox.com/ios-sdk/api/) and [online examples](https://www.mapbox.com/ios-sdk/examples/) apply to the Mapbox macOS SDK with few differences, mostly around unimplemented features like user location tracking.
 
-Mapbox does not officially support the OS X SDK to the same extent as the iOS SDK; however, [bug reports and pull requests](https://github.com/mapbox/mapbox-gl-native/issues/) are certainly welcome.
+Mapbox does not officially support the macOS SDK to the same extent as the iOS SDK; however, [bug reports and pull requests](https://github.com/mapbox/mapbox-gl-native/issues/) are certainly welcome.
diff --git a/platform/osx/jazzy.yml b/platform/macos/jazzy.yml
similarity index 100%
rename from platform/osx/jazzy.yml
rename to platform/macos/jazzy.yml
diff --git a/platform/osx/osx.xcodeproj/project.pbxproj b/platform/macos/macos.xcodeproj/project.pbxproj
similarity index 98%
rename from platform/osx/osx.xcodeproj/project.pbxproj
rename to platform/macos/macos.xcodeproj/project.pbxproj
index 51d9f0671ea..7271356f2a8 100644
--- a/platform/osx/osx.xcodeproj/project.pbxproj
+++ b/platform/macos/macos.xcodeproj/project.pbxproj
@@ -46,7 +46,7 @@
 		DAE6C33D1CC30DB200DB3429 /* Mapbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DAE6C3281CC30DB200DB3429 /* Mapbox.framework */; };
 		DAE6C33E1CC30DB200DB3429 /* Mapbox.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DAE6C3281CC30DB200DB3429 /* Mapbox.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		DAE6C3471CC31D1200DB3429 /* libmbgl-core.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAE6C3451CC31D1200DB3429 /* libmbgl-core.a */; };
-		DAE6C3481CC31D1200DB3429 /* libmbgl-platform-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAE6C3461CC31D1200DB3429 /* libmbgl-platform-osx.a */; };
+		DAE6C3481CC31D1200DB3429 /* libmbgl-platform-macos.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAE6C3461CC31D1200DB3429 /* libmbgl-platform-macos.a */; };
 		DAE6C35A1CC31E0400DB3429 /* MGLAccountManager.h in Headers */ = {isa = PBXBuildFile; fileRef = DAE6C34A1CC31E0400DB3429 /* MGLAccountManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DAE6C35B1CC31E0400DB3429 /* MGLAnnotation.h in Headers */ = {isa = PBXBuildFile; fileRef = DAE6C34B1CC31E0400DB3429 /* MGLAnnotation.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DAE6C35C1CC31E0400DB3429 /* MGLGeometry.h in Headers */ = {isa = PBXBuildFile; fileRef = DAE6C34C1CC31E0400DB3429 /* MGLGeometry.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -193,7 +193,7 @@
 		DAE6C3311CC30DB200DB3429 /* test.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = test.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		DAE6C33A1CC30DB200DB3429 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		DAE6C3451CC31D1200DB3429 /* libmbgl-core.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libmbgl-core.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		DAE6C3461CC31D1200DB3429 /* libmbgl-platform-osx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libmbgl-platform-osx.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		DAE6C3461CC31D1200DB3429 /* libmbgl-platform-macos.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libmbgl-platform-macos.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		DAE6C34A1CC31E0400DB3429 /* MGLAccountManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLAccountManager.h; sourceTree = "<group>"; };
 		DAE6C34B1CC31E0400DB3429 /* MGLAnnotation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLAnnotation.h; sourceTree = "<group>"; };
 		DAE6C34C1CC31E0400DB3429 /* MGLGeometry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLGeometry.h; sourceTree = "<group>"; };
@@ -253,7 +253,7 @@
 		DAE6C3BB1CC31F2E00DB3429 /* default_marker.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = default_marker.pdf; sourceTree = "<group>"; };
 		DAE6C3BC1CC31F2E00DB3429 /* mapbox.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = mapbox.pdf; sourceTree = "<group>"; };
 		DAE6C3C11CC31F4500DB3429 /* Mapbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Mapbox.h; path = src/Mapbox.h; sourceTree = SOURCE_ROOT; };
-		DAE6C3C51CC31F9100DB3429 /* mbgl.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = mbgl.xcconfig; path = ../../build/osx/mbgl.xcconfig; sourceTree = "<group>"; };
+		DAE6C3C51CC31F9100DB3429 /* mbgl.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = mbgl.xcconfig; path = ../../build/macos/mbgl.xcconfig; sourceTree = "<group>"; };
 		DAE6C3C61CC3499100DB3429 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; };
 		DAE6C3C81CC34BD800DB3429 /* MGLGeometryTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MGLGeometryTests.mm; path = ../../darwin/test/MGLGeometryTests.mm; sourceTree = "<group>"; };
 		DAE6C3C91CC34BD800DB3429 /* MGLOfflinePackTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MGLOfflinePackTests.m; path = ../../darwin/test/MGLOfflinePackTests.m; sourceTree = "<group>"; };
@@ -277,7 +277,7 @@
 			files = (
 				52BECB0A1CC5A26F009CD791 /* SystemConfiguration.framework in Frameworks */,
 				DAE6C3471CC31D1200DB3429 /* libmbgl-core.a in Frameworks */,
-				DAE6C3481CC31D1200DB3429 /* libmbgl-platform-osx.a in Frameworks */,
+				DAE6C3481CC31D1200DB3429 /* libmbgl-platform-macos.a in Frameworks */,
 				DAE6C3C71CC3499100DB3429 /* libsqlite3.tbd in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -450,7 +450,7 @@
 			children = (
 				52BECB091CC5A26F009CD791 /* SystemConfiguration.framework */,
 				DAE6C3451CC31D1200DB3429 /* libmbgl-core.a */,
-				DAE6C3461CC31D1200DB3429 /* libmbgl-platform-osx.a */,
+				DAE6C3461CC31D1200DB3429 /* libmbgl-platform-macos.a */,
 				DAE6C3C61CC3499100DB3429 /* libsqlite3.tbd */,
 			);
 			name = Frameworks;
@@ -598,7 +598,7 @@
 /* Begin PBXLegacyTarget section */
 		DAAA17961CE13BAE00731EFE /* docs */ = {
 			isa = PBXLegacyTarget;
-			buildArgumentsString = "xdocument OUTPUT=build/osx/pkg/documentation";
+			buildArgumentsString = "xdocument OUTPUT=build/macos/pkg/documentation";
 			buildConfigurationList = DAAA17991CE13BAE00731EFE /* Build configuration list for PBXLegacyTarget "docs" */;
 			buildPhases = (
 			);
@@ -613,9 +613,9 @@
 /* End PBXLegacyTarget section */
 
 /* Begin PBXNativeTarget section */
-		DA839E911CC2E3400062CAFB /* osxapp */ = {
+		DA839E911CC2E3400062CAFB /* macosapp */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = DA839EA91CC2E3400062CAFB /* Build configuration list for PBXNativeTarget "osxapp" */;
+			buildConfigurationList = DA839EA91CC2E3400062CAFB /* Build configuration list for PBXNativeTarget "macosapp" */;
 			buildPhases = (
 				DA839E8E1CC2E3400062CAFB /* Sources */,
 				DA839E8F1CC2E3400062CAFB /* Frameworks */,
@@ -627,8 +627,8 @@
 			dependencies = (
 				DAE6C33C1CC30DB200DB3429 /* PBXTargetDependency */,
 			);
-			name = osxapp;
-			productName = osxapp;
+			name = macosapp;
+			productName = macosapp;
 			productReference = DA839E921CC2E3400062CAFB /* Mapbox GL.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -692,7 +692,7 @@
 					};
 				};
 			};
-			buildConfigurationList = DA839E8D1CC2E3400062CAFB /* Build configuration list for PBXProject "osx" */;
+			buildConfigurationList = DA839E8D1CC2E3400062CAFB /* Build configuration list for PBXProject "macos" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
@@ -705,7 +705,7 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				DA839E911CC2E3400062CAFB /* osxapp */,
+				DA839E911CC2E3400062CAFB /* macosapp */,
 				DAE6C3271CC30DB200DB3429 /* dynamic */,
 				DAE6C3301CC30DB200DB3429 /* test */,
 				DAAA17961CE13BAE00731EFE /* docs */,
@@ -1127,7 +1127,7 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		DA839E8D1CC2E3400062CAFB /* Build configuration list for PBXProject "osx" */ = {
+		DA839E8D1CC2E3400062CAFB /* Build configuration list for PBXProject "macos" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				DA839EA71CC2E3400062CAFB /* Debug */,
@@ -1136,7 +1136,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		DA839EA91CC2E3400062CAFB /* Build configuration list for PBXNativeTarget "osxapp" */ = {
+		DA839EA91CC2E3400062CAFB /* Build configuration list for PBXNativeTarget "macosapp" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				DA839EAA1CC2E3400062CAFB /* Debug */,
diff --git a/platform/osx/osx.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/platform/macos/macos.xcodeproj/project.xcworkspace/contents.xcworkspacedata
similarity index 87%
rename from platform/osx/osx.xcodeproj/project.xcworkspace/contents.xcworkspacedata
rename to platform/macos/macos.xcodeproj/project.xcworkspace/contents.xcworkspacedata
index 6451d59cab2..f2c779de46b 100644
--- a/platform/osx/osx.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ b/platform/macos/macos.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -2,6 +2,6 @@
 <Workspace
    version = "1.0">
    <FileRef
-      location = "self:/Users/mxn/hub/mapbox-gl-native/platform/osx/osx.xcodeproj">
+      location = "self:/Users/mxn/hub/mapbox-gl-native/platform/macos/macos.xcodeproj">
    </FileRef>
 </Workspace>
diff --git a/platform/osx/osx.xcodeproj/xcshareddata/xcschemes/CI.xcscheme b/platform/macos/macos.xcodeproj/xcshareddata/xcschemes/CI.xcscheme
similarity index 86%
rename from platform/osx/osx.xcodeproj/xcshareddata/xcschemes/CI.xcscheme
rename to platform/macos/macos.xcodeproj/xcshareddata/xcschemes/CI.xcscheme
index 2c9e4a3c746..476532377da 100644
--- a/platform/osx/osx.xcodeproj/xcshareddata/xcschemes/CI.xcscheme
+++ b/platform/macos/macos.xcodeproj/xcshareddata/xcschemes/CI.xcscheme
@@ -17,7 +17,7 @@
                BlueprintIdentifier = "4E8A9455A3A23B7FD2A8FC52"
                BuildableName = "All"
                BlueprintName = "All"
-               ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj">
+               ReferencedContainer = "container:../../build/macos/platform/macos/platform.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
          <BuildActionEntry
@@ -30,8 +30,8 @@
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "DA839E911CC2E3400062CAFB"
                BuildableName = "Mapbox GL.app"
-               BlueprintName = "osxapp"
-               ReferencedContainer = "container:osx.xcodeproj">
+               BlueprintName = "macosapp"
+               ReferencedContainer = "container:macos.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
          <BuildActionEntry
@@ -45,7 +45,7 @@
                BlueprintIdentifier = "DAE6C3301CC30DB200DB3429"
                BuildableName = "test.xctest"
                BlueprintName = "test"
-               ReferencedContainer = "container:osx.xcodeproj">
+               ReferencedContainer = "container:macos.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -63,7 +63,7 @@
                BlueprintIdentifier = "DAE6C3301CC30DB200DB3429"
                BuildableName = "test.xctest"
                BlueprintName = "test"
-               ReferencedContainer = "container:osx.xcodeproj">
+               ReferencedContainer = "container:macos.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
@@ -72,8 +72,8 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "DA839E911CC2E3400062CAFB"
             BuildableName = "Mapbox GL.app"
-            BlueprintName = "osxapp"
-            ReferencedContainer = "container:osx.xcodeproj">
+            BlueprintName = "macosapp"
+            ReferencedContainer = "container:macos.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
@@ -94,8 +94,8 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "DA839E911CC2E3400062CAFB"
             BuildableName = "Mapbox GL.app"
-            BlueprintName = "osxapp"
-            ReferencedContainer = "container:osx.xcodeproj">
+            BlueprintName = "macosapp"
+            ReferencedContainer = "container:macos.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
@@ -113,8 +113,8 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "DA839E911CC2E3400062CAFB"
             BuildableName = "Mapbox GL.app"
-            BlueprintName = "osxapp"
-            ReferencedContainer = "container:osx.xcodeproj">
+            BlueprintName = "macosapp"
+            ReferencedContainer = "container:macos.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
    </ProfileAction>
diff --git a/platform/osx/osx.xcodeproj/xcshareddata/xcschemes/dynamic.xcscheme b/platform/macos/macos.xcodeproj/xcshareddata/xcschemes/dynamic.xcscheme
similarity index 90%
rename from platform/osx/osx.xcodeproj/xcshareddata/xcschemes/dynamic.xcscheme
rename to platform/macos/macos.xcodeproj/xcshareddata/xcschemes/dynamic.xcscheme
index b3659411ed6..1d1c9de8c56 100644
--- a/platform/osx/osx.xcodeproj/xcshareddata/xcschemes/dynamic.xcscheme
+++ b/platform/macos/macos.xcodeproj/xcshareddata/xcschemes/dynamic.xcscheme
@@ -17,7 +17,7 @@
                BlueprintIdentifier = "DAE6C3271CC30DB200DB3429"
                BuildableName = "Mapbox.framework"
                BlueprintName = "dynamic"
-               ReferencedContainer = "container:osx.xcodeproj">
+               ReferencedContainer = "container:macos.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
          <BuildActionEntry
@@ -31,7 +31,7 @@
                BlueprintIdentifier = "DAE6C3301CC30DB200DB3429"
                BuildableName = "test.xctest"
                BlueprintName = "test"
-               ReferencedContainer = "container:osx.xcodeproj">
+               ReferencedContainer = "container:macos.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -49,7 +49,7 @@
                BlueprintIdentifier = "DAE6C3301CC30DB200DB3429"
                BuildableName = "test.xctest"
                BlueprintName = "test"
-               ReferencedContainer = "container:osx.xcodeproj">
+               ReferencedContainer = "container:macos.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
@@ -59,7 +59,7 @@
             BlueprintIdentifier = "DAE6C3271CC30DB200DB3429"
             BuildableName = "Mapbox.framework"
             BlueprintName = "dynamic"
-            ReferencedContainer = "container:osx.xcodeproj">
+            ReferencedContainer = "container:macos.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
@@ -81,7 +81,7 @@
             BlueprintIdentifier = "DAE6C3271CC30DB200DB3429"
             BuildableName = "Mapbox.framework"
             BlueprintName = "dynamic"
-            ReferencedContainer = "container:osx.xcodeproj">
+            ReferencedContainer = "container:macos.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
@@ -99,7 +99,7 @@
             BlueprintIdentifier = "DAE6C3271CC30DB200DB3429"
             BuildableName = "Mapbox.framework"
             BlueprintName = "dynamic"
-            ReferencedContainer = "container:osx.xcodeproj">
+            ReferencedContainer = "container:macos.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>
diff --git a/platform/osx/osx.xcodeproj/xcshareddata/xcschemes/osxapp.xcscheme b/platform/macos/macos.xcodeproj/xcshareddata/xcschemes/macosapp.xcscheme
similarity index 87%
rename from platform/osx/osx.xcodeproj/xcshareddata/xcschemes/osxapp.xcscheme
rename to platform/macos/macos.xcodeproj/xcshareddata/xcschemes/macosapp.xcscheme
index 528ce0e755b..3e3baa83255 100644
--- a/platform/osx/osx.xcodeproj/xcshareddata/xcschemes/osxapp.xcscheme
+++ b/platform/macos/macos.xcodeproj/xcshareddata/xcschemes/macosapp.xcscheme
@@ -16,8 +16,8 @@
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "DA839E911CC2E3400062CAFB"
                BuildableName = "Mapbox GL.app"
-               BlueprintName = "osxapp"
-               ReferencedContainer = "container:osx.xcodeproj">
+               BlueprintName = "macosapp"
+               ReferencedContainer = "container:macos.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -35,7 +35,7 @@
                BlueprintIdentifier = "DAE6C3301CC30DB200DB3429"
                BuildableName = "test.xctest"
                BlueprintName = "test"
-               ReferencedContainer = "container:osx.xcodeproj">
+               ReferencedContainer = "container:macos.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
@@ -44,8 +44,8 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "DA839E911CC2E3400062CAFB"
             BuildableName = "Mapbox GL.app"
-            BlueprintName = "osxapp"
-            ReferencedContainer = "container:osx.xcodeproj">
+            BlueprintName = "macosapp"
+            ReferencedContainer = "container:macos.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
@@ -67,8 +67,8 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "DA839E911CC2E3400062CAFB"
             BuildableName = "Mapbox GL.app"
-            BlueprintName = "osxapp"
-            ReferencedContainer = "container:osx.xcodeproj">
+            BlueprintName = "macosapp"
+            ReferencedContainer = "container:macos.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
       <AdditionalOptions>
@@ -86,8 +86,8 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "DA839E911CC2E3400062CAFB"
             BuildableName = "Mapbox GL.app"
-            BlueprintName = "osxapp"
-            ReferencedContainer = "container:osx.xcodeproj">
+            BlueprintName = "macosapp"
+            ReferencedContainer = "container:macos.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
    </ProfileAction>
diff --git a/platform/osx/osx.xcworkspace/contents.xcworkspacedata b/platform/macos/macos.xcworkspace/contents.xcworkspacedata
similarity index 52%
rename from platform/osx/osx.xcworkspace/contents.xcworkspacedata
rename to platform/macos/macos.xcworkspace/contents.xcworkspacedata
index 3d745d1790b..67a33490e9a 100644
--- a/platform/osx/osx.xcworkspace/contents.xcworkspacedata
+++ b/platform/macos/macos.xcworkspace/contents.xcworkspacedata
@@ -2,9 +2,9 @@
 <Workspace
    version = "1.0">
    <FileRef
-      location = "container:osx.xcodeproj">
+      location = "container:macos.xcodeproj">
    </FileRef>
    <FileRef
-      location = "group:../../build/osx/platform/osx/platform.xcodeproj">
+      location = "group:../../build/macos/platform/macos/platform.xcodeproj">
    </FileRef>
 </Workspace>
diff --git a/platform/osx/osx.xcworkspace/xcshareddata/xcdebugger/Breakpoints_v2.xcbkptlist b/platform/macos/macos.xcworkspace/xcshareddata/xcdebugger/Breakpoints_v2.xcbkptlist
similarity index 100%
rename from platform/osx/osx.xcworkspace/xcshareddata/xcdebugger/Breakpoints_v2.xcbkptlist
rename to platform/macos/macos.xcworkspace/xcshareddata/xcdebugger/Breakpoints_v2.xcbkptlist
diff --git a/platform/osx/osx.xcworkspace/xcshareddata/xcschemes/mbgl-offline.xcscheme b/platform/macos/macos.xcworkspace/xcshareddata/xcschemes/mbgl-offline.xcscheme
similarity index 88%
rename from platform/osx/osx.xcworkspace/xcshareddata/xcschemes/mbgl-offline.xcscheme
rename to platform/macos/macos.xcworkspace/xcshareddata/xcschemes/mbgl-offline.xcscheme
index c88fefb747c..90ba9db153b 100644
--- a/platform/osx/osx.xcworkspace/xcshareddata/xcschemes/mbgl-offline.xcscheme
+++ b/platform/macos/macos.xcworkspace/xcshareddata/xcschemes/mbgl-offline.xcscheme
@@ -17,7 +17,7 @@
                BlueprintIdentifier = "960D5BDFBD73C605ACCF58C2"
                BuildableName = "mbgl-offline"
                BlueprintName = "mbgl-offline"
-               ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj">
+               ReferencedContainer = "container:../../build/macos/platform/macos/platform.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -35,7 +35,7 @@
             BlueprintIdentifier = "960D5BDFBD73C605ACCF58C2"
             BuildableName = "mbgl-offline"
             BlueprintName = "mbgl-offline"
-            ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj">
+            ReferencedContainer = "container:../../build/macos/platform/macos/platform.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
@@ -59,7 +59,7 @@
             BlueprintIdentifier = "960D5BDFBD73C605ACCF58C2"
             BuildableName = "mbgl-offline"
             BlueprintName = "mbgl-offline"
-            ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj">
+            ReferencedContainer = "container:../../build/macos/platform/macos/platform.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
       <AdditionalOptions>
@@ -78,7 +78,7 @@
             BlueprintIdentifier = "960D5BDFBD73C605ACCF58C2"
             BuildableName = "mbgl-offline"
             BlueprintName = "mbgl-offline"
-            ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj">
+            ReferencedContainer = "container:../../build/macos/platform/macos/platform.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
    </ProfileAction>
diff --git a/platform/osx/osx.xcworkspace/xcshareddata/xcschemes/mbgl-render.xcscheme b/platform/macos/macos.xcworkspace/xcshareddata/xcschemes/mbgl-render.xcscheme
similarity index 88%
rename from platform/osx/osx.xcworkspace/xcshareddata/xcschemes/mbgl-render.xcscheme
rename to platform/macos/macos.xcworkspace/xcshareddata/xcschemes/mbgl-render.xcscheme
index 522998bd3c1..c1768619997 100644
--- a/platform/osx/osx.xcworkspace/xcshareddata/xcschemes/mbgl-render.xcscheme
+++ b/platform/macos/macos.xcworkspace/xcshareddata/xcschemes/mbgl-render.xcscheme
@@ -17,7 +17,7 @@
                BlueprintIdentifier = "D27AE71B9B193AD277AD4CFE"
                BuildableName = "mbgl-render"
                BlueprintName = "mbgl-render"
-               ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj">
+               ReferencedContainer = "container:../../build/macos/platform/macos/platform.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -35,7 +35,7 @@
             BlueprintIdentifier = "D27AE71B9B193AD277AD4CFE"
             BuildableName = "mbgl-render"
             BlueprintName = "mbgl-render"
-            ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj">
+            ReferencedContainer = "container:../../build/macos/platform/macos/platform.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
@@ -59,7 +59,7 @@
             BlueprintIdentifier = "D27AE71B9B193AD277AD4CFE"
             BuildableName = "mbgl-render"
             BlueprintName = "mbgl-render"
-            ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj">
+            ReferencedContainer = "container:../../build/macos/platform/macos/platform.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
       <AdditionalOptions>
@@ -78,7 +78,7 @@
             BlueprintIdentifier = "D27AE71B9B193AD277AD4CFE"
             BuildableName = "mbgl-render"
             BlueprintName = "mbgl-render"
-            ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj">
+            ReferencedContainer = "container:../../build/macos/platform/macos/platform.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
    </ProfileAction>
diff --git a/platform/osx/osx.xcworkspace/xcshareddata/xcschemes/test.xcscheme b/platform/macos/macos.xcworkspace/xcshareddata/xcschemes/test.xcscheme
similarity index 88%
rename from platform/osx/osx.xcworkspace/xcshareddata/xcschemes/test.xcscheme
rename to platform/macos/macos.xcworkspace/xcshareddata/xcschemes/test.xcscheme
index f995e74964f..20394eb2586 100644
--- a/platform/osx/osx.xcworkspace/xcshareddata/xcschemes/test.xcscheme
+++ b/platform/macos/macos.xcworkspace/xcshareddata/xcschemes/test.xcscheme
@@ -17,7 +17,7 @@
                BlueprintIdentifier = "DC37A7F85AC5E5958672B4F8"
                BuildableName = "test"
                BlueprintName = "test"
-               ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj">
+               ReferencedContainer = "container:../../build/macos/platform/macos/platform.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -35,7 +35,7 @@
             BlueprintIdentifier = "DC37A7F85AC5E5958672B4F8"
             BuildableName = "test"
             BlueprintName = "test"
-            ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj">
+            ReferencedContainer = "container:../../build/macos/platform/macos/platform.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
@@ -59,7 +59,7 @@
             BlueprintIdentifier = "DC37A7F85AC5E5958672B4F8"
             BuildableName = "test"
             BlueprintName = "test"
-            ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj">
+            ReferencedContainer = "container:../../build/macos/platform/macos/platform.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
       <AdditionalOptions>
@@ -78,7 +78,7 @@
             BlueprintIdentifier = "DC37A7F85AC5E5958672B4F8"
             BuildableName = "test"
             BlueprintName = "test"
-            ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj">
+            ReferencedContainer = "container:../../build/macos/platform/macos/platform.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
    </ProfileAction>
diff --git a/platform/osx/platform.gyp b/platform/macos/platform.gyp
similarity index 96%
rename from platform/osx/platform.gyp
rename to platform/macos/platform.gyp
index bbda61e7d9f..68ab4ce4674 100644
--- a/platform/osx/platform.gyp
+++ b/platform/macos/platform.gyp
@@ -5,7 +5,7 @@
     'coverage': 0,
   },
   'includes': [
-    '../../build/osx/config.gypi',
+    '../../build/macos/config.gypi',
     '../../mbgl.gypi',
     '../../test/test.gypi',
     '../../benchmark/benchmark.gypi',
@@ -42,7 +42,7 @@
     },
     {
       'target_name': 'platform-lib',
-      'product_name': 'mbgl-platform-osx',
+      'product_name': 'mbgl-platform-macos',
       'type': 'static_library',
       'standalone_static_library': 1,
       'hard_dependency': 1,
diff --git a/platform/osx/screenshot.png b/platform/macos/screenshot.png
similarity index 100%
rename from platform/osx/screenshot.png
rename to platform/macos/screenshot.png
diff --git a/platform/osx/scripts/configure.sh b/platform/macos/scripts/configure.sh
similarity index 100%
rename from platform/osx/scripts/configure.sh
rename to platform/macos/scripts/configure.sh
diff --git a/platform/osx/scripts/document.sh b/platform/macos/scripts/document.sh
similarity index 67%
rename from platform/osx/scripts/document.sh
rename to platform/macos/scripts/document.sh
index 5559d858c79..e62a1e16686 100755
--- a/platform/osx/scripts/document.sh
+++ b/platform/macos/scripts/document.sh
@@ -8,32 +8,32 @@ if [ -z `which jazzy` ]; then
     echo "Installing jazzy…"
     gem install jazzy
     if [ -z `which jazzy` ]; then
-        echo "Unable to install jazzy. See https://github.com/mapbox/mapbox-gl-native/blob/master/platform/osx/INSTALL.md"
+        echo "Unable to install jazzy. See https://github.com/mapbox/mapbox-gl-native/blob/master/platform/macos/INSTALL.md"
         exit 1
     fi
 fi
 
 OUTPUT=${OUTPUT:-documentation}
 
-BRANCH=$( git describe --tags --match=osx-v*.*.* --abbrev=0 )
-SHORT_VERSION=$( echo ${BRANCH} | sed 's/^osx-v//' )
-RELEASE_VERSION=$( echo ${SHORT_VERSION} | sed -e 's/^osx-v//' -e 's/-.*//' )
+BRANCH=$( git describe --tags --match=macos-v*.*.* --abbrev=0 )
+SHORT_VERSION=$( echo ${BRANCH} | sed 's/^macos-v//' )
+RELEASE_VERSION=$( echo ${SHORT_VERSION} | sed -e 's/^macos-v//' -e 's/-.*//' )
 
 SWIFT_VERSION=$(xcrun swift -version | head -n 1 | sed -e 's/^Apple Swift version //' -e 's/ .*$//')
 
 rm -rf /tmp/mbgl
 mkdir -p /tmp/mbgl/
 README=/tmp/mbgl/README.md
-cp platform/osx/docs/doc-README.md "${README}"
+cp platform/macos/docs/doc-README.md "${README}"
 # http://stackoverflow.com/a/4858011/4585461
 echo "## Changes in version ${RELEASE_VERSION}" >> "${README}"
-sed -n -e '/^## /{' -e ':a' -e 'n' -e '/^##/q' -e 'p' -e 'ba' -e '}' platform/osx/CHANGELOG.md >> "${README}"
+sed -n -e '/^## /{' -e ':a' -e 'n' -e '/^##/q' -e 'p' -e 'ba' -e '}' platform/macos/CHANGELOG.md >> "${README}"
 
 rm -rf ${OUTPUT}
 mkdir -p ${OUTPUT}
 
 jazzy \
-    --config platform/osx/jazzy.yml \
+    --config platform/macos/jazzy.yml \
     --sdk macosx \
     --swift-version $SWIFT_VERSION \
     --github-file-prefix https://github.com/mapbox/mapbox-gl-native/tree/${BRANCH} \
@@ -42,4 +42,4 @@ jazzy \
     --output ${OUTPUT}
 # https://github.com/realm/jazzy/issues/411
 find ${OUTPUT} -name *.html -exec \
-    perl -pi -e 's/Mapbox\s+(Docs|Reference)/Mapbox OS X SDK $1/' {} \;
+    perl -pi -e 's/Mapbox\s+(Docs|Reference)/Mapbox macOS SDK $1/' {} \;
diff --git a/platform/osx/scripts/osxtest.xcscheme b/platform/macos/scripts/macostest.xcscheme
similarity index 89%
rename from platform/osx/scripts/osxtest.xcscheme
rename to platform/macos/scripts/macostest.xcscheme
index 5060703614c..ba6f6a6f4bb 100644
--- a/platform/osx/scripts/osxtest.xcscheme
+++ b/platform/macos/scripts/macostest.xcscheme
@@ -17,9 +17,9 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "6EE19CDFBCE7BD04FE561812"
-               BuildableName = "osxtest.xctest"
-               BlueprintName = "osxtest"
-               ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj">
+               BuildableName = "macostest.xctest"
+               BlueprintName = "macostest"
+               ReferencedContainer = "container:../../build/macos/platform/macos/platform.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
diff --git a/platform/osx/scripts/package.sh b/platform/macos/scripts/package.sh
similarity index 82%
rename from platform/osx/scripts/package.sh
rename to platform/macos/scripts/package.sh
index 1304430835a..a6952e8ab23 100755
--- a/platform/osx/scripts/package.sh
+++ b/platform/macos/scripts/package.sh
@@ -5,8 +5,8 @@ set -o pipefail
 set -u
 
 NAME=Mapbox
-OUTPUT=build/osx/pkg
-DERIVED_DATA=build/osx
+OUTPUT=build/macos/pkg
+DERIVED_DATA=build/macos
 PRODUCTS=${DERIVED_DATA}/Build/Products
 
 BUILDTYPE=${BUILDTYPE:-Release}
@@ -20,7 +20,7 @@ rm -rf ${OUTPUT}
 
 HASH=`git log | head -1 | awk '{ print $2 }' | cut -c 1-10` && true
 PROJ_VERSION=$(git rev-list --count HEAD)
-SEM_VERSION=$( git describe --tags --match=osx-v*.*.* --abbrev=0 | sed 's/^osx-v//' )
+SEM_VERSION=$( git describe --tags --match=macos-v*.*.* --abbrev=0 | sed 's/^macos-v//' )
 SHORT_VERSION=${SEM_VERSION%-*}
 
 step "Building targets (build ${PROJ_VERSION}, version ${SEM_VERSION})…"
@@ -31,7 +31,7 @@ xcodebuild \
     CURRENT_SEMANTIC_VERSION=${SEM_VERSION} \
     CURRENT_COMMIT_HASH=${HASH} \
     -derivedDataPath ${DERIVED_DATA} \
-    -workspace ./platform/osx/osx.xcworkspace \
+    -workspace ./platform/macos/macos.xcworkspace \
     -scheme dynamic \
     -configuration ${BUILDTYPE} \
     -jobs ${JOBS} | xcpretty
@@ -50,8 +50,8 @@ fi
 
 step "Copying library resources…"
 cp -pv LICENSE.md "${OUTPUT}"
-cp -pv platform/osx/docs/pod-README.md "${OUTPUT}/README.md"
-sed -n -e '/^## /,$p' platform/osx/CHANGELOG.md > "${OUTPUT}/CHANGELOG.md"
+cp -pv platform/macos/docs/pod-README.md "${OUTPUT}/README.md"
+sed -n -e '/^## /,$p' platform/macos/CHANGELOG.md > "${OUTPUT}/CHANGELOG.md"
 
 step "Generating API documentation…"
 make xdocument OUTPUT="${OUTPUT}/documentation"
diff --git a/platform/osx/sdk/Base.lproj/Localizable.strings b/platform/macos/sdk/Base.lproj/Localizable.strings
similarity index 100%
rename from platform/osx/sdk/Base.lproj/Localizable.strings
rename to platform/macos/sdk/Base.lproj/Localizable.strings
diff --git a/platform/osx/sdk/Base.lproj/MGLAnnotationCallout.xib b/platform/macos/sdk/Base.lproj/MGLAnnotationCallout.xib
similarity index 100%
rename from platform/osx/sdk/Base.lproj/MGLAnnotationCallout.xib
rename to platform/macos/sdk/Base.lproj/MGLAnnotationCallout.xib
diff --git a/platform/osx/sdk/Info.plist b/platform/macos/sdk/Info.plist
similarity index 100%
rename from platform/osx/sdk/Info.plist
rename to platform/macos/sdk/Info.plist
diff --git a/platform/osx/sdk/default_marker.pdf b/platform/macos/sdk/default_marker.pdf
similarity index 100%
rename from platform/osx/sdk/default_marker.pdf
rename to platform/macos/sdk/default_marker.pdf
diff --git a/platform/osx/sdk/mapbox.pdf b/platform/macos/sdk/mapbox.pdf
similarity index 100%
rename from platform/osx/sdk/mapbox.pdf
rename to platform/macos/sdk/mapbox.pdf
diff --git a/platform/osx/src/MGLAnnotationImage.h b/platform/macos/src/MGLAnnotationImage.h
similarity index 100%
rename from platform/osx/src/MGLAnnotationImage.h
rename to platform/macos/src/MGLAnnotationImage.h
diff --git a/platform/osx/src/MGLAnnotationImage.m b/platform/macos/src/MGLAnnotationImage.m
similarity index 100%
rename from platform/osx/src/MGLAnnotationImage.m
rename to platform/macos/src/MGLAnnotationImage.m
diff --git a/platform/osx/src/MGLAnnotationImage_Private.h b/platform/macos/src/MGLAnnotationImage_Private.h
similarity index 100%
rename from platform/osx/src/MGLAnnotationImage_Private.h
rename to platform/macos/src/MGLAnnotationImage_Private.h
diff --git a/platform/osx/src/MGLAttributionButton.h b/platform/macos/src/MGLAttributionButton.h
similarity index 100%
rename from platform/osx/src/MGLAttributionButton.h
rename to platform/macos/src/MGLAttributionButton.h
diff --git a/platform/osx/src/MGLAttributionButton.m b/platform/macos/src/MGLAttributionButton.m
similarity index 100%
rename from platform/osx/src/MGLAttributionButton.m
rename to platform/macos/src/MGLAttributionButton.m
diff --git a/platform/osx/src/MGLCompassCell.h b/platform/macos/src/MGLCompassCell.h
similarity index 100%
rename from platform/osx/src/MGLCompassCell.h
rename to platform/macos/src/MGLCompassCell.h
diff --git a/platform/osx/src/MGLCompassCell.m b/platform/macos/src/MGLCompassCell.m
similarity index 100%
rename from platform/osx/src/MGLCompassCell.m
rename to platform/macos/src/MGLCompassCell.m
diff --git a/platform/osx/src/MGLMapView+IBAdditions.h b/platform/macos/src/MGLMapView+IBAdditions.h
similarity index 100%
rename from platform/osx/src/MGLMapView+IBAdditions.h
rename to platform/macos/src/MGLMapView+IBAdditions.h
diff --git a/platform/osx/src/MGLMapView+IBAdditions.m b/platform/macos/src/MGLMapView+IBAdditions.m
similarity index 100%
rename from platform/osx/src/MGLMapView+IBAdditions.m
rename to platform/macos/src/MGLMapView+IBAdditions.m
diff --git a/platform/osx/src/MGLMapView.h b/platform/macos/src/MGLMapView.h
similarity index 100%
rename from platform/osx/src/MGLMapView.h
rename to platform/macos/src/MGLMapView.h
diff --git a/platform/osx/src/MGLMapView.mm b/platform/macos/src/MGLMapView.mm
similarity index 99%
rename from platform/osx/src/MGLMapView.mm
rename to platform/macos/src/MGLMapView.mm
index ac4eae9d344..2f985b85d88 100644
--- a/platform/osx/src/MGLMapView.mm
+++ b/platform/macos/src/MGLMapView.mm
@@ -508,17 +508,17 @@ - (void)setDelegate:(id<MGLMapViewDelegate>)delegate {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wundeclared-selector"
     if ([self.delegate respondsToSelector:@selector(mapView:regionWillChangeAnimated:)]) {
-        NSLog(@"-mapView:regionWillChangeAnimated: is not supported by the OS X SDK, but %@ implements it anyways. "
+        NSLog(@"-mapView:regionWillChangeAnimated: is not supported by the macOS SDK, but %@ implements it anyways. "
               @"Please implement -[%@ mapView:cameraWillChangeAnimated:] instead.",
               NSStringFromClass([delegate class]), NSStringFromClass([delegate class]));
     }
     if ([self.delegate respondsToSelector:@selector(mapViewRegionIsChanging:)]) {
-        NSLog(@"-mapViewRegionIsChanging: is not supported by the OS X SDK, but %@ implements it anyways. "
+        NSLog(@"-mapViewRegionIsChanging: is not supported by the macOS SDK, but %@ implements it anyways. "
               @"Please implement -[%@ mapViewCameraIsChanging:] instead.",
               NSStringFromClass([delegate class]), NSStringFromClass([delegate class]));
     }
     if ([self.delegate respondsToSelector:@selector(mapView:regionDidChangeAnimated:)]) {
-        NSLog(@"-mapView:regionDidChangeAnimated: is not supported by the OS X SDK, but %@ implements it anyways. "
+        NSLog(@"-mapView:regionDidChangeAnimated: is not supported by the macOS SDK, but %@ implements it anyways. "
               @"Please implement -[%@ mapView:cameraDidChangeAnimated:] instead.",
               NSStringFromClass([delegate class]), NSStringFromClass([delegate class]));
     }
diff --git a/platform/osx/src/MGLMapViewDelegate.h b/platform/macos/src/MGLMapViewDelegate.h
similarity index 100%
rename from platform/osx/src/MGLMapViewDelegate.h
rename to platform/macos/src/MGLMapViewDelegate.h
diff --git a/platform/osx/src/MGLMapView_Private.h b/platform/macos/src/MGLMapView_Private.h
similarity index 100%
rename from platform/osx/src/MGLMapView_Private.h
rename to platform/macos/src/MGLMapView_Private.h
diff --git a/platform/osx/src/MGLOpenGLLayer.h b/platform/macos/src/MGLOpenGLLayer.h
similarity index 100%
rename from platform/osx/src/MGLOpenGLLayer.h
rename to platform/macos/src/MGLOpenGLLayer.h
diff --git a/platform/osx/src/MGLOpenGLLayer.mm b/platform/macos/src/MGLOpenGLLayer.mm
similarity index 100%
rename from platform/osx/src/MGLOpenGLLayer.mm
rename to platform/macos/src/MGLOpenGLLayer.mm
diff --git a/platform/osx/src/Mapbox.h b/platform/macos/src/Mapbox.h
similarity index 100%
rename from platform/osx/src/Mapbox.h
rename to platform/macos/src/Mapbox.h
diff --git a/platform/osx/test/Info.plist b/platform/macos/test/Info.plist
similarity index 100%
rename from platform/osx/test/Info.plist
rename to platform/macos/test/Info.plist
diff --git a/platform/node/README.md b/platform/node/README.md
index 50f53d72ebb..9e14d1bbd60 100644
--- a/platform/node/README.md
+++ b/platform/node/README.md
@@ -8,7 +8,7 @@ Requires a modern C++ runtime that supports C++14.
 
 By default, installs binaries. On these platforms no additional dependencies are needed.
 
-- 64 bit OS X or 64 bit Linux
+- 64 bit macOS or 64 bit Linux
 - Node.js v4.x _(note: v5+ is known to have issues)_
 
 Run:
diff --git a/platform/node/bitrise.yml b/platform/node/bitrise.yml
index dde34c6c6ab..b43b85d69aa 100644
--- a/platform/node/bitrise.yml
+++ b/platform/node/bitrise.yml
@@ -43,8 +43,8 @@ workflows:
         inputs:
         - webhook_url: "$SLACK_HOOK_URL"
         - channel: "#gl-bots"
-        - from_username: 'Bitrise Node OS X'
-        - from_username_on_error: 'Bitrise Node OS X'
+        - from_username: 'Bitrise Node macOS'
+        - from_username_on_error: 'Bitrise Node macOS'
         - message: '<${BITRISE_BUILD_URL}|Build #${BITRISE_BUILD_NUMBER}>
             for <https://github.com/mapbox/mapbox-gl-native/compare/${BITRISE_GIT_BRANCH}|mapbox/mapbox-gl-native@${BITRISE_GIT_BRANCH}>
             by ${GIT_CLONE_COMMIT_COMMITER_NAME}
diff --git a/platform/osx/docs/doc-README.md b/platform/osx/docs/doc-README.md
deleted file mode 100644
index 1e9619766f6..00000000000
--- a/platform/osx/docs/doc-README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# [Mapbox OS X SDK](https://github.com/mapbox/mapbox-gl-native/tree/master/platform/osx/)
-
-The Mapbox OS X SDK is an open-source framework for embedding interactive map views with scalable, customizable vector maps into Cocoa applications on OS X 10.10.0 and above using Objective-C, Swift, or Interface Builder. It takes stylesheets that conform to the [Mapbox GL Style Specification](https://www.mapbox.com/mapbox-gl-style-spec/), applies them to vector tiles that conform to the [Mapbox Vector Tile Specification](https://www.mapbox.com/developers/vector-tiles/), and renders them using OpenGL.
-
-<img alt="" src="https://raw.githubusercontent.com/mapbox/mapbox-gl-native/master/platform/osx/screenshot.png" width="645">
-
-For setup information, consult the README.md that comes with this documentation. The [Mapbox iOS SDK](https://www.mapbox.com/ios-sdk/)’s [API documentation](https://www.mapbox.com/ios-sdk/api/) and [online examples](https://www.mapbox.com/ios-sdk/examples/) apply to the Mapbox OS X SDK with few differences, mostly around unimplemented features like user location tracking. A [full changelog](https://github.com/mapbox/mapbox-gl-native/blob/master/platform/osx/CHANGELOG.md) is also available.
-
-Mapbox does not officially support the OS X SDK to the same extent as the iOS SDK; however, [bug reports and pull requests](https://github.com/mapbox/mapbox-gl-native/issues/) are certainly welcome.
diff --git a/platform/qt/README.md b/platform/qt/README.md
index d763682717d..e5ec7e3bb0b 100644
--- a/platform/qt/README.md
+++ b/platform/qt/README.md
@@ -19,7 +19,7 @@ example](https://c2.staticflickr.com/8/7689/26247088394_01541b34de_o.png)
 ### Developing
 
 [Qt supports many platforms](https://www.qt.io/qt-framework/#section-4) - so far
-we have been testing our code on Linux and OS X desktops, as well as embedded
+we have been testing our code on Linux and macOS desktops, as well as embedded
 devices such as Raspberry Pi 3.
 
 If you need to maintain backwards compatibility with prior releases of
@@ -47,9 +47,9 @@ you also need:
     qml-module-qtquick2 qml-module-qtpositioning qml-module-qtgraphicaleffects \
     qml-module-qtquick-layouts qml-module-qtquick-controls
 
-#### OS X
+#### macOS
 
-For OS X desktop, you can install Qt 5 via [Homebrew](http://brew.sh):
+For macOS desktop, you can install Qt 5 via [Homebrew](http://brew.sh):
 
     brew install qt5
 
diff --git a/platform/qt/bitrise-qt4.yml b/platform/qt/bitrise-qt4.yml
index 83c222a9dbf..24e0f44932e 100644
--- a/platform/qt/bitrise-qt4.yml
+++ b/platform/qt/bitrise-qt4.yml
@@ -42,8 +42,8 @@ workflows:
         inputs:
         - webhook_url: "$SLACK_HOOK_URL"
         - channel: "#gl-bots"
-        - from_username: 'Bitrise Qt4 OS X'
-        - from_username_on_error: 'Bitrise Qt4 OS X'
+        - from_username: 'Bitrise Qt4 macOS'
+        - from_username_on_error: 'Bitrise Qt4 macOS'
         - message: '<${BITRISE_BUILD_URL}|Build #${BITRISE_BUILD_NUMBER}>
             for <https://github.com/mapbox/mapbox-gl-native/compare/${BITRISE_GIT_BRANCH}|mapbox/mapbox-gl-native@${BITRISE_GIT_BRANCH}>
             by ${GIT_CLONE_COMMIT_COMMITER_NAME}
diff --git a/platform/qt/bitrise-qt5.yml b/platform/qt/bitrise-qt5.yml
index 1e767b31690..18fa44dd2c2 100644
--- a/platform/qt/bitrise-qt5.yml
+++ b/platform/qt/bitrise-qt5.yml
@@ -43,8 +43,8 @@ workflows:
         inputs:
         - webhook_url: "$SLACK_HOOK_URL"
         - channel: "#gl-bots"
-        - from_username: 'Bitrise Qt5 OS X'
-        - from_username_on_error: 'Bitrise Qt5 OS X'
+        - from_username: 'Bitrise Qt5 macOS'
+        - from_username_on_error: 'Bitrise Qt5 macOS'
         - message: '<${BITRISE_BUILD_URL}|Build #${BITRISE_BUILD_NUMBER}>
             for <https://github.com/mapbox/mapbox-gl-native/compare/${BITRISE_GIT_BRANCH}|mapbox/mapbox-gl-native@${BITRISE_GIT_BRANCH}>
             by ${GIT_CLONE_COMMIT_COMMITER_NAME}
diff --git a/scripts/collect-coverage.sh b/scripts/collect-coverage.sh
index 35a9b8cd5a5..efc93769f2f 100755
--- a/scripts/collect-coverage.sh
+++ b/scripts/collect-coverage.sh
@@ -15,7 +15,7 @@ function usage() {
     if [ `uname -s` = 'Linux' ]; then
         echo "On Debian-based distros, you can install them via 'apt-get install lcov'"
     elif [ `uname -s` = 'Darwin' ]; then
-        echo "On OS X, you can install them via 'brew install lcov'"
+        echo "On macOS, you can install them via 'brew install lcov'"
     fi
     exit 1
 }