@@ -30,26 +30,26 @@
 	struct objc_method_list *iter;
 	unsigned int i;
 
 	for (iter = category->instanceMethods; iter != NULL; iter = iter->next)
 		for (i = 0; i < iter->count; i++)
-			objc_register_selector(&iter->methods[i].selector);
+			objc_registerSelector(&iter->methods[i].selector);
 
 	for (iter = category->classMethods; iter != NULL; iter = iter->next)
 		for (i = 0; i < iter->count; i++)
-			objc_register_selector(&iter->methods[i].selector);
+			objc_registerSelector(&iter->methods[i].selector);
 }
 
 static void
 registerCategory(struct objc_category *category)
 {
 	struct objc_category **categories;
-	Class class = objc_classname_to_class(category->className, false);
+	Class class = objc_classnameToClass(category->className, false);
 
 	if (categoriesMap == NULL)
 		categoriesMap = objc_hashtable_new(
-		    objc_hash_string, objc_equal_string, 2);
+		    objc_string_hash, objc_string_equal, 2);
 
 	categories = (struct objc_category **)objc_hashtable_get(
 	    categoriesMap, category->className);
 
 	if (categories != NULL) {
@@ -68,12 +68,12 @@
 		newCategories[i + 1] = NULL;
 		objc_hashtable_set(categoriesMap, category->className,
 		    newCategories);
 
 		if (class != Nil && class->info & OBJC_CLASS_INFO_SETUP) {
-			objc_update_dtable(class);
-			objc_update_dtable(class->isa);
+			objc_updateDTable(class);
+			objc_updateDTable(class->isa);
 		}
 
 		return;
 	}
 
@@ -84,17 +84,17 @@
 	categories[0] = category;
 	categories[1] = NULL;
 	objc_hashtable_set(categoriesMap, category->className, categories);
 
 	if (class != Nil && class->info & OBJC_CLASS_INFO_SETUP) {
-		objc_update_dtable(class);
-		objc_update_dtable(class->isa);
+		objc_updateDTable(class);
+		objc_updateDTable(class->isa);
 	}
 }
 
 void
-objc_register_all_categories(struct objc_symtab *symtab)
+objc_registerAllCategories(struct objc_symtab *symtab)
 {
 	struct objc_category **categories =
 	    (struct objc_category **)symtab->defs + symtab->classDefsCount;
 
 	for (size_t i = 0; i < symtab->categoryDefsCount; i++) {
@@ -102,21 +102,21 @@
 		registerCategory(categories[i]);
 	}
 }
 
 struct objc_category **
-objc_categories_for_class(Class class)
+objc_categoriesForClass(Class class)
 {
 	if (categoriesMap == NULL)
 		return NULL;
 
 	return (struct objc_category **)objc_hashtable_get(categoriesMap,
 	    class->name);
 }
 
 void
-objc_unregister_all_categories(void)
+objc_unregisterAllCategories(void)
 {
 	if (categoriesMap == NULL)
 		return;
 
 	for (uint32_t i = 0; i < categoriesMap->size; i++)