--- a/toolkit/components/url-classifier/HashStore.cpp
+++ b/toolkit/components/url-classifier/HashStore.cpp
@@ -516,23 +516,16 @@ HashStore::ReadHashes()
 
 nsresult
 HashStore::ReadCompletions()
 {
   if (!mInputStream || AlreadyReadCompletions()) {
     return NS_OK;
   }
 
-  nsCOMPtr<nsIFile> storeFile;
-  nsresult rv = mStoreDirectory->Clone(getter_AddRefs(storeFile));
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  rv = storeFile->AppendNative(mTableName + NS_LITERAL_CSTRING(STORE_SUFFIX));
-  NS_ENSURE_SUCCESS(rv, rv);
-
   uint32_t offset = mFileSize -
                     sizeof(struct AddComplete) * mHeader.numAddCompletes -
                     sizeof(struct SubComplete) * mHeader.numSubCompletes -
                     nsCheckSummedOutputStream::CHECKSUM_SIZE;
 
   nsCOMPtr<nsISeekableStream> seekable = do_QueryInterface(mInputStream);
 
   rv = seekable->Seek(nsISeekableStream::NS_SEEK_SET, offset);
@@ -990,17 +983,17 @@ HashStore::WriteFile()
   NS_ASSERTION(mInUpdate, "Must be in update to write database.");
   if (nsUrlClassifierDBService::ShutdownHasStarted()) {
     return NS_ERROR_ABORT;
   }
 
   nsCOMPtr<nsIFile> storeFile;
   nsresult rv = mStoreDirectory->Clone(getter_AddRefs(storeFile));
   NS_ENSURE_SUCCESS(rv, rv);
-  rv = storeFile->AppendNative(mTableName + NS_LITERAL_CSTRING(".sbstore"));
+  rv = storeFile->AppendNative(mTableName + NS_LITERAL_CSTRING(STORE_SUFFIX));
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsCOMPtr<nsIOutputStream> out;
   rv = NS_NewCheckSummedOutputStream(getter_AddRefs(out), storeFile,
                                      PR_WRONLY | PR_TRUNCATE | PR_CREATE_FILE);
   NS_ENSURE_SUCCESS(rv, rv);
 
   uint32_t written;