@@ -385,11 +385,11 @@
 
 		if (component.length == 0)
 			@throw [OFInvalidFormatException exception];
 
 		if ([component indexOfCharacterFromSet:
-		    whitespaceCharacterSet] != OF_NOT_FOUND)
+		    whitespaceCharacterSet] != OFNotFound)
 			@throw [OFInvalidFormatException exception];
 
 		number = component.unsignedLongLongValue;
 
 		if (number > UINT8_MAX)
@@ -409,11 +409,11 @@
 parseIPv6Component(OFString *component)
 {
 	unsigned long long number;
 
 	if ([component indexOfCharacterFromSet:
-	    [OFCharacterSet whitespaceCharacterSet]] != OF_NOT_FOUND)
+	    [OFCharacterSet whitespaceCharacterSet]] != OFNotFound)
 		@throw [OFInvalidFormatException exception];
 
 	number = [component unsignedLongLongValueWithBase: 16];
 
 	if (number > UINT16_MAX)
@@ -441,11 +441,11 @@
 #endif
 	addrIn6->sin6_port = OF_BSWAP16_IF_LE(port);
 
 	doubleColon = [IPv6 rangeOfString: @"::"].location;
 
-	if (doubleColon != OF_NOT_FOUND) {
+	if (doubleColon != OFNotFound) {
 		OFString *left = [IPv6 substringToIndex: doubleColon];
 		OFString *right = [IPv6 substringFromIndex: doubleColon + 2];
 		OFArray OF_GENERIC(OFString *) *leftComponents;
 		OFArray OF_GENERIC(OFString *) *rightComponents;
 		size_t i;