@@ -22,18 +22,18 @@
 #import "OFString.h"
 
 #import "common.h"
 
 @implementation OFInvalidArgumentException
-+ (instancetype)exceptionWithClass: (Class)class_
-			  selector: (SEL)selector_
++ (instancetype)exceptionWithClass: (Class)class
+			  selector: (SEL)selector
 {
-	return [[[self alloc] initWithClass: class_
-				   selector: selector_] autorelease];
+	return [[[self alloc] initWithClass: class
+				   selector: selector] autorelease];
 }
 
-- initWithClass: (Class)class_
+- initWithClass: (Class)class
 {
 	@try {
 		[self doesNotRecognizeSelector: _cmd];
 	} @catch (id e) {
 		[self release];
@@ -41,32 +41,32 @@
 	}
 
 	abort();
 }
 
-- initWithClass: (Class)class_
-       selector: (SEL)selector_
+- initWithClass: (Class)class
+       selector: (SEL)selector
 {
-	self = [super initWithClass: class_];
+	self = [super initWithClass: class];
 
-	selector = selector_;
+	_selector = selector;
 
 	return self;
 }
 
 - (OFString*)description
 {
-	if (description != nil)
-		return description;
+	if (_description != nil)
+		return _description;
 
-	description = [[OFString alloc] initWithFormat:
+	_description = [[OFString alloc] initWithFormat:
 	    @"The argument or receiver for method %s of class %@ is invalid!",
-	    sel_getName(selector), inClass];
+	    sel_getName(_selector), _inClass];
 
-	return description;
+	return _description;
 }
 
 - (SEL)selector
 {
-	return selector;
+	return _selector;
 }
 @end