@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2008-2021 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2008-2022 Jonathan Schleifer <js@nil.im>
  *
  * All rights reserved.
  *
  * This file is part of ObjFW. It may be distributed under the terms of the
  * Q Public License 1.0, which can be found in the file LICENSE.QPL included in
@@ -15,11 +15,11 @@
 
 #include "config.h"
 
 #import "TestsAppDelegate.h"
 
-static OFString *module = @"OFList";
+static OFString *const module = @"OFList";
 static OFString *strings[] = {
 	@"Foo",
 	@"Bar",
 	@"Baz"
 };
@@ -29,11 +29,11 @@
 {
 	void *pool = objc_autoreleasePoolPush();
 	OFList *list;
 	OFEnumerator *enumerator;
 	OFListItem iter;
-	OFString *obj;
+	OFString *object;
 	size_t i;
 	bool ok;
 
 	TEST(@"+[list]", (list = [OFList list]))
 
@@ -95,12 +95,12 @@
 	TEST(@"-[objectEnumerator]", (enumerator = [list objectEnumerator]))
 
 	iter = list.firstListItem;
 	i = 0;
 	ok = true;
-	while ((obj = [enumerator nextObject]) != nil) {
-		if (![obj isEqual: OFListItemObject(iter)])
+	while ((object = [enumerator nextObject]) != nil) {
+		if (![object isEqual: OFListItemObject(iter)])
 			ok = false;
 
 		iter = OFListItemNext(iter);
 		i++;
 	}
@@ -119,12 +119,12 @@
 
 	iter = list.firstListItem;
 	i = 0;
 	ok = true;
 
-	for (OFString *object in list) {
-		if (![object isEqual: OFListItemObject(iter)])
+	for (OFString *object_ in list) {
+		if (![object_ isEqual: OFListItemObject(iter)])
 			ok = false;
 
 		iter = OFListItemNext(iter);
 		i++;
 	}
@@ -134,12 +134,12 @@
 
 	TEST(@"Fast Enumeration", ok)
 
 	ok = false;
 	@try {
-		for (OFString *object in list) {
-			(void)object;
+		for (OFString *object_ in list) {
+			(void)object_;
 
 			[list removeListItem: list.lastListItem];
 		}
 	} @catch (OFEnumerationMutationException *e) {
 		ok = true;