Index: src/OFMD5Hash.h
==================================================================
--- src/OFMD5Hash.h
+++ src/OFMD5Hash.h
@@ -26,11 +26,11 @@
  */
 OF_SUBCLASSING_RESTRICTED
 @interface OFMD5Hash: OFObject <OFCryptographicHash>
 {
 	OFSecureData *_iVarsData;
-	struct of_md5_hash_ivars {
+	struct {
 		uint32_t state[4];
 		uint64_t bits;
 		union of_md5_hash_buffer {
 			unsigned char bytes[64];
 			uint32_t words[16];

Index: src/OFMapTable.h
==================================================================
--- src/OFMapTable.h
+++ src/OFMapTable.h
@@ -71,11 +71,11 @@
  */
 OF_SUBCLASSING_RESTRICTED
 @interface OFMapTable: OFObject <OFCopying, OFFastEnumeration>
 {
 	OFMapTableFunctions _keyFunctions, _objectFunctions;
-	struct of_map_table_bucket *_Nonnull *_Nullable _buckets;
+	struct OFMapTableBucket *_Nonnull *_Nullable _buckets;
 	unsigned long _count, _capacity;
 	unsigned char _rotate;
 	unsigned long _mutations;
 }
 
@@ -233,11 +233,11 @@
  *	  keys or objects.
  */
 @interface OFMapTableEnumerator: OFObject
 {
 	OFMapTable *_mapTable;
-	struct of_map_table_bucket *_Nonnull *_Nullable _buckets;
+	struct OFMapTableBucket *_Nonnull *_Nullable _buckets;
 	unsigned long _capacity, _mutations, *_Nullable _mutationsPtr;
 	unsigned long _position;
 }
 
 - (instancetype)init OF_UNAVAILABLE;

Index: src/OFMapTable.m
==================================================================
--- src/OFMapTable.m
+++ src/OFMapTable.m
@@ -28,15 +28,15 @@
 #import "OFInvalidArgumentException.h"
 #import "OFOutOfRangeException.h"
 
 #define MIN_CAPACITY 16
 
-struct of_map_table_bucket {
+struct OFMapTableBucket {
 	void *key, *object;
 	unsigned long hash;
 };
-static struct of_map_table_bucket deleted = { 0 };
+static struct OFMapTableBucket deleted = { 0 };
 
 static void *
 defaultRetain(void *object)
 {
 	return object;
@@ -60,11 +60,11 @@
 }
 
 OF_DIRECT_MEMBERS
 @interface OFMapTableEnumerator ()
 - (instancetype)of_initWithMapTable: (OFMapTable *)mapTable
-			    buckets: (struct of_map_table_bucket **)buckets
+			    buckets: (struct OFMapTableBucket **)buckets
 			   capacity: (unsigned long)capacity
 		   mutationsPointer: (unsigned long *)mutationsPtr
     OF_METHOD_FAMILY(init);
 @end
 
@@ -182,11 +182,11 @@
 
 static void
 resizeForCount(OFMapTable *self, unsigned long count)
 {
 	unsigned long fullness, capacity;
-	struct of_map_table_bucket **buckets;
+	struct OFMapTableBucket **buckets;
 
 	if (count > ULONG_MAX / sizeof(*self->_buckets) ||
 	    count > ULONG_MAX / 8)
 		@throw [OFOutOfRangeException exception];
 
@@ -280,11 +280,11 @@
 
 	/* Key not in map table */
 	if (i >= last || self->_buckets[i] == NULL ||
 	    self->_buckets[i] == &deleted ||
 	    !self->_keyFunctions.equal(self->_buckets[i]->key, key)) {
-		struct of_map_table_bucket *bucket;
+		struct OFMapTableBucket *bucket;
 
 		resizeForCount(self, self->_count + 1);
 
 		self->_mutations++;
 		last = self->_capacity;
@@ -647,11 +647,11 @@
 {
 	OF_INVALID_INIT_METHOD
 }
 
 - (instancetype)of_initWithMapTable: (OFMapTable *)mapTable
-			    buckets: (struct of_map_table_bucket **)buckets
+			    buckets: (struct OFMapTableBucket **)buckets
 			   capacity: (unsigned long)capacity
 		   mutationsPointer: (unsigned long *)mutationsPtr
 {
 	self = [super init];
 

Index: src/OFRIPEMD160Hash.h
==================================================================
--- src/OFRIPEMD160Hash.h
+++ src/OFRIPEMD160Hash.h
@@ -26,11 +26,11 @@
  */
 OF_SUBCLASSING_RESTRICTED
 @interface OFRIPEMD160Hash: OFObject <OFCryptographicHash>
 {
 	OFSecureData *_iVarsData;
-	struct of_ripemd160_hash_ivars {
+	struct {
 		uint32_t state[5];
 		uint64_t bits;
 		union of_ripemd160_hash_buffer {
 			unsigned char bytes[64];
 			uint32_t words[16];

Index: src/OFSHA1Hash.h
==================================================================
--- src/OFSHA1Hash.h
+++ src/OFSHA1Hash.h
@@ -26,11 +26,11 @@
  */
 OF_SUBCLASSING_RESTRICTED
 @interface OFSHA1Hash: OFObject <OFCryptographicHash>
 {
 	OFSecureData *_iVarsData;
-	struct of_sha1_hash_ivars {
+	struct {
 		uint32_t state[5];
 		uint64_t bits;
 		union of_sha1_hash_buffer {
 			unsigned char bytes[64];
 			uint32_t words[80];

Index: src/OFSHA224Or256Hash.h
==================================================================
--- src/OFSHA224Or256Hash.h
+++ src/OFSHA224Or256Hash.h
@@ -27,11 +27,11 @@
 @interface OFSHA224Or256Hash: OFObject <OFCryptographicHash>
 {
 @private
 	OFSecureData *_iVarsData;
 @protected
-	struct of_sha224_or_256_hash_ivars {
+	struct {
 		uint32_t state[8];
 		uint64_t bits;
 		union of_sha224_or_256_hash_buffer {
 			unsigned char bytes[64];
 			uint32_t words[64];

Index: src/OFSHA384Or512Hash.h
==================================================================
--- src/OFSHA384Or512Hash.h
+++ src/OFSHA384Or512Hash.h
@@ -27,11 +27,11 @@
 @interface OFSHA384Or512Hash: OFObject <OFCryptographicHash>
 {
 @private
 	OFSecureData *_iVarsData;
 @protected
-	struct of_sha384_or_512_hash_ivars {
+	struct {
 		uint64_t state[8];
 		uint64_t bits[2];
 		union of_sha384_or_512_hash_buffer {
 			unsigned char bytes[128];
 			uint64_t words[80];