From c2eb47c7a70bf2925165ad4ca803cc774a7daaf3 Mon Sep 17 00:00:00 2001
From: Nikita Lutsenko <nlutsenko@fb.com>
Date: Tue, 18 Aug 2015 15:20:06 -0700
Subject: [PATCH] Rename ParseOSX.framework to Parse.framework

---
 Configurations/Parse-OSX.xcconfig             |  2 +-
 Parse-OSX.podspec                             |  7 ++-
 Parse.xcodeproj/project.pbxproj               | 48 ++++++++++++-------
 .../xcshareddata/xcschemes/Parse-OSX.xcscheme | 18 +++----
 .../Internal/Analytics/PFAnalytics_Private.h  |  6 +--
 Parse/Internal/BFTask+Private.m               |  6 +--
 .../Commands/CommandRunner/PFCommandRunning.h |  7 +--
 .../URLSession/Session/PFURLSession.h         |  4 --
 .../PFURLSessionFileDownloadTaskDelegate.h    |  4 --
 .../PFURLSessionUploadTaskDelegate.h          |  8 +---
 Parse/Internal/Config/PFConfig_Private.h      |  4 --
 .../File/Controller/PFFileController.h        |  4 --
 Parse/Internal/File/PFFile_Private.h          |  5 --
 .../Installation/PFInstallationPrivate.h      |  4 --
 .../Internal/KeyValueCache/PFKeyValueCache.m  |  4 --
 Parse/Internal/LocalDataStore/Pin/PFPin.h     |  5 --
 Parse/Internal/Object/PFObjectPrivate.h       |  6 +--
 Parse/Internal/PFGeoPointPrivate.h            |  4 --
 Parse/Internal/PFInternalUtils.h              |  8 +---
 Parse/Internal/PFLogger.h                     |  4 --
 Parse/Internal/PFLogging.h                    |  4 --
 Parse/Internal/ParseInternal.h                |  4 --
 Parse/Internal/Parse_Private.h                |  6 +--
 Parse/Internal/Push/PFPushPrivate.h           |  4 --
 Parse/Internal/Query/PFQueryPrivate.h         |  4 --
 Parse/Internal/Query/State/PFQueryState.h     |  8 +---
 Parse/Internal/Relation/PFRelationPrivate.h   |  4 --
 Parse/Internal/Session/PFSession_Private.h    |  4 --
 Parse/Internal/User/PFUserPrivate.h           |  4 --
 Parse/OSX/ParseOSX.h                          | 10 ----
 Parse/PFACL.h                                 |  4 --
 Parse/PFAnalytics.h                           |  4 --
 Parse/PFAnonymousUtils.h                      |  5 --
 Parse/PFCloud.h                               |  4 --
 Parse/PFConfig.h                              |  4 --
 Parse/PFConstants.h                           |  4 --
 Parse/PFFile.h                                |  4 --
 Parse/PFGeoPoint.h                            |  6 +--
 Parse/PFInstallation.h                        |  6 ---
 Parse/PFInstallation.m                        |  8 ++--
 Parse/PFObject+Subclass.h                     |  5 --
 Parse/PFObject.h                              |  5 --
 Parse/PFPush.h                                |  4 --
 Parse/PFQuery.h                               |  7 ---
 Parse/PFRelation.h                            |  6 ---
 Parse/PFRole.h                                |  6 ---
 Parse/PFSession.h                             |  5 --
 Parse/PFSubclassing.h                         |  4 --
 Parse/PFUser.h                                |  6 ---
 Parse/Parse.h                                 | 31 ++----------
 .../project.pbxproj                           | 18 +++----
 .../ParseOSXStarterProject-Swift.xcscheme     |  6 +--
 .../ParseOSXStarterProject/AppDelegate.swift  |  2 +-
 .../project.pbxproj                           | 14 +++---
 .../xcschemes/ParseOSXStarterProject.xcscheme |  6 +--
 .../ParseOSXStarterProject/AppDelegate.m      |  4 +-
 .../ParseStarterProject-Swift.xcscheme        | 16 ++++++-
 .../xcschemes/ParseStarterProject.xcscheme    | 16 ++++++-
 Rakefile                                      |  4 +-
 .../ParseUnitTests-OSX-Bridging-Header.h      |  4 +-
 .../ParseUnitTests-iOS-Bridging-Header.h      |  2 +-
 .../Swizzling/PFTestSwizzlingUtilities.h      |  4 --
 62 files changed, 126 insertions(+), 308 deletions(-)
 delete mode 100644 Parse/OSX/ParseOSX.h

diff --git a/Configurations/Parse-OSX.xcconfig b/Configurations/Parse-OSX.xcconfig
index 562b9ee66..1820e2973 100644
--- a/Configurations/Parse-OSX.xcconfig
+++ b/Configurations/Parse-OSX.xcconfig
@@ -10,7 +10,7 @@
 #include "Shared/Platform/OSX.xcconfig"
 #include "Shared/Product/Framework.xcconfig"
 
-PRODUCT_NAME = ParseOSX
+PRODUCT_NAME = Parse
 
 MACH_O_TYPE = mh_dylib
 DEFINES_MODULE = YES
diff --git a/Parse-OSX.podspec b/Parse-OSX.podspec
index f03d0c6f5..bf5d49d20 100644
--- a/Parse-OSX.podspec
+++ b/Parse-OSX.podspec
@@ -13,13 +13,12 @@ Pod::Spec.new do |s|
   s.osx.deployment_target = '10.9'
   s.requires_arc = true
   
-  s.header_dir = 'ParseOSX'
-  s.module_name = 'ParseOSX'
+  s.header_dir = 'Parse'
+  s.module_name = 'Parse'
   
   s.source_files = 'Parse/*.{h,m}',
-                   'Parse/OSX.{h,m}',
                    'Parse/Internal/**/*.{h,m}'
-  s.public_header_files = 'Parse/*.h', 'Parse/OSX/*.h'
+  s.public_header_files = 'Parse/*.h'
   s.resources = 'Parse/Resources/en.lproj'
   s.exclude_files = 'Parse/PFNetworkActivityIndicatorManager.{h,m}',
                     'Parse/PFProduct.{h,m}',
diff --git a/Parse.xcodeproj/project.pbxproj b/Parse.xcodeproj/project.pbxproj
index 219e08094..39e8671f9 100644
--- a/Parse.xcodeproj/project.pbxproj
+++ b/Parse.xcodeproj/project.pbxproj
@@ -599,7 +599,7 @@
 		81BF4ABD1B0BF64B00A3D75B /* PFCurrentConfigController.h in Headers */ = {isa = PBXBuildFile; fileRef = 81BF4ABA1B0BF64B00A3D75B /* PFCurrentConfigController.h */; };
 		81BF4ABE1B0BF64B00A3D75B /* PFCurrentConfigController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81BF4ABB1B0BF64B00A3D75B /* PFCurrentConfigController.m */; };
 		81BF4ABF1B0BF64B00A3D75B /* PFCurrentConfigController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81BF4ABB1B0BF64B00A3D75B /* PFCurrentConfigController.m */; };
-		81C09F891AF97EA70043B49C /* ParseOSX.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97010FAC1630B18F00AB761E /* ParseOSX.framework */; };
+		81C09F891AF97EA70043B49C /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97010FAC1630B18F00AB761E /* Parse.framework */; };
 		81C09F8D1AF9816D0043B49C /* Bolts.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 8103FA44198FC267000BAE3F /* Bolts.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		81C1EE491AE1EF960031C438 /* PFWeakValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 81C1EE471AE1EF960031C438 /* PFWeakValue.h */; };
 		81C1EE4A1AE1EF960031C438 /* PFWeakValue.m in Sources */ = {isa = PBXBuildFile; fileRef = 81C1EE481AE1EF960031C438 /* PFWeakValue.m */; };
