@@ -73,12 +73,12 @@
 #import "OFInitializationFailedException.h"
 #import "OFInvalidArgumentException.h"
 #import "OFNotImplementedException.h"
 #import "OFOutOfRangeException.h"
 #ifdef OF_HAVE_THREADS
-# import "OFThreadJoinFailedException.h"
-# import "OFThreadStartFailedException.h"
+# import "OFJoinThreadFailedException.h"
+# import "OFStartThreadFailedException.h"
 # import "OFThreadStillRunningException.h"
 #endif
 
 #ifdef OF_MINT
 /* freemint-gcc does not have trunc() */
@@ -435,11 +435,11 @@
 	_running = OFThreadStateRunning;
 
 	if ((error = OFPlainThreadNew(&_thread, [_name cStringWithEncoding:
 	    [OFLocale encoding]], callMain, self, &_attr)) != 0) {
 		[self release];
-		@throw [OFThreadStartFailedException
+		@throw [OFStartThreadFailedException
 		    exceptionWithThread: self
 				  errNo: error];
 	}
 }
 
@@ -446,16 +446,16 @@
 - (id)join
 {
 	int error;
 
 	if (_running == OFThreadStateNotRunning)
-		@throw [OFThreadJoinFailedException
+		@throw [OFJoinThreadFailedException
 		    exceptionWithThread: self
 				  errNo: EINVAL];
 
 	if ((error = OFPlainThreadJoin(_thread)) != 0)
-		@throw [OFThreadJoinFailedException exceptionWithThread: self
+		@throw [OFJoinThreadFailedException exceptionWithThread: self
 								  errNo: error];
 
 	_running = OFThreadStateNotRunning;
 
 	return _returnValue;