Update artifact/package/module names across all three app languages

- Java: org.whispersystems:signal-client-java -> org.signal:libsignal-client - Java: org.whispersystems:signal-client-android -> org.signal:libsignal-android - Java: org.whispersystems:libsignal-server -> org.signal:libsignal-server - Swift: SignalClient -> LibSignalClient - NPM: @signalapp/signal-client -> @signalapp/libsignal-client - Repository: github.com/signalapp/libsignal-client -> github.com/signalapp/libsignal
jpdoyle · Mar 23, 2022 · 0542686 · 0542686
1 parent a0c1745
commit 0542686
Show file tree

Hide file tree

Showing 98 changed files with 68 additions and 70 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -60,7 +60,7 @@ jobs:
           swift:
           - *rust_ios
           - 'swift/**'
-          - 'SignalClient.podspec'
+          - 'LibSignalClient.podspec'
           ignored:
           - 'LICENSE'
           - '*.md'
@@ -192,8 +192,7 @@ jobs:
     - name: Verify that the JNI bindings are up to date
       run: rust/bridge/jni/bin/gen_java_decl.py --verify
 
-    - name: Build libsignal-client-java
-      run: ./gradlew build
+    - run: ./gradlew build
       working-directory: java
       env:
         ANDROID_NDK_HOME: /usr/local/lib/android/sdk/ndk-bundle

diff --git a/SignalClient.podspec → LibSignalClient.podspec b/SignalClient.podspec → LibSignalClient.podspec
@@ -1,17 +1,17 @@
 #
-# Copyright 2020-2021 Signal Messenger, LLC.
+# Copyright 2020-2022 Signal Messenger, LLC.
 # SPDX-License-Identifier: AGPL-3.0-only
 #
 
 Pod::Spec.new do |s|
-  s.name             = 'SignalClient'
+  s.name             = 'LibSignalClient'
   s.version          = '0.14.0'
   s.summary          = 'A Swift wrapper library for communicating with the Signal messaging service.'
 
-  s.homepage         = 'https://github.com/signalapp/libsignal-client'
+  s.homepage         = 'https://github.com/signalapp/libsignal'
   s.license          = 'AGPL-3.0-only'
-  s.author           = { 'Jack Lloyd' => 'jack@signal.org', 'Jordan Rose' => 'jrose@signal.org' }
-  s.source           = { :git => 'https://github.com/signalapp/libsignal-client.git', :tag => "swift-#{s.version}" }
+  s.author           = { 'Signal Developers' => 'ios@signal.org' }
+  s.source           = { :git => 'https://github.com/signalapp/libsignal.git', :tag => "v#{s.version}" }
 
   s.swift_version    = '5'
   s.platform         = :ios, '10'

diff --git a/RELEASE.md b/RELEASE.md
@@ -1,4 +1,4 @@
-# Making a libsignal-client release
+# Making a libsignal release
 
 ## 0. Make sure all CI tests are passing on the latest commit
 
@@ -50,16 +50,16 @@ Note that both the tag *and* the branch need to be pushed.
 
 ### Android: Sonatype
 
-1. Wait for the "Publish JNI Artifacts to GitHub Release" action to complete. These artifacts, though not built reproducibly, will be included in the "testable" jar that supports running on macOS and Windows as well.
+1. Wait for the "Publish JNI Artifacts to GitHub Release" action to complete. These artifacts, though not built reproducibly, will be included in the `libsignal-client` and `libsignal-server` jars to support running on macOS and Windows as well.
 2. Set the environment variables `SONATYPE_USERNAME`, `SONATYPE_PASSWORD`, `KEYRING_FILE`, `SIGNING_KEY`, and `SIGNING_KEY_PASSSWORD`.
 3. Run `make -C java publish_java` to build through Docker.
 
 Note that Sonatype is pretty slow; even after the build completes it might take a while for it to show up.
 
 ### Node: NPM
 
-In the signalapp/libsignal-client repository on GitHub, run the "Publish to NPM" action. Use the tag you just made as the "Git Tag" and leave the "NPM Tag" as "latest".
+In the signalapp/libsignal repository on GitHub, run the "Publish to NPM" action. Use the tag you just made as the "Git Tag" and leave the "NPM Tag" as "latest".
 
 ### iOS: Let the iOS team know
 
-They build all their CocoaPods on a dedicated build server, including libsignal-client.
+They build all their CocoaPods on a dedicated build server, including libsignal.
diff --git a/bin/update_versions.py b/bin/update_versions.py
@@ -42,7 +42,7 @@ def main():
     os.chdir(os.path.dirname(os.path.dirname(os.path.realpath(__file__))))
 
     if len(sys.argv) > 1:
