diff --git a/runtime/starpu/control/runtime_async.c b/runtime/starpu/control/runtime_async.c
index ce9c39deb0a554222378181e822f46d1d2a069d8..7c58b10766b270ff901c5fcbf39d049017db6180 100644
--- a/runtime/starpu/control/runtime_async.c
+++ b/runtime/starpu/control/runtime_async.c
@@ -7,7 +7,9 @@
  * @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
  *                      Univ. Bordeaux. All rights reserved.
  *
- * @brief Chameleon auxiliary routines
+ ***
+ *
+ * @brief Chameleon StarPU asynchronous routines
  *
  * @version 1.0.0
  * @author Mathieu Faverge
diff --git a/runtime/starpu/control/runtime_context.c b/runtime/starpu/control/runtime_context.c
index 294bf7956912a5f8252208821eabef3f45e0a687..c4578327bbcb5e9de7c8d330ddb17469b7a603b4 100644
--- a/runtime/starpu/control/runtime_context.c
+++ b/runtime/starpu/control/runtime_context.c
@@ -7,7 +7,9 @@
  * @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
  *                      Univ. Bordeaux. All rights reserved.
  *
- * @brief Chameleon auxiliary routines
+ ***
+ *
+ * @brief Chameleon StarPU context routines
  *
  * @version 1.0.0
  * @author Cedric Augonnet
diff --git a/runtime/starpu/control/runtime_control.c b/runtime/starpu/control/runtime_control.c
index 293752c4e2504539afc4d808d9e99fc6e0407fda..e8a8accd95535a03ed5a3eb6ff84f19cbf9cf1c0 100644
--- a/runtime/starpu/control/runtime_control.c
+++ b/runtime/starpu/control/runtime_control.c
@@ -7,7 +7,9 @@
  * @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
  *                      Univ. Bordeaux. All rights reserved.
  *
- * @brief Chameleon auxiliary routines
+ ***
+ *
+ * @brief Chameleon StarPU control routines
  *
  * @version 1.0.0
  * @author Mathieu Faverge
diff --git a/runtime/starpu/control/runtime_descriptor.c b/runtime/starpu/control/runtime_descriptor.c
index 391e263802a00579482c068a76d6c273f3fef70b..b99de9935b67f807a5e0dbd39c29719ecef3f0a3 100644
--- a/runtime/starpu/control/runtime_descriptor.c
+++ b/runtime/starpu/control/runtime_descriptor.c
@@ -7,7 +7,9 @@
  * @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
  *                      Univ. Bordeaux. All rights reserved.
  *
- * @brief Chameleon auxiliary routines
+ ***
+ *
+ * @brief Chameleon StarPU descriptor routines
  *
  * @version 1.0.0
  * @author Cedric Augonnet
diff --git a/runtime/starpu/control/runtime_options.c b/runtime/starpu/control/runtime_options.c
index a70cc8468b3bffe59228d248588a901416804dbe..8e341df71e532a559d5b03eb93fcc1b71299f19a 100644
--- a/runtime/starpu/control/runtime_options.c
+++ b/runtime/starpu/control/runtime_options.c
@@ -7,7 +7,9 @@
  * @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
  *                      Univ. Bordeaux. All rights reserved.
  *
- * @brief Chameleon auxiliary routines
+ ***
+ *
+ * @brief Chameleon StarPU options routines
  *
  * @version 1.0.0
  * @author Cedric Augonnet
diff --git a/runtime/starpu/control/runtime_profiling.c b/runtime/starpu/control/runtime_profiling.c
index 6b0b191a9c6eb5d8541871f36d4dfd82d370c2c9..ef7f266afcf04d58ad02ea5364adec996539639f 100644
--- a/runtime/starpu/control/runtime_profiling.c
+++ b/runtime/starpu/control/runtime_profiling.c
@@ -7,7 +7,9 @@
  * @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
  *                      Univ. Bordeaux. All rights reserved.
  *
- * @brief Chameleon auxiliary routines
+ ***
+ *
+ * @brief Chameleon StarPU profiling routines
  *
  * @version 1.0.0
  * @author Cedric Augonnet
diff --git a/runtime/starpu/control/runtime_workspace.c b/runtime/starpu/control/runtime_workspace.c
index 02a21c0cf41bc9c900ad74464063ca337a1fb531..ae15829b0d61091e295b7ca86efe2aa317232727 100644
--- a/runtime/starpu/control/runtime_workspace.c
+++ b/runtime/starpu/control/runtime_workspace.c
@@ -7,7 +7,9 @@
  * @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
  *                      Univ. Bordeaux. All rights reserved.
  *
- * @brief Chameleon codelets kernel
+ ***
+ *
+ * @brief Chameleon StarPU workspaces routines
  *
  * @version 1.0.0
  * @author Cedric Augonnet
