@@ -25,20 +25,20 @@
 
 #import "autorelease.h"
 #import "common.h"
 
 @implementation OFHTTPRequestFailedException
-+ (instancetype)exceptionWithClass: (Class)class_
++ (instancetype)exceptionWithClass: (Class)class
 			   request: (OFHTTPRequest*)request
 			     reply: (OFHTTPRequestReply*)reply
 {
-	return [[[self alloc] initWithClass: class_
+	return [[[self alloc] initWithClass: class
 				    request: request
 				      reply: reply] autorelease];
 }
 
-- initWithClass: (Class)class_
+- initWithClass: (Class)class
 {
 	@try {
 		[self doesNotRecognizeSelector: _cmd];
 	} @catch (id e) {
 		[self release];
@@ -46,39 +46,39 @@
 	}
 
 	abort();
 }
 
-- initWithClass: (Class)class_
-	request: (OFHTTPRequest*)request_
-	  reply: (OFHTTPRequestReply*)reply_
-{
-	self = [super initWithClass: class_];
-
-	request = [request_ retain];
-	reply = [reply_ retain];
+- initWithClass: (Class)class
+	request: (OFHTTPRequest*)request
+	  reply: (OFHTTPRequestReply*)reply
+{
+	self = [super initWithClass: class];
+
+	_request = [request retain];
+	_reply = [reply retain];
 
 	return self;
 }
 
 - (void)dealloc
 {
-	[request release];
-	[reply release];
+	[_request release];
+	[_reply release];
 
 	[super dealloc];
 }
 
 - (OFString*)description
 {
 	void *pool;
 	const char *type = "(unknown)";
 
-	if (description != nil)
-		return description;
+	if (_description != nil)
+		return _description;
 
-	switch ([request requestType]) {
+	switch ([_request requestType]) {
 	case OF_HTTP_REQUEST_TYPE_GET:
 		type = "GET";
 		break;
 	case OF_HTTP_REQUEST_TYPE_HEAD:
 		type = "HEAD";
@@ -88,24 +88,24 @@
 		break;
 	}
 
 	pool = objc_autoreleasePoolPush();
 
-	description = [[OFString alloc] initWithFormat:
+	_description = [[OFString alloc] initWithFormat:
 	    @"A HTTP %s request in class %@ with URL %@ failed with code %d",
-	    type, inClass, [request URL], [reply statusCode]];
+	    type, _inClass, [_request URL], [_reply statusCode]];
 
 	objc_autoreleasePoolPop(pool);
 
-	return description;
+	return _description;
 }
 
 - (OFHTTPRequest*)request
 {
-	OF_GETTER(request, NO)
+	OF_GETTER(_request, NO)
 }
 
 - (OFHTTPRequestReply*)reply
 {
-	OF_GETTER(reply, NO)
+	OF_GETTER(_reply, NO)
 }
 @end