renamed DNSwift.System to just SystemHEADmaster

6 files changed, 93 insertions, 163 deletions

diff --git a/DNSwift.System/DNSwift.System.xcodeproj/project.pbxproj b/System/System.xcodeproj/project.pbxproj
index a5f31c5..cb9ffd4 100644
--- a/DNSwift.System/DNSwift.System.xcodeproj/project.pbxproj
+++ b/System/System.xcodeproj/project.pbxproj
@@ -7,130 +7,93 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		C90502C51987465E00F91F1A /* DNSwift.System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C90502B91987465E00F91F1A /* DNSwift.System.framework */; };
-		C90502CC1987465E00F91F1A /* DNSwift_SystemTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C90502CB1987465E00F91F1A /* DNSwift_SystemTests.swift */; };
-		C90502DF198746A000F91F1A /* Console.swift in Sources */ = {isa = PBXBuildFile; fileRef = C90502DE198746A000F91F1A /* Console.swift */; };
+		C90778BC1998555100AB7EF2 /* SystemTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C90778BB1998555100AB7EF2 /* SystemTests.swift */; };
+		C90778C61998556300AB7EF2 /* Console.swift in Sources */ = {isa = PBXBuildFile; fileRef = C90778C51998556300AB7EF2 /* Console.swift */; };
 /* End PBXBuildFile section */
 
-/* Begin PBXContainerItemProxy section */
-		C90502C61987465E00F91F1A /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = C90502B01987465E00F91F1A /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = C90502B81987465E00F91F1A;
-			remoteInfo = DNSwift.System;
-		};
-		C90502DA1987468F00F91F1A /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = C90502D51987468F00F91F1A /* DNSwift.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = C98EBA481986F0EF00DCC6C9;
-			remoteInfo = DNSwift;
-		};
-		C90502DC1987468F00F91F1A /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = C90502D51987468F00F91F1A /* DNSwift.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = C98EBA531986F0EF00DCC6C9;
-			remoteInfo = DNSwiftTests;
-		};
-/* End PBXContainerItemProxy section */
-
 /* Begin PBXFileReference section */
-		C90502B91987465E00F91F1A /* DNSwift.System.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = DNSwift.System.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		C90502BD1987465E00F91F1A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		C90502C41987465E00F91F1A /* DNSwift.SystemTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DNSwift.SystemTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		C90502CA1987465E00F91F1A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		C90502CB1987465E00F91F1A /* DNSwift_SystemTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DNSwift_SystemTests.swift; sourceTree = "<group>"; };
-		C90502D51987468F00F91F1A /* DNSwift.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = DNSwift.xcodeproj; path = ../DNSwift/DNSwift.xcodeproj; sourceTree = "<group>"; };
-		C90502DE198746A000F91F1A /* Console.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Console.swift; sourceTree = "<group>"; };
+		C90778AC1998555100AB7EF2 /* System.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = System.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		C90778B01998555100AB7EF2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		C90778B71998555100AB7EF2 /* SystemTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SystemTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		C90778BA1998555100AB7EF2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		C90778BB1998555100AB7EF2 /* SystemTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SystemTests.swift; sourceTree = "<group>"; };
+		C90778C51998556300AB7EF2 /* Console.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Console.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
-		C90502B51987465E00F91F1A /* Frameworks */ = {
+		C90778A81998555100AB7EF2 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		C90502C11987465E00F91F1A /* Frameworks */ = {
+		C90778B41998555100AB7EF2 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C90502C51987465E00F91F1A /* DNSwift.System.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		C90502AF1987465E00F91F1A = {
+		C90778A21998555100AB7EF2 = {
 			isa = PBXGroup;
 			children = (
-				C90502D51987468F00F91F1A /* DNSwift.xcodeproj */,
-				C90502BB1987465E00F91F1A /* DNSwift.System */,
-				C90502C81987465E00F91F1A /* DNSwift.SystemTests */,
-				C90502BA1987465E00F91F1A /* Products */,
+				C90778AE1998555100AB7EF2 /* System */,
+				C90778B81998555100AB7EF2 /* SystemTests */,
+				C90778AD1998555100AB7EF2 /* Products */,
 			);
 			sourceTree = "<group>";
 		};
