@@ -11,11 +11,11 @@
  * Public License, either version 2 or 3, which can be found in the file
  * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
  * file.
  */
 
-#import "OFCryptoHash.h"
+#import "OFCryptographicHash.h"
 
 OF_ASSUME_NONNULL_BEGIN
 
 @class OFSecureData;
 
@@ -23,17 +23,17 @@
  * @class OFSHA1Hash OFSHA1Hash.h ObjFW/OFSHA1Hash.h
  *
  * @brief A class which provides methods to create an SHA-1 hash.
  */
 OF_SUBCLASSING_RESTRICTED
-@interface OFSHA1Hash: OFObject <OFCryptoHash>
+@interface OFSHA1Hash: OFObject <OFCryptographicHash>
 {
 	OFSecureData *_iVarsData;
-	struct of_sha1_hash_ivars {
+	struct {
 		uint32_t state[5];
 		uint64_t bits;
-		union of_sha1_hash_buffer {
+		union {
 			unsigned char bytes[64];
 			uint32_t words[80];
 		} buffer;
 		size_t bufferLength;
 	} *_iVars;