@@ -754,7 +754,6 @@
 		81EEE1B21B446D600087AC4D /* PFCurrentUserController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81EEE1AF1B446D600087AC4D /* PFCurrentUserController.m */; };
 		81EEE1B31B446D600087AC4D /* PFCurrentUserController.m in Sources */ = {isa = PBXBuildFile; fileRef = 81EEE1AF1B446D600087AC4D /* PFCurrentUserController.m */; };
 		81F0E88E19E6F7D600812A88 /* Parse.h in Headers */ = {isa = PBXBuildFile; fileRef = 09EEA12D1434FB1F00E3A3FA /* Parse.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		81F0E88F19E6F7DB00812A88 /* ParseOSX.h in Headers */ = {isa = PBXBuildFile; fileRef = 971AC55C1716405A00A4EB71 /* ParseOSX.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		81F0E89019E6F83E00812A88 /* PFACL.h in Headers */ = {isa = PBXBuildFile; fileRef = 64C47802147336C70092082F /* PFACL.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		81F0E89119E6F83E00812A88 /* PFAnalytics.h in Headers */ = {isa = PBXBuildFile; fileRef = 9739513816B9D28E0010B884 /* PFAnalytics.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		81F0E89219E6F83E00812A88 /* PFAnonymousUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 638CBBB415191435004F54E4 /* PFAnonymousUtils.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -919,6 +918,20 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
+		811167461B8402DA003CB026 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 09D33641139C54930098E916 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 97010FAB1630B18F00AB761E;
+			remoteInfo = "Parse-OSX";
+		};
+		8111674B1B8402DF003CB026 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 09D33641139C54930098E916 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 81C3821B19CCA89E0066284A;
+			remoteInfo = "Parse-iOS";
+		};
 		81493A991A0D3CE3008D5504 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 09D33641139C54930098E916 /* Project object */;
@@ -1467,9 +1480,8 @@
 		91DF24941A09BAF100CFC7D4 /* PFPinningEventuallyQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFPinningEventuallyQueue.h; sourceTree = "<group>"; };
 		91DF24951A09BAF100CFC7D4 /* PFPinningEventuallyQueue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFPinningEventuallyQueue.m; sourceTree = "<group>"; };
 		91DF24981A0B0FF200CFC7D4 /* PFEventuallyQueue_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFEventuallyQueue_Private.h; sourceTree = "<group>"; };
-		97010FAC1630B18F00AB761E /* ParseOSX.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ParseOSX.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		97010FAC1630B18F00AB761E /* Parse.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Parse.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		970110191630B1FE00AB761E /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
-		971AC55C1716405A00A4EB71 /* ParseOSX.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ParseOSX.h; sourceTree = "<group>"; };
 		9739513816B9D28E0010B884 /* PFAnalytics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFAnalytics.h; sourceTree = "<group>"; };
 		9739513916B9D28E0010B884 /* PFAnalytics.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFAnalytics.m; sourceTree = "<group>"; };
 		97A3EA0C161FB6A9007A96B2 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
@@ -1560,7 +1572,7 @@
 			files = (
 				81AB68C61B7E7F250053210E /* OCMock.framework in Frameworks */,
 				F5B0B3171B44A2CA00F3EBC4 /* StoreKit.framework in Frameworks */,
-				81C09F891AF97EA70043B49C /* ParseOSX.framework in Frameworks */,
+				81C09F891AF97EA70043B49C /* Parse.framework in Frameworks */,
 				815868E21AF9818D009A5751 /* Bolts.framework in Frameworks */,
 				F5B0B3161B44A22300F3EBC4 /* SystemConfiguration.framework in Frameworks */,
 			);
@@ -1594,7 +1606,6 @@
 			children = (
 				09809FAE1434F98C00EC3E74 /* Internal */,
 				09809FB81434F98C00EC3E74 /* Resources */,
-				97DE04271631E686007154E8 /* OSX */,
 				09EEA12D1434FB1F00E3A3FA /* Parse.h */,
 				09EEA12E1434FB1F00E3A3FA /* Parse.m */,
 				64C47802147336C70092082F /* PFACL.h */,
@@ -1762,7 +1773,7 @@
 		09D3364B139C54940098E916 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				97010FAC1630B18F00AB761E /* ParseOSX.framework */,
+				97010FAC1630B18F00AB761E /* Parse.framework */,
 				81C3821C19CCA89E0066284A /* Parse.framework */,
 				816F449B1A8E8933009CDB32 /* ParseUnitTests-iOS.xctest */,
 				81C09F861AF97A490043B49C /* ParseUnitTests-OSX.xctest */,
@@ -2940,14 +2951,6 @@
 			path = CurrentUserController;
 			sourceTree = "<group>";
 		};
-		97DE04271631E686007154E8 /* OSX */ = {
-			isa = PBXGroup;
-			children = (
-				971AC55C1716405A00A4EB71 /* ParseOSX.h */,
-			);
-			path = OSX;
-			sourceTree = "<group>";
-		};
 		F50C66301B33A6CE001941A6 /* Utilites */ = {
 			isa = PBXGroup;
 			children = (
@@ -3380,7 +3383,6 @@
 				81D0EE9A19B0A2060000AE75 /* PFKeychainStore.h in Headers */,
 				81BF4AB71B0BF3E500A3D75B /* PFConfigController.h in Headers */,
 				F515355A1B57573700C49F56 /* PFDefaultACLController.h in Headers */,
-				81F0E88F19E6F7DB00812A88 /* ParseOSX.h in Headers */,
 				8119C9981A76E28F0085B516 /* PFNetworkCommand.h in Headers */,
 				8166FCDE1B503914003841A2 /* PFAnonymousAuthenticationProvider.h in Headers */,
 				81CD665B1B4DA5BA0042FC0B /* PFInstallationController.h in Headers */,
@@ -3537,6 +3539,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				8111674C1B8402DF003CB026 /* PBXTargetDependency */,
 				81AB68C21B7E7EEA0053210E /* PBXTargetDependency */,
 			);
 			name = "ParseUnitTests-iOS";
@@ -3556,6 +3559,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				811167471B8402DA003CB026 /* PBXTargetDependency */,
 				81AB68C81B7E7F2A0053210E /* PBXTargetDependency */,
 			);
 			name = "ParseUnitTests-OSX";
@@ -3600,7 +3604,7 @@
 			);
 			name = "Parse-OSX";
 			productName = ParseMac;
-			productReference = 97010FAC1630B18F00AB761E /* ParseOSX.framework */;
+			productReference = 97010FAC1630B18F00AB761E /* Parse.framework */;
 			productType = "com.apple.product-type.framework";
 		};
 /* End PBXNativeTarget section */
@@ -4287,6 +4291,16 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
+		811167471B8402DA003CB026 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 97010FAB1630B18F00AB761E /* Parse-OSX */;
+			targetProxy = 811167461B8402DA003CB026 /* PBXContainerItemProxy */;
+		};
+		8111674C1B8402DF003CB026 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 81C3821B19CCA89E0066284A /* Parse-iOS */;
+			targetProxy = 8111674B1B8402DF003CB026 /* PBXContainerItemProxy */;
+		};
 		81493A9A1A0D3CE3008D5504 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 81493A931A0D3492008D5504 /* BoltsSDK-OSX */;
diff --git a/Parse.xcodeproj/xcshareddata/xcschemes/Parse-OSX.xcscheme b/Parse.xcodeproj/xcshareddata/xcschemes/Parse-OSX.xcscheme
index 9cdff3423..027b0a4a1 100644
--- a/Parse.xcodeproj/xcshareddata/xcschemes/Parse-OSX.xcscheme
+++ b/Parse.xcodeproj/xcshareddata/xcschemes/Parse-OSX.xcscheme
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "0700"
-   version = "1.3">
+   version = "1.8">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "97010FAB1630B18F00AB761E"
-               BuildableName = "ParseOSX.framework"
+               BuildableName = "Parse.framework"
                BlueprintName = "Parse-OSX"
                ReferencedContainer = "container:Parse.xcodeproj">
             </BuildableReference>
