diff --git a/runtime/starpu/CMakeLists.txt b/runtime/starpu/CMakeLists.txt
index 19b5522fb6cfdeb2b8e0903c210507f4fe988ab9..6063f65d3d81005dff3ec00446c110c610f60aeb 100644
--- a/runtime/starpu/CMakeLists.txt
+++ b/runtime/starpu/CMakeLists.txt
@@ -39,11 +39,11 @@ if ( CBLAS_FOUND AND LAPACKE_FOUND AND LAPACK_FOUND AND CUDA_FOUND AND CUDA_CUBL
     endif()
 endif()
 
-# Generate the magma headers for all possible precisions
-# ------------------------------------------------------
+# Generate headers for all possible precisions
+# --------------------------------------------
 set(RUNTIME_HDRS_GENERATED "")
 set(ZHDR
-  include/codelet_z.h
+  include/runtime_codelet_z.h
 )
 
 precisions_rules_py(RUNTIME_HDRS_GENERATED "${ZHDR}"
@@ -53,11 +53,11 @@ precisions_rules_py(RUNTIME_HDRS_GENERATED "${ZHDR}"
 # Define the list of headers
 # --------------------------
 set(RUNTIME_HDRS
-    include/codelet_profile.h
-    include/codelets.h
     include/morse_starpu.h
-    include/profiling.h
-    include/workspace.h
+    include/runtime_codelet_profile.h
+    include/runtime_codelets.h
+    include/runtime_profiling.h
+    include/runtime_workspace.h
     ${RUNTIME_HDRS_GENERATED}
     )
 
@@ -74,8 +74,8 @@ add_custom_target(runtime_starpu_include ALL SOURCES ${RUNTIME_HDRS})
 # -----------------------------------------------------
 set(RUNTIME_COMMON_GENERATED "")
 set(ZSRC
-    control/zprofiling.c
-    control/zlocality.c
+    control/runtime_zprofiling.c
+    control/runtime_zlocality.c
     )
 
 precisions_rules_py(RUNTIME_COMMON_GENERATED "${ZSRC}"
@@ -83,13 +83,13 @@ precisions_rules_py(RUNTIME_COMMON_GENERATED "${ZSRC}"
                     TARGETDIR "control")
 
 set(RUNTIME_COMMON
-    control/control.c
-    control/context.c
-    control/descriptor.c
-    control/async.c
-    control/options.c
-    control/profiling.c
-    control/workspace.c
+    control/runtime_control.c
+    control/runtime_context.c
+    control/runtime_descriptor.c
+    control/runtime_async.c
+    control/runtime_options.c
+    control/runtime_profiling.c
+    control/runtime_workspace.c
     codelets/codelet_dataflush.c
     ${RUNTIME_COMMON_GENERATED}
     )
@@ -98,7 +98,7 @@ set(flags_to_add "")
 foreach(_prec ${CHAMELEON_PRECISION})
     set(flags_to_add "${flags_to_add} -DPRECISION_${_prec}")
 endforeach()
-set_source_files_properties(control/profiling.c PROPERTIES COMPILE_FLAGS "${flags_to_add}")
+set_source_files_properties(control/runtime_profiling.c PROPERTIES COMPILE_FLAGS "${flags_to_add}")
 
 # Generate the morse sources for all possible precisions
 # ------------------------------------------------------
diff --git a/runtime/starpu/codelets/codelet_zasum.c b/runtime/starpu/codelets/codelet_zasum.c
index ca8a2969ec388ed5b4620308c490dc18922a676f..0d5cab3aed0c8c50adad3f1fbe25a2728381f3c9 100644
--- a/runtime/starpu/codelets/codelet_zasum.c
+++ b/runtime/starpu/codelets/codelet_zasum.c
@@ -25,7 +25,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 #include "runtime_z.h"
 
 void MORSE_TASK_dzasum(MORSE_option_t *options,
diff --git a/runtime/starpu/codelets/codelet_zaxpy.c b/runtime/starpu/codelets/codelet_zaxpy.c
index fb1d4510ba4e3cf112d63c7ebf669e96f4a5e463..ff26364b55c9d4e3398fef6502b926d166cf2209 100644
--- a/runtime/starpu/codelets/codelet_zaxpy.c
+++ b/runtime/starpu/codelets/codelet_zaxpy.c
@@ -23,7 +23,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 void MORSE_TASK_zaxpy(MORSE_option_t *options,
                       int M, MORSE_Complex64_t alpha,
diff --git a/runtime/starpu/codelets/codelet_zcallback.c b/runtime/starpu/codelets/codelet_zcallback.c
index d274326fea193eb6fe19541b1cd59a487e8c9c87..3fcf9d85b3e66bc7255a839057e246461a33b8d5 100644
--- a/runtime/starpu/codelets/codelet_zcallback.c
+++ b/runtime/starpu/codelets/codelet_zcallback.c
@@ -25,7 +25,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 CHAMELEON_CL_CB(zasum,         starpu_matrix_get_nx(task->handles[0]), starpu_matrix_get_ny(task->handles[0]), 0,                                      M*N);
 CHAMELEON_CL_CB(zaxpy,         starpu_matrix_get_nx(task->handles[0]), starpu_matrix_get_nx(task->handles[1]), 0,                                      M);
diff --git a/runtime/starpu/codelets/codelet_zgeadd.c b/runtime/starpu/codelets/codelet_zgeadd.c
index a1c3fda6550b038ae09ea8788c781eab85beb4a6..a6c8c30c66a559072df661ed8a0d2bfa7e5a72ab 100644
--- a/runtime/starpu/codelets/codelet_zgeadd.c
+++ b/runtime/starpu/codelets/codelet_zgeadd.c
@@ -27,7 +27,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zgelqt.c b/runtime/starpu/codelets/codelet_zgelqt.c
index 241f64f239340d9a5ce3f5f5b38554696a16d0fd..b0ee80073939e49a94fe5f5cb874b5f1d00ff064 100644
--- a/runtime/starpu/codelets/codelet_zgelqt.c
+++ b/runtime/starpu/codelets/codelet_zgelqt.c
@@ -30,7 +30,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zgemm.c b/runtime/starpu/codelets/codelet_zgemm.c
index 37059ac74daa7af116f95033374f9d88a8540287..e230c96f6573946fb563c1d98f35dd4e50a82c1d 100644
--- a/runtime/starpu/codelets/codelet_zgemm.c
+++ b/runtime/starpu/codelets/codelet_zgemm.c
@@ -29,7 +29,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zgeqrt.c b/runtime/starpu/codelets/codelet_zgeqrt.c
index 4ace1e060e0a2958d33dbb2c7de63a093058dcd4..e4b844e456e2520f6115d6efa31deaa92c26d33b 100644
--- a/runtime/starpu/codelets/codelet_zgeqrt.c
+++ b/runtime/starpu/codelets/codelet_zgeqrt.c
@@ -30,7 +30,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zgessm.c b/runtime/starpu/codelets/codelet_zgessm.c
index a0a000a003fef395124e03bca3b7a9b5998142d4..97a8ab7f8748819dfec0d81ab8281abdc9887bcf 100644
--- a/runtime/starpu/codelets/codelet_zgessm.c
+++ b/runtime/starpu/codelets/codelet_zgessm.c
@@ -31,7 +31,7 @@
 #include "coreblas/include/cblas.h"
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zgessq.c b/runtime/starpu/codelets/codelet_zgessq.c
index d30d904405dea077c8bec596f38c132c530f6c60..424da15fe025329271e6a3d178931d73054644d3 100644
--- a/runtime/starpu/codelets/codelet_zgessq.c
+++ b/runtime/starpu/codelets/codelet_zgessq.c
@@ -25,7 +25,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 void MORSE_TASK_zgessq( MORSE_option_t *options,
                         int m, int n,
diff --git a/runtime/starpu/codelets/codelet_zgetrf.c b/runtime/starpu/codelets/codelet_zgetrf.c
index ead284b2883323512faa7912c14a01c32de8e46e..7b0c9c7b563383d70975fcc9efa051bd81604e00 100644
--- a/runtime/starpu/codelets/codelet_zgetrf.c
+++ b/runtime/starpu/codelets/codelet_zgetrf.c
@@ -28,7 +28,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 void MORSE_TASK_zgetrf(MORSE_option_t *options,
                        int m, int n, int nb,
diff --git a/runtime/starpu/codelets/codelet_zgetrf_incpiv.c b/runtime/starpu/codelets/codelet_zgetrf_incpiv.c
index 9c46345ebf5a766be34a43ec0d3465e7be95e004..b7c944ce763c7d5136a579927929b717fc8e6493 100644
--- a/runtime/starpu/codelets/codelet_zgetrf_incpiv.c
+++ b/runtime/starpu/codelets/codelet_zgetrf_incpiv.c
@@ -30,7 +30,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zgetrf_nopiv.c b/runtime/starpu/codelets/codelet_zgetrf_nopiv.c
index a7bb8dc9deb345367a1079c99f0e4ef9cb132959..3db007331c8c2b78d93e2079cec72078c7796afa 100644
--- a/runtime/starpu/codelets/codelet_zgetrf_nopiv.c
+++ b/runtime/starpu/codelets/codelet_zgetrf_nopiv.c
@@ -26,7 +26,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zhemm.c b/runtime/starpu/codelets/codelet_zhemm.c
index 5f3083a61b578019273120c72026bd9abbff398f..4c700b698e266d7fb036c0b629257f237e7eadd1 100644
--- a/runtime/starpu/codelets/codelet_zhemm.c
+++ b/runtime/starpu/codelets/codelet_zhemm.c
@@ -29,7 +29,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zher2k.c b/runtime/starpu/codelets/codelet_zher2k.c
index 7d6b78750b36836772e39693d995ad7e0e013a3b..de2b0936730af86e0ac90a33f1e15e75dbfcfff2 100644
--- a/runtime/starpu/codelets/codelet_zher2k.c
+++ b/runtime/starpu/codelets/codelet_zher2k.c
@@ -29,7 +29,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zherk.c b/runtime/starpu/codelets/codelet_zherk.c
index 19897f4a2fee88f0773e9cb920fbf13e703909c6..5d3a7e301c06c2f2594e62e3e8499413e446a6ab 100644
--- a/runtime/starpu/codelets/codelet_zherk.c
+++ b/runtime/starpu/codelets/codelet_zherk.c
@@ -29,7 +29,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zhessq.c b/runtime/starpu/codelets/codelet_zhessq.c
index 7b34c96d1023a03839e8442c62c89b708ce2413a..6577b1e8f352f25b39ae75268c81d9850e82c3f5 100644
--- a/runtime/starpu/codelets/codelet_zhessq.c
+++ b/runtime/starpu/codelets/codelet_zhessq.c
@@ -25,7 +25,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 void MORSE_TASK_zhessq( MORSE_option_t *options,
                         MORSE_enum uplo, int n,
diff --git a/runtime/starpu/codelets/codelet_zlacpy.c b/runtime/starpu/codelets/codelet_zlacpy.c
index 9b95d2e4b7a704a922ebf99d0d82c65fb94a1f3a..31d3708463f7e02684bd558ec7d92bf0a305fb37 100644
--- a/runtime/starpu/codelets/codelet_zlacpy.c
+++ b/runtime/starpu/codelets/codelet_zlacpy.c
@@ -30,7 +30,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zlag2c.c b/runtime/starpu/codelets/codelet_zlag2c.c
index c39f1112c160d984ef209ab811fd7869b92131c8..b2941d7103e19e1847be5bb96389f85fa5db2f67 100644
--- a/runtime/starpu/codelets/codelet_zlag2c.c
+++ b/runtime/starpu/codelets/codelet_zlag2c.c
@@ -28,7 +28,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zlange.c b/runtime/starpu/codelets/codelet_zlange.c
index 026c2edfa93dd695e4b9c25b2b63421fa22ada46..c536dad4513d476faac2d1558ef56389ed2bd556 100644
--- a/runtime/starpu/codelets/codelet_zlange.c
+++ b/runtime/starpu/codelets/codelet_zlange.c
@@ -28,7 +28,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 void MORSE_TASK_zlange(MORSE_option_t *options,
                        MORSE_enum norm, int M, int N, int NB,
diff --git a/runtime/starpu/codelets/codelet_zlanhe.c b/runtime/starpu/codelets/codelet_zlanhe.c
index 0093edb21f1b19d7a8c406ddc366b273ac996c86..1539de98edd19a2fef83cbbe22d8f2ab9181bd0f 100644
--- a/runtime/starpu/codelets/codelet_zlanhe.c
+++ b/runtime/starpu/codelets/codelet_zlanhe.c
@@ -10,7 +10,7 @@
 
 /**
  *
- * @file codelet_zlange.c
+ * @file codelet_zlanhe.c
  *
  *  MORSE codelets kernel
  *  MORSE is a software package provided by Inria Bordeaux - Sud-Ouest, LaBRI,
@@ -27,7 +27,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 void MORSE_TASK_zlanhe(MORSE_option_t *options,
                        MORSE_enum norm, MORSE_enum uplo, int N, int NB,
diff --git a/runtime/starpu/codelets/codelet_zlansy.c b/runtime/starpu/codelets/codelet_zlansy.c
index a605bf2a5fd67f57c2629b69c338a5962bdfd8e1..09fc7d37e48694be974e110db283b5e46992af52 100644
--- a/runtime/starpu/codelets/codelet_zlansy.c
+++ b/runtime/starpu/codelets/codelet_zlansy.c
@@ -28,7 +28,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 void MORSE_TASK_zlansy(MORSE_option_t *options,
                        MORSE_enum norm, MORSE_enum uplo, int N, int NB,
diff --git a/runtime/starpu/codelets/codelet_zlantr.c b/runtime/starpu/codelets/codelet_zlantr.c
index da0e26c97a842a7ebffe86588c30f3ed66e5dc4d..34d6fe52d1189888946820b995486417a9e7cb3c 100644
--- a/runtime/starpu/codelets/codelet_zlantr.c
+++ b/runtime/starpu/codelets/codelet_zlantr.c
@@ -25,7 +25,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 void MORSE_TASK_zlantr(MORSE_option_t *options,
                        MORSE_enum norm, MORSE_enum uplo, MORSE_enum diag,
diff --git a/runtime/starpu/codelets/codelet_zlaset.c b/runtime/starpu/codelets/codelet_zlaset.c
index 0d45831db7421bd749ca54d539f039e03c886aba..c9644af396904b8400a8cf9700c9aa937ae53465 100644
--- a/runtime/starpu/codelets/codelet_zlaset.c
+++ b/runtime/starpu/codelets/codelet_zlaset.c
@@ -29,7 +29,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 
 /**
diff --git a/runtime/starpu/codelets/codelet_zlaset2.c b/runtime/starpu/codelets/codelet_zlaset2.c
index f14069ad8cf8239c0085cb7ce7a32dc3e177b0eb..f87193a52f5ebb11754f9ea436d10993526a8157 100644
--- a/runtime/starpu/codelets/codelet_zlaset2.c
+++ b/runtime/starpu/codelets/codelet_zlaset2.c
@@ -29,7 +29,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 
 /**
diff --git a/runtime/starpu/codelets/codelet_zlauum.c b/runtime/starpu/codelets/codelet_zlauum.c
index 5628bf6719bdd97f5d9e545153efe235e7c602cc..619060f869d4038984e777785525f7f627a9a22e 100644
--- a/runtime/starpu/codelets/codelet_zlauum.c
+++ b/runtime/starpu/codelets/codelet_zlauum.c
@@ -30,7 +30,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zpamm.c b/runtime/starpu/codelets/codelet_zpamm.c
index f6fc58adc442b66591d97223adaf44396c7691f7..22aff4faf66d93e1e2330cc729f27753a9365fbd 100644
--- a/runtime/starpu/codelets/codelet_zpamm.c
+++ b/runtime/starpu/codelets/codelet_zpamm.c
@@ -30,7 +30,7 @@
 #include "coreblas/include/cblas.h"
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zplghe.c b/runtime/starpu/codelets/codelet_zplghe.c
index 4f63a143bbbab63a398fd5d15182f039734a6b37..73df1e37497ba826e1bb6686423fffb7abc32b80 100644
--- a/runtime/starpu/codelets/codelet_zplghe.c
+++ b/runtime/starpu/codelets/codelet_zplghe.c
@@ -29,7 +29,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 void MORSE_TASK_zplghe( MORSE_option_t *options,
                         double bump, int m, int n, MORSE_desc_t *A, int Am, int An, int lda,
diff --git a/runtime/starpu/codelets/codelet_zplgsy.c b/runtime/starpu/codelets/codelet_zplgsy.c
index 03d4fe1770cca18f4a4499d47f6542df53e6f61c..62e0f86df0146d50bea4a725918cda4c6c0fd53b 100644
--- a/runtime/starpu/codelets/codelet_zplgsy.c
+++ b/runtime/starpu/codelets/codelet_zplgsy.c
@@ -29,7 +29,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 
 
diff --git a/runtime/starpu/codelets/codelet_zplrnt.c b/runtime/starpu/codelets/codelet_zplrnt.c
index d703f42b756c760c38e17c6231706256b8e471c7..a5c0f2dec3684b47e3f500d4345c0f14b53a0ab4 100644
--- a/runtime/starpu/codelets/codelet_zplrnt.c
+++ b/runtime/starpu/codelets/codelet_zplrnt.c
@@ -29,7 +29,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 
 
diff --git a/runtime/starpu/codelets/codelet_zplssq.c b/runtime/starpu/codelets/codelet_zplssq.c
index 7069f279c0e285c18afc27fb62e5c16d680fe256..f86cfa0697815d78963d4afabe3a8194035d5da2 100644
--- a/runtime/starpu/codelets/codelet_zplssq.c
+++ b/runtime/starpu/codelets/codelet_zplssq.c
@@ -26,7 +26,7 @@
  **/
 #include <math.h>
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /*****************************************************************************
  *
diff --git a/runtime/starpu/codelets/codelet_zpotrf.c b/runtime/starpu/codelets/codelet_zpotrf.c
index ce8931fe4441327899ab5e42ec9861685498950e..2f1f9cfd389d0f7f4edd15467046039f8d930803 100644
--- a/runtime/starpu/codelets/codelet_zpotrf.c
+++ b/runtime/starpu/codelets/codelet_zpotrf.c
@@ -30,7 +30,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zssssm.c b/runtime/starpu/codelets/codelet_zssssm.c
index cf0c6d38fea5af22befdd23b78fffd375b207238..019daf9f17f66d832e2bb3aade9981e739bd474c 100644
--- a/runtime/starpu/codelets/codelet_zssssm.c
+++ b/runtime/starpu/codelets/codelet_zssssm.c
@@ -30,7 +30,7 @@
  **/
 #include "coreblas/include/cblas.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zsymm.c b/runtime/starpu/codelets/codelet_zsymm.c
index ec4b1b83261e3e24c287bbdeceede028d947a9fa..dfa54ca0ea9105c3fa531fbcacb02f1010d58c42 100644
--- a/runtime/starpu/codelets/codelet_zsymm.c
+++ b/runtime/starpu/codelets/codelet_zsymm.c
@@ -29,7 +29,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zsyr2k.c b/runtime/starpu/codelets/codelet_zsyr2k.c
index b480dfbabb7f07251d01b05c6a494ea2a12eed5b..161caa1192c005796a3ddda10bc7fe11de5422aa 100644
--- a/runtime/starpu/codelets/codelet_zsyr2k.c
+++ b/runtime/starpu/codelets/codelet_zsyr2k.c
@@ -29,7 +29,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zsyrk.c b/runtime/starpu/codelets/codelet_zsyrk.c
index bba02221267b5660b81abdc0aa53fd56e53ef3cf..9388048eea5f66bc8f4e48fc3eabcf877694066d 100644
--- a/runtime/starpu/codelets/codelet_zsyrk.c
+++ b/runtime/starpu/codelets/codelet_zsyrk.c
@@ -29,7 +29,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zsyssq.c b/runtime/starpu/codelets/codelet_zsyssq.c
index 85f9b7e21279688bb25a36dd20b586ab6d1cf04e..fdef038e60163b0f92e2f24c5c7df09bcd70dc32 100644
--- a/runtime/starpu/codelets/codelet_zsyssq.c
+++ b/runtime/starpu/codelets/codelet_zsyssq.c
@@ -25,7 +25,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 void MORSE_TASK_zsyssq( MORSE_option_t *options,
                         MORSE_enum uplo, int n,
diff --git a/runtime/starpu/codelets/codelet_zsytrf_nopiv.c b/runtime/starpu/codelets/codelet_zsytrf_nopiv.c
index 28bf29d37947ba05d57dfd4cac20653ae8c4fba9..df6bf32a30c3665d4fba006d47332fdf2c43771b 100644
--- a/runtime/starpu/codelets/codelet_zsytrf_nopiv.c
+++ b/runtime/starpu/codelets/codelet_zsytrf_nopiv.c
@@ -29,7 +29,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 
 void MORSE_TASK_zsytrf_nopiv(MORSE_option_t *options,
diff --git a/runtime/starpu/codelets/codelet_ztile_zero.c b/runtime/starpu/codelets/codelet_ztile_zero.c
index 400eff376df3435d6a60760daeaf9dc27b7c3900..08830ca60e86bb6f405662d5d2a999bbb3638897 100644
--- a/runtime/starpu/codelets/codelet_ztile_zero.c
+++ b/runtime/starpu/codelets/codelet_ztile_zero.c
@@ -25,7 +25,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /*****************************************************************************
  *
diff --git a/runtime/starpu/codelets/codelet_ztrasm.c b/runtime/starpu/codelets/codelet_ztrasm.c
index 92b4279cc08ed465da5e7b2c22ae4be69bea8896..49927d142788db4ae14789c69c814af7cb6ba6fd 100644
--- a/runtime/starpu/codelets/codelet_ztrasm.c
+++ b/runtime/starpu/codelets/codelet_ztrasm.c
@@ -25,7 +25,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 void MORSE_TASK_ztrasm(MORSE_option_t *options,
                        MORSE_enum storev, MORSE_enum uplo, MORSE_enum diag, int M, int N,
diff --git a/runtime/starpu/codelets/codelet_ztrmm.c b/runtime/starpu/codelets/codelet_ztrmm.c
index 87ea1f29e5b692e51e735b973f18ca3a6594b374..5fe76f76b21d3c6f175f48989336875ee2d56bcf 100644
--- a/runtime/starpu/codelets/codelet_ztrmm.c
+++ b/runtime/starpu/codelets/codelet_ztrmm.c
@@ -29,7 +29,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_ztrsm.c b/runtime/starpu/codelets/codelet_ztrsm.c
index 0e5fdd2fa0f69568a625b133aa216279a05ee749..da6f1cf312cb096db079d37bb7ca750debc6072c 100644
--- a/runtime/starpu/codelets/codelet_ztrsm.c
+++ b/runtime/starpu/codelets/codelet_ztrsm.c
@@ -29,7 +29,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_ztrssq.c b/runtime/starpu/codelets/codelet_ztrssq.c
index c680839aaf5da1d3c181c0d1506494d7f8208b2f..3916956521d4f7e3455fc1035f054241f77f3ed8 100644
--- a/runtime/starpu/codelets/codelet_ztrssq.c
+++ b/runtime/starpu/codelets/codelet_ztrssq.c
@@ -25,7 +25,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 void MORSE_TASK_ztrssq( MORSE_option_t *options,
                         MORSE_enum uplo, MORSE_enum diag,
diff --git a/runtime/starpu/codelets/codelet_ztrtri.c b/runtime/starpu/codelets/codelet_ztrtri.c
index 00cef02aba8a6083bca8f5c0be1d0cab8b77bb67..8103fd87b3209d92a072457aabecc759f5533a83 100644
--- a/runtime/starpu/codelets/codelet_ztrtri.c
+++ b/runtime/starpu/codelets/codelet_ztrtri.c
@@ -30,7 +30,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_ztslqt.c b/runtime/starpu/codelets/codelet_ztslqt.c
index 8edeeaa9e0458246a535adf074e3af2bccd4b0d6..a7e5bf60c7eedb38a8102c34ac6fc66b04c6e305 100644
--- a/runtime/starpu/codelets/codelet_ztslqt.c
+++ b/runtime/starpu/codelets/codelet_ztslqt.c
@@ -30,7 +30,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 #undef REAL
 #define COMPLEX
 
diff --git a/runtime/starpu/codelets/codelet_ztsmlq.c b/runtime/starpu/codelets/codelet_ztsmlq.c
index 8f2d4eab4bb6e3092836fd7d11d15eda162fbe39..03b74668e8f4d5d9c2485b883beddb63220a0842 100644
--- a/runtime/starpu/codelets/codelet_ztsmlq.c
+++ b/runtime/starpu/codelets/codelet_ztsmlq.c
@@ -31,7 +31,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_ztsmqr.c b/runtime/starpu/codelets/codelet_ztsmqr.c
index ea98c08e0461798385d5fae0cef7eceed2c3f1a0..55468843244327b50d7d2a307d17a5e634d4a95d 100644
--- a/runtime/starpu/codelets/codelet_ztsmqr.c
+++ b/runtime/starpu/codelets/codelet_ztsmqr.c
@@ -31,7 +31,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_ztsqrt.c b/runtime/starpu/codelets/codelet_ztsqrt.c
index 5580eb6500a9ac02798fb77ad2b6a40b280d4520..84b37b64bd63ab4093274154ec2f316a27a49d5d 100644
--- a/runtime/starpu/codelets/codelet_ztsqrt.c
+++ b/runtime/starpu/codelets/codelet_ztsqrt.c
@@ -30,7 +30,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 #undef REAL
 #define COMPLEX
 
diff --git a/runtime/starpu/codelets/codelet_ztstrf.c b/runtime/starpu/codelets/codelet_ztstrf.c
index 59216ba4269dfe6adf2c43e094e4733ecd482dbc..e76985b02e15f096548ea9ecaacafe1af3c5888d 100644
--- a/runtime/starpu/codelets/codelet_ztstrf.c
+++ b/runtime/starpu/codelets/codelet_ztstrf.c
@@ -29,7 +29,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 #include "coreblas/include/cblas.h"
 #include <math.h>
 
diff --git a/runtime/starpu/codelets/codelet_zttlqt.c b/runtime/starpu/codelets/codelet_zttlqt.c
index 6ea48b3e3218cb863c9e78b85fd0a158da7b61a7..e4cdf3db76ee68e60c017a39ab35bd7a83bb287f 100644
--- a/runtime/starpu/codelets/codelet_zttlqt.c
+++ b/runtime/starpu/codelets/codelet_zttlqt.c
@@ -30,7 +30,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zttmlq.c b/runtime/starpu/codelets/codelet_zttmlq.c
index b7b609c3cc27938a819d4eae691871541aa3c9fc..311cd7a63071b31c95e6d0ae76c1682867021089 100644
--- a/runtime/starpu/codelets/codelet_zttmlq.c
+++ b/runtime/starpu/codelets/codelet_zttmlq.c
@@ -29,7 +29,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zttmqr.c b/runtime/starpu/codelets/codelet_zttmqr.c
index df79c5fbf1efa8c9e8dd07d7a252b984d448405d..e11d6b57957a2afe7b0c54b806ec7d37b9fe0733 100644
--- a/runtime/starpu/codelets/codelet_zttmqr.c
+++ b/runtime/starpu/codelets/codelet_zttmqr.c
@@ -29,7 +29,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zttqrt.c b/runtime/starpu/codelets/codelet_zttqrt.c
index 087c1b42bf50e042e6f11786a79b5c57b2bdc73d..3905e4d82ca9ac39361277a003638231af067b7c 100644
--- a/runtime/starpu/codelets/codelet_zttqrt.c
+++ b/runtime/starpu/codelets/codelet_zttqrt.c
@@ -30,7 +30,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zunmlq.c b/runtime/starpu/codelets/codelet_zunmlq.c
index b6589b16c06ff19ae98f4b00ec32e6f5c0da5593..2bc5834eb19f71d1a86490e8ec30d508ad55d313 100644
--- a/runtime/starpu/codelets/codelet_zunmlq.c
+++ b/runtime/starpu/codelets/codelet_zunmlq.c
@@ -31,7 +31,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *
diff --git a/runtime/starpu/codelets/codelet_zunmqr.c b/runtime/starpu/codelets/codelet_zunmqr.c
index 505947a6d2b435878fc1251989ef18e07fac0d0b..b4de7a5d111e43064043dc0a9fbf33a5c0b7aae0 100644
--- a/runtime/starpu/codelets/codelet_zunmqr.c
+++ b/runtime/starpu/codelets/codelet_zunmqr.c
@@ -30,7 +30,7 @@
  **/
 #include "coreblas/include/lapacke.h"
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 /**
  *
diff --git a/runtime/starpu/control/async.c b/runtime/starpu/control/runtime_async.c
similarity index 98%
rename from runtime/starpu/control/async.c
rename to runtime/starpu/control/runtime_async.c
index 541adad58ea80e4055aba3f38ecc64617b4eab4a..849a5ce539df87e6abb26d3be995b3f146d97ea9 100644
--- a/runtime/starpu/control/async.c
+++ b/runtime/starpu/control/runtime_async.c
@@ -10,7 +10,7 @@
 
 /**
  *
- * @file async.c
+ * @file runtime_async.c
  *
  *  MORSE auxiliary routines
  *  MORSE is a software package provided by Univ. of Tennessee,
diff --git a/runtime/starpu/control/context.c b/runtime/starpu/control/runtime_context.c
similarity index 98%
rename from runtime/starpu/control/context.c
rename to runtime/starpu/control/runtime_context.c
index 0e25a6cdbfab780be19707fa03a1c68a08e62aff..1d031cee31468be44a04d8e2e30e3296f60b476a 100644
--- a/runtime/starpu/control/context.c
+++ b/runtime/starpu/control/runtime_context.c
@@ -10,7 +10,7 @@
 
 /**
  *
- * @file context.c
+ * @file runtime_context.c
  *
  *  MORSE auxiliary routines
  *  MORSE is a software package provided by Univ. of Tennessee,
diff --git a/runtime/starpu/control/control.c b/runtime/starpu/control/runtime_control.c
similarity index 92%
rename from runtime/starpu/control/control.c
rename to runtime/starpu/control/runtime_control.c
index 9208e694275684d1b88494af83b503caf8dba5f6..54e838e1253e280918f9665601b9493d3a5ea2cb 100644
--- a/runtime/starpu/control/control.c
+++ b/runtime/starpu/control/runtime_control.c
@@ -10,7 +10,7 @@
 
 /**
  *
- * @file control.c
+ * @file runtime_control.c
  *
  *  MORSE auxiliary routines
  *  MORSE is a software package provided by Univ. of Tennessee,
@@ -39,12 +39,12 @@ int RUNTIME_rank(MORSE_context_t *morse)
 /*******************************************************************************
  *
  **/
-int RUNTIME_init_scheduler( MORSE_context_t *morse, int nworkers, int ncudas, int nthreads_per_worker)
+int RUNTIME_init_scheduler( MORSE_context_t *morse, int ncpus, int ncudas, int nthreads_per_worker)
 {
     starpu_conf_t *conf = (starpu_conf_t*)(morse->schedopt);
     int hres = -1;
 
-    conf->ncpus = nworkers;
+    conf->ncpus = ncpus;
     conf->ncuda = ncudas;
     conf->nopencl = 0;
 
@@ -70,7 +70,7 @@ int RUNTIME_init_scheduler( MORSE_context_t *morse, int nworkers, int ncudas, in
         conf->sched_policy_name = "ws";
 #endif
 
-    if ((nworkers == -1)||(nthreads_per_worker == -1))
+    if ((ncpus == -1)||(nthreads_per_worker == -1))
     {
         morse->parallel_enabled = MORSE_FALSE;
 
@@ -81,17 +81,17 @@ int RUNTIME_init_scheduler( MORSE_context_t *morse, int nworkers, int ncudas, in
 
         morse->parallel_enabled = MORSE_TRUE;
 
-        for (worker = 0; worker < nworkers; worker++)
+        for (worker = 0; worker < ncpus; worker++)
             conf->workers_bindid[worker] = (worker+1)*nthreads_per_worker - 1;
 
-        for (worker = 0; worker < nworkers; worker++)
+        for (worker = 0; worker < ncpus; worker++)
             conf->workers_bindid[worker + ncudas] = worker*nthreads_per_worker;
 
         conf->use_explicit_workers_bindid = 1;
 
         hres = starpu_init( conf );
 
-        morse->nworkers = nworkers;
+        morse->nworkers = ncpus;
         morse->nthreads_per_worker = nthreads_per_worker;
     }
 
diff --git a/runtime/starpu/control/descriptor.c b/runtime/starpu/control/runtime_descriptor.c
similarity index 97%
rename from runtime/starpu/control/descriptor.c
rename to runtime/starpu/control/runtime_descriptor.c
index 558300bf9fbf648405e6e3520c075594c5a4f70f..026e028f3f9c4871d08ae2ad3532224434079654 100644
--- a/runtime/starpu/control/descriptor.c
+++ b/runtime/starpu/control/runtime_descriptor.c
@@ -10,7 +10,7 @@
 
 /**
  *
- * @file descriptor.c
+ * @file runtime_descriptor.c
  *
  *  MORSE auxiliary routines
  *  MORSE is a software package provided by Univ. of Tennessee,
@@ -66,7 +66,7 @@ void RUNTIME_desc_create( MORSE_desc_t *desc )
          * Register allocated memory as CUDA pinned memory
          */
         {
-            int64_t eltsze = morse_element_size(desc->dtyp);
+            int64_t eltsze = MORSE_Element_Size(desc->dtyp);
             size_t size = (size_t)(desc->llm) * (size_t)(desc->lln) * eltsze;
 
             /* Register the matrix as pinned memory */
@@ -156,7 +156,7 @@ void RUNTIME_desc_destroy( MORSE_desc_t *desc )
 
 #if defined(CHAMELEON_USE_CUDA)
         if (desc->use_mat == 1 && desc->register_mat == 1){
-            int64_t eltsze = morse_element_size(desc->dtyp);
+            int64_t eltsze = MORSE_Element_Size(desc->dtyp);
             size_t size = (size_t)(desc->llm) * (size_t)(desc->lln) * eltsze;
 
             /* Unmap the pinned memory associated to the matrix */
@@ -263,7 +263,7 @@ void *RUNTIME_desc_getaddr( MORSE_desc_t *desc, int m, int n )
 
     if (*ptrtile == NULL) {
         int64_t block_ind = desc->lmt * n + m;
-        int64_t eltsze = morse_element_size(desc->dtyp);
+        int64_t eltsze = MORSE_Element_Size(desc->dtyp);
         int myrank = desc->myrank;
         int owner  = desc->get_rankof( desc, m, n );
         int tempmm = (m == desc->lmt-1) ? (desc->lm - m * desc->mb) : desc->mb;
diff --git a/runtime/starpu/control/options.c b/runtime/starpu/control/runtime_options.c
similarity index 98%
rename from runtime/starpu/control/options.c
rename to runtime/starpu/control/runtime_options.c
index de121a513123bc470b78e16c077ece0bf04fca5f..902d49417cb23881f94fd5b23b59112f44436f10 100644
--- a/runtime/starpu/control/options.c
+++ b/runtime/starpu/control/runtime_options.c
@@ -10,7 +10,7 @@
 
 /**
  *
- * @file options.c
+ * @file runtime_options.c
  *
  *  MORSE auxiliary routines
  *  MORSE is a software package provided by Univ. of Tennessee,
diff --git a/runtime/starpu/control/profiling.c b/runtime/starpu/control/runtime_profiling.c
similarity index 99%
rename from runtime/starpu/control/profiling.c
rename to runtime/starpu/control/runtime_profiling.c
index f6666cfa6c34b2e720fd7a899e526a9da0db1c99..4c7d2e1b3809ddfa412ff09d6b0c3e426d31ca9f 100644
--- a/runtime/starpu/control/profiling.c
+++ b/runtime/starpu/control/runtime_profiling.c
@@ -10,7 +10,7 @@
 
 /**
  *
- * @file profiling.c
+ * @file runtime_profiling.c
  *
  *  MORSE auxiliary routines
  *  MORSE is a software package provided by Univ. of Tennessee,
diff --git a/runtime/starpu/control/workspace.c b/runtime/starpu/control/runtime_workspace.c
similarity index 99%
rename from runtime/starpu/control/workspace.c
rename to runtime/starpu/control/runtime_workspace.c
index a67232cd0ecd58158e8dca0eaac51e140363180e..af1e1231c08a7cea0178107077fc0b0233ed9b69 100644
--- a/runtime/starpu/control/workspace.c
+++ b/runtime/starpu/control/runtime_workspace.c
@@ -10,7 +10,7 @@
 
 /**
  *
- * @file workspace.c
+ * @file runtime_workspace.c
  *
  *  MORSE codelets kernel
  *  MORSE is a software package provided by Univ. of Tennessee,
diff --git a/runtime/starpu/control/zlocality.c b/runtime/starpu/control/runtime_zlocality.c
similarity index 98%
rename from runtime/starpu/control/zlocality.c
rename to runtime/starpu/control/runtime_zlocality.c
index 4ece91efe5438cd6857cd0ad1690d8f3adeb3be4..a83ddceb5df06a6e035bab0e65e121a01c1dfbce 100644
--- a/runtime/starpu/control/zlocality.c
+++ b/runtime/starpu/control/runtime_zlocality.c
@@ -10,7 +10,7 @@
 
 /**
  *
- * @file zlocality.c
+ * @file runtime_zlocality.c
  *
  *  MORSE codelets kernel
  *  MORSE is a software package provided by Univ. of Tennessee,
@@ -26,7 +26,7 @@
  *
  **/
 #include "runtime/starpu/include/morse_starpu.h"
-#include "runtime/starpu/include/codelet_z.h"
+#include "runtime/starpu/include/runtime_codelet_z.h"
 
 #ifdef CHAMELEON_USE_CUDA
 /* Only codelets with multiple choices are present here */
diff --git a/runtime/starpu/control/zprofiling.c b/runtime/starpu/control/runtime_zprofiling.c
similarity index 99%
rename from runtime/starpu/control/zprofiling.c
rename to runtime/starpu/control/runtime_zprofiling.c
index 8f82e052f3e3edec9c7c2b26501f9139e1fdc966..98476046c5659e850571da39cfcf52aaf44e1db6 100644
--- a/runtime/starpu/control/zprofiling.c
+++ b/runtime/starpu/control/runtime_zprofiling.c
@@ -10,7 +10,7 @@
 
 /**
  *
- * @file zprofiling.c
+ * @file runtime_zprofiling.c
  *
  *  MORSE codelets kernel
  *  MORSE is a software package provided by Univ. of Tennessee,
diff --git a/runtime/starpu/include/morse_starpu.h b/runtime/starpu/include/morse_starpu.h
index 277ef6ae51aa0f864f226b286417c8cb9cde0344..501f022abb34c89d3309f26a750544cffa599af9 100644
--- a/runtime/starpu/include/morse_starpu.h
+++ b/runtime/starpu/include/morse_starpu.h
@@ -46,10 +46,10 @@
 #endif
 
 #include "control/common.h"
-#include "codelets.h"
-#include "profiling.h"
-#include "codelet_profile.h"
-#include "workspace.h"
+#include "runtime/starpu/include/runtime_codelets.h"
+#include "runtime/starpu/include/runtime_profiling.h"
+#include "runtime/starpu/include/runtime_codelet_profile.h"
+#include "runtime/starpu/include/runtime_workspace.h"
 
 typedef struct starpu_conf starpu_conf_t;
 
diff --git a/runtime/starpu/include/codelet_profile.h b/runtime/starpu/include/runtime_codelet_profile.h
similarity index 99%
rename from runtime/starpu/include/codelet_profile.h
rename to runtime/starpu/include/runtime_codelet_profile.h
index de61f471c7a0ca1813dd1904307e14e2b6c30c7f..99303041aff166086b319a114b96b5063381907a 100644
--- a/runtime/starpu/include/codelet_profile.h
+++ b/runtime/starpu/include/runtime_codelet_profile.h
@@ -10,7 +10,7 @@
 
 /**
  *
- * @file codelet_profile.h
+ * @file runtime_codelet_profile.h
  *
  *  MORSE codelets kernel
  *  MORSE is a software package provided by Univ. of Tennessee,
diff --git a/runtime/starpu/include/codelet_z.h b/runtime/starpu/include/runtime_codelet_z.h
similarity index 96%
rename from runtime/starpu/include/codelet_z.h
rename to runtime/starpu/include/runtime_codelet_z.h
index d2ea96654dd0e9a7d52f0f66c75057e6945a6daa..3d93bc46ceb482e4972ca4d90996730243019a47 100644
--- a/runtime/starpu/include/codelet_z.h
+++ b/runtime/starpu/include/runtime_codelet_z.h
@@ -10,7 +10,7 @@
 
 /**
  *
- * @file codelet_z.h
+ * @file runtime_codelet_z.h
  *
  *  MORSE codelets kernel
  *  MORSE is a software package provided by Univ. of Tennessee,
@@ -30,7 +30,7 @@
 #define _CODELETS_Z_H_
 
 #include <stdio.h>
-#include "runtime/starpu/include/codelets.h"
+#include "runtime/starpu/include/runtime_codelets.h"
 
 /*
  * Management functions
diff --git a/runtime/starpu/include/codelets.h b/runtime/starpu/include/runtime_codelets.h
similarity index 98%
rename from runtime/starpu/include/codelets.h
rename to runtime/starpu/include/runtime_codelets.h
index c8862e909f63ec6fac7831070e3fcc5e172be1db..f6c329e943880411d881dfec83ac71b2d061666a 100644
--- a/runtime/starpu/include/codelets.h
+++ b/runtime/starpu/include/runtime_codelets.h
@@ -10,7 +10,7 @@
 
 /**
  *
- * @file codelets.h
+ * @file runtime_codelets.h
  *
  *  MORSE codelets kernel
  *  MORSE is a software package provided by Univ. of Tennessee,
@@ -28,7 +28,7 @@
 #ifndef _CODELETS_H_
 #define _CODELETS_H_
 
-#include "codelet_profile.h"
+#include "runtime_codelet_profile.h"
 
 //#undef STARPU_CUDA_ASYNC
 #ifdef STARPU_CUDA_ASYNC
diff --git a/runtime/starpu/include/profiling.h b/runtime/starpu/include/runtime_profiling.h
similarity index 97%
rename from runtime/starpu/include/profiling.h
rename to runtime/starpu/include/runtime_profiling.h
index c0fda76e2493219c1d070ad3263d2abc3ed292a3..4e712053d15cdd0054a3ef798e1034681e7daaf8 100644
--- a/runtime/starpu/include/profiling.h
+++ b/runtime/starpu/include/runtime_profiling.h
@@ -10,7 +10,7 @@
 
 /**
  *
- * @file progiling.h
+ * @file runtime_progiling.h
  *
  *  MORSE codelets kernel
  *  MORSE is a software package provided by Univ. of Tennessee,
diff --git a/runtime/starpu/include/workspace.h b/runtime/starpu/include/runtime_workspace.h
similarity index 98%
rename from runtime/starpu/include/workspace.h
rename to runtime/starpu/include/runtime_workspace.h
index 37bf993bcd17e409b81b37417c4658e8b037b059..e1bd1859d784f8c3fb349e84c181b0bd3cf672e8 100644
--- a/runtime/starpu/include/workspace.h
+++ b/runtime/starpu/include/runtime_workspace.h
@@ -10,7 +10,7 @@
 
 /**
  *
- * @file workspace.h
+ * @file runtime_workspace.h
  *
  *  MORSE codelets kernel
  *  MORSE is a software package provided by Univ. of Tennessee,