diff --git a/Pods b/Pods
index f62516a6d..d16f91410 160000
--- a/Pods
+++ b/Pods
@@ -1 +1 @@
-Subproject commit f62516a6d38a44a322bd115f913e83e2941e404f
+Subproject commit d16f91410fa1d9859a910b6f2b6e2369fb6d0377
diff --git a/Signal/src/Models/OWSDeviceProvisioningURLParser.m b/Signal/src/Models/OWSDeviceProvisioningURLParser.m
index 2fd15bce8..964c4fdf3 100644
--- a/Signal/src/Models/OWSDeviceProvisioningURLParser.m
+++ b/Signal/src/Models/OWSDeviceProvisioningURLParser.m
@@ -1,7 +1,9 @@
-//  Copyright © 2016 Open Whisper Systems. All rights reserved.
+//
+//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//
 
 #import "OWSDeviceProvisioningURLParser.h"
-#import "NSData+Base64.h"
+#import "NSData+OWS.h"
 #import <AxolotlKit/NSData+keyVersionByte.h>
 
 NS_ASSUME_NONNULL_BEGIN
diff --git a/Signal/src/Signal-Bridging-Header.h b/Signal/src/Signal-Bridging-Header.h
index 39527ac50..6d7258bc5 100644
--- a/Signal/src/Signal-Bridging-Header.h
+++ b/Signal/src/Signal-Bridging-Header.h
@@ -72,8 +72,8 @@
 #import <SignalServiceKit/Cryptography.h>
 #import <SignalServiceKit/DataSource.h>
 #import <SignalServiceKit/MIMETypeUtil.h>
-#import <SignalServiceKit/NSData+Base64.h>
 #import <SignalServiceKit/NSData+Image.h>
+#import <SignalServiceKit/NSData+OWS.h>
 #import <SignalServiceKit/NSDate+OWS.h>
 #import <SignalServiceKit/NSNotificationCenter+OWS.h>
 #import <SignalServiceKit/NSString+SSK.h>
diff --git a/Signal/src/util/OWSBackupExportJob.m b/Signal/src/util/OWSBackupExportJob.m
index c4968fa00..fc01ecac5 100644
--- a/Signal/src/util/OWSBackupExportJob.m
+++ b/Signal/src/util/OWSBackupExportJob.m
@@ -6,7 +6,7 @@
 #import "OWSBackupIO.h"
 #import "OWSDatabaseMigration.h"
 #import "Signal-Swift.h"
-#import <SignalServiceKit/NSData+Base64.h>
+#import <SignalServiceKit/NSData+OWS.h>
 #import <SignalServiceKit/NSDate+OWS.h>
 #import <SignalServiceKit/OWSBackgroundTask.h>
 #import <SignalServiceKit/OWSError.h>
diff --git a/Signal/src/util/OWSBackupImportJob.m b/Signal/src/util/OWSBackupImportJob.m
index cd4f617cc..e7421e409 100644
--- a/Signal/src/util/OWSBackupImportJob.m
+++ b/Signal/src/util/OWSBackupImportJob.m
@@ -7,7 +7,7 @@
 #import "OWSDatabaseMigration.h"
 #import "OWSDatabaseMigrationRunner.h"
 #import "Signal-Swift.h"
-#import <SignalServiceKit/NSData+Base64.h>
+#import <SignalServiceKit/NSData+OWS.h>
 #import <SignalServiceKit/OWSBackgroundTask.h>
 #import <SignalServiceKit/OWSFileSystem.h>
 #import <SignalServiceKit/TSAttachment.h>
diff --git a/Signal/test/Models/OWSDeviceProvisioningURLParserTest.m b/Signal/test/Models/OWSDeviceProvisioningURLParserTest.m
index 12f91e3be..8af07e92a 100644
--- a/Signal/test/Models/OWSDeviceProvisioningURLParserTest.m
+++ b/Signal/test/Models/OWSDeviceProvisioningURLParserTest.m
@@ -1,7 +1,9 @@
-//  Copyright © 2016 Open Whisper Systems. All rights reserved.
+//
+//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//
 
 #import "OWSDeviceProvisioningURLParser.h"
