@@ -87,21 +87,21 @@
  * \param class The class of the object which caused the exception
  * \param size The size of the memory that couldn't be allocated
  * \return A new no memory exception
  */
 + newWithClass: (Class)class
-       andSize: (size_t)size;
+	  size: (size_t)size;
 
 /**
  * Initializes an already allocated no memory exception.
  *
  * \param class The class of the object which caused the exception
  * \param size The size of the memory that couldn't be allocated
  * \return An initialized no memory exception
  */
 - initWithClass: (Class)class
-	andSize: (size_t)size;
+	   size: (size_t)size;
 
 /**
  * \return The size of the memoory that couldn't be allocated
  */
 - (size_t)requestedSize;
@@ -119,21 +119,21 @@
  * \param class The class of the object which caused the exception
  * \param ptr A pointer to the memory that is not part of the object
  * \return A new memory not part of object exception
  */
 + newWithClass: (Class)class
-    andPointer: (void*)ptr;
+       pointer: (void*)ptr;
 
 /**
  * Initializes an already allocated memory not part of object exception.
  *
  * \param class The class of the object which caused the exception
  * \param ptr A pointer to the memory that is not part of the object
  * \return An initialized memory not part of object exception
  */
 - initWithClass: (Class)class
-     andPointer: (void*)ptr;
+	pointer: (void*)ptr;
 
 /**
  * \return A pointer to the memory which is not part of the object
  */
 - (void*)pointer;
@@ -151,21 +151,21 @@
  * \param class The class of the object which caused the exception
  * \param selector The selector which is not or not fully implemented
  * \return A new not implemented exception
  */
 + newWithClass: (Class)class
-   andSelector: (SEL)selector;
+      selector: (SEL)selector;
 
 /**
  * Initializes an already allocated not implemented exception.
  *
  * \param class The class of the object which caused the exception
  * \param selector The selector which is not or not fully implemented
  * \return An initialized not implemented exception
  */
 - initWithClass: (Class)class
-    andSelector: (SEL)selector;
+       selector: (SEL)selector;
 @end
 
 /**
  * An OFException indicating the given value is out of range.
  */
@@ -184,21 +184,21 @@
  * \param class The class of the object which caused the exception
  * \param selector The selector which doesn't accept the argument
  * \return A new invalid argument exception
  */
 + newWithClass: (Class)class
-   andSelector: (SEL)selector;
+      selector: (SEL)selector;
 
 /**
  * Initializes an already allocated invalid argument exception
  *
  * \param class The class of the object which caused the exception
  * \param selector The selector which doesn't accept the argument
  * \return An initialized invalid argument exception
  */
 - initWithClass: (Class)class
-    andSelector: (SEL)selector;
+       selector: (SEL)selector;
 @end
 
 /**
  * An OFException indicating that the encoding is invalid for this object.
  */
@@ -232,12 +232,12 @@
  * \param path A string of the path to the file tried to open
  * \param mode A string of the mode in which the file should have been opened
  * \return A new open file failed exception
  */
 + newWithClass: (Class)class
-       andPath: (OFString*)path
-       andMode: (OFString*)mode;
+	  path: (OFString*)path
+	  mode: (OFString*)mode;
 
 /**
  * Initializes an already allocated open file failed exception.
  *
  * \param class The class of the object which caused the exception
@@ -244,12 +244,12 @@
  * \param path A string of the path to the file which couldn't be opened
  * \param mode A string of the mode in which the file should have been opened
  * \return An initialized open file failed exception
  */
 - initWithClass: (Class)class
-	andPath: (OFString*)path
-	andMode: (OFString*)mode;
+	   path: (OFString*)path
+	   mode: (OFString*)mode;
 
 /**
  * \return The errno from when the exception was created
  */
 - (int)errNo;
@@ -277,46 +277,46 @@
 }
 
 /**
  * \param class The class of the object which caused the exception
  * \param size The requested size of the data that couldn't be read / written
- * \param nitems The requested number of items that couldn't be read / written
+ * \param items The requested number of items that couldn't be read / written
  * \return A new open file failed exception
  */
 + newWithClass: (Class)class
-       andSize: (size_t)size
-     andNItems: (size_t)nitems;
+	  size: (size_t)size
+	 items: (size_t)items;
 
 /**
  * \param class The class of the object which caused the exception
  * \param size The requested size of the data that couldn't be read / written
  * \return A new open file failed exception
  */
 + newWithClass: (Class)class
