@@ -20,11 +20,11 @@
 .globl objc_msg_lookup_stret
 .globl objc_msg_lookup_super
 .globl objc_msg_lookup_super_stret
 
 .section .text
-.macro generate_lookup name not_found_handler
+.macro generate_lookup name not_found
 \name:
 	beqz	$a0, .ret_nil_\name
 
 	lw	$t0, 0($a0)
 	lw	$t0, 32($t0)
@@ -62,11 +62,11 @@
 	lw	$t0, 0($t0)
 
 #ifdef __PIC__
 	beqz	$t0, .forward_\name
 #else
-	beqz	$t0, \not_found_handler
+	beqz	$t0, \not_found
 #endif
 
 	move	$v0, $t0
 	j	$ra
 
@@ -83,11 +83,11 @@
 	lui	$gp, %hi(_gp_disp)
 	addiu	$gp, $gp, %lo(_gp_disp)
 	addu	$gp, $gp, $t9
 	addiu	$gp, $gp, .forward_\name-\name
 
-	lw	$t9, %call16(\not_found_handler)($gp)
+	lw	$t9, %call16(\not_found)($gp)
 	jr	$t9
 #endif
 .type \name, %function
 .size \name, .-\name
 .endm
@@ -111,12 +111,12 @@
 	j	$ra
 .type \name, %function
 .size \name, .-\name
 .endm
 
-generate_lookup objc_msg_lookup objc_not_found_handler
-generate_lookup objc_msg_lookup_stret objc_not_found_handler_stret
+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
 
 nil_method:
 	move	$v0, $zero