diff --git a/swift/lib/ProtocGenSwift/ProtocGenSwift(OSX)/Info.plist b/swift/lib/ProtocGenSwift/ProtocGenSwift(OSX)/Info.plist
index 19b28fe..55ab2ea 100644
--- a/swift/lib/ProtocGenSwift/ProtocGenSwift(OSX)/Info.plist
+++ b/swift/lib/ProtocGenSwift/ProtocGenSwift(OSX)/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.tonicdesign.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/swift/lib/ProtocGenSwift/ProtocGenSwift(OSX)Tests/Info.plist b/swift/lib/ProtocGenSwift/ProtocGenSwift(OSX)Tests/Info.plist
index cec9945..ba72822 100644
--- a/swift/lib/ProtocGenSwift/ProtocGenSwift(OSX)Tests/Info.plist
+++ b/swift/lib/ProtocGenSwift/ProtocGenSwift(OSX)Tests/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.tonicdesign.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/swift/lib/ProtocGenSwift/ProtocGenSwift.xcodeproj/project.pbxproj b/swift/lib/ProtocGenSwift/ProtocGenSwift.xcodeproj/project.pbxproj
index 447ab41..b21d10c 100644
--- a/swift/lib/ProtocGenSwift/ProtocGenSwift.xcodeproj/project.pbxproj
+++ b/swift/lib/ProtocGenSwift/ProtocGenSwift.xcodeproj/project.pbxproj
@@ -422,7 +422,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0710;
-				LastUpgradeCheck = 0620;
+				LastUpgradeCheck = 0730;
 				ORGANIZATIONNAME = TonicDesign;
 				TargetAttributes = {
 					BC17DD871B04E609003F3DD4 = {
@@ -619,6 +619,7 @@
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -694,6 +695,7 @@
 				INFOPLIST_FILE = ProtocGenSwift/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.tonicdesign.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -711,6 +713,7 @@
 				INFOPLIST_FILE = ProtocGenSwift/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.tonicdesign.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 			};
@@ -729,6 +732,7 @@
 				);
 				INFOPLIST_FILE = ProtocGenSwiftTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.tonicdesign.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -742,6 +746,7 @@
 				);
 				INFOPLIST_FILE = ProtocGenSwiftTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.tonicdesign.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@@ -765,6 +770,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.tonicdesign.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = ProtocGenSwift;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
@@ -786,6 +792,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.tonicdesign.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = ProtocGenSwift;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
@@ -809,6 +816,7 @@
 				INFOPLIST_FILE = "ProtocGenSwift(OSX)Tests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.tonicdesign.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = ProtocGenSwiftTests;
 				SDKROOT = macosx;
 			};
@@ -827,6 +835,7 @@
 				INFOPLIST_FILE = "ProtocGenSwift(OSX)Tests/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.tonicdesign.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = ProtocGenSwiftTests;
 				SDKROOT = macosx;
 			};
diff --git a/swift/lib/ProtocGenSwift/ProtocGenSwift.xcodeproj/xcshareddata/xcschemes/ProtocGenSwift(OSX).xcscheme b/swift/lib/ProtocGenSwift/ProtocGenSwift.xcodeproj/xcshareddata/xcschemes/ProtocGenSwift(OSX).xcscheme
index 8f3000f..a03d8b6 100644
--- a/swift/lib/ProtocGenSwift/ProtocGenSwift.xcodeproj/xcshareddata/xcschemes/ProtocGenSwift(OSX).xcscheme
+++ b/swift/lib/ProtocGenSwift/ProtocGenSwift.xcodeproj/xcshareddata/xcschemes/ProtocGenSwift(OSX).xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0630"
+   LastUpgradeVersion = "0730"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -37,10 +37,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -62,15 +62,18 @@
             ReferencedContainer = "container:ProtocGenSwift.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </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"
       allowLocationSimulation = "YES">
       <MacroExpansion>
          <BuildableReference
@@ -85,10 +88,10 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <MacroExpansion>
          <BuildableReference
diff --git a/swift/lib/ProtocGenSwift/ProtocGenSwift.xcodeproj/xcshareddata/xcschemes/ProtocGenSwift.xcscheme b/swift/lib/ProtocGenSwift/ProtocGenSwift.xcodeproj/xcshareddata/xcschemes/ProtocGenSwift.xcscheme
index f37651c..97eabec 100644
--- a/swift/lib/ProtocGenSwift/ProtocGenSwift.xcodeproj/xcshareddata/xcschemes/ProtocGenSwift.xcscheme
+++ b/swift/lib/ProtocGenSwift/ProtocGenSwift.xcodeproj/xcshareddata/xcschemes/ProtocGenSwift.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0620"
+   LastUpgradeVersion = "0730"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -37,10 +37,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -62,15 +62,18 @@
             ReferencedContainer = "container:ProtocGenSwift.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </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"
       allowLocationSimulation = "YES">
       <MacroExpansion>
          <BuildableReference
@@ -85,10 +88,10 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <MacroExpansion>
          <BuildableReference
diff --git a/swift/lib/ProtocGenSwift/ProtocGenSwift.xcodeproj/xcshareddata/xcschemes/protoc-gen-swift.xcscheme b/swift/lib/ProtocGenSwift/ProtocGenSwift.xcodeproj/xcshareddata/xcschemes/protoc-gen-swift.xcscheme
index b0fc566..728ac29 100644
--- a/swift/lib/ProtocGenSwift/ProtocGenSwift.xcodeproj/xcshareddata/xcschemes/protoc-gen-swift.xcscheme
+++ b/swift/lib/ProtocGenSwift/ProtocGenSwift.xcodeproj/xcshareddata/xcschemes/protoc-gen-swift.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0710"
+   LastUpgradeVersion = "0730"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/swift/lib/ProtocGenSwift/ProtocGenSwift/Info.plist b/swift/lib/ProtocGenSwift/ProtocGenSwift/Info.plist
index da2cf04..d3de8ee 100644
--- a/swift/lib/ProtocGenSwift/ProtocGenSwift/Info.plist
+++ b/swift/lib/ProtocGenSwift/ProtocGenSwift/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.tonicdesign.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/swift/lib/ProtocGenSwift/ProtocGenSwiftTests/Info.plist b/swift/lib/ProtocGenSwift/ProtocGenSwiftTests/Info.plist
index cec9945..ba72822 100644
--- a/swift/lib/ProtocGenSwift/ProtocGenSwiftTests/Info.plist
+++ b/swift/lib/ProtocGenSwift/ProtocGenSwiftTests/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.tonicdesign.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>