diff --git a/Package.swift b/Package.swift
index 17b7e29..4d50e18 100644
--- a/Package.swift
+++ b/Package.swift
@@ -2,17 +2,17 @@
 import PackageDescription
 
 let package = Package(
-    name: "SwiftSignal",
+    name: "SignalProtocol",
     products: [
         .library(
-            name: "SwiftSignal",
-            targets: ["SwiftSignal"]
+            name: "SignalProtocol",
+            targets: ["SignalProtocol"]
         )
     ],
     dependencies: [],
     targets: [
         .systemLibrary(name: "SignalFfi", pkgConfig: "signal_ffi"),
-        .target(name: "SwiftSignal", dependencies: ["SignalFfi"]),
-        .testTarget(name: "SwiftSignalTests", dependencies: ["SwiftSignal"])
+        .target(name: "SignalProtocol", dependencies: ["SignalFfi"]),
+        .testTarget(name: "SignalProtocolTests", dependencies: ["SignalProtocol"])
     ]
 )
diff --git a/Sources/SwiftSignal/Address.swift b/Sources/SignalProtocol/Address.swift
similarity index 100%
rename from Sources/SwiftSignal/Address.swift
rename to Sources/SignalProtocol/Address.swift
diff --git a/Sources/SwiftSignal/ClonableHandleOwner.swift b/Sources/SignalProtocol/ClonableHandleOwner.swift
similarity index 100%
rename from Sources/SwiftSignal/ClonableHandleOwner.swift
rename to Sources/SignalProtocol/ClonableHandleOwner.swift
diff --git a/Sources/SwiftSignal/DataStoreInMemory.swift b/Sources/SignalProtocol/DataStoreInMemory.swift
similarity index 100%
rename from Sources/SwiftSignal/DataStoreInMemory.swift
rename to Sources/SignalProtocol/DataStoreInMemory.swift
diff --git a/Sources/SwiftSignal/DataStoreProtocols.swift b/Sources/SignalProtocol/DataStoreProtocols.swift
similarity index 100%
rename from Sources/SwiftSignal/DataStoreProtocols.swift
rename to Sources/SignalProtocol/DataStoreProtocols.swift
diff --git a/Sources/SwiftSignal/Error.swift b/Sources/SignalProtocol/Error.swift
similarity index 100%
rename from Sources/SwiftSignal/Error.swift
rename to Sources/SignalProtocol/Error.swift
diff --git a/Sources/SwiftSignal/Fingerprint.swift b/Sources/SignalProtocol/Fingerprint.swift
similarity index 100%
rename from Sources/SwiftSignal/Fingerprint.swift
rename to Sources/SignalProtocol/Fingerprint.swift
diff --git a/Sources/SwiftSignal/IdentityKey.swift b/Sources/SignalProtocol/IdentityKey.swift
similarity index 100%
rename from Sources/SwiftSignal/IdentityKey.swift
rename to Sources/SignalProtocol/IdentityKey.swift
diff --git a/Sources/SwiftSignal/Kdf.swift b/Sources/SignalProtocol/Kdf.swift
similarity index 100%
rename from Sources/SwiftSignal/Kdf.swift
rename to Sources/SignalProtocol/Kdf.swift
diff --git a/Sources/SwiftSignal/PrivateKey.swift b/Sources/SignalProtocol/PrivateKey.swift
similarity index 100%
rename from Sources/SwiftSignal/PrivateKey.swift
rename to Sources/SignalProtocol/PrivateKey.swift
diff --git a/Sources/SwiftSignal/Protocol.swift b/Sources/SignalProtocol/Protocol.swift
similarity index 100%
rename from Sources/SwiftSignal/Protocol.swift
rename to Sources/SignalProtocol/Protocol.swift
diff --git a/Sources/SwiftSignal/PublicKey.swift b/Sources/SignalProtocol/PublicKey.swift
similarity index 100%
rename from Sources/SwiftSignal/PublicKey.swift
rename to Sources/SignalProtocol/PublicKey.swift
diff --git a/Sources/SwiftSignal/SenderKeyName.swift b/Sources/SignalProtocol/SenderKeyName.swift
similarity index 100%
rename from Sources/SwiftSignal/SenderKeyName.swift
rename to Sources/SignalProtocol/SenderKeyName.swift
diff --git a/Sources/SwiftSignal/Utils.swift b/Sources/SignalProtocol/Utils.swift
similarity index 100%
rename from Sources/SwiftSignal/Utils.swift
rename to Sources/SignalProtocol/Utils.swift
diff --git a/Sources/SwiftSignal/messages/CiphertextMessage.swift b/Sources/SignalProtocol/messages/CiphertextMessage.swift
similarity index 100%
rename from Sources/SwiftSignal/messages/CiphertextMessage.swift
rename to Sources/SignalProtocol/messages/CiphertextMessage.swift
diff --git a/Sources/SwiftSignal/messages/PreKeySignalMessage.swift b/Sources/SignalProtocol/messages/PreKeySignalMessage.swift
similarity index 100%
rename from Sources/SwiftSignal/messages/PreKeySignalMessage.swift
rename to Sources/SignalProtocol/messages/PreKeySignalMessage.swift
diff --git a/Sources/SwiftSignal/messages/SenderKeyDistributionMessage.swift b/Sources/SignalProtocol/messages/SenderKeyDistributionMessage.swift
similarity index 100%
rename from Sources/SwiftSignal/messages/SenderKeyDistributionMessage.swift
rename to Sources/SignalProtocol/messages/SenderKeyDistributionMessage.swift
diff --git a/Sources/SwiftSignal/messages/SenderKeyMessage.swift b/Sources/SignalProtocol/messages/SenderKeyMessage.swift
similarity index 100%
rename from Sources/SwiftSignal/messages/SenderKeyMessage.swift
rename to Sources/SignalProtocol/messages/SenderKeyMessage.swift
diff --git a/Sources/SwiftSignal/messages/SignalMessage.swift b/Sources/SignalProtocol/messages/SignalMessage.swift
similarity index 100%
rename from Sources/SwiftSignal/messages/SignalMessage.swift
rename to Sources/SignalProtocol/messages/SignalMessage.swift
diff --git a/Sources/SwiftSignal/state/PreKeyBundle.swift b/Sources/SignalProtocol/state/PreKeyBundle.swift
similarity index 100%
rename from Sources/SwiftSignal/state/PreKeyBundle.swift
rename to Sources/SignalProtocol/state/PreKeyBundle.swift
diff --git a/Sources/SwiftSignal/state/PreKeyRecord.swift b/Sources/SignalProtocol/state/PreKeyRecord.swift
similarity index 100%
rename from Sources/SwiftSignal/state/PreKeyRecord.swift
rename to Sources/SignalProtocol/state/PreKeyRecord.swift
diff --git a/Sources/SwiftSignal/state/SenderKeyRecord.swift b/Sources/SignalProtocol/state/SenderKeyRecord.swift
similarity index 100%
rename from Sources/SwiftSignal/state/SenderKeyRecord.swift
rename to Sources/SignalProtocol/state/SenderKeyRecord.swift
diff --git a/Sources/SwiftSignal/state/SessionRecord.swift b/Sources/SignalProtocol/state/SessionRecord.swift
similarity index 100%
rename from Sources/SwiftSignal/state/SessionRecord.swift
rename to Sources/SignalProtocol/state/SessionRecord.swift
diff --git a/Sources/SwiftSignal/state/SignedPreKeyRecord.swift b/Sources/SignalProtocol/state/SignedPreKeyRecord.swift
similarity index 100%
rename from Sources/SwiftSignal/state/SignedPreKeyRecord.swift
rename to Sources/SignalProtocol/state/SignedPreKeyRecord.swift
diff --git a/Tests/LinuxMain.swift b/Tests/LinuxMain.swift
index a6a897e..3707ad3 100644
--- a/Tests/LinuxMain.swift
+++ b/Tests/LinuxMain.swift
@@ -1,6 +1,6 @@
 import XCTest
