@@ -44,15 +44,15 @@
  *
  * We need this bad check to see if we already imported Cocoa, which defines
  * this as well.
  */
 /**
- * @struct of_fast_enumeration_state_t OFEnumerator.h ObjFW/OFEnumerator.h
+ * @struct OFFastEnumerationState OFEnumerator.h ObjFW/OFEnumerator.h
  *
  * @brief State information for fast enumerations.
  */
-#define of_fast_enumeration_state_t NSFastEnumerationState
+#define OFFastEnumerationState NSFastEnumerationState
 #ifndef NSINTEGER_DEFINED
 typedef struct {
 	/** Arbitrary state information for the enumeration */
 	unsigned long state;
 	/** Pointer to a C array of objects to return */
@@ -59,11 +59,11 @@
 	id __unsafe_unretained _Nullable *_Nullable itemsPtr;
 	/** Arbitrary state information to detect mutations */
 	unsigned long *_Nullable mutationsPtr;
 	/** Additional arbitrary state information */
 	unsigned long extra[5];
-} of_fast_enumeration_state_t;
+} OFFastEnumerationState;
 #endif
 
 /**
  * @protocol OFFastEnumeration OFEnumerator.h ObjFW/OFEnumerator.h
  *
@@ -81,11 +81,11 @@
  * @param objects A pointer to an array where to put the objects
  * @param count The number of objects that can be stored at objects
  * @return The number of objects returned in objects or 0 when the enumeration
  *	   finished.
  */
-- (int)countByEnumeratingWithState: (of_fast_enumeration_state_t *)state
+- (int)countByEnumeratingWithState: (OFFastEnumerationState *)state
 			   objects: (id __unsafe_unretained _Nonnull *_Nonnull)
 					objects
 			     count: (int)count;
 @end