diff --git a/build/osx/wxcocoa_in.xcodeproj/xcshareddata/xcschemes/dynamic.xcscheme b/build/osx/wxcocoa_in.xcodeproj/xcshareddata/xcschemes/dynamic.xcscheme
index aaf9a7924e..50aba4b66d 100644
--- a/build/osx/wxcocoa_in.xcodeproj/xcshareddata/xcschemes/dynamic.xcscheme
+++ b/build/osx/wxcocoa_in.xcodeproj/xcshareddata/xcschemes/dynamic.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0460"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,63 +14,40 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "D2AAC0C605546C1D00DB518D"
+               BlueprintIdentifier = "363401F972C53D8EBD3D4BD9"
                BuildableName = "libwx_osx_cocoa.dylib"
                BlueprintName = "dynamic"
-               ReferencedContainer = "container:wxcocoa_in.xcodeproj">
+               ReferencedContainer = "container:wxcocoa.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
-      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "D2AAC0C605546C1D00DB518D"
-            BuildableName = "libwx_osx_cocoa.dylib"
-            BlueprintName = "dynamic"
-            ReferencedContainer = "container:wxcocoa_in.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
-      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "D2AAC0C605546C1D00DB518D"
-            BuildableName = "libwx_osx_cocoa.dylib"
-            BlueprintName = "dynamic"
-            ReferencedContainer = "container:wxcocoa_in.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">
diff --git a/build/osx/wxcocoa_in.xcodeproj/xcshareddata/xcschemes/static.xcscheme b/build/osx/wxcocoa_in.xcodeproj/xcshareddata/xcschemes/static.xcscheme
index f6ad36a151..3643e0f07c 100644
--- a/build/osx/wxcocoa_in.xcodeproj/xcshareddata/xcschemes/static.xcscheme
+++ b/build/osx/wxcocoa_in.xcodeproj/xcshareddata/xcschemes/static.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "0460"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,63 +14,40 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "404BEE6010EC83280080E2B8"
+               BlueprintIdentifier = "BAB02EC06578349A9171CCAC"
                BuildableName = "libwx_osx_cocoa_static.a"
                BlueprintName = "static"
-               ReferencedContainer = "container:wxcocoa_in.xcodeproj">
+               ReferencedContainer = "container:wxcocoa.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
-      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "404BEE6010EC83280080E2B8"
-            BuildableName = "libwx_osx_cocoa_static.a"
-            BlueprintName = "static"
-            ReferencedContainer = "container:wxcocoa_in.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
-      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "404BEE6010EC83280080E2B8"
-            BuildableName = "libwx_osx_cocoa_static.a"
-            BlueprintName = "static"
-            ReferencedContainer = "container:wxcocoa_in.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">
diff --git a/build/osx/wxiphone_in.xcodeproj/xcshareddata/xcschemes/static.xcscheme b/build/osx/wxiphone_in.xcodeproj/xcshareddata/xcschemes/static.xcscheme
index 38fe36ff8a..72f89ce627 100644
--- a/build/osx/wxiphone_in.xcodeproj/xcshareddata/xcschemes/static.xcscheme
+++ b/build/osx/wxiphone_in.xcodeproj/xcshareddata/xcschemes/static.xcscheme
@@ -14,10 +14,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "D2AAC07D0554694100DB518D"
+               BlueprintIdentifier = "BAB02EC06578349A9171CCAC"
                BuildableName = "libwx_osx_iphone.a"
                BlueprintName = "static"
-               ReferencedContainer = "container:wxiphone_in.xcodeproj">
+               ReferencedContainer = "container:wxiPhone.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -37,7 +36,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
@@ -47,10 +45,10 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "D2AAC07D0554694100DB518D"
+            BlueprintIdentifier = "BAB02EC06578349A9171CCAC"
             BuildableName = "libwx_osx_iphone.a"
             BlueprintName = "static"
-            ReferencedContainer = "container:wxiphone_in.xcodeproj">
+            ReferencedContainer = "container:wxiPhone.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
@@ -65,10 +63,10 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "D2AAC07D0554694100DB518D"
+            BlueprintIdentifier = "BAB02EC06578349A9171CCAC"
             BuildableName = "libwx_osx_iphone.a"
             BlueprintName = "static"
-            ReferencedContainer = "container:wxiphone_in.xcodeproj">
+            ReferencedContainer = "container:wxiPhone.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>