@@ -39,13 +39,13 @@
 /*!
  * @brief A class which provides functions to read, write and manipulate files.
  */
 @interface OFFile: OFSeekableStream
 {
-	int  fd;
-	BOOL closable;
-	BOOL atEndOfStream;
+	int  _fd;
+	BOOL _closable;
+	BOOL _atEndOfStream;
 }
 
 /*!
  * @brief Creates a new OFFile with the specified path and mode.
  *
@@ -72,15 +72,15 @@
 			mode: (OFString*)mode;
 
 /*!
  * @brief Creates a new OFFile with the specified file descriptor.
  *
- * @param fileDescriptor A file descriptor, returned from for example open().
- *			 It is not closed when the OFFile object is deallocated!
+ * @param fd A file descriptor, returned from for example open().
+ *	     It is not closed when the OFFile object is deallocated!
  * @return A new autoreleased OFFile
  */
-+ (instancetype)fileWithFileDescriptor: (int)fileDescriptor;
++ (instancetype)fileWithFileDescriptor: (int)fd;
 
 /*!
  * @brief Returns the path fo the current working directory.
  *
  * @return The path of the current working directory
@@ -262,14 +262,14 @@
 	  mode: (OFString*)mode;
 
 /*!
  * @brief Initializes an already allocated OFFile.
  *
- * @param fileDescriptor A file descriptor, returned from for example open().
- *			 It is not closed when the OFFile object is deallocated!
+ * @param fd A file descriptor, returned from for example open().
+ *	     It is not closed when the OFFile object is deallocated!
  */
-- initWithFileDescriptor: (int)fileDescriptor;
+- initWithFileDescriptor: (int)fd;
 @end
 
 #ifdef __cplusplus
 extern "C" {
 #endif