@@ -329,11 +329,11 @@
 	void *pool = objc_autoreleasePoolPush();
 
 	characterSet = [[[OFInvertedCharacterSetWithoutPercent alloc]
 	    initWithCharacterSet: characterSet] autorelease];
 
-	if ([string indexOfCharacterFromSet: characterSet] != OF_NOT_FOUND)
+	if ([string indexOfCharacterFromSet: characterSet] != OFNotFound)
 		@throw [OFInvalidFormatException exception];
 
 	objc_autoreleasePoolPop(pool);
 }
 
@@ -678,11 +678,11 @@
 				    : @"/")];
 				OFRange range = [path
 				    rangeOfString: @"/"
 					  options: OF_STRING_SEARCH_BACKWARDS];
 
-				if (range.location == OF_NOT_FOUND)
+				if (range.location == OFNotFound)
 					@throw [OFInvalidFormatException
 					    exception];
 
 				range.location++;
 				range.length = path.length - range.location;