Index: src/exceptions/OFHashAlreadyCalculatedException.h
==================================================================
--- src/exceptions/OFHashAlreadyCalculatedException.h
+++ src/exceptions/OFHashAlreadyCalculatedException.h
@@ -21,15 +21,15 @@
 /**
  * \brief An exception indicating that the hash has already been calculated.
  */
 @interface OFHashAlreadyCalculatedException: OFException
 {
-	OFHash *hash;
+	OFHash *hashObject;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly, nonatomic) OFHash *hash;
+@property (readonly, nonatomic) OFHash *hashObject;
 #endif
 
 /**
  * \param class_ The class of the object which caused the exception
  * \param hash The hash which has already been calculated

Index: src/exceptions/OFHashAlreadyCalculatedException.m
==================================================================
--- src/exceptions/OFHashAlreadyCalculatedException.m
+++ src/exceptions/OFHashAlreadyCalculatedException.m
@@ -37,16 +37,16 @@
 	@throw [OFNotImplementedException newWithClass: c
 					      selector: _cmd];
 }
 
 - initWithClass: (Class)class_
-	   hash: (OFHash*)hash_
+	   hash: (OFHash*)hash
 {
 	self = [super initWithClass: class_];
 
 	@try {
-		hash = [hash_ retain];
+		hashObject = [hash retain];
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}
 
@@ -53,11 +53,11 @@
 	return self;
 }
 
 - (void)dealloc
 {
-	[hash release];
+	[hashObject release];
 
 	[super dealloc];
 }
 
 - (OFString*)description
@@ -72,8 +72,8 @@
 	return description;
 }
 
 - (OFHash*)hashObject
 {
-	return hash;
+	return hashObject;
 }
 @end