@@ -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:
 	testq	%rdi, %rdi
 	jz	ret_nil
 
 	movq	(%rdi), %r8
@@ -41,11 +41,11 @@
 #endif
 	movq	(%r8,%rcx,8), %r8
 	movq	(%r8,%rdx,8), %rax
 
 	testq	%rax, %rax
-	jz	\not_found_handler@PLT
+	jz	\not_found@PLT
 
 	ret
 .type \name, %function
 .size \name, .-\name
 .endm
@@ -62,12 +62,12 @@
 	jmp	.main_\lookup
 .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
 
 ret_nil:
 	leaq	nil_method(%rip), %rax