@@ -100,18 +100,18 @@
 }
 @end
 
 @implementation OFOutOfMemoryException
 + newWithClass: (Class)class_
-       andSize: (size_t)size
+	  size: (size_t)size
 {
 	return [[self alloc] initWithClass: class_
-				   andSize: size];
+				      size: size];
 }
 
 - initWithClass: (Class)class_
-	andSize: (size_t)size
+	   size: (size_t)size
 {
 	self = [super initWithClass: class_];
 
 	req_size = size;
 
@@ -136,18 +136,18 @@
 }
 @end
 
 @implementation OFMemoryNotPartOfObjectException
 + newWithClass: (Class)class_
-    andPointer: (void*)ptr
+       pointer: (void*)ptr
 {
 	return [[self alloc] initWithClass: class_
-				andPointer: ptr];
+				   pointer: ptr];
 }
 
 - initWithClass: (Class)class_
-     andPointer: (void*)ptr
+	pointer: (void*)ptr
 {
 	self = [super initWithClass: class_];
 
 	pointer = ptr;
 
@@ -174,18 +174,18 @@
 }
 @end
 
 @implementation OFNotImplementedException
 + newWithClass: (Class)class_
-   andSelector: (SEL)selector_
+      selector: (SEL)selector_
 {
 	return [[self alloc] initWithClass: class_
-			       andSelector: selector_];
+				  selector: selector_];
 }
 
 - initWithClass: (Class)class_
-    andSelector: (SEL)selector_
+       selector: (SEL)selector_
 {
 	self = [super initWithClass: class_];
 
 	selector = selector_;
 
@@ -218,18 +218,18 @@
 }
 @end
 
 @implementation OFInvalidArgumentException
 + newWithClass: (Class)class_
-   andSelector: (SEL)selector_
+      selector: (SEL)selector_
 {
 	return [[self alloc] initWithClass: class_
-			       andSelector: selector_];
+				  selector: selector_];
 }
 
 - initWithClass: (Class)class_
-    andSelector: (SEL)selector_
+       selector: (SEL)selector_
 {
 	self = [super initWithClass: class_];
 
 	selector = selector_;
 
@@ -288,21 +288,21 @@
 }
 @end
 
 @implementation OFOpenFileFailedException
 + newWithClass: (Class)class_
-       andPath: (OFString*)path_
-       andMode: (OFString*)mode_
+	  path: (OFString*)path_
+	  mode: (OFString*)mode_
 {
 	return [[self alloc] initWithClass: class_
-				   andPath: path_
-				   andMode: mode_];
+				      path: path_
+				      mode: mode_];
 }
 
 - initWithClass: (Class)class_
-	andPath: (OFString*)path_
-	andMode: (OFString*)mode_
+	   path: (OFString*)path_
+	   mode: (OFString*)mode_
 {
 	self = [super initWithClass: class_];
 
 	path = [path_ retain];
 	mode = [mode_ retain];
@@ -347,33 +347,33 @@
 }
 @end
 
 @implementation OFReadOrWriteFailedException
 + newWithClass: (Class)class_
-       andSize: (size_t)size
-     andNItems: (size_t)nitems
+	  size: (size_t)size
+	 items: (size_t)items
 {
 	return [[self alloc] initWithClass: class_
-				   andSize: size
-				 andNItems: nitems];
+				      size: size
+				     items: items];
 }
 
 + newWithClass: (Class)class_
-       andSize: (size_t)size
+	  size: (size_t)size
 {
 	return [[self alloc] initWithClass: class_
-				   andSize: size];
+				      size: size];
 }
 
 - initWithClass: (Class)class_
-	andSize: (size_t)size
-      andNItems: (size_t)nitems
+	   size: (size_t)size
+	  items: (size_t)items
 {
 	self = [super initWithClass: class_];
 
 	req_size = size;
-	req_items = nitems;
+	req_items = items;
 	has_items = YES;
 
 	if (class_ == [OFTCPSocket class])
 		err = GET_SOCK_ERR;
 	else
@@ -381,11 +381,11 @@
 
 	return self;
 }
 
 - initWithClass: (Class)class_
-	andSize: (size_t)size
+	   size: (size_t)size
 {
 	self = [super initWithClass: class_];
 
 	req_size = size;
 	req_items = 0;
@@ -498,21 +498,21 @@
 }
 @end
 
 @implementation OFAddressTranslationFailedException
 + newWithClass: (Class)class_
-       andNode: (OFString*)node_
-    andService: (OFString*)service_
+	  node: (OFString*)node_
+       service: (OFString*)service_
 {
 	return [[self alloc] initWithClass: class_
-				   andNode: node_
-				andService: service_];
+				      node: node_
+				   service: service_];
 }
 
 - initWithClass: (Class)class_
-	andNode: (OFString*)node_
-     andService: (OFString*)service_
+	   node: (OFString*)node_
+	service: (OFString*)service_
 {
 	self = [super initWithClass: class_];
 
 	node = [node_ retain];
 	service = [service_ retain];
@@ -561,21 +561,21 @@
 }
 @end
 
 @implementation OFConnectionFailedException
 + newWithClass: (Class)class_
-       andNode: (OFString*)node_
-    andService: (OFString*)service_
+	  node: (OFString*)node_
+       service: (OFString*)service_
 {
 	return [[self alloc] initWithClass: class_
-				   andNode: node_
-				andService: service_];
+				      node: node_
+				   service: service_];
 }
 
 - initWithClass: (Class)class_
-	andNode: (OFString*)node_
-     andService: (OFString*)service_
+	   node: (OFString*)node_
+	service: (OFString*)service_
 {
 	self = [super initWithClass: class_];
 
 	node	= [node_ retain];
 	service	= [service_ retain];
@@ -621,24 +621,24 @@
 }
 @end
 
 @implementation OFBindFailedException
 + newWithClass: (Class)class_
-       andNode: (OFString*)node_
-    andService: (OFString*)service_
-     andFamily: (int)family_
+	  node: (OFString*)node_
+       service: (OFString*)service_
+	family: (int)family_
 {
 	return [[self alloc] initWithClass: class_
-				   andNode: node_
-				andService: service_
-				 andFamily: family_];
+				      node: node_
+				   service: service_
+				    family: family_];
 }
 
 - initWithClass: (Class)class_
-	andNode: (OFString*)node_
-     andService: (OFString*)service_
-      andFamily: (int)family_
+	   node: (OFString*)node_
+	service: (OFString*)service_
+	 family: (int)family_
 {
 	self = [super initWithClass: class_];
 
 	node	= [node_ retain];
 	service	= [service_ retain];
@@ -690,18 +690,18 @@
 }
 @end
 
 @implementation OFListenFailedException
 + newWithClass: (Class)class_
-    andBackLog: (int)backlog_
+       backLog: (int)backlog_
 {
 	return [[self alloc] initWithClass: class_
-				andBackLog: backlog_];
+				   backLog: backlog_];
 }
 
 - initWithClass: (Class)class_
-     andBackLog: (int)backlog_
+	backLog: (int)backlog_
 {
 	self = [super initWithClass: class_];
 
 	backlog = backlog_;
 	err = GET_SOCK_ERR;