diff --git a/runtime/starpu/codelets/codelet_zgeadd.c b/runtime/starpu/codelets/codelet_zgeadd.c
index aace97617b754005d6a12c3dd55641006cb94f5a..0cdc6cafaf4060132b0b770c4d532eab085c8e5f 100644
--- a/runtime/starpu/codelets/codelet_zgeadd.c
+++ b/runtime/starpu/codelets/codelet_zgeadd.c
@@ -78,6 +78,7 @@ cl_zgeadd_cuda_func( void *descr[], void *cl_arg )
 CODELETS( zgeadd, cl_zgeadd_cpu_func, cl_zgeadd_cuda_func, STARPU_CUDA_ASYNC )
 
 #if defined(CHAMELEON_STARPU_USE_INSERT)
+
 void INSERT_TASK_zgeadd( const RUNTIME_option_t *options,
                          cham_trans_t trans, int m, int n, int nb,
                          CHAMELEON_Complex64_t alpha, const CHAM_desc_t *A, int Am, int An,
@@ -133,7 +134,7 @@ void INSERT_TASK_zgeadd( const RUNTIME_option_t *options,
     (void)nb;
 }
 
-#else
+#else /* defined(CHAMELEON_STARPU_USE_INSERT) */
 
 void INSERT_TASK_zgeadd( const RUNTIME_option_t *options,
                          cham_trans_t trans, int m, int n, int nb,
@@ -156,8 +157,8 @@ void INSERT_TASK_zgeadd( const RUNTIME_option_t *options,
      * Set the data handles and initialize exchanges if needed
      */
     starpu_cham_exchange_init_params( options, &params, B->get_rankof( B, Bm, Bn ) );
-    starpu_cham_exchange_data_before_execution( options, &params, &nbdata, descrs, A, Am, An, STARPU_R );
-    starpu_cham_exchange_data_before_execution( options, &params, &nbdata, descrs, B, Bm, Bn, accessB  );
+    starpu_cham_exchange_tile_before_execution( options, &params, &nbdata, descrs, A, Am, An, STARPU_R );
+    starpu_cham_exchange_tile_before_execution( options, &params, &nbdata, descrs, B, Bm, Bn, accessB  );
 
     /*
      * Not involved, let's return
@@ -209,4 +210,4 @@ void INSERT_TASK_zgeadd( const RUNTIME_option_t *options,
     (void)nb;
 }
 
-#endif
+#endif /* defined(CHAMELEON_STARPU_USE_INSERT) */
diff --git a/runtime/starpu/codelets/codelet_zgemm.c b/runtime/starpu/codelets/codelet_zgemm.c
index de400f20da43773e00b960a6fb02cfa640726137..1fe76c9b782c0b52de548f1d851e17250c732dc5 100644
--- a/runtime/starpu/codelets/codelet_zgemm.c
+++ b/runtime/starpu/codelets/codelet_zgemm.c
@@ -127,6 +127,7 @@ CODELETS( zgemm, cl_zgemm_cpu_func, cl_zgemm_cuda_func, STARPU_CUDA_ASYNC )
 #endif
 
 #if defined(CHAMELEON_STARPU_USE_INSERT)
+
 void INSERT_TASK_zgemm_Astat( const RUNTIME_option_t *options,
                               cham_trans_t transA, cham_trans_t transB,
                               int m, int n, int k, int nb,
@@ -297,7 +298,7 @@ void INSERT_TASK_zgemm( const RUNTIME_option_t *options,
         0 );
 }
 
-#else
+#else /* defined(CHAMELEON_STARPU_USE_INSERT) */
 
 void __INSERT_TASK_zgemm( const RUNTIME_option_t *options,
                           int xrank, int accessC,
@@ -319,9 +320,9 @@ void __INSERT_TASK_zgemm( const RUNTIME_option_t *options,
      * Register the data handles and initialize exchanges if needed
      */
     starpu_cham_exchange_init_params( options, &params, xrank );
-    starpu_cham_exchange_data_before_execution( options, &params, &nbdata, descrs, A, Am, An, STARPU_R );
-    starpu_cham_exchange_data_before_execution( options, &params, &nbdata, descrs, B, Bm, Bn, STARPU_R );
-    starpu_cham_exchange_data_before_execution( options, &params, &nbdata, descrs, C, Cm, Cn, accessC  );
+    starpu_cham_exchange_tile_before_execution( options, &params, &nbdata, descrs, A, Am, An, STARPU_R );
+    starpu_cham_exchange_tile_before_execution( options, &params, &nbdata, descrs, B, Bm, Bn, STARPU_R );
+    starpu_cham_exchange_tile_before_execution( options, &params, &nbdata, descrs, C, Cm, Cn, accessC  );
 
     /*
      * Not involved, let's return
@@ -425,4 +426,5 @@ void INSERT_TASK_zgemm( const RUNTIME_option_t *options,
                                 B, Bm, Bn,
                          beta,  C, Cm, Cn );
 }
-#endif
+
+#endif /* defined(CHAMELEON_STARPU_USE_INSERT) */
diff --git a/runtime/starpu/codelets/codelet_zhemm.c b/runtime/starpu/codelets/codelet_zhemm.c
index 2ce1c3a5a5fe2501683f53856e632b5bd974c098..6584684a40f43cb40417458dc69d4591aa8730f4 100644
--- a/runtime/starpu/codelets/codelet_zhemm.c
+++ b/runtime/starpu/codelets/codelet_zhemm.c
@@ -126,6 +126,7 @@ CODELETS( zhemm, cl_zhemm_cpu_func, cl_zhemm_cuda_func, STARPU_CUDA_ASYNC )
 #endif
 
 #if defined(CHAMELEON_STARPU_USE_INSERT)
+
 void INSERT_TASK_zhemm_Astat( const RUNTIME_option_t *options,
                               cham_side_t side, cham_uplo_t uplo,
                               int m, int n, int nb,
@@ -274,7 +275,7 @@ void INSERT_TASK_zhemm( const RUNTIME_option_t *options,
         0 );
 }
 
-#else
+#else /* defined(CHAMELEON_STARPU_USE_INSERT) */
 
 void __INSERT_TASK_zhemm( const RUNTIME_option_t *options,
                           cham_side_t side, cham_uplo_t uplo,
@@ -295,9 +296,9 @@ void __INSERT_TASK_zhemm( const RUNTIME_option_t *options,
      * Set the data handles and initialize exchanges if needed
      */
     starpu_cham_exchange_init_params( options, &params, xrank );
-    starpu_cham_exchange_data_before_execution( options, &params, &nbdata, descrs, A, Am, An, STARPU_R );
-    starpu_cham_exchange_data_before_execution( options, &params, &nbdata, descrs, B, Bm, Bn, STARPU_R );
-    starpu_cham_exchange_data_before_execution( options, &params, &nbdata, descrs, C, Cm, Cn, accessC  );
+    starpu_cham_exchange_tile_before_execution( options, &params, &nbdata, descrs, A, Am, An, STARPU_R );
+    starpu_cham_exchange_tile_before_execution( options, &params, &nbdata, descrs, B, Bm, Bn, STARPU_R );
+    starpu_cham_exchange_tile_before_execution( options, &params, &nbdata, descrs, C, Cm, Cn, accessC  );
 
     /*
      * Not involved, let's return
@@ -391,4 +392,5 @@ void INSERT_TASK_zhemm( const RUNTIME_option_t *options,
                                 B, Bm, Bn,
                          beta,  C, Cm, Cn );
 }
-#endif
+
+#endif /* defined(CHAMELEON_STARPU_USE_INSERT) */
diff --git a/runtime/starpu/codelets/codelet_zher2k.c b/runtime/starpu/codelets/codelet_zher2k.c
index 04c5354996e62e3f70b2ed908124ae0a88eeec69..455427bc90ad26d5a52a322d0617256e80964824 100644
--- a/runtime/starpu/codelets/codelet_zher2k.c
+++ b/runtime/starpu/codelets/codelet_zher2k.c
@@ -108,6 +108,7 @@ CODELETS( zher2k, cl_zher2k_cpu_func, cl_zher2k_cuda_func, STARPU_CUDA_ASYNC )
 #endif
 
 #if defined(CHAMELEON_STARPU_USE_INSERT)
+
 void INSERT_TASK_zher2k( const RUNTIME_option_t *options,
                          cham_uplo_t uplo, cham_trans_t trans,
                          int n, int k, int nb,
@@ -175,7 +176,7 @@ void INSERT_TASK_zher2k( const RUNTIME_option_t *options,
     (void)nb;
 }
 
-#else
+#else /* defined(CHAMELEON_STARPU_USE_INSERT) */
 
 void INSERT_TASK_zher2k( const RUNTIME_option_t *options,
                          cham_uplo_t uplo, cham_trans_t trans,
@@ -200,9 +201,9 @@ void INSERT_TASK_zher2k( const RUNTIME_option_t *options,
      * Set the data handles and initialize exchanges if needed
      */
     starpu_cham_exchange_init_params( options, &params, C->get_rankof( C, Cm, Cn ) );
-    starpu_cham_exchange_data_before_execution( options, &params, &nbdata, descrs, A, Am, An, STARPU_R );
-    starpu_cham_exchange_data_before_execution( options, &params, &nbdata, descrs, B, Bm, Bn, STARPU_R );
-    starpu_cham_exchange_data_before_execution( options, &params, &nbdata, descrs, C, Cm, Cn, accessC  );
+    starpu_cham_exchange_tile_before_execution( options, &params, &nbdata, descrs, A, Am, An, STARPU_R );
+    starpu_cham_exchange_tile_before_execution( options, &params, &nbdata, descrs, B, Bm, Bn, STARPU_R );
+    starpu_cham_exchange_tile_before_execution( options, &params, &nbdata, descrs, C, Cm, Cn, accessC  );
 
     /*
      * Not involved, let's return
@@ -256,4 +257,4 @@ void INSERT_TASK_zher2k( const RUNTIME_option_t *options,
     (void)nb;
 }
 
-#endif
+#endif /* defined(CHAMELEON_STARPU_USE_INSERT) */
diff --git a/runtime/starpu/codelets/codelet_zherk.c b/runtime/starpu/codelets/codelet_zherk.c
index 7ea5448cad03886644367b3b641f2ffaa9b665e8..beba72bf4cb5cfd5c6feda024c71fd9dbed7db58 100644
--- a/runtime/starpu/codelets/codelet_zherk.c
+++ b/runtime/starpu/codelets/codelet_zherk.c
@@ -110,6 +110,7 @@ CODELETS( zherk, cl_zherk_cpu_func, cl_zherk_cuda_func, STARPU_CUDA_ASYNC )
 #endif
 
 #if defined(CHAMELEON_STARPU_USE_INSERT)
+
 void INSERT_TASK_zherk( const RUNTIME_option_t *options,
                         cham_uplo_t uplo, cham_trans_t trans,
                         int n, int k, int nb,
@@ -175,7 +176,7 @@ void INSERT_TASK_zherk( const RUNTIME_option_t *options,
     (void)nb;
 }
 
-#else
+#else /* defined(CHAMELEON_STARPU_USE_INSERT) */
 
 void INSERT_TASK_zherk( const RUNTIME_option_t *options,
                         cham_uplo_t uplo, cham_trans_t trans,
@@ -199,8 +200,8 @@ void INSERT_TASK_zherk( const RUNTIME_option_t *options,
      * Set the data handles and initialize exchanges if needed
      */
     starpu_cham_exchange_init_params( options, &params, C->get_rankof( C, Cm, Cn ) );
-    starpu_cham_exchange_data_before_execution( options, &params, &nbdata, descrs, A, Am, An, STARPU_R );
-    starpu_cham_exchange_data_before_execution( options, &params, &nbdata, descrs, C, Cm, Cn, accessC  );
+    starpu_cham_exchange_tile_before_execution( options, &params, &nbdata, descrs, A, Am, An, STARPU_R );
+    starpu_cham_exchange_tile_before_execution( options, &params, &nbdata, descrs, C, Cm, Cn, accessC  );
 
     /*
      * Not involved, let's return
@@ -253,4 +254,4 @@ void INSERT_TASK_zherk( const RUNTIME_option_t *options,
     (void)nb;
 }
 
-#endif
+#endif /* defined(CHAMELEON_STARPU_USE_INSERT) */
diff --git a/runtime/starpu/codelets/codelet_zlascal.c b/runtime/starpu/codelets/codelet_zlascal.c
index 7478942fe3fe48b1bceeb0e9474243ac016cce8f..b9ddb9a8c83659dea3a4bddc6abea31180a57cf6 100644
--- a/runtime/starpu/codelets/codelet_zlascal.c
+++ b/runtime/starpu/codelets/codelet_zlascal.c
@@ -50,6 +50,7 @@ cl_zlascal_cpu_func( void *descr[], void *cl_arg )
 CODELETS_CPU( zlascal, cl_zlascal_cpu_func )
 
 #if defined(CHAMELEON_STARPU_USE_INSERT)
+
 void INSERT_TASK_zlascal( const RUNTIME_option_t *options,
                           cham_uplo_t uplo,
                           int m, int n, int nb,
@@ -104,7 +105,7 @@ void INSERT_TASK_zlascal( const RUNTIME_option_t *options,
     (void)nb;
 }
 
-#else
+#else /* defined(CHAMELEON_STARPU_USE_INSERT) */
 
 void INSERT_TASK_zlascal( const RUNTIME_option_t *options,
                           cham_uplo_t uplo,
@@ -127,7 +128,7 @@ void INSERT_TASK_zlascal( const RUNTIME_option_t *options,
      * Set the data handles and initialize exchanges if needed
      */
     starpu_cham_exchange_init_params( options, &params, A->get_rankof( A, Am, An ) );
-    starpu_cham_exchange_data_before_execution( options, &params, &nbdata, descrs, A, Am, An, STARPU_RW );
+    starpu_cham_exchange_tile_before_execution( options, &params, &nbdata, descrs, A, Am, An, STARPU_RW );
 
     /*
      * Not involved, let's return
@@ -177,4 +178,4 @@ void INSERT_TASK_zlascal( const RUNTIME_option_t *options,
     (void)nb;
 }
 
-#endif
+#endif /* defined(CHAMELEON_STARPU_USE_INSERT) */
diff --git a/runtime/starpu/codelets/codelet_zpotrf.c b/runtime/starpu/codelets/codelet_zpotrf.c
index fb83eccc0d65e348efa665eb4f84df5563e246a4..80be1490512d9cc63ddfc6a2f9d98cd6d9f92585 100644
--- a/runtime/starpu/codelets/codelet_zpotrf.c
+++ b/runtime/starpu/codelets/codelet_zpotrf.c
@@ -66,6 +66,7 @@ CODELETS_CPU( zpotrf, cl_zpotrf_cpu_func )
 #endif
 
 #if defined(CHAMELEON_STARPU_USE_INSERT)
+
 void INSERT_TASK_zpotrf( const RUNTIME_option_t *options,
                          cham_uplo_t uplo, int n, int nb,
                          const CHAM_desc_t *A, int Am, int An,
@@ -116,7 +117,7 @@ void INSERT_TASK_zpotrf( const RUNTIME_option_t *options,
     (void)nb;
 }
 
-#else
+#else /* defined(CHAMELEON_STARPU_USE_INSERT) */
 
 void INSERT_TASK_zpotrf( const RUNTIME_option_t *options,
                          cham_uplo_t uplo, int n, int nb,
@@ -129,7 +130,7 @@ void INSERT_TASK_zpotrf( const RUNTIME_option_t *options,
      * Set the data handles and initialize exchanges if needed
      */
     starpu_cham_exchange_init_params( options, &params, A->get_rankof( A, Am, An ) );
-    starpu_cham_exchange_data_before_execution( options, &params, &nbdata, descrs, A, Am, An, STARPU_RW );
+    starpu_cham_exchange_tile_before_execution( options, &params, &nbdata, descrs, A, Am, An, STARPU_RW );
 
     /*
      * Not involved, let's return
@@ -180,4 +181,4 @@ void INSERT_TASK_zpotrf( const RUNTIME_option_t *options,
     (void)nb;
 }
 
-#endif
+#endif /* defined(CHAMELEON_STARPU_USE_INSERT) */
diff --git a/runtime/starpu/codelets/codelet_zsymm.c b/runtime/starpu/codelets/codelet_zsymm.c
index 4298cd8dd3716c1d112949eaa6689cbacad68a37..c715baff60f576206889892a9d6e07263041c9a1 100644
--- a/runtime/starpu/codelets/codelet_zsymm.c
+++ b/runtime/starpu/codelets/codelet_zsymm.c
@@ -127,6 +127,7 @@ CODELETS( zsymm, cl_zsymm_cpu_func, cl_zsymm_cuda_func, STARPU_CUDA_ASYNC )
 #endif
 
 #if defined(CHAMELEON_STARPU_USE_INSERT)
+
 void INSERT_TASK_zsymm_Astat( const RUNTIME_option_t *options,
                               cham_side_t side, cham_uplo_t uplo,
                               int m, int n, int nb,
@@ -275,7 +276,7 @@ void INSERT_TASK_zsymm( const RUNTIME_option_t *options,
         0 );
 }
 
-#else
+#else /* defined(CHAMELEON_STARPU_USE_INSERT) */
 
 void __INSERT_TASK_zsymm( const RUNTIME_option_t *options,
                           cham_side_t side, cham_uplo_t uplo,
@@ -296,9 +297,9 @@ void __INSERT_TASK_zsymm( const RUNTIME_option_t *options,
      * Set the data handles and initialize exchanges if needed
      */
     starpu_cham_exchange_init_params( options, &params, xrank );
-    starpu_cham_exchange_data_before_execution( options, &params, &nbdata, descrs, A, Am, An, STARPU_R );
-    starpu_cham_exchange_data_before_execution( options, &params, &nbdata, descrs, B, Bm, Bn, STARPU_R );
-    starpu_cham_exchange_data_before_execution( options, &params, &nbdata, descrs, C, Cm, Cn, accessC  );
+    starpu_cham_exchange_tile_before_execution( options, &params, &nbdata, descrs, A, Am, An, STARPU_R );
+    starpu_cham_exchange_tile_before_execution( options, &params, &nbdata, descrs, B, Bm, Bn, STARPU_R );
+    starpu_cham_exchange_tile_before_execution( options, &params, &nbdata, descrs, C, Cm, Cn, accessC  );
 
     /*
      * Not involved, let's return
@@ -392,4 +393,5 @@ void INSERT_TASK_zsymm( const RUNTIME_option_t *options,
                                 B, Bm, Bn,
                          beta,  C, Cm, Cn );
 }
-#endif
+
+#endif /* defined(CHAMELEON_STARPU_USE_INSERT) */
diff --git a/runtime/starpu/codelets/codelet_zsyr2k.c b/runtime/starpu/codelets/codelet_zsyr2k.c
index 6ab60fbe5831fc58ccb18c8b1c3d8346ef49ca47..145b926466b2758ada8efd859bc1924bff52ad8e 100644
--- a/runtime/starpu/codelets/codelet_zsyr2k.c
+++ b/runtime/starpu/codelets/codelet_zsyr2k.c
@@ -109,6 +109,7 @@ CODELETS( zsyr2k, cl_zsyr2k_cpu_func, cl_zsyr2k_cuda_func, STARPU_CUDA_ASYNC )
 #endif
 
 #if defined(CHAMELEON_STARPU_USE_INSERT)
+
 void INSERT_TASK_zsyr2k( const RUNTIME_option_t *options,
                          cham_uplo_t uplo, cham_trans_t trans,
                          int n, int k, int nb,
@@ -176,7 +177,7 @@ void INSERT_TASK_zsyr2k( const RUNTIME_option_t *options,
     (void)nb;
 }
 
-#else
+#else /* defined(CHAMELEON_STARPU_USE_INSERT) */
 
 void INSERT_TASK_zsyr2k( const RUNTIME_option_t *options,
                          cham_uplo_t uplo, cham_trans_t trans,
@@ -201,9 +202,9 @@ void INSERT_TASK_zsyr2k( const RUNTIME_option_t *options,
      * Set the data handles and initialize exchanges if needed
      */
     starpu_cham_exchange_init_params( options, &params, C->get_rankof( C, Cm, Cn ) );
-    starpu_cham_exchange_data_before_execution( options, &params, &nbdata, descrs, A, Am, An, STARPU_R );
-    starpu_cham_exchange_data_before_execution( options, &params, &nbdata, descrs, B, Bm, Bn, STARPU_R );
-    starpu_cham_exchange_data_before_execution( options, &params, &nbdata, descrs, C, Cm, Cn, accessC  );
+    starpu_cham_exchange_tile_before_execution( options, &params, &nbdata, descrs, A, Am, An, STARPU_R );
+    starpu_cham_exchange_tile_before_execution( options, &params, &nbdata, descrs, B, Bm, Bn, STARPU_R );
+    starpu_cham_exchange_tile_before_execution( options, &params, &nbdata, descrs, C, Cm, Cn, accessC  );
 
     /*
      * Not involved, let's return
@@ -257,4 +258,4 @@ void INSERT_TASK_zsyr2k( const RUNTIME_option_t *options,
     (void)nb;
 }
 
-#endif
+#endif /* defined(CHAMELEON_STARPU_USE_INSERT) */
diff --git a/runtime/starpu/codelets/codelet_zsyrk.c b/runtime/starpu/codelets/codelet_zsyrk.c
index d2ea231706b2409f5c440986f0af2175dcb40390..722aa51729022207759258c583bc6c9363851dcd 100644
--- a/runtime/starpu/codelets/codelet_zsyrk.c
+++ b/runtime/starpu/codelets/codelet_zsyrk.c
@@ -111,6 +111,7 @@ CODELETS( zsyrk, cl_zsyrk_cpu_func, cl_zsyrk_cuda_func, STARPU_CUDA_ASYNC )
 #endif
 
 #if defined(CHAMELEON_STARPU_USE_INSERT)
+
 void INSERT_TASK_zsyrk( const RUNTIME_option_t *options,
                         cham_uplo_t uplo, cham_trans_t trans,
                         int n, int k, int nb,
@@ -176,7 +177,7 @@ void INSERT_TASK_zsyrk( const RUNTIME_option_t *options,
     (void)nb;
 }
 
-#else
+#else /* defined(CHAMELEON_STARPU_USE_INSERT) */
 
 void INSERT_TASK_zsyrk( const RUNTIME_option_t *options,
                         cham_uplo_t uplo, cham_trans_t trans,
@@ -200,8 +201,8 @@ void INSERT_TASK_zsyrk( const RUNTIME_option_t *options,
      * Set the data handles and initialize exchanges if needed
      */
     starpu_cham_exchange_init_params( options, &params, C->get_rankof( C, Cm, Cn ) );
-    starpu_cham_exchange_data_before_execution( options, &params, &nbdata, descrs, A, Am, An, STARPU_R );
-    starpu_cham_exchange_data_before_execution( options, &params, &nbdata, descrs, C, Cm, Cn, accessC  );
+    starpu_cham_exchange_tile_before_execution( options, &params, &nbdata, descrs, A, Am, An, STARPU_R );
+    starpu_cham_exchange_tile_before_execution( options, &params, &nbdata, descrs, C, Cm, Cn, accessC  );
 
     /*
      * Not involved, let's return
@@ -254,4 +255,4 @@ void INSERT_TASK_zsyrk( const RUNTIME_option_t *options,
     (void)nb;
 }
 
-#endif
+#endif /* defined(CHAMELEON_STARPU_USE_INSERT) */
diff --git a/runtime/starpu/codelets/codelet_ztradd.c b/runtime/starpu/codelets/codelet_ztradd.c
index 3c9786734efe00dd355871336ab954922a4e0fcb..f88fdae60663dd49d12a53e4d5a822d466e603b2 100644
--- a/runtime/starpu/codelets/codelet_ztradd.c
+++ b/runtime/starpu/codelets/codelet_ztradd.c
@@ -54,6 +54,7 @@ cl_ztradd_cpu_func(void *descr[], void *cl_arg)
 CODELETS_CPU( ztradd, cl_ztradd_cpu_func )
 
 #if defined(CHAMELEON_STARPU_USE_INSERT)
+
 void INSERT_TASK_ztradd( const RUNTIME_option_t *options,
                          cham_uplo_t uplo, cham_trans_t trans, int m, int n, int nb,
                          CHAMELEON_Complex64_t alpha, const CHAM_desc_t *A, int Am, int An,
@@ -112,7 +113,7 @@ void INSERT_TASK_ztradd( const RUNTIME_option_t *options,
     (void)nb;
 }
 
-#else
+#else /* defined(CHAMELEON_STARPU_USE_INSERT) */
 
 void INSERT_TASK_ztradd( const RUNTIME_option_t *options,
                          cham_uplo_t uplo, cham_trans_t trans, int m, int n, int nb,
@@ -136,8 +137,8 @@ void INSERT_TASK_ztradd( const RUNTIME_option_t *options,
      * Set the data handles and initialize exchanges if needed
      */
     starpu_cham_exchange_init_params( options, &params, B->get_rankof( B, Bm, Bn ) );
-    starpu_cham_exchange_data_before_execution( options, &params, &nbdata, descrs, A, Am, An, STARPU_R );
-    starpu_cham_exchange_data_before_execution( options, &params, &nbdata, descrs, B, Bm, Bn, accessB  );
+    starpu_cham_exchange_tile_before_execution( options, &params, &nbdata, descrs, A, Am, An, STARPU_R );
+    starpu_cham_exchange_tile_before_execution( options, &params, &nbdata, descrs, B, Bm, Bn, accessB  );
 
     /*
      * Not involved, let's return
@@ -190,4 +191,4 @@ void INSERT_TASK_ztradd( const RUNTIME_option_t *options,
     (void)nb;
 }
 
-#endif
+#endif /* defined(CHAMELEON_STARPU_USE_INSERT) */
diff --git a/runtime/starpu/codelets/codelet_ztrmm.c b/runtime/starpu/codelets/codelet_ztrmm.c
index bafef35505b4bed91e0ef7f268102589ed4a3fec..c44697a83b9c562d722df59c6328bffd53ef797a 100644
--- a/runtime/starpu/codelets/codelet_ztrmm.c
+++ b/runtime/starpu/codelets/codelet_ztrmm.c
@@ -107,6 +107,7 @@ CODELETS( ztrmm, cl_ztrmm_cpu_func, cl_ztrmm_cuda_func, STARPU_CUDA_ASYNC )
 #endif
 
 #if defined(CHAMELEON_STARPU_USE_INSERT)
+
 void INSERT_TASK_ztrmm( const RUNTIME_option_t *options,
                         cham_side_t side, cham_uplo_t uplo, cham_trans_t transA, cham_diag_t diag,
                         int m, int n, int nb,
@@ -162,7 +163,7 @@ void INSERT_TASK_ztrmm( const RUNTIME_option_t *options,
     (void)nb;
 }
 
-#else
+#else /* defined(CHAMELEON_STARPU_USE_INSERT) */
 
 void INSERT_TASK_ztrmm( const RUNTIME_option_t *options,
                         cham_side_t side, cham_uplo_t uplo, cham_trans_t transA, cham_diag_t diag,
@@ -176,8 +177,8 @@ void INSERT_TASK_ztrmm( const RUNTIME_option_t *options,
      * Set the data handles and initialize exchanges if needed
      */
     starpu_cham_exchange_init_params( options, &params, B->get_rankof( B, Bm, Bn ) );
-    starpu_cham_exchange_data_before_execution( options, &params, &nbdata, descrs, A, Am, An, STARPU_R  );
-    starpu_cham_exchange_data_before_execution( options, &params, &nbdata, descrs, B, Bm, Bn, STARPU_RW );
+    starpu_cham_exchange_tile_before_execution( options, &params, &nbdata, descrs, A, Am, An, STARPU_R  );
+    starpu_cham_exchange_tile_before_execution( options, &params, &nbdata, descrs, B, Bm, Bn, STARPU_RW );
 
     /*
      * Not involved, let's return
@@ -231,4 +232,4 @@ void INSERT_TASK_ztrmm( const RUNTIME_option_t *options,
     (void)nb;
 }
 
-#endif
+#endif /* defined(CHAMELEON_STARPU_USE_INSERT) */
diff --git a/runtime/starpu/codelets/codelet_ztrsm.c b/runtime/starpu/codelets/codelet_ztrsm.c
index 70fdf057fa3e087bfe9e0d4df61b8727c7aae492..719ce05c3369c4433976554e105ea5a18da73872 100644
--- a/runtime/starpu/codelets/codelet_ztrsm.c
+++ b/runtime/starpu/codelets/codelet_ztrsm.c
@@ -114,6 +114,7 @@ CODELETS( ztrsm, cl_ztrsm_cpu_func, cl_ztrsm_cuda_func, STARPU_CUDA_ASYNC )
 #endif
 
 #if defined(CHAMELEON_STARPU_USE_INSERT)
+
 void INSERT_TASK_ztrsm( const RUNTIME_option_t *options,
                         cham_side_t side, cham_uplo_t uplo, cham_trans_t transA, cham_diag_t diag,
                         int m, int n, int nb,
@@ -170,7 +171,7 @@ void INSERT_TASK_ztrsm( const RUNTIME_option_t *options,
     (void)nb;
 }
 
-#else
+#else /* defined(CHAMELEON_STARPU_USE_INSERT) */
 
 void INSERT_TASK_ztrsm( const RUNTIME_option_t *options,
                         cham_side_t side, cham_uplo_t uplo, cham_trans_t transA, cham_diag_t diag,
@@ -184,8 +185,8 @@ void INSERT_TASK_ztrsm( const RUNTIME_option_t *options,
      * Set the data handles and initialize exchanges if needed
      */
     starpu_cham_exchange_init_params( options, &params, B->get_rankof( B, Bm, Bn ) );
-    starpu_cham_exchange_data_before_execution( options, &params, &nbdata, descrs, A, Am, An, STARPU_R  );
-    starpu_cham_exchange_data_before_execution( options, &params, &nbdata, descrs, B, Bm, Bn, STARPU_RW );
+    starpu_cham_exchange_tile_before_execution( options, &params, &nbdata, descrs, A, Am, An, STARPU_R  );
+    starpu_cham_exchange_tile_before_execution( options, &params, &nbdata, descrs, B, Bm, Bn, STARPU_RW );
 
     /*
      * Not involved, let's return
@@ -239,4 +240,4 @@ void INSERT_TASK_ztrsm( const RUNTIME_option_t *options,
     (void)nb;
 }
 
-#endif
+#endif /* defined(CHAMELEON_STARPU_USE_INSERT) */
diff --git a/runtime/starpu/include/chameleon_starpu_internal.h b/runtime/starpu/include/chameleon_starpu_internal.h
index a32a183e3d3f1af367040bfcd506d4c14b1bd21f..1100baeeb5a5065d5565697187162aa974c727ac 100644
--- a/runtime/starpu/include/chameleon_starpu_internal.h
+++ b/runtime/starpu/include/chameleon_starpu_internal.h
@@ -320,7 +320,7 @@ starpu_cham_exchange_handle_before_execution( const RUNTIME_option_t
 }
 
 static inline void
-starpu_cham_exchange_data_before_execution( const RUNTIME_option_t                 *options,
+starpu_cham_exchange_tile_before_execution( const RUNTIME_option_t                 *options,
                                             struct starpu_mpi_task_exchange_params *params,
                                             int                                    *nbdata,
                                             struct starpu_data_descr               *descrs,
@@ -455,7 +455,7 @@ starpu_cham_exchange_handle_before_execution( const RUNTIME_option_t
  *
  */
 static inline void
-starpu_cham_exchange_data_before_execution( const RUNTIME_option_t                 *options,
+starpu_cham_exchange_tile_before_execution( const RUNTIME_option_t                 *options,
                                             struct starpu_mpi_task_exchange_params *params,
                                             int                                    *nbdata,
                                             struct starpu_data_descr               *descrs,