@@ -30,11 +30,11 @@
 
 #import "OFApplication.h"
 #import "OFString.h"
 #import "OFArray.h"
 #import "OFDictionary.h"
-#import "OFLocalization.h"
+#import "OFLocale.h"
 #import "OFRunLoop.h"
 #import "OFRunLoop+Private.h"
 #import "OFThread.h"
 #import "OFThread+Private.h"
 #import "OFSandbox.h"
@@ -121,11 +121,11 @@
 #ifdef OF_WINDOWS
 	wchar_t **wargv, **wenvp;
 	int wargc, si = 0;
 #endif
 
-	[[OFLocalization alloc] init];
+	[[OFLocale alloc] init];
 
 	app = [[OFApplication alloc] of_init];
 
 	[app of_setArgumentCount: argc
 	       andArgumentValues: argv];
@@ -255,11 +255,11 @@
 #elif defined(OF_AMIGAOS)
 		void *pool = objc_autoreleasePoolPush();
 		OFFileManager *fileManager = [OFFileManager defaultManager];
 		OFArray *envContents =
 		    [fileManager contentsOfDirectoryAtPath: @"ENV:"];
-		const of_string_encoding_t encoding = [OFLocalization encoding];
+		const of_string_encoding_t encoding = [OFLocale encoding];
 		struct Process *proc;
 		struct LocalVar *firstLocalVar;
 
 		for (OFString *name in envContents) {
 			void *pool2 = objc_autoreleasePoolPush();
@@ -322,11 +322,11 @@
 		char **env = *_NSGetEnviron();
 # endif
 
 		if (env != NULL) {
 			const of_string_encoding_t encoding =
-			    [OFLocalization encoding];
+			    [OFLocale encoding];
 
 			for (; *env != NULL; env++) {
 				void *pool = objc_autoreleasePoolPush();
 				OFString *key, *value;
 				char *sep;
@@ -427,11 +427,11 @@
 	of_string_encoding_t encoding;
 
 	_argc = argc;
 	_argv = argv;
 
-	encoding = [OFLocalization encoding];
+	encoding = [OFLocale encoding];
 
 # ifndef OF_NINTENDO_DS
 	if (*argc > 0) {
 # else
 	if (__system_argv->argvMagic == ARGV_MAGIC &&
@@ -569,11 +569,11 @@
 - (void)activateSandbox: (OFSandbox *)sandbox
 {
 # ifdef OF_HAVE_PLEDGE
 	void *pool = objc_autoreleasePoolPush();
 	const char *promises = [[sandbox pledgeString]
-	    cStringWithEncoding: [OFLocalization encoding]];
+	    cStringWithEncoding: [OFLocale encoding]];
 	OFSandbox *oldSandbox;
 
 	if (pledge(promises, NULL) != 0)
 		@throw [OFSandboxActivationFailedException
 		    exceptionWithSandbox: sandbox