@@ -37,10 +37,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
-      buildConfiguration = "Test"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Test">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -57,7 +57,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "97010FAB1630B18F00AB761E"
-            BuildableName = "ParseOSX.framework"
+            BuildableName = "Parse.framework"
             BlueprintName = "Parse-OSX"
             ReferencedContainer = "container:Parse.xcodeproj">
          </BuildableReference>
@@ -66,11 +66,11 @@
       </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
@@ -79,7 +79,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "97010FAB1630B18F00AB761E"
-            BuildableName = "ParseOSX.framework"
+            BuildableName = "Parse.framework"
             BlueprintName = "Parse-OSX"
             ReferencedContainer = "container:Parse.xcodeproj">
          </BuildableReference>
@@ -88,16 +88,16 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
-      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "97010FAB1630B18F00AB761E"
-            BuildableName = "ParseOSX.framework"
+            BuildableName = "Parse.framework"
             BlueprintName = "Parse-OSX"
             ReferencedContainer = "container:Parse.xcodeproj">
          </BuildableReference>
diff --git a/Parse/Internal/Analytics/PFAnalytics_Private.h b/Parse/Internal/Analytics/PFAnalytics_Private.h
index 240335738..d0017989e 100644
--- a/Parse/Internal/Analytics/PFAnalytics_Private.h
+++ b/Parse/Internal/Analytics/PFAnalytics_Private.h
@@ -7,11 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#if TARGET_OS_IPHONE
-# import <Parse/PFAnalytics.h>
-#else
-# import <ParseOSX/PFAnalytics.h>
-#endif
+#import <Parse/PFAnalytics.h>
 
 /*!
  Predefined events - AppOpened, CrashReport
diff --git a/Parse/Internal/BFTask+Private.m b/Parse/Internal/BFTask+Private.m
index f6d7c6c24..5ed495920 100644
--- a/Parse/Internal/BFTask+Private.m
+++ b/Parse/Internal/BFTask+Private.m
@@ -12,11 +12,7 @@
 #import <Bolts/BFExecutor.h>
 #import <Bolts/BFTaskCompletionSource.h>
 
-#if TARGET_OS_IPHONE
-#import <Parse/PFLogging.h>
-#else
-#import <ParseOSX/PFLogging.h>
-#endif
+#import "PFLogging.h"
 
 @implementation BFExecutor (Background)
 
diff --git a/Parse/Internal/Commands/CommandRunner/PFCommandRunning.h b/Parse/Internal/Commands/CommandRunner/PFCommandRunning.h
index c698a91da..d82dedb40 100644
--- a/Parse/Internal/Commands/CommandRunner/PFCommandRunning.h
+++ b/Parse/Internal/Commands/CommandRunner/PFCommandRunning.h
@@ -9,12 +9,9 @@
 
 #import <Foundation/Foundation.h>
 
-#import "PFDataProvider.h"
-#if TARGET_OS_IPHONE
 #import <Parse/PFConstants.h>
-#else
-#import <ParseOSX/PFConstants.h>
-#endif
+
+#import "PFDataProvider.h"
 
 @class BFCancellationToken;
 @class BFTask;
diff --git a/Parse/Internal/Commands/CommandRunner/URLSession/Session/PFURLSession.h b/Parse/Internal/Commands/CommandRunner/URLSession/Session/PFURLSession.h
index 0232cf44c..67196bbf8 100644
--- a/Parse/Internal/Commands/CommandRunner/URLSession/Session/PFURLSession.h
+++ b/Parse/Internal/Commands/CommandRunner/URLSession/Session/PFURLSession.h
@@ -9,11 +9,7 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
 #import <Parse/PFConstants.h>
-#else
-#import <ParseOSX/PFConstants.h>
-#endif
 
 @class BFCancellationToken;
 @class BFTask;
diff --git a/Parse/Internal/Commands/CommandRunner/URLSession/Session/TaskDelegate/PFURLSessionFileDownloadTaskDelegate.h b/Parse/Internal/Commands/CommandRunner/URLSession/Session/TaskDelegate/PFURLSessionFileDownloadTaskDelegate.h
index 5a791d949..918e1b5d2 100644
--- a/Parse/Internal/Commands/CommandRunner/URLSession/Session/TaskDelegate/PFURLSessionFileDownloadTaskDelegate.h
+++ b/Parse/Internal/Commands/CommandRunner/URLSession/Session/TaskDelegate/PFURLSessionFileDownloadTaskDelegate.h
@@ -9,11 +9,7 @@
 
 #import "PFURLSessionDataTaskDelegate.h"
 
-#if TARGET_OS_IPHONE
 #import <Parse/PFConstants.h>
-#else
-#import <ParseOSX/PFConstants.h>
-#endif
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Parse/Internal/Commands/CommandRunner/URLSession/Session/TaskDelegate/PFURLSessionUploadTaskDelegate.h b/Parse/Internal/Commands/CommandRunner/URLSession/Session/TaskDelegate/PFURLSessionUploadTaskDelegate.h
index 22667ebaf..d08225fd5 100644
--- a/Parse/Internal/Commands/CommandRunner/URLSession/Session/TaskDelegate/PFURLSessionUploadTaskDelegate.h
+++ b/Parse/Internal/Commands/CommandRunner/URLSession/Session/TaskDelegate/PFURLSessionUploadTaskDelegate.h
@@ -9,13 +9,9 @@
 
 #import <Foundation/Foundation.h>
 
-#import "PFURLSessionJSONDataTaskDelegate.h"
-
-#if TARGET_OS_IPHONE
 #import <Parse/PFConstants.h>
-#else
-#import <ParseOSX/PFConstants.h>
-#endif
+
+#import "PFURLSessionJSONDataTaskDelegate.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/Parse/Internal/Config/PFConfig_Private.h b/Parse/Internal/Config/PFConfig_Private.h
index 07a197672..326f42583 100644
--- a/Parse/Internal/Config/PFConfig_Private.h
+++ b/Parse/Internal/Config/PFConfig_Private.h
@@ -9,11 +9,7 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
 #import <Parse/PFConfig.h>
-#else
-#import <ParseOSX/PFConfig.h>
-#endif
 
 NSString *const PFConfigParametersRESTKey;
 
diff --git a/Parse/Internal/File/Controller/PFFileController.h b/Parse/Internal/File/Controller/PFFileController.h
index b024e86c2..99f8ea174 100644
--- a/Parse/Internal/File/Controller/PFFileController.h
+++ b/Parse/Internal/File/Controller/PFFileController.h
@@ -9,11 +9,7 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
 #import <Parse/PFConstants.h>
-#else
-#import <ParseOSX/PFConstants.h>
-#endif
 
 #import "PFDataProvider.h"
 
diff --git a/Parse/Internal/File/PFFile_Private.h b/Parse/Internal/File/PFFile_Private.h
index f9956eb02..9d3c81135 100644
--- a/Parse/Internal/File/PFFile_Private.h
+++ b/Parse/Internal/File/PFFile_Private.h
@@ -9,13 +9,8 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
 #import <Parse/PFConstants.h>
 #import <Parse/PFFile.h>
-#else
-#import <ParseOSX/PFConstants.h>
-#import <ParseOSX/PFFile.h>
-#endif
 
 #import "PFFileState.h"
 
diff --git a/Parse/Internal/Installation/PFInstallationPrivate.h b/Parse/Internal/Installation/PFInstallationPrivate.h
index 791a29a11..52475e170 100644
--- a/Parse/Internal/Installation/PFInstallationPrivate.h
+++ b/Parse/Internal/Installation/PFInstallationPrivate.h
@@ -9,11 +9,7 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
 #import <Parse/PFInstallation.h>
-#else
-#import <ParseOSX/PFInstallation.h>
-#endif
 
 @interface PFInstallation (Private)
 
diff --git a/Parse/Internal/KeyValueCache/PFKeyValueCache.m b/Parse/Internal/KeyValueCache/PFKeyValueCache.m
index b849f68a4..92f774de7 100644
--- a/Parse/Internal/KeyValueCache/PFKeyValueCache.m
+++ b/Parse/Internal/KeyValueCache/PFKeyValueCache.m
@@ -9,10 +9,6 @@
 
 #import "PFKeyValueCache_Private.h"
 
-#import <Parse_Private.h>
-
-#import <Foundation/Foundation.h>
-
 #import "BFTask+Private.h"
 #import "PFAssert.h"
 #import "PFConstants.h"
diff --git a/Parse/Internal/LocalDataStore/Pin/PFPin.h b/Parse/Internal/LocalDataStore/Pin/PFPin.h
index df70eeadb..745baf6ae 100644
--- a/Parse/Internal/LocalDataStore/Pin/PFPin.h
+++ b/Parse/Internal/LocalDataStore/Pin/PFPin.h
@@ -9,13 +9,8 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
 #import <Parse/PFObject.h>
 #import <Parse/PFSubclassing.h>
-#else
-#import <ParseOSX/PFObject.h>
-#import <ParseOSX/PFSubclassing.h>
-#endif
 
 extern NSString *const PFPinKeyName;
 extern NSString *const PFPinKeyObjects;
diff --git a/Parse/Internal/Object/PFObjectPrivate.h b/Parse/Internal/Object/PFObjectPrivate.h
index 669713e40..c524df317 100644
--- a/Parse/Internal/Object/PFObjectPrivate.h
+++ b/Parse/Internal/Object/PFObjectPrivate.h
@@ -9,11 +9,7 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
-# import <Parse/PFObject.h>
-#else
-# import <ParseOSX/PFObject.h>
-#endif
+#import <Parse/PFObject.h>
 
 #import <Bolts/BFTask.h>
 
diff --git a/Parse/Internal/PFGeoPointPrivate.h b/Parse/Internal/PFGeoPointPrivate.h
index 4a84da051..13aeb6fbd 100644
--- a/Parse/Internal/PFGeoPointPrivate.h
+++ b/Parse/Internal/PFGeoPointPrivate.h
@@ -9,11 +9,7 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
 # import <Parse/PFGeoPoint.h>
-#else
-# import <ParseOSX/PFGeoPoint.h>
-#endif
 
 extern const double EARTH_RADIUS_MILES;
 extern const double EARTH_RADIUS_KILOMETERS;
diff --git a/Parse/Internal/PFInternalUtils.h b/Parse/Internal/PFInternalUtils.h
index 6602e413d..4d226be8b 100644
--- a/Parse/Internal/PFInternalUtils.h
+++ b/Parse/Internal/PFInternalUtils.h
@@ -10,12 +10,8 @@
 #import <Foundation/Foundation.h>
 #import <SystemConfiguration/SCNetworkReachability.h>
 
-#if TARGET_OS_IPHONE
-# import <Parse/PFConstants.h>
-# import "PFPushPrivate.h"
-#else
-# import <ParseOSX/PFConstants.h>
-#endif
+#import <Parse/PFConstants.h>
+#import "PFPushPrivate.h"
 
 #import "PFEncoder.h"
 
diff --git a/Parse/Internal/PFLogger.h b/Parse/Internal/PFLogger.h
index a69495db9..afff41217 100644
--- a/Parse/Internal/PFLogger.h
+++ b/Parse/Internal/PFLogger.h
@@ -9,11 +9,7 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
 # import <Parse/PFConstants.h>
-#else
-# import <ParseOSX/PFConstants.h>
-#endif
 
 typedef uint8_t PFLoggingTag;
 
diff --git a/Parse/Internal/PFLogging.h b/Parse/Internal/PFLogging.h
index 1d1f3da19..90a4410c0 100644
--- a/Parse/Internal/PFLogging.h
+++ b/Parse/Internal/PFLogging.h
@@ -10,11 +10,7 @@
 #ifndef Parse_PFLogging_h
 #define Parse_PFLogging_h
 
-#if TARGET_OS_IPHONE
 # import <Parse/PFConstants.h>
-#else
-# import <ParseOSX/PFConstants.h>
-#endif
 
 #import "PFLogger.h"
 
diff --git a/Parse/Internal/ParseInternal.h b/Parse/Internal/ParseInternal.h
index 402651af6..6a9338e2c 100644
--- a/Parse/Internal/ParseInternal.h
+++ b/Parse/Internal/ParseInternal.h
@@ -9,11 +9,7 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
 # import <Parse/Parse.h>
-#else
-# import <ParseOSX/Parse.h>
-#endif
 
 #import "PFAssert.h"
 #import "PFAuthenticationProvider.h"
diff --git a/Parse/Internal/Parse_Private.h b/Parse/Internal/Parse_Private.h
index f95654f34..176dd1f14 100644
--- a/Parse/Internal/Parse_Private.h
+++ b/Parse/Internal/Parse_Private.h
@@ -9,11 +9,7 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
-# import <Parse/Parse.h>
-#else
-# import <ParseOSX/Parse.h>
-#endif
+#import <Parse/Parse.h>
 
 #import "ParseManager.h"
 
diff --git a/Parse/Internal/Push/PFPushPrivate.h b/Parse/Internal/Push/PFPushPrivate.h
index 4ad0efd11..5f685a001 100644
--- a/Parse/Internal/Push/PFPushPrivate.h
+++ b/Parse/Internal/Push/PFPushPrivate.h
@@ -9,11 +9,7 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
 #import <Parse/PFPush.h>
-#else
-#import <ParseOSX/PFPush.h>
-#endif
 
 #import "PFMacros.h"
 
diff --git a/Parse/Internal/Query/PFQueryPrivate.h b/Parse/Internal/Query/PFQueryPrivate.h
index b7cbdffe7..0fe2e3fc3 100644
--- a/Parse/Internal/Query/PFQueryPrivate.h
+++ b/Parse/Internal/Query/PFQueryPrivate.h
@@ -9,11 +9,7 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
 #import <Parse/PFQuery.h>
-#else
-#import <ParseOSX/PFQuery.h>
-#endif
 
 #import "PFQueryState.h"
 
diff --git a/Parse/Internal/Query/State/PFQueryState.h b/Parse/Internal/Query/State/PFQueryState.h
index a66807bd2..c97ff5815 100644
--- a/Parse/Internal/Query/State/PFQueryState.h
+++ b/Parse/Internal/Query/State/PFQueryState.h
@@ -9,13 +9,9 @@
 
 #import <Foundation/Foundation.h>
 
-#import "PFBaseState.h"
-
-#if TARGET_OS_IPHONE
 #import <Parse/PFConstants.h>
-#else
-#import <ParseOSX/PFConstants.h>
-#endif
+
+#import "PFBaseState.h"
 
 @interface PFQueryState : PFBaseState <PFBaseStateSubclass, NSCopying, NSMutableCopying>
 
diff --git a/Parse/Internal/Relation/PFRelationPrivate.h b/Parse/Internal/Relation/PFRelationPrivate.h
index 1ce3f37f7..26d26fdd4 100644
--- a/Parse/Internal/Relation/PFRelationPrivate.h
+++ b/Parse/Internal/Relation/PFRelationPrivate.h
@@ -9,11 +9,7 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
 #import <Parse/PFRelation.h>
-#else
-#import <ParseOSX/PFRelation.h>
-#endif
 
 @class PFDecoder;
 
diff --git a/Parse/Internal/Session/PFSession_Private.h b/Parse/Internal/Session/PFSession_Private.h
index 40de5a92b..b647585a2 100644
--- a/Parse/Internal/Session/PFSession_Private.h
+++ b/Parse/Internal/Session/PFSession_Private.h
@@ -9,11 +9,7 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
 #import <Parse/PFSession.h>
-#else
-#import <ParseOSX/PFSession.h>
-#endif
 
 @class PFSessionController;
 
diff --git a/Parse/Internal/User/PFUserPrivate.h b/Parse/Internal/User/PFUserPrivate.h
index 295f376ae..8ce24a99f 100644
--- a/Parse/Internal/User/PFUserPrivate.h
+++ b/Parse/Internal/User/PFUserPrivate.h
@@ -9,11 +9,7 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
 # import <Parse/PFUser.h>
-#else
-# import <ParseOSX/PFUser.h>
-#endif
 
 #import "PFAuthenticationProvider.h"
 
diff --git a/Parse/OSX/ParseOSX.h b/Parse/OSX/ParseOSX.h
deleted file mode 100644
index c4803fd0f..000000000
--- a/Parse/OSX/ParseOSX.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * Copyright (c) 2015-present, Parse, LLC.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-#import <ParseOSX/Parse.h>
diff --git a/Parse/PFACL.h b/Parse/PFACL.h
index 5c4c1b1e3..a952585ba 100644
--- a/Parse/PFACL.h
+++ b/Parse/PFACL.h
@@ -9,11 +9,7 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
 #import <Parse/PFNullability.h>
-#else
-#import <ParseOSX/PFNullability.h>
-#endif
 
 PF_ASSUME_NONNULL_BEGIN
 
diff --git a/Parse/PFAnalytics.h b/Parse/PFAnalytics.h
index a3d32a683..0e090bc80 100644
--- a/Parse/PFAnalytics.h
+++ b/Parse/PFAnalytics.h
@@ -9,11 +9,7 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
 #import <Parse/PFConstants.h>
-#else
-#import <ParseOSX/PFConstants.h>
-#endif
 
 PF_ASSUME_NONNULL_BEGIN
 
diff --git a/Parse/PFAnonymousUtils.h b/Parse/PFAnonymousUtils.h
index d1334649a..21209cf86 100644
--- a/Parse/PFAnonymousUtils.h
+++ b/Parse/PFAnonymousUtils.h
@@ -9,13 +9,8 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
 #import <Parse/PFConstants.h>
 #import <Parse/PFUser.h>
-#else
-#import <ParseOSX/PFConstants.h>
-#import <ParseOSX/PFUser.h>
-#endif
 
 PF_ASSUME_NONNULL_BEGIN
 
diff --git a/Parse/PFCloud.h b/Parse/PFCloud.h
index 57ca6124f..6f7413a4e 100644
--- a/Parse/PFCloud.h
+++ b/Parse/PFCloud.h
@@ -9,11 +9,7 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
 #import <Parse/PFConstants.h>
-#else
-#import <ParseOSX/PFConstants.h>
-#endif
 
 PF_ASSUME_NONNULL_BEGIN
 
diff --git a/Parse/PFConfig.h b/Parse/PFConfig.h
index 3e4c29a5d..c96685777 100644
--- a/Parse/PFConfig.h
+++ b/Parse/PFConfig.h
@@ -9,11 +9,7 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
 #import <Parse/PFNullability.h>
-#else
-#import <ParseOSX/PFNullability.h>
-#endif
 
 PF_ASSUME_NONNULL_BEGIN
 
diff --git a/Parse/PFConstants.h b/Parse/PFConstants.h
index 6a368b418..04b23342f 100644
--- a/Parse/PFConstants.h
+++ b/Parse/PFConstants.h
@@ -9,11 +9,7 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
 #import <Parse/PFNullability.h>
-#else
-#import <ParseOSX/PFNullability.h>
-#endif
 
 @class PFObject;
 @class PFUser;
diff --git a/Parse/PFFile.h b/Parse/PFFile.h
index 62ac01729..db3a56ca5 100644
--- a/Parse/PFFile.h
+++ b/Parse/PFFile.h
@@ -9,11 +9,7 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
 #import <Parse/PFConstants.h>
-#else
-#import <ParseOSX/PFConstants.h>
-#endif
 
 PF_ASSUME_NONNULL_BEGIN
 
diff --git a/Parse/PFGeoPoint.h b/Parse/PFGeoPoint.h
index b45ddc6e2..9081a6190 100644
--- a/Parse/PFGeoPoint.h
+++ b/Parse/PFGeoPoint.h
@@ -7,14 +7,10 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import <Foundation/Foundation.h>
 #import <CoreLocation/CoreLocation.h>
+#import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
 #import <Parse/PFNullability.h>
-#else
-#import <ParseOSX/PFNullability.h>
-#endif
 
 PF_ASSUME_NONNULL_BEGIN
 
diff --git a/Parse/PFInstallation.h b/Parse/PFInstallation.h
index ed51328fa..d9d14fe11 100644
--- a/Parse/PFInstallation.h
+++ b/Parse/PFInstallation.h
@@ -9,15 +9,9 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
 #import <Parse/PFNullability.h>
 #import <Parse/PFObject.h>
 #import <Parse/PFSubclassing.h>
-#else
-#import <ParseOSX/PFNullability.h>
-#import <ParseOSX/PFObject.h>
-#import <ParseOSX/PFSubclassing.h>
-#endif
 
 PF_ASSUME_NONNULL_BEGIN
 
diff --git a/Parse/PFInstallation.m b/Parse/PFInstallation.m
index ac439abf0..0404b30d0 100644
--- a/Parse/PFInstallation.m
+++ b/Parse/PFInstallation.m
@@ -312,23 +312,23 @@ - (void)_updateVersionInfoFromDevice {
 
 /*!
  @abstract Save localeIdentifier in the following format: [language code]-[COUNTRY CODE].
- 
+
  @discussion The language codes are two-letter lowercase ISO language codes (such as "en") as defined by
  <a href="http://en.wikipedia.org/wiki/ISO_639-1">ISO 639-1</a>.
  The country codes are two-letter uppercase ISO country codes (such as "US") as defined by
  <a href="http://en.wikipedia.org/wiki/ISO_3166-1_alpha-3">ISO 3166-1</a>.
- 
+
  Many iOS locale identifiers don't contain the country code -> inconsistencies with Android/Windows Phone.
  */
 - (void)_updateLocaleIdentifierFromDevice {
     NSLocale *currentLocale = [NSLocale currentLocale];
     NSString *language = [currentLocale objectForKey:NSLocaleLanguageCode];
     NSString *countryCode = [currentLocale objectForKey:NSLocaleCountryCode];
-    
+
     if (language.length == 0) {
         return;
     }
-    
+
     NSString *localeIdentifier = nil;
     if (countryCode.length > 0) {
         localeIdentifier = [NSString stringWithFormat:@"%@-%@", language, countryCode];
diff --git a/Parse/PFObject+Subclass.h b/Parse/PFObject+Subclass.h
index 92b869543..bda5dad33 100644
--- a/Parse/PFObject+Subclass.h
+++ b/Parse/PFObject+Subclass.h
@@ -9,13 +9,8 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
 #import <Parse/PFNullability.h>
 #import <Parse/PFObject.h>
-#else
-#import <ParseOSX/PFNullability.h>
-#import <ParseOSX/PFObject.h>
-#endif
 
 PF_ASSUME_NONNULL_BEGIN
 
diff --git a/Parse/PFObject.h b/Parse/PFObject.h
index de63a2ced..043ed5e9d 100644
--- a/Parse/PFObject.h
+++ b/Parse/PFObject.h
@@ -9,13 +9,8 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
 #import <Parse/PFACL.h>
 #import <Parse/PFConstants.h>
-#else
-#import <ParseOSX/PFACL.h>
-#import <ParseOSX/PFConstants.h>
-#endif
 
 PF_ASSUME_NONNULL_BEGIN
 
diff --git a/Parse/PFPush.h b/Parse/PFPush.h
index 69984d691..bd79c8ebf 100644
--- a/Parse/PFPush.h
+++ b/Parse/PFPush.h
@@ -9,11 +9,7 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
 #import <Parse/PFConstants.h>
-#else
-#import <ParseOSX/PFConstants.h>
-#endif
 
 @class BFTask;
 @class PFQuery;
diff --git a/Parse/PFQuery.h b/Parse/PFQuery.h
index 81463513c..3f1d87304 100644
--- a/Parse/PFQuery.h
+++ b/Parse/PFQuery.h
@@ -9,17 +9,10 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
 #import <Parse/PFConstants.h>
 #import <Parse/PFGeoPoint.h>
 #import <Parse/PFObject.h>
 #import <Parse/PFUser.h>
-#else
-#import <ParseOSX/PFConstants.h>
-#import <ParseOSX/PFGeoPoint.h>
-#import <ParseOSX/PFObject.h>
-#import <ParseOSX/PFUser.h>
-#endif
 
 PF_ASSUME_NONNULL_BEGIN
 
diff --git a/Parse/PFRelation.h b/Parse/PFRelation.h
index 7a7b90286..af64ff901 100644
--- a/Parse/PFRelation.h
+++ b/Parse/PFRelation.h
@@ -9,15 +9,9 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
 #import <Parse/PFNullability.h>
 #import <Parse/PFObject.h>
 #import <Parse/PFQuery.h>
-#else
-#import <ParseOSX/PFNullability.h>
-#import <ParseOSX/PFObject.h>
-#import <ParseOSX/PFQuery.h>
-#endif
 
 PF_ASSUME_NONNULL_BEGIN
 
diff --git a/Parse/PFRole.h b/Parse/PFRole.h
index a406b291f..18d21c9fb 100644
--- a/Parse/PFRole.h
+++ b/Parse/PFRole.h
@@ -9,15 +9,9 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
 #import <Parse/PFNullability.h>
 #import <Parse/PFObject.h>
 #import <Parse/PFSubclassing.h>
-#else
-#import <ParseOSX/PFNullability.h>
-#import <ParseOSX/PFObject.h>
-#import <ParseOSX/PFSubclassing.h>
-#endif
 
 PF_ASSUME_NONNULL_BEGIN
 
diff --git a/Parse/PFSession.h b/Parse/PFSession.h
index f666b607c..ef7dc4d64 100644
--- a/Parse/PFSession.h
+++ b/Parse/PFSession.h
@@ -9,13 +9,8 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
 #import <Parse/PFObject.h>
 #import <Parse/PFSubclassing.h>
-#else
-#import <ParseOSX/PFObject.h>
-#import <ParseOSX/PFSubclassing.h>
-#endif
 
 PF_ASSUME_NONNULL_BEGIN
 
diff --git a/Parse/PFSubclassing.h b/Parse/PFSubclassing.h
index 2b2bee016..5e4068752 100644
--- a/Parse/PFSubclassing.h
+++ b/Parse/PFSubclassing.h
@@ -9,11 +9,7 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
 #import <Parse/PFNullability.h>
-#else
-#import <ParseOSX/PFNullability.h>
-#endif
 
 @class PFQuery;
 
diff --git a/Parse/PFUser.h b/Parse/PFUser.h
index 8fae8528f..6e28ad7ee 100644
--- a/Parse/PFUser.h
+++ b/Parse/PFUser.h
@@ -9,15 +9,9 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
 #import <Parse/PFConstants.h>
 #import <Parse/PFObject.h>
 #import <Parse/PFSubclassing.h>
-#else
-#import <ParseOSX/PFConstants.h>
-#import <ParseOSX/PFObject.h>
-#import <ParseOSX/PFSubclassing.h>
-#endif
 
 PF_ASSUME_NONNULL_BEGIN
 
diff --git a/Parse/Parse.h b/Parse/Parse.h
index 2e632fcf2..d3b98dcc2 100644
--- a/Parse/Parse.h
+++ b/Parse/Parse.h
@@ -9,8 +9,6 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE
-
 #import <Parse/PFACL.h>
 #import <Parse/PFAnalytics.h>
 #import <Parse/PFAnonymousUtils.h>
@@ -28,33 +26,14 @@
 #import <Parse/PFSubclassing.h>
 #import <Parse/PFUser.h>
 #import <Parse/PFInstallation.h>
-#import <Parse/PFNetworkActivityIndicatorManager.h>
 #import <Parse/PFNullability.h>
-#import <Parse/PFProduct.h>
-#import <Parse/PFPurchase.h>
 #import <Parse/PFPush.h>
 
-#else
-
-#import <ParseOSX/PFACL.h>
-#import <ParseOSX/PFAnalytics.h>
-#import <ParseOSX/PFAnonymousUtils.h>
-#import <ParseOSX/PFCloud.h>
-#import <ParseOSX/PFConfig.h>
-#import <ParseOSX/PFConstants.h>
-#import <ParseOSX/PFFile.h>
-#import <ParseOSX/PFGeoPoint.h>
-#import <ParseOSX/PFInstallation.h>
-#import <ParseOSX/PFNullability.h>
-#import <ParseOSX/PFObject+Subclass.h>
-#import <ParseOSX/PFObject.h>
-#import <ParseOSX/PFPush.h>
-#import <ParseOSX/PFQuery.h>
-#import <ParseOSX/PFRelation.h>
-#import <ParseOSX/PFRole.h>
-#import <ParseOSX/PFSession.h>
-#import <ParseOSX/PFSubclassing.h>
-#import <ParseOSX/PFUser.h>
+#if TARGET_OS_IPHONE
+
+#import <Parse/PFNetworkActivityIndicatorManager.h>
+#import <Parse/PFProduct.h>
+#import <Parse/PFPurchase.h>
 
 #endif
 
diff --git a/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject-Swift.xcodeproj/project.pbxproj b/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject-Swift.xcodeproj/project.pbxproj
index c2f6723fe..e5c85f628 100644
--- a/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject-Swift.xcodeproj/project.pbxproj
+++ b/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject-Swift.xcodeproj/project.pbxproj
@@ -21,13 +21,14 @@
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
+		8129E46E1B841A5C00309634 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8129E46D1B841A5C00309634 /* Parse.framework */; };
+		8129E46F1B841AEE00309634 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8129E46D1B841A5C00309634 /* Parse.framework */; };
+		8129E4701B841AEE00309634 /* Parse.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8129E46D1B841A5C00309634 /* Parse.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		814C3AD21B69887B00E307BB /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 814C3ACE1B69887B00E307BB /* MainMenu.xib */; };
 		814C3AD31B69887B00E307BB /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 814C3AD01B69887B00E307BB /* Images.xcassets */; };
 		81CC85BE1A49F2E00076DE19 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81CC85BD1A49F2E00076DE19 /* AppDelegate.swift */; };
 		81CC85DA1A49F3D70076DE19 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81CC85D81A49F3D70076DE19 /* Bolts.framework */; };
