@@ -73,11 +73,11 @@
 functionWrapper(void *data)
 {
 	struct thread_ctx *ctx = data;
 
 	if (ctx->name != NULL)
-		of_thread_set_name(ctx->name);
+		OFSetThreadName(ctx->name);
 
 	pthread_cleanup_push(free, data);
 
 	ctx->function(ctx->object);
 
@@ -84,11 +84,11 @@
 	pthread_cleanup_pop(1);
 	return NULL;
 }
 
 int
-of_thread_attr_init(of_thread_attr_t *attr)
+OFPlainThreadAttributesInit(OFPlainThreadAttributes *attr)
 {
 	int error;
 	pthread_attr_t POSIXAttr;
 
 	attr->priority = 0;
@@ -107,12 +107,12 @@
 
 	return error;
 }
 
 int
-of_thread_new(of_thread_t *thread, const char *name, void (*function)(id),
-    id object, const of_thread_attr_t *attr)
+OFPlainThreadNew(OFPlainThread *thread, const char *name, void (*function)(id),
+    id object, const OFPlainThreadAttributes *attr)
 {
 	int error = 0;
 	pthread_attr_t POSIXAttr;
 	bool POSIXAttrAvailable = true;
 
@@ -182,25 +182,25 @@
 
 	return error;
 }
 
 int
-of_thread_join(of_thread_t thread)
+OFPlainThreadJoin(OFPlainThread thread)
 {
 	void *ret;
 
 	return pthread_join(thread, &ret);
 }
 
 int
-of_thread_detach(of_thread_t thread)
+OFPlainThreadDetach(OFPlainThread thread)
 {
 	return pthread_detach(thread);
 }
 
 void
-of_thread_set_name(const char *name)
+OFSetThreadName(const char *name)
 {
 #if defined(OF_HAIKU)
 	rename_thread(find_thread(NULL), name);
 #elif defined(HAVE_PTHREAD_SET_NAME_NP)
 	pthread_set_name_np(pthread_self(), name);