diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c
--- a/sys/arm/arm/pmap-v6.c
+++ b/sys/arm/arm/pmap-v6.c
@@ -2158,7 +2158,7 @@
  ***********************************************/
 
 /*
- *  Initialize the pmap for the swapper process.
+ *  Initialize the pmap for proc0.
  */
 void
 pmap_pinit0(pmap_t pmap)
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -2026,7 +2026,7 @@
 }
 
 /*
- * Initialize the pmap for the swapper process.
+ * Initialize the pmap for proc0.
  */
 static void
 __CONCAT(PMTYPE, pinit0)(pmap_t pmap)
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -1081,7 +1081,7 @@
 extern struct sx proctree_lock;
 extern struct mtx ppeers_lock;
 extern struct mtx procid_lock;
-extern struct proc proc0;		/* Process slot for swapper. */
+extern struct proc proc0;		/* Initial kernel process. */
 extern struct thread0_storage thread0_st;	/* Primary thread in proc0. */
 #define	thread0 (thread0_st.t0st_thread)
 extern struct vmspace vmspace0;		/* VM space for proc0. */
diff --git a/sys/sys/sleepqueue.h b/sys/sys/sleepqueue.h
--- a/sys/sys/sleepqueue.h
+++ b/sys/sys/sleepqueue.h
@@ -54,10 +54,7 @@
  * be removed from a specified sleep queue using the sleepq_remove()
  * function.  Note that the sleep queue chain must first be locked via
  * sleepq_lock() before calling sleepq_abort(), sleepq_broadcast(), or
- * sleepq_signal().  These routines each return a boolean that will be true
- * if at least one swapped-out thread was resumed.  In that case, the caller
- * is responsible for waking up the swapper by calling kick_proc0() after
- * releasing the sleep queue chain lock.
+ * sleepq_signal().
  *
  * Each thread allocates a sleep queue at thread creation via sleepq_alloc()
  * and releases it at thread destruction via sleepq_free().  Note that
diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c
--- a/sys/vm/vnode_pager.c
+++ b/sys/vm/vnode_pager.c
@@ -1264,7 +1264,7 @@
 	 * Force synchronous operation if we are extremely low on memory
 	 * to prevent a low-memory deadlock.  VOP operations often need to
 	 * allocate more memory to initiate the I/O ( i.e. do a BMAP
-	 * operation ).  The swapper handles the case by limiting the amount
+	 * operation ).  The swap pager handles the case by limiting the amount
 	 * of asynchronous I/O, but that sort of solution doesn't scale well
 	 * for the vnode pager without a lot of work.
 	 *