@@ -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;
@@ -78,12 +78,12 @@
 	[_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];
 
 			length = hash.digestSize;
 			if OF_UNLIKELY (length > blockSize)
@@ -102,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