Index: src/OFFile.h
==================================================================
--- src/OFFile.h
+++ src/OFFile.h
@@ -115,25 +115,25 @@
 /**
  * \brief Changes the current working directory.
  *
  * \param path The new directory to change to
  */
-+ (void)changeToDirectory: (OFString*)path;
++ (void)changeToDirectoryAtPath: (OFString*)path;
 
 /**
  * \brief Returns the size of the specified file.
  *
  * \return The size of the specified file
  */
-+ (off_t)sizeOfFile: (OFString*)path;
++ (off_t)sizeOfFileAtPath: (OFString*)path;
 
 /**
  * \brief Returns the date of the last modification of the file.
  *
  * \return The date of the last modification of the file
  */
-+ (OFDate*)modificationDateOfFile: (OFString*)path;
++ (OFDate*)modificationDateOfFileAtPath: (OFString*)path;
 
 #ifndef _PSP
 /**
  * \brief Changes the mode of a file.
  *
@@ -141,12 +141,12 @@
  *
  * \param path The path to the file of which the mode should be changed as a
  *	       string
  * \param mode The new mode for the file
  */
-+ (void)changeModeOfFile: (OFString*)path
-		  toMode: (mode_t)mode;
++ (void)changeModeOfFileAtPath: (OFString*)path
+			  mode: (mode_t)mode;
 #endif
 
 #if !defined(_WIN32) && !defined(_PSP)
 /**
  * \brief Changes the owner of a file.
@@ -156,13 +156,13 @@
  * \param path The path to the file of which the owner should be changed as a
  *	       string
  * \param owner The new owner for the file
  * \param group The new group for the file
  */
-+ (void)changeOwnerOfFile: (OFString*)path
-		  toOwner: (OFString*)owner
-		    group: (OFString*)group;
++ (void)changeOwnerOfFileAtPath: (OFString*)path
+			  owner: (OFString*)owner
+			  group: (OFString*)group;
 #endif
 
 /**
  * \brief Copies a file.
  *

Index: src/OFFile.m
==================================================================
--- src/OFFile.m
+++ src/OFFile.m
@@ -354,21 +354,21 @@
 	[files makeImmutable];
 
 	return files;
 }
 
-+ (void)changeToDirectory: (OFString*)path
++ (void)changeToDirectoryAtPath: (OFString*)path
 {
 	if (chdir([path cStringWithEncoding: OF_STRING_ENCODING_NATIVE]))
 		@throw [OFChangeDirectoryFailedException
 		    exceptionWithClass: self
 				  path: path];
 }
 
 #ifndef _PSP
-+ (void)changeModeOfFile: (OFString*)path
-		  toMode: (mode_t)mode
++ (void)changeModeOfFileAtPath: (OFString*)path
+			  mode: (mode_t)mode
 {
 # ifndef _WIN32
 	if (chmod([path cStringWithEncoding: OF_STRING_ENCODING_NATIVE], mode))
 		@throw [OFChangeFileModeFailedException
 		    exceptionWithClass: self
@@ -397,11 +397,11 @@
 				  mode: mode];
 # endif
 }
 #endif
 
-+ (off_t)sizeOfFile: (OFString*)path
++ (off_t)sizeOfFileAtPath: (OFString*)path
 {
 	struct stat s;
 
 	if (stat([path cStringWithEncoding: OF_STRING_ENCODING_NATIVE],
 	    &s) == -1)
@@ -411,11 +411,11 @@
 								mode: @"r"];
 
 	return s.st_size;
 }
 
-+ (OFDate*)modificationDateOfFile: (OFString*)path
++ (OFDate*)modificationDateOfFileAtPath: (OFString*)path
 {
 	struct stat s;
 
 	if (stat([path cStringWithEncoding: OF_STRING_ENCODING_NATIVE],
 	    &s) == -1)
@@ -427,13 +427,13 @@
 	/* FIXME: We could be more precise on some OSes */
 	return [OFDate dateWithTimeIntervalSince1970: s.st_mtime];
 }
 
 #if !defined(_WIN32) && !defined(_PSP)
-+ (void)changeOwnerOfFile: (OFString*)path
-		  toOwner: (OFString*)owner
-		    group: (OFString*)group
++ (void)changeOwnerOfFileAtPath: (OFString*)path
+			  owner: (OFString*)owner
+			  group: (OFString*)group
 {
 	uid_t uid = -1;
 	gid_t gid = -1;
 
 	if (owner == nil && group == nil)