diff --git a/runtime/starpu/codelets/codelet_zgemm.c b/runtime/starpu/codelets/codelet_zgemm.c
index e66b85dedb1c17a8bff8e8ceb49f18fd662060dd..cac587414bc35f51eaa6142f57e07e12195b307d 100644
--- a/runtime/starpu/codelets/codelet_zgemm.c
+++ b/runtime/starpu/codelets/codelet_zgemm.c
@@ -153,6 +153,14 @@ void INSERT_TASK_zgemm( const RUNTIME_option_t *options,
     /* Reduce the C access if needed */
     accessC = ( beta == 0. ) ? STARPU_W : STARPU_RW;
 
+#if defined(CHAMELEON_KERNELS_TRACE)
+    {
+        char *cl_fullname;
+        chameleon_asprintf( &cl_fullname, "%s( %s, %s, %s )", cl_name, clargs->tileA->name, clargs->tileB->name, clargs->tileC->name );
+        cl_name = cl_fullname;
+    }
+#endif
+
     /* Insert the task */
     rt_starpu_insert_task(
         &cl_zgemm,
diff --git a/runtime/starpu/codelets/codelet_zherk.c b/runtime/starpu/codelets/codelet_zherk.c
index 3cc33f4236be6b6619f91c1032df22e787d11724..c4b6eedd83e4004783b2f5f00c630aa53707918d 100644
--- a/runtime/starpu/codelets/codelet_zherk.c
+++ b/runtime/starpu/codelets/codelet_zherk.c
@@ -135,6 +135,14 @@ void INSERT_TASK_zherk( const RUNTIME_option_t *options,
     /* Reduce the C access if needed */
     accessC = ( beta == 0. ) ? STARPU_W : STARPU_RW;
 
+#if defined(CHAMELEON_KERNELS_TRACE)
+    {
+        char *cl_fullname;
+        chameleon_asprintf( &cl_fullname, "%s( %s, %s )", cl_name, clargs->tileA->name, clargs->tileC->name );
+        cl_name = cl_fullname;
+    }
+#endif
+
     /* Insert the task */
     rt_starpu_insert_task(
         &cl_zherk,
diff --git a/runtime/starpu/codelets/codelet_zlauum.c b/runtime/starpu/codelets/codelet_zlauum.c
index 700352172f44c4f3fdbda09f0474d073cb44bc44..31f8012645c2065892434d153151db5f9a6642b8 100644
--- a/runtime/starpu/codelets/codelet_zlauum.c
+++ b/runtime/starpu/codelets/codelet_zlauum.c
@@ -82,6 +82,14 @@ void INSERT_TASK_zlauum( const RUNTIME_option_t *options,
     /* Fix the worker id */
     workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
 
+#if defined(CHAMELEON_KERNELS_TRACE)
+    {
+        char *cl_fullname;
+        chameleon_asprintf( &cl_fullname, "%s( %s )", cl_name, clargs->tileA->name );
+        cl_name = cl_fullname;
+    }
+#endif
+
     /* Insert the task */
     rt_starpu_insert_task(
         &cl_zlauum,
diff --git a/runtime/starpu/codelets/codelet_zpotrf.c b/runtime/starpu/codelets/codelet_zpotrf.c
index 4f58f7239f494902ba2c067a42ff0ca3e853559f..b0f42d459e51bed0c96b41bdde85256a06ca229a 100644
--- a/runtime/starpu/codelets/codelet_zpotrf.c
+++ b/runtime/starpu/codelets/codelet_zpotrf.c
@@ -98,6 +98,14 @@ void INSERT_TASK_zpotrf( const RUNTIME_option_t *options,
     /* Fix the worker id */
     workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
 
+#if defined(CHAMELEON_KERNELS_TRACE)
+    {
+        char *cl_fullname;
+        chameleon_asprintf( &cl_fullname, "%s( %s )", cl_name, clargs->tileA->name );
+        cl_name = cl_fullname;
+    }
+#endif
+
     /* Insert the task */
     rt_starpu_insert_task(
         &cl_zpotrf,
diff --git a/runtime/starpu/codelets/codelet_zsyrk.c b/runtime/starpu/codelets/codelet_zsyrk.c
index a878aaa19adfc5c60ece27a785a7dd2fd1e67986..49a16f71bbfec0754d540caf48cdd0ed6540a866 100644
--- a/runtime/starpu/codelets/codelet_zsyrk.c
+++ b/runtime/starpu/codelets/codelet_zsyrk.c
@@ -135,6 +135,14 @@ void INSERT_TASK_zsyrk( const RUNTIME_option_t *options,
     /* Reduce the C access if needed */
     accessC = ( beta == 0. ) ? STARPU_W : STARPU_RW;
 
+#if defined(CHAMELEON_KERNELS_TRACE)
+    {
+        char *cl_fullname;
+        chameleon_asprintf( &cl_fullname, "%s( %s, %s )", cl_name, clargs->tileA->name, clargs->tileC->name );
+        cl_name = cl_fullname;
+    }
+#endif
+
     /* Insert the task */
     rt_starpu_insert_task(
         &cl_zsyrk,
diff --git a/runtime/starpu/codelets/codelet_ztrmm.c b/runtime/starpu/codelets/codelet_ztrmm.c
index 20f86bd38af1f4842aa6e853392f00ed7adfbea3..887ff71d3c7c237d924afe849858ea8d4ba99979 100644
--- a/runtime/starpu/codelets/codelet_ztrmm.c
+++ b/runtime/starpu/codelets/codelet_ztrmm.c
@@ -128,6 +128,14 @@ void INSERT_TASK_ztrmm( const RUNTIME_option_t *options,
     /* Fix the worker id */
     workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
 
+#if defined(CHAMELEON_KERNELS_TRACE)
+    {
+        char *cl_fullname;
+        chameleon_asprintf( &cl_fullname, "%s( %s, %s )", cl_name, clargs->tileA->name, clargs->tileB->name );
+        cl_name = cl_fullname;
+    }
+#endif
+
     /* Insert the task */
     rt_starpu_insert_task(
         &cl_ztrmm,
diff --git a/runtime/starpu/codelets/codelet_ztrsm.c b/runtime/starpu/codelets/codelet_ztrsm.c
index e40dde763ed018a29003e39bc1b5ee377fbeb4df..2aa43232e8404cfa31431ba7fb3779d3ff0c9e92 100644
--- a/runtime/starpu/codelets/codelet_ztrsm.c
+++ b/runtime/starpu/codelets/codelet_ztrsm.c
@@ -129,6 +129,14 @@ void INSERT_TASK_ztrsm( const RUNTIME_option_t *options,
     /* Fix the worker id */
     workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
 
+#if defined(CHAMELEON_KERNELS_TRACE)
+    {
+        char *cl_fullname;
+        chameleon_asprintf( &cl_fullname, "%s( %s, %s )", cl_name, clargs->tileA->name, clargs->tileB->name );
+        cl_name = cl_fullname;
+    }
+#endif
+
     /* Insert the task */
     rt_starpu_insert_task(
         &cl_ztrsm,
diff --git a/runtime/starpu/codelets/codelet_ztrtri.c b/runtime/starpu/codelets/codelet_ztrtri.c
index 9732e84c36f4c88c310ee35a8028fc66d4c7b572..9605d034eca04fbced137f051f54b962706c5308 100644
--- a/runtime/starpu/codelets/codelet_ztrtri.c
+++ b/runtime/starpu/codelets/codelet_ztrtri.c
@@ -96,6 +96,14 @@ void INSERT_TASK_ztrtri( const RUNTIME_option_t *options,
     /* Fix the worker id */
     workerid = (schedopt == NULL) ? -1 : schedopt->workerid;
 
+#if defined(CHAMELEON_KERNELS_TRACE)
+    {
+        char *cl_fullname;
+        chameleon_asprintf( &cl_fullname, "%s( %s )", cl_name, clargs->tileA->name );
+        cl_name = cl_fullname;
+    }
+#endif
+
     /* Insert the task */
     rt_starpu_insert_task(
         &cl_ztrtri,