-#import <SignalServiceKit/NSData+Base64.h>
+#import <SignalServiceKit/NSData+OWS.h>
 #import <XCTest/XCTest.h>
 
 @interface OWSDeviceProvisioningURLParserTest : XCTestCase
diff --git a/Signal/test/util/CDSSigningCertificateTest.m b/Signal/test/util/CDSSigningCertificateTest.m
index d87e3b173..25825c2d1 100644
--- a/Signal/test/util/CDSSigningCertificateTest.m
+++ b/Signal/test/util/CDSSigningCertificateTest.m
@@ -3,7 +3,6 @@
 //
 
 #import <SignalServiceKit/CDSSigningCertificate.h>
-#import <SignalServiceKit/NSData+Base64.h>
 #import <SignalServiceKit/NSData+OWS.h>
 #import <XCTest/XCTest.h>
 
diff --git a/SignalServiceKit/src/Account/TSAccountManager.m b/SignalServiceKit/src/Account/TSAccountManager.m
index c5839fb0c..79569e738 100644
--- a/SignalServiceKit/src/Account/TSAccountManager.m
+++ b/SignalServiceKit/src/Account/TSAccountManager.m
@@ -4,8 +4,6 @@
 
 #import "TSAccountManager.h"
 #import "AppContext.h"
-#import "Cryptography.h"
-#import "NSData+Base64.h"
 #import "NSData+OWS.h"
 #import "NSNotificationCenter+OWS.h"
 #import "NSURLSessionDataTask+StatusCode.h"
diff --git a/SignalServiceKit/src/Contacts/CDSSigningCertificate.m b/SignalServiceKit/src/Contacts/CDSSigningCertificate.m
index 03398914f..7f8af2f3d 100644
--- a/SignalServiceKit/src/Contacts/CDSSigningCertificate.m
+++ b/SignalServiceKit/src/Contacts/CDSSigningCertificate.m
@@ -4,7 +4,6 @@
 
 #import "CDSSigningCertificate.h"
 #import "Cryptography.h"
-#import "NSData+Base64.h"
 #import "NSData+OWS.h"
 #import <CommonCrypto/CommonCrypto.h>
 #import <openssl/x509.h>
diff --git a/SignalServiceKit/src/Contacts/Threads/TSGroupThread.m b/SignalServiceKit/src/Contacts/Threads/TSGroupThread.m
index 13341b9cd..98a3ded81 100644
--- a/SignalServiceKit/src/Contacts/Threads/TSGroupThread.m
+++ b/SignalServiceKit/src/Contacts/Threads/TSGroupThread.m
@@ -3,7 +3,7 @@
 //
 
 #import "TSGroupThread.h"
-#import "NSData+Base64.h"
+#import "NSData+OWS.h"
 #import "TSAttachmentStream.h"
 #import <SignalServiceKit/TSAccountManager.h>
 #import <YapDatabase/YapDatabaseConnection.h>
diff --git a/SignalServiceKit/src/Messages/OWSMessageServiceParams.m b/SignalServiceKit/src/Messages/OWSMessageServiceParams.m
index bf7665186..efed386da 100644
--- a/SignalServiceKit/src/Messages/OWSMessageServiceParams.m
+++ b/SignalServiceKit/src/Messages/OWSMessageServiceParams.m
@@ -1,9 +1,9 @@
 //
-//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
 //
 
 #import "OWSMessageServiceParams.h"
-#import "NSData+Base64.h"
+#import "NSData+OWS.h"
 #import "TSConstants.h"
 
 @implementation OWSMessageServiceParams
diff --git a/SignalServiceKit/src/Messages/PreKeyBundle+jsonDict.m b/SignalServiceKit/src/Messages/PreKeyBundle+jsonDict.m
index 4aa5b8eff..4f03207a0 100644
--- a/SignalServiceKit/src/Messages/PreKeyBundle+jsonDict.m
+++ b/SignalServiceKit/src/Messages/PreKeyBundle+jsonDict.m
@@ -1,9 +1,9 @@
 //