-        update_version('SignalClient.podspec', PODSPEC_PATTERN, sys.argv[1])
+        update_version('LibSignalClient.podspec', PODSPEC_PATTERN, sys.argv[1])
         update_version(os.path.join('java', 'build.gradle'), GRADLE_PATTERN, sys.argv[1])
         update_version(os.path.join('node', 'package.json'), NODE_PATTERN, sys.argv[1])
         update_version(bridge_path('ffi'), CARGO_PATTERN, sys.argv[1])
@@ -51,7 +51,7 @@ def main():
         return 0
 
     package_versions = {
-        'swift': read_version('SignalClient.podspec', PODSPEC_PATTERN),
+        'swift': read_version('LibSignalClient.podspec', PODSPEC_PATTERN),
         'java': read_version(os.path.join('java', 'build.gradle'), GRADLE_PATTERN),
         'node': read_version(os.path.join('node', 'package.json'), NODE_PATTERN)
     }

diff --git a/java/Makefile b/java/Makefile
@@ -45,8 +45,8 @@ publish_java: docker_image
 		-v $(KEYRING_VOLUME):/home/libsignal/keyring \
 		$(DOCKER_IMAGE) \
 		sh -c "cd src/java; ./gradlew clean publish \
-			-PwhisperSonatypeUsername='$(SONATYPE_USERNAME)' \
-			-PwhisperSonatypePassword='$(SONATYPE_PASSWORD)' \
+			-PsonatypeUsername='$(SONATYPE_USERNAME)' \
+			-PsonatypePassword='$(SONATYPE_PASSWORD)' \
 			-Psigning.secretKeyRingFile='/home/libsignal/keyring/$(KEYRING_FILE_ROOT)' \
 			-Psigning.keyId='$(SIGNING_KEY)' \
 			-Psigning.password='$(SIGNING_KEY_PASSWORD)'"
diff --git a/java/android/build.gradle b/java/android/build.gradle
@@ -4,7 +4,7 @@ plugins {
     id 'signing'
 }
 
-archivesBaseName = "signal-client-android"
+archivesBaseName = "libsignal-android"
 version          = version_number
 group            = group_info
 