-		C90502BA1987465E00F91F1A /* Products */ = {
+		C90778AD1998555100AB7EF2 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				C90502B91987465E00F91F1A /* DNSwift.System.framework */,
-				C90502C41987465E00F91F1A /* DNSwift.SystemTests.xctest */,
+				C90778AC1998555100AB7EF2 /* System.framework */,
+				C90778B71998555100AB7EF2 /* SystemTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
-		C90502BB1987465E00F91F1A /* DNSwift.System */ = {
+		C90778AE1998555100AB7EF2 /* System */ = {
 			isa = PBXGroup;
 			children = (
-				C90502BC1987465E00F91F1A /* Supporting Files */,
-				C90502DE198746A000F91F1A /* Console.swift */,
+				C90778C51998556300AB7EF2 /* Console.swift */,
+				C90778AF1998555100AB7EF2 /* Supporting Files */,
 			);
-			path = DNSwift.System;
+			path = System;
 			sourceTree = "<group>";
 		};
-		C90502BC1987465E00F91F1A /* Supporting Files */ = {
+		C90778AF1998555100AB7EF2 /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
-				C90502BD1987465E00F91F1A /* Info.plist */,
+				C90778B01998555100AB7EF2 /* Info.plist */,
 			);
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
-		C90502C81987465E00F91F1A /* DNSwift.SystemTests */ = {
+		C90778B81998555100AB7EF2 /* SystemTests */ = {
 			isa = PBXGroup;
 			children = (
-				C90502CB1987465E00F91F1A /* DNSwift_SystemTests.swift */,
-				C90502C91987465E00F91F1A /* Supporting Files */,
+				C90778BB1998555100AB7EF2 /* SystemTests.swift */,
+				C90778B91998555100AB7EF2 /* Supporting Files */,
 			);
-			path = DNSwift.SystemTests;
+			path = SystemTests;
 			sourceTree = "<group>";
 		};
-		C90502C91987465E00F91F1A /* Supporting Files */ = {
+		C90778B91998555100AB7EF2 /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
-				C90502CA1987465E00F91F1A /* Info.plist */,
+				C90778BA1998555100AB7EF2 /* Info.plist */,
 			);
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
-		C90502D61987468F00F91F1A /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				C90502DB1987468F00F91F1A /* DNSwift.framework */,
-				C90502DD1987468F00F91F1A /* DNSwiftTests.xctest */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
-		C90502B61987465E00F91F1A /* Headers */ = {
+		C90778A91998555100AB7EF2 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -140,110 +103,85 @@
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
-		C90502B81987465E00F91F1A /* DNSwift.System */ = {
+		C90778AB1998555100AB7EF2 /* System */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = C90502CF1987465E00F91F1A /* Build configuration list for PBXNativeTarget "DNSwift.System" */;
+			buildConfigurationList = C90778BF1998555100AB7EF2 /* Build configuration list for PBXNativeTarget "System" */;
 			buildPhases = (
-				C90502B41987465E00F91F1A /* Sources */,
-				C90502B51987465E00F91F1A /* Frameworks */,
-				C90502B61987465E00F91F1A /* Headers */,
-				C90502B71987465E00F91F1A /* Resources */,
+				C90778A71998555100AB7EF2 /* Sources */,
+				C90778A81998555100AB7EF2 /* Frameworks */,
+				C90778A91998555100AB7EF2 /* Headers */,
+				C90778AA1998555100AB7EF2 /* Resources */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 			);
-			name = DNSwift.System;
-			productName = DNSwift.System;
-			productReference = C90502B91987465E00F91F1A /* DNSwift.System.framework */;
+			name = System;
+			productName = System;
+			productReference = C90778AC1998555100AB7EF2 /* System.framework */;
 			productType = "com.apple.product-type.framework";
 		};
-		C90502C31987465E00F91F1A /* DNSwift.SystemTests */ = {
+		C90778B61998555100AB7EF2 /* SystemTests */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = C90502D21987465E00F91F1A /* Build configuration list for PBXNativeTarget "DNSwift.SystemTests" */;
+			buildConfigurationList = C90778C21998555100AB7EF2 /* Build configuration list for PBXNativeTarget "SystemTests" */;
 			buildPhases = (
-				C90502C01987465E00F91F1A /* Sources */,
-				C90502C11987465E00F91F1A /* Frameworks */,
-				C90502C21987465E00F91F1A /* Resources */,
+				C90778B31998555100AB7EF2 /* Sources */,
+				C90778B41998555100AB7EF2 /* Frameworks */,
+				C90778B51998555100AB7EF2 /* Resources */,
 			);
 			buildRules = (
 			);
 			dependencies = (
-				C90502C71987465E00F91F1A /* PBXTargetDependency */,
 			);
-			name = DNSwift.SystemTests;
-			productName = DNSwift.SystemTests;
-			productReference = C90502C41987465E00F91F1A /* DNSwift.SystemTests.xctest */;
+			name = SystemTests;
+			productName = SystemTests;
+			productReference = C90778B71998555100AB7EF2 /* SystemTests.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
-		C90502B01987465E00F91F1A /* Project object */ = {
+		C90778A31998555100AB7EF2 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 0600;
 				ORGANIZATIONNAME = "Matthew S";
 				TargetAttributes = {
-					C90502B81987465E00F91F1A = {
+					C90778AB1998555100AB7EF2 = {
 						CreatedOnToolsVersion = 6.0;
 					};
-					C90502C31987465E00F91F1A = {
+					C90778B61998555100AB7EF2 = {
 						CreatedOnToolsVersion = 6.0;
-						TestTargetID = C90502B81987465E00F91F1A;
 					};
 				};
 			};
-			buildConfigurationList = C90502B31987465E00F91F1A /* Build configuration list for PBXProject "DNSwift.System" */;
+			buildConfigurationList = C90778A61998555100AB7EF2 /* Build configuration list for PBXProject "System" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
 			);
-			mainGroup = C90502AF1987465E00F91F1A;
-			productRefGroup = C90502BA1987465E00F91F1A /* Products */;
+			mainGroup = C90778A21998555100AB7EF2;
+			productRefGroup = C90778AD1998555100AB7EF2 /* Products */;
 			projectDirPath = "";
-			projectReferences = (
-				{
-					ProductGroup = C90502D61987468F00F91F1A /* Products */;
-					ProjectRef = C90502D51987468F00F91F1A /* DNSwift.xcodeproj */;
-				},
-			);
 			projectRoot = "";
 			targets = (
-				C90502B81987465E00F91F1A /* DNSwift.System */,
-				C90502C31987465E00F91F1A /* DNSwift.SystemTests */,
+				C90778AB1998555100AB7EF2 /* System */,
+				C90778B61998555100AB7EF2 /* SystemTests */,
 			);
 		};
 /* End PBXProject section */
 
-/* Begin PBXReferenceProxy section */
-		C90502DB1987468F00F91F1A /* DNSwift.framework */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.framework;
-			path = DNSwift.framework;
-			remoteRef = C90502DA1987468F00F91F1A /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		C90502DD1987468F00F91F1A /* DNSwiftTests.xctest */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = DNSwiftTests.xctest;
-			remoteRef = C90502DC1987468F00F91F1A /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-/* End PBXReferenceProxy section */
-
 /* Begin PBXResourcesBuildPhase section */
-		C90502B71987465E00F91F1A /* Resources */ = {
+		C90778AA1998555100AB7EF2 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		C90502C21987465E00F91F1A /* Resources */ = {
+		C90778B51998555100AB7EF2 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -253,34 +191,26 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
-		C90502B41987465E00F91F1A /* Sources */ = {
+		C90778A71998555100AB7EF2 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C90502DF198746A000F91F1A /* Console.swift in Sources */,
+				C90778C61998556300AB7EF2 /* Console.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		C90502C01987465E00F91F1A /* Sources */ = {
+		C90778B31998555100AB7EF2 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C90502CC1987465E00F91F1A /* DNSwift_SystemTests.swift in Sources */,
+				C90778BC1998555100AB7EF2 /* SystemTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 
-/* Begin PBXTargetDependency section */
-		C90502C71987465E00F91F1A /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = C90502B81987465E00F91F1A /* DNSwift.System */;
-			targetProxy = C90502C61987465E00F91F1A /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
 /* Begin XCBuildConfiguration section */
-		C90502CD1987465E00F91F1A /* Debug */ = {
+		C90778BD1998555100AB7EF2 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
@@ -326,7 +256,7 @@
 			};
 			name = Debug;
 		};
-		C90502CE1987465E00F91F1A /* Release */ = {
+		C90778BE1998555100AB7EF2 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
@@ -365,7 +295,7 @@
 			};
 			name = Release;
 		};
-		C90502D01987465E00F91F1A /* Debug */ = {
+		C90778C01998555100AB7EF2 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
@@ -373,7 +303,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				INFOPLIST_FILE = DNSwift.System/Info.plist;
+				INFOPLIST_FILE = System/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -382,7 +312,7 @@
 			};
 			name = Debug;
 		};
-		C90502D11987465E00F91F1A /* Release */ = {
+		C90778C11998555100AB7EF2 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
@@ -390,7 +320,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				INFOPLIST_FILE = DNSwift.System/Info.plist;
+				INFOPLIST_FILE = System/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -398,7 +328,7 @@
 			};
 			name = Release;
 		};
-		C90502D31987465E00F91F1A /* Debug */ = {
+		C90778C31998555100AB7EF2 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				FRAMEWORK_SEARCH_PATHS = (
@@ -409,20 +339,20 @@
 					"DEBUG=1",
 					"$(inherited)",
 				);
-				INFOPLIST_FILE = DNSwift.SystemTests/Info.plist;
+				INFOPLIST_FILE = SystemTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
 		};
-		C90502D41987465E00F91F1A /* Release */ = {
+		C90778C41998555100AB7EF2 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
 				);
-				INFOPLIST_FILE = DNSwift.SystemTests/Info.plist;
+				INFOPLIST_FILE = SystemTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -431,32 +361,32 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		C90502B31987465E00F91F1A /* Build configuration list for PBXProject "DNSwift.System" */ = {
+		C90778A61998555100AB7EF2 /* Build configuration list for PBXProject "System" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				C90502CD1987465E00F91F1A /* Debug */,
-				C90502CE1987465E00F91F1A /* Release */,
+				C90778BD1998555100AB7EF2 /* Debug */,
+				C90778BE1998555100AB7EF2 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		C90502CF1987465E00F91F1A /* Build configuration list for PBXNativeTarget "DNSwift.System" */ = {
+		C90778BF1998555100AB7EF2 /* Build configuration list for PBXNativeTarget "System" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				C90502D01987465E00F91F1A /* Debug */,
-				C90502D11987465E00F91F1A /* Release */,
+				C90778C01998555100AB7EF2 /* Debug */,
+				C90778C11998555100AB7EF2 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 		};
-		C90502D21987465E00F91F1A /* Build configuration list for PBXNativeTarget "DNSwift.SystemTests" */ = {
+		C90778C21998555100AB7EF2 /* Build configuration list for PBXNativeTarget "SystemTests" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				C90502D31987465E00F91F1A /* Debug */,
-				C90502D41987465E00F91F1A /* Release */,
+				C90778C31998555100AB7EF2 /* Debug */,
+				C90778C41998555100AB7EF2 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 		};
 /* End XCConfigurationList section */
 	};
-	rootObject = C90502B01987465E00F91F1A /* Project object */;
+	rootObject = C90778A31998555100AB7EF2 /* Project object */;
 }
diff --git a/DNSwift.System/DNSwift.System.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/System/System.xcodeproj/project.xcworkspace/contents.xcworkspacedata
index f841620..40a38a4 100644
--- a/DNSwift.System/DNSwift.System.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ b/System/System.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -2,6 +2,6 @@
 <Workspace
    version = "1.0">
    <FileRef
-      location = "self:DNSwift.System.xcodeproj">
+      location = "self:System.xcodeproj">
    </FileRef>
 </Workspace>
diff --git a/DNSwift.System/DNSwift.System/Console.swift b/System/System/Console.swift
index a261595..a261595 100644
--- a/DNSwift.System/DNSwift.System/Console.swift
+++ b/System/System/Console.swift
diff --git a/DNSwift.System/DNSwift.System/Info.plist b/System/System/Info.plist
index 09c6970..6f8ed09 100644
--- a/DNSwift.System/DNSwift.System/Info.plist
+++ b/System/System/Info.plist
@@ -5,13 +5,13 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
+	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>SwiftSharp.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>SharpSwift.$(PRODUCT_NAME:rfc1034identifier)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>${PRODUCT_NAME}</string>
+	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>${CURRENT_PROJECT_VERSION}</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>
diff --git a/DNSwift.System/DNSwift.SystemTests/Info.plist b/System/SystemTests/Info.plist
index 6d1bb1f..915980a 100644
--- a/DNSwift.System/DNSwift.SystemTests/Info.plist
+++ b/System/SystemTests/Info.plist
@@ -5,13 +5,13 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
+	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>SwiftSharp.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>SharpSwift.$(PRODUCT_NAME:rfc1034identifier)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>${PRODUCT_NAME}</string>
+	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
diff --git a/DNSwift.System/DNSwift.SystemTests/DNSwift_SystemTests.swift b/System/SystemTests/SystemTests.swift
index e4256da..9122031 100644
--- a/DNSwift.System/DNSwift.SystemTests/DNSwift_SystemTests.swift
+++ b/System/SystemTests/SystemTests.swift
@@ -1,15 +1,15 @@
 //
-//  DNSwift_SystemTests.swift
-//  DNSwift.SystemTests
+//  SystemTests.swift
+//  SystemTests
 //
-//  Created by Matthew S on 7/28/14.
+//  Created by Matthew S on 8/10/14.
 //  Copyright (c) 2014 Matthew S. All rights reserved.
 //
 
 import UIKit
 import XCTest
 
-class DNSwift_SystemTests: XCTestCase {
+class SystemTests: XCTestCase {
     
     override func setUp() {
         super.setUp()