Index: src/OFBlock.m
==================================================================
--- src/OFBlock.m
+++ src/OFBlock.m
@@ -125,18 +125,18 @@
 /* End of ObjC module */
 #elif defined(OF_APPLE_RUNTIME)
 extern Class objc_initializeClassPair(Class, const char *, Class, Class);
 
 struct class {
-	struct class *isa, *super_class;
+	struct class *isa, *superclass;
 	const char *name;
-	long version, info, instance_size;
-	struct ivar_list *ivars;
-	struct method_list **methodLists;
+	long version, info, instanceSize;
+	struct ivar_list *iVars;
+	struct method_list **methodList;
 	struct cache *cache;
 	struct protocol_list *protocols;
-	const char *ivar_layout;
+	const char *iVarLayout;
 	struct class_ext *ext;
 };
 
 struct class _NSConcreteStackBlock;
 struct class _NSConcreteGlobalBlock;

Index: src/OFConstantString.m
==================================================================
--- src/OFConstantString.m
+++ src/OFConstantString.m
@@ -31,18 +31,18 @@
 
 #if defined(OF_APPLE_RUNTIME) && !defined(__OBJC2__)
 # import <objc/runtime.h>
 
 struct {
-	struct class *isa, *super_class;
+	struct class *isa, *superclass;
 	const char *name;
-	long version, info, instance_size;
-	struct ivar_list *ivars;
-	struct method_list **method_lists;
+	long version, info, instanceSize;
+	struct ivar_list *iVars;
+	struct method_list **methodList;
 	struct cache *cache;
 	struct protocol_list *protocols;
-	const char *ivar_layout;
+	const char *iVarLayout;
 	struct class_ext *ext;
 } _OFConstantStringClassReference;
 #endif
 
 @interface OFString_const: OFString_UTF8