@@ -21,16 +21,16 @@
 .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:
 	beqz	$a0, 0f
 
 	andi	$t0, $a0, 1
-	bnez	$t0, .Ltagged_pointer_\name
+	bnez	$t0, .LtaggedPointer_\name
 
 	ld	$t0, ($a0)
 	ld	$t0, 64($t0)
 
 .Lmain_\name:
@@ -70,42 +70,42 @@
 
 0:
 	lui	$v0, %hi(%neg(%gp_rel(\name)))
 	daddiu	$v0, $v0, %lo(%neg(%gp_rel(\name)))
 	daddu	$v0, $v0, $t9
-	ld	$v0, %got_disp(nil_method)($v0)
+	ld	$v0, %got_disp(nilMethod)($v0)
 	jr	$ra
 
 1:
 	lui	$t0, %hi(%neg(%gp_rel(\name)))
 	daddiu	$t0, $t0, %lo(%neg(%gp_rel(\name)))
 	daddu	$t0, $t0, $t9
-	ld	$t9, %got_disp(\not_found)($t0)
+	ld	$t9, %got_disp(\notFound)($t0)
 	jr	$t9
 
-.Ltagged_pointer_\name:
+.LtaggedPointer_\name:
 	lui	$t0, %hi(%neg(%gp_rel(\name)))
 	daddiu	$t0, $t0, %lo(%neg(%gp_rel(\name)))
 	daddu	$t0, $t0, $t9
 
-	ld	$t1, %got_disp(objc_tagged_pointer_secret)($t0)
+	ld	$t1, %got_disp(objc_taggedPointerSecret)($t0)
 	ld	$t1, 0($t1)
 	xor	$t1, $a0, $t1
 	and	$t1, $t1, 0xE
 	dsll	$t1, $t1, 2
 
-	ld	$t0, %got_disp(objc_tagged_pointer_classes)($t0)
+	ld	$t0, %got_disp(objc_taggedPointerClasses)($t0)
 	daddu	$t0, $t0, $t1
 	ld	$t0, ($t0)
 	ld	$t0, 64($t0)
 
 	b	.Lmain_\name
 .type \name, %function
 .size \name, .-\name
 .endm
 
-.macro generate_lookup_super name lookup
+.macro GENERATE_LOOKUP_SUPER name lookup
 \name:
 	move	$t0, $a0
 	ld	$a0, ($a0)
 	beqz	$a0, 0f
 
@@ -117,23 +117,23 @@
 
 0:
 	lui	$v0, %hi(%neg(%gp_rel(\name)))
 	daddiu	$v0, $v0, %lo(%neg(%gp_rel(\name)))
 	daddu	$v0, $v0, $t9
-	ld	$v0, %got_disp(nil_method)($v0)
+	ld	$v0, %got_disp(nilMethod)($v0)
 	jr	$ra
 .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
+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
 
-nil_method:
+nilMethod:
 	move	$v0, $zero
 	jr	$ra
 
 #ifdef OF_LINUX
 .section .note.GNU-stack, "", %progbits
 #endif