Index: src/OFExceptions.h
==================================================================
--- src/OFExceptions.h
+++ src/OFExceptions.h
@@ -152,29 +152,29 @@
 	char *mode;
 }
 
 /**
  * \param obj The object which caused the exception
- * \param p A C string of the path to the file tried to open
- * \param m A C string of the mode in which the file should have been opened
+ * \param path A C string of the path to the file tried to open
+ * \param mode A C string of the mode in which the file should have been opened
  * \return A new open file failed exception
  */
 + newWithObject: (id)obj
-	andPath: (const char*)p
-	andMode: (const char*)m;
+	andPath: (const char*)path
+	andMode: (const char*)mode;
 
 /**
  * Initializes an already allocated open file failed exception.
  *
  * \param obj The object which caused the exception
- * \param p A C string of the path to the file which couldn't be opened
- * \param m A C string of the mode in which the file should have been opened
+ * \param path A C string of the path to the file which couldn't be opened
+ * \param mode A C string of the mode in which the file should have been opened
  * \return An initialized open file failed exception
  */
 - initWithObject: (id)obj
-	 andPath: (const char*)p
-	 andMode: (const char*)m;
+	 andPath: (const char*)path
+	 andMode: (const char*)mode;
 
 - free;
 
 /**
  * \return An error message for the exception as a C String
@@ -328,29 +328,29 @@
 	char *service;
 }
 
 /**
  * \param obj The object which caused the exception
- * \param n The node for which translation was requested
- * \param s The service of the node for which translation was requested
+ * \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
  */
 + newWithObject: (id)obj
-	andNode: (const char*)n
-     andService: (const char*)s;
+	andNode: (const char*)node
+     andService: (const char*)service;
 
 /**
  * Initializes an already allocated address translation failed exception.
  *
  * \param obj The object which caused the exception
- * \param n The node for which translation was requested
- * \param s The service of the node for which translation was requested
+ * \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
  */
 - initWithObject: (id)obj
-	 andNode: (const char*)n
-      andService: (const char*)s;
+	 andNode: (const char*)node
+      andService: (const char*)service;
 
 - free;
 
 /**
  * \return An error message for the exception as a C string.
@@ -377,29 +377,29 @@
 	uint16_t port;
 }
 
 /**
  * \param obj The object which caused the exception
- * \param h The host to which the connection failed
- * \param p The port on the host to which the connection failed
+ * \param host The host to which the connection failed
+ * \param port The port on the host to which the connection failed
  * \return A new connection failed exception
  */
 + newWithObject: (id)obj
-	andHost: (const char*)h
-	andPort: (uint16_t)p;
+	andHost: (const char*)host
+	andPort: (uint16_t)port;
 
 /**
  * Initializes an already allocated connection failed exception.
  *
  * \param obj The object which caused the exception
- * \param h The host to which the connection failed
- * \param p The port on the host to which the connection failed
+ * \param host The host to which the connection failed
+ * \param port The port on the host to which the connection failed
  * \return An initialized connection failed exception
  */
 - initWithObject: (id)obj
-	 andHost: (const char*)h
-	 andPort: (uint16_t)p;
+	 andHost: (const char*)host
+	 andPort: (uint16_t)port;
 
 - free;
 
 /**
  * \return An error message for the exception as a C string.
@@ -427,33 +427,33 @@
 	int family;
 }
 
 /**
  * \param obj The object which caused the exception
- * \param h The host on which binding failed
- * \param p The port on which binding failed
- * \param f The family for which binnding failed
+ * \param host The host on which binding failed
+ * \param port The port on which binding failed
+ * \param family The family for which binnding failed
  * \return A new bind failed exception
  */
 + newWithObject: (id)obj
-	andHost: (const char*)h
-	andPort: (uint16_t)p
-      andFamily: (int)f;
+	andHost: (const char*)host
+	andPort: (uint16_t)port
+      andFamily: (int)family;
 
 /**
  * Initializes an already allocated bind failed exception.
  *
  * \param obj The object which caused the exception
- * \param h The host on which binding failed
- * \param p The port on which binding failed
- * \param f The family for which binnding failed
+ * \param host The host on which binding failed
+ * \param port The port on which binding failed
+ * \param family The family for which binnding failed
  * \return An initialized bind failed exception
  */
 - initWithObject: (id)obj
-	 andHost: (const char*)h
-	 andPort: (uint16_t)p
-       andFamily: (int)f;
+	 andHost: (const char*)host
+	 andPort: (uint16_t)port
+       andFamily: (int)family;
 
 - free;
 
 /**
  * \return An error message for the exception as a C string.
@@ -484,25 +484,25 @@
 	int backlog;
 }
 
 /**
  * \param obj The object which caused the exception
- * \param b The requested size of the back log
+ * \param backlog The requested size of the back log
  * \return A new listen failed exception
  */
 + newWithObject: (id)obj
