@@ -45,11 +45,11 @@
 
 static void
 registerCategory(struct objc_abi_category *category)
 {
 	struct objc_abi_category **categories;
-	Class cls = objc_classname_to_class(category->className, false);
+	Class class = objc_classname_to_class(category->className, false);
 
 	if (categoriesMap == NULL)
 		categoriesMap = objc_hashtable_new(
 		    objc_hash_string, objc_equal_string, 2);
 
@@ -71,13 +71,13 @@
 		newCategories[i] = category;
 		newCategories[i + 1] = NULL;
 		objc_hashtable_set(categoriesMap, category->className,
 		    newCategories);
 
-		if (cls != Nil && cls->info & OBJC_CLASS_INFO_SETUP) {
-			objc_update_dtable(cls);
-			objc_update_dtable(cls->isa);
+		if (class != Nil && class->info & OBJC_CLASS_INFO_SETUP) {
+			objc_update_dtable(class);
+			objc_update_dtable(class->isa);
 		}
 
 		return;
 	}
 
@@ -88,13 +88,13 @@
 
 	categories[0] = category;
 	categories[1] = NULL;
 	objc_hashtable_set(categoriesMap, category->className, categories);
 
-	if (cls != Nil && cls->info & OBJC_CLASS_INFO_SETUP) {
-		objc_update_dtable(cls);
-		objc_update_dtable(cls->isa);
+	if (class != Nil && class->info & OBJC_CLASS_INFO_SETUP) {
+		objc_update_dtable(class);
+		objc_update_dtable(class->isa);
 	}
 }
 
 void
 objc_register_all_categories(struct objc_abi_symtab *symtab)
@@ -107,17 +107,17 @@
 		registerCategory(categories[i]);
 	}
 }
 
 struct objc_category **
-objc_categories_for_class(Class cls)
+objc_categories_for_class(Class class)
 {
 	if (categoriesMap == NULL)
 		return NULL;
 
 	return (struct objc_category **)objc_hashtable_get(categoriesMap,
-	    cls->name);
+	    class->name);
 }
 
 void
 objc_unregister_all_categories(void)
 {