@@ -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
 
 	lw	$t0, 0($a0)
 	lw	$t0, 32($t0)
 
 .Lmain_\name:
@@ -64,21 +64,21 @@
 	lw	$t0, 0($t0)
 
 #ifdef OF_PIC
 	beqz	$t0, 1f
 #else
-	beqz	$t0, \not_found
+	beqz	$t0, \notFound
 #endif
 
 	move	$v0, $t0
 	jr	$ra
 
 0:
 #ifdef OF_PIC
-	addiu	$v0, $t9, nil_method-\name
+	addiu	$v0, $t9, nilMethod-\name
 #else
-	la	$v0, nil_method
+	la	$v0, nilMethod
 #endif
 	jr	$ra
 
 #ifdef OF_PIC
 1:
@@ -85,35 +85,35 @@
 	lui	$gp, %hi(_gp_disp)
 	addiu	$gp, $gp, %lo(_gp_disp)
 	addu	$gp, $gp, $t9
 	addiu	$gp, $gp, 1b-\name
 
-	lw	$t9, %call16(\not_found)($gp)
+	lw	$t9, %call16(\notFound)($gp)
 	jr	$t9
 #endif
 
-.Ltagged_pointer_\name:
+.LtaggedPointer_\name:
 #ifdef OF_PIC
 0:
 	lui	$gp, %hi(_gp_disp)
 	addiu	$gp, $gp, %lo(_gp_disp)
 	addu	$gp, $gp, $t9
 	addiu	$gp, $gp, 0b-\name
 
-	lw	$t0, %got(objc_tagged_pointer_secret)($gp)
+	lw	$t0, %got(objc_taggedPointerSecret)($gp)
 #else
-	la	$t0, objc_tagged_pointer_secret
+	la	$t0, objc_taggedPointerSecret
 #endif
 	lw	$t0, 0($t0)
 	xor	$t0, $a0, $t0
 	and	$t0, $t0, 0xE
 	sll	$t0, $t0, 1
 
 #ifdef OF_PIC
-	lw	$t1, %got(objc_tagged_pointer_classes)($gp)
+	lw	$t1, %got(objc_taggedPointerClasses)($gp)
 #else
-	la	$t1, objc_tagged_pointer_classes
+	la	$t1, objc_taggedPointerClasses
 #endif
 	addu	$t0, $t1, $t0
 	ld	$t0, ($t0)
 	ld	$t0, 32($t0)
 
@@ -120,11 +120,11 @@
 	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
 	lw	$a0, 0($a0)
 	beqz	$a0, 0f
 
@@ -134,26 +134,26 @@
 	addiu	$t9, $t9, \lookup-\name
 	b	.Lmain_\lookup
 
 0:
 #ifdef OF_PIC
-	addiu	$v0, $t9, nil_method-\name
+	addiu	$v0, $t9, nilMethod-\name
 #else
-	la	$v0, nil_method
+	la	$v0, nilMethod
 #endif
 	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