-     andBackLog: (int)b;
+     andBackLog: (int)backlog;
 
 /**
  * Initializes an already allocated listen failed exception
  *
  * \param obj The object which caused the exception
- * \param b The requested size of the back log
+ * \param backlog The requested size of the back log
  * \return An initialized listen failed exception
  */
 - initWithObject: (id)obj
-      andBackLog: (int)b;
+      andBackLog: (int)backlog;
 
 /**
  * \return An error message for the exception as a C string.
  */
 - (const char*)cString;

Index: src/OFExceptions.m
==================================================================
--- src/OFExceptions.m
+++ src/OFExceptions.m
@@ -153,25 +153,25 @@
 }
 @end
 
 @implementation OFOpenFileFailedException
 + newWithObject: (id)obj
-	andPath: (const char*)p
-	andMode: (const char*)m
+	andPath: (const char*)path_
+	andMode: (const char*)mode_
 {
 	return [[self alloc] initWithObject: obj
-				    andPath: p
-				    andMode: m];
+				    andPath: path_
+				    andMode: mode_];
 }
 
 - initWithObject: (id)obj
-	 andPath: (const char*)p
-	 andMode: (const char*)m
+	 andPath: (const char*)path_
+	 andMode: (const char*)mode_
 {
 	if ((self = [super initWithObject: obj])) {
-		path = (p != NULL ? strdup(p) : NULL);
-		mode = (m != NULL ? strdup(m) : NULL);
+		path = (path_ != NULL ? strdup(path_) : NULL);
+		mode = (mode_ != NULL ? strdup(mode_) : NULL);
 	}
 
 	return self;
 }
 
@@ -352,25 +352,25 @@
 }
 @end
 
 @implementation OFAddressTranslationFailedException
 + newWithObject: (id)obj
-	andNode: (const char*)n
-     andService: (const char*)s
+	andNode: (const char*)node_
+     andService: (const char*)service_
 {
 	return [self newWithObject: obj
-			   andNode: n
-			andService: s];
+			   andNode: node_
+			andService: service_];
 }
 
 - initWithObject: (id)obj
-	 andNode: (const char*)n
-      andService: (const char*)s
+	 andNode: (const char*)node_
+      andService: (const char*)service_
 {
 	if ((self = [super initWithObject: obj])) {
-		node = (n != NULL ? strdup(n) : NULL);
-		service = (s != NULL ? strdup(s) : NULL);
+		node = (node_ != NULL ? strdup(node_) : NULL);
+		service = (service_ != NULL ? strdup(service_) : NULL);
 	}
 
 	return self;
 }
 
@@ -410,25 +410,25 @@
 }
 @end
 
 @implementation OFConnectionFailedException
 + newWithObject: (id)obj
-	andHost: (const char*)h
-	andPort: (uint16_t)p
+	andHost: (const char*)host_
+	andPort: (uint16_t)port_
 {
 	return [self newWithObject: obj
-			   andHost: h
-			   andPort: p];
+			   andHost: host_
+			   andPort: port_];
 }
 
 - initWithObject: (id)obj
-	 andHost: (const char*)h
-	 andPort: (uint16_t)p
+	 andHost: (const char*)host_
+	 andPort: (uint16_t)port_
 {
 	if ((self = [super initWithObject: obj])) {
-		host = (h != NULL ? strdup(h) : NULL);
-		port = p;
+		host = (host_ != NULL ? strdup(host_) : NULL);
+		port = port_;
 	}
 
 	return self;
 }
 
@@ -462,29 +462,29 @@
 }
 @end
 
 @implementation OFBindFailedException
 + newWithObject: (id)obj
-	andHost: (const char*)h
-	andPort: (uint16_t)p
-      andFamily: (int)f
+	andHost: (const char*)host_
+	andPort: (uint16_t)port_
+      andFamily: (int)family_
 {
 	return [self newWithObject: obj
-			   andHost: h
-			   andPort: p
-			 andFamily: f];
+			   andHost: host_
+			   andPort: port_
+			 andFamily: family_];
 }
 
 - initWithObject: (id)obj
-	 andHost: (const char*)h
-	 andPort: (uint16_t)p
-       andFamily: (int)f
+	 andHost: (const char*)host_
+	 andPort: (uint16_t)port_
+       andFamily: (int)family_
 {
 	if ((self = [super initWithObject: obj])) {
-		host = (h != NULL ? strdup(h) : NULL);
-		port = p;
-		family = f;
+		host = (host_ != NULL ? strdup(host_) : NULL);
+		port = port_;
+		family = family_;
 	}
 
 	return self;
 }
 
@@ -523,21 +523,21 @@
 }
 @end
 
 @implementation OFListenFailedException
 + newWithObject: (id)obj
-     andBackLog: (int)b
+     andBackLog: (int)backlog_
 {
 	return [[self alloc] initWithObject: obj
-				 andBackLog: b];
+				 andBackLog: backlog_];
 }
 
 - initWithObject: (id)obj
-      andBackLog: (int)b
+      andBackLog: (int)backlog_
 {
 	if ((self = [super initWithObject: obj]))
-		backlog = b;
+		backlog = backlog_;
 
 	return self;
 }
 
 - (const char*)cString