@@ -27,12 +27,12 @@
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
 + (instancetype)exceptionWithURL: (OFURL *)URL
-		      attributes: (of_file_attributes_t)attributes
-		 failedAttribute: (of_file_attribute_key_t)failedAttribute
+		      attributes: (OFFileAttributes)attributes
+		 failedAttribute: (OFFileAttributeKey)failedAttribute
 			   errNo: (int)errNo
 {
 	return [[[self alloc] initWithURL: URL
 			       attributes: attributes
 			  failedAttribute: failedAttribute
@@ -43,12 +43,12 @@
 {
 	OF_INVALID_INIT_METHOD
 }
 
 - (instancetype)initWithURL: (OFURL *)URL
-		 attributes: (of_file_attributes_t)attributes
-	    failedAttribute: (of_file_attribute_key_t)failedAttribute
+		 attributes: (OFFileAttributes)attributes
+	    failedAttribute: (OFFileAttributeKey)failedAttribute
 		      errNo: (int)errNo
 {
 	self = [super init];
 
 	@try {
@@ -75,8 +75,8 @@
 
 - (OFString *)description
 {
 	return [OFString stringWithFormat:
 	    @"Failed to set attribute %@ for item %@: %@",
-	    _failedAttribute, _URL, of_strerror(_errNo)];
+	    _failedAttribute, _URL, OFStrError(_errNo)];
 }
 @end