-//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
 //
 
+#import "NSData+OWS.h"
 #import "PreKeyBundle+jsonDict.h"
-#import "NSData+Base64.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Network/API/OWSRequestBuilder.m b/SignalServiceKit/src/Network/API/OWSRequestBuilder.m
index 9b943ce70..ff1340434 100644
--- a/SignalServiceKit/src/Network/API/OWSRequestBuilder.m
+++ b/SignalServiceKit/src/Network/API/OWSRequestBuilder.m
@@ -1,11 +1,11 @@
 //
-//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
 //
 
 #import "OWSRequestBuilder.h"
-#import "TSRequest.h"
+#import "NSData+OWS.h"
 #import "TSConstants.h"
-#import "NSData+Base64.h"
+#import "TSRequest.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m
index 8beb06972..ef3ab2003 100644
--- a/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m
+++ b/SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m
@@ -3,7 +3,7 @@
 //
 
 #import "OWSRequestFactory.h"
-#import "NSData+Base64.h"
+#import "NSData+OWS.h"
 #import "OWS2FAManager.h"
 #import "OWSDevice.h"
 #import "TSAttributes.h"
diff --git a/SignalServiceKit/src/Security/OWSFingerprint.m b/SignalServiceKit/src/Security/OWSFingerprint.m
index 95f05e5c1..62cc1a640 100644
--- a/SignalServiceKit/src/Security/OWSFingerprint.m
+++ b/SignalServiceKit/src/Security/OWSFingerprint.m
@@ -3,7 +3,7 @@
 //
 
 #import "OWSFingerprint.h"
-#import "NSData+Base64.h"
+#import "NSData+OWS.h"
 #import "OWSError.h"
 #import <AxolotlKit/NSData+keyVersionByte.h>
 #import <CommonCrypto/CommonDigest.h>
diff --git a/SignalServiceKit/src/Storage/OWSStorage.m b/SignalServiceKit/src/Storage/OWSStorage.m
index c7f589c17..6e23bc394 100644
--- a/SignalServiceKit/src/Storage/OWSStorage.m
+++ b/SignalServiceKit/src/Storage/OWSStorage.m
@@ -4,7 +4,7 @@
 
 #import "OWSStorage.h"
 #import "AppContext.h"
-#import "NSData+Base64.h"
+#import "NSData+OWS.h"
 #import "NSNotificationCenter+OWS.h"
 #import "NSUserDefaults+OWS.h"
 #import "OWSBackgroundTask.h"
diff --git a/SignalServiceKit/src/Util/Cryptography.m b/SignalServiceKit/src/Util/Cryptography.m
index 234a6d398..bcf446186 100755
--- a/SignalServiceKit/src/Util/Cryptography.m
+++ b/SignalServiceKit/src/Util/Cryptography.m
@@ -3,7 +3,6 @@
 //
 
 #import "Cryptography.h"
-#import "NSData+Base64.h"
 #import "NSData+OWS.h"
 #import "OWSError.h"
 #import <CommonCrypto/CommonCryptor.h>
