@@ -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
@@ -229,11 +228,11 @@
 			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;
 
 				/*