@@ -92,17 +92,16 @@
 
 	[delegate release];
 
 #if defined(OF_HAVE_THREADS) && defined(OF_HAVE_SOCKETS) && \
     defined(OF_AMIGAOS) && !defined(OF_MORPHOS)
-	of_socket_deinit();
+	OFSocketDeinit();
 #endif
 }
 
 int
-of_application_main(int *argc, char **argv[],
-    id <OFApplicationDelegate> delegate)
+OFApplicationMain(int *argc, char **argv[], id <OFApplicationDelegate> delegate)
 {
 #ifdef OF_WINDOWS
 	wchar_t **wargv, **wenvp;
 	int wargc, si = 0;
 #endif
@@ -221,19 +220,19 @@
 
 		atexit(atexitHandler);
 
 #if defined(OF_WINDOWS)
 		if ([OFSystemInfo isWindowsNT]) {
-			of_char16_t *env, *env0;
+			OFChar16 *env, *env0;
 			env = env0 = GetEnvironmentStringsW();
 
 			while (*env != 0) {
 				void *pool = objc_autoreleasePoolPush();
 				OFString *tmp, *key, *value;
 				size_t length, pos;
 
-				length = of_string_utf16_length(env);
+				length = OFUTF16StringLength(env);
 				tmp = [OFString stringWithUTF16String: env
 							       length: length];
 				env += length + 1;
 
 				/*
@@ -245,11 +244,11 @@
 					objc_autoreleasePoolPop(pool);
 					continue;
 				}
 
 				pos = [tmp rangeOfString: @"="].location;
-				if (pos == OF_NOT_FOUND) {
+				if (pos == OFNotFound) {
 					fprintf(stderr,
 					    "Warning: Invalid environment "
 					    "variable: %s\n", tmp.UTF8String);
 					continue;
 				}
@@ -287,11 +286,11 @@
 					objc_autoreleasePoolPop(pool);
 					continue;
 				}
 
 				pos = [tmp rangeOfString: @"="].location;
-				if (pos == OF_NOT_FOUND) {
+				if (pos == OFNotFound) {
 					fprintf(stderr,
 					    "Warning: Invalid environment "
 					    "variable: %s\n", tmp.UTF8String);
 					continue;
 				}
@@ -308,11 +307,11 @@
 #elif defined(OF_AMIGAOS)
 		void *pool = objc_autoreleasePoolPush();
 		OFFileManager *fileManager = [OFFileManager defaultManager];
 		OFArray *envContents =
 		    [fileManager contentsOfDirectoryAtPath: @"ENV:"];
-		const of_string_encoding_t encoding = [OFLocale encoding];
+		OFStringEncoding encoding = [OFLocale encoding];
 		struct Process *proc;
 		struct LocalVar *firstLocalVar;
 
 		for (OFString *name in envContents) {
 			void *pool2 = objc_autoreleasePoolPush();
@@ -374,12 +373,11 @@
 # else
 		char **env = *_NSGetEnviron();
 # endif
 
 		if (env != NULL) {
-			const of_string_encoding_t encoding =
-			    [OFLocale encoding];
+			OFStringEncoding encoding = [OFLocale encoding];
 
 			for (; *env != NULL; env++) {
 				void *pool = objc_autoreleasePoolPush();
 				OFString *key, *value;
 				char *sep;
@@ -466,11 +464,11 @@
 
 - (void)of_setArgumentCount: (int *)argc andArgumentValues: (char ***)argv
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFMutableArray *arguments;
-	of_string_encoding_t encoding;
+	OFStringEncoding encoding;
 
 	_argc = argc;
 	_argv = argv;
 
 	encoding = [OFLocale encoding];
@@ -605,12 +603,12 @@
 #ifdef OF_HAVE_SANDBOX
 - (void)activateSandbox: (OFSandbox *)sandbox
 {
 # ifdef OF_HAVE_PLEDGE
 	void *pool = objc_autoreleasePoolPush();
-	of_string_encoding_t encoding = [OFLocale encoding];
-	OFArray OF_GENERIC(of_sandbox_unveil_path_t) *unveiledPaths;
+	OFStringEncoding encoding = [OFLocale encoding];
+	OFArray OF_GENERIC(OFSandboxUnveilPath) *unveiledPaths;
 	size_t unveiledPathsCount;
 	const char *promises;
 
 	if (_activeSandbox != nil && sandbox != _activeSandbox)
 		@throw [OFInvalidArgumentException exception];
@@ -618,11 +616,11 @@
 	unveiledPaths = sandbox.unveiledPaths;
 	unveiledPathsCount = unveiledPaths.count;
 
 	for (size_t i = sandbox->_unveiledPathsIndex;
 	    i < unveiledPathsCount; i++) {
-		of_sandbox_unveil_path_t unveiledPath =
+		OFSandboxUnveilPath unveiledPath =
 		    [unveiledPaths objectAtIndex: i];
 		OFString *path = unveiledPath.firstObject;
 		OFString *permissions = unveiledPath.secondObject;
 
 		if (path == nil || permissions == nil)