@@ -50,11 +50,11 @@
 	OFString *writePath;
 #endif
 
 	TEST(@"+[fileWithPath:encoding:]",
 	    (file = [OFINIFile fileWithPath: @"testfile.ini"
-				   encoding: OF_STRING_ENCODING_CODEPAGE_437]))
+				   encoding: OFStringEncodingCodepage437]))
 
 	tests = [file categoryForName: @"tests"];
 	foobar = [file categoryForName: @"foobar"];
 	types = [file categoryForName: @"types"];
 	TEST(@"-[categoryForName:]",
@@ -119,18 +119,18 @@
 	    [[OFApplication environment] objectForKey: @"HOME"],
 	    @"tmp", @"tmpfile.ini", nil]];
 # endif
 	TEST(@"-[writeToFile:encoding:]",
 	    R([file writeToFile: writePath
-		       encoding: OF_STRING_ENCODING_CODEPAGE_437]) &&
+		       encoding: OFStringEncodingCodepage437]) &&
 	    [[OFString
 		stringWithContentsOfFile: writePath
-				encoding: OF_STRING_ENCODING_CODEPAGE_437]
+				encoding: OFStringEncodingCodepage437]
 	    isEqual: output])
 	[[OFFileManager defaultManager] removeItemAtPath: writePath];
 #else
 	(void)output;
 #endif
 
 	objc_autoreleasePoolPop(pool);
 }
 @end