diff --git a/CMakeLists.txt b/CMakeLists.txt
index 029f3ffa337..ddbb5447b3d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,8 +51,5 @@ find_package(dispatch QUIET)
 find_package(Foundation QUIET)
 find_package(SQLite3 REQUIRED)
 
-# Enable `package` modifier for the whole package.
-add_compile_options("$<$<COMPILE_LANGUAGE:Swift>:-package-name;SwiftPM>")
-
 add_subdirectory(Sources)
 add_subdirectory(cmake/modules)
diff --git a/Sources/Basics/CMakeLists.txt b/Sources/Basics/CMakeLists.txt
index 9d414fc9eea..dd61eda01eb 100644
--- a/Sources/Basics/CMakeLists.txt
+++ b/Sources/Basics/CMakeLists.txt
@@ -70,7 +70,6 @@ target_link_libraries(Basics PUBLIC
 target_link_libraries(Basics PRIVATE
   SPMSQLite3
   TSCclibc)
-
 # NOTE(compnerd) workaround for CMake not setting up include flags yet
 set_target_properties(Basics PROPERTIES
   INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
diff --git a/Sources/Basics/OSSignpost.swift b/Sources/Basics/OSSignpost.swift
index 96f524f2a60..34eb9d49c04 100644
--- a/Sources/Basics/OSSignpost.swift
+++ b/Sources/Basics/OSSignpost.swift
@@ -22,7 +22,7 @@ extension os.OSLog {
 #endif
 
 /// Emits a signpost.
-@inlinable package func os_signpost(
+@inlinable public func os_signpost(
     _ type: SignpostType,
     name: StaticString,
     signpostID: SignpostID = .exclusive
@@ -39,8 +39,8 @@ extension os.OSLog {
     #endif
 }
 
-@usableFromInline
-package enum SignpostType {
+
+public enum SignpostType {
     case begin
     case end
     case event
@@ -61,8 +61,7 @@ package enum SignpostType {
     #endif
 }
 
-@usableFromInline
-package enum SignpostID {
+public enum SignpostID {
     case exclusive
 
     #if canImport(os)
@@ -78,7 +77,7 @@ package enum SignpostID {
 }
 
 
-package enum SignpostName {
+public enum SignpostName {
     public static let updatingDependencies: StaticString = "updating"
     public static let resolvingDependencies: StaticString = "resolving"
     public static let pubgrub: StaticString = "pubgrub"
diff --git a/Sources/SPMTestSupport/GitRepositoryExtensions.swift b/Sources/SPMTestSupport/GitRepositoryExtensions.swift
index 5a61fd9925b..9f3c4db0d9c 100644
--- a/Sources/SPMTestSupport/GitRepositoryExtensions.swift
+++ b/Sources/SPMTestSupport/GitRepositoryExtensions.swift
@@ -18,7 +18,7 @@ import enum TSCUtility.Git
 
 /// Extensions useful for unit testing purposes.
 /// Note: These are not thread safe.
-package extension GitRepository {
+public extension GitRepository {
     /// Create the repository using git init.
     func create() throws {
         try systemQuietly([Git.tool, "-C", self.path.pathString, "init"])
diff --git a/Sources/SPMTestSupport/MockArchiver.swift b/Sources/SPMTestSupport/MockArchiver.swift
index cf1a84434df..2bfc63546a3 100644
--- a/Sources/SPMTestSupport/MockArchiver.swift
+++ b/Sources/SPMTestSupport/MockArchiver.swift
@@ -12,22 +12,22 @@
 
 import Basics
 
-package class MockArchiver: Archiver {
-    package typealias ExtractionHandler = (
+public class MockArchiver: Archiver {
+    public typealias ExtractionHandler = (
         MockArchiver,
         AbsolutePath,
         AbsolutePath,
         (Result<Void, Error>) -> Void
     ) throws -> Void
-    package typealias CompressionHandler = (
+    public typealias CompressionHandler = (
         MockArchiver,
         AbsolutePath,
         AbsolutePath,
         (Result<Void, Error>) -> Void
     ) throws -> Void
-    package typealias ValidationHandler = (MockArchiver, AbsolutePath, (Result<Bool, Error>) -> Void) throws -> Void
+    public typealias ValidationHandler = (MockArchiver, AbsolutePath, (Result<Bool, Error>) -> Void) throws -> Void
 
-    package struct Extraction: Equatable {
+    public struct Extraction: Equatable {
         public let archivePath: AbsolutePath
         public let destinationPath: AbsolutePath
 
@@ -37,7 +37,7 @@ package class MockArchiver: Archiver {
         }
     }
 
-    package struct Compression: Equatable {
+    public struct Compression: Equatable {
         public let directory: AbsolutePath
         public let destinationPath: AbsolutePath
 
@@ -47,18 +47,18 @@ package class MockArchiver: Archiver {
         }
     }
 
-    package let supportedExtensions: Set<String> = ["zip"]
-    package let extractions = ThreadSafeArrayStore<Extraction>()
-    package let compressions = ThreadSafeArrayStore<Compression>()
-    package let extractionHandler: ExtractionHandler?
-    package let compressionHandler: CompressionHandler?
-    package let validationHandler: ValidationHandler?
+    public let supportedExtensions: Set<String> = ["zip"]
+    public let extractions = ThreadSafeArrayStore<Extraction>()
+    public let compressions = ThreadSafeArrayStore<Compression>()
+    public let extractionHandler: ExtractionHandler?
+    public let compressionHandler: CompressionHandler?
+    public let validationHandler: ValidationHandler?
 
-    package convenience init(handler: ExtractionHandler? = .none) {
+    public convenience init(handler: ExtractionHandler? = .none) {
         self.init(extractionHandler: handler, compressionHandler: .none, validationHandler: .none)
     }
 
-    package init(
+    public init(
         extractionHandler: ExtractionHandler? = .none,
         compressionHandler: CompressionHandler? = .none,
         validationHandler: ValidationHandler? = .none
@@ -68,7 +68,7 @@ package class MockArchiver: Archiver {
         self.validationHandler = validationHandler
     }
 
-    package func extract(
+    public func extract(
         from archivePath: AbsolutePath,
         to destinationPath: AbsolutePath,
         completion: @escaping (Result<Void, Error>) -> Void
@@ -85,7 +85,7 @@ package class MockArchiver: Archiver {
         }
     }
 
-    package func compress(
+    public func compress(
         directory: AbsolutePath,
         to destinationPath: AbsolutePath,
         completion: @escaping (Result<Void, Error>) -> Void
@@ -102,7 +102,7 @@ package class MockArchiver: Archiver {
         }
     }
 
-    package func validate(path: AbsolutePath, completion: @escaping (Result<Bool, Error>) -> Void) {
+    public func validate(path: AbsolutePath, completion: @escaping (Result<Bool, Error>) -> Void) {
         do {
             if let handler = self.validationHandler {
                 try handler(self, path, completion)