-		81CC85DB1A49F3D70076DE19 /* ParseOSX.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 81CC85D91A49F3D70076DE19 /* ParseOSX.framework */; };
 		81CC85DF1A49F53C0076DE19 /* Bolts.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 81CC85D81A49F3D70076DE19 /* Bolts.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		81CC85E01A49F53C0076DE19 /* ParseOSX.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 81CC85D91A49F3D70076DE19 /* ParseOSX.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -47,21 +48,21 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
+				8129E4701B841AEE00309634 /* Parse.framework in CopyFiles */,
 				81CC85DF1A49F53C0076DE19 /* Bolts.framework in CopyFiles */,
-				81CC85E01A49F53C0076DE19 /* ParseOSX.framework in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		8129E46D1B841A5C00309634 /* Parse.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Parse.framework; sourceTree = "<group>"; };
 		814C3ACF1B69887B00E307BB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
 		814C3AD01B69887B00E307BB /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		814C3AD11B69887B00E307BB /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		81CC85B81A49F2E00076DE19 /* ParseOSXStarterProject-Swift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ParseOSXStarterProject-Swift.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		81CC85BD1A49F2E00076DE19 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		81CC85D81A49F3D70076DE19 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Bolts.framework; sourceTree = "<group>"; };
-		81CC85D91A49F3D70076DE19 /* ParseOSX.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ParseOSX.framework; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -69,8 +70,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				8129E46E1B841A5C00309634 /* Parse.framework in Frameworks */,
+				8129E46F1B841AEE00309634 /* Parse.framework in Frameworks */,
 				81CC85DA1A49F3D70076DE19 /* Bolts.framework in Frameworks */,
