diff --git a/KeePassKit b/KeePassKit
index 4e8693c8..3c0af98c 160000
--- a/KeePassKit
+++ b/KeePassKit
@@ -1 +1 @@
-Subproject commit 4e8693c89c269534ee578a012ff08dfa571d1d50
+Subproject commit 3c0af98c46e8ec2d50653bd8f7b62410f5144c20
diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist
index 74e37406..6c06ec7c 100644
--- a/MacPass/MacPass-Info.plist
+++ b/MacPass/MacPass-Info.plist
@@ -48,7 +48,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2521</string>
+	<string>2522</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/MacPass/en.lproj/Localizable.strings b/MacPass/en.lproj/Localizable.strings
index 459b2cbe..135e3db7 100644
Binary files a/MacPass/en.lproj/Localizable.strings and b/MacPass/en.lproj/Localizable.strings differ
diff --git a/MacPassTests/KPKTreeLoadingTest.m b/MacPassTests/KPKTreeLoadingTest.m
index bb7a511a..0ab4637e 100644
--- a/MacPassTests/KPKTreeLoadingTest.m
+++ b/MacPassTests/KPKTreeLoadingTest.m
@@ -7,7 +7,7 @@
 //
 
 #import "KPKTreeLoadingTest.h"
-#import "KPKTreeLoader.h"
+#import "KPKTreeCryptor.h"
 #import "KPKPassword.h"
 
 @implementation KPKTreeLoadingTest
@@ -25,9 +25,9 @@
 }
 
 - (void)testLoading {
-  KPKTreeLoader *loader = [[KPKTreeLoader alloc] initWithData:_data password:_password];
-  KPKTree *tree = [loader loadTree:NULL];
-  STAssertNil(tree, @"Loading should broken");
+  KPKTreeCryptor *cryptor = [KPKTreeCryptor treeCryptorWithData:_data password:_password];
+  KPKTree *tree = [cryptor decryptTree:NULL];
+  STAssertNotNil(tree, @"Loading should result in a tree object");
 }
 
 @end