@@ -15,43 +15,44 @@
 
 #include "config.h"
 
 #include <errno.h>
 
-#import "thread.h"
+#import "OFPlainThread.h"
+
 #import "macros.h"
 
 #include <windows.h>
 
-struct thread_context {
+struct ThreadContext {
 	void (*function)(id);
 	id object;
 };
 
 static WINAPI void
-functionWrapper(struct thread_context *context)
+functionWrapper(struct ThreadContext *context)
 {
 	context->function(context->object);
 
 	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;
+	struct ThreadContext *context;
 	DWORD threadID;
 
 	if (attr != NULL && attr->priority != 0) {
 		if (attr->priority < -1 || attr->priority > 1)
 			return EINVAL;
@@ -84,25 +85,25 @@
 			break;
 		case ERROR_ACCESS_DENIED:
 			error = EACCES;
 			break;
 		default:
-			OF_ENSURE(0);
+			OFEnsure(0);
 		}
 
 		free(context);
 		return error;
 	}
 
 	if (attr != NULL && attr->priority != 0)
-		OF_ENSURE(!SetThreadPriority(*thread, priority));
+		OFEnsure(!SetThreadPriority(*thread, priority));
 
 	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;
@@ -109,24 +110,24 @@
 	case WAIT_FAILED:
 		switch (GetLastError()) {
 		case ERROR_INVALID_HANDLE:
 			return EINVAL;
 		default:
-			OF_ENSURE(0);
+			OFEnsure(0);
 		}
 	default:
-		OF_ENSURE(0);
+		OFEnsure(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)
 {
 }