diff --git a/sys/arch/amd64/amd64/locore.S b/sys/arch/amd64/amd64/locore.S
index dd8056ed70f1..2cd860662293 100644
--- a/sys/arch/amd64/amd64/locore.S
+++ b/sys/arch/amd64/amd64/locore.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.16 2006/04/30 19:50:19 rjs Exp $	*/
+/*	$NetBSD: locore.S,v 1.17 2006/05/13 08:56:08 skrll Exp $	*/
 
 /*
  * Copyright-o-rama!
@@ -747,7 +747,7 @@ NENTRY(switch_error3)
 
 /*
  * int cpu_switch(struct lwp *)
- * Find a runnable process and switch to it.  Wait if necessary.  If the new
+ * Find a runnable lwp and switch to it.  Wait if necessary.  If the new
  * lwp is the same as the old one, we short-circuit the context save and
  * restore.
  */
@@ -776,9 +776,9 @@ ENTRY(cpu_switch)
 	 *
 	 * Registers:
 	 *   %rax - queue head, scratch, then zero
-	 *   %r8 - queue number
+	 *   %r8  - queue number
 	 *   %ecx - cached value of whichqs
-	 *   %rdx - next process in queue
+	 *   %rdx - next lwp in queue
 	 *   %r13 - old lwp
 	 *   %r12 - new lwp
 	 */
diff --git a/sys/arch/arm/arm32/cpuswitch.S b/sys/arch/arm/arm32/cpuswitch.S
index c73d9a2a2fe9..e51391705f5e 100644
--- a/sys/arch/arm/arm32/cpuswitch.S
+++ b/sys/arch/arm/arm32/cpuswitch.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpuswitch.S,v 1.43 2006/05/10 07:13:30 skrll Exp $	*/
+/*	$NetBSD: cpuswitch.S,v 1.44 2006/05/13 08:56:08 skrll Exp $	*/
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -281,10 +281,10 @@ ENTRY(cpu_switch)
 	ldr	r7, .Lcurlwp
 	ldr	r6, .Lcurpcb
 	mov	r2, #0x00000000
-	str	r2, [r7]		/* curproc = NULL */
+	str	r2, [r7]		/* curlwp = NULL */
 	str	r2, [r6]		/* curpcb = NULL */
 
-	/* stash the old proc while we call functions */
+	/* stash the old lwp while we call functions */
 	mov	r5, r0
 
 	/* First phase : find a new lwp */
@@ -303,7 +303,7 @@ ENTRY(cpu_switch)
 	teq	r3, #0x00000000
 	beq	_ASM_LABEL(idle)
 
-	/* put old proc back in r1 */
+	/* put old lwp back in r1 */
 	mov	r1, r5
 
 	/* rem: r1 = old lwp */
