@@ -21,14 +21,14 @@
 /*!
  * @brief An exception indicating a read or write to a stream failed.
  */
 @interface OFReadOrWriteFailedException: OFException
 {
-	OFStream *stream;
-	size_t	 requestedLength;
+	OFStream *_stream;
+	size_t	 _requestedLength;
 @public
-	int	 errNo;
+	int	 _errNo;
 }
 
 #ifdef OF_HAVE_PROPERTIES
 @property (readonly, retain, nonatomic) OFStream *stream;
 @property (readonly) size_t requestedLength;
@@ -38,30 +38,30 @@
 /*!
  * @brief Creates a new, autoreleased read or write failed exception.
  *
  * @param class_ The class of the object which caused the exception
  * @param stream The stream which caused the read or write failed exception
- * @param length The requested length of the data that couldn't be read /
- *		 written
+ * @param requestedLength The requested length of the data that couldn't be
+ *			  read / written
  * @return A new, autoreleased read or write failed exception
  */
 + (instancetype)exceptionWithClass: (Class)class_
 			    stream: (OFStream*)stream
-		   requestedLength: (size_t)length;
+		   requestedLength: (size_t)requestedLength;
 
 /*!
  * @brief Initializes an already allocated read or write failed exception.
  *
  * @param class_ The class of the object which caused the exception
  * @param stream The stream which caused the read or write failed exception
- * @param length The requested length of the data that couldn't be read /
- *		 written
+ * @param requestedLength The requested length of the data that couldn't be
+ *			  read / written
  * @return A new open file failed exception
  */
 -   initWithClass: (Class)class_
 	   stream: (OFStream*)stream
-  requestedLength: (size_t)length;
+  requestedLength: (size_t)requestedLength;
 
 /*!
  * @brief Returns the stream which caused the read or write failed exception.
  *
  * @return The stream which caused the read or write failed exception