diff --git a/Example/TSKitiOSTestApp/Podfile.lock b/Example/TSKitiOSTestApp/Podfile.lock
index 999134210..fc99c597f 100644
--- a/Example/TSKitiOSTestApp/Podfile.lock
+++ b/Example/TSKitiOSTestApp/Podfile.lock
@@ -28,16 +28,16 @@ PODS:
   - CocoaLumberjack/Extensions (2.2.0):
     - CocoaLumberjack/Default
   - HKDFKit (0.0.3)
-  - libPhoneNumber-iOS (0.8.10)
+  - libPhoneNumber-iOS (0.8.11)
   - Mantle (2.0.6):
     - Mantle/extobjc (= 2.0.6)
   - Mantle/extobjc (2.0.6)
-  - ProtocolBuffers (1.9.9.2)
+  - ProtocolBuffers (1.9.10)
   - SocketRocket-PinningPolicy (0.4.3)
   - SQLCipher/common (3.3.1)
   - SQLCipher/fts (3.3.1):
     - SQLCipher/common
-  - SSKeychain (1.3.1)
+  - SSKeychain (1.4.0)
   - TextSecureKit (0.0.4):
     - '25519'
     - AFNetworking
@@ -52,9 +52,48 @@ PODS:
   - TwistedOakCollapsingFutures (1.0.0):
     - UnionFind (~> 1.0)
   - UnionFind (1.0.1)
-  - YapDatabase/SQLCipher (2.7.7):
+  - YapDatabase/SQLCipher (2.8.3):
+    - YapDatabase/SQLCipher/Core (= 2.8.3)
+    - YapDatabase/SQLCipher/Extensions (= 2.8.3)
+  - YapDatabase/SQLCipher/Core (2.8.3):
     - CocoaLumberjack (~> 2)
     - SQLCipher/fts
+  - YapDatabase/SQLCipher/Extensions (2.8.3):
+    - YapDatabase/SQLCipher/Core
+    - YapDatabase/SQLCipher/Extensions/CloudKit (= 2.8.3)
+    - YapDatabase/SQLCipher/Extensions/ConnectionProxy (= 2.8.3)
+    - YapDatabase/SQLCipher/Extensions/FilteredViews (= 2.8.3)
+    - YapDatabase/SQLCipher/Extensions/FullTextSearch (= 2.8.3)
+    - YapDatabase/SQLCipher/Extensions/Hooks (= 2.8.3)
+    - YapDatabase/SQLCipher/Extensions/Relationships (= 2.8.3)
+    - YapDatabase/SQLCipher/Extensions/RTreeIndex (= 2.8.3)
+    - YapDatabase/SQLCipher/Extensions/SearchResults (= 2.8.3)
+    - YapDatabase/SQLCipher/Extensions/SecondaryIndex (= 2.8.3)
+    - YapDatabase/SQLCipher/Extensions/SecondaryIndex (= 2.8.3)
+    - YapDatabase/SQLCipher/Extensions/Views (= 2.8.3)
+  - YapDatabase/SQLCipher/Extensions/CloudKit (2.8.3):
+    - YapDatabase/SQLCipher/Core
+  - YapDatabase/SQLCipher/Extensions/ConnectionProxy (2.8.3):
+    - YapDatabase/SQLCipher/Core
+  - YapDatabase/SQLCipher/Extensions/FilteredViews (2.8.3):
+    - YapDatabase/SQLCipher/Core
+    - YapDatabase/SQLCipher/Extensions/Views
+  - YapDatabase/SQLCipher/Extensions/FullTextSearch (2.8.3):
+    - YapDatabase/SQLCipher/Core
+  - YapDatabase/SQLCipher/Extensions/Hooks (2.8.3):
+    - YapDatabase/SQLCipher/Core
+  - YapDatabase/SQLCipher/Extensions/Relationships (2.8.3):
+    - YapDatabase/SQLCipher/Core
+  - YapDatabase/SQLCipher/Extensions/RTreeIndex (2.8.3):
+    - YapDatabase/SQLCipher/Core
+  - YapDatabase/SQLCipher/Extensions/SearchResults (2.8.3):
+    - YapDatabase/SQLCipher/Core
+    - YapDatabase/SQLCipher/Extensions/FullTextSearch
+    - YapDatabase/SQLCipher/Extensions/Views
+  - YapDatabase/SQLCipher/Extensions/SecondaryIndex (2.8.3):
+    - YapDatabase/SQLCipher/Core
+  - YapDatabase/SQLCipher/Extensions/Views (2.8.3):
+    - YapDatabase/SQLCipher/Core
 
 DEPENDENCIES:
   - TextSecureKit (from `../../TextSecureKit.podspec`)
@@ -69,15 +108,15 @@ SPEC CHECKSUMS:
   AxolotlKit: a33962f26943990e5d69d05b30470cea18caeed0
   CocoaLumberjack: 17fe8581f84914d5d7e6360f7c70022b173c3ae0
   HKDFKit: c058305d6f64b84f28c50bd7aa89574625bcb62a
-  libPhoneNumber-iOS: 7bfd00f843fdcd82b5182b463e8eb3b27579f41d
+  libPhoneNumber-iOS: ded33fab2c51ee847979556aa504c9e70f32d703
   Mantle: 299966b00759634931699f69cb6a30b9239b944d
