@@ -23,43 +23,43 @@
 #import "private.h"
 
 #import "macros.h"
 
 #ifdef OF_SELUID24
-# define SEL_MAX 0xFFFFFF
-# define SEL_SIZE 3
+static const uint32_t maxSel = 0xFFFFFF;
+static const uint8_t selLevels = 3;
 #else
-# define SEL_MAX 0xFFFF
-# define SEL_SIZE 2
+static const uint32_t maxSel = 0xFFFF;
+static const uint8_t selLevels = 2;
 #endif
 
 static struct objc_hashtable *selectors = NULL;
 static uint32_t selectorsCount = 0;
 static struct objc_sparsearray *selectorNames = NULL;
 static void **freeList = NULL;
 static size_t freeListCount = 0;
 
 void
-objc_register_selector(struct objc_selector *selector)
+objc_registerSelector(struct objc_selector *selector)
 {
 	SEL existingSelector;
 	const char *name;
 
-	if (selectorsCount > SEL_MAX)
+	if (selectorsCount > maxSel)
 		OBJC_ERROR("Out of selector slots!");
 
 	if (selectors == NULL)
 		selectors = objc_hashtable_new(
-		    objc_hash_string, objc_equal_string, 2);
+		    objc_string_hash, objc_string_equal, 2);
 	else if ((existingSelector = objc_hashtable_get(selectors,
 	    (const char *)selector->UID)) != NULL) {
 		selector->UID = existingSelector->UID;
 		return;
 	}
 
 	if (selectorNames == NULL)
-		selectorNames = objc_sparsearray_new(SEL_SIZE);
+		selectorNames = objc_sparsearray_new(selLevels);
 
 	name = (const char *)selector->UID;
 	selector->UID = selectorsCount++;
 
 	objc_hashtable_set(selectors, name, selector);
@@ -70,22 +70,20 @@
 SEL
 sel_registerName(const char *name)
 {
 	struct objc_selector *selector;
 
-	objc_global_mutex_lock();
+	objc_globalMutex_lock();
 
 	if (selectors != NULL &&
 	    (selector = objc_hashtable_get(selectors, name)) != NULL) {
-		objc_global_mutex_unlock();
+		objc_globalMutex_unlock();
 		return (SEL)selector;
 	}
 
-	if ((selector = malloc(sizeof(*selector))) == NULL)
-		OBJC_ERROR("Not enough memory to allocate selector!");
-
-	if ((selector->UID = (uintptr_t)of_strdup(name)) == 0)
+	if ((selector = malloc(sizeof(*selector))) == NULL ||
+	    (selector->UID = (uintptr_t)objc_strdup(name)) == 0)
 		OBJC_ERROR("Not enough memory to allocate selector!");
 
 	selector->typeEncoding = NULL;
 
 	if ((freeList = realloc(freeList,
@@ -93,36 +91,36 @@
 		OBJC_ERROR("Not enough memory to allocate selector!");
 
 	freeList[freeListCount++] = selector;
 	freeList[freeListCount++] = (char *)selector->UID;
 
-	objc_register_selector(selector);
+	objc_registerSelector(selector);
 
-	objc_global_mutex_unlock();
+	objc_globalMutex_unlock();
 	return (SEL)selector;
 }
 
 void
-objc_register_all_selectors(struct objc_symtab *symtab)
+objc_registerAllSelectors(struct objc_symtab *symtab)
 {
 	struct objc_selector *selector;
 
 	if (symtab->selectorRefs == NULL)
 		return;
 
 	for (selector = symtab->selectorRefs; selector->UID != 0; selector++)
-		objc_register_selector(selector);
+		objc_registerSelector(selector);
 }
 
 const char *
 sel_getName(SEL selector)
 {
 	const char *ret;
 
-	objc_global_mutex_lock();
+	objc_globalMutex_lock();
 	ret = objc_sparsearray_get(selectorNames, (uint32_t)selector->UID);
-	objc_global_mutex_unlock();
+	objc_globalMutex_unlock();
 
 	return ret;
 }
 
 bool
@@ -130,11 +128,11 @@
 {
 	return (selector1->UID == selector2->UID);
 }
 
 void
-objc_unregister_all_selectors(void)
+objc_unregisterAllSelectors(void)
 {
 	objc_hashtable_free(selectors);
 	objc_sparsearray_free(selectorNames);
 
 	if (freeList != NULL) {