-				81CC85DB1A49F3D70076DE19 /* ParseOSX.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -116,8 +118,8 @@
 		81CC85DC1A49F3DA0076DE19 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				8129E46D1B841A5C00309634 /* Parse.framework */,
 				81CC85D81A49F3D70076DE19 /* Bolts.framework */,
-				81CC85D91A49F3D70076DE19 /* ParseOSX.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -204,7 +206,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [[ ! -d \"Bolts.framework\" ]]; then\n  cp -R ../../../Vendor/Bolts-ObjC/build/osx/Bolts.framework .\nfi\n\nrm -rf ParseOSX.framework\ncp -R $BUILT_PRODUCTS_DIR/ParseOSX.framework .\n";
+			shellScript = "if [[ ! -d \"Bolts.framework\" ]]; then\n  cp -R ../../../Vendor/Bolts-ObjC/build/osx/Bolts.framework .\nfi\n\nrm -rf Parse.framework\ncp -R $BUILT_PRODUCTS_DIR/Parse.framework .\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -271,7 +273,6 @@
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_IDENTITY = "-";
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -313,7 +314,6 @@
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_IDENTITY = "-";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
diff --git a/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject-Swift.xcodeproj/xcshareddata/xcschemes/ParseOSXStarterProject-Swift.xcscheme b/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject-Swift.xcodeproj/xcshareddata/xcschemes/ParseOSXStarterProject-Swift.xcscheme
index f148574b7..56d6dcfd6 100644
--- a/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject-Swift.xcodeproj/xcshareddata/xcschemes/ParseOSXStarterProject-Swift.xcscheme
+++ b/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject-Swift.xcodeproj/xcshareddata/xcschemes/ParseOSXStarterProject-Swift.xcscheme
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0610"
+   LastUpgradeVersion = "0640"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"
-      buildImplicitDependencies = "YES">
+      buildImplicitDependencies = "NO">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "97010FAB1630B18F00AB761E"
-               BuildableName = "ParseOSX.framework"
+               BuildableName = "Parse.framework"
                BlueprintName = "Parse-OSX"
                ReferencedContainer = "container:../../../Parse.xcodeproj">
             </BuildableReference>
diff --git a/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject/AppDelegate.swift b/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject/AppDelegate.swift
index 431ad15d1..30cb053be 100644
--- a/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject/AppDelegate.swift
+++ b/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/ParseOSXStarterProject/AppDelegate.swift
@@ -10,7 +10,7 @@
 import Cocoa
 
 import Bolts
-import ParseOSX
+import Parse
 
 @NSApplicationMain
 class AppDelegate: NSObject, NSApplicationDelegate {
diff --git a/ParseStarterProject/OSX/ParseOSXStarterProject/ParseOSXStarterProject.xcodeproj/project.pbxproj b/ParseStarterProject/OSX/ParseOSXStarterProject/ParseOSXStarterProject.xcodeproj/project.pbxproj
index 668860b4e..400e7feed 100644
--- a/ParseStarterProject/OSX/ParseOSXStarterProject/ParseOSXStarterProject.xcodeproj/project.pbxproj
+++ b/ParseStarterProject/OSX/ParseOSXStarterProject/ParseOSXStarterProject.xcodeproj/project.pbxproj
@@ -26,6 +26,8 @@
 		814C3ADF1B6988E300E307BB /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 814C3ADA1B6988E300E307BB /* MainMenu.xib */; };
 		815E9D8C196C6B0800F648E4 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 817AD67D196B026F0014C796 /* Bolts.framework */; };
 		815E9D8D196C6B1A00F648E4 /* Bolts.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 817AD67D196B026F0014C796 /* Bolts.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+		8160DBDA1B8418BE0030ABD9 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8160DBD91B8418BE0030ABD9 /* Parse.framework */; };
