diff --git a/runtime/parsec/control/runtime_async.c b/runtime/parsec/control/runtime_async.c
index 38ed05224073613495658d2484fda741522d489d..43981f9d6aaac30970cd3338e4ba2b2b42685280 100644
--- a/runtime/parsec/control/runtime_async.c
+++ b/runtime/parsec/control/runtime_async.c
@@ -7,6 +7,10 @@
  * @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
  *                      Univ. Bordeaux. All rights reserved.
  *
+ ***
+ *
+ * @brief Chameleon PaRSEC asynchronous routines
+ *
  * @version 1.0.0
  * @author Reazul Hoque
  * @author Mathieu Faverge
diff --git a/runtime/parsec/control/runtime_context.c b/runtime/parsec/control/runtime_context.c
index 8e3b7cc2de9eeb973dff5b70a8d5c26ac8dd36d1..4a66c19f31c9d63aa930f8d0914bee4af38f33e1 100644
--- a/runtime/parsec/control/runtime_context.c
+++ b/runtime/parsec/control/runtime_context.c
@@ -7,6 +7,10 @@
  * @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
  *                      Univ. Bordeaux. All rights reserved.
  *
+ ***
+ *
+ * @brief Chameleon PaRSEC context routines
+ *
  * @version 1.0.0
  * @author Reazul Hoque
  * @author Mathieu Faverge
diff --git a/runtime/parsec/control/runtime_control.c b/runtime/parsec/control/runtime_control.c
index c5ca9d871b965c67259223ed546d963bdc93449b..95eeb3701c162b69ebe26569739c871c6323d40f 100644
--- a/runtime/parsec/control/runtime_control.c
+++ b/runtime/parsec/control/runtime_control.c
@@ -7,6 +7,10 @@
  * @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
  *                      Univ. Bordeaux. All rights reserved.
  *
+ ***
+ *
+ * @brief Chameleon PaRSEC control routines
+ *
  * @version 1.0.0
  * @author Reazul Hoque
  * @author Mathieu Faverge
diff --git a/runtime/parsec/control/runtime_descriptor.c b/runtime/parsec/control/runtime_descriptor.c
index b3f66b3791e2acf1c2057b773610a16e434a62da..6aa19fbb09d56d5c7780b629c5deee8b345c42c7 100644
--- a/runtime/parsec/control/runtime_descriptor.c
+++ b/runtime/parsec/control/runtime_descriptor.c
@@ -7,6 +7,10 @@
  * @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
  *                      Univ. Bordeaux. All rights reserved.
  *
+ ***
+ *
+ * @brief Chameleon PaRSEC descriptor routines
+ *
  * @version 1.0.0
  * @author Reazul Hoque
  * @author Mathieu Faverge
diff --git a/runtime/parsec/control/runtime_options.c b/runtime/parsec/control/runtime_options.c
index 1894e8d1c0feb1e1c32a34d4e4dc607e26bbd42c..374e5d74f7d262ff0eb67f5d15a0dbed61565e65 100644
--- a/runtime/parsec/control/runtime_options.c
+++ b/runtime/parsec/control/runtime_options.c
@@ -7,6 +7,10 @@
  * @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
  *                      Univ. Bordeaux. All rights reserved.
  *
+ ***
+ *
+ * @brief Chameleon PaRSEC options routines
+ *
  * @version 1.0.0
  * @author Reazul Hoque
  * @author Mathieu Faverge
diff --git a/runtime/parsec/control/runtime_profiling.c b/runtime/parsec/control/runtime_profiling.c
index c45210934edb719ae9434d9b0fdade02c0b26f2f..8147e49eed76ad116793cb50d09abcdbdc635a56 100644
--- a/runtime/parsec/control/runtime_profiling.c
+++ b/runtime/parsec/control/runtime_profiling.c
@@ -7,6 +7,10 @@
  * @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
  *                      Univ. Bordeaux. All rights reserved.
  *
+ ***
+ *
+ * @brief Chameleon PaRSEC profiling routines
+ *
  * @version 1.0.0
  * @author Reazul Hoque
  * @author Mathieu Faverge
diff --git a/runtime/parsec/control/runtime_zlocality.c b/runtime/parsec/control/runtime_zlocality.c
index 05ae71d8669e2bdf24be1b2e136859a7aceceff1..71ac488ba3d9113a470ada698d6072b1b6876db3 100644
--- a/runtime/parsec/control/runtime_zlocality.c
+++ b/runtime/parsec/control/runtime_zlocality.c
@@ -7,6 +7,10 @@
  * @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
  *                      Univ. Bordeaux. All rights reserved.
  *
+ ***
+ *
+ * @brief Chameleon PaRSEC MORSE_Complex64_t kernel locality management
+ *
  * @version 1.0.0
  * @author Reazul Hoque
  * @author Mathieu Faverge
diff --git a/runtime/parsec/control/runtime_zprofiling.c b/runtime/parsec/control/runtime_zprofiling.c
index 0d23cc456d17c71fdea147b0334ffd36174ccf1b..42db58aedcc584b2dcc3a965b8bdc0fa8c7f7223 100644
--- a/runtime/parsec/control/runtime_zprofiling.c
+++ b/runtime/parsec/control/runtime_zprofiling.c
@@ -7,6 +7,10 @@
  * @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
  *                      Univ. Bordeaux. All rights reserved.
  *
+ ***
+ *
+ * @brief Chameleon PaRSEC MORSE_Complex64_t kernel progiling
+ *
  * @version 1.0.0
  * @author Reazul Hoque
  * @author Mathieu Faverge
