@@ -37,12 +37,13 @@
 } placeholder;
 
 static OFCharacterSet *URLQueryPartAllowedCharacterSet = nil;
 
 @interface OFDictionary ()
-- (OFString *)of_JSONRepresentationWithOptions: (int)options
-					 depth: (size_t)depth;
+- (OFString *)
+    of_JSONRepresentationWithOptions: (OFJSONRepresentationOptions)options
+			       depth: (size_t)depth;
 @end
 
 @interface OFDictionaryPlaceholder: OFDictionary
 @end
 
@@ -169,16 +170,16 @@
 {
 }
 
 - (unsigned int)retainCount
 {
-	return OF_RETAIN_COUNT_MAX;
+	return OFMaxRetainCount;
 }
 
-- (bool)characterIsMember: (of_unichar_t)character
+- (bool)characterIsMember: (OFUnichar)character
 {
-	if (character < CHAR_MAX && of_ascii_isalnum(character))
+	if (character < CHAR_MAX && OFASCIIIsAlnum(character))
 		return true;
 
 	switch (character) {
 	case '-':
 	case '.':
@@ -505,11 +506,11 @@
 {
 	return [[[OFDictionaryObjectEnumerator alloc]
 	    initWithDictionary: self] autorelease];
 }
 
-- (int)countByEnumeratingWithState: (of_fast_enumeration_state_t *)state
+- (int)countByEnumeratingWithState: (OFFastEnumerationState *)state
 			   objects: (id *)objects
 			     count: (int)count
 {
 	OFEnumerator *enumerator;
 	int i;
@@ -535,12 +536,11 @@
 
 	return i;
 }
 
 #ifdef OF_HAVE_BLOCKS
-- (void)enumerateKeysAndObjectsUsingBlock:
-    (of_dictionary_enumeration_block_t)block
+- (void)enumerateKeysAndObjectsUsingBlock: (OFDictionaryEnumerationBlock)block
 {
 	bool stop = false;
 
 	for (id key in self) {
 		block(key, [self objectForKey: key], &stop);
@@ -548,11 +548,11 @@
 		if (stop)
 			break;
 	}
 }
 
-- (OFDictionary *)mappedDictionaryUsingBlock: (of_dictionary_map_block_t)block
+- (OFDictionary *)mappedDictionaryUsingBlock: (OFDictionaryMapBlock)block
 {
 	OFMutableDictionary *new = [OFMutableDictionary dictionary];
 
 	[self enumerateKeysAndObjectsUsingBlock: ^ (id key, id object,
 	    bool *stop) {
@@ -562,12 +562,11 @@
 	[new makeImmutable];
 
 	return new;
 }
 
-- (OFDictionary *)filteredDictionaryUsingBlock:
-    (of_dictionary_filter_block_t)block
+- (OFDictionary *)filteredDictionaryUsingBlock: (OFDictionaryFilterBlock)block
 {
 	OFMutableDictionary *new = [OFMutableDictionary dictionary];
 
 	[self enumerateKeysAndObjectsUsingBlock: ^ (id key, id object,
 	    bool *stop) {
@@ -679,14 +678,14 @@
 	OFEnumerator *keyEnumerator, *objectEnumerator;
 	id <OFSerialization> key, object;
 
 	if ([self isKindOfClass: [OFMutableDictionary class]])
 		element = [OFXMLElement elementWithName: @"OFMutableDictionary"
-					      namespace: OF_SERIALIZATION_NS];
+					      namespace: OFSerializationNS];
 	else
 		element = [OFXMLElement elementWithName: @"OFDictionary"
-					      namespace: OF_SERIALIZATION_NS];
+					      namespace: OFSerializationNS];
 
 	keyEnumerator = [self keyEnumerator];
 	objectEnumerator = [self objectEnumerator];
 	while ((key = [keyEnumerator nextObject]) != nil &&
 	       (object = [objectEnumerator nextObject]) != nil) {
@@ -693,16 +692,16 @@
 		void *pool2 = objc_autoreleasePoolPush();
 		OFXMLElement *keyElement, *objectElement;
 
 		keyElement = [OFXMLElement
 		    elementWithName: @"key"
-			  namespace: OF_SERIALIZATION_NS];
+			  namespace: OFSerializationNS];
 		[keyElement addChild: key.XMLElementBySerializing];
 
 		objectElement = [OFXMLElement
 		    elementWithName: @"object"
-			  namespace: OF_SERIALIZATION_NS];
+			  namespace: OFSerializationNS];
 		[objectElement addChild: object.XMLElementBySerializing];
 
 		[element addChild: keyElement];
 		[element addChild: objectElement];
 
@@ -719,26 +718,28 @@
 - (OFString *)JSONRepresentation
 {
 	return [self of_JSONRepresentationWithOptions: 0 depth: 0];
 }
 
-- (OFString *)JSONRepresentationWithOptions: (int)options
+- (OFString *)JSONRepresentationWithOptions:
+    (OFJSONRepresentationOptions)options
 {
 	return [self of_JSONRepresentationWithOptions: options depth: 0];
 }
 
-- (OFString *)of_JSONRepresentationWithOptions: (int)options
-					 depth: (size_t)depth
+- (OFString *)
+    of_JSONRepresentationWithOptions: (OFJSONRepresentationOptions)options
+			       depth: (size_t)depth
 {
 	OFMutableString *JSON = [OFMutableString stringWithString: @"{"];
 	void *pool = objc_autoreleasePoolPush();
 	OFEnumerator *keyEnumerator = [self keyEnumerator];
 	OFEnumerator *objectEnumerator = [self objectEnumerator];
 	size_t i, count = self.count;
 	id key, object;
 
-	if (options & OF_JSON_REPRESENTATION_PRETTY) {
+	if (options & OFJSONRepresentationOptionPretty) {
 		OFMutableString *indentation = [OFMutableString string];
 
 		for (i = 0; i < depth; i++)
 			[indentation appendString: @"\t"];
 
@@ -747,11 +748,11 @@
 		i = 0;
 		while ((key = [keyEnumerator nextObject]) != nil &&
 		    (object = [objectEnumerator nextObject]) != nil) {
 			void *pool2 = objc_autoreleasePoolPush();
 			int identifierOptions =
-			    options | OF_JSON_REPRESENTATION_IDENTIFIER;
+			    options | OFJSONRepresentationOptionIsIdentifier;
 
 			if (![key isKindOfClass: [OFString class]])
 				@throw [OFInvalidArgumentException exception];
 
 			[JSON appendString: indentation];
@@ -777,11 +778,11 @@
 		i = 0;
 		while ((key = [keyEnumerator nextObject]) != nil &&
 		    (object = [objectEnumerator nextObject]) != nil) {
 			void *pool2 = objc_autoreleasePoolPush();
 			int identifierOptions =
-			    options | OF_JSON_REPRESENTATION_IDENTIFIER;
+			    options | OFJSONRepresentationOptionIsIdentifier;
 
 			if (![key isKindOfClass: [OFString class]])
 				@throw [OFInvalidArgumentException exception];
 
 			[JSON appendString: [key
@@ -821,17 +822,17 @@
 	if (count <= 15) {
 		uint8_t tmp = 0x80 | ((uint8_t)count & 0xF);
 		[data addItem: &tmp];
 	} else if (count <= UINT16_MAX) {
 		uint8_t type = 0xDE;
-		uint16_t tmp = OF_BSWAP16_IF_LE((uint16_t)count);
+		uint16_t tmp = OFToBigEndian16((uint16_t)count);
 
 		[data addItem: &type];
 		[data addItems: &tmp count: sizeof(tmp)];
 	} else if (count <= UINT32_MAX) {
 		uint8_t type = 0xDF;
-		uint32_t tmp = OF_BSWAP32_IF_LE((uint32_t)count);
+		uint32_t tmp = OFToBigEndian32((uint32_t)count);
 
 		[data addItem: &type];
 		[data addItems: &tmp count: sizeof(tmp)];
 	} else
 		@throw [OFOutOfRangeException exception];