Index: src/OFDataArray.m
==================================================================
--- src/OFDataArray.m
+++ src/OFDataArray.m
@@ -151,11 +151,11 @@
 	result = [request perform];
 
 	if ([result statusCode] != 200)
 		@throw [OFHTTPRequestFailedException
 		    exceptionWithClass: [request class]
-			   HTTPRequest: request
+			       request: request
 				result: result];
 
 	self = [[result data] retain];
 	objc_autoreleasePoolPop(pool);
 	return self;

Index: src/OFHTTPRequest.m
==================================================================
--- src/OFHTTPRequest.m
+++ src/OFHTTPRequest.m
@@ -521,11 +521,11 @@
 		break;
 	default:
 		[result autorelease];
 		@throw [OFHTTPRequestFailedException
 		    exceptionWithClass: [self class]
-			   HTTPRequest: self
+			       request: self
 				result: result];
 	}
 
 	objc_autoreleasePoolPop(pool);
 

Index: src/OFString.m
==================================================================
--- src/OFString.m
+++ src/OFString.m
@@ -912,11 +912,11 @@
 	result = [request perform];
 
 	if ([result statusCode] != 200)
 		@throw [OFHTTPRequestFailedException
 		    exceptionWithClass: [request class]
-			   HTTPRequest: request
+			       request: request
 				result: result];
 
 	if (encoding == OF_STRING_ENCODING_AUTODETECT &&
 	    (contentType = [[result headers] objectForKey: @"Content-Type"])) {
 		contentType = [contentType lowercaseString];

Index: src/exceptions/OFHTTPRequestFailedException.h
==================================================================
--- src/exceptions/OFHTTPRequestFailedException.h
+++ src/exceptions/OFHTTPRequestFailedException.h
@@ -22,16 +22,16 @@
 /**
  * \brief An exception indicating that a HTTP request failed.
  */
 @interface OFHTTPRequestFailedException: OFException
 {
-	OFHTTPRequest *HTTPRequest;
+	OFHTTPRequest *request;
 	OFHTTPRequestResult *result;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, retain, nonatomic) OFHTTPRequest *HTTPRequest;
+@property (readonly, retain, nonatomic) OFHTTPRequest *request;
 @property (readonly, retain, nonatomic) OFHTTPRequestResult *result;
 #endif
 
 /**
  * \param class_ The class of the object which caused the exception
@@ -38,11 +38,11 @@
  * \param request The HTTP request which failed
  * \param result The result of the failed HTTP request
  * \return A new HTTP request failed exception
  */
 + exceptionWithClass: (Class)class_
-	 HTTPRequest: (OFHTTPRequest*)request
+	     request: (OFHTTPRequest*)request
 	      result: (OFHTTPRequestResult*)result;
 
 /**
  * Initializes an already allocated HTTP request failed exception
  *
@@ -50,18 +50,18 @@
  * \param request The HTTP request which failed
  * \param result The result of the failed HTTP request
  * \return A new HTTP request failed exception
  */
 - initWithClass: (Class)class_
-    HTTPRequest: (OFHTTPRequest*)request
+	request: (OFHTTPRequest*)request
 	 result: (OFHTTPRequestResult*)result;
 
 /**
  * \return The HTTP request which failed
  */
-- (OFHTTPRequest*)HTTPRequest;
+- (OFHTTPRequest*)request;
 
 /**
  * \return The result of the failed HTTP request
  */
 - (OFHTTPRequestResult*)result;
 @end

Index: src/exceptions/OFHTTPRequestFailedException.m
==================================================================
--- src/exceptions/OFHTTPRequestFailedException.m
+++ src/exceptions/OFHTTPRequestFailedException.m
@@ -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