diff --git a/CMakeLists.txt b/CMakeLists.txt
index 44019bf5462cd6145205593b869f9429b624dcf0..b65b2961ccecb9369401e3d30b925920fe8e0a8c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -691,8 +691,6 @@ if( CHAMELEON_SCHED_STARPU )
         foreach(libdir ${STARPU_LIBRARY_DIRS_DEP})
             list(APPEND CMAKE_REQUIRED_FLAGS "-L${libdir}")
         endforeach()
-        add_definitions("-DSTARPU_${STARPU_VERSION_MAJOR}${STARPU_VERSION_MINOR}")
-        message("-- ${Blue}Add definition STARPU_${STARPU_VERSION_MAJOR}${STARPU_VERSION_MINOR}${ColourReset}")
         set(CMAKE_REQUIRED_LIBRARIES "${STARPU_LIBRARIES_DEP}")
         if (CHAMELEON_USE_MPI)
             list(APPEND CMAKE_REQUIRED_INCLUDES "${MPI_C_INCLUDE_PATH}")
diff --git a/runtime/starpu/codelets/codelet_zasum.c b/runtime/starpu/codelets/codelet_zasum.c
index 14c640d71ddc6e4695ea8381544147da332abdc2..bd04e779c28f4c3e4fb7d8068618d48e46396b7c 100644
--- a/runtime/starpu/codelets/codelet_zasum.c
+++ b/runtime/starpu/codelets/codelet_zasum.c
@@ -46,6 +46,9 @@ void MORSE_TASK_dzasum(const MORSE_option_t *options,
         STARPU_RW,        RTBLKADDR(B, double, Bm, Bn),
         STARPU_PRIORITY,    options->priority,
         STARPU_CALLBACK,    callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+        STARPU_NAME, "zasum",
+#endif
         0);
 }
 
diff --git a/runtime/starpu/codelets/codelet_zaxpy.c b/runtime/starpu/codelets/codelet_zaxpy.c
index 1de17ff6958fa3b306adc7b8cf867c60d5c17bc6..26735cad8ff1b02348623c1fe559cff7fd79df22 100644
--- a/runtime/starpu/codelets/codelet_zaxpy.c
+++ b/runtime/starpu/codelets/codelet_zaxpy.c
@@ -45,6 +45,9 @@ void MORSE_TASK_zaxpy(const MORSE_option_t *options,
                 STARPU_VALUE,    &incB,                        sizeof(int),
                 STARPU_PRIORITY, options->priority,
                 STARPU_CALLBACK, callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+                STARPU_NAME, "zaxpy",
+#endif
                 0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zbuild.c b/runtime/starpu/codelets/codelet_zbuild.c
index d8071d814db42bd8f7b6ec4c0d4c6ecc4c919372..fa1cd01cc9c4349d266ce085648caa7703ccd181 100644
--- a/runtime/starpu/codelets/codelet_zbuild.c
+++ b/runtime/starpu/codelets/codelet_zbuild.c
@@ -62,6 +62,9 @@ void MORSE_TASK_zbuild( const MORSE_option_t *options,
           STARPU_VALUE,    &user_build_callback,          sizeof(void*),
           STARPU_PRIORITY,  options->priority,
           STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+          STARPU_NAME, "zbuild",
+#endif
           0);
   }
 }
