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 d5a89a3a3de1e754f1702111bb064b10ea5b097d)
@@ -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)