@@ -709,42 +709,42 @@
 }
 @end
 #endif
 
 @implementation OFRenameFileFailedException
-+ newWithClass: (Class)class__
-	  from: (OFString*)from_
-	    to: (OFString*)to_
++    newWithClass: (Class)class__
+       sourcePath: (OFString*)src_
+  destinationPath: (OFString*)dst_
 {
 	return [[self alloc] initWithClass: class__
-				      from: from_
-					to: to_];
+				sourcePath: src_
+			   destinationPath: dst_];
 }
 
 - initWithClass: (Class)class__
 {
 	@throw [OFNotImplementedException newWithClass: isa
 					      selector: _cmd];
 }
 
-- initWithClass: (Class)class__
-	   from: (OFString*)from_
-	     to: (OFString*)to_
+-   initWithClass: (Class)class__
+       sourcePath: (OFString*)src_
+  destinationPath: (OFString*)dst_
 {
 	self = [super initWithClass: class__];
 
-	from = [from_ copy];
-	to   = [to_ copy];
-	err  = GET_ERR;
+	src = [src_ copy];
+	dst = [dst_ copy];
+	err = GET_ERR;
 
 	return self;
 }
 
 - (void)dealloc
 {
-	[from release];
-	[to release];
+	[src release];
+	[dst release];
 
 	[super dealloc];
 }
 
 - (OFString*)string
@@ -752,28 +752,28 @@
 	if (string != nil)
 		return string;
 
 	string = [[OFString alloc] initWithFormat:
 	    @"Failed to rename file %s to %s in class %s! " ERRFMT,
-	    [from cString], [to cString], [class_ className], ERRPARAM];
+	    [src cString], [dst cString], [class_ className], ERRPARAM];
 
 	return string;
 }
 
 - (int)errNo
 {
 	return err;
 }
 
-- (OFString*)from
+- (OFString*)sourcePath
 {
-	return from;
+	return src;
 }
 
-- (OFString*)to
+- (OFString*)destinationPath;
 {
-	return to;
+	return dst;
 }
 @end
 
 @implementation OFDeleteFileFailedException
 + newWithClass: (Class)class__
@@ -830,28 +830,28 @@
 }
 @end
 
 #ifndef _WIN32
 @implementation OFLinkFailedException
-+ newWithClass: (Class)class__
-	source: (OFString*)src_
-   destination: (OFString*)dest_
++    newWithClass: (Class)class__
+       sourcePath: (OFString*)src_
+  destinationPath: (OFString*)dest_
 {
 	return [[self alloc] initWithClass: class__
-				    source: src_
-			       destination: dest_];
+				sourcePath: src_
+			   destinationPath: dest_];
 }
 
 - initWithClass: (Class)class__
 {
 	@throw [OFNotImplementedException newWithClass: isa
 					      selector: _cmd];
 }
 
-- initWithClass: (Class)class__
-	 source: (OFString*)src_
-    destination: (OFString*)dest_
+-   initWithClass: (Class)class__
+       sourcePath: (OFString*)src_
+  destinationPath: (OFString*)dest_
 {
 	self = [super initWithClass: class__];
 
 	src  = [src_ copy];
 	dest = [dest_ copy];
@@ -883,40 +883,40 @@
 - (int)errNo
 {
 	return err;
 }
 
-- (OFString*)source
+- (OFString*)sourcePath
 {
 	return src;
 }
 
-- (OFString*)destination
+- (OFString*)destinationPath
 {
 	return dest;
 }
 @end
 
 @implementation OFSymlinkFailedException
-+ newWithClass: (Class)class__
-	source: (OFString*)src_
-   destination: (OFString*)dest_
++    newWithClass: (Class)class__
+       sourcePath: (OFString*)src_
+  destinationPath: (OFString*)dest_
 {
 	return [[self alloc] initWithClass: class__
-				    source: src_
-			       destination: dest_];
+				sourcePath: src_
+			   destinationPath: dest_];
 }
 
 - initWithClass: (Class)class__
 {
 	@throw [OFNotImplementedException newWithClass: isa
 					      selector: _cmd];
 }
 
-- initWithClass: (Class)class__
-	 source: (OFString*)src_
-    destination: (OFString*)dest_
+-   initWithClass: (Class)class__
+       sourcePath: (OFString*)src_
+  destinationPath: (OFString*)dest_
 {
 	self = [super initWithClass: class__];
 
 	src  = [src_ copy];
 	dest = [dest_ copy];
@@ -948,16 +948,16 @@
 - (int)errNo
 {
 	return err;
 }
 
-- (OFString*)source
+- (OFString*)sourcePath
 {
 	return src;
 }
 
-- (OFString*)destination
+- (OFString*)destinationPath
 {
 	return dest;
 }
 @end
 #endif