diff --git a/SignalServiceKit/src/Util/NSData+Base64.h b/SignalServiceKit/src/Util/NSData+Base64.h
deleted file mode 100644
index 3938c3ae0..000000000
--- a/SignalServiceKit/src/Util/NSData+Base64.h
+++ /dev/null
@@ -1,12 +0,0 @@
-//
-//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
-//
-
-@interface NSData (Base64)
-
-+ (NSData *)dataFromBase64StringNoPadding:(NSString *)aString;
-+ (NSData *)dataFromBase64String:(NSString *)aString;
-
-- (NSString *)base64EncodedString;
-
-@end
diff --git a/SignalServiceKit/src/Util/NSData+Base64.m b/SignalServiceKit/src/Util/NSData+Base64.m
deleted file mode 100644
index dddfa9162..000000000
--- a/SignalServiceKit/src/Util/NSData+Base64.m
+++ /dev/null
@@ -1,49 +0,0 @@
-
-#import "NSData+Base64.h"
-
-
-@implementation NSData (Base64)
-
-+ (NSData *)dataFromBase64StringNoPadding:(NSString *)aString {
-    int padding = aString.length % 4;
-
-    NSMutableString *strResult = [aString mutableCopy];
-    if (padding != 0) {
-        int charsToAdd = 4 - padding;
-        for (int i = 0; i < charsToAdd; i++) {
-            [strResult appendString:@"="];
-        }
-    }
-    return [self dataFromBase64String:strResult];
-}
-
-//
-// dataFromBase64String:
-//
-// Creates an NSData object containing the base64 decoded representation of
-// the base64 string 'aString'
-//
-// Parameters:
-//    aString - the base64 string to decode
-//
-// returns the NSData representation of the base64 string
-//
-
-+ (NSData *)dataFromBase64String:(NSString *)aString {
-    return [[NSData alloc] initWithBase64EncodedString:aString options:NSDataBase64DecodingIgnoreUnknownCharacters];
-}
-
-//
-// base64EncodedString
-//
-// Creates an NSString object that contains the base 64 encoding of the
-// receiver's data. Lines are broken at 64 characters long.
-//
-// returns an NSString being the base 64 representation of the
-//	receiver.
-//
-- (NSString *)base64EncodedString {
-    return [self base64EncodedStringWithOptions:0];
-}
-
-@end
diff --git a/SignalServiceKit/src/Util/NSData+OWS.h b/SignalServiceKit/src/Util/NSData+OWS.h
index d725945a8..50ec714e0 100644
--- a/SignalServiceKit/src/Util/NSData+OWS.h
+++ b/SignalServiceKit/src/Util/NSData+OWS.h
@@ -15,6 +15,13 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (NSString *)hexadecimalString;
 
+#pragma mark - Base64
+
++ (NSData *)dataFromBase64StringNoPadding:(NSString *)aString;
++ (NSData *)dataFromBase64String:(NSString *)aString;
+
+- (NSString *)base64EncodedString;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/SignalServiceKit/src/Util/NSData+OWS.m b/SignalServiceKit/src/Util/NSData+OWS.m
index ad1fe17e8..2a44da3a8 100644
--- a/SignalServiceKit/src/Util/NSData+OWS.m
+++ b/SignalServiceKit/src/Util/NSData+OWS.m
@@ -51,6 +51,53 @@ NS_ASSUME_NONNULL_BEGIN
     return [hexString copy];
 }
 
+#pragma mark - Base64
+
++ (NSData *)dataFromBase64StringNoPadding:(NSString *)aString
+{
+    int padding = aString.length % 4;
+
+    NSMutableString *strResult = [aString mutableCopy];
+    if (padding != 0) {
+        int charsToAdd = 4 - padding;
+        for (int i = 0; i < charsToAdd; i++) {
+            [strResult appendString:@"="];
+        }
+    }
+    return [self dataFromBase64String:strResult];
+}
+
+//
+// dataFromBase64String:
+//
+// Creates an NSData object containing the base64 decoded representation of
+// the base64 string 'aString'
+//
+// Parameters:
+//    aString - the base64 string to decode
+//
+// returns the NSData representation of the base64 string
+//
+
++ (NSData *)dataFromBase64String:(NSString *)aString
+{
+    return [[NSData alloc] initWithBase64EncodedString:aString options:NSDataBase64DecodingIgnoreUnknownCharacters];
+}
+
+//
+// base64EncodedString
+//
+// Creates an NSString object that contains the base 64 encoding of the
+// receiver's data. Lines are broken at 64 characters long.
+//
+// returns an NSString being the base 64 representation of the
+//    receiver.
+//
+- (NSString *)base64EncodedString
+{
+    return [self base64EncodedStringWithOptions:0];
+}
+
 @end
 
 NS_ASSUME_NONNULL_END