@@ -239,11 +239,11 @@
 - (OFEnumerator *)objectEnumerator
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
-- (int)countByEnumeratingWithState: (of_fast_enumeration_state_t *)state
+- (int)countByEnumeratingWithState: (OFFastEnumerationState *)state
 			   objects: (id *)objects
 			     count: (int)count
 {
 	OFEnumerator *enumerator;
 	int i;
@@ -367,14 +367,14 @@
 	void *pool = objc_autoreleasePoolPush();
 	OFXMLElement *element;
 
 	if ([self isKindOfClass: [OFMutableSet class]])
 		element = [OFXMLElement elementWithName: @"OFMutableSet"
-					      namespace: OF_SERIALIZATION_NS];
+					      namespace: OFSerializationNS];
 	else
 		element = [OFXMLElement elementWithName: @"OFSet"
-					      namespace: OF_SERIALIZATION_NS];
+					      namespace: OFSerializationNS];
 
 	for (id <OFSerialization> object in self) {
 		void *pool2 = objc_autoreleasePoolPush();
 		[element addChild: object.XMLElementBySerializing];
 		objc_autoreleasePoolPop(pool2);
@@ -426,11 +426,11 @@
 	objc_autoreleasePoolPop(pool);
 	return [ret autorelease];
 }
 
 #ifdef OF_HAVE_BLOCKS
-- (void)enumerateObjectsUsingBlock: (of_set_enumeration_block_t)block
+- (void)enumerateObjectsUsingBlock: (OFSetEnumerationBlock)block
 {
 	bool stop = false;
 
 	for (id object in self) {
 		block(object, &stop);
@@ -438,11 +438,11 @@
 		if (stop)
 			break;
 	}
 }
 
-- (OFSet *)filteredSetUsingBlock: (of_set_filter_block_t)block
+- (OFSet *)filteredSetUsingBlock: (OFSetFilterBlock)block
 {
 	OFMutableSet *ret = [OFMutableSet set];
 
 	[self enumerateObjectsUsingBlock: ^ (id object, bool *stop) {
 		if (block(object))