@@ -120,28 +120,27 @@
 #endif
 
 static OF_INLINE OFString *
 normalizedKey(OFString *key)
 {
-	char *cString = of_strdup(key.UTF8String);
+	char *cString = OFStrdup(key.UTF8String);
 	unsigned char *tmp = (unsigned char *)cString;
 	bool firstLetter = true;
 
 	if (cString == NULL)
 		@throw [OFOutOfMemoryException
 		    exceptionWithRequestedSize: strlen(key.UTF8String)];
 
 	while (*tmp != '\0') {
-		if (!of_ascii_isalpha(*tmp)) {
+		if (!OFASCIIIsAlpha(*tmp)) {
 			firstLetter = true;
 			tmp++;
 			continue;
 		}
 
 		*tmp = (firstLetter
-		    ? of_ascii_toupper(*tmp)
-		    : of_ascii_tolower(*tmp));
+		    ? OFASCIIToUpper(*tmp) : OFASCIIToLower(*tmp));
 
 		firstLetter = false;
 		tmp++;
 	}
 
@@ -341,11 +340,11 @@
 		}
 	} @catch (OFWriteFailedException *e) {
 		return false;
 	}
 
-	OF_ENSURE(0);
+	OFEnsure(0);
 }
 
 - (bool)parseProlog: (OFString *)line
 {
 	OFString *method;