@@ -240,18 +240,18 @@
 	microseconds %= 1000000;
 
 	return self;
 }
 
-- (BOOL)isEqual: (id)obj
+- (BOOL)isEqual: (id)object
 {
 	OFDate *otherDate;
 
-	if (![obj isKindOfClass: [OFDate class]])
+	if (![object isKindOfClass: [OFDate class]])
 		return NO;
 
-	otherDate = (OFDate*)obj;
+	otherDate = (OFDate*)object;
 
 	if (otherDate->seconds != seconds ||
 	    otherDate->microseconds != microseconds)
 		return NO;
 
@@ -383,16 +383,16 @@
 - (uint16_t)localDayOfYear
 {
 	LOCALTIME_RET(tm_yday + 1)
 }
 
-- (OFString*)dateStringWithFormat: (OFString*)fmt
+- (OFString*)dateStringWithFormat: (OFString*)format
 {
 	OFString *ret;
 	time_t seconds_ = (time_t)seconds;
 	struct tm tm;
-	char *buf;
+	char *buffer;
 
 	if (seconds != seconds_)
 		@throw [OFOutOfRangeException newWithClass: isa];
 
 #ifdef HAVE_GMTIME_R
@@ -415,30 +415,30 @@
 		[mutex unlock];
 	}
 # endif
 #endif
 
-	buf = [self allocMemoryWithSize: of_pagesize];
+	buffer = [self allocMemoryWithSize: of_pagesize];
 
 	@try {
-		if (!strftime(buf, of_pagesize, [fmt cString], &tm))
+		if (!strftime(buffer, of_pagesize, [format cString], &tm))
 			@throw [OFOutOfRangeException newWithClass: isa];
 
-		ret = [OFString stringWithCString: buf];
+		ret = [OFString stringWithCString: buffer];
 	} @finally {
-		[self freeMemory: buf];
+		[self freeMemory: buffer];
 	}
 
 	return ret;
 }
 
-- (OFString*)localDateStringWithFormat: (OFString*)fmt
+- (OFString*)localDateStringWithFormat: (OFString*)format
 {
 	OFString *ret;
 	time_t seconds_ = (time_t)seconds;
 	struct tm tm;
-	char *buf;
+	char *buffer;
 
 	if (seconds != seconds_)
 		@throw [OFOutOfRangeException newWithClass: isa];
 
 #ifdef HAVE_LOCALTIME_R
@@ -461,19 +461,19 @@
 		[mutex unlock];
 	}
 # endif
 #endif
 
-	buf = [self allocMemoryWithSize: of_pagesize];
+	buffer = [self allocMemoryWithSize: of_pagesize];
 
 	@try {
-		if (!strftime(buf, of_pagesize, [fmt cString], &tm))
+		if (!strftime(buffer, of_pagesize, [format cString], &tm))
 			@throw [OFOutOfRangeException newWithClass: isa];
 
-		ret = [OFString stringWithCString: buf];
+		ret = [OFString stringWithCString: buffer];
 	} @finally {
-		[self freeMemory: buf];
+		[self freeMemory: buffer];
 	}
 
 	return ret;
 }