@@ -69,12 +69,12 @@ afterEvaluate {
                     name = archivesBaseName
                     packaging = 'aar'
                     description = 'Signal Protocol cryptography library for Android'
-                    url = 'https://github.com/signalapp/libsignal-client'
+                    url = 'https://github.com/signalapp/libsignal'
 
                     scm {
-                        url = 'scm:git@github.com:signalapp/libsignal-client.git'
-                        connection = 'scm:git@github.com:signalapp/libsignal-client.git'
-                        developerConnection = 'scm:git@github.com:signalapp/libsignal-client.git'
+                        url = 'scm:git@github.com:signalapp/libsignal.git'
+                        connection = 'scm:git@github.com:signalapp/libsignal.git'
+                        developerConnection = 'scm:git@github.com:signalapp/libsignal.git'
                     }
 
                     licenses {

diff --git a/java/build.gradle b/java/build.gradle
@@ -6,7 +6,7 @@ def version_number = "0.14.0"
 
 subprojects {
     ext.version_number     = version_number
-    ext.group_info         = "org.whispersystems"
+    ext.group_info         = "org.signal"
 
     if (JavaVersion.current().isJava8Compatible()) {
         allprojects {
@@ -63,7 +63,7 @@ task downloadNonLinuxLibraries(type: Download) {
   def extraResources = ['signal_jni.dll', 'libsignal_jni.dylib']
 
   src(extraResources.collect {
-    'https://github.com/signalapp/libsignal-client/releases/download/v' + version_number + '/' + it
+    'https://github.com/signalapp/libsignal/releases/download/v' + version_number + '/' + it
   })
   dest 'shared/resources'
 }
@@ -80,9 +80,9 @@ def getReleaseRepositoryUrl() {
 }
 
 def getRepositoryUsername() {
-    return hasProperty('whisperSonatypeUsername') ? whisperSonatypeUsername : ""
+    return hasProperty('sonatypeUsername') ? sonatypeUsername : ""
 }
 
 def getRepositoryPassword() {
-    return hasProperty('whisperSonatypePassword') ? whisperSonatypePassword : ""
+    return hasProperty('sonatypePassword') ? sonatypePassword : ""
 }
diff --git a/java/client/build.gradle b/java/client/build.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 sourceCompatibility = 1.8
-archivesBaseName = "signal-client-java"
+archivesBaseName = "libsignal-client"
 version          = version_number
 group            = group_info
 
@@ -68,12 +68,12 @@ publishing {
             pom {
                 name = archivesBaseName
                 description = 'Signal Protocol cryptography library for Java'
-                url = 'https://github.com/signalapp/libsignal-client'
+                url = 'https://github.com/signalapp/libsignal'
 
                 scm {
-                    url = 'scm:git@github.com:signalapp/libsignal-client.git'
-                    connection = 'scm:git@github.com:signalapp/libsignal-client.git'
-                    developerConnection = 'scm:git@github.com:signalapp/libsignal-client.git'
+                    url = 'scm:git@github.com:signalapp/libsignal.git'
+                    connection = 'scm:git@github.com:signalapp/libsignal.git'
+                    developerConnection = 'scm:git@github.com:signalapp/libsignal.git'
                 }
 
                 licenses {

diff --git a/java/client/src/test/java/org/signal/libsignal/protocol/SessionBuilderTest.java b/java/client/src/test/java/org/signal/libsignal/protocol/SessionBuilderTest.java
@@ -334,7 +334,7 @@ public void testBadSignedPreKeyStoreError() throws InvalidKeyException, Untruste
       plaintext = bobSessionCipher.decrypt(incomingMessage);
       throw new AssertionError("Decrypt should have failed!");
     } catch (InvalidKeyIdException e) {
-      throw new AssertionError("libsignal-client swallowed the exception");
+      throw new AssertionError("libsignal swallowed the exception");
     } catch (TestBadSignedPreKeysStore.CustomException e) {
       // success!
     }

diff --git a/java/server/build.gradle b/java/server/build.gradle
@@ -68,12 +68,12 @@ publishing {
             pom {
                 name = archivesBaseName
                 description = 'Signal Protocol cryptography library for Java (server-side)'
-                url = 'https://github.com/signalapp/libsignal-client'
+                url = 'https://github.com/signalapp/libsignal'
 
                 scm {
-                    url = 'scm:git@github.com:signalapp/libsignal-client.git'
-                    connection = 'scm:git@github.com:signalapp/libsignal-client.git'
-                    developerConnection = 'scm:git@github.com:signalapp/libsignal-client.git'
+                    url = 'scm:git@github.com:signalapp/libsignal.git'
+                    connection = 'scm:git@github.com:signalapp/libsignal.git'
+                    developerConnection = 'scm:git@github.com:signalapp/libsignal.git'
                 }
 
                 licenses {

diff --git a/node/package.json b/node/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@signalapp/signal-client",
+  "name": "@signalapp/libsignal-client",
   "version": "0.14.0",
   "license": "AGPL-3.0-only",
   "main": "dist/index.js",

diff --git a/node/zkgroup.d.ts b/node/zkgroup.d.ts
@@ -3,5 +3,5 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //
 
-// Make it possible to import from '@signalapp/signal-client/zkgroup'.
+// Make it possible to import from '@signalapp/libsignal-client/zkgroup'.
 export * from './dist/zkgroup';
diff --git a/node/zkgroup.js b/node/zkgroup.js
@@ -3,5 +3,5 @@
 // SPDX-License-Identifier: AGPL-3.0-only
 //
 
-// Make it possible to import from '@signalapp/signal-client/zkgroup'.
+// Make it possible to import from '@signalapp/libsignal-client/zkgroup'.
 module.exports = require('./dist/zkgroup');
diff --git a/rust/bridge/ffi/src/logging.rs b/rust/bridge/ffi/src/logging.rs
@@ -98,13 +98,13 @@ pub unsafe extern "C" fn signal_init_logger(max_level: LogLevel, logger: FfiLogg
         Ok(_) => {
             log::set_max_level(log::Level::from(max_level).to_level_filter());
             log::info!(
-                "Initializing libsignal-client version:{}",
+                "Initializing libsignal version:{}",
                 env!("CARGO_PKG_VERSION")
             );
             log_panics::init();
         }
         Err(_) => {
-            log::warn!("logging already initialized for libsignal-client; ignoring later call");
+            log::warn!("logging already initialized for libsignal; ignoring later call");
         }
     }
 }
diff --git a/rust/bridge/jni/src/logging.rs b/rust/bridge/jni/src/logging.rs
@@ -83,7 +83,7 @@ impl JniLogger {
         );
         let args = jni_args!((
             level.into() => int,
-            env.new_string("libsignal-client")? => java.lang.String,
+            env.new_string("libsignal")? => java.lang.String,
             env.new_string(message)? => java.lang.String,
         ) -> void);
         let result = env.call_static_method(&self.logger_class, "log", args.sig, &args.args);
@@ -127,7 +127,7 @@ fn set_max_level_from_java_level(max_level: jint) {
     // Keep this in sync with SignalProtocolLogger.java.
     let level = match max_level {
         // The jni crate uses trace! in its own implementation.
-        2 => panic!("invalid log level (must be DEBUG or higher for libsignal-client)"),
+        2 => panic!("invalid log level (must be DEBUG or higher for libsignal)"),
         3 => JavaLogLevel::Debug,
         4 => JavaLogLevel::Info,
         5 => JavaLogLevel::Warn,
@@ -154,13 +154,13 @@ pub unsafe extern "C" fn Java_org_signal_libsignal_internal_Native_Logger_1Initi
             Ok(_) => {
                 set_max_level_from_java_level(max_level);
                 log::info!(
-                    "Initializing libsignal-client version:{}",
+                    "Initializing libsignal version:{}",
                     env!("CARGO_PKG_VERSION")
                 );
                 log_panics::init();
             }
             Err(_) => {
-                log::warn!("logging already initialized for libsignal-client; ignoring later call");
+                log::warn!("logging already initialized for libsignal; ignoring later call");
             }
         }
     });

diff --git a/rust/bridge/node/src/logging.rs b/rust/bridge/node/src/logging.rs
@@ -131,13 +131,13 @@ pub(crate) fn init_logger(mut cx: FunctionContext) -> JsResult<JsUndefined> {
         Ok(_) => {
             set_max_level_from_js_level(max_level);
             log::info!(
-                "Initializing libsignal-client version:{}",
+                "Initializing libsignal version:{}",
                 env!("CARGO_PKG_VERSION")
             );
             log_panics::init();
         }
         Err(_) => {
-            log::warn!("logging already initialized for libsignal-client; ignoring later call");
+            log::warn!("logging already initialized for libsignal; ignoring later call");
         }
     }
 

diff --git a/rust/protocol/Cargo.toml b/rust/protocol/Cargo.toml
@@ -9,7 +9,6 @@ version = "0.1.0"
 authors = ["Ehren Kret <ehren@signal.org>", "Jack Lloyd <jack@signal.org>"]
 edition = "2018"
 license = "AGPL-3.0-only"
-repository = "https://github.com/signalapp/libsignal-client"
 
 [dependencies]
 aes = { version = "0.7.4", features = ["ctr"] }

diff --git a/rust/protocol/src/lib.rs b/rust/protocol/src/lib.rs
@@ -17,7 +17,7 @@
 #![warn(clippy::unwrap_used)]
 #![deny(unsafe_code)]
 
-// TODO(https://github.com/signalapp/libsignal-client/issues/285): it should be an aspiration to
+// TODO(https://github.com/signalapp/libsignal/issues/285): it should be an aspiration to
 // eventually warn and then error for public members without docstrings. Also see
 // https://doc.rust-lang.org/rustdoc/what-to-include.html for background.
 // #![warn(missing_docs)]

diff --git a/swift/Package.swift b/swift/Package.swift
@@ -10,24 +10,24 @@ import PackageDescription
 let rustBuildDir = "../target/debug/"
 
 let package = Package(
-    name: "SignalClient",
+    name: "LibSignalClient",
     products: [
         .library(
-            name: "SignalClient",
-            targets: ["SignalClient"]
+            name: "LibSignalClient",
+            targets: ["LibSignalClient"]
         )
     ],
     dependencies: [],
     targets: [
         .systemLibrary(name: "SignalFfi"),
         .target(
-            name: "SignalClient",
+            name: "LibSignalClient",
             dependencies: ["SignalFfi"],
             exclude: ["Logging.m"]
         ),
         .testTarget(
-            name: "SignalClientTests",
-            dependencies: ["SignalClient"],
+            name: "LibSignalClientTests",
+            dependencies: ["LibSignalClient"],
             linkerSettings: [.unsafeFlags(["-L\(rustBuildDir)"])]
         )
     ]

diff --git a/swift/PodLibLint.xcconfig b/swift/PodLibLint.xcconfig
@@ -1,5 +1,5 @@
 // Disable arm64 simulator builds for `pod lib lint`.
-// Not only does SignalClient not support it yet,
+// Not only does LibSignalClient not support it yet,
 // but neither do some of its indirect dependencies.
 //
 // This *ought* to be limited to [sdk=iphonesimulator*],

diff --git a/swift/README.md b/swift/README.md
@@ -5,35 +5,35 @@ This is a binding to the Signal client code in rust/, implemented on top of the
 
 # Use as CocoaPod
 
-1. Make sure you are using `use_frameworks!` in your Podfile. SignalClient is a Swift pod and as such cannot be compiled as a plain library.
+1. Make sure you are using `use_frameworks!` in your Podfile. LibSignalClient is a Swift pod and as such cannot be compiled as a plain library.
 
-2. Add 'SignalClient' and 'SignalCoreKit' as dependencies in your Podfile:
+2. Add 'LibSignalClient' and 'SignalCoreKit' as dependencies in your Podfile:
 
-        pod 'SignalClient', git: 'https://github.com/signalapp/libsignal-client.git'
+        pod 'LibSignalClient', git: 'https://github.com/signalapp/libsignal.git'
         pod 'SignalCoreKit', git: 'https://github.com/signalapp/SignalCoreKit.git'
 
 3. Use `pod install` or `pod update` to build the Rust library for all targets. You may be prompted to install Rust dependencies (`cbindgen`, `rust-src`, `xargo`).
 
-4. Build as usual. The Rust library will automatically be linked into the built SignalClient.framework.
+4. Build as usual. The Rust library will automatically be linked into the built LibSignalClient.framework.
 
 
 ## Development as a CocoaPod
 
-Instead of a git-based dependency, use a path-based dependency to treat SignalClient as a development pod. Since [`prepare_command`s][pc] are not run for path-based dependencies, you will need to build the Rust library yourself. (Xcode should prompt you to do this if you forget.)
+Instead of a git-based dependency, use a path-based dependency to treat LibSignalClient as a development pod. Since [`prepare_command`s][pc] are not run for path-based dependencies, you will need to build the Rust library yourself. (Xcode should prompt you to do this if you forget.)
 
     CARGO_BUILD_TARGET=x86_64-apple-ios swift/build_ffi.sh --release
 
 The CocoaPod is configured to use the release build of the Rust library.
 
-If validating SignalClient locally, use the following invocation:
+If validating LibSignalClient locally, use the following invocation:
 
     XCODE_XCCONFIG_FILE=swift/PodLibLint.xcconfig pod lib lint \
       --platforms=ios \
       --include-podspecs=../SignalCoreKit/SignalCoreKit.podspec \
       --skip-import-validation \
       --verbose
 
-You will also need to have [SignalCoreKit][] checked out; the above command assumes you have checked it out as a sibling directory to libsignal-client.
+You will also need to have [SignalCoreKit][] checked out; the above command assumes you have checked it out as a sibling directory to libsignal.
 
 When exposing new APIs to Swift, you will need to add the `--generate-ffi` flag to your
 `build_ffi.sh` invocation.

diff --git a/swift/Sources/SignalClient/Address.swift → swift/Sources/LibSignalClient/Address.swift b/swift/Sources/SignalClient/Address.swift → swift/Sources/LibSignalClient/Address.swift
diff --git a/...t/Sources/SignalClient/Aes256GcmSiv.swift → ...ources/LibSignalClient/Aes256GcmSiv.swift b/...t/Sources/SignalClient/Aes256GcmSiv.swift → ...ources/LibSignalClient/Aes256GcmSiv.swift
diff --git a/...rces/SignalClient/DataStoreInMemory.swift → ...s/LibSignalClient/DataStoreInMemory.swift b/...rces/SignalClient/DataStoreInMemory.swift → ...s/LibSignalClient/DataStoreInMemory.swift
diff --git a/...ces/SignalClient/DataStoreProtocols.swift → .../LibSignalClient/DataStoreProtocols.swift b/...ces/SignalClient/DataStoreProtocols.swift → .../LibSignalClient/DataStoreProtocols.swift
diff --git a/...Sources/SignalClient/DataStoreUtils.swift → ...rces/LibSignalClient/DataStoreUtils.swift b/...Sources/SignalClient/DataStoreUtils.swift → ...rces/LibSignalClient/DataStoreUtils.swift
diff --git a/...Sources/SignalClient/DeviceTransfer.swift → ...rces/LibSignalClient/DeviceTransfer.swift b/...Sources/SignalClient/DeviceTransfer.swift → ...rces/LibSignalClient/DeviceTransfer.swift
diff --git a/swift/Sources/SignalClient/Error.swift → swift/Sources/LibSignalClient/Error.swift b/swift/Sources/SignalClient/Error.swift → swift/Sources/LibSignalClient/Error.swift
diff --git a/swift/Sources/SignalClient/Fingerprint.swift → ...Sources/LibSignalClient/Fingerprint.swift b/swift/Sources/SignalClient/Fingerprint.swift → ...Sources/LibSignalClient/Fingerprint.swift
diff --git a/swift/Sources/SignalClient/HsmEnclave.swift → .../Sources/LibSignalClient/HsmEnclave.swift b/swift/Sources/SignalClient/HsmEnclave.swift → .../Sources/LibSignalClient/HsmEnclave.swift
diff --git a/swift/Sources/SignalClient/IdentityKey.swift → ...Sources/LibSignalClient/IdentityKey.swift b/swift/Sources/SignalClient/IdentityKey.swift → ...Sources/LibSignalClient/IdentityKey.swift
diff --git a/swift/Sources/SignalClient/Kdf.swift → swift/Sources/LibSignalClient/Kdf.swift b/swift/Sources/SignalClient/Kdf.swift → swift/Sources/LibSignalClient/Kdf.swift
diff --git a/swift/Sources/SignalClient/Logging.m → swift/Sources/LibSignalClient/Logging.m b/swift/Sources/SignalClient/Logging.m → swift/Sources/LibSignalClient/Logging.m
diff --git a/...rces/SignalClient/NativeHandleOwner.swift → ...s/LibSignalClient/NativeHandleOwner.swift b/...rces/SignalClient/NativeHandleOwner.swift → ...s/LibSignalClient/NativeHandleOwner.swift
diff --git a/swift/Sources/SignalClient/PrivateKey.swift → .../Sources/LibSignalClient/PrivateKey.swift b/swift/Sources/SignalClient/PrivateKey.swift → .../Sources/LibSignalClient/PrivateKey.swift
diff --git a/swift/Sources/SignalClient/Protocol.swift → swift/Sources/LibSignalClient/Protocol.swift b/swift/Sources/SignalClient/Protocol.swift → swift/Sources/LibSignalClient/Protocol.swift
diff --git a/swift/Sources/SignalClient/PublicKey.swift → ...t/Sources/LibSignalClient/PublicKey.swift b/swift/Sources/SignalClient/PublicKey.swift → ...t/Sources/LibSignalClient/PublicKey.swift
diff --git a/...t/Sources/SignalClient/SealedSender.swift → ...ources/LibSignalClient/SealedSender.swift b/...t/Sources/SignalClient/SealedSender.swift → ...ources/LibSignalClient/SealedSender.swift
diff --git a/...gnalClient/SealedSenderCertificates.swift → ...gnalClient/SealedSenderCertificates.swift b/...gnalClient/SealedSenderCertificates.swift → ...gnalClient/SealedSenderCertificates.swift
diff --git a/swift/Sources/SignalClient/Utils.swift → swift/Sources/LibSignalClient/Utils.swift b/swift/Sources/SignalClient/Utils.swift → swift/Sources/LibSignalClient/Utils.swift
diff --git a/...alClient/messages/CiphertextMessage.swift → ...alClient/messages/CiphertextMessage.swift b/...alClient/messages/CiphertextMessage.swift → ...alClient/messages/CiphertextMessage.swift
diff --git a/...nalClient/messages/PlaintextContent.swift → ...nalClient/messages/PlaintextContent.swift b/...nalClient/messages/PlaintextContent.swift → ...nalClient/messages/PlaintextContent.swift
diff --git a/...Client/messages/PreKeySignalMessage.swift → ...Client/messages/PreKeySignalMessage.swift b/...Client/messages/PreKeySignalMessage.swift → ...Client/messages/PreKeySignalMessage.swift
diff --git a/...ssages/SenderKeyDistributionMessage.swift → ...ssages/SenderKeyDistributionMessage.swift b/...ssages/SenderKeyDistributionMessage.swift → ...ssages/SenderKeyDistributionMessage.swift
diff --git a/...nalClient/messages/SenderKeyMessage.swift → ...nalClient/messages/SenderKeyMessage.swift b/...nalClient/messages/SenderKeyMessage.swift → ...nalClient/messages/SenderKeyMessage.swift
diff --git a/...SignalClient/messages/SignalMessage.swift → ...SignalClient/messages/SignalMessage.swift b/...SignalClient/messages/SignalMessage.swift → ...SignalClient/messages/SignalMessage.swift
diff --git a/...ces/SignalClient/state/PreKeyBundle.swift → .../LibSignalClient/state/PreKeyBundle.swift b/...ces/SignalClient/state/PreKeyBundle.swift → .../LibSignalClient/state/PreKeyBundle.swift
diff --git a/...ces/SignalClient/state/PreKeyRecord.swift → .../LibSignalClient/state/PreKeyRecord.swift b/...ces/SignalClient/state/PreKeyRecord.swift → .../LibSignalClient/state/PreKeyRecord.swift
diff --git a/.../SignalClient/state/SenderKeyRecord.swift → ...bSignalClient/state/SenderKeyRecord.swift b/.../SignalClient/state/SenderKeyRecord.swift → ...bSignalClient/state/SenderKeyRecord.swift
diff --git a/...es/SignalClient/state/SessionRecord.swift → ...LibSignalClient/state/SessionRecord.swift b/...es/SignalClient/state/SessionRecord.swift → ...LibSignalClient/state/SessionRecord.swift
diff --git a/...gnalClient/state/SignedPreKeyRecord.swift → ...gnalClient/state/SignedPreKeyRecord.swift b/...gnalClient/state/SignedPreKeyRecord.swift → ...gnalClient/state/SignedPreKeyRecord.swift
diff --git a/...SignalClient/zkgroup/AuthCredential.swift → ...SignalClient/zkgroup/AuthCredential.swift b/...SignalClient/zkgroup/AuthCredential.swift → ...SignalClient/zkgroup/AuthCredential.swift
diff --git a/.../zkgroup/AuthCredentialPresentation.swift → .../zkgroup/AuthCredentialPresentation.swift b/.../zkgroup/AuthCredentialPresentation.swift → .../zkgroup/AuthCredentialPresentation.swift
diff --git a/...ient/zkgroup/AuthCredentialResponse.swift → ...ient/zkgroup/AuthCredentialResponse.swift b/...ient/zkgroup/AuthCredentialResponse.swift → ...ient/zkgroup/AuthCredentialResponse.swift
diff --git a/...rces/SignalClient/zkgroup/ByteArray.swift → ...s/LibSignalClient/zkgroup/ByteArray.swift b/...rces/SignalClient/zkgroup/ByteArray.swift → ...s/LibSignalClient/zkgroup/ByteArray.swift
diff --git a/...ient/zkgroup/ClientZkAuthOperations.swift → ...ient/zkgroup/ClientZkAuthOperations.swift b/...ient/zkgroup/ClientZkAuthOperations.swift → ...ient/zkgroup/ClientZkAuthOperations.swift
diff --git a/...lClient/zkgroup/ClientZkGroupCipher.swift → ...lClient/zkgroup/ClientZkGroupCipher.swift b/...lClient/zkgroup/ClientZkGroupCipher.swift → ...lClient/zkgroup/ClientZkGroupCipher.swift
diff --git a/...t/zkgroup/ClientZkProfileOperations.swift → ...t/zkgroup/ClientZkProfileOperations.swift b/...t/zkgroup/ClientZkProfileOperations.swift → ...t/zkgroup/ClientZkProfileOperations.swift
diff --git a/...t/zkgroup/ClientZkReceiptOperations.swift → ...t/zkgroup/ClientZkReceiptOperations.swift b/...t/zkgroup/ClientZkReceiptOperations.swift → ...t/zkgroup/ClientZkReceiptOperations.swift
diff --git a/...ignalClient/zkgroup/GroupIdentifier.swift → ...ignalClient/zkgroup/GroupIdentifier.swift b/...ignalClient/zkgroup/GroupIdentifier.swift → ...ignalClient/zkgroup/GroupIdentifier.swift
diff --git a/...SignalClient/zkgroup/GroupMasterKey.swift → ...SignalClient/zkgroup/GroupMasterKey.swift b/...SignalClient/zkgroup/GroupMasterKey.swift → ...SignalClient/zkgroup/GroupMasterKey.swift
diff --git a/...nalClient/zkgroup/GroupPublicParams.swift → ...nalClient/zkgroup/GroupPublicParams.swift b/...nalClient/zkgroup/GroupPublicParams.swift → ...nalClient/zkgroup/GroupPublicParams.swift
diff --git a/...nalClient/zkgroup/GroupSecretParams.swift → ...nalClient/zkgroup/GroupSecretParams.swift b/...nalClient/zkgroup/GroupSecretParams.swift → ...nalClient/zkgroup/GroupSecretParams.swift
diff --git a/...ignalClient/zkgroup/NotarySignature.swift → ...ignalClient/zkgroup/NotarySignature.swift b/...ignalClient/zkgroup/NotarySignature.swift → ...ignalClient/zkgroup/NotarySignature.swift
diff --git a/.../SignalClient/zkgroup/PniCredential.swift → ...bSignalClient/zkgroup/PniCredential.swift b/.../SignalClient/zkgroup/PniCredential.swift → ...bSignalClient/zkgroup/PniCredential.swift
diff --git a/...t/zkgroup/PniCredentialPresentation.swift → ...t/zkgroup/PniCredentialPresentation.swift b/...t/zkgroup/PniCredentialPresentation.swift → ...t/zkgroup/PniCredentialPresentation.swift
diff --git a/...zkgroup/PniCredentialRequestContext.swift → ...zkgroup/PniCredentialRequestContext.swift b/...zkgroup/PniCredentialRequestContext.swift → ...zkgroup/PniCredentialRequestContext.swift
diff --git a/...lient/zkgroup/PniCredentialResponse.swift → ...lient/zkgroup/PniCredentialResponse.swift b/...lient/zkgroup/PniCredentialResponse.swift → ...lient/zkgroup/PniCredentialResponse.swift
diff --git a/...ces/SignalClient/zkgroup/ProfileKey.swift → .../LibSignalClient/zkgroup/ProfileKey.swift b/...ces/SignalClient/zkgroup/ProfileKey.swift → .../LibSignalClient/zkgroup/ProfileKey.swift
diff --git a/...Client/zkgroup/ProfileKeyCiphertext.swift → ...Client/zkgroup/ProfileKeyCiphertext.swift b/...Client/zkgroup/ProfileKeyCiphertext.swift → ...Client/zkgroup/ProfileKeyCiphertext.swift
diff --git a/...Client/zkgroup/ProfileKeyCommitment.swift → ...Client/zkgroup/ProfileKeyCommitment.swift b/...Client/zkgroup/ProfileKeyCommitment.swift → ...Client/zkgroup/ProfileKeyCommitment.swift
diff --git a/...Client/zkgroup/ProfileKeyCredential.swift → ...Client/zkgroup/ProfileKeyCredential.swift b/...Client/zkgroup/ProfileKeyCredential.swift → ...Client/zkgroup/ProfileKeyCredential.swift
diff --git a/...up/ProfileKeyCredentialPresentation.swift → ...up/ProfileKeyCredentialPresentation.swift b/...up/ProfileKeyCredentialPresentation.swift → ...up/ProfileKeyCredentialPresentation.swift
diff --git a/...zkgroup/ProfileKeyCredentialRequest.swift → ...zkgroup/ProfileKeyCredentialRequest.swift b/...zkgroup/ProfileKeyCredentialRequest.swift → ...zkgroup/ProfileKeyCredentialRequest.swift
diff --git a/.../ProfileKeyCredentialRequestContext.swift → .../ProfileKeyCredentialRequestContext.swift b/.../ProfileKeyCredentialRequestContext.swift → .../ProfileKeyCredentialRequestContext.swift
diff --git a/...kgroup/ProfileKeyCredentialResponse.swift → ...kgroup/ProfileKeyCredentialResponse.swift b/...kgroup/ProfileKeyCredentialResponse.swift → ...kgroup/ProfileKeyCredentialResponse.swift
diff --git a/...nalClient/zkgroup/ProfileKeyVersion.swift → ...nalClient/zkgroup/ProfileKeyVersion.swift b/...nalClient/zkgroup/ProfileKeyVersion.swift → ...nalClient/zkgroup/ProfileKeyVersion.swift
diff --git a/...ces/SignalClient/zkgroup/Randomness.swift → .../LibSignalClient/zkgroup/Randomness.swift b/...ces/SignalClient/zkgroup/Randomness.swift → .../LibSignalClient/zkgroup/Randomness.swift
diff --git a/...nalClient/zkgroup/ReceiptCredential.swift → ...nalClient/zkgroup/ReceiptCredential.swift b/...nalClient/zkgroup/ReceiptCredential.swift → ...nalClient/zkgroup/ReceiptCredential.swift
diff --git a/...group/ReceiptCredentialPresentation.swift → ...group/ReceiptCredentialPresentation.swift b/...group/ReceiptCredentialPresentation.swift → ...group/ReceiptCredentialPresentation.swift
diff --git a/...nt/zkgroup/ReceiptCredentialRequest.swift → ...nt/zkgroup/ReceiptCredentialRequest.swift b/...nt/zkgroup/ReceiptCredentialRequest.swift → ...nt/zkgroup/ReceiptCredentialRequest.swift
diff --git a/...oup/ReceiptCredentialRequestContext.swift → ...oup/ReceiptCredentialRequestContext.swift b/...oup/ReceiptCredentialRequestContext.swift → ...oup/ReceiptCredentialRequestContext.swift
diff --git a/...t/zkgroup/ReceiptCredentialResponse.swift → ...t/zkgroup/ReceiptCredentialResponse.swift b/...t/zkgroup/ReceiptCredentialResponse.swift → ...t/zkgroup/ReceiptCredentialResponse.swift
diff --git a/.../SignalClient/zkgroup/ReceiptSerial.swift → ...bSignalClient/zkgroup/ReceiptSerial.swift b/.../SignalClient/zkgroup/ReceiptSerial.swift → ...bSignalClient/zkgroup/ReceiptSerial.swift
diff --git a/...alClient/zkgroup/ServerPublicParams.swift → ...alClient/zkgroup/ServerPublicParams.swift b/...alClient/zkgroup/ServerPublicParams.swift → ...alClient/zkgroup/ServerPublicParams.swift
diff --git a/...alClient/zkgroup/ServerSecretParams.swift → ...alClient/zkgroup/ServerSecretParams.swift b/...alClient/zkgroup/ServerSecretParams.swift → ...alClient/zkgroup/ServerSecretParams.swift
diff --git a/...ient/zkgroup/ServerZkAuthOperations.swift → ...ient/zkgroup/ServerZkAuthOperations.swift b/...ient/zkgroup/ServerZkAuthOperations.swift → ...ient/zkgroup/ServerZkAuthOperations.swift
diff --git a/...t/zkgroup/ServerZkProfileOperations.swift → ...t/zkgroup/ServerZkProfileOperations.swift b/...t/zkgroup/ServerZkProfileOperations.swift → ...t/zkgroup/ServerZkProfileOperations.swift
diff --git a/...t/zkgroup/ServerZkReceiptOperations.swift → ...t/zkgroup/ServerZkReceiptOperations.swift b/...t/zkgroup/ServerZkReceiptOperations.swift → ...t/zkgroup/ServerZkReceiptOperations.swift
diff --git a/...SignalClient/zkgroup/UuidCiphertext.swift → ...SignalClient/zkgroup/UuidCiphertext.swift b/...SignalClient/zkgroup/UuidCiphertext.swift → ...SignalClient/zkgroup/UuidCiphertext.swift
diff --git a/...lientTests/ClonableHandleOwnerTests.swift → ...lientTests/ClonableHandleOwnerTests.swift b/...lientTests/ClonableHandleOwnerTests.swift → ...lientTests/ClonableHandleOwnerTests.swift
@@ -4,7 +4,7 @@
 //
 
 import XCTest
-@testable import SignalClient
+@testable import LibSignalClient
 
 private struct FakeHandle {
     // We're using the tuple to guarantee in-memory layout for this test.