@@ -69,13 +69,13 @@
 static bool initSuccessful = false;
 #endif
 
 #ifdef OF_AMIGAOS
 # if defined(OF_HAVE_THREADS) && !defined(OF_MORPHOS)
-OFTLSKey of_socket_base_key;
+OFTLSKey OFSocketBaseKey;
 #  ifdef OF_AMIGAOS4
-OFTLSKey of_socket_interface_key;
+OFTLSKey OFSocketInterfaceKey;
 #  endif
 # else
 struct Library *SocketBase;
 #  ifdef OF_AMIGAOS4
 struct SocketIFace *ISocket = NULL;
@@ -84,15 +84,15 @@
 #endif
 
 #if defined(OF_HAVE_THREADS) && defined(OF_AMIGAOS) && !defined(OF_MORPHOS)
 OF_CONSTRUCTOR()
 {
-	if (OFTLSKeyNew(&of_socket_base_key) != 0)
+	if (OFTLSKeyNew(&OFSocketBaseKey) != 0)
 		@throw [OFInitializationFailedException exception];
 
 # ifdef OF_AMIGAOS4
-	if (OFTLSKeyNew(&of_socket_interface_key) != 0)
+	if (OFTLSKeyNew(&OFSocketInterfaceKey) != 0)
 		@throw [OFInitializationFailedException exception];
 # endif
 }
 #endif
 
@@ -157,11 +157,11 @@
 # endif
 }
 #endif
 
 bool
-of_socket_init(void)
+OFSocketInit(void)
 {
 #if !defined(OF_AMIGAOS) || defined(OF_MORPHOS) || !defined(OF_HAVE_THREADS)
 	static OFOnceControl onceControl = OFOnceControlInitValue;
 	OFOnce(&onceControl, init);
 
@@ -171,13 +171,13 @@
 # ifdef OF_AMIGAOS4
 	struct SocketIFace *socketInterface;
 # endif
 
 # ifdef OF_AMIGAOS4
-	if ((socketInterface = OFTLSKeyGet(of_socket_interface_key)) != NULL)
+	if ((socketInterface = OFTLSKeyGet(OFSocketInterfaceKey)) != NULL)
 # else
-	if ((socketBase = OFTLSKeyGet(of_socket_base_key)) != NULL)
+	if ((socketBase = OFTLSKeyGet(OFSocketBaseKey)) != NULL)
 # endif
 		return true;
 
 	if ((socketBase = OpenLibrary("bsdsocket.library", 4)) == NULL)
 		return false;
@@ -188,20 +188,20 @@
 		CloseLibrary(socketBase);
 		return false;
 	}
 # endif
 
-	if (OFTLSKeySet(of_socket_base_key, socketBase) != 0) {
+	if (OFTLSKeySet(OFSocketBaseKey, socketBase) != 0) {
 		CloseLibrary(socketBase);
 # ifdef OF_AMIGAOS4
 		DropInterface((struct Interface *)socketInterface);
 # endif
 		return false;
 	}
 
 # ifdef OF_AMIGAOS4
-	if (OFTLSKeySet(of_socket_interface_key, socketInterface) != 0) {
+	if (OFTLSKeySet(OFSocketInterfaceKey, socketInterface) != 0) {
 		CloseLibrary(socketBase);
 		DropInterface((struct Interface *)socketInterface);
 		return false;
 	}
 # endif
@@ -210,16 +210,15 @@
 #endif
 }
 
 #if defined(OF_HAVE_THREADS) && defined(OF_AMIGAOS) && !defined(OF_MORPHOS)
 void
-of_socket_deinit(void)
+OFSocketDeinit(void)
 {
-	struct Library *socketBase = OFTLSKeyGet(of_socket_base_key);
+	struct Library *socketBase = OFTLSKeyGet(OFSocketBaseKey);
 # ifdef OF_AMIGAOS4
-	struct SocketIFace *socketInterface =
-	    OFTLSKeyGet(of_socket_interface_key);
+	struct SocketIFace *socketInterface = OFTLSKeyGet(OFSocketInterfaceKey);
 
 	if (socketInterface != NULL)
 		DropInterface((struct Interface *)socketInterface);
 # endif
 	if (socketBase != NULL)
@@ -226,11 +225,11 @@
 		CloseLibrary(socketBase);
 }
 #endif
 
 int
-of_socket_errno()
+OFSocketErrNo()
 {
 #if defined(OF_WINDOWS)
 	switch (WSAGetLastError()) {
 	case WSAEACCES:
 		return EACCES;
@@ -328,11 +327,11 @@
 #endif
 }
 
 #ifndef OF_WII
 int
-of_getsockname(OFSocketHandle sock, struct sockaddr *restrict addr,
+OFGetSockName(OFSocketHandle sock, struct sockaddr *restrict addr,
     socklen_t *restrict addrLen)
 {
 	int ret;
 
 # if defined(OF_HAVE_THREADS) && (!defined(OF_AMIGAOS) || defined(OF_MORPHOS))