diff --git a/Code.xcodeproj/xcshareddata/xcschemes/Code UI.xcscheme b/Code.xcodeproj/xcshareddata/xcschemes/Code UI.xcscheme
deleted file mode 100644
index c14835208..000000000
--- a/Code.xcodeproj/xcshareddata/xcschemes/Code UI.xcscheme	
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "2600"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "9419692E280316C7008AAEB2"
-               BuildableName = "CodeUI.app"
-               BlueprintName = "CodeUI"
-               ReferencedContainer = "container:Code.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO"
-            parallelizable = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "9FE3E291298A14BC00F63DD0"
-               BuildableName = "CodeUITests.xctest"
-               BlueprintName = "CodeUITests"
-               ReferencedContainer = "container:Code.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "9419692E280316C7008AAEB2"
-            BuildableName = "CodeUI.app"
-            BlueprintName = "CodeUI"
-            ReferencedContainer = "container:Code.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "9419692E280316C7008AAEB2"
-            BuildableName = "CodeUI.app"
-            BlueprintName = "CodeUI"
-            ReferencedContainer = "container:Code.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/Code.xcodeproj/xcshareddata/xcschemes/Code App.xcscheme b/Code.xcodeproj/xcshareddata/xcschemes/CodifyOne.xcscheme
similarity index 100%
rename from Code.xcodeproj/xcshareddata/xcschemes/Code App.xcscheme
rename to Code.xcodeproj/xcshareddata/xcschemes/CodifyOne.xcscheme
diff --git a/Code.xcodeproj/xcshareddata/xcschemes/extension.xcscheme b/Code.xcodeproj/xcshareddata/xcschemes/extension.xcscheme
deleted file mode 100644
index b4e8055a4..000000000
--- a/Code.xcodeproj/xcshareddata/xcschemes/extension.xcscheme
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "2600"
-   wasCreatedForAppExtension = "YES"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "94369AFB25E3B933008419A0"
-               BuildableName = "extension.appex"
-               BlueprintName = "extension"
-               ReferencedContainer = "container:Code.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "NO"
-            buildForRunning = "NO"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "944EEBEF2563C381009D77FE"
-               BuildableName = "Code.app"
-               BlueprintName = "Code"
-               ReferencedContainer = "container:Code.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "NO"
-            buildForRunning = "YES"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "9419692E280316C7008AAEB2"
-               BuildableName = "CodeUI.app"
-               BlueprintName = "CodeUI"
-               ReferencedContainer = "container:Code.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = ""
-      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "9419692E280316C7008AAEB2"
-            BuildableName = "CodeUI.app"
-            BlueprintName = "CodeUI"
-            ReferencedContainer = "container:Code.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES"
-      askForAppToLaunch = "Yes"
-      launchAutomaticallySubstyle = "2">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "94369AFB25E3B933008419A0"
-            BuildableName = "extension.appex"
-            BlueprintName = "extension"
-            ReferencedContainer = "container:Code.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/Code App.entitlements b/CodifyOne.entitlements
similarity index 100%
rename from Code App.entitlements
rename to CodifyOne.entitlements
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 2060fbd44..5e172b8fe 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -130,6 +130,6 @@ platform :ios do
     Dir.chdir("..") do
       sh("./downloadFrameworks.sh")
     end
-    run_tests(scheme: "Code UI")
+    run_tests(scheme: "CodifyOne")
   end
 end