diff --git a/sys/arch/i386/i386/locore.S b/sys/arch/i386/i386/locore.S
index 8d12e99f9c5f..ef9920531eba 100644
--- a/sys/arch/i386/i386/locore.S
+++ b/sys/arch/i386/i386/locore.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.38 2006/04/12 13:48:52 jmmv Exp $	*/
+/*	$NetBSD: locore.S,v 1.39 2006/05/13 08:56:08 skrll Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2000, 2004 The NetBSD Foundation, Inc.
@@ -773,8 +773,8 @@ NENTRY(switch_error)
 
 /*
  * void cpu_switch(struct lwp *)
- * Find a runnable process and switch to it.  Wait if necessary.  If the new
- * process is the same as the old one, we short-circuit the context save and
+ * Find a runnable lwp and switch to it.  Wait if necessary.  If the new
+ * lwp is the same as the old one, we short-circuit the context save and
  * restore.
  *
  * Note that the stack frame layout is known to "struct switchframe"
diff --git a/sys/arch/m68k/m68k/switch_subr.s b/sys/arch/m68k/m68k/switch_subr.s
index 2da6c6547c85..70f17b935a3e 100644
--- a/sys/arch/m68k/m68k/switch_subr.s
+++ b/sys/arch/m68k/m68k/switch_subr.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: switch_subr.s,v 1.13 2005/12/11 12:17:59 christos Exp $	*/
+/*	$NetBSD: switch_subr.s,v 1.14 2006/05/13 08:56:08 skrll Exp $	*/
 
 /*
  * Copyright (c) 2001 The NetBSD Foundation.
@@ -114,8 +114,8 @@ ASBSS(nullpcb,SIZEOF_PCB)
 /*
  * void switch_lwp_exit(struct lwp *);
  *
- * At exit of a process, do a switch for the last time.
- * Switch to a safe stack and PCB, and select a new process to run.  The
+ * At exit of a lwp, do a switch for the last time.
+ * Switch to a safe stack and PCB, and select a new lwp to run.  The
  * old stack and u-area will be freed by the reaper.
  *
  * MUST BE CALLED AT SPLHIGH!
@@ -166,7 +166,7 @@ Lcpu_switch_badsw:
 	/*NOTREACHED*/
 
 /*
- * int cpu_switch(struct lwp *p)
+ * int cpu_switch(struct lwp *l)
  *
  * NOTE: With the new VM layout we now no longer know if an inactive
  * user's PTEs have been changed (formerly denoted by the SPTECHG p_flag
diff --git a/sys/arch/pc532/pc532/locore.s b/sys/arch/pc532/pc532/locore.s
index b7cf2f73f29e..8f156b5bd740 100644
--- a/sys/arch/pc532/pc532/locore.s
+++ b/sys/arch/pc532/pc532/locore.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.82 2006/05/12 06:05:23 simonb Exp $	*/
+/*	$NetBSD: locore.s,v 1.83 2006/05/13 08:56:08 skrll Exp $	*/
 
 /*
  * Copyright (c) 1993 Philip A. Nelson.
@@ -744,7 +744,7 @@ ENTRY_NOPROFILE(idle)
 
 /*
  * int cpu_switch(struct lwp *)
- * Find a runnable process and switch to it.  Wait if necessary.
+ * Find a runnable lwp and switch to it.  Wait if necessary.
  */
 KENTRY(cpu_switch, 4)
 	enter	[r3,r4,r5,r6,r7],0
@@ -753,7 +753,7 @@ KENTRY(cpu_switch, 4)
 
 	/*
 	 * Clear curlwp so that we don't accumulate system time while idle.
-	 * This also insures that schedcpu() will move the old process to
+	 * This also insures that schedcpu() will move the old lwp to
 	 * the correct queue if it happens to get called from the spl0()
 	 * below and changes the priority.  (See corresponding comment in
 	 * userret()).
@@ -774,14 +774,14 @@ KENTRY(cpu_switch, 4)
 #endif
 
 	/*
-	 * First phase: find new process.
+	 * First phase: find new lwp.
 	 *
 	 * Registers:
 	 *   r0 - queue number
 	 *   r1 - queue head
-	 *   r2 - new process
-	 *   r3 - next process in queue
-	 *   r4 - old process
+	 *   r2 - new lwp
+	 *   r3 - next lwp in queue
+	 *   r4 - old lwp
 	 */
 	ints_off
 
@@ -789,10 +789,10 @@ KENTRY(cpu_switch, 4)
 	ffsd	_C_LABEL(sched_whichqs)(pc),r0 /* find a full q */
 	bfs	0b			/* if none, idle */
 
-sw1:	/* Get the process and unlink it from the queue. */
+sw1:	/* Get the lwp and unlink it from the queue. */
 	addr	_C_LABEL(sched_qs)(pc)[r0:q],r1 /* address of qs entry! */
 
-	movd	L_FORW(r1),r2		/* unlink from front of process q */
+	movd	L_FORW(r1),r2		/* unlink from front of lwp q */
 #ifdef	DIAGNOSTIC
 	cmpd	r2,r1			/* linked to self (i.e. nothing queued? */
 	beq	_C_LABEL(switch_error)	/* not possible */
