@@ -17,45 +17,41 @@
 
 #include <string.h>
 
 #import "TestsAppDelegate.h"
 
-static OFString *module = @"OFSHA224Hash";
+static OFString *const module = @"OFSHA224Hash";
 
-const uint8_t testfile_sha224[28] =
+const uint8_t testFileSHA224[28] =
 	"\x27\x69\xD8\x04\x2D\x0F\xCA\x84\x6C\xF1\x62\x44\xBA\x0C\xBD\x46\x64"
 	"\x5F\x4F\x20\x02\x4D\x15\xED\x1C\x61\x1F\xF7";
 
 @implementation TestsAppDelegate (SHA224HashTests)
 - (void)SHA224HashTests
 {
 	void *pool = objc_autoreleasePoolPush();
-	OFSHA224Hash *sha224, *copy;
-	OFFile *f = [OFFile fileWithPath: @"testfile.bin"
-				    mode: @"r"];
-
-	TEST(@"+[cryptoHashWithAllowsSwappableMemory:]",
-	    (sha224 = [OFSHA224Hash cryptoHashWithAllowsSwappableMemory: true]))
-
-	while (!f.atEndOfStream) {
-		char buf[64];
-		size_t len = [f readIntoBuffer: buf
-					length: 64];
-		[sha224 updateWithBuffer: buf
-				  length: len];
-	}
-	[f close];
-
-	TEST(@"-[copy]", (copy = [[sha224 copy] autorelease]))
+	OFSHA224Hash *SHA224, *SHA224Copy;
+	OFFile *file = [OFFile fileWithPath: @"testfile.bin" mode: @"r"];
+
+	TEST(@"+[hashWithAllowsSwappableMemory:]",
+	    (SHA224 = [OFSHA224Hash hashWithAllowsSwappableMemory: true]))
+
+	while (!file.atEndOfStream) {
+		char buffer[64];
+		size_t length = [file readIntoBuffer: buffer length: 64];
+		[SHA224 updateWithBuffer: buffer length: length];
+	}
+	[file close];
+
+	TEST(@"-[copy]", (SHA224Copy = [[SHA224 copy] autorelease]))
 
 	TEST(@"-[digest]",
-	    memcmp(sha224.digest, testfile_sha224, 28) == 0 &&
-	    memcmp(copy.digest, testfile_sha224, 28) == 0)
+	    memcmp(SHA224.digest, testFileSHA224, 28) == 0 &&
+	    memcmp(SHA224Copy.digest, testFileSHA224, 28) == 0)
 
 	EXPECT_EXCEPTION(@"Detect invalid call of "
 	    @"-[updateWithBuffer:length:]", OFHashAlreadyCalculatedException,
-	    [sha224 updateWithBuffer: ""
-			      length: 1])
+	    [SHA224 updateWithBuffer: "" length: 1])
 
 	objc_autoreleasePoolPop(pool);
 }
 @end