@@ -17,46 +17,42 @@
 
 #include <string.h>
 
 #import "TestsAppDelegate.h"
 
-static OFString *module = @"OFSHA384Hash";
+static OFString *const module = @"OFSHA384Hash";
 
-const uint8_t testfile_sha384[48] =
+const uint8_t testFileSHA384[48] =
 	"\x7E\xDE\x62\xE2\x10\xA5\x1E\x18\x8A\x11\x7F\x78\xD7\xC7\x55\xB6\x43"
 	"\x94\x1B\xD2\x78\x5C\xCF\xF3\x8A\xB8\x98\x22\xC7\x0E\xFE\xF1\xEC\x53"
 	"\xE9\x1A\xB3\x51\x70\x8C\x1F\x3F\x56\x12\x44\x01\x91\x54";
 
 @implementation TestsAppDelegate (SHA384HashTests)
 - (void)SHA384HashTests
 {
 	void *pool = objc_autoreleasePoolPush();
-	OFSHA384Hash *sha384, *copy;
-	OFFile *f = [OFFile fileWithPath: @"testfile.bin"
-				    mode: @"r"];
-
-	TEST(@"+[cryptoHashWithAllowsSwappableMemory:]",
-	    (sha384 = [OFSHA384Hash cryptoHashWithAllowsSwappableMemory: true]))
-
-	while (!f.atEndOfStream) {
-		char buf[128];
-		size_t len = [f readIntoBuffer: buf
-					length: 128];
-		[sha384 updateWithBuffer: buf
-				  length: len];
-	}
-	[f close];
-
-	TEST(@"-[copy]", (copy = [[sha384 copy] autorelease]))
+	OFSHA384Hash *SHA384, *SHA384Copy;
+	OFFile *file = [OFFile fileWithPath: @"testfile.bin" mode: @"r"];
+
+	TEST(@"+[hashWithAllowsSwappableMemory:]",
+	    (SHA384 = [OFSHA384Hash hashWithAllowsSwappableMemory: true]))
+
+	while (!file.atEndOfStream) {
+		char buffer[128];
+		size_t length = [file readIntoBuffer: buffer length: 128];
+		[SHA384 updateWithBuffer: buffer length: length];
+	}
+	[file close];
+
+	TEST(@"-[copy]", (SHA384Copy = [[SHA384 copy] autorelease]))
 
 	TEST(@"-[digest]",
-	    memcmp(sha384.digest, testfile_sha384, 48) == 0 &&
-	    memcmp(copy.digest, testfile_sha384, 48) == 0)
+	    memcmp(SHA384.digest, testFileSHA384, 48) == 0 &&
+	    memcmp(SHA384Copy.digest, testFileSHA384, 48) == 0)
 
 	EXPECT_EXCEPTION(@"Detect invalid call of "
 	    @"-[updateWithBuffer:length:]", OFHashAlreadyCalculatedException,
-	    [sha384 updateWithBuffer: ""
-			      length: 1])
+	    [SHA384 updateWithBuffer: "" length: 1])
 
 	objc_autoreleasePoolPop(pool);
 }
 @end