diff --git a/runtime/starpu/codelets/codelet_zgeadd.c b/runtime/starpu/codelets/codelet_zgeadd.c
index 1eefb71ba2d0ae4edd870ed3eef0b3c5a4a7c3f7..f2ebfc783c0dbbb186d433aa41d1a8e66ad3ae3e 100644
--- a/runtime/starpu/codelets/codelet_zgeadd.c
+++ b/runtime/starpu/codelets/codelet_zgeadd.c
@@ -107,6 +107,9 @@ void MORSE_TASK_zgeadd(const MORSE_option_t *options,
             STARPU_VALUE,    &ldb,                sizeof(int),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zgeadd",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zgelqt.c b/runtime/starpu/codelets/codelet_zgelqt.c
index fe12b78508ce6b5fbd0a15928647760daf5d8fcf..023af3243433871b3e279152ef82897f2e3bd878 100644
--- a/runtime/starpu/codelets/codelet_zgelqt.c
+++ b/runtime/starpu/codelets/codelet_zgelqt.c
@@ -122,6 +122,9 @@ void MORSE_TASK_zgelqt(const MORSE_option_t *options,
             STARPU_VALUE,    &h_work,            sizeof(MORSE_starpu_ws_t *),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zgelqt",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zgemm.c b/runtime/starpu/codelets/codelet_zgemm.c
index 581d46a1153631294ee2e0239e61de1c510625a0..68564e7968f2a555a29e26ba3977221000c77f7a 100644
--- a/runtime/starpu/codelets/codelet_zgemm.c
+++ b/runtime/starpu/codelets/codelet_zgemm.c
@@ -95,6 +95,9 @@ void MORSE_TASK_zgemm(const MORSE_option_t *options,
             STARPU_CALLBACK,  callback,
 #if defined(CHAMELEON_USE_MPI)
             STARPU_EXECUTE_ON_NODE, execution_rank,
+#endif
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zgemm",
 #endif
             0);
     }
diff --git a/runtime/starpu/codelets/codelet_zgeqrt.c b/runtime/starpu/codelets/codelet_zgeqrt.c
index a60fb29da3d3b454615a4fd71ce77d275f493d8d..ca0875bbbe8c8064307ad70930479f977abd519c 100644
--- a/runtime/starpu/codelets/codelet_zgeqrt.c
+++ b/runtime/starpu/codelets/codelet_zgeqrt.c
@@ -123,7 +123,7 @@ void MORSE_TASK_zgeqrt(const MORSE_option_t *options,
             STARPU_VALUE,    &h_work,            sizeof(MORSE_starpu_ws_t *),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
-#ifdef STARPU_12
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
             STARPU_NAME, "zgeqrt",
 #endif
             0);
diff --git a/runtime/starpu/codelets/codelet_zgessm.c b/runtime/starpu/codelets/codelet_zgessm.c
index f357b215f3190ab02f25147412fe2b8234ebf784..09d5a60ef334c295662ebca9747b80a59944280d 100644
--- a/runtime/starpu/codelets/codelet_zgessm.c
+++ b/runtime/starpu/codelets/codelet_zgessm.c
@@ -109,6 +109,9 @@ void MORSE_TASK_zgessm(const MORSE_option_t *options,
             STARPU_VALUE,   &lda,                        sizeof(int),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zgessm",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zgessq.c b/runtime/starpu/codelets/codelet_zgessq.c
index d13dd85c78bfd64d6be161e5d413d69d5bc91260..4c65d87aa1aac7c2797a2e6a8a861c33344e92ee 100644
--- a/runtime/starpu/codelets/codelet_zgessq.c
+++ b/runtime/starpu/codelets/codelet_zgessq.c
@@ -44,6 +44,9 @@ void MORSE_TASK_zgessq( const MORSE_option_t *options,
             STARPU_RW,       RTBLKADDR(SCALESUMSQ, double, SCALESUMSQm, SCALESUMSQn),
             STARPU_PRIORITY, options->priority,
             STARPU_CALLBACK, callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zgessq",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zgetrf.c b/runtime/starpu/codelets/codelet_zgetrf.c
index e6eec579a39c6f1e8bf0add8557fa44c5cd9c988..9943b30ef7bf548cf6ebc70dd4b3f7eb87783aac 100644
--- a/runtime/starpu/codelets/codelet_zgetrf.c
+++ b/runtime/starpu/codelets/codelet_zgetrf.c
@@ -53,6 +53,9 @@ void MORSE_TASK_zgetrf(const MORSE_option_t *options,
             STARPU_VALUE,         &iinfo,                        sizeof(int),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zgetrf",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zgetrf_incpiv.c b/runtime/starpu/codelets/codelet_zgetrf_incpiv.c
index 8ee3d95dc42be6795727931f3ba46bf3d72ebe0d..736bcecf753ef4349dab5c1841bee7dc2770ff9b 100644
--- a/runtime/starpu/codelets/codelet_zgetrf_incpiv.c
+++ b/runtime/starpu/codelets/codelet_zgetrf_incpiv.c
@@ -119,6 +119,9 @@ void MORSE_TASK_zgetrf_incpiv(const MORSE_option_t *options,
             STARPU_VALUE,    &h_work,            sizeof(MORSE_starpu_ws_t *),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zgetrf_incpiv",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zgetrf_nopiv.c b/runtime/starpu/codelets/codelet_zgetrf_nopiv.c
index 31e70a4c06c2e040d1d5772c2ce7225b7ae37eb2..d2a6425d3f72fbe3b8f907723a4f97719d9b121a 100644
--- a/runtime/starpu/codelets/codelet_zgetrf_nopiv.c
+++ b/runtime/starpu/codelets/codelet_zgetrf_nopiv.c
@@ -97,6 +97,9 @@ void MORSE_TASK_zgetrf_nopiv(const MORSE_option_t *options,
             STARPU_VALUE,    &iinfo,                     sizeof(int),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zgetrf_nopiv",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zhe2ge.c b/runtime/starpu/codelets/codelet_zhe2ge.c
index 1daebd9f103a51c184c8a415d237921166b745de..a6a33e7838b25eb8919e14df3350b3218f50c316 100644
--- a/runtime/starpu/codelets/codelet_zhe2ge.c
+++ b/runtime/starpu/codelets/codelet_zhe2ge.c
@@ -53,7 +53,7 @@ void MORSE_TASK_zhe2ge(const MORSE_option_t *options,
             STARPU_VALUE,   &ldb,                        sizeof(int),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback,
-#ifdef STARPU_12
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
             STARPU_NAME, "zhe2ge",
 #endif
             0);
diff --git a/runtime/starpu/codelets/codelet_zhemm.c b/runtime/starpu/codelets/codelet_zhemm.c
index 6fd6706820ead9907f01f7bc93da6c227c75e82a..af47b8e988723605c153cf8b45fe9427b9191c24 100644
--- a/runtime/starpu/codelets/codelet_zhemm.c
+++ b/runtime/starpu/codelets/codelet_zhemm.c
@@ -68,6 +68,9 @@ void MORSE_TASK_zhemm(const MORSE_option_t *options,
             STARPU_VALUE,     &ldc,                        sizeof(int),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zhemm",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zher2k.c b/runtime/starpu/codelets/codelet_zher2k.c
index fa002e2126f653651b445ccfd3173acb2c2556e5..2287ab27fbdbf42658cee6b7c27e4e1b21a3801b 100644
--- a/runtime/starpu/codelets/codelet_zher2k.c
+++ b/runtime/starpu/codelets/codelet_zher2k.c
@@ -68,6 +68,9 @@ void MORSE_TASK_zher2k(const MORSE_option_t *options,
             STARPU_VALUE,       &ldc,                        sizeof(int),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zher2k",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zherfb.c b/runtime/starpu/codelets/codelet_zherfb.c
index 4e257acba0b6dc9b371466e05e5b79b43b08006d..eeaecd32c45b845e67dd9032f9a54e37c80edbc0 100644
--- a/runtime/starpu/codelets/codelet_zherfb.c
+++ b/runtime/starpu/codelets/codelet_zherfb.c
@@ -61,7 +61,7 @@ void MORSE_TASK_zherfb(const MORSE_option_t *options,
             STARPU_VALUE,    &nb,                sizeof(int),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
-#ifdef STARPU_12
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
             STARPU_NAME, "zherfb",
 #endif
             0);
diff --git a/runtime/starpu/codelets/codelet_zherk.c b/runtime/starpu/codelets/codelet_zherk.c
index df6d8718f51783d57f0b5fa5b18fa7ea77b4d1f3..ce5f60025d0dd547d218458b1b7a2d1a58afed2c 100644
--- a/runtime/starpu/codelets/codelet_zherk.c
+++ b/runtime/starpu/codelets/codelet_zherk.c
@@ -64,6 +64,9 @@ void MORSE_TASK_zherk(const MORSE_option_t *options,
             STARPU_VALUE,    &ldc,               sizeof(int),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zherk",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zhessq.c b/runtime/starpu/codelets/codelet_zhessq.c
index aa3904e76b52547f874d31d82d53ca9d9bd15088..8faa15d0bdb077fdb9beb00d5447d30527acb510 100644
--- a/runtime/starpu/codelets/codelet_zhessq.c
+++ b/runtime/starpu/codelets/codelet_zhessq.c
@@ -44,6 +44,9 @@ void MORSE_TASK_zhessq( const MORSE_option_t *options,
             STARPU_RW,       RTBLKADDR(SCALESUMSQ, double, SCALESUMSQm, SCALESUMSQn),
             STARPU_PRIORITY, options->priority,
             STARPU_CALLBACK, callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zhessq",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zlacpy.c b/runtime/starpu/codelets/codelet_zlacpy.c
index c70e6b6805ef7a377f52e6f25acb80b3ab93c8d0..c36bc9f8ea3ecf4e7cf96e99c9b500346d4d180a 100644
--- a/runtime/starpu/codelets/codelet_zlacpy.c
+++ b/runtime/starpu/codelets/codelet_zlacpy.c
@@ -63,6 +63,9 @@ void MORSE_TASK_zlacpyx(const MORSE_option_t *options,
             STARPU_VALUE,   &ldb,                 sizeof(int),
             STARPU_PRIORITY, options->priority,
             STARPU_CALLBACK, callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zlacpy",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zlag2c.c b/runtime/starpu/codelets/codelet_zlag2c.c
index 7996cc8017ba21776e07bc0993e43d75ba3f9bd6..f3b0f2a8696880408e3392bded7181e08d43b6fa 100644
--- a/runtime/starpu/codelets/codelet_zlag2c.c
+++ b/runtime/starpu/codelets/codelet_zlag2c.c
@@ -57,6 +57,9 @@ void MORSE_TASK_zlag2c(const MORSE_option_t *options,
             STARPU_VALUE,    &ldb,               sizeof(int),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zlag2c",
+#endif
             0);
     }
 }
@@ -100,6 +103,9 @@ void MORSE_TASK_clag2z(const MORSE_option_t *options,
             STARPU_VALUE,    &ldb,               sizeof(int),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "clag2z",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zlange.c b/runtime/starpu/codelets/codelet_zlange.c
index 219487ed70fdc9345a65b3c43ae0a87744514b34..ef031041e5f0beac8cc2d8f2f51afeb859476522 100644
--- a/runtime/starpu/codelets/codelet_zlange.c
+++ b/runtime/starpu/codelets/codelet_zlange.c
@@ -50,6 +50,9 @@ void MORSE_TASK_zlange(const MORSE_option_t *options,
                            STARPU_W,        RTBLKADDR(B, double, Bm, Bn),
                            STARPU_PRIORITY, options->priority,
                            STARPU_CALLBACK, callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+                           STARPU_NAME, "zlange",
+#endif
                            0);
     }
 }
@@ -91,6 +94,9 @@ void MORSE_TASK_zlange_max(const MORSE_option_t *options,
                            STARPU_RW,       RTBLKADDR(B, double, Bm, Bn),
                            STARPU_PRIORITY, options->priority,
                            STARPU_CALLBACK, callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+                           STARPU_NAME, "zlange_max",
+#endif
                            0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zlanhe.c b/runtime/starpu/codelets/codelet_zlanhe.c
index 529899eece704c3d9d32fff0de1989e435ad5b2b..c547eac267ff438c28153c582504c9996ceecbef 100644
--- a/runtime/starpu/codelets/codelet_zlanhe.c
+++ b/runtime/starpu/codelets/codelet_zlanhe.c
@@ -48,6 +48,9 @@ void MORSE_TASK_zlanhe(const MORSE_option_t *options,
             STARPU_W,        RTBLKADDR(B, double, Bm, Bn),
             STARPU_PRIORITY, options->priority,
             STARPU_CALLBACK, callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zlanhe",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zlansy.c b/runtime/starpu/codelets/codelet_zlansy.c
index d2973a1d34278f367e7c4cc5adee067dbb4a7330..69623180d10407ce2682da1143aa6ba5553d1e80 100644
--- a/runtime/starpu/codelets/codelet_zlansy.c
+++ b/runtime/starpu/codelets/codelet_zlansy.c
@@ -50,6 +50,9 @@ void MORSE_TASK_zlansy(const MORSE_option_t *options,
             STARPU_W,        RTBLKADDR(B, double, Bm, Bn),
             STARPU_PRIORITY, options->priority,
             STARPU_CALLBACK, callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zlansy",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zlantr.c b/runtime/starpu/codelets/codelet_zlantr.c
index 6ba5cb732817750122bb2effa8efd47c57c8fc98..e1d585f8691ec7b790606d42a767a898d76f7202 100644
--- a/runtime/starpu/codelets/codelet_zlantr.c
+++ b/runtime/starpu/codelets/codelet_zlantr.c
@@ -49,6 +49,9 @@ void MORSE_TASK_zlantr(const MORSE_option_t *options,
             STARPU_W,        RTBLKADDR(B, double, Bm, Bn),
             STARPU_PRIORITY, options->priority,
             STARPU_CALLBACK, callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zlantr",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zlascal.c b/runtime/starpu/codelets/codelet_zlascal.c
index f40802665fa7899c798940aa4dc87a6f6ddf6bd2..36af8ccb5ec6327476907326f31cd304a108a3c4 100644
--- a/runtime/starpu/codelets/codelet_zlascal.c
+++ b/runtime/starpu/codelets/codelet_zlascal.c
@@ -83,6 +83,9 @@ void MORSE_TASK_zlascal(const MORSE_option_t *options,
             STARPU_VALUE,    &lda,                sizeof(int),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zlascal",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zlaset.c b/runtime/starpu/codelets/codelet_zlaset.c
index 1809d5f2a743da6e9a5f3f94c8e0a54c8c2442ee..4f2c84485f3ca501edb9059858c8d544342e326d 100644
--- a/runtime/starpu/codelets/codelet_zlaset.c
+++ b/runtime/starpu/codelets/codelet_zlaset.c
@@ -90,6 +90,9 @@ void MORSE_TASK_zlaset(const MORSE_option_t *options,
             STARPU_VALUE,   &LDA,                        sizeof(int),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zlaset",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zlaset2.c b/runtime/starpu/codelets/codelet_zlaset2.c
index 67572a47f0e60d5520d9a00cfcd5ed73051f4e73..453025b813dc45fcbdb39301a39fbc09d0493f9e 100644
--- a/runtime/starpu/codelets/codelet_zlaset2.c
+++ b/runtime/starpu/codelets/codelet_zlaset2.c
@@ -86,6 +86,9 @@ void MORSE_TASK_zlaset2(const MORSE_option_t *options,
             STARPU_VALUE,   &LDA,                        sizeof(int),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zlaset2",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zlatro.c b/runtime/starpu/codelets/codelet_zlatro.c
index 5f0a2ea0401732cb7308b95cbb72ce041fde09c4..cf3433112f9039f28d54f3b67b9432972a2a5928 100644
--- a/runtime/starpu/codelets/codelet_zlatro.c
+++ b/runtime/starpu/codelets/codelet_zlatro.c
@@ -62,7 +62,7 @@ void MORSE_TASK_zlatro(const MORSE_option_t *options,
             STARPU_VALUE,   &ldb,     sizeof(int),
             STARPU_PRIORITY, options->priority,
             STARPU_CALLBACK, callback,
-#ifdef STARPU_12
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
             STARPU_NAME, "zlatro",
 #endif
             0);
diff --git a/runtime/starpu/codelets/codelet_zlauum.c b/runtime/starpu/codelets/codelet_zlauum.c
index d30eb3740569300708b4a9eec8eda5ac5cdce17c..5539ca63f24864743de95d6c6f20ebc6c42e6dd0 100644
--- a/runtime/starpu/codelets/codelet_zlauum.c
+++ b/runtime/starpu/codelets/codelet_zlauum.c
@@ -56,6 +56,9 @@ void MORSE_TASK_zlauum(const MORSE_option_t *options,
             STARPU_VALUE,    &lda,               sizeof(int),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zlauum",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zplghe.c b/runtime/starpu/codelets/codelet_zplghe.c
index 186d9b21078b8ba4d150676cd2a8f83f2237a5b1..42d3b73204686ca29fa6df74321b556c3fc612ce 100644
--- a/runtime/starpu/codelets/codelet_zplghe.c
+++ b/runtime/starpu/codelets/codelet_zplghe.c
@@ -56,6 +56,9 @@ void MORSE_TASK_zplghe( const MORSE_option_t *options,
             STARPU_VALUE, &seed,   sizeof(unsigned long long int),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zplghe",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zplgsy.c b/runtime/starpu/codelets/codelet_zplgsy.c
index 854947480d870e70cda6d26fbb3318ee712ef1b5..027b804895ccd186788aab70100567101622df62 100644
--- a/runtime/starpu/codelets/codelet_zplgsy.c
+++ b/runtime/starpu/codelets/codelet_zplgsy.c
@@ -57,6 +57,9 @@ void MORSE_TASK_zplgsy( const MORSE_option_t *options,
             STARPU_VALUE, &seed,   sizeof(unsigned long long int),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zplgsy",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zplrnt.c b/runtime/starpu/codelets/codelet_zplrnt.c
index 1935dd343f500b6812750524670a5416c0806e36..7c6d3556d6555cc2c173405b71bca5db7f7d9154 100644
--- a/runtime/starpu/codelets/codelet_zplrnt.c
+++ b/runtime/starpu/codelets/codelet_zplrnt.c
@@ -55,6 +55,9 @@ void MORSE_TASK_zplrnt( const MORSE_option_t *options,
             STARPU_VALUE, &seed,   sizeof(unsigned long long int),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zplrnt",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zplssq.c b/runtime/starpu/codelets/codelet_zplssq.c
index 65b51032eab7740e275ec64339b36426b02e7676..25de90a799b9d4a88a439110bee908a8bdd63839 100644
--- a/runtime/starpu/codelets/codelet_zplssq.c
+++ b/runtime/starpu/codelets/codelet_zplssq.c
@@ -72,6 +72,9 @@ void MORSE_TASK_zplssq( const MORSE_option_t *options,
             STARPU_RW, RTBLKADDR(SCLSSQ,     double, SCLSSQm,     SCLSSQn),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zplssq",
+#endif
             0);
     }
 }
@@ -110,6 +113,9 @@ void MORSE_TASK_zplssq2( const MORSE_option_t *options,
             STARPU_RW, RTBLKADDR(RESULT, double, RESULTm, RESULTn),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zplssq2",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zpotrf.c b/runtime/starpu/codelets/codelet_zpotrf.c
index abfd477a2709f11b0d2f1f7a73ddef843dbfb467..af1449231caf29f5fb4be0eb28de91d15dc41e9c 100644
--- a/runtime/starpu/codelets/codelet_zpotrf.c
+++ b/runtime/starpu/codelets/codelet_zpotrf.c
@@ -59,6 +59,9 @@ void MORSE_TASK_zpotrf(const MORSE_option_t *options,
             /* STARPU_SCRATCH,   options->ws_worker, */
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zpotrf",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zssssm.c b/runtime/starpu/codelets/codelet_zssssm.c
index 3a59f77080530cc1c9881fb885c346f4b4155d4c..79c90bb56098fd44afe6c1da8cfa4a2d39f02657 100644
--- a/runtime/starpu/codelets/codelet_zssssm.c
+++ b/runtime/starpu/codelets/codelet_zssssm.c
@@ -139,6 +139,9 @@ void MORSE_TASK_zssssm(const MORSE_option_t *options,
             STARPU_VALUE,          &IPIV,                      sizeof(int*),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zssssm",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zsymm.c b/runtime/starpu/codelets/codelet_zsymm.c
index 030ccc1b7016d49b304c00b2b50776e82841b2eb..d7d557ef7765991cfaa06f39d6e57a50f2ba396b 100644
--- a/runtime/starpu/codelets/codelet_zsymm.c
+++ b/runtime/starpu/codelets/codelet_zsymm.c
@@ -68,6 +68,9 @@ void MORSE_TASK_zsymm(const MORSE_option_t *options,
             STARPU_VALUE,     &ldc,                        sizeof(int),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zsymm",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zsyr2k.c b/runtime/starpu/codelets/codelet_zsyr2k.c
index b3bebf3b051647fcdafe93cafa4c48b98e062581..a9d7a0ed2acbdee7791b7f33004ac4a9d2be0dfc 100644
--- a/runtime/starpu/codelets/codelet_zsyr2k.c
+++ b/runtime/starpu/codelets/codelet_zsyr2k.c
@@ -68,6 +68,9 @@ void MORSE_TASK_zsyr2k(const MORSE_option_t *options,
             STARPU_VALUE,       &ldc,                        sizeof(int),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zsyr2k",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zsyrk.c b/runtime/starpu/codelets/codelet_zsyrk.c
index 98e472cc47cc4d92bc01e46b048c27dc39f09b2f..33e07811c1ce53717e4d073ad0b43c3afcf48587 100644
--- a/runtime/starpu/codelets/codelet_zsyrk.c
+++ b/runtime/starpu/codelets/codelet_zsyrk.c
@@ -64,6 +64,9 @@ void MORSE_TASK_zsyrk(const MORSE_option_t *options,
             STARPU_VALUE,       &ldc,                        sizeof(int),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zsyrk",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zsyssq.c b/runtime/starpu/codelets/codelet_zsyssq.c
index 62fe8f524a522c8054230b4795c94655cf0ae750..29d2f2df3b7e3f51ad905e2dea16e8dad92c87cd 100644
--- a/runtime/starpu/codelets/codelet_zsyssq.c
+++ b/runtime/starpu/codelets/codelet_zsyssq.c
@@ -44,6 +44,9 @@ void MORSE_TASK_zsyssq( const MORSE_option_t *options,
             STARPU_RW,       RTBLKADDR(SCALESUMSQ, double, SCALESUMSQm, SCALESUMSQn),
             STARPU_PRIORITY, options->priority,
             STARPU_CALLBACK, callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zsyssq",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zsytrf_nopiv.c b/runtime/starpu/codelets/codelet_zsytrf_nopiv.c
index 6320ea9a701ba4597dd90b4dea3a477a20ecbd5d..6a375295fbd1f45d5554dcdb871dd0284a42b872 100644
--- a/runtime/starpu/codelets/codelet_zsytrf_nopiv.c
+++ b/runtime/starpu/codelets/codelet_zsytrf_nopiv.c
@@ -53,6 +53,9 @@ void MORSE_TASK_zsytrf_nopiv(const MORSE_option_t *options,
             /* STARPU_SCRATCH,   options->ws_worker, */
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zsytrf_nopiv",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_ztile_zero.c b/runtime/starpu/codelets/codelet_ztile_zero.c
index d8f1a1fb64fc0e0f48d5a8df3c0f6ed86f3e342f..567e231a6008aa3dd9a6d4ae33400f52a22c55f0 100644
--- a/runtime/starpu/codelets/codelet_ztile_zero.c
+++ b/runtime/starpu/codelets/codelet_ztile_zero.c
@@ -50,6 +50,9 @@ void MORSE_TASK_ztile_zero(const const MORSE_option_t *options,
             STARPU_VALUE, &lda, sizeof(int),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback, NULL,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "ztile_zero",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_ztradd.c b/runtime/starpu/codelets/codelet_ztradd.c
index 24d532ddd6003aae04ad120709fd572eb156ea7c..53cab26a45dad0d556c5b66120c8ec2bb4eaba24 100644
--- a/runtime/starpu/codelets/codelet_ztradd.c
+++ b/runtime/starpu/codelets/codelet_ztradd.c
@@ -112,6 +112,9 @@ void MORSE_TASK_ztradd(const MORSE_option_t *options,
             STARPU_VALUE,    &ldb,                sizeof(int),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "ztradd",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_ztrasm.c b/runtime/starpu/codelets/codelet_ztrasm.c
index 7ad655c07eff232cebcd0af44049233189b03be3..f8aa3743e2500d905a350efff4e8be8bdd937a84 100644
--- a/runtime/starpu/codelets/codelet_ztrasm.c
+++ b/runtime/starpu/codelets/codelet_ztrasm.c
@@ -46,6 +46,9 @@ void MORSE_TASK_ztrasm(const MORSE_option_t *options,
         STARPU_RW,       RTBLKADDR(B, double, Bm, Bn),
         STARPU_PRIORITY, options->priority,
         STARPU_CALLBACK, callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "ztrasm",
+#endif
         0);
 }
 
diff --git a/runtime/starpu/codelets/codelet_ztrmm.c b/runtime/starpu/codelets/codelet_ztrmm.c
index 9878b02fcd81ff9164d43a9c79b9d7b99dfdc943..745d429bdffbcd1d72b92126056b50c86c48858c 100644
--- a/runtime/starpu/codelets/codelet_ztrmm.c
+++ b/runtime/starpu/codelets/codelet_ztrmm.c
@@ -65,6 +65,9 @@ void MORSE_TASK_ztrmm(const MORSE_option_t *options,
             STARPU_VALUE,       &ldb,                        sizeof(int),
             STARPU_PRIORITY,    options->priority,
             STARPU_CALLBACK,    callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "ztrmm",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_ztrsm.c b/runtime/starpu/codelets/codelet_ztrsm.c
index e009a14b374327a452aebcc8cd829453d92a9f0d..4bbea5e1a6b5aa276493c8b62b07bc5f06709edd 100644
--- a/runtime/starpu/codelets/codelet_ztrsm.c
+++ b/runtime/starpu/codelets/codelet_ztrsm.c
@@ -86,6 +86,9 @@ void MORSE_TASK_ztrsm(const MORSE_option_t *options,
             STARPU_CALLBACK,  callback,
 #if defined(CHAMELEON_USE_MPI)
             STARPU_EXECUTE_ON_NODE, execution_rank,
+#endif
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "ztrsm",
 #endif
             0);
     }
diff --git a/runtime/starpu/codelets/codelet_ztrssq.c b/runtime/starpu/codelets/codelet_ztrssq.c
index 910a81d3c9c72d93ae3cb0f790639870df84c0c8..92ef401a197c6132356374321a0f63b60b575de3 100644
--- a/runtime/starpu/codelets/codelet_ztrssq.c
+++ b/runtime/starpu/codelets/codelet_ztrssq.c
@@ -47,6 +47,9 @@ void MORSE_TASK_ztrssq( const MORSE_option_t *options,
             STARPU_RW,       RTBLKADDR(SCALESUMSQ, double, SCALESUMSQm, SCALESUMSQn),
             STARPU_PRIORITY, options->priority,
             STARPU_CALLBACK, callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "ztrssq",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_ztrtri.c b/runtime/starpu/codelets/codelet_ztrtri.c
index 49e1ca9457e4f2b830da5a664ffdaf5ac3d9aaee..962ef0b7663957d3f6e56ce01832a0efbe44a51d 100644
--- a/runtime/starpu/codelets/codelet_ztrtri.c
+++ b/runtime/starpu/codelets/codelet_ztrtri.c
@@ -60,6 +60,9 @@ void MORSE_TASK_ztrtri(const MORSE_option_t *options,
             STARPU_VALUE,    &iinfo,             sizeof(int),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "ztrtri",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_ztslqt.c b/runtime/starpu/codelets/codelet_ztslqt.c
index 137275a6822ee791a3a495ffc6c0b51086767634..653dffff04fa2b127c197b26889b80b20330bcf1 100644
--- a/runtime/starpu/codelets/codelet_ztslqt.c
+++ b/runtime/starpu/codelets/codelet_ztslqt.c
@@ -140,6 +140,9 @@ void MORSE_TASK_ztslqt(const MORSE_option_t *options,
             STARPU_VALUE,    &h_work,            sizeof(MORSE_starpu_ws_t *),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "ztslqt",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_ztsmlq.c b/runtime/starpu/codelets/codelet_ztsmlq.c
index 88128117d6db2449768a70b933f8d62d5de49174..4215279ed58edd836ddd9f0555f974c6201cdfa5 100644
--- a/runtime/starpu/codelets/codelet_ztsmlq.c
+++ b/runtime/starpu/codelets/codelet_ztsmlq.c
@@ -173,6 +173,9 @@ void MORSE_TASK_ztsmlq(const MORSE_option_t *options,
             STARPU_VALUE,    &ldwork,            sizeof(int),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "ztsmlq",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_ztsmlq_hetra1.c b/runtime/starpu/codelets/codelet_ztsmlq_hetra1.c
index ef13963bb922c075e40c9fa7cb29455f05a445d6..da3a7516e47f2eaa77b35e72340e2664c6b47830 100644
--- a/runtime/starpu/codelets/codelet_ztsmlq_hetra1.c
+++ b/runtime/starpu/codelets/codelet_ztsmlq_hetra1.c
@@ -74,6 +74,9 @@ void MORSE_TASK_ztsmlq_hetra1(const MORSE_option_t *options,
             STARPU_VALUE,    &ldwork,            sizeof(int),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "ztsmlq_hetra1",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_ztsmqr.c b/runtime/starpu/codelets/codelet_ztsmqr.c
index 16f2475b3c1d228827eaae3b682bcd482c416622..661b597e69800819b25f6c18a091734e503317da 100644
--- a/runtime/starpu/codelets/codelet_ztsmqr.c
+++ b/runtime/starpu/codelets/codelet_ztsmqr.c
@@ -199,7 +199,7 @@ void MORSE_TASK_ztsmqr(const MORSE_option_t *options,
             STARPU_VALUE,    &ldwork,            sizeof(int),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
-#ifdef STARPU_12
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
             STARPU_NAME, "ztsmqr",
 #endif
 #if defined(CHAMELEON_USE_MPI)
diff --git a/runtime/starpu/codelets/codelet_ztsmqr_hetra1.c b/runtime/starpu/codelets/codelet_ztsmqr_hetra1.c
index 94597b6a905dfdcb923a8acc699d37cb7305e8a2..2af83b5d23cd6239f9217ad18235bb774071d240 100644
--- a/runtime/starpu/codelets/codelet_ztsmqr_hetra1.c
+++ b/runtime/starpu/codelets/codelet_ztsmqr_hetra1.c
@@ -73,7 +73,7 @@ void MORSE_TASK_ztsmqr_hetra1(const MORSE_option_t *options,
             STARPU_VALUE,    &ldwork,            sizeof(int),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
-#ifdef STARPU_12
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
             STARPU_NAME, "ztsmqr_hetra1",
 #endif
             0);
diff --git a/runtime/starpu/codelets/codelet_ztsqrt.c b/runtime/starpu/codelets/codelet_ztsqrt.c
index 0d8a8a9aa737ecbf44aa18a8d0c816819cdf2463..63660c0a9a6bbf2acf632d581935cb5b08e95ebe 100644
--- a/runtime/starpu/codelets/codelet_ztsqrt.c
+++ b/runtime/starpu/codelets/codelet_ztsqrt.c
@@ -129,7 +129,7 @@ void MORSE_TASK_ztsqrt(const MORSE_option_t *options,
             STARPU_VALUE,    &h_work,            sizeof(MORSE_starpu_ws_t *),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
-#ifdef STARPU_12
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
             STARPU_NAME, "ztsqrt",
 #endif
             STARPU_EXECUTE_ON_NODE, A2->get_rankof(A2, A2m, A2n),
diff --git a/runtime/starpu/codelets/codelet_ztstrf.c b/runtime/starpu/codelets/codelet_ztstrf.c
index 2ba801d75f075ea69511ac51c60f0f4585c60f18..f1ae6bb1722bda85e2738e8743074d0e7913ec55 100644
--- a/runtime/starpu/codelets/codelet_ztstrf.c
+++ b/runtime/starpu/codelets/codelet_ztstrf.c
@@ -137,6 +137,9 @@ void MORSE_TASK_ztstrf(const MORSE_option_t *options,
             STARPU_VALUE,    &iinfo,                     sizeof(int),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "ztstrf",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zttlqt.c b/runtime/starpu/codelets/codelet_zttlqt.c
index 1eac70c5dd6883e8a4533d1a7f289e0a9408ce56..518d965e8a2794ea57d72f69ee97cee973fbabee 100644
--- a/runtime/starpu/codelets/codelet_zttlqt.c
+++ b/runtime/starpu/codelets/codelet_zttlqt.c
@@ -136,6 +136,9 @@ void MORSE_TASK_zttlqt(const MORSE_option_t *options,
             STARPU_SCRATCH,   options->ws_worker,
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zttlqt",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zttmlq.c b/runtime/starpu/codelets/codelet_zttmlq.c
index c3ec7be24e3bb149cb546e3d8b001a4b9fb963d9..cd6fbaff4bec64f248a983af6df78dbb0b7398d0 100644
--- a/runtime/starpu/codelets/codelet_zttmlq.c
+++ b/runtime/starpu/codelets/codelet_zttmlq.c
@@ -166,6 +166,9 @@ void MORSE_TASK_zttmlq(const MORSE_option_t *options,
             STARPU_VALUE,    &ldwork,            sizeof(int),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zttmlq",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zttmqr.c b/runtime/starpu/codelets/codelet_zttmqr.c
index 215c1870192806d8691ed667ca80111647b0f47f..453ed0af0606b827ad3cce9da3575c183415721d 100644
--- a/runtime/starpu/codelets/codelet_zttmqr.c
+++ b/runtime/starpu/codelets/codelet_zttmqr.c
@@ -194,6 +194,9 @@ void MORSE_TASK_zttmqr(const MORSE_option_t *options,
             STARPU_CALLBACK,  callback,
 #if defined(CHAMELEON_USE_MPI)
             STARPU_EXECUTE_ON_NODE, execution_rank,
+#endif
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zttmqr",
 #endif
             0);
     }
diff --git a/runtime/starpu/codelets/codelet_zttqrt.c b/runtime/starpu/codelets/codelet_zttqrt.c
index 3f5fd2ab38042a9b0cf41805d719953a5436d327..a5bf954ce62c6fdf520c72f9e7f78352c33c2f8b 100644
--- a/runtime/starpu/codelets/codelet_zttqrt.c
+++ b/runtime/starpu/codelets/codelet_zttqrt.c
@@ -136,6 +136,9 @@ void MORSE_TASK_zttqrt(const MORSE_option_t *options,
             STARPU_SCRATCH,   options->ws_worker,
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zttqrt",
+#endif
             0);
     }
 }
diff --git a/runtime/starpu/codelets/codelet_zunmlq.c b/runtime/starpu/codelets/codelet_zunmlq.c
index b3e973a09845cc30fa6b1109e7bc749e09eac0b8..a615c4784ccf2375a9a16d8bf54445f8122b9765 100644
--- a/runtime/starpu/codelets/codelet_zunmlq.c
+++ b/runtime/starpu/codelets/codelet_zunmlq.c
@@ -150,7 +150,7 @@ void MORSE_TASK_zunmlq(const MORSE_option_t *options,
             STARPU_VALUE,    &nb,                sizeof(int),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
-#ifdef STARPU_12
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
             STARPU_NAME, "zunmlq",
 #endif
             0);
diff --git a/runtime/starpu/codelets/codelet_zunmqr.c b/runtime/starpu/codelets/codelet_zunmqr.c
index 32c6d14acd4e8b95b38ae7189c37ad2684fc15b8..acb7279eda15aeb8f3c2d8cb60ef6e7be517796a 100644
--- a/runtime/starpu/codelets/codelet_zunmqr.c
+++ b/runtime/starpu/codelets/codelet_zunmqr.c
@@ -172,11 +172,11 @@ void MORSE_TASK_zunmqr(const MORSE_option_t *options,
             STARPU_VALUE,    &nb,                sizeof(int),
             STARPU_PRIORITY,  options->priority,
             STARPU_CALLBACK,  callback,
-#ifdef STARPU_12
-            STARPU_NAME, "zunmqr",
-#endif
 #if defined(CHAMELEON_USE_MPI)
             STARPU_EXECUTE_ON_NODE, execution_rank,
+#endif
+#if defined(CHAMELEON_CODELETS_HAVE_NAME)
+            STARPU_NAME, "zunmqr",
 #endif
             0);
     }
diff --git a/runtime/starpu/control/runtime_descriptor.c b/runtime/starpu/control/runtime_descriptor.c
index c25460a91e737c896e0adc4d952d2ec72d8d6fb3..5bd0ca72010ce1a0ab6b775d48a34e4aee54dc8e 100644
--- a/runtime/starpu/control/runtime_descriptor.c
+++ b/runtime/starpu/control/runtime_descriptor.c
@@ -268,6 +268,13 @@ int RUNTIME_desc_release( MORSE_desc_t *desc )
     return MORSE_SUCCESS;
 }
 
+/**
+ * For older revision of StarPU, STARPU_MAIN_RAM is not defined
+ */
+#ifndef STARPU_MAIN_RAM
+#define STARPU_MAIN_RAM 0
+#endif
+
 int RUNTIME_desc_getoncpu( MORSE_desc_t *desc )
 {
     starpu_data_handle_t *handle = (starpu_data_handle_t*)(desc->schedopt);
@@ -315,15 +322,9 @@ void *RUNTIME_desc_getaddr( const MORSE_desc_t *desc, int m, int n )
                                             BLKLDD(desc, im), tempmm, tempnn, eltsze);
             }
             else {
-#ifdef STARPU_12
                 starpu_matrix_data_register(ptrtile, STARPU_MAIN_RAM,
                                             (uintptr_t)desc->get_blkaddr(desc, m, n),
                                             BLKLDD(desc, im), tempmm, tempnn, eltsze);
-#else
-                starpu_matrix_data_register(ptrtile, 0,
-                                            (uintptr_t)desc->get_blkaddr(desc, m, n),
-                                            BLKLDD(desc, im), tempmm, tempnn, eltsze);
-#endif
             }
         }
         else {
diff --git a/runtime/starpu/include/morse_starpu.h b/runtime/starpu/include/morse_starpu.h
index de46d065e5b6223848f6b6ee1e017b045de5b868..efbc57cf1c1ec1e176f14fded91b827589ad411d 100644
--- a/runtime/starpu/include/morse_starpu.h
+++ b/runtime/starpu/include/morse_starpu.h
@@ -64,6 +64,13 @@ typedef struct starpu_conf starpu_conf_t;
 #endif
 
 /*
+ * Enable codelets names
+ */
+#if (STARPU_MAJOR_VERSION > 1) || ((STARPU_MAJOR_VERSION == 1) && (STARPU_MINOR_VERSION > 1))
+#define CHAMELEON_CODELETS_HAVE_NAME
+#endif
+
+/**
  * Access to block pointer and leading dimension
  */
 #define RTBLKADDR( desc, type, m, n ) ( (starpu_data_handle_t)RUNTIME_desc_getaddr( desc, m, n ) )