diff --git a/runtime/parsec/include/chameleon_parsec.h b/runtime/parsec/include/chameleon_parsec.h
index 165f23c19931c2c4287c7be3f91b910f118c87e8..367bdde50377b58132f46b3d83f9ffffffcd1adf 100644
--- a/runtime/parsec/include/chameleon_parsec.h
+++ b/runtime/parsec/include/chameleon_parsec.h
@@ -7,7 +7,14 @@
  * @copyright 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
  *                      Univ. Bordeaux. All rights reserved.
  *
+ ***
+ *
+ * @brief Chameleon PaRSEC runtime header
+ *
  * @version 1.0.0
+ * @author Mathieu Faverge
+ * @author Reazul Hoque
+ * @date 2018-02-06
  *
  **/
 #ifndef _MORSE_PARSEC_H_
diff --git a/runtime/quark/control/runtime_async.c b/runtime/quark/control/runtime_async.c
index d1b831009fcf981adcfc49a068963b6db1aabc63..1c1247c5e4fdea065509903ea8ea84c5b04ab817 100644
--- a/runtime/quark/control/runtime_async.c
+++ b/runtime/quark/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 async routines
+ ***
+ *
+ * @brief Chameleon Quark asynchronous routines
  *
  * @version 1.0.0
  * @author Jakub Kurzak
diff --git a/runtime/quark/control/runtime_context.c b/runtime/quark/control/runtime_context.c
index a434cd8295dee5a59fcea9e586c5db8cd660a079..cb552f122ce2c49dba814e8f8c1ad07b60e46678 100644
--- a/runtime/quark/control/runtime_context.c
+++ b/runtime/quark/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 Quark context routines
  *
  * @version 1.0.0
  * @author Vijay Joshi
diff --git a/runtime/quark/control/runtime_control.c b/runtime/quark/control/runtime_control.c
index 8c7616ae3c3658bbfb2d1b311252b9f2be11990b..3f541cc1b20b1ce8e529fbc77dd755f8a3495542 100644
--- a/runtime/quark/control/runtime_control.c
+++ b/runtime/quark/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 Quark control routines
  *
  * @version 1.0.0
  * @author Vijay Joshi
diff --git a/runtime/quark/control/runtime_descriptor.c b/runtime/quark/control/runtime_descriptor.c
index bb294f3a40f2ea177e8aa6233f72b92c738c7d32..7dfddf61e878e022f4b71f06d44cb7101d4fc4f4 100644
--- a/runtime/quark/control/runtime_descriptor.c
+++ b/runtime/quark/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 Quark descriptor routines
  *
  * @version 1.0.0
  * @author Vijay Joshi
diff --git a/runtime/quark/control/runtime_options.c b/runtime/quark/control/runtime_options.c
index 4976b1515a718e11b30ed707ba084891a51f1057..88f7ba73ecb3c304e253c700468dc8c32c4f74bd 100644
--- a/runtime/quark/control/runtime_options.c
+++ b/runtime/quark/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 Quark options routines
  *
  * @version 1.0.0
  * @author Vijay Joshi
diff --git a/runtime/quark/control/runtime_profiling.c b/runtime/quark/control/runtime_profiling.c
index da76630430e433e5659dbbeb4ac7543cde021967..ab4e5e89488b0345701a2007e1ff884bd8304e77 100644
--- a/runtime/quark/control/runtime_profiling.c
+++ b/runtime/quark/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 Quark profiling routines
  *
  * @version 1.0.0
  * @author Vijay Joshi
diff --git a/runtime/quark/control/runtime_zlocality.c b/runtime/quark/control/runtime_zlocality.c
index 84c4cdaba72bd6322f3856008706b8ea6871d66a..38a92b78f942e7605b4d66ada43e704594e1a7a5 100644
--- a/runtime/quark/control/runtime_zlocality.c
+++ b/runtime/quark/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 Quark MORSE_Complex64_t kernel locality management
  *
  * @version 1.0.0
  * @author Vijay Joshi
diff --git a/runtime/quark/control/runtime_zprofiling.c b/runtime/quark/control/runtime_zprofiling.c
index 8f3a590a1348303a3f354212a47e5f92bba943ea..e59ba01ca51cf7d8669442806685b790c686903d 100644
--- a/runtime/quark/control/runtime_zprofiling.c
+++ b/runtime/quark/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 Quark MORSE_Complex64_t kernel progiling
  *
  * @version 1.0.0
  * @author Mathieu Faverge
diff --git a/runtime/quark/include/chameleon_quark.h b/runtime/quark/include/chameleon_quark.h
index d819c34131ef3641f0e44a2c658c61c77bc73187..90c221218ed69e173edec9dad4502c3b74af7ec2 100644
--- a/runtime/quark/include/chameleon_quark.h
+++ b/runtime/quark/include/chameleon_quark.h
@@ -9,7 +9,7 @@
  *
  ***
  *
- * @brief Chameleon codelets kernel
+ * @brief Chameleon Quark runtime main header
  *
  * @version 1.0.0
  * @author Mathieu Faverge
diff --git a/runtime/quark/include/core_blas_dag.h b/runtime/quark/include/core_blas_dag.h
index d9e0bb0c1f128235952c5754ba6e70c7be83b62f..a375eaa192ccfd64ddc84da0d9a09aafbe8883fe 100644
--- a/runtime/quark/include/core_blas_dag.h
+++ b/runtime/quark/include/core_blas_dag.h
@@ -9,7 +9,7 @@
  *
  ***
  *
- * @brief Chameleon auxiliary routines
+ * @brief Chameleon Quark DAG generation header
  *
  * @version 1.0.0
  * @author Mathieu Faverge