@@ -324,13 +324,13 @@
 {
 	return objc_allocateClassPair_m68k(superclass, name, extraBytes);
 }
 
 void
-objc_registerClassPair(Class cls)
+objc_registerClassPair(Class class)
 {
-	objc_registerClassPair_m68k(cls);
+	objc_registerClassPair_m68k(class);
 }
 
 unsigned int
 objc_getClassList(Class *buffer, unsigned int count)
 {
@@ -342,76 +342,76 @@
 {
 	return objc_copyClassList_m68k(length);
 }
 
 bool
-class_isMetaClass(Class cls)
-{
-	return class_isMetaClass_m68k(cls);
-}
-
-const char *
-class_getName(Class cls)
-{
-	return class_getName_m68k(cls);
-}
-
-Class
-class_getSuperclass(Class cls)
-{
-	return class_getSuperclass_m68k(cls);
-}
-
-unsigned long
-class_getInstanceSize(Class cls)
-{
-	return class_getInstanceSize_m68k(cls);
-}
-
-bool
-class_respondsToSelector(Class cls, SEL selector)
-{
-	return class_respondsToSelector_m68k(cls, selector);
-}
-
-bool
-class_conformsToProtocol(Class cls, Protocol *protocol)
-{
-	return class_conformsToProtocol_m68k(cls, protocol);
-}
-
-IMP
-class_getMethodImplementation(Class cls, SEL selector)
-{
-	return class_getMethodImplementation_m68k(cls, selector);
-}
-
-IMP
-class_getMethodImplementation_stret(Class cls, SEL selector)
-{
-	return class_getMethodImplementation_stret_m68k(cls, selector);
-}
-
-const char *
-class_getMethodTypeEncoding(Class cls, SEL selector)
-{
-	return class_getMethodTypeEncoding_m68k(cls, selector);
-}
-
-bool
-class_addMethod(Class cls, SEL selector, IMP implementation,
-    const char *typeEncoding)
-{
-	return class_addMethod_m68k(cls, selector, implementation,
+class_isMetaClass(Class class)
+{
+	return class_isMetaClass_m68k(class);
+}
+
+const char *
+class_getName(Class class)
+{
+	return class_getName_m68k(class);
+}
+
+Class
+class_getSuperclass(Class class)
+{
+	return class_getSuperclass_m68k(class);
+}
+
+unsigned long
+class_getInstanceSize(Class class)
+{
+	return class_getInstanceSize_m68k(class);
+}
+
+bool
+class_respondsToSelector(Class class, SEL selector)
+{
+	return class_respondsToSelector_m68k(class, selector);
+}
+
+bool
+class_conformsToProtocol(Class class, Protocol *protocol)
+{
+	return class_conformsToProtocol_m68k(class, protocol);
+}
+
+IMP
+class_getMethodImplementation(Class class, SEL selector)
+{
+	return class_getMethodImplementation_m68k(class, selector);
+}
+
+IMP
+class_getMethodImplementation_stret(Class class, SEL selector)
+{
+	return class_getMethodImplementation_stret_m68k(class, selector);
+}
+
+const char *
+class_getMethodTypeEncoding(Class class, SEL selector)
+{
+	return class_getMethodTypeEncoding_m68k(class, selector);
+}
+
+bool
+class_addMethod(Class class, SEL selector, IMP implementation,
+    const char *typeEncoding)
+{
+	return class_addMethod_m68k(class, selector, implementation,
 	    typeEncoding);
 }
 
 IMP
-class_replaceMethod(Class cls, SEL selector, IMP implementation,
+class_replaceMethod(Class class, SEL selector, IMP implementation,
     const char *typeEncoding)
 {
-	return class_replaceMethod_m68k(cls, selector, implementation,
+	return class_replaceMethod_m68k(class, selector, implementation,
 	    typeEncoding);
 }
 
 Class
 object_getClass(id object)
@@ -418,13 +418,13 @@
 {
 	return object_getClass_m68k(object);
 }
 
 Class
-object_setClass(id object, Class cls)
+object_setClass(id object, Class class)
 {
-	return object_setClass_m68k(object, cls);
+	return object_setClass_m68k(object, class);
 }
 
 const char *
 object_getClassName(id object)
 {