@@ -181,11 +181,11 @@
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFXMLElement *element;
 
 	element = [OFXMLElement elementWithName: @"OFCountedSet"
-				      namespace: OF_SERIALIZATION_NS];
+				      namespace: OFSerializationNS];
 
 	for (id <OFSerialization> object in self) {
 		void *pool2 = objc_autoreleasePoolPush();
 
 		OFXMLElement *objectElement;
@@ -195,11 +195,11 @@
 		    [OFString stringWithFormat: @"%zu",
 						[self countForObject: object]];
 
 		objectElement = [OFXMLElement
 		    elementWithName: @"object"
-			  namespace: OF_SERIALIZATION_NS];
+			  namespace: OFSerializationNS];
 		[objectElement addAttributeWithName: @"count"
 					stringValue: count];
 		[objectElement addChild: object.XMLElementBySerializing];
 		[element addChild: objectElement];
 
@@ -212,12 +212,11 @@
 
 	return [element autorelease];
 }
 
 #ifdef OF_HAVE_BLOCKS
-- (void)enumerateObjectsAndCountUsingBlock:
-    (of_counted_set_enumeration_block_t)block
+- (void)enumerateObjectsAndCountUsingBlock: (OFCountedSetEnumerationBlock)block
 {
 	[self enumerateObjectsUsingBlock: ^ (id object, bool *stop) {
 		block(object, [self countForObject: object], stop);
 	}];
 }