@@ -24,15 +24,15 @@
 
 #import "autorelease.h"
 
 @implementation OFHTTPRequestFailedException
 + exceptionWithClass: (Class)class_
-	 HTTPRequest: (OFHTTPRequest*)request
+	     request: (OFHTTPRequest*)request
 	      result: (OFHTTPRequestResult*)result
 {
 	return [[[self alloc] initWithClass: class_
-				HTTPRequest: request
+				    request: request
 				     result: result] autorelease];
 }
 
 - initWithClass: (Class)class_
 {
@@ -41,24 +41,24 @@
 	@throw [OFNotImplementedException exceptionWithClass: c
 						    selector: _cmd];
 }
 
 - initWithClass: (Class)class_
-    HTTPRequest: (OFHTTPRequest*)request
+	request: (OFHTTPRequest*)request_
 	 result: (OFHTTPRequestResult*)result_
 {
 	self = [super initWithClass: class_];
 
-	HTTPRequest = [request retain];
+	request = [request_ retain];
 	result = [result_ retain];
 
 	return self;
 }
 
 - (void)dealloc
 {
-	[HTTPRequest release];
+	[request release];
 	[result release];
 
 	[super dealloc];
 }
 
@@ -68,11 +68,11 @@
 	const char *type = "(unknown)";
 
 	if (description != nil)
 		return description;
 
-	switch ([HTTPRequest requestType]) {
+	switch ([request requestType]) {
 	case OF_HTTP_REQUEST_TYPE_GET:
 		type = "GET";
 		break;
 	case OF_HTTP_REQUEST_TYPE_HEAD:
 		type = "HEAD";
@@ -84,22 +84,22 @@
 
 	pool = objc_autoreleasePoolPush();
 
 	description = [[OFString alloc] initWithFormat:
 	    @"A HTTP %s request in class %@ with URL %@ failed with code %d",
-	    type, inClass, [HTTPRequest URL], [result statusCode]];
+	    type, inClass, [request URL], [result statusCode]];
 
 	objc_autoreleasePoolPop(pool);
 
 	return description;
 }
 
-- (OFHTTPRequest*)HTTPRequest
+- (OFHTTPRequest*)request
 {
-	OF_GETTER(HTTPRequest, NO)
+	OF_GETTER(request, NO)
 }
 
 - (OFHTTPRequestResult*)result
 {
 	OF_GETTER(result, NO)
 }
 @end