@@ -22,15 +22,15 @@
 #import "private.h"
 
 #ifdef OF_HAVE_THREADS
 # import "OFPlainMutex.h"
 
-static struct lock {
+static struct Lock {
 	id object;
 	int count;
 	OFPlainRecursiveMutex rmutex;
-	struct lock *next;
+	struct Lock *next;
 } *locks = NULL;
 
 static OFPlainMutex mutex;
 
 OF_CONSTRUCTOR()
@@ -45,11 +45,11 @@
 {
 	if (object == nil)
 		return 0;
 
 #ifdef OF_HAVE_THREADS
-	struct lock *lock;
+	struct Lock *lock;
 
 	if (OFPlainMutexLock(&mutex) != 0)
 		OBJC_ERROR("Failed to lock mutex!");
 
 	/* Look if we already have a lock */
@@ -96,11 +96,11 @@
 {
 	if (object == nil)
 		return 0;
 
 #ifdef OF_HAVE_THREADS
-	struct lock *lock, *last = NULL;
+	struct Lock *lock, *last = NULL;
 
 	if (OFPlainMutexLock(&mutex) != 0)
 		OBJC_ERROR("Failed to lock mutex!");
 
 	for (lock = locks; lock != NULL; lock = lock->next) {
@@ -128,10 +128,10 @@
 			OBJC_ERROR("Failed to unlock mutex!");
 
 		return 0;
 	}
 
-	OBJC_ERROR("objc_sync_exit() was called for an object not locked!");
+	OBJC_ERROR("objc_sync_exit() was called for an unlocked object!");
 #else
 	return 0;
 #endif
 }