diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj
index 8e96346a8..98ead857b 100644
--- a/NetNewsWire.xcodeproj/project.pbxproj
+++ b/NetNewsWire.xcodeproj/project.pbxproj
@@ -845,7 +845,7 @@
 		849A97971ED9EFAA007D329B /* Node-Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Node-Extensions.swift"; sourceTree = "<group>"; };
 		849A979E1ED9F130007D329B /* SidebarCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SidebarCell.swift; sourceTree = "<group>"; };
 		849A97A11ED9F180007D329B /* FolderTreeControllerDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FolderTreeControllerDelegate.swift; sourceTree = "<group>"; };
-		849C64601ED37A5D003D8FC0 /* NetNewsWire.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = NetNewsWire.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		849C64601ED37A5D003D8FC0 /* NetNewsWire.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; name = NetNewsWire.app; path = .app; sourceTree = BUILT_PRODUCTS_DIR; };
 		849C64671ED37A5D003D8FC0 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		849C64711ED37A5D003D8FC0 /* NetNewsWireTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NetNewsWireTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		849EE70E203919360082A1EA /* AppAssets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppAssets.swift; sourceTree = "<group>"; };
@@ -2785,6 +2785,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = D519E74722EE553300923F27 /* NetNewsWire_safariextension_target.xcconfig */;
 			buildSettings = {
+				PRODUCT_NAME = "Subscribe to Feed";
 			};
 			name = Debug;
 		};
@@ -2792,6 +2793,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = D519E74722EE553300923F27 /* NetNewsWire_safariextension_target.xcconfig */;
 			buildSettings = {
+				PRODUCT_NAME = "Subscribe to Feed";
 			};
 			name = Release;
 		};
diff --git a/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire.xcscheme b/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire.xcscheme
index 230b6714a..07e988391 100644
--- a/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire.xcscheme
+++ b/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire.xcscheme
@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "849C645F1ED37A5D003D8FC0"
-               BuildableName = "NetNewsWire.app"
+               BuildableName = ".app"
                BlueprintName = "NetNewsWire"
                ReferencedContainer = "container:NetNewsWire.xcodeproj">
             </BuildableReference>
@@ -31,7 +31,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "849C645F1ED37A5D003D8FC0"
-            BuildableName = "NetNewsWire.app"
+            BuildableName = ".app"
             BlueprintName = "NetNewsWire"
             ReferencedContainer = "container:NetNewsWire.xcodeproj">
          </BuildableReference>
@@ -69,7 +69,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "849C645F1ED37A5D003D8FC0"
-            BuildableName = "NetNewsWire.app"
+            BuildableName = ".app"
             BlueprintName = "NetNewsWire"
             ReferencedContainer = "container:NetNewsWire.xcodeproj">
          </BuildableReference>
@@ -86,7 +86,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "849C645F1ED37A5D003D8FC0"
-            BuildableName = "NetNewsWire.app"
+            BuildableName = ".app"
             BlueprintName = "NetNewsWire"
             ReferencedContainer = "container:NetNewsWire.xcodeproj">
          </BuildableReference>
diff --git a/buildscripts/VerifyNoBuildSettings.swift b/buildscripts/VerifyNoBuildSettings.swift
index 885e660ef..82e839b46 100755
--- a/buildscripts/VerifyNoBuildSettings.swift
+++ b/buildscripts/VerifyNoBuildSettings.swift
@@ -41,6 +41,8 @@ public func processXcodeprojAt(url: URL) -> ProcessXcodeprojResult {
                 inBuildSettingsBlock = false
             } else if let _ = nthLine.range(of:"CODE_SIGN_IDENTITY") {
 
+            } else if let _ = nthLine.range(of:"PRODUCT_NAME") {
+
             } else {
                 badLines.append(nthLine)
             }
diff --git a/xcconfig/NetNewsWire_macapp_target.xcconfig b/xcconfig/NetNewsWire_macapp_target.xcconfig
index fd4d8f1bb..71f46022a 100644
--- a/xcconfig/NetNewsWire_macapp_target.xcconfig
+++ b/xcconfig/NetNewsWire_macapp_target.xcconfig
@@ -1,5 +1,6 @@
-CODE_SIGN_IDENTITY = Developer ID Application
-DEVELOPMENT_TEAM = M8L2WTLA8W 
+CODE_SIGN_IDENTITY[Config=Release] = Developer ID Application
+CODE_SIGN_IDENTITY[Config=Debug] = -
+DEVELOPMENT_TEAM[Config=Release] = M8L2WTLA8W 
 CODE_SIGN_STYLE = Manual
 PROVISIONING_PROFILE_SPECIFIER =
 
diff --git a/xcconfig/NetNewsWire_project_release.xcconfig b/xcconfig/NetNewsWire_project_release.xcconfig
index e891e925d..f4d9e6289 100644
--- a/xcconfig/NetNewsWire_project_release.xcconfig
+++ b/xcconfig/NetNewsWire_project_release.xcconfig
@@ -7,4 +7,4 @@ ENABLE_NS_ASSERTIONS = NO
 MTL_ENABLE_DEBUG_INFO = NO
 OTHER_SWIFT_FLAGS = -DRELEASE
 SWIFT_OPTIMIZATION_LEVEL = -Owholemodule
-// VALIDATE_PRODUCT = YES
+VALIDATE_PRODUCT = YES
diff --git a/xcconfig/NetNewsWire_safariextension_target.xcconfig b/xcconfig/NetNewsWire_safariextension_target.xcconfig
index 1af7c77e0..3313d39bb 100644
--- a/xcconfig/NetNewsWire_safariextension_target.xcconfig
+++ b/xcconfig/NetNewsWire_safariextension_target.xcconfig
@@ -1,5 +1,6 @@
-CODE_SIGN_IDENTITY = Developer ID Application
-DEVELOPMENT_TEAM = M8L2WTLA8W 
+CODE_SIGN_IDENTITY[Config=Release] = Developer ID Application
+CODE_SIGN_IDENTITY[Config=Debug] = -
+DEVELOPMENT_TEAM[Config=Release] = M8L2WTLA8W 
 CODE_SIGN_STYLE = Manual
 PROVISIONING_PROFILE_SPECIFIER =
 
@@ -40,4 +41,7 @@ LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @executabl
 MACOSX_DEPLOYMENT_TARGET = 10.14.4
 PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.NetNewsWire-Evergreen.Subscribe-to-Feed
 PRODUCT_NAME = $(TARGET_NAME)
+
 SDKROOT = macosx
+
+