Index: src/libcfa/concurrency/coroutine
===================================================================
--- src/libcfa/concurrency/coroutine	(revision ecc7752874f9978583bc6f0688400c001f2859ef)
+++ src/libcfa/concurrency/coroutine	(revision 0ea1b65137b1cab670e971a4da6728f9daff37e3)
@@ -6,5 +6,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// coroutines --
+// coroutine --
 //
 // Author           : Thierry Delisle
Index: src/libcfa/concurrency/coroutine.c
===================================================================
--- src/libcfa/concurrency/coroutine.c	(revision ecc7752874f9978583bc6f0688400c001f2859ef)
+++ src/libcfa/concurrency/coroutine.c	(revision 0ea1b65137b1cab670e971a4da6728f9daff37e3)
@@ -6,5 +6,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// coroutines.c --
+// coroutine.c --
 //
 // Author           : Thierry Delisle
@@ -15,5 +15,5 @@
 //
 
-#include "coroutines"
+#include "coroutine"
 
 extern "C" {
Index: src/libcfa/concurrency/kernel
===================================================================
--- src/libcfa/concurrency/kernel	(revision ecc7752874f9978583bc6f0688400c001f2859ef)
+++ src/libcfa/concurrency/kernel	(revision 0ea1b65137b1cab670e971a4da6728f9daff37e3)
@@ -6,5 +6,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// threads --
+// kernel --
 //
 // Author           : Thierry Delisle
Index: src/libcfa/concurrency/kernel_private.h
===================================================================
--- src/libcfa/concurrency/kernel_private.h	(revision ecc7752874f9978583bc6f0688400c001f2859ef)
+++ src/libcfa/concurrency/kernel_private.h	(revision 0ea1b65137b1cab670e971a4da6728f9daff37e3)
@@ -6,5 +6,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// threads --
+// kernel_private.h --
 //
 // Author           : Thierry Delisle
@@ -19,5 +19,5 @@
 
 #include "kernel"
-#include "threads"
+#include "thread"
 
 //-----------------------------------------------------------------------------
Index: src/libcfa/concurrency/thread
===================================================================
--- src/libcfa/concurrency/thread	(revision ecc7752874f9978583bc6f0688400c001f2859ef)
+++ src/libcfa/concurrency/thread	(revision 0ea1b65137b1cab670e971a4da6728f9daff37e3)
@@ -6,5 +6,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// threads --
+// thread --
 //
 // Author           : Thierry Delisle
@@ -21,5 +21,5 @@
 #include "invoke.h"
 
-#include "coroutines"
+#include "coroutine"
 
 //-----------------------------------------------------------------------------
Index: src/libcfa/concurrency/thread.c
===================================================================
--- src/libcfa/concurrency/thread.c	(revision ecc7752874f9978583bc6f0688400c001f2859ef)
+++ src/libcfa/concurrency/thread.c	(revision 0ea1b65137b1cab670e971a4da6728f9daff37e3)
@@ -6,5 +6,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// threads.c --
+// thread.c --
 //
 // Author           : Thierry Delisle
@@ -15,5 +15,5 @@
 //
 
-#include "threads"
+#include "thread"
 
 #include "kernel_private.h"