diff --git a/Package.swift b/Package.swift
index 1612f07f..708b6c5b 100644
--- a/Package.swift
+++ b/Package.swift
@@ -81,7 +81,7 @@ let package = Package(
       // useful to any Swift package. Similar in spirit to SwiftPM's Basic module.
       .target(
         name: "SKSupport",
-        dependencies: ["SPMUtility"]),
+        dependencies: ["TSCUtility"]),
       .testTarget(
         name: "SKSupportTests",
         dependencies: ["SKSupport", "SKTestSupport"]),
diff --git a/Sources/LanguageServerProtocol/Messages.swift b/Sources/LanguageServerProtocol/Messages.swift
index 4a9698c9..1f87e191 100644
--- a/Sources/LanguageServerProtocol/Messages.swift
+++ b/Sources/LanguageServerProtocol/Messages.swift
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Basic
+import TSCBasic
 
 /// The set of known requests.
 ///
diff --git a/Sources/SKCore/BuildSetup.swift b/Sources/SKCore/BuildSetup.swift
index 3b1c134c..23d29ab2 100644
--- a/Sources/SKCore/BuildSetup.swift
+++ b/Sources/SKCore/BuildSetup.swift
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Basic
-import SPMUtility
+import TSCBasic
+import TSCUtility
 import SKSupport
 
 /// Build configuration
diff --git a/Sources/SKCore/BuildSystem.swift b/Sources/SKCore/BuildSystem.swift
index 17f6007f..0e99ed52 100644
--- a/Sources/SKCore/BuildSystem.swift
+++ b/Sources/SKCore/BuildSystem.swift
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import LanguageServerProtocol
-import Basic
+import TSCBasic
 
 /// Provider of FileBuildSettings and other build-related information.
 ///
diff --git a/Sources/SKCore/BuildSystemList.swift b/Sources/SKCore/BuildSystemList.swift
index a0b942d9..085d150c 100644
--- a/Sources/SKCore/BuildSystemList.swift
+++ b/Sources/SKCore/BuildSystemList.swift
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Basic
+import TSCBasic
 import LanguageServerProtocol
 
 /// Provides build settings from a list of build systems in priority order.
diff --git a/Sources/SKCore/CompilationDatabase.swift b/Sources/SKCore/CompilationDatabase.swift
index 128b768b..b2acfc59 100644
--- a/Sources/SKCore/CompilationDatabase.swift
+++ b/Sources/SKCore/CompilationDatabase.swift
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import SKSupport
-import Basic
+import TSCBasic
 import Foundation
 
 /// A single compilation database command.
diff --git a/Sources/SKCore/CompilationDatabaseBuildSystem.swift b/Sources/SKCore/CompilationDatabaseBuildSystem.swift
index e25560ca..0ec9ea59 100644
--- a/Sources/SKCore/CompilationDatabaseBuildSystem.swift
+++ b/Sources/SKCore/CompilationDatabaseBuildSystem.swift
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import SKSupport
-import Basic
+import TSCBasic
 import LanguageServerProtocol
 
 /// A `BuildSystem` based on loading clang-compatible compilation database(s).
diff --git a/Sources/SKCore/FallbackBuildSystem.swift b/Sources/SKCore/FallbackBuildSystem.swift
index 6ded1999..b4672e99 100644
--- a/Sources/SKCore/FallbackBuildSystem.swift
+++ b/Sources/SKCore/FallbackBuildSystem.swift
@@ -11,8 +11,8 @@
 //===----------------------------------------------------------------------===//
 
 import LanguageServerProtocol