@@ -814,7 +814,7 @@ sw1:	/* Get the process and unlink it from the queue. */
 	bne	_C_LABEL(switch_error)	/* No; shouldn't be queued. */
 #endif
 
-	/* Isolate process. XXX Is this necessary? */
+	/* Isolate lwp. XXX Is this necessary? */
 	movqd	0,L_BACK(r2)
 
 switch_resume:
@@ -822,21 +822,21 @@ switch_resume:
 
 	/* p->p_cpu initialized in fork1() for single-processor */
 
-	/* Record new process. */
+	/* Record new lwp. */
 	movb	LSONPROC,L_STAT(r2)	/* l->l_stat = LSONPROC */
 	movd	r2,_C_LABEL(curlwp)(pc)
 
 	/* It's okay to take interrupts here. */
 	ints_on
 
-	/* Skip context switch if same process. */
+	/* Skip context switch if same lwp. */
 	movqd	0,r0			/* return "didn't switch" */
 	cmpd	r2,r4
 	beq	_ASM_LABEL(switch_return)
 
 	movqd	1,r0			/* return "did switch" */
 
-	/* If old process exited, don't bother. */
+	/* If old lwp exited, don't bother. */
 	cmpqd	0,r4
 	beq	_ASM_LABEL(switch_exited)
 
@@ -844,8 +844,8 @@ switch_resume:
 	 * Second phase: save old context.
 	 *
 	 * Registers:
-	 *   r4 - old process, then old pcb
-	 *   r2 - new process
+	 *   r4 - old lwp, then old pcb
+	 *   r2 - new lwp
 	 */
 
 	movd	L_ADDR(r4),r4
@@ -860,7 +860,7 @@ ASLOCAL(switch_exited)
 	 *
 	 * Registers:
 	 *   r1 - new pcb
-	 *   r2 - new process
+	 *   r2 - new lwp
 	 */
 
 	/* No interrupts while loading new state. */
diff --git a/sys/arch/xen/i386/locore.S b/sys/arch/xen/i386/locore.S
index e4d7ade496a5..4e8f33bfa768 100644
--- a/sys/arch/xen/i386/locore.S
+++ b/sys/arch/xen/i386/locore.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.15 2006/03/06 20:32:28 bouyer Exp $	*/
+/*	$NetBSD: locore.S,v 1.16 2006/05/13 08:56:08 skrll Exp $	*/
 /*	NetBSD: locore.S,v 1.31 2004/08/26 10:12:33 junyoung Exp	*/
 
 /*
@@ -618,8 +618,8 @@ NENTRY(switch_error)
 
 /*
  * void cpu_switch(struct lwp *)
- * Find a runnable process and switch to it.  Wait if necessary.  If the new
- * process is the same as the old one, we short-circuit the context save and
+ * Find a runnable lwp and switch to it.  Wait if necessary.  If the new
+ * lwp is the same as the old one, we short-circuit the context save and
  * restore.
  *
  * Note that the stack frame layout is known to "struct switchframe"
@@ -679,7 +679,7 @@ ENTRY(cpu_switch)
 	 */
 
 	pushl	%esi
-	call	_C_LABEL(pmap_deactivate2)	# pmap_deactivate(oldproc)
+	call	_C_LABEL(pmap_deactivate2)	# pmap_deactivate(oldlwp)
 	addl	$4,%esp
 
 	movl	L_ADDR(%esi),%esi
@@ -843,7 +843,7 @@ switch_resume:
 	 */
 
 	pushl	%esi
-	call	_C_LABEL(pmap_deactivate2)	# pmap_deactivate(oldproc)
+	call	_C_LABEL(pmap_deactivate2)	# pmap_deactivate(oldlwp)
 	addl	$4,%esp
 
 	movl	L_ADDR(%esi),%esi