diff --git a/pEpiOSAdapter.xcodeproj/project.pbxproj b/pEpObjCAdapter.xcodeproj/project.pbxproj
similarity index 97%
rename from pEpiOSAdapter.xcodeproj/project.pbxproj
rename to pEpObjCAdapter.xcodeproj/project.pbxproj
index aeb44e85..2543dee3 100644
--- a/pEpiOSAdapter.xcodeproj/project.pbxproj
+++ b/pEpObjCAdapter.xcodeproj/project.pbxproj
@@ -36,7 +36,7 @@
 		640F79231C9B517C00DBEC4E /* 5CB2C182_sec.asc in Resources */ = {isa = PBXBuildFile; fileRef = 640F79211C9B517C00DBEC4E /* 5CB2C182_sec.asc */; };
 		640F79241C9B517C00DBEC4E /* 5CB2C182.asc in Resources */ = {isa = PBXBuildFile; fileRef = 640F79221C9B517C00DBEC4E /* 5CB2C182.asc */; };
 		64415E1A1BE94FCB00F6CBB2 /* iOSTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 64415E191BE94FCB00F6CBB2 /* iOSTests.m */; };
-		64415E1C1BE94FCB00F6CBB2 /* libpEpiOSAdapter.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 352988AA1AEF964100FA7E2E /* libpEpiOSAdapter.a */; };
+		64415E1C1BE94FCB00F6CBB2 /* libpEpObjCAdapter.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 352988AA1AEF964100FA7E2E /* libpEpObjCAdapter.a */; };
 		64415E2E1BE9511300F6CBB2 /* libbz2.1.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 64415E2D1BE9511300F6CBB2 /* libbz2.1.0.dylib */; };
 		64415E2F1BE9511C00F6CBB2 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 35FB0ABD1B57F99D00377032 /* Security.framework */; };
 		64415E301BE9513300F6CBB2 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 35FB0ABB1B57F97E00377032 /* CFNetwork.framework */; };
@@ -117,7 +117,7 @@
 		350F0ED21B4D642200D9964F /* PEPSession.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PEPSession.m; sourceTree = "<group>"; };
 		350F0ED71B4E997300D9964F /* PEPMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PEPMessage.h; sourceTree = "<group>"; };
 		350F0ED81B4E997300D9964F /* PEPMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PEPMessage.m; sourceTree = "<group>"; };
-		352988AA1AEF964100FA7E2E /* libpEpiOSAdapter.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libpEpiOSAdapter.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		352988AA1AEF964100FA7E2E /* libpEpObjCAdapter.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libpEpObjCAdapter.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		352988AD1AEF964100FA7E2E /* PEPObjCAdapter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPObjCAdapter.h; sourceTree = "<group>"; };
 		352988AF1AEF964100FA7E2E /* PEPObjCAdapter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPObjCAdapter.m; sourceTree = "<group>"; };
 		35EA58131B565643000B4CC5 /* PEPQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PEPQueue.h; sourceTree = "<group>"; };
@@ -179,7 +179,7 @@
 				64415E2E1BE9511300F6CBB2 /* libbz2.1.0.dylib in Frameworks */,
 				64415E2F1BE9511C00F6CBB2 /* Security.framework in Frameworks */,
 				64415E301BE9513300F6CBB2 /* CFNetwork.framework in Frameworks */,
-				64415E1C1BE94FCB00F6CBB2 /* libpEpiOSAdapter.a in Frameworks */,
+				64415E1C1BE94FCB00F6CBB2 /* libpEpObjCAdapter.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -202,7 +202,7 @@
 		352988AB1AEF964100FA7E2E /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				352988AA1AEF964100FA7E2E /* libpEpiOSAdapter.a */,
+				352988AA1AEF964100FA7E2E /* libpEpObjCAdapter.a */,
 				64415E171BE94FCB00F6CBB2 /* iOSTests.xctest */,
 			);
 			name = Products;
