@@ -22,16 +22,16 @@
 .globl objc_msg_lookup_super_stret
 
 .section .text
 .macro generate_lookup name not_found
 \name:
-	beqz	$a0, .ret_nil_\name
+	beqz	$a0, 0f
 
 	lw	$t0, 0($a0)
 	lw	$t0, 32($t0)
 
-.main_\name:
+.Lmain_\name:
 #if defined(__MIPSEL__)
 # ifdef OF_SELUID24
 	lbu	$t1, 2($a1)
 # endif
 	lbu	$t2, 1($a1)
@@ -60,32 +60,32 @@
 	lw	$t0, 0($t0)
 	addu	$t0, $t0, $t3
 	lw	$t0, 0($t0)
 
 #ifdef __PIC__
-	beqz	$t0, .forward_\name
+	beqz	$t0, 1f
 #else
 	beqz	$t0, \not_found
 #endif
 
 	move	$v0, $t0
 	j	$ra
 
-.ret_nil_\name:
+0:
 #ifdef __PIC__
 	addiu	$v0, $t9, nil_method-\name
 #else
 	la	$v0, nil_method
 #endif
 	j	$ra
 
 #ifdef __PIC__
-.forward_\name:
+1:
 	lui	$gp, %hi(_gp_disp)
 	addiu	$gp, $gp, %lo(_gp_disp)
 	addu	$gp, $gp, $t9
-	addiu	$gp, $gp, .forward_\name-\name
+	addiu	$gp, $gp, 1b-\name
 
 	lw	$t9, %call16(\not_found)($gp)
 	jr	$t9
 #endif
 .type \name, %function
@@ -93,18 +93,18 @@
 .endm
 
 .macro generate_lookup_super name lookup
 \name:
 	lw	$t0, 0($a0)
-	beqz	$t0, .ret_nil_\name
+	beqz	$t0, 0f
 
 	lw	$t0, 4($a0)
 	lw	$t0, 32($t0)
 
-	b	.main_\lookup
+	b	.Lmain_\lookup
 
-.ret_nil_\name:
+0:
 #ifdef __PIC__
 	addiu	$v0, $t9, nil_method-\name
 #else
 	la	$v0, nil_method
 #endif