@@ -70,13 +70,13 @@
 static bool initSuccessful = false;
 #endif
 
 #ifdef OF_AMIGAOS
 # if defined(OF_HAVE_THREADS) && !defined(OF_MORPHOS)
-of_tlskey_t of_socket_base_key;
+OFTLSKey of_socket_base_key;
 #  ifdef OF_AMIGAOS4
-of_tlskey_t of_socket_interface_key;
+OFTLSKey of_socket_interface_key;
 #  endif
 # else
 struct Library *SocketBase;
 #  ifdef OF_AMIGAOS4
 struct SocketIFace *ISocket = NULL;
@@ -85,15 +85,15 @@
 #endif
 
 #if defined(OF_HAVE_THREADS) && defined(OF_AMIGAOS) && !defined(OF_MORPHOS)
 OF_CONSTRUCTOR()
 {
-	if (of_tlskey_new(&of_socket_base_key) != 0)
+	if (OFTLSKeyNew(&of_socket_base_key) != 0)
 		@throw [OFInitializationFailedException exception];
 
 # ifdef OF_AMIGAOS4
-	if (of_tlskey_new(&of_socket_interface_key) != 0)
+	if (OFTLSKeyNew(&of_socket_interface_key) != 0)
 		@throw [OFInitializationFailedException exception];
 # endif
 }
 #endif
 
@@ -172,13 +172,13 @@
 # ifdef OF_AMIGAOS4
 	struct SocketIFace *socketInterface;
 # endif
 
 # ifdef OF_AMIGAOS4
-	if ((socketInterface = of_tlskey_get(of_socket_interface_key)) != NULL)
+	if ((socketInterface = OFTLSKeyGet(of_socket_interface_key)) != NULL)
 # else
-	if ((socketBase = of_tlskey_get(of_socket_base_key)) != NULL)
+	if ((socketBase = OFTLSKeyGet(of_socket_base_key)) != NULL)
 # endif
 		return true;
 
 	if ((socketBase = OpenLibrary("bsdsocket.library", 4)) == NULL)
 		return false;
@@ -189,20 +189,20 @@
 		CloseLibrary(socketBase);
 		return false;
 	}
 # endif
 
-	if (of_tlskey_set(of_socket_base_key, socketBase) != 0) {
+	if (OFTLSKeySet(of_socket_base_key, socketBase) != 0) {
 		CloseLibrary(socketBase);
 # ifdef OF_AMIGAOS4
 		DropInterface((struct Interface *)socketInterface);
 # endif
 		return false;
 	}
 
 # ifdef OF_AMIGAOS4
-	if (of_tlskey_set(of_socket_interface_key, socketInterface) != 0) {
+	if (OFTLSKeySet(of_socket_interface_key, socketInterface) != 0) {
 		CloseLibrary(socketBase);
 		DropInterface((struct Interface *)socketInterface);
 		return false;
 	}
 # endif
@@ -213,14 +213,14 @@
 
 #if defined(OF_HAVE_THREADS) && defined(OF_AMIGAOS) && !defined(OF_MORPHOS)
 void
 of_socket_deinit(void)
 {
-	struct Library *socketBase = of_tlskey_get(of_socket_base_key);
+	struct Library *socketBase = OFTLSKeyGet(of_socket_base_key);
 # ifdef OF_AMIGAOS4
 	struct SocketIFace *socketInterface =
-	    of_tlskey_get(of_socket_interface_key);
+	    OFTLSKeyGet(of_socket_interface_key);
 
 	if (socketInterface != NULL)
 		DropInterface((struct Interface *)socketInterface);
 # endif
 	if (socketBase != NULL)