@@ -252,11 +252,11 @@
 		}
 
 		if (c >> 8 < tableSize && table[c >> 8][c & 0xFF])
 			[self setCharacter: table[c >> 8][c & 0xFF] atIndex: i];
 
-		isStart = of_ascii_isspace(c);
+		isStart = OFASCIIIsSpace(c);
 	}
 
 	objc_autoreleasePoolPop(pool);
 }
 #else
@@ -275,11 +275,11 @@
 		OFUnichar c = characters[i];
 
 		if (c <= 0x7F)
 			[self setCharacter: (int)function(c) atIndex: i];
 
-		isStart = of_ascii_isspace(c);
+		isStart = OFASCIIIsSpace(c);
 	}
 
 	objc_autoreleasePoolPop(pool);
 }
 #endif
@@ -413,21 +413,21 @@
 		       wordMiddleTableSize: OF_UNICODE_LOWERCASE_TABLE_SIZE];
 }
 #else
 - (void)uppercase
 {
-	convert(self, of_ascii_toupper, of_ascii_toupper);
+	convert(self, OFASCIIToUpper, OFASCIIToUpper);
 }
 
 - (void)lowercase
 {
-	convert(self, of_ascii_tolower, of_ascii_tolower);
+	convert(self, OFASCIIToLower, OFASCIIToLower);
 }
 
 - (void)capitalize
 {
-	convert(self, of_ascii_toupper, of_ascii_tolower);
+	convert(self, OFASCIIToUpper, OFASCIIToLower);
 }
 #endif
 
 - (void)insertString: (OFString *)string atIndex: (size_t)idx
 {
@@ -509,11 +509,11 @@
 	size_t i, length = self.length;
 
 	for (i = 0; i < length; i++) {
 		OFUnichar c = characters[i];
 
-		if (!of_ascii_isspace(c))
+		if (!OFASCIIIsSpace(c))
 			break;
 	}
 
 	objc_autoreleasePoolPop(pool);
 
@@ -534,11 +534,11 @@
 	pool = objc_autoreleasePoolPush();
 	characters = self.characters;
 
 	d = 0;
 	for (p = characters + length - 1; p >= characters; p--) {
-		if (!of_ascii_isspace(*p))
+		if (!OFASCIIIsSpace(*p))
 			break;
 
 		d++;
 	}