@@ -23,11 +23,11 @@
 #import "OFSocket.h"
 #import "OFSocket+Private.h"
 
 #import "OFAlreadyConnectedException.h"
 #import "OFBindIPXSocketFailedException.h"
-#import "OFConnectionFailedException.h"
+#import "OFConnectSocketFailedException.h"
 #import "OFNotOpenException.h"
 
 #ifndef NSPROTO_SPX
 # define NSPROTO_SPX 0
 #endif
@@ -164,15 +164,15 @@
 #endif
 }
 
 - (id)of_connectionFailedExceptionForErrNo: (int)errNo
 {
-	return [OFConnectionFailedException exceptionWithNetwork: _network
-							    node: _node
-							    port: _port
-							  socket: _socket
-							   errNo: errNo];
+	return [OFConnectSocketFailedException exceptionWithNetwork: _network
+							       node: _node
+							       port: _port
+							     socket: _socket
+							      errNo: errNo];
 }
 @end
 
 @implementation OFSPXSocket
 @dynamic delegate;
@@ -229,21 +229,21 @@
 {
 	OFSocketAddress address = OFSocketAddressMakeIPX(network, node, port);
 	int errNo;
 
 	if (![self of_createSocketForAddress: &address errNo: &errNo])
-		@throw [OFConnectionFailedException
+		@throw [OFConnectSocketFailedException
 		    exceptionWithNetwork: network
 				    node: node
 				    port: port
 				  socket: self
 				   errNo: errNo];
 
 	if (![self of_connectSocketToAddress: &address errNo: &errNo]) {
 		[self of_closeSocket];
 
-		@throw [OFConnectionFailedException
+		@throw [OFConnectSocketFailedException
 		    exceptionWithNetwork: network
 				    node: node
 				    port: port
 				  socket: self
 				   errNo: errNo];