@@ -23,11 +23,11 @@
 
 @implementation OFHMAC
 @synthesize hashClass = _hashClass;
 @synthesize allowsSwappableMemory = _allowsSwappableMemory;
 
-+ (instancetype)HMACWithHashClass: (Class <OFCryptoHash>)class
++ (instancetype)HMACWithHashClass: (Class <OFCryptographicHash>)class
 	    allowsSwappableMemory: (bool)allowsSwappableMemory
 {
 	return [[[self alloc] initWithHashClass: class
 			  allowsSwappableMemory: allowsSwappableMemory]
 	    autorelease];
@@ -36,11 +36,11 @@
 - (instancetype)init
 {
 	OF_INVALID_INIT_METHOD
 }
 
-- (instancetype)initWithHashClass: (Class <OFCryptoHash>)class
+- (instancetype)initWithHashClass: (Class <OFCryptographicHash>)class
 	    allowsSwappableMemory: (bool)allowsSwappableMemory
 {
 	self = [super init];
 
 	_hashClass = class;
@@ -57,12 +57,11 @@
 	[_innerHashCopy release];
 
 	[super dealloc];
 }
 
-- (void)setKey: (const void *)key
-	length: (size_t)length
+- (void)setKey: (const void *)key length: (size_t)length
 {
 	void *pool = objc_autoreleasePoolPush();
 	size_t blockSize = [_hashClass blockSize];
 	OFSecureData *outerKeyPad = [OFSecureData
 		    dataWithCount: blockSize
@@ -79,16 +78,14 @@
 	[_innerHashCopy release];
 	_outerHash = _innerHash = _outerHashCopy = _innerHashCopy = nil;
 
 	@try {
 		if (length > blockSize) {
-			id <OFCryptoHash> hash = [_hashClass
-			    cryptoHashWithAllowsSwappableMemory:
+			id <OFCryptographicHash> hash = [_hashClass
+			    hashWithAllowsSwappableMemory:
 			    _allowsSwappableMemory];
-
-			[hash updateWithBuffer: key
-					length: length];
+			[hash updateWithBuffer: key length: length];
 
 			length = hash.digestSize;
 			if OF_UNLIKELY (length > blockSize)
 				length = blockSize;
 
@@ -105,13 +102,13 @@
 		for (size_t i = 0; i < blockSize; i++) {
 			outerKeyPadItems[i] ^= 0x5C;
 			innerKeyPadItems[i] ^= 0x36;
 		}
 
-		_outerHash = [[_hashClass cryptoHashWithAllowsSwappableMemory:
+		_outerHash = [[_hashClass hashWithAllowsSwappableMemory:
 		    _allowsSwappableMemory] retain];
-		_innerHash = [[_hashClass cryptoHashWithAllowsSwappableMemory:
+		_innerHash = [[_hashClass hashWithAllowsSwappableMemory:
 		    _allowsSwappableMemory] retain];
 
 		[_outerHash updateWithBuffer: outerKeyPadItems
 				      length: blockSize];
 		[_innerHash updateWithBuffer: innerKeyPadItems
@@ -129,22 +126,20 @@
 	_innerHashCopy = [_innerHash copy];
 
 	_calculated = false;
 }
 
-- (void)updateWithBuffer: (const void *)buffer
-		  length: (size_t)length
+- (void)updateWithBuffer: (const void *)buffer length: (size_t)length
 {
 	if (_innerHash == nil)
 		@throw [OFInvalidArgumentException exception];
 
 	if (_calculated)
 		@throw [OFHashAlreadyCalculatedException
 		    exceptionWithObject: self];
 
-	[_innerHash updateWithBuffer: buffer
-			      length: length];
+	[_innerHash updateWithBuffer: buffer length: length];
 }
 
 - (const unsigned char *)digest
 {
 	if (_outerHash == nil || _innerHash == nil)