@@ -34,21 +34,21 @@
 
 	free(context);
 }
 
 int
-of_thread_attr_init(of_thread_attr_t *attr)
+OFPlainThreadAttributesInit(OFPlainThreadAttributes *attr)
 {
 	attr->priority = 0;
 	attr->stackSize = 0;
 
 	return 0;
 }
 
 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)
 {
 	DWORD priority = THREAD_PRIORITY_NORMAL;
 	struct thread_context *context;
 	DWORD threadID;
 
@@ -98,11 +98,11 @@
 
 	return 0;
 }
 
 int
-of_thread_join(of_thread_t thread)
+OFPlainThreadJoin(OFPlainThread thread)
 {
 	switch (WaitForSingleObject(thread, INFINITE)) {
 	case WAIT_OBJECT_0:
 		CloseHandle(thread);
 		return 0;
@@ -117,16 +117,16 @@
 		OF_ENSURE(0);
 	}
 }
 
 int
-of_thread_detach(of_thread_t thread)
+OFPlainThreadDetach(OFPlainThread thread)
 {
 	CloseHandle(thread);
 
 	return 0;
 }
 
 void
-of_thread_set_name(const char *name)
+OFSetThreadName(const char *name)
 {
 }