diff --git a/headers/private/kernel/arch/x86/arch_kernel.h b/headers/private/kernel/arch/x86/arch_kernel.h
index efd914f6d6..e90175a685 100644
--- a/headers/private/kernel/arch/x86/arch_kernel.h
+++ b/headers/private/kernel/arch/x86/arch_kernel.h
@@ -34,7 +34,7 @@
 // whole kernel address space is the top 512GB of the address space.
 #define KERNEL_BASE				0xffffff0000000000
 #define KERNEL_SIZE				0x10000000000
-#define KERNEL_TOP  			(KERNEL_BASE + (KERNEL_SIZE - 1))
+#define KERNEL_TOP				(KERNEL_BASE + (KERNEL_SIZE - 1))
 #define KERNEL_LOAD_BASE		0xffffffff80000000
 
 // Kernel physical memory map area.
diff --git a/headers/private/kernel/lock.h b/headers/private/kernel/lock.h
index 92d0dda24a..256b2e66fc 100644
--- a/headers/private/kernel/lock.h
+++ b/headers/private/kernel/lock.h
@@ -154,12 +154,11 @@ extern void mutex_destroy(mutex* lock);
 extern void mutex_transfer_lock(mutex* lock, thread_id thread);
 extern status_t mutex_switch_lock(mutex* from, mutex* to);
 	// Unlocks "from" and locks "to" such that unlocking and starting to wait
-	// for the lock is atomically. I.e. if "from" guards the object "to" belongs
+	// for the lock is atomic. I.e. if "from" guards the object "to" belongs
 	// to, the operation is safe as long as "from" is held while destroying
 	// "to".
 extern status_t mutex_switch_from_read_lock(rw_lock* from, mutex* to);
-	// Like mutex_switch_lock(), just for a switching from a read-locked
-	// rw_lock.
+	// Like mutex_switch_lock(), just for switching from a read-locked rw_lock.
 
 
 // implementation private:
diff --git a/headers/private/system/vm_defs.h b/headers/private/system/vm_defs.h
index eefa895e60..a8988545f8 100644
--- a/headers/private/system/vm_defs.h
+++ b/headers/private/system/vm_defs.h
@@ -17,7 +17,7 @@
 	(B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA | B_KERNEL_EXECUTE_AREA \
 	| B_KERNEL_STACK_AREA)
 
-// TODO: These aren't really a protection flags, but since the "protection"
+// TODO: These aren't really protection flags, but since the "protection"
 //	field is the only flag field, we currently use it for this.
 //	A cleaner approach would be appreciated - maybe just an official generic
 //	flags region in the protection field.
diff --git a/src/system/kernel/arch/x86/paging/X86VMTranslationMap.h b/src/system/kernel/arch/x86/paging/X86VMTranslationMap.h
index a07b314b69..bf632151b5 100644
--- a/src/system/kernel/arch/x86/paging/X86VMTranslationMap.h
+++ b/src/system/kernel/arch/x86/paging/X86VMTranslationMap.h
@@ -27,7 +27,7 @@ struct X86VMTranslationMap : VMTranslationMap {
 
 			status_t			Init(bool kernel);
 
-	virtual	bool 				Lock() final;
+	virtual	bool				Lock() final;
 	virtual	void				Unlock() final;
 
 	virtual	addr_t				MappedSize() const final;
diff --git a/src/system/kernel/main.cpp b/src/system/kernel/main.cpp
index 2071f6757f..813f508b96 100644
--- a/src/system/kernel/main.cpp
+++ b/src/system/kernel/main.cpp
@@ -8,7 +8,7 @@
  */
 
 
-/*! This is main - initializes the kernel and launches the Bootscript */
+/*! This is main - initializes the kernel and launches the launch_daemon */
 
 
 #include <string.h>
diff --git a/src/system/kernel/vm/VMAnonymousCache.cpp b/src/system/kernel/vm/VMAnonymousCache.cpp
index 5baad4c2d0..c043ed4923 100644
--- a/src/system/kernel/vm/VMAnonymousCache.cpp
+++ b/src/system/kernel/vm/VMAnonymousCache.cpp
@@ -958,7 +958,7 @@ VMAnonymousCache::Merge(VMCache* _source)
 {
 	VMAnonymousCache* source = dynamic_cast<VMAnonymousCache*>(_source);
 	if (source == NULL) {
-		panic("VMAnonymousCache::MergeStore(): merge with incompatible cache "
+		panic("VMAnonymousCache::Merge(): merge with incompatible cache "
 			"%p requested", _source);
 		return;
 	}
diff --git a/src/system/kernel/vm/VMUserAddressSpace.cpp b/src/system/kernel/vm/VMUserAddressSpace.cpp
index 4e302bc387..d0cf3446f5 100644
--- a/src/system/kernel/vm/VMUserAddressSpace.cpp
+++ b/src/system/kernel/vm/VMUserAddressSpace.cpp
@@ -347,7 +347,7 @@ VMUserAddressSpace::UnreserveAddressRange(addr_t address, size_t size,
 	// check to see if this address space has entered DELETE state
 	if (fDeleting) {
 		// okay, someone is trying to delete this address space now, so we can't
-		// insert the area, so back out
+		// remove the area, so back out
 		return B_BAD_TEAM_ID;
 	}