@@ -971,11 +971,11 @@
 		memcpy(s->cString, [firstComponent cString], cStringLength);
 		i = cStringLength;
 
 		while ((component = va_arg(arguments, OFString*)) != nil) {
 			cStringLength = [component cStringLength];
-			s->cString[i] = OF_PATH_DELIM;
+			s->cString[i] = OF_PATH_DELIMITER;
 			memcpy(s->cString + i + 1, [component cString],
 			    cStringLength);
 			i += 1 + cStringLength;
 		}
 
@@ -1605,20 +1605,20 @@
 		return ret;
 
 	pool = [[OFAutoreleasePool alloc] init];
 
 #ifndef _WIN32
-	if (s->cString[pathCStringLength - 1] == OF_PATH_DELIM)
+	if (s->cString[pathCStringLength - 1] == OF_PATH_DELIMITER)
 #else
 	if (s->cString[pathCStringLength - 1] == '/' ||
 	    s->cString[pathCStringLength - 1] == '\\')
 #endif
 		pathCStringLength--;
 
 	for (i = 0; i < pathCStringLength; i++) {
 #ifndef _WIN32
-		if (s->cString[i] == OF_PATH_DELIM) {
+		if (s->cString[i] == OF_PATH_DELIMITER) {
 #else
 		if (s->cString[i] == '/' || s->cString[i] == '\\') {
 #endif
 			[ret addObject:
 			    [OFString stringWithCString: s->cString + last
@@ -1648,20 +1648,20 @@
 
 	if (pathCStringLength == 0)
 		return @"";
 
 #ifndef _WIN32
-	if (s->cString[pathCStringLength - 1] == OF_PATH_DELIM)
+	if (s->cString[pathCStringLength - 1] == OF_PATH_DELIMITER)
 #else
 	if (s->cString[pathCStringLength - 1] == '/' ||
 	    s->cString[pathCStringLength - 1] == '\\')
 #endif
 		pathCStringLength--;
 
 	for (i = pathCStringLength - 1; i >= 0; i--) {
 #ifndef _WIN32
-		if (s->cString[i] == OF_PATH_DELIM) {
+		if (s->cString[i] == OF_PATH_DELIMITER) {
 #else
 		if (s->cString[i] == '/' || s->string[i] == '\\') {
 #endif
 			i++;
 			break;
@@ -1685,11 +1685,11 @@
 
 	if (pathCStringLength == 0)
 		return @"";
 
 #ifndef _WIN32
-	if (s->cString[pathCStringLength - 1] == OF_PATH_DELIM)
+	if (s->cString[pathCStringLength - 1] == OF_PATH_DELIMITER)
 #else
 	if (s->cString[pathCStringLength - 1] == '/' ||
 	    s->cString[pathCStringLength - 1] == '\\')
 #endif
 		pathCStringLength--;
@@ -1698,19 +1698,19 @@
 		return [OFString stringWithCString: s->cString
 					    length: 1];
 
 	for (i = pathCStringLength - 1; i >= 1; i--)
 #ifndef _WIN32
-		if (s->cString[i] == OF_PATH_DELIM)
+		if (s->cString[i] == OF_PATH_DELIMITER)
 #else
 		if (s->cString[i] == '/' || s->cString[i] == '\\')
 #endif
 			return [OFString stringWithCString: s->cString
 						    length: i];
 
 #ifndef _WIN32
-	if (s->cString[0] == OF_PATH_DELIM)
+	if (s->cString[0] == OF_PATH_DELIMITER)
 #else
 	if (s->cString[0] == '/' || s->cString[0] == '\\')
 #endif
 		return [OFString stringWithCString: s->cString
 					    length: 1];