@@ -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:
 	movl	4(%esp), %edx
 	testl	%edx, %edx
 	jz	ret_nil
 
@@ -49,11 +49,11 @@
 	ret
 
 .forward_\name:
 	call	get_eip
 .forward_L0_\name:
-	addl	$\not_found_handler-.forward_L0_\name, %eax
+	addl	$\not_found-.forward_L0_\name, %eax
 	jmp	*%eax
 .endm
 
 .macro generate_lookup_super name lookup
 \name:
@@ -64,12 +64,12 @@
 	movl	4(%edx), %edx
 	movl	32(%edx), %edx
 	jmp	.main_\lookup
 .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
 
 ret_nil:
 	call	get_eip