diff --git a/runtime/starpu/control/runtime_zlocality.c b/runtime/starpu/control/runtime_zlocality.c
index a66da2aa82af4ba89347016d1541a7ca227545c3..30bd9be56713ee6ceae85d6c914c7c6a0937d7bb 100644
--- a/runtime/starpu/control/runtime_zlocality.c
+++ b/runtime/starpu/control/runtime_zlocality.c
@@ -7,7 +7,9 @@
  * @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
  *                      Univ. Bordeaux. All rights reserved.
  *
- * @brief Chameleon codelets kernel
+ ***
+ *
+ * @brief Chameleon StarPU MORSE_Complex64_t kernel locality management
  *
  * @version 1.0.0
  * @author Cedric Augonnet
diff --git a/runtime/starpu/control/runtime_zprofiling.c b/runtime/starpu/control/runtime_zprofiling.c
index 474de8c377b324e9406a00afd773cefb664dab49..10879431e21e49946bd6695c277fd28fed4c813c 100644
--- a/runtime/starpu/control/runtime_zprofiling.c
+++ b/runtime/starpu/control/runtime_zprofiling.c
@@ -7,7 +7,9 @@
  * @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
  *                      Univ. Bordeaux. All rights reserved.
  *
- * @brief Chameleon codelets kernel
+ ***
+ *
+ * @brief Chameleon StarPU MORSE_Complex64_t kernel progiling
  *
  * @version 1.0.0
  * @author Cedric Augonnet
diff --git a/runtime/starpu/include/chameleon_starpu.h.in b/runtime/starpu/include/chameleon_starpu.h.in
index 0191493b667d0662cc5d88705e85f8089a95dfbe..027118ac7cf038f68a82bc4c898e1ae5a00ffa04 100644
--- a/runtime/starpu/include/chameleon_starpu.h.in
+++ b/runtime/starpu/include/chameleon_starpu.h.in
@@ -9,7 +9,7 @@
  *
  ***
  *
- * @brief Chameleon codelets kernel
+ * @brief Chameleon StarPU runtime header
  *
  * @version 1.0.0
  * @author Mathieu Faverge
diff --git a/runtime/starpu/include/runtime_codelet_profile.h b/runtime/starpu/include/runtime_codelet_profile.h
index c7e809b59c850c2c65df42df71bb4746476f4f9d..78e56dd39f138f2658f879fafbe84c1fc243d66c 100644
--- a/runtime/starpu/include/runtime_codelet_profile.h
+++ b/runtime/starpu/include/runtime_codelet_profile.h
@@ -9,7 +9,7 @@
  *
  ***
  *
- * @brief Chameleon codelets kernel
+ * @brief Chameleon StarPU codelet profiling header
  *
  * @version 1.0.0
  * @author Cedric Augonnet
diff --git a/runtime/starpu/include/runtime_codelet_z.h b/runtime/starpu/include/runtime_codelet_z.h
index 789516496639e23a02266417f78273237698353f..0226ae60a384ec0814a4a198a9456bdada59fef1 100644
--- a/runtime/starpu/include/runtime_codelet_z.h
+++ b/runtime/starpu/include/runtime_codelet_z.h
@@ -9,7 +9,7 @@
  *
  ***
  *
- * @brief Chameleon codelets kernel
+ * @brief Chameleon StarPU MORSE_Complex64_t codelets header
  *
  * @version 1.0.0
  * @author Cedric Augonnet
diff --git a/runtime/starpu/include/runtime_codelets.h b/runtime/starpu/include/runtime_codelets.h
index defe1a8afa69af569d7e91aa79bbf0e4112084df..ee360f337b00d45fe01526ded4d5a351ab8eebfa 100644
--- a/runtime/starpu/include/runtime_codelets.h
+++ b/runtime/starpu/include/runtime_codelets.h
@@ -9,7 +9,7 @@
  *
  ***
  *
- * @brief Chameleon codelets kernel
+ * @brief Chameleon StarPU codelets main header
  *
  * @version 1.0.0
  * @author Cedric Augonnet
diff --git a/runtime/starpu/include/runtime_profiling.h b/runtime/starpu/include/runtime_profiling.h
index 02fa826ea05e2d7d06b756e14d98b296cae39ac8..b60453bb79846975a2c0983a10ed659d41593a7b 100644
--- a/runtime/starpu/include/runtime_profiling.h
+++ b/runtime/starpu/include/runtime_profiling.h
@@ -9,7 +9,7 @@
  *
  ***
  *
- * @brief Chameleon codelets kernel
+ * @brief Chameleon StarPU profiling and kernel locality header
  *
  * @version 1.0.0
  * @author Mathieu Faverge
diff --git a/runtime/starpu/include/runtime_workspace.h b/runtime/starpu/include/runtime_workspace.h
index 30895801c0f1f2ca4a0300776b877f14b7f5d525..8c3efcd39d00b9dd93a8e63224a96dd04fcba540 100644
--- a/runtime/starpu/include/runtime_workspace.h
+++ b/runtime/starpu/include/runtime_workspace.h
@@ -9,7 +9,7 @@
  *
  ***
  *
- * @brief Chameleon codelets kernel
+ * @brief Chameleon StarPU workspace header
  *
  * @version 1.0.0
  * @author Cedric Augonnet