@@ -276,9 +276,9 @@
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		352988A91AEF964100FA7E2E /* pEpiOSAdapter */ = {
+		352988A91AEF964100FA7E2E /* pEpObjCAdapter */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 352988BE1AEF964100FA7E2E /* Build configuration list for PBXNativeTarget "pEpiOSAdapter" */;
+			buildConfigurationList = 352988BE1AEF964100FA7E2E /* Build configuration list for PBXNativeTarget "pEpObjCAdapter" */;
 			buildPhases = (
 				352988A61AEF964100FA7E2E /* Sources */,
 				352988A71AEF964100FA7E2E /* Frameworks */,
@@ -290,9 +290,9 @@
 				640F89481BE37C4F00B34B30 /* PBXTargetDependency */,
 				64289E581B8B70FF00FC617B /* PBXTargetDependency */,
 			);
-			name = pEpiOSAdapter;
+			name = pEpObjCAdapter;
 			productName = pEpiOSAdapter;
-			productReference = 352988AA1AEF964100FA7E2E /* libpEpiOSAdapter.a */;
+			productReference = 352988AA1AEF964100FA7E2E /* libpEpObjCAdapter.a */;
 			productType = "com.apple.product-type.library.static";
 		};
 		64415E161BE94FCB00F6CBB2 /* iOSTests */ = {
@@ -332,7 +332,7 @@
 					};
 				};
 			};
-			buildConfigurationList = 352988A51AEF964100FA7E2E /* Build configuration list for PBXProject "pEpiOSAdapter" */;
+			buildConfigurationList = 352988A51AEF964100FA7E2E /* Build configuration list for PBXProject "pEpObjCAdapter" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
@@ -350,7 +350,7 @@
 			);
 			projectRoot = "";
 			targets = (
-				352988A91AEF964100FA7E2E /* pEpiOSAdapter */,
+				352988A91AEF964100FA7E2E /* pEpObjCAdapter */,
 				64415E161BE94FCB00F6CBB2 /* iOSTests */,
 			);
 		};
@@ -444,7 +444,7 @@
 		};
 		64415E1E1BE94FCB00F6CBB2 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 352988A91AEF964100FA7E2E /* pEpiOSAdapter */;
