diff --git a/mach/ns/libem/putchar.s b/mach/ns/libem/putchar.s
index 9cdd0f8c6..128290b9e 100644
--- a/mach/ns/libem/putchar.s
+++ b/mach/ns/libem/putchar.s
@@ -14,7 +14,7 @@
 	movqd	1,tos
 	addr	8(fp),tos
 	movqd	1,tos
-	bsr	__write
+	bsr	WRITE
 	adjspb	-12
 	exit	[]
 	ret	0
diff --git a/mach/z8000/libem/printf.s b/mach/z8000/libem/printf.s
index 5512c4730..00736b7a3 100755
--- a/mach/z8000/libem/printf.s
+++ b/mach/z8000/libem/printf.s
@@ -62,7 +62,7 @@ ready:	    !now really print the string we built in the buffer
 	push	*RR14, R3	!count
 	push	*RR14, R1	!buffer
 	push	*RR14, $2	!file descriptor
-	calr	__write
+	calr	WRITE
 	inc	R15, $6
 
 	ldm	R4, savereg, $10
diff --git a/mach/z8000/libem/trp.s b/mach/z8000/libem/trp.s
index 4ff5a0c77..8c0efbf4c 100644
--- a/mach/z8000/libem/trp.s
+++ b/mach/z8000/libem/trp.s
@@ -18,7 +18,7 @@ fatal:
 	pushl	*RR14, saveret
 	calr	trp
 	push	*RR14, $1
-	calr	__exit
+	jr	EXIT
 	!NOTREACHED
 
 trp:
@@ -54,7 +54,7 @@ trp:
 	push	*RR14, $err
 	calr	printf
 	push	*RR14, $1
-	calr	__exit
+	jr	EXIT
 	!NOTREACHED
 .sect .data
 err:	.asciz	"trap error %d\n"