@@ -49,11 +49,11 @@
  * IMPORTANT: Exceptions do NOT use OFAutoreleasePools and can't be autoreleased
  * either! You have to make sure to dealloc the exception in your \@catch block!
  */
 @interface OFException: OFObject
 {
-	Class	 class_;
+	Class inClass;
 	OFString *string;
 }
 
 /**
  * Creates a new exception.
@@ -85,11 +85,11 @@
 /**
  * \brief An exception indicating there is not enough memory available.
  */
 @interface OFOutOfMemoryException: OFException
 {
-	size_t req_size;
+	size_t requestedSize;
 }
 
 /**
  * \param class_ The class of the object which caused the exception
  * \param size The size of the memory that couldn't be allocated
@@ -244,11 +244,11 @@
  */
 @interface OFOpenFileFailedException: OFException
 {
 	OFString *path;
 	OFString *mode;
-	int err;
+	int errNo;
 }
 
 /**
  * \param class_ The class of the object which caused the exception
  * \param path A string with the path of the file tried to open
@@ -290,12 +290,12 @@
 /**
  * \brief An exception indicating a read or write to a stream failed.
  */
 @interface OFReadOrWriteFailedException: OFException
 {
-	size_t req_size;
-	int    err;
+	size_t requestedSize;
+	int    errNo;
 }
 
 /**
  * \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
@@ -340,11 +340,11 @@
 /**
  * \brief An exception indicating that seeking in a stream failed.
  */
 @interface OFSeekFailedException: OFException
 {
-	int err;
+	int errNo;
 }
 
 /**
  * \return The errno from when the exception was created
  */
@@ -355,11 +355,11 @@
  * \brief An exception indicating a directory couldn't be created.
  */
 @interface OFCreateDirectoryFailedException: OFException
 {
 	OFString *path;
-	int err;
+	int errNo;
 }
 
 /**
  * \param class_ The class of the object which caused the exception
  * \param path A string with the path of the directory which couldn't be created
@@ -394,11 +394,11 @@
  */
 @interface OFChangeFileModeFailedException: OFException
 {
 	OFString *path;
 	mode_t mode;
-	int err;
+	int errNo;
 }
 
 /**
  * \param class_ The class of the object which caused the exception
  * \param path The path of the file
@@ -444,11 +444,11 @@
 @interface OFChangeFileOwnerFailedException: OFException
 {
 	OFString *path;
 	uid_t owner;
 	gid_t group;
-	int err;
+	int errNo;
 }
 
 /**
  * \param class_ The class of the object which caused the exception
  * \param path The path of the file
@@ -500,13 +500,13 @@
 /**
  * \brief An exception indicating that renaming a file failed.
  */
 @interface OFRenameFileFailedException: OFException
 {
-	OFString *src;
-	OFString *dst;
-	int err;
+	OFString *sourcePath;
+	OFString *destinationPath;
+	int errNo;
 }
 
 /**
  * \param class_ The class of the object which caused the exception
  * \param src The original path
@@ -549,11 +549,11 @@
  * \brief An exception indicating that deleting a file failed.
  */
 @interface OFDeleteFileFailedException: OFException
 {
 	OFString *path;
-	int err;
+	int errNo;
 }
 
 /**
  * \param class_ The class of the object which caused the exception
  * \param path The path of the file
@@ -587,13 +587,13 @@
 /**
  * \brief An exception indicating that creating a link failed.
  */
 @interface OFLinkFailedException: OFException
 {
-	OFString *src;
-	OFString *dest;
-	int err;
+	OFString *sourcePath;
+	OFString *destinationPath;
+	int errNo;
 }
 
 /**
  * \param class_ The class of the object which caused the exception
  * \param src The source for the link
@@ -635,13 +635,13 @@
 /**
  * \brief An exception indicating that creating a symlink failed.
  */
 @interface OFSymlinkFailedException: OFException
 {
-	OFString *src;
-	OFString *dest;
-	int err;
+	OFString *sourcePath;
+	OFString *destinationPath;
+	int errNo;
 }
 
 /**
  * \param class_ The class of the object which caused the exception
  * \param src The source for the symlink
@@ -705,11 +705,11 @@
  */
 @interface OFAddressTranslationFailedException: OFException
 {
 	OFString *node;
 	OFString *service;
-	int	 err;
+	int	 errNo;
 }
 
 /**
  * \param class_ The class of the object which caused the exception
  * \param node The node for which translation was requested
@@ -753,11 +753,11 @@
  */
 @interface OFConnectionFailedException: OFException
 {
 	OFString *node;
 	OFString *service;
-	int	 err;
+	int	 errNo;
 }
 
 /**
  * \param class_ The class of the object which caused the exception
  * \param node The node to which the connection failed
@@ -802,11 +802,11 @@
 @interface OFBindFailedException: OFException
 {
 	OFString *node;
 	OFString *service;
 	int	 family;
-	int	 err;
+	int	 errNo;
 }
 
 /**
  * \param class_ The class of the object which caused the exception
  * \param node The node on which binding failed
@@ -857,12 +857,12 @@
 /**
  * \brief An exception indicating that listening on the socket failed.
  */
 @interface OFListenFailedException: OFException
 {
-	int backlog;
-	int err;
+	int backLog;
+	int errNo;
 }
 
 /**
  * \param class_ The class of the object which caused the exception
  * \param backlog The requested size of the back log
@@ -895,11 +895,11 @@
 /**
  * \brief An exception indicating that accepting a connection failed.
  */
 @interface OFAcceptFailedException: OFException
 {
-	int err;
+	int errNo;
 }
 
 /**
  * \return The errno from when the exception was created
  */