@@ -123,23 +123,23 @@
 
 	@try {
 		void *pool = objc_autoreleasePoolPush();
 
 		if (![element.name isEqual: @"OFCountedSet"] ||
-		    ![element.namespace isEqual: OF_SERIALIZATION_NS])
+		    ![element.namespace isEqual: OFSerializationNS])
 			@throw [OFInvalidArgumentException exception];
 
 		for (OFXMLElement *objectElement in
 		    [element elementsForName: @"object"
-				   namespace: OF_SERIALIZATION_NS]) {
+				   namespace: OFSerializationNS]) {
 			void *pool2 = objc_autoreleasePoolPush();
 			OFXMLElement *object;
 			OFXMLAttribute *countAttribute;
 			unsigned long long count;
 
 			object = [objectElement elementsForNamespace:
-			    OF_SERIALIZATION_NS].firstObject;
+			    OFSerializationNS].firstObject;
 			countAttribute =
 			    [objectElement attributeForName: @"count"];
 
 			if (object == nil || countAttribute == nil)
 				@throw [OFInvalidFormatException exception];
@@ -167,12 +167,11 @@
 {
 	return (size_t)(uintptr_t)[_mapTable objectForKey: object];
 }
 
 #ifdef OF_HAVE_BLOCKS
-- (void)enumerateObjectsAndCountUsingBlock:
-    (of_counted_set_enumeration_block_t)block
+- (void)enumerateObjectsAndCountUsingBlock: (OFCountedSetEnumerationBlock)block
 {
 	@try {
 		[_mapTable enumerateKeysAndObjectsUsingBlock:
 		    ^ (void *key, void *object, bool *stop) {
 			block(key, (size_t)(uintptr_t)object, stop);