@@ -21,17 +21,17 @@
 .globl objc_msg_lookup_stret
 .globl objc_msg_lookup_super
 .globl objc_msg_lookup_super_stret
 
 .section .text
-.macro generate_lookup name not_found
+.macro GENERATE_LOOKUP name notFound
 \name:
 	cmpwi	%r3, 0
-	beq-	ret_nil
+	beq-	returnNilMethod
 
 	andi.	%r0, %r3, 1
-	bne-	.Ltagged_pointer_\name
+	bne-	.LtaggedPointer_\name
 
 	lwz	%r5, 0(%r3)
 	lwz	%r5, 32(%r5)
 
 .Lmain_\name:
@@ -65,109 +65,109 @@
 0:
 	mflr	%r30
 	addis	%r30, %r30, .Lbiased_got2-0b@ha
 	addi	%r30, %r30, .Lbiased_got2-0b@l
 
-	lwz	%r0, .Lgot_\not_found-.Lbiased_got2(%r30)
+	lwz	%r0, .Lgot_\notFound-.Lbiased_got2(%r30)
 	mtctr	%r0
 
 	lwz	%r30, 8(%r1)
 	lwz	%r0, 20(%r1)
 	addi	%r1, %r1, 16
 	mtlr	%r0
 
 	bctr
 #else
-	b	\not_found
+	b	\notFound
 #endif
 
-.Ltagged_pointer_\name:
+.LtaggedPointer_\name:
 #if defined(OF_PIC)
 	mflr	%r7
 	bl	0f
 0:
 	mflr	%r6
 	mtlr	%r7
 	addis	%r6, %r6, .Lbiased_got2-0b@ha
 	addi	%r6, %r6, .Lbiased_got2-0b@l
 
-	lwz	%r5, .Lgot_objc_tagged_pointer_secret-.Lbiased_got2(%r6)
+	lwz	%r5, .Lgot_objc_taggedPointerSecret-.Lbiased_got2(%r6)
 	lwz	%r5, 0(%r5)
 #elif defined(OF_BASEREL)
-	addis	%r5, %r13, objc_tagged_pointer_secret@drel@ha
-	lwz	%r5, objc_tagged_pointer_secret@drel@l(%r5)
+	addis	%r5, %r13, objc_taggedPointerSecret@drel@ha
+	lwz	%r5, objc_taggedPointerSecret@drel@l(%r5)
 #else
-	lis	%r5, objc_tagged_pointer_secret@ha
-	lwz	%r5, objc_tagged_pointer_secret@l(%r5)
+	lis	%r5, objc_taggedPointerSecret@ha
+	lwz	%r5, objc_taggedPointerSecret@l(%r5)
 #endif
 	xor	%r5, %r3, %r5
 	rlwinm	%r5, %r5, 1, 0x1C
 
 #if defined(OF_PIC)
-	lwz	%r6, .Lgot_objc_tagged_pointer_classes-.Lbiased_got2(%r6)
+	lwz	%r6, .Lgot_objc_taggedPointerClasses-.Lbiased_got2(%r6)
 #elif defined(OF_BASEREL)
-	addis	%r6, %r13, objc_tagged_pointer_classes@drel@ha
-	addi	%r6, %r6, objc_tagged_pointer_classes@drel@l
+	addis	%r6, %r13, objc_taggedPointerClasses@drel@ha
+	addi	%r6, %r6, objc_taggedPointerClasses@drel@l
 #else
-	lis	%r6, objc_tagged_pointer_classes@ha
-	addi	%r6, %r6, objc_tagged_pointer_classes@l
+	lis	%r6, objc_taggedPointerClasses@ha
+	addi	%r6, %r6, objc_taggedPointerClasses@l
 #endif
 	lwzx	%r5, %r6, %r5
 	lwz	%r5, 32(%r5)
 
 	b	.Lmain_\name
 .type \name, @function
 .size \name, .-\name
 .endm
 
-.macro generate_lookup_super name lookup
+.macro GENERATE_LOOKUP_SUPER name lookup
 \name:
 	mr	%r5, %r3
 	lwz	%r3, 0(%r3)
 	cmpwi	%r3, 0
-	beq-	ret_nil
+	beq-	returnNilMethod
 
 	lwz	%r5, 4(%r5)
 	lwz	%r5, 32(%r5)
 
 	b	.Lmain_\lookup
 .type \name, @function
 .size \name, .-\name
 .endm
 
-generate_lookup objc_msg_lookup objc_method_not_found
-generate_lookup objc_msg_lookup_stret objc_method_not_found_stret
-generate_lookup_super objc_msg_lookup_super objc_msg_lookup
-generate_lookup_super objc_msg_lookup_super_stret objc_msg_lookup_stret
-
-ret_nil:
-	mflr	%r0
-	bl	get_pc
+GENERATE_LOOKUP objc_msg_lookup objc_methodNotFound
+GENERATE_LOOKUP objc_msg_lookup_stret objc_methodNotFound_stret
+GENERATE_LOOKUP_SUPER objc_msg_lookup_super objc_msg_lookup
+GENERATE_LOOKUP_SUPER objc_msg_lookup_super_stret objc_msg_lookup_stret
+
+returnNilMethod:
+	mflr	%r0
+	bl	getPC
 	mtlr	%r0
 0:
-	addi	%r3, %r3, nil_method-0b
+	addi	%r3, %r3, nilMethod-0b
 	blr
 
-nil_method:
+nilMethod:
 	li	%r3, 0
 	blr
 
-get_pc:
+getPC:
 	mflr	%r3
 	blr
 
 #ifdef OF_PIC
 .section .got2, "aw"
 .Lbiased_got2 = .+0x8000
-.Lgot_objc_method_not_found:
-	.long objc_method_not_found
-.Lgot_objc_method_not_found_stret:
-	.long objc_method_not_found_stret
-.Lgot_objc_tagged_pointer_secret:
-	.long objc_tagged_pointer_secret
-.Lgot_objc_tagged_pointer_classes:
-	.long objc_tagged_pointer_classes
+.Lgot_objc_methodNotFound:
+	.long objc_methodNotFound
+.Lgot_objc_methodNotFound_stret:
+	.long objc_methodNotFound_stret
+.Lgot_objc_taggedPointerSecret:
+	.long objc_taggedPointerSecret
+.Lgot_objc_taggedPointerClasses:
+	.long objc_taggedPointerClasses
 #endif
 
 #ifdef OF_LINUX
 .section .note.GNU-stack, "", @progbits
 #endif