diff --git a/include/chameleon.h b/include/chameleon.h
index e12a3c59372456184cacc8131358c2e7eaf67e17..da34cab2ab698707fd3a240487aefe7115854d4b 100644
--- a/include/chameleon.h
+++ b/include/chameleon.h
@@ -56,11 +56,11 @@
  */
 int CHAMELEON_map_Tile( cham_uplo_t           uplo,
                         CHAM_desc_t          *A,
-                        cham_unary_operator_t operator,
+                        cham_unary_operator_t op_fct,
                         void                 *op_args );
 int CHAMELEON_map_Tile_Async( cham_uplo_t           uplo,
                               CHAM_desc_t          *A,
-                              cham_unary_operator_t operator,
+                              cham_unary_operator_t op_fct,
                               void                 *op_args,
                               RUNTIME_sequence_t   *sequence,
                               RUNTIME_request_t    *request );
diff --git a/include/chameleon/tasks.h b/include/chameleon/tasks.h
index b8f91fb211f98a417a9c722794df6c45c441dcdc..4bbea72815d36440eb9e4ac24040041b35bbf199 100644
--- a/include/chameleon/tasks.h
+++ b/include/chameleon/tasks.h
@@ -97,7 +97,7 @@ typedef int (*cham_unary_operator_t)( const CHAM_desc_t *desc,
 
 void INSERT_TASK_map( const RUNTIME_option_t *options,
                       cham_uplo_t uplo, const CHAM_desc_t *A, int Am, int An,
-                      cham_unary_operator_t operator, void *op_args );
+                      cham_unary_operator_t op_fct, void *op_args );
 
 #include "chameleon/tasks_z.h"
 #include "chameleon/tasks_d.h"