+		8160DBDB1B84191F0030ABD9 /* Parse.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8160DBD91B8418BE0030ABD9 /* Parse.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		974268D81651F09E00F2BC57 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 974268D01651F09E00F2BC57 /* CFNetwork.framework */; };
 		974268D91651F09E00F2BC57 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 974268D11651F09E00F2BC57 /* CoreGraphics.framework */; };
 		974268DA1651F09E00F2BC57 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 974268D21651F09E00F2BC57 /* CoreLocation.framework */; };
@@ -37,8 +39,6 @@
 		978816C0163F1D6F00C613D2 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 978816BF163F1D6F00C613D2 /* Cocoa.framework */; };
 		978816CC163F1D6F00C613D2 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 978816CB163F1D6F00C613D2 /* main.m */; };
 		978816D3163F1D6F00C613D2 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 978816D2163F1D6F00C613D2 /* AppDelegate.m */; };
-		97DFCF92166FF5FB0094BE60 /* ParseOSX.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97DFCF91166FF5FB0094BE60 /* ParseOSX.framework */; };
-		97DFCF93166FF5FC0094BE60 /* ParseOSX.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 97DFCF91166FF5FB0094BE60 /* ParseOSX.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 		97F7357D165B6AF000C4B72A /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97F7357C165B6AF000C4B72A /* ApplicationServices.framework */; };
 /* End PBXBuildFile section */
 