-  ProtocolBuffers: 7111461618460961e6b7469177ec45ee551b4f0e
+  ProtocolBuffers: d088180c10072b3d24a9939a6314b7b9bcc2340b
   SocketRocket-PinningPolicy: f2ef00c3927bac05cd04d9d5171f82d922b40d3d
   SQLCipher: d490d2effe735895d2204d25a154b1e722278421
-  SSKeychain: 04c4ec40f4c3deda524e269bc76e5f30e638a174
+  SSKeychain: c71293fa57216a40ab06c23f4085387583293de4
   TextSecureKit: b7419cbc792e5be4cbfd93a4da340f7a51d7bc41
   TwistedOakCollapsingFutures: f359b90f203e9ab13dfb92c9ff41842a7fe1cd0c
   UnionFind: c33be5adb12983981d6e827ea94fc7f9e370f52d
-  YapDatabase: a7a1ae3e0f89c319e3b22615c2351987fbbdbded
+  YapDatabase: 15b6867a07ff30eac3af28794cd2262b4d0ca4ca
 
 COCOAPODS: 0.39.0
diff --git a/README.md b/README.md
index 3a1d83879..584ef9f95 100644
--- a/README.md
+++ b/README.md
@@ -1 +1 @@
-# TextSecureKit
+# SignalServiceKit
diff --git a/TextSecureKit.podspec b/SignalServiceKit.podspec
similarity index 87%
rename from TextSecureKit.podspec
rename to SignalServiceKit.podspec
index 13492db1e..dc2621a1e 100644
--- a/TextSecureKit.podspec
+++ b/SignalServiceKit.podspec
@@ -7,18 +7,18 @@
 #
 
 Pod::Spec.new do |s|
-  s.name             = "TextSecureKit"
+  s.name             = "SignalServiceKit"
   s.version          = "0.0.4"
-  s.summary          = "An Objective-C library for communicating via TextSecure."
+  s.summary          = "An Objective-C library for communicating with the Signal messaging service."
 
   s.description      = <<-DESC
   TextSecureKit is a library for the TextSecure protocol for iOS & OS X
                        DESC
 
-  s.homepage         = "https://github.com/WhisperSystems/TextSecureKit"
+  s.homepage         = "https://github.com/WhisperSystems/SignalServiceKit"
   s.license          = 'GPLv3'
   s.author           = { "Frederic Jacobs" => "github@fredericjacobs.com" }
-  s.source           = { :git => "https://github.com/WhisperSystems/TextSecureKit.git", :tag => s.version.to_s }
+  s.source           = { :git => "https://github.com/WhisperSystems/SignalServiceKit.git", :tag => s.version.to_s }
   s.social_media_url = 'https://twitter.com/FredericJacobs'
 
   s.platform     = :ios, '8.0'
diff --git a/src/Messages/TSMessagesManager+sendMessages.m b/src/Messages/TSMessagesManager+sendMessages.m
index 9cff1a3fe..08647dc56 100644
--- a/src/Messages/TSMessagesManager+sendMessages.m
+++ b/src/Messages/TSMessagesManager+sendMessages.m
@@ -12,11 +12,11 @@
 #import <AxolotlKit/SessionBuilder.h>
 #import <AxolotlKit/SessionCipher.h>
 #import <Mantle/Mantle.h>
-#import <TextSecureKit/TSAccountManager.h>
 #import <TwistedOakCollapsingFutures/CollapsingFutures.h>
 #import "ContactsUpdater.h"
 #import "NSData+messagePadding.h"
 #import "PreKeyBundle+jsonDict.h"
+#import "TSAccountManager.h"
 #import "TSAttachmentStream.h"
 #import "TSInfoMessage.h"
 #import "TSNetworkManager.h"
@@ -48,7 +48,7 @@ dispatch_queue_t sendingQueue() {
               success:(void (^)(NSArray<SignalRecipient *> *))success
               failure:(void (^)(NSError *error))failure {
     NSMutableArray<SignalRecipient *> *recipients = [NSMutableArray array];
-    
+
     __block NSError *latestError;
     for (NSString *recipientId in identifiers) {
         __block SignalRecipient *recipient;
@@ -56,7 +56,7 @@ dispatch_queue_t sendingQueue() {
           recipient = [SignalRecipient recipientWithTextSecureIdentifier:recipientId withTransaction:transaction];
         }];
 
-        
+
         if (!recipient) {
             [[self contactUpdater] synchronousLookup:recipientId
                 success:^(SignalRecipient *newRecipient) {
@@ -76,7 +76,7 @@ dispatch_queue_t sendingQueue() {
     } else {
         failure(latestError);
     }
-    
+
     return;
 }
 
diff --git a/src/Messages/TSMessagesManager.m b/src/Messages/TSMessagesManager.m
index 647b86b41..3faf261da 100644
--- a/src/Messages/TSMessagesManager.m
+++ b/src/Messages/TSMessagesManager.m
@@ -10,9 +10,9 @@
 
 #import <AxolotlKit/AxolotlExceptions.h>
 #import <AxolotlKit/SessionCipher.h>
-#import <TextSecureKit/TSAccountManager.h>
 
 #import "NSData+messagePadding.h"
+#import "TSAccountManager.h"
 #import "TSAttachmentStream.h"
 #import "TSCall.h"
 #import "TSDatabaseView.h"