-@testable import SwiftSignalTests
+@testable import SignalProtocolTests
 
 XCTMain([
-     testCase(SwiftSignalTests.allTests)
+     testCase(SignalProtocolTests.allTests)
 ])
diff --git a/Tests/SwiftSignalTests/SwiftSignalTests.swift b/Tests/SignalProtocolTests/SignalProtocolTests.swift
similarity index 99%
rename from Tests/SwiftSignalTests/SwiftSignalTests.swift
rename to Tests/SignalProtocolTests/SignalProtocolTests.swift
index 6fb3d38..2bdfd20 100644
--- a/Tests/SwiftSignalTests/SwiftSignalTests.swift
+++ b/Tests/SignalProtocolTests/SignalProtocolTests.swift
@@ -1,7 +1,7 @@
 import XCTest
-@testable import SwiftSignal
+@testable import SignalProtocol
 
-class SwiftSignalTests: XCTestCase {
+class SignalProtocolTests: XCTestCase {
     func testHkdf() {
 
         let ikm : [UInt8] = [
@@ -296,7 +296,7 @@ class SwiftSignalTests: XCTestCase {
         XCTAssertEqual(ptext2_a, ptext2_b)
     }
 
-    static var allTests: [(String, (SwiftSignalTests) -> () throws -> Void)] {
+    static var allTests: [(String, (SignalProtocolTests) -> () throws -> Void)] {
         return [
           ("testAddreses", testAddress),
           ("testFingerprint", testFingerprint),