-import Basic
-import enum SPMUtility.Platform
+import TSCBasic
+import enum TSCUtility.Platform
 
 /// A simple BuildSystem suitable as a fallback when accurate settings are unknown.
 public final class FallbackBuildSystem: BuildSystem {
diff --git a/Sources/SKCore/Toolchain.swift b/Sources/SKCore/Toolchain.swift
index fd19744b..31212378 100644
--- a/Sources/SKCore/Toolchain.swift
+++ b/Sources/SKCore/Toolchain.swift
@@ -11,8 +11,8 @@
 //===----------------------------------------------------------------------===//
 
 import SKSupport
-import Basic
-import SPMUtility
+import TSCBasic
+import TSCUtility
 
 /// A Toolchain is a collection of related compilers and libraries meant to be used together to
 /// build and edit source code.
diff --git a/Sources/SKCore/ToolchainRegistry.swift b/Sources/SKCore/ToolchainRegistry.swift
index d1c99156..ed25680e 100644
--- a/Sources/SKCore/ToolchainRegistry.swift
+++ b/Sources/SKCore/ToolchainRegistry.swift
@@ -11,8 +11,8 @@
 //===----------------------------------------------------------------------===//
 
 import SKSupport
-import Basic
-import SPMUtility
+import TSCBasic
+import TSCUtility
 import Dispatch
 import Foundation
 
diff --git a/Sources/SKCore/XCToolchainPlist.swift b/Sources/SKCore/XCToolchainPlist.swift
index 66aa568f..07b43b67 100644
--- a/Sources/SKCore/XCToolchainPlist.swift
+++ b/Sources/SKCore/XCToolchainPlist.swift
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Basic
+import TSCBasic
 import Foundation
 
 /// A helper type for decoding the Info.plist or ToolchainInfo.plist file from an .xctoolchain.
diff --git a/Sources/SKSupport/BuildConfiguration.swift b/Sources/SKSupport/BuildConfiguration.swift
index c9fba7eb..b2476c17 100644
--- a/Sources/SKSupport/BuildConfiguration.swift
+++ b/Sources/SKSupport/BuildConfiguration.swift
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import SPMUtility
+import TSCUtility
 
 public enum BuildConfiguration: String {
   case debug
diff --git a/Sources/SKSupport/ByteString.swift b/Sources/SKSupport/ByteString.swift
index b023ebf6..28192117 100644
--- a/Sources/SKSupport/ByteString.swift
+++ b/Sources/SKSupport/ByteString.swift
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Basic
+import TSCBasic
 import Foundation
 
 extension ByteString {
diff --git a/Sources/SKSupport/FileSystem.swift b/Sources/SKSupport/FileSystem.swift
index 5d34575a..8d558c23 100644
--- a/Sources/SKSupport/FileSystem.swift
+++ b/Sources/SKSupport/FileSystem.swift
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Basic
+import TSCBasic
 import Foundation
 
 /// The home directory of the current user (same as returned by Foundation's `NSHomeDirectory` method).
diff --git a/Sources/SKSupport/Int.swift b/Sources/SKSupport/Int.swift
index 6539c799..0c02017a 100644
--- a/Sources/SKSupport/Int.swift
+++ b/Sources/SKSupport/Int.swift
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import SPMLibc
+import TSCLibc
 
 extension UInt8 {
   @inlinable
diff --git a/Sources/SKSupport/LogLevel.swift b/Sources/SKSupport/LogLevel.swift
index 2660b818..0ccb6aec 100644
--- a/Sources/SKSupport/LogLevel.swift
+++ b/Sources/SKSupport/LogLevel.swift
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import SPMUtility
+import TSCUtility
 
 #if canImport(os)
 import os
diff --git a/Sources/SKSupport/Logging.swift b/Sources/SKSupport/Logging.swift
index 4a133b1a..f0ebed54 100644
--- a/Sources/SKSupport/Logging.swift
+++ b/Sources/SKSupport/Logging.swift
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Basic
+import TSCBasic
 import Foundation
 
 #if canImport(os)
diff --git a/Sources/SKSupport/Platform.swift b/Sources/SKSupport/Platform.swift
index 1797e2c7..798057c6 100644
--- a/Sources/SKSupport/Platform.swift
+++ b/Sources/SKSupport/Platform.swift
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import SPMUtility
+import TSCUtility
 
 extension Platform {
 
diff --git a/Sources/SKSupport/dlopen.swift b/Sources/SKSupport/dlopen.swift
index 4ab036ae..13f53f5c 100644
--- a/Sources/SKSupport/dlopen.swift
+++ b/Sources/SKSupport/dlopen.swift
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import SPMLibc
+import TSCLibc
 
 public final class DLHandle {
   #if os(Windows)
@@ -84,7 +84,7 @@ public func dlopen(_ path: String?, mode: DLOpenFlags) throws -> DLHandle {
       throw DLError.open("LoadLibraryW failed: \(GetLastError())")
     }
   #else
-    guard let handle = SPMLibc.dlopen(path, mode.rawValue) else {
+    guard let handle = TSCLibc.dlopen(path, mode.rawValue) else {
       throw DLError.open(dlerror() ?? "unknown error")
     }
   #endif
diff --git a/Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift b/Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift
index a2fdedbc..a8d18a20 100644
--- a/Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift
+++ b/Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift
@@ -12,8 +12,8 @@
 
 import LanguageServerProtocol
 import SKCore
-import Basic
-import SPMUtility
+import TSCBasic
+import TSCUtility
 import SKSupport
 import Build
 import PackageModel
@@ -410,7 +410,7 @@ public final class BuildSettingProviderWorkspaceDelegate: WorkspaceDelegate {
 
   public func fetchingWillBegin(repository: String) {}
 
-  public func fetchingDidFinish(repository: String, diagnostic: Basic.Diagnostic?) {}
+  public func fetchingDidFinish(repository: String, diagnostic: TSCBasic.Diagnostic?) {}
 
   public func cloning(repository: String) {}
 
@@ -419,7 +419,7 @@ public final class BuildSettingProviderWorkspaceDelegate: WorkspaceDelegate {
   public func managedDependenciesDidUpdate(_ dependencies: AnySequence<ManagedDependency>) {}
 }
 
-extension Basic.Diagnostic.Behavior {
+extension TSCBasic.Diagnostic.Behavior {
   var asLogLevel: LogLevel {
     switch self {
     case .error: return .error
diff --git a/Sources/SKTestSupport/FileSystem.swift b/Sources/SKTestSupport/FileSystem.swift
index 91a49ff2..437d886c 100644
--- a/Sources/SKTestSupport/FileSystem.swift
+++ b/Sources/SKTestSupport/FileSystem.swift
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Basic
+import TSCBasic
 
 extension FileSystem {
 
diff --git a/Sources/SKTestSupport/SKSwiftPMTestWorkspace.swift b/Sources/SKTestSupport/SKSwiftPMTestWorkspace.swift
index da1ade57..04871750 100644
--- a/Sources/SKTestSupport/SKSwiftPMTestWorkspace.swift
+++ b/Sources/SKTestSupport/SKSwiftPMTestWorkspace.swift
@@ -17,8 +17,8 @@ import SKCore
 import IndexStoreDB
 import ISDBTibs
 import ISDBTestSupport
-import Basic
-import SPMUtility
+import TSCBasic
+import TSCUtility
 import XCTest
 import Foundation
 
@@ -108,7 +108,7 @@ extension SKSwiftPMTestWorkspace {
   }
 
   func build() throws {
-    try Basic.Process.checkNonZeroExit(arguments: [
+    try TSCBasic.Process.checkNonZeroExit(arguments: [
       String(toolchain.swiftc!.pathString.dropLast()),
       "build",
       "--package-path", sources.rootDirectory.path,
diff --git a/Sources/SKTestSupport/SKTibsTestWorkspace.swift b/Sources/SKTestSupport/SKTibsTestWorkspace.swift
index 956a0966..78e80fb7 100644
--- a/Sources/SKTestSupport/SKTibsTestWorkspace.swift
+++ b/Sources/SKTestSupport/SKTibsTestWorkspace.swift
@@ -16,8 +16,8 @@ import SKCore
 import IndexStoreDB
 import ISDBTibs
 import ISDBTestSupport
-import Basic
-import SPMUtility
+import TSCBasic
+import TSCUtility
 import XCTest
 import Foundation
 
diff --git a/Sources/SKTestSupport/TestServer.swift b/Sources/SKTestSupport/TestServer.swift
index 069dff4e..fdd6829d 100644
--- a/Sources/SKTestSupport/TestServer.swift
+++ b/Sources/SKTestSupport/TestServer.swift
@@ -12,7 +12,7 @@
 
 import SKSupport
 import SKCore
-import SPMUtility
+import TSCUtility
 import LanguageServerProtocol
 import LanguageServerProtocolJSONRPC
 import SourceKit
diff --git a/Sources/SourceKit/SourceKitServer.swift b/Sources/SourceKit/SourceKitServer.swift
index 8ebb35d8..52ed5260 100644
--- a/Sources/SourceKit/SourceKitServer.swift
+++ b/Sources/SourceKit/SourceKitServer.swift
@@ -14,11 +14,11 @@ import LanguageServerProtocol
 import SKCore
 import SKSupport
 import IndexStoreDB
-import Basic
-import SPMUtility
+import TSCBasic
+import TSCUtility
 import Dispatch
 import Foundation
-import SPMLibc
+import TSCLibc
 
 public typealias URL = Foundation.URL
 
diff --git a/Sources/SourceKit/Workspace.swift b/Sources/SourceKit/Workspace.swift
index 7fe8a09e..f3aa098d 100644
--- a/Sources/SourceKit/Workspace.swift
+++ b/Sources/SourceKit/Workspace.swift
@@ -14,8 +14,8 @@ import LanguageServerProtocol
 import SKCore
 import SKSupport
 import IndexStoreDB
-import Basic
-import SPMUtility
+import TSCBasic
+import TSCUtility
 import SKSwiftPMWorkspace
 
 /// Represents the configuration and state of a project or combination of projects being worked on
diff --git a/Sources/SourceKit/clangd/ClangLanguageServer.swift b/Sources/SourceKit/clangd/ClangLanguageServer.swift
index 18b3e771..05279645 100644
--- a/Sources/SourceKit/clangd/ClangLanguageServer.swift
+++ b/Sources/SourceKit/clangd/ClangLanguageServer.swift
@@ -12,7 +12,7 @@
 
 import SKSupport
 import SKCore
-import Basic
+import TSCBasic
 import LanguageServerProtocol
 import LanguageServerProtocolJSONRPC
 import Foundation
diff --git a/Sources/SourceKit/sourcekitd/CursorInfo.swift b/Sources/SourceKit/sourcekitd/CursorInfo.swift
index af081f1a..993d271c 100644
--- a/Sources/SourceKit/sourcekitd/CursorInfo.swift
+++ b/Sources/SourceKit/sourcekitd/CursorInfo.swift
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import LanguageServerProtocol
-import Basic
+import TSCBasic
 import sourcekitd
 
 /// Detailed information about a symbol under the cursor.
diff --git a/Sources/SourceKit/sourcekitd/SwiftLanguageServer.swift b/Sources/SourceKit/sourcekitd/SwiftLanguageServer.swift
index bda239ce..eb2aba2b 100644
--- a/Sources/SourceKit/sourcekitd/SwiftLanguageServer.swift
+++ b/Sources/SourceKit/sourcekitd/SwiftLanguageServer.swift
@@ -13,7 +13,7 @@
 import LanguageServerProtocol
 import SKCore
 import SKSupport
-import Basic
+import TSCBasic
 import sourcekitd
 import Dispatch
 import struct Foundation.CharacterSet
diff --git a/Sources/SourceKit/sourcekitd/SwiftSourceKitFramework.swift b/Sources/SourceKit/sourcekitd/SwiftSourceKitFramework.swift
index 892a64c6..668c2499 100644
--- a/Sources/SourceKit/sourcekitd/SwiftSourceKitFramework.swift
+++ b/Sources/SourceKit/sourcekitd/SwiftSourceKitFramework.swift
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import LanguageServerProtocol
-import Basic
+import TSCBasic
 import SKSupport
 import sourcekitd
 
diff --git a/Sources/sourcekit-lsp/main.swift b/Sources/sourcekit-lsp/main.swift
index dfe063bb..eec5e6e7 100644
--- a/Sources/sourcekit-lsp/main.swift
+++ b/Sources/sourcekit-lsp/main.swift
@@ -15,10 +15,10 @@ import LanguageServerProtocolJSONRPC
 import LanguageServerProtocol
 import SKSupport
 import SKCore
-import SPMLibc
+import TSCLibc
 import Dispatch
-import Basic
-import SPMUtility
+import TSCBasic
+import TSCUtility
 import Foundation
 import sourcekitd // Not needed here, but fixes debugging...
 
@@ -62,7 +62,7 @@ let sync: Bool
 do {
   (buildSetup, sync) = try parseArguments()
 } catch {
-  fputs("error: \(error)\n", SPMLibc.stderr)
+  fputs("error: \(error)\n", TSCLibc.stderr)
   exit(1)
 }
 
diff --git a/Tests/SKCoreTests/CompilationDatabaseTests.swift b/Tests/SKCoreTests/CompilationDatabaseTests.swift
index ab5d2526..b7c5d3f3 100644
--- a/Tests/SKCoreTests/CompilationDatabaseTests.swift
+++ b/Tests/SKCoreTests/CompilationDatabaseTests.swift
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import SKCore
-import Basic
+import TSCBasic
 import SKTestSupport
 import XCTest
 
diff --git a/Tests/SKCoreTests/FallbackBuildSystemTests.swift b/Tests/SKCoreTests/FallbackBuildSystemTests.swift
index a8bcd3a1..6cac0588 100644
--- a/Tests/SKCoreTests/FallbackBuildSystemTests.swift
+++ b/Tests/SKCoreTests/FallbackBuildSystemTests.swift
@@ -12,7 +12,7 @@
 
 import SKCore
 import LanguageServerProtocol
-import Basic
+import TSCBasic
 import XCTest
 
 final class FallbackBuildSystemTests: XCTestCase {
diff --git a/Tests/SKCoreTests/ToolchainRegistryTests.swift b/Tests/SKCoreTests/ToolchainRegistryTests.swift
index 41997fe1..c83da8a9 100644
--- a/Tests/SKCoreTests/ToolchainRegistryTests.swift
+++ b/Tests/SKCoreTests/ToolchainRegistryTests.swift
@@ -11,8 +11,8 @@
 //===----------------------------------------------------------------------===//
 
 import SKCore
-import Basic
-import SPMUtility
+import TSCBasic
+import TSCUtility
 import XCTest
 
 final class ToolchainRegistryTests: XCTestCase {
diff --git a/Tests/SKSupportTests/SupportPerfTests.swift b/Tests/SKSupportTests/SupportPerfTests.swift
index 760f3fe9..161b70cc 100644
--- a/Tests/SKSupportTests/SupportPerfTests.swift
+++ b/Tests/SKSupportTests/SupportPerfTests.swift
@@ -12,7 +12,7 @@
 
 import SKSupport
 import SKTestSupport
-import Basic
+import TSCBasic
 import XCTest
 
 final class SupportPerfTests: PerfTestCase {
diff --git a/Tests/SKSupportTests/SupportTests.swift b/Tests/SKSupportTests/SupportTests.swift
index 20ec3fe7..3d03695d 100644
--- a/Tests/SKSupportTests/SupportTests.swift
+++ b/Tests/SKSupportTests/SupportTests.swift
@@ -12,7 +12,7 @@
 
 import XCTest
 import SKSupport
-import Basic
+import TSCBasic
 
 final class SupportTests: XCTestCase {
 
diff --git a/Tests/SKSwiftPMWorkspaceTests/SwiftPMWorkspaceTests.swift b/Tests/SKSwiftPMWorkspaceTests/SwiftPMWorkspaceTests.swift
index aff9c1bc..b370ace5 100644
--- a/Tests/SKSwiftPMWorkspaceTests/SwiftPMWorkspaceTests.swift
+++ b/Tests/SKSwiftPMWorkspaceTests/SwiftPMWorkspaceTests.swift
@@ -13,8 +13,8 @@
 import SKSwiftPMWorkspace
 import SKCore
 import PackageModel
-import Basic
-import SPMUtility
+import TSCBasic
+import TSCUtility
 import SKTestSupport
 import Build
 import XCTest
diff --git a/Tests/SourceKitTests/SourceKitTests.swift b/Tests/SourceKitTests/SourceKitTests.swift
index 55c3ea15..dbd50370 100644
--- a/Tests/SourceKitTests/SourceKitTests.swift
+++ b/Tests/SourceKitTests/SourceKitTests.swift
@@ -12,8 +12,8 @@
 
 import SourceKit
 import LanguageServerProtocol
-import Basic
-import SPMUtility
+import TSCBasic
+import TSCUtility
 import SKCore
 import SKTestSupport
 import IndexStoreDB