@@ -38,11 +38,11 @@
 	unsigned long version;
 	unsigned long info;
 	long instanceSize;
 	struct objc_ivar_list *_Nullable ivars;
 	struct objc_method_list *_Nullable methodList;
-	struct objc_dtable *_Nonnull DTable;
+	struct objc_dtable *_Nonnull dTable;
 	Class _Nullable *_Nullable subclassList;
 	void *_Nullable siblingClass;
 	struct objc_protocol_list *_Nullable protocols;
 	void *_Nullable GCObjectType;
 	unsigned long ABIVersion;
@@ -199,11 +199,11 @@
 
 struct objc_sparsearray {
 	struct objc_sparsearray_data {
 		void *_Nullable next[256];
 	} *_Nonnull data;
-	uint8_t indexSize;
+	uint8_t levels;
 };
 
 struct objc_dtable {
 	struct objc_dtable_level2 {
 #ifdef OF_SELUID24
@@ -279,35 +279,35 @@
 #  define __gnu_objc_personality(version, actions, exClass, ex, ctx)	\
 	__gnu_objc_personality_v0(version, actions, *exClass, ex, ctx)
 # endif
 #endif
 
-extern void objc_register_all_categories(struct objc_symtab *_Nonnull);
+extern void objc_registerAllCategories(struct objc_symtab *_Nonnull);
 extern struct objc_category *_Nullable *_Nullable
-    objc_categories_for_class(Class _Nonnull);
-extern void objc_unregister_all_categories(void);
-extern void objc_initialize_class(Class _Nonnull);
-extern void objc_update_dtable(Class _Nonnull);
-extern void objc_register_all_classes(struct objc_symtab *_Nonnull);
-extern Class _Nullable objc_classname_to_class(const char *_Nonnull, bool);
-extern void objc_unregister_class(Class _Nonnull);
-extern void objc_unregister_all_classes(void);
-extern uint32_t objc_hash_string(const void *_Nonnull);
-extern bool objc_equal_string(const void *_Nonnull, const void *_Nonnull);
+    objc_categoriesForClass(Class _Nonnull);
+extern void objc_unregisterAllCategories(void);
+extern void objc_initializeClass(Class _Nonnull);
+extern void objc_updateDTable(Class _Nonnull);
+extern void objc_registerAllClasses(struct objc_symtab *_Nonnull);
+extern Class _Nullable objc_classnameToClass(const char *_Nonnull, bool);
+extern void objc_unregisterClass(Class _Nonnull);
+extern void objc_unregisterAllClasses(void);
+extern uint32_t objc_string_hash(const void *_Nonnull);
+extern bool objc_string_equal(const void *_Nonnull, const void *_Nonnull);
 extern struct objc_hashtable *_Nonnull objc_hashtable_new(
     objc_hashtable_hash_func, objc_hashtable_equal_func, uint32_t);
-extern struct objc_hashtable_bucket objc_deleted_bucket;
+extern struct objc_hashtable_bucket objc_deletedBucket;
 extern void objc_hashtable_set(struct objc_hashtable *_Nonnull,
     const void *_Nonnull, const void *_Nonnull);
 extern void *_Nullable objc_hashtable_get(struct objc_hashtable *_Nonnull,
     const void *_Nonnull);
 extern void objc_hashtable_delete(struct objc_hashtable *_Nonnull,
     const void *_Nonnull);
 extern void objc_hashtable_free(struct objc_hashtable *_Nonnull);
-extern void objc_register_selector(struct objc_selector *_Nonnull);
-extern void objc_register_all_selectors(struct objc_symtab *_Nonnull);
-extern void objc_unregister_all_selectors(void);
+extern void objc_registerSelector(struct objc_selector *_Nonnull);
+extern void objc_registerAllSelectors(struct objc_symtab *_Nonnull);
+extern void objc_unregisterAllSelectors(void);
 extern struct objc_sparsearray *_Nonnull objc_sparsearray_new(uint8_t);
 extern void *_Nullable objc_sparsearray_get(struct objc_sparsearray *_Nonnull,
     uintptr_t);
 extern void objc_sparsearray_set(struct objc_sparsearray *_Nonnull, uintptr_t,
     void *_Nullable);
@@ -317,23 +317,24 @@
     struct objc_dtable *_Nonnull);
 extern void objc_dtable_set(struct objc_dtable *_Nonnull, uint32_t,
     IMP _Nullable);
 extern void objc_dtable_free(struct objc_dtable *_Nonnull);
 extern void objc_dtable_cleanup(void);
-extern void objc_init_static_instances(struct objc_symtab *_Nonnull);
-extern void objc_forget_pending_static_instances(void);
-extern void objc_zero_weak_references(id _Nonnull);
+extern void objc_initStaticInstances(struct objc_symtab *_Nonnull);
+extern void objc_forgetPendingStaticInstances(void);
+extern void objc_zeroWeakReferences(id _Nonnull);
 extern Class _Nullable object_getTaggedPointerClass(id _Nonnull);
 #ifdef OF_HAVE_THREADS
-extern void objc_global_mutex_lock(void);
-extern void objc_global_mutex_unlock(void);
-extern void objc_global_mutex_free(void);
+extern void objc_globalMutex_lock(void);
+extern void objc_globalMutex_unlock(void);
+extern void objc_globalMutex_free(void);
 #else
-# define objc_global_mutex_lock()
-# define objc_global_mutex_unlock()
-# define objc_global_mutex_free()
+# define objc_globalMutex_lock()
+# define objc_globalMutex_unlock()
+# define objc_globalMutex_free()
 #endif
+extern char *_Nullable objc_strdup(const char *_Nonnull string);
 
 static inline IMP _Nullable
 objc_dtable_get(const struct objc_dtable *_Nonnull dtable, uint32_t idx)
 {
 #ifdef OF_SELUID24