-       andSize: (size_t)size;
+	  size: (size_t)size;
 
 /**
  * Initializes an already allocated read or write failed exception.
  *
  * \param class The class of the object which caused the exception
  * \param size The requested size of the data that couldn't be read / written
- * \param nitems The requested number of items that couldn't be read / written
+ * \param items The requested number of items that couldn't be read / written
  * \return A new open file failed exception
  */
 - initWithClass: (Class)class
-	andSize: (size_t)size
-      andNItems: (size_t)nitems;
+	   size: (size_t)size
+	  items: (size_t)items;
 
 /**
  * Initializes an already allocated read or write failed exception.
  *
  * \param class The class of the object which caused the exception
  * \param size The requested size of the data that couldn't be read / written
  * \return A new open file failed exception
  */
 - initWithClass: (Class)class
-	andSize: (size_t)size;
+	   size: (size_t)size;
 
 /**
  * \return The errno from when the exception was created
  */
 - (int)errNo;
@@ -383,12 +383,12 @@
  * \param node The node for which translation was requested
  * \param service The service of the node for which translation was requested
  * \return A new address translation failed exception
  */
 + newWithClass: (Class)class
-       andNode: (OFString*)node
-    andService: (OFString*)service;
+	  node: (OFString*)node
+       service: (OFString*)service;
 
 /**
  * Initializes an already allocated address translation failed exception.
  *
  * \param class The class of the object which caused the exception
@@ -395,12 +395,12 @@
  * \param node The node for which translation was requested
  * \param service The service of the node for which translation was requested
  * \return An initialized address translation failed exception
  */
 - initWithClass: (Class)class
-	andNode: (OFString*)node
-     andService: (OFString*)service;
+	   node: (OFString*)node
+	service: (OFString*)service;
 
 /**
  * \return The errno from when the exception was created
  */
 - (int)errNo;
@@ -431,12 +431,12 @@
  * \param node The node to which the connection failed
  * \param service The service on the node to which the connection failed
  * \return A new connection failed exception
  */
 + newWithClass: (Class)class
-       andNode: (OFString*)node
-    andService: (OFString*)service;
+	  node: (OFString*)node
+       service: (OFString*)service;
 
 /**
  * Initializes an already allocated connection failed exception.
  *
  * \param class The class of the object which caused the exception
@@ -443,12 +443,12 @@
  * \param node The node to which the connection failed
  * \param service The service on the node to which the connection failed
  * \return An initialized connection failed exception
  */
 - initWithClass: (Class)class
-	andNode: (OFString*)node
-     andService: (OFString*)service;
+	   node: (OFString*)node
+	service: (OFString*)service;
 
 /**
  * \return The errno from when the exception was created
  */
 - (int)errNo;
@@ -481,13 +481,13 @@
  * \param service The service on which binding failed
  * \param family The family for which binnding failed
  * \return A new bind failed exception
  */
 + newWithClass: (Class)class
-       andNode: (OFString*)node
-    andService: (OFString*)service
-     andFamily: (int)family;
+	  node: (OFString*)node
+       service: (OFString*)service
+	family: (int)family;
 
 /**
  * Initializes an already allocated bind failed exception.
  *
  * \param class The class of the object which caused the exception
@@ -495,13 +495,13 @@
  * \param service The service on which binding failed
  * \param family The family for which binnding failed
  * \return An initialized bind failed exception
  */
 - initWithClass: (Class)class
-	andNode: (OFString*)node
-     andService: (OFString*)service
-      andFamily: (int)family;
+	   node: (OFString*)node
+	service: (OFString*)service
+	 family: (int)family;
 
 /**
  * \return The errno from when the exception was created
  */
 - (int)errNo;
@@ -535,21 +535,21 @@
  * \param class The class of the object which caused the exception
  * \param backlog The requested size of the back log
  * \return A new listen failed exception
  */
 + newWithClass: (Class)class
-    andBackLog: (int)backlog;
+       backLog: (int)backlog;
 
 /**
  * Initializes an already allocated listen failed exception
  *
  * \param class The class of the object which caused the exception
  * \param backlog The requested size of the back log
  * \return An initialized listen failed exception
  */
 - initWithClass: (Class)class
-     andBackLog: (int)backlog;
+	backLog: (int)backlog;
 
 /**
  * \return The errno from when the exception was created
  */
 - (int)errNo;