diff --git a/2Term.xcodeproj/kelvin.pbxuser b/TwoTerm.xcodeproj/kelvin.pbxuser
similarity index 100%
rename from 2Term.xcodeproj/kelvin.pbxuser
rename to TwoTerm.xcodeproj/kelvin.pbxuser
diff --git a/2Term.xcodeproj/kelvin.perspectivev3 b/TwoTerm.xcodeproj/kelvin.perspectivev3
similarity index 100%
rename from 2Term.xcodeproj/kelvin.perspectivev3
rename to TwoTerm.xcodeproj/kelvin.perspectivev3
diff --git a/2Term.xcodeproj/project.pbxproj b/TwoTerm.xcodeproj/project.pbxproj
similarity index 98%
rename from 2Term.xcodeproj/project.pbxproj
rename to TwoTerm.xcodeproj/project.pbxproj
index 5731478..ca97ec7 100644
--- a/2Term.xcodeproj/project.pbxproj
+++ b/TwoTerm.xcodeproj/project.pbxproj
@@ -366,9 +366,9 @@
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		8D1107260486CEB800E47090 /* 2Term */ = {
+		8D1107260486CEB800E47090 /* TwoTerm */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "2Term" */;
+			buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "TwoTerm" */;
 			buildPhases = (
 				8D1107290486CEB800E47090 /* Resources */,
 				8D11072C0486CEB800E47090 /* Sources */,
@@ -381,7 +381,7 @@
 			);
 			dependencies = (
 			);
-			name = 2Term;
+			name = TwoTerm;
 			productInstallPath = "$(HOME)/Applications";
 			productName = 2Term;
 			productReference = 8D1107320486CEB800E47090 /* TwoTerm.app */;
@@ -393,9 +393,9 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0910;
 			};
-			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "2Term" */;
+			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "TwoTerm" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 1;
@@ -407,7 +407,7 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				8D1107260486CEB800E47090 /* 2Term */,
+				8D1107260486CEB800E47090 /* TwoTerm */,
 			);
 		};
 /* End PBXProject section */
@@ -559,12 +559,18 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -592,12 +598,18 @@
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
 				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -620,7 +632,7 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "2Term" */ = {
+		C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "TwoTerm" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				C01FCF4B08A954540054247B /* Debug */,
@@ -629,7 +641,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "2Term" */ = {
+		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "TwoTerm" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				C01FCF4F08A954540054247B /* Debug */,
diff --git a/TwoTerm_Prefix.pch b/TwoTerm_Prefix.pch
new file mode 100644
index 0000000..40ddc0f
--- /dev/null
+++ b/TwoTerm_Prefix.pch
@@ -0,0 +1,7 @@
+//
+// Prefix header for all source files of the '2Term' target in the '2Term' project
+//
+
+#ifdef __OBJC__
+    #import <Cocoa/Cocoa.h>
+#endif