@@ -59,8 +59,8 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				97DFCF93166FF5FC0094BE60 /* ParseOSX.framework in CopyFiles */,
 				815E9D8D196C6B1A00F648E4 /* Bolts.framework in CopyFiles */,
+				8160DBDB1B84191F0030ABD9 /* Parse.framework in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -71,6 +71,7 @@
 		814C3AD91B6988E300E307BB /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		814C3ADB1B6988E300E307BB /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainMenu.xib; sourceTree = "<group>"; };
 		814C3ADC1B6988E300E307BB /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		8160DBD91B8418BE0030ABD9 /* Parse.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Parse.framework; sourceTree = "<group>"; };
 		817AD67D196B026F0014C796 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Bolts.framework; sourceTree = "<group>"; };
 		974268D01651F09E00F2BC57 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
 		974268D11651F09E00F2BC57 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -88,7 +89,6 @@
 		978816CB163F1D6F00C613D2 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		978816D1163F1D6F00C613D2 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		978816D2163F1D6F00C613D2 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
-		97DFCF91166FF5FB0094BE60 /* ParseOSX.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ParseOSX.framework; sourceTree = "<group>"; };
 		97F7357C165B6AF000C4B72A /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
@@ -97,6 +97,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				8160DBDA1B8418BE0030ABD9 /* Parse.framework in Frameworks */,
 				97F7357D165B6AF000C4B72A /* ApplicationServices.framework in Frameworks */,
 				974268D81651F09E00F2BC57 /* CFNetwork.framework in Frameworks */,
 				974268D91651F09E00F2BC57 /* CoreGraphics.framework in Frameworks */,
@@ -108,7 +109,6 @@
 				974268DF1651F09E00F2BC57 /* SystemConfiguration.framework in Frameworks */,
 				978816C0163F1D6F00C613D2 /* Cocoa.framework in Frameworks */,
 				815E9D8C196C6B0800F648E4 /* Bolts.framework in Frameworks */,
-				97DFCF92166FF5FB0094BE60 /* ParseOSX.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -146,8 +146,8 @@
 		978816BE163F1D6F00C613D2 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				8160DBD91B8418BE0030ABD9 /* Parse.framework */,
 				817AD67D196B026F0014C796 /* Bolts.framework */,
