@@ -115,11 +115,11 @@
 	else
 		OFSetThreadName(object_getClassName(thread));
 
 #if defined(OF_AMIGAOS) && defined(OF_HAVE_SOCKETS)
 	if (thread.supportsSockets)
-		if (!of_socket_init())
+		if (!OFSocketInit())
 			@throw [OFInitializationFailedException
 			    exceptionWithClass: thread.class];
 #endif
 
 	/*
@@ -143,11 +143,11 @@
 	objc_autoreleasePoolPop(thread->_pool);
 #endif
 
 #if defined(OF_AMIGAOS) && !defined(OF_MORPHOS) && defined(OF_HAVE_SOCKETS)
 	if (thread.supportsSockets)
-		of_socket_deinit();
+		OFSocketDeinit();
 #endif
 
 	thread->_running = OFThreadStateWaitingForJoin;
 
 	[thread release];