@@ -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];