diff --git a/kernel/system.c b/kernel/system.c
index 59f79b4a0..a413bac82 100755
--- a/kernel/system.c
+++ b/kernel/system.c
@@ -21,7 +21,7 @@
  *   get_randomness:	accumulate randomness in a buffer
  *
  * Changes:
- *   Aug 04, 2005   check if kernel call is allowed  (Jorrit N. Herder)
+ *   Aug 04, 2005   check if system call is allowed  (Jorrit N. Herder)
  *   Jul 20, 2005   send signal to services with message  (Jorrit N. Herder) 
  *   Jan 15, 2005   new, generalized virtual copy function  (Jorrit N. Herder)
  *   Oct 10, 2004   dispatch system calls from call vector  (Jorrit N. Herder)
@@ -84,7 +84,7 @@ PUBLIC void sys_task()
 	  result = EBADREQUEST;			/* illegal message type */
       } 
       else {
-          result = (*call_vec[call_nr])(&m);	/* handle the kernel call */
+          result = (*call_vec[call_nr])(&m);	/* handle the system call */
       }
 
       /* Send a reply, unless inhibited by a handler function. Use the kernel
diff --git a/kernel/system.h b/kernel/system.h
index c2a25035d..4c884b6d8 100644
--- a/kernel/system.h
+++ b/kernel/system.h
@@ -2,7 +2,7 @@
  * are undefined to do_unused if the kernel call is not enabled in config.h. 
  * The implementation is contained in src/kernel/system/.  
  *
- * The system library allows to access system services by doing a system call.
+ * The system library allows to access system services by doing a kernel call.
  * System calls are transformed into request messages to the SYS task that is 
  * responsible for handling the call. By convention, sys_call() is transformed 
  * into a message with type SYS_CALL that is handled in a function do_call(). 
@@ -11,7 +11,7 @@
  *   Jul 30, 2005   created SYS_INT86 to support BIOS driver  (Philip Homburg) 
  *   Jul 13, 2005   created SYS_PRIVCTL to manage services  (Jorrit N. Herder) 
  *   Jul 09, 2005   updated SYS_KILL to signal services  (Jorrit N. Herder) 
- *   Jun 21, 2005   created SYS_NICE for nice(2) system call  (Ben J. Gras)
+ *   Jun 21, 2005   created SYS_NICE for nice(2) kernel call  (Ben J. Gras)
  *   Jun 21, 2005   created SYS_MEMSET to speed up exec(2)  (Ben J. Gras)
  *   Apr 12, 2005   updated SYS_VCOPY for virtual_copy()  (Jorrit N. Herder)
  *   Jan 20, 2005   updated SYS_COPY for virtual_copy()  (Jorrit N. Herder)