+			target = 352988A91AEF964100FA7E2E /* pEpObjCAdapter */;
 			targetProxy = 64415E1D1BE94FCB00F6CBB2 /* PBXContainerItemProxy */;
 		};
 		64415E401BE95B2000F6CBB2 /* PBXTargetDependency */ = {
@@ -641,7 +641,7 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		352988A51AEF964100FA7E2E /* Build configuration list for PBXProject "pEpiOSAdapter" */ = {
+		352988A51AEF964100FA7E2E /* Build configuration list for PBXProject "pEpObjCAdapter" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				352988BC1AEF964100FA7E2E /* Debug */,
@@ -650,7 +650,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		352988BE1AEF964100FA7E2E /* Build configuration list for PBXNativeTarget "pEpiOSAdapter" */ = {
+		352988BE1AEF964100FA7E2E /* Build configuration list for PBXNativeTarget "pEpObjCAdapter" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				352988BF1AEF964100FA7E2E /* Debug */,
diff --git a/pEpiOSAdapter.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/pEpObjCAdapter.xcodeproj/project.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from pEpiOSAdapter.xcodeproj/project.xcworkspace/contents.xcworkspacedata
rename to pEpObjCAdapter.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/pEpiOSAdapter.xcodeproj/project.xcworkspace/xcuserdata/vb.xcuserdatad/UserInterfaceState.xcuserstate b/pEpiOSAdapter.xcodeproj/project.xcworkspace/xcuserdata/vb.xcuserdatad/UserInterfaceState.xcuserstate
deleted file mode 100644
index fccfaa09..00000000
Binary files a/pEpiOSAdapter.xcodeproj/project.xcworkspace/xcuserdata/vb.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ
diff --git a/pEpiOSAdapter.xcodeproj/project.xcworkspace/xcuserdata/vb.xcuserdatad/WorkspaceSettings.xcsettings b/pEpiOSAdapter.xcodeproj/project.xcworkspace/xcuserdata/vb.xcuserdatad/WorkspaceSettings.xcsettings
deleted file mode 100644
index 659c8766..00000000
--- a/pEpiOSAdapter.xcodeproj/project.xcworkspace/xcuserdata/vb.xcuserdatad/WorkspaceSettings.xcsettings
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges</key>
-	<true/>
-	<key>SnapshotAutomaticallyBeforeSignificantChanges</key>
-	<true/>
-</dict>
-</plist>
diff --git a/pEpiOSAdapter.xcodeproj/xcuserdata/vb.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/pEpiOSAdapter.xcodeproj/xcuserdata/vb.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
deleted file mode 100644
index 534568f1..00000000
--- a/pEpiOSAdapter.xcodeproj/xcuserdata/vb.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Bucket
-   type = "1"
-   version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "pEpiOSAdapter/PEPSession.m"
-            timestampString = "458063665.070881"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "32"
-            endingLineNumber = "32"
-            landmarkName = "-init"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "pEpiOSAdapter/PEPiOSAdapter.m"
-            timestampString = "458136396.953772"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "11"
-            endingLineNumber = "11">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "pEpiOSAdapter/MCOAbstractMessage+PEPMessage.m"
-            timestampString = "458137578.095499"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "14"
-            endingLineNumber = "14"
-            landmarkName = "PEP_arrayFromStringlist()"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "pEpiOSAdapter/MCOAbstractMessage+PEPMessage.m"
-            timestampString = "458140996.304142"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "15"
-            endingLineNumber = "15"
-            landmarkName = "PEP_arrayFromStringlist()"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "pEpiOSAdapter/PEPQueue.m"
-            timestampString = "458643384.036861"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "23"
-            endingLineNumber = "23"
-            landmarkName = "-dequeue"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "pEpiOSAdapter/PEPSession.m"
-            timestampString = "458650611.950696"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "85"
-            endingLineNumber = "85"
-            landmarkName = "-trustwords:forLanguage:shortened:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "pEpiOSAdapter/PEPSession.m"
-            timestampString = "458663829.156249"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "58"
-            endingLineNumber = "58"
-            landmarkName = "-outgoingMessageColor:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "pEpiOSAdapter/MCOAbstractMessage+PEPMessage.m"
-            timestampString = "458664545.776036"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "143"
-            endingLineNumber = "143"
-            landmarkName = "PEP_MCOAddressArrayToList()"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "pEpiOSAdapter/PEPiOSAdapter.m"
-            timestampString = "458742875.295344"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "72"
-            endingLineNumber = "72"
-            landmarkName = "+registerExamineFunction:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
-</Bucket>
diff --git a/pEpiOSAdapter.xcodeproj/xcuserdata/vb.xcuserdatad/xcschemes/pEpiOSAdapter.xcscheme b/pEpiOSAdapter.xcodeproj/xcuserdata/vb.xcuserdatad/xcschemes/pEpiOSAdapter.xcscheme
deleted file mode 100644
index c0e09677..00000000
--- a/pEpiOSAdapter.xcodeproj/xcuserdata/vb.xcuserdatad/xcschemes/pEpiOSAdapter.xcscheme
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0630"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "352988A91AEF964100FA7E2E"
-               BuildableName = "libpEpiOSAdapter.a"
-               BlueprintName = "pEpiOSAdapter"
-               ReferencedContainer = "container:pEpiOSAdapter.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "352988B41AEF964100FA7E2E"
-               BuildableName = "pEpiOSAdapterTests.xctest"
-               BlueprintName = "pEpiOSAdapterTests"
-               ReferencedContainer = "container:pEpiOSAdapter.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "352988B41AEF964100FA7E2E"
-               BuildableName = "pEpiOSAdapterTests.xctest"
-               BlueprintName = "pEpiOSAdapterTests"
-               ReferencedContainer = "container:pEpiOSAdapter.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "352988A91AEF964100FA7E2E"
-            BuildableName = "libpEpiOSAdapter.a"
-            BlueprintName = "pEpiOSAdapter"
-            ReferencedContainer = "container:pEpiOSAdapter.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </TestAction>
-   <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "352988A91AEF964100FA7E2E"
-            BuildableName = "libpEpiOSAdapter.a"
-            BlueprintName = "pEpiOSAdapter"
-            ReferencedContainer = "container:pEpiOSAdapter.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "352988A91AEF964100FA7E2E"
-            BuildableName = "libpEpiOSAdapter.a"
-            BlueprintName = "pEpiOSAdapter"
-            ReferencedContainer = "container:pEpiOSAdapter.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/pEpiOSAdapter.xcodeproj/xcuserdata/vb.xcuserdatad/xcschemes/xcschememanagement.plist b/pEpiOSAdapter.xcodeproj/xcuserdata/vb.xcuserdatad/xcschemes/xcschememanagement.plist
deleted file mode 100644
index f6f021b3..00000000
--- a/pEpiOSAdapter.xcodeproj/xcuserdata/vb.xcuserdatad/xcschemes/xcschememanagement.plist
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>pEpiOSAdapter.xcscheme</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-	</dict>
-	<key>SuppressBuildableAutocreation</key>
-	<dict>
-		<key>352988A91AEF964100FA7E2E</key>
-		<dict>
-			<key>primary</key>
-			<true/>
-		</dict>
-		<key>352988B41AEF964100FA7E2E</key>
-		<dict>
-			<key>primary</key>
-			<true/>
-		</dict>
-	</dict>
-</dict>
-</plist>