Index: src/OFFile.h
==================================================================
--- src/OFFile.h
+++ src/OFFile.h
@@ -98,19 +98,19 @@
  * Renames a file.
  *
  * \param from The file to rename
  * \param to The new name
  */
-+ (void)renameFileWithPath: (OFString*)from
-		    toPath: (OFString*)to;
++ (void)renameFileAtPath: (OFString*)from
+		  toPath: (OFString*)to;
 
 /**
  * Deletes a file.
  *
  * \param path The path to the file of which should be deleted as a string
  */
-+ (void)deleteFileWithPath: (OFString*)path;
++ (void)deleteFileAtPath: (OFString*)path;
 
 #ifndef _WIN32
 /**
  * Hardlinks a file.
  *
@@ -117,23 +117,23 @@
  * Not available on Windows.
  *
  * \param src The path to the file of which should be linked as a string
  * \param dest The path to where the file should be linked as a string
  */
-+ (void)linkFileWithPath: (OFString*)src
-		  toPath: (OFString*)dest;
++ (void)linkFileAtPath: (OFString*)src
+		toPath: (OFString*)dest;
 
 /**
  * Symlinks a file.
  *
  * Not available on Windows.
  *
  * \param src The path to the file of which should be symlinked as a string
  * \param dest The path to where the file should be symlinked as a string
  */
-+ (void)symlinkFileWithPath: (OFString*)src
-		     toPath: (OFString*)dest;
++ (void)symlinkFileAtPath: (OFString*)src
+		   toPath: (OFString*)dest;
 #endif
 
 /**
  * Initializes an already allocated OFFile.
  *

Index: src/OFFile.m
==================================================================
--- src/OFFile.m
+++ src/OFFile.m
@@ -253,12 +253,12 @@
 								owner: owner
 								group: group];
 }
 #endif
 
-+ (void)renameFileWithPath: (OFString*)from
-		    toPath: (OFString*)to
++ (void)renameFileAtPath: (OFString*)from
+		  toPath: (OFString*)to
 {
 #ifndef _WIN32
 	if (rename([from cString], [to cString]))
 #else
 	if (!MoveFile([from cString], [to cString]))
@@ -266,11 +266,11 @@
 		@throw [OFRenameFileFailedException newWithClass: self
 							    from: from
 							      to: to];
 }
 
-+ (void)deleteFileWithPath: (OFString*)path
++ (void)deleteFileAtPath: (OFString*)path
 {
 #ifndef _WIN32
 	if (unlink([path cString]))
 #else
 	if (!DeleteFile([path cString]))
@@ -278,21 +278,21 @@
 		@throw [OFDeleteFileFailedException newWithClass: self
 							    path: path];
 }
 
 #ifndef _WIN32
-+ (void)linkFileWithPath: (OFString*)src
-		  toPath: (OFString*)dest
++ (void)linkFileAtPath: (OFString*)src
+		toPath: (OFString*)dest
 {
 	if (link([src cString], [dest cString]) != 0)
 		@throw [OFLinkFailedException newWithClass: self
 						    source: src
 					       destination: dest];
 }
 
-+ (void)symlinkFileWithPath: (OFString*)src
-		     toPath: (OFString*)dest
++ (void)symlinkFileAtPath: (OFString*)src
+		   toPath: (OFString*)dest
 {
 	if (symlink([src cString], [dest cString]) != 0)
 		@throw [OFSymlinkFailedException newWithClass: self
 						       source: src
 						  destination: dest];