diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m b/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m
index 9942b3741..41ecfa7e9 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m
+++ b/Signal/src/ViewControllers/DebugUI/DebugUIMisc.m
@@ -186,9 +186,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (void)sendEncryptedDatabase:(TSThread *)thread
 {
-    NSString *temporaryDirectory = NSTemporaryDirectory();
-    NSString *fileName = [[NSUUID UUID].UUIDString stringByAppendingString:@".sqlite"];
-    NSString *filePath = [temporaryDirectory stringByAppendingPathComponent:fileName];
+    NSString *filePath = [OWSFileSystem temporaryFilePathWithFileExtension:@"sqlite"];
+    NSString *fileName = filePath.lastPathComponent;
 
     __block BOOL success;
     [TSStorageManager.sharedManager.newDatabaseConnection
@@ -223,9 +222,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (void)sendUnencryptedDatabase:(TSThread *)thread
 {
-    NSString *temporaryDirectory = NSTemporaryDirectory();
-    NSString *fileName = [[NSUUID UUID].UUIDString stringByAppendingString:@".sqlite"];
-    NSString *filePath = [temporaryDirectory stringByAppendingPathComponent:fileName];
+    NSString *filePath = [OWSFileSystem temporaryFilePathWithFileExtension:@"sqlite"];
+    NSString *fileName = filePath.lastPathComponent;
 
     NSError *error = [TSStorageManager.sharedManager.newDatabaseConnection backupToPath:filePath];
     if (error) {
diff --git a/Signal/test/util/OWSDatabaseConverterTest.m b/Signal/test/util/OWSDatabaseConverterTest.m
index 7ab31745c..ce51fd44c 100644
--- a/Signal/test/util/OWSDatabaseConverterTest.m
+++ b/Signal/test/util/OWSDatabaseConverterTest.m
@@ -225,9 +225,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (NSString *)createTempDatabaseFilePath
 {
-    NSString *temporaryDirectory = NSTemporaryDirectory();
-    NSString *filename = [[NSUUID UUID].UUIDString stringByAppendingString:@".sqlite"];
-    NSString *databaseFilePath = [temporaryDirectory stringByAppendingPathComponent:filename];
+    NSString *databaseFilePath = [OWSFileSystem temporaryFilePathWithFileExtension:@"sqlite"];
 
     DDLogInfo(@"%@ databaseFilePath: %@", self.logTag, databaseFilePath);
     [DDLog flushLog];
diff --git a/SignalServiceKit/src/Util/DataSource.m b/SignalServiceKit/src/Util/DataSource.m
index 74b353b03..439265287 100755
--- a/SignalServiceKit/src/Util/DataSource.m
+++ b/SignalServiceKit/src/Util/DataSource.m
@@ -1,10 +1,11 @@
 //
-//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
 //
 
 #import "DataSource.h"
 #import "MIMETypeUtil.h"
 #import "NSData+Image.h"
+#import "OWSFileSystem.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -173,9 +174,7 @@ NS_ASSUME_NONNULL_BEGIN
     @synchronized(self)
     {
         if (!self.cachedFilePath) {
-            NSString *dirPath = NSTemporaryDirectory();
-            NSString *fileName = [[[NSUUID UUID] UUIDString] stringByAppendingPathExtension:self.fileExtension];
-            NSString *filePath = [dirPath stringByAppendingPathComponent:fileName];
+            NSString *filePath = [OWSFileSystem temporaryFilePathWithFileExtension:self.fileExtension];
             if ([self writeToPath:filePath]) {
                 self.cachedFilePath = filePath;
             } else {