Index: uspace/lib/c/arch/abs32le/src/fibril.c
===================================================================
--- uspace/lib/c/arch/abs32le/src/fibril.c	(revision a5c78a18893be91b59c28590353ad8d90673105a)
+++ uspace/lib/c/arch/abs32le/src/fibril.c	(revision 08e103d46af516da7dcb378db322a88e2c4aca0b)
@@ -33,10 +33,10 @@
 #include <stdbool.h>
 
-int __setjmp(__context_t *ctx)
+int __context_save(__context_t *ctx)
 {
 	return 0;
 }
 
-void __longjmp(__context_t *ctx, int val)
+void __context_restore(__context_t *ctx, int val)
 {
 	while (true)
Index: uspace/lib/c/arch/amd64/src/fibril.S
===================================================================
--- uspace/lib/c/arch/amd64/src/fibril.S	(revision a5c78a18893be91b59c28590353ad8d90673105a)
+++ uspace/lib/c/arch/amd64/src/fibril.S	(revision 08e103d46af516da7dcb378db322a88e2c4aca0b)
@@ -37,5 +37,5 @@
 # pointed by the 1st argument. Returns 0 in RAX.
 #
-FUNCTION_BEGIN(__setjmp)
+FUNCTION_BEGIN(__context_save)
 	movq (%rsp), %rdx     # the caller's return %eip
 
@@ -54,7 +54,7 @@
 	movq %rax, __CONTEXT_OFFSET_TLS(%rdi)
 
-	xorq %rax, %rax                      # __setjmp returns 0
+	xorq %rax, %rax                      # __context_save returns 0
 	ret
-FUNCTION_END(__setjmp)
+FUNCTION_END(__context_save)
 
 ## Restore current CPU context
@@ -63,5 +63,5 @@
 # pointed by the 1st argument. Returns second argument in RAX.
 #
-FUNCTION_BEGIN(__longjmp)
+FUNCTION_BEGIN(__context_restore)
 	movq __CONTEXT_OFFSET_R15(%rdi), %r15
 	movq __CONTEXT_OFFSET_R14(%rdi), %r14
@@ -80,6 +80,6 @@
 	movq %rdi, %fs:0
 
-	movq %rsi, %rax                      # __longjmp returns second argument
+	movq %rsi, %rax                      # __context_restore returns second argument
 	ret
-FUNCTION_END(__longjmp)
+FUNCTION_END(__context_restore)
 
Index: uspace/lib/c/arch/arm32/src/fibril.S
===================================================================
--- uspace/lib/c/arch/arm32/src/fibril.S	(revision a5c78a18893be91b59c28590353ad8d90673105a)
+++ uspace/lib/c/arch/arm32/src/fibril.S	(revision 08e103d46af516da7dcb378db322a88e2c4aca0b)
@@ -31,5 +31,5 @@
 .text
 
-FUNCTION_BEGIN(__setjmp)
+FUNCTION_BEGIN(__context_save)
 	stmia r0!, {sp, lr}
 	stmia r0!, {r4-r11}
@@ -38,7 +38,7 @@
 	mov r0, #0
 	mov pc, lr
-FUNCTION_END(__setjmp)
+FUNCTION_END(__context_save)
 
-FUNCTION_BEGIN(__longjmp)
+FUNCTION_BEGIN(__context_restore)
 	ldmia r0!, {sp, lr}
 	ldmia r0!, {r4-r11}
@@ -47,4 +47,4 @@
 	mov r0, r1
 	mov pc, lr
-FUNCTION_END(__longjmp)
+FUNCTION_END(__context_restore)
 
Index: uspace/lib/c/arch/ia32/src/fibril.S
===================================================================
--- uspace/lib/c/arch/ia32/src/fibril.S	(revision a5c78a18893be91b59c28590353ad8d90673105a)
+++ uspace/lib/c/arch/ia32/src/fibril.S	(revision 08e103d46af516da7dcb378db322a88e2c4aca0b)
@@ -37,5 +37,5 @@
 # pointed by the 1st argument. Returns 0 in EAX.
 #
-FUNCTION_BEGIN(__setjmp)
+FUNCTION_BEGIN(__context_save)
 	movl 0(%esp), %eax  # the caller's return %eip
 	movl 4(%esp), %edx  # address of the context variable to save context to
@@ -53,7 +53,7 @@
 	movl %eax, __CONTEXT_OFFSET_TLS(%edx)	# tls -> ctx->tls
 
-	xorl %eax, %eax		# __setjmp returns 0
+	xorl %eax, %eax		# __context_save returns 0
 	ret
-FUNCTION_END(__setjmp)
+FUNCTION_END(__context_save)
 
 ## Restore saved CPU context
@@ -62,5 +62,5 @@
 # pointed by the 1st argument. Returns second argument in EAX.
 #
-FUNCTION_BEGIN(__longjmp)
+FUNCTION_BEGIN(__context_restore)
 	movl 4(%esp), %eax  # address of the context variable to restore context from
 	movl 8(%esp), %ecx  # return value
@@ -82,4 +82,4 @@
 	movl %ecx, %eax
 	ret
-FUNCTION_END(__longjmp)
+FUNCTION_END(__context_restore)
 
Index: uspace/lib/c/arch/ia64/include/libarch/fibril.h
===================================================================
--- uspace/lib/c/arch/ia64/include/libarch/fibril.h	(revision a5c78a18893be91b59c28590353ad8d90673105a)
+++ uspace/lib/c/arch/ia64/include/libarch/fibril.h	(revision 08e103d46af516da7dcb378db322a88e2c4aca0b)
@@ -43,5 +43,5 @@
 
 /*
- * __setjmp() and __longjmp() are both leaf procedures.
+ * __context_save() and __context_restore() are both leaf procedures.
  * No need to allocate scratch area.
  */
Index: uspace/lib/c/arch/ia64/src/fibril.S
===================================================================
--- uspace/lib/c/arch/ia64/src/fibril.S	(revision a5c78a18893be91b59c28590353ad8d90673105a)
+++ uspace/lib/c/arch/ia64/src/fibril.S	(revision 08e103d46af516da7dcb378db322a88e2c4aca0b)
@@ -32,5 +32,5 @@
 .text
 
-FUNCTION_BEGIN(__setjmp)
+FUNCTION_BEGIN(__context_save)
 	alloc loc0 = ar.pfs, 1, 49, 0, 0
 	mov loc1 = ar.unat ;;
@@ -178,9 +178,9 @@
 	mov ar.unat = loc1
 
-	mov r8 = 0 	/* __setjmp returns 0 */
+	mov r8 = 0 	/* __context_save returns 0 */
 	br.ret.sptk.many b0
-FUNCTION_END(__setjmp)
-
-FUNCTION_BEGIN(__longjmp)
+FUNCTION_END(__context_save)
+
+FUNCTION_BEGIN(__context_restore)
 	alloc loc0 = ar.pfs, 2, 50, 0, 0 ;;
 
@@ -335,5 +335,5 @@
 	mov ar.unat = loc1
 
-	mov r8 = in1			/* __longjmp returns second argument */
+	mov r8 = in1			/* __context_restore returns second argument */
 	br.ret.sptk.many b0
-FUNCTION_END(__longjmp)
+FUNCTION_END(__context_restore)
Index: uspace/lib/c/arch/mips32/src/fibril.S
===================================================================
--- uspace/lib/c/arch/mips32/src/fibril.S	(revision a5c78a18893be91b59c28590353ad8d90673105a)
+++ uspace/lib/c/arch/mips32/src/fibril.S	(revision 08e103d46af516da7dcb378db322a88e2c4aca0b)
@@ -35,5 +35,5 @@
 #include <libarch/fibril_context.h>
 
-FUNCTION_BEGIN(__setjmp)
+FUNCTION_BEGIN(__context_save)
 	sw $s0, __CONTEXT_OFFSET_S0($a0)
 	sw $s1, __CONTEXT_OFFSET_S1($a0)
@@ -87,10 +87,10 @@
 	sw $sp, __CONTEXT_OFFSET_SP($a0)
 
-	# __setjmp returns 0
+	# __context_save returns 0
 	j $ra
 	li $v0, 0
-FUNCTION_END(__setjmp)
+FUNCTION_END(__context_save)
 
-FUNCTION_BEGIN(__longjmp)
+FUNCTION_BEGIN(__context_restore)
 	lw $s0, __CONTEXT_OFFSET_S0($a0)
 	lw $s1, __CONTEXT_OFFSET_S1($a0)
@@ -147,6 +147,6 @@
 	move $t9, $ra
 
-	# __longjmp returns second argument
+	# __context_restore returns second argument
 	j $ra
 	move $v0, $a1
-FUNCTION_END(__longjmp)
+FUNCTION_END(__context_restore)
Index: uspace/lib/c/arch/ppc32/src/fibril.S
===================================================================
--- uspace/lib/c/arch/ppc32/src/fibril.S	(revision a5c78a18893be91b59c28590353ad8d90673105a)
+++ uspace/lib/c/arch/ppc32/src/fibril.S	(revision 08e103d46af516da7dcb378db322a88e2c4aca0b)
@@ -33,5 +33,5 @@
 #include <libarch/fibril_context.h>
 
-FUNCTION_BEGIN(__setjmp)
+FUNCTION_BEGIN(__context_save)
 	stw sp, __CONTEXT_OFFSET_SP(r3)
 	stw r2, __CONTEXT_OFFSET_TLS(r3)
@@ -62,10 +62,10 @@
 	stw r4, __CONTEXT_OFFSET_CR(r3)
 
-	# __setjmp returns 0
+	# __context_save returns 0
 	li r3, 0
 	blr
-FUNCTION_END(__setjmp)
+FUNCTION_END(__context_save)
 
-FUNCTION_BEGIN(__longjmp)
+FUNCTION_BEGIN(__context_restore)
 	lwz sp, __CONTEXT_OFFSET_SP(r3)
 	lwz r2, __CONTEXT_OFFSET_TLS(r3)
@@ -96,6 +96,6 @@
 	mtlr r5
 
-	# __longjmp returns second argument
+	# __context_restore returns second argument
 	mr r3, r4
 	blr
-FUNCTION_END(__longjmp)
+FUNCTION_END(__context_restore)
Index: uspace/lib/c/arch/riscv64/src/fibril.c
===================================================================
--- uspace/lib/c/arch/riscv64/src/fibril.c	(revision a5c78a18893be91b59c28590353ad8d90673105a)
+++ uspace/lib/c/arch/riscv64/src/fibril.c	(revision 08e103d46af516da7dcb378db322a88e2c4aca0b)
@@ -33,10 +33,10 @@
 #include <stdbool.h>
 
-int __setjmp(__context_t *ctx)
+int __context_save(__context_t *ctx)
 {
 	return 0;
 }
 
-void __longjmp(__context_t *ctx, int ret)
+void __context_restore(__context_t *ctx, int ret)
 {
 	while (true)
Index: uspace/lib/c/arch/sparc64/src/fibril.S
===================================================================
--- uspace/lib/c/arch/sparc64/src/fibril.S	(revision a5c78a18893be91b59c28590353ad8d90673105a)
+++ uspace/lib/c/arch/sparc64/src/fibril.S	(revision 08e103d46af516da7dcb378db322a88e2c4aca0b)
@@ -32,5 +32,5 @@
 .text
 
-FUNCTION_BEGIN(__setjmp)
+FUNCTION_BEGIN(__context_save)
 	#
 	# We rely on the kernel to flush our active register windows to memory
@@ -57,8 +57,8 @@
 	stx %g7, [%o0 + __CONTEXT_OFFSET_TP]
 	retl
-	mov 0, %o0		! __setjmp returns 0
-FUNCTION_END(__setjmp)
+	mov 0, %o0		! __context_save returns 0
+FUNCTION_END(__context_save)
 
-FUNCTION_BEGIN(__longjmp)
+FUNCTION_BEGIN(__context_restore)
 	#
 	# Flush all active windows.
@@ -89,4 +89,4 @@
 	ldx [%o0 + __CONTEXT_OFFSET_TP], %g7
 	retl
-	mov %o1, %o0	! __longjmp returns second argument
-FUNCTION_END(__longjmp)
+	mov %o1, %o0	! __context_restore returns second argument
+FUNCTION_END(__context_restore)