-				97DFCF91166FF5FB0094BE60 /* ParseOSX.framework */,
 				978816BF163F1D6F00C613D2 /* Cocoa.framework */,
 				97F7357C165B6AF000C4B72A /* ApplicationServices.framework */,
 				974268D01651F09E00F2BC57 /* CFNetwork.framework */,
@@ -271,7 +271,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [[ ! -d \"Bolts.framework\" ]]; then\n  cp -R ../../../Vendor/Bolts-ObjC/build/osx/Bolts.framework .\nfi\n\nrm -rf ParseOSX.framework\ncp -R $BUILT_PRODUCTS_DIR/ParseOSX.framework .\n";
+			shellScript = "if [[ ! -d \"Bolts.framework\" ]]; then\n  cp -R ../../../Vendor/Bolts-ObjC/build/osx/Bolts.framework .\nfi\n\nrm -rf Parse.framework\ncp -R $BUILT_PRODUCTS_DIR/Parse.framework .\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
diff --git a/ParseStarterProject/OSX/ParseOSXStarterProject/ParseOSXStarterProject.xcodeproj/xcshareddata/xcschemes/ParseOSXStarterProject.xcscheme b/ParseStarterProject/OSX/ParseOSXStarterProject/ParseOSXStarterProject.xcodeproj/xcshareddata/xcschemes/ParseOSXStarterProject.xcscheme
index 7636cffda..3202f1959 100644
--- a/ParseStarterProject/OSX/ParseOSXStarterProject/ParseOSXStarterProject.xcodeproj/xcshareddata/xcschemes/ParseOSXStarterProject.xcscheme
+++ b/ParseStarterProject/OSX/ParseOSXStarterProject/ParseOSXStarterProject.xcodeproj/xcshareddata/xcschemes/ParseOSXStarterProject.xcscheme
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0600"
+   LastUpgradeVersion = "0640"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"
-      buildImplicitDependencies = "YES">
+      buildImplicitDependencies = "NO">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "97010FAB1630B18F00AB761E"
-               BuildableName = "ParseOSX.framework"
+               BuildableName = "Parse.framework"
                BlueprintName = "Parse-OSX"
                ReferencedContainer = "container:../../../Parse.xcodeproj">
             </BuildableReference>
diff --git a/ParseStarterProject/OSX/ParseOSXStarterProject/ParseOSXStarterProject/AppDelegate.m b/ParseStarterProject/OSX/ParseOSXStarterProject/ParseOSXStarterProject/AppDelegate.m
index 2e665c917..cacfdef85 100644
--- a/ParseStarterProject/OSX/ParseOSXStarterProject/ParseOSXStarterProject/AppDelegate.m
+++ b/ParseStarterProject/OSX/ParseOSXStarterProject/ParseOSXStarterProject/AppDelegate.m
@@ -7,10 +7,10 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import <ParseOSX/Parse.h>
-
 #import "AppDelegate.h"
 
+#import <Parse/Parse.h>
+
 @implementation AppDelegate
 
 #pragma mark -
diff --git a/ParseStarterProject/iOS/ParseStarterProject-Swift/ParseStarterProject-Swift.xcodeproj/xcshareddata/xcschemes/ParseStarterProject-Swift.xcscheme b/ParseStarterProject/iOS/ParseStarterProject-Swift/ParseStarterProject-Swift.xcodeproj/xcshareddata/xcschemes/ParseStarterProject-Swift.xcscheme
index 83aa47616..1ae0700da 100644
--- a/ParseStarterProject/iOS/ParseStarterProject-Swift/ParseStarterProject-Swift.xcodeproj/xcshareddata/xcschemes/ParseStarterProject-Swift.xcscheme
+++ b/ParseStarterProject/iOS/ParseStarterProject-Swift/ParseStarterProject-Swift.xcodeproj/xcshareddata/xcschemes/ParseStarterProject-Swift.xcscheme
@@ -4,8 +4,22 @@
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"
-      buildImplicitDependencies = "YES">
+      buildImplicitDependencies = "NO">
       <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "81C3821B19CCA89E0066284A"
+               BuildableName = "Parse.framework"
+               BlueprintName = "Parse-iOS"
+               ReferencedContainer = "container:../../../Parse.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"
diff --git a/ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject.xcodeproj/xcshareddata/xcschemes/ParseStarterProject.xcscheme b/ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject.xcodeproj/xcshareddata/xcschemes/ParseStarterProject.xcscheme
index 97728ce13..ab45df580 100644
--- a/ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject.xcodeproj/xcshareddata/xcschemes/ParseStarterProject.xcscheme
+++ b/ParseStarterProject/iOS/ParseStarterProject/ParseStarterProject.xcodeproj/xcshareddata/xcschemes/ParseStarterProject.xcscheme
@@ -4,8 +4,22 @@
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"
-      buildImplicitDependencies = "YES">
+      buildImplicitDependencies = "NO">
       <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "81C3821B19CCA89E0066284A"
+               BuildableName = "Parse.framework"
+               BlueprintName = "Parse-iOS"
+               ReferencedContainer = "container:../../../Parse.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
             buildForRunning = "YES"
diff --git a/Rakefile b/Rakefile
index 772eee25f..55e85fc63 100644
--- a/Rakefile
+++ b/Rakefile
@@ -83,7 +83,7 @@ namespace :build do
       t.directory = script_folder
       t.build_directory = build_folder
       t.framework_type = XCTask::FrameworkType::OSX
-      t.framework_name = 'ParseOSX.framework'
+      t.framework_name = 'Parse.framework'
 
       t.workspace = 'Parse.xcworkspace'
       t.scheme = 'Parse-OSX'
@@ -124,7 +124,7 @@ namespace :package do
     ## Build OS X Framework
     Rake::Task['build:osx'].invoke
     bolts_path = File.join(bolts_build_folder, 'osx', 'Bolts.framework')
-    osx_framework_path = File.join(build_folder, 'ParseOSX.framework')
+    osx_framework_path = File.join(build_folder, 'Parse.framework')
     make_package(release_folder,
                  [osx_framework_path, bolts_path],
                  package_osx_name)
diff --git a/Tests/Other/Swift/ParseUnitTests-OSX-Bridging-Header.h b/Tests/Other/Swift/ParseUnitTests-OSX-Bridging-Header.h
index 12b14787f..d35c96c03 100644
--- a/Tests/Other/Swift/ParseUnitTests-OSX-Bridging-Header.h
+++ b/Tests/Other/Swift/ParseUnitTests-OSX-Bridging-Header.h
@@ -7,5 +7,5 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import <ParseOSX/PFObject+Subclass.h>
-#import <ParseOSX/ParseOSX.h>
+#import <Parse/Parse.h>
+#import <Parse/PFObject+Subclass.h>
diff --git a/Tests/Other/Swift/ParseUnitTests-iOS-Bridging-Header.h b/Tests/Other/Swift/ParseUnitTests-iOS-Bridging-Header.h
index 96f46e5ce..d35c96c03 100644
--- a/Tests/Other/Swift/ParseUnitTests-iOS-Bridging-Header.h
+++ b/Tests/Other/Swift/ParseUnitTests-iOS-Bridging-Header.h
@@ -7,5 +7,5 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import <Parse/PFObject+Subclass.h>
 #import <Parse/Parse.h>
+#import <Parse/PFObject+Subclass.h>
diff --git a/Tests/Other/Swizzling/PFTestSwizzlingUtilities.h b/Tests/Other/Swizzling/PFTestSwizzlingUtilities.h
index 04da9848b..cc2328e38 100644
--- a/Tests/Other/Swizzling/PFTestSwizzlingUtilities.h
+++ b/Tests/Other/Swizzling/PFTestSwizzlingUtilities.h
@@ -9,11 +9,7 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
 #import <Parse/PFConstants.h>
-#else
-#import <ParseOSX/PFConstants.h>
-#endif
 
 #import "PFTestSwizzledMethod.h"