@@ -22,18 +22,18 @@
 #import "OFString.h"
 
 #import "common.h"
 
 @implementation OFCreateDirectoryFailedException
-+ (instancetype)exceptionWithClass: (Class)class_
-			      path: (OFString*)path_
++ (instancetype)exceptionWithClass: (Class)class
+			      path: (OFString*)path
 {
-	return [[[self alloc] initWithClass: class_
-				       path: path_] autorelease];
+	return [[[self alloc] initWithClass: class
+				       path: path] autorelease];
 }
 
-- initWithClass: (Class)class_
+- initWithClass: (Class)class
 {
 	@try {
 		[self doesNotRecognizeSelector: _cmd];
 	} @catch (id e) {
 		[self release];
@@ -41,18 +41,18 @@
 	}
 
 	abort();
 }
 
-- initWithClass: (Class)class_
-	   path: (OFString*)path_
+- initWithClass: (Class)class
+	   path: (OFString*)path
 {
-	self = [super initWithClass: class_];
+	self = [super initWithClass: class];
 
 	@try {
-		path  = [path_ copy];
-		errNo = GET_ERRNO;
+		_path  = [path copy];
+		_errNo = GET_ERRNO;
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}
 
@@ -59,32 +59,32 @@
 	return self;
 }
 
 - (void)dealloc
 {
-	[path release];
+	[_path release];
 
 	[super dealloc];
 }
 
 - (OFString*)description
 {
-	if (description != nil)
-		return description;
-
-	description = [[OFString alloc] initWithFormat:
-	    @"Failed to create directory %@ in class %@! " ERRFMT, path,
-	    inClass, ERRPARAM];
-
-	return description;
+	if (_description != nil)
+		return _description;
+
+	_description = [[OFString alloc] initWithFormat:
+	    @"Failed to create directory %@ in class %@! " ERRFMT, _path,
+	    _inClass, ERRPARAM];
+
+	return _description;
 }
 
 - (int)errNo
 {
-	return errNo;
+	return _errNo;
 }
 
 - (OFString*)path
 {
-	OF_GETTER(path, NO)
+	OF_GETTER(_path, NO)
 }
 @end