@@ -142,13 +142,13 @@
 {
 	@throw [OFEnumerationMutationException exceptionWithObject: object];
 }
 
 void OF_NO_RETURN_FUNC
-of_method_not_found(id obj, SEL sel)
+of_method_not_found(id object, SEL selector)
 {
-	[obj doesNotRecognizeSelector: sel];
+	[object doesNotRecognizeSelector: selector];
 
 	/*
 	 * Just in case doesNotRecognizeSelector: returned, even though it must
 	 * never return.
 	 */
@@ -156,13 +156,13 @@
 
 	OF_UNREACHABLE
 }
 
 void OF_NO_RETURN_FUNC
-of_method_not_found_stret(void *st, id obj, SEL sel)
+of_method_not_found_stret(void *stret, id object, SEL selector)
 {
-	of_method_not_found(obj, sel);
+	of_method_not_found(object, selector);
 }
 
 id
 of_alloc_object(Class class, size_t extraSize, size_t extraAlignment,
     void **extra)