diff --git a/runtime/parsec/CMakeLists.txt b/runtime/parsec/CMakeLists.txt
index 41ee03942296bcdd9d40483b3aa3efb809c5a6b7..f6ea641c8a81a836cb142d8b9b627108ce74c0e0 100644
--- a/runtime/parsec/CMakeLists.txt
+++ b/runtime/parsec/CMakeLists.txt
@@ -3,8 +3,8 @@
 # @copyright (c) 2009-2015 The University of Tennessee and The University
 #                          of Tennessee Research Foundation.
 #                          All rights reserved.
-# @copyright (c) 2012-2015 Inria. All rights reserved.
-# @copyright (c) 2012-2015 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved.
+# @copyright (c) 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
+#                          Univ. Bordeaux. All rights reserved.
 #
 ###
 #
@@ -26,9 +26,11 @@
 #  @date 13-07-2012
 #
 ###
-
 cmake_minimum_required(VERSION 2.8)
 
+include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/include )
+include_directories( ${CMAKE_CURRENT_BINARY_DIR}/include )
+
 # Generate headers for all possible precisions
 # --------------------------------------------
 set(RUNTIME_HDRS_GENERATED "")
@@ -42,47 +44,61 @@ set(RUNTIME_HDRS_GENERATED "")
 # Define the list of headers
 # --------------------------
 set(RUNTIME_HDRS
-    include/morse_parsec.h
-    ${RUNTIME_HDRS_GENERATED}
+    include/chameleon_parsec.h
     )
 
+# Add generated headers
+# ---------------------
+foreach( hdr_file ${RUNTIME_HDRS_GENERATED} )
+  list(APPEND RUNTIME_HDRS ${CMAKE_CURRENT_BINARY_DIR}/${hdr_file})
+endforeach()
+
 # Force generation of headers
 # ---------------------------
-add_custom_target(runtime_parsec_include ALL SOURCES ${RUNTIME_HDRS})
+add_custom_target(
+  runtime_parsec_include
+  ALL SOURCES ${RUNTIME_HDRS})
+
+# Installation
+# ------------
+install(
+  FILES ${RUNTIME_HDRS}
+  DESTINATION include/runtime/parsec )
 
-# Generate the morse common for all possible precisions
-# -----------------------------------------------------
+# Generate the Chameleon common for all possible precisions
+# ---------------------------------------------------------
 set(RUNTIME_COMMON_GENERATED "")
 set(ZSRC
-    control/runtime_zprofiling.c
-    control/runtime_zlocality.c
-    )
+  control/runtime_zprofiling.c
+  control/runtime_zlocality.c
+  )
 
-precisions_rules_py(RUNTIME_COMMON_GENERATED "${ZSRC}"
-                    PRECISIONS "${CHAMELEON_PRECISION}"
-                    TARGETDIR "control")
+precisions_rules_py(
+  RUNTIME_COMMON_GENERATED "${ZSRC}"
+  PRECISIONS "${CHAMELEON_PRECISION}"
+  TARGETDIR "control")
 
 set(RUNTIME_COMMON
-    control/runtime_async.c
-    control/runtime_context.c
-    control/runtime_control.c
-    control/runtime_descriptor.c
-    control/runtime_options.c
-    control/runtime_profiling.c
-    codelets/codelet_dataflush.c
-    ${RUNTIME_COMMON_GENERATED}
-    )
+  control/runtime_async.c
+  control/runtime_context.c
+  control/runtime_control.c
+  control/runtime_descriptor.c
+  control/runtime_options.c
+  control/runtime_profiling.c
+  codelets/codelet_dataflush.c
+  ${RUNTIME_COMMON_GENERATED}
+  )
 
-# Generate the morse sources for all possible precisions
-# ------------------------------------------------------
+# Generate the Chameleon sources for all possible precisions
+# ----------------------------------------------------------
 set(RUNTIME_SRCS_GENERATED "")
 set(ZSRC
-    ${CODELETS_ZSRC}
-    )
+  ${CODELETS_ZSRC}
+  )
 
 precisions_rules_py(RUNTIME_SRCS_GENERATED "${ZSRC}"
-                    PRECISIONS "${CHAMELEON_PRECISION}"
-                    TARGETDIR "codelets")
+  PRECISIONS "${CHAMELEON_PRECISION}"
+  TARGETDIR "codelets")
 
 set(RUNTIME_SRCS
   ${RUNTIME_COMMON}
@@ -114,7 +130,7 @@ endif()
 # installation
 # ------------
 install(TARGETS chameleon_parsec
-        DESTINATION lib)
+  DESTINATION lib)
 
 ###
 ### END CMakeLists.txt
diff --git a/runtime/parsec/codelets/codelet_dataflush.c b/runtime/parsec/codelets/codelet_dataflush.c
index 0a01e0cd92b44854453e83b8c2a08501da32892e..606f8dc7d5b194d1565785cfb8913af1055193dd 100644
--- a/runtime/parsec/codelets/codelet_dataflush.c
+++ b/runtime/parsec/codelets/codelet_dataflush.c
@@ -19,8 +19,8 @@
  * @precisions normal z -> c d s
  *
  **/
-
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/chameleon_tasks.h"
 
 void MORSE_TASK_dataflush(const MORSE_option_t *options,
                           const MORSE_desc_t *A, int Am, int An)
diff --git a/runtime/parsec/codelets/codelet_zasum.c b/runtime/parsec/codelets/codelet_zasum.c
index 401bede893f37596e69b2d4ef8e6941fbe7ad256..652824d6a6853475f10f1a399d0ff4dc0963720f 100644
--- a/runtime/parsec/codelets/codelet_zasum.c
+++ b/runtime/parsec/codelets/codelet_zasum.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_dzasum_parsec(dague_execution_unit_t    *context,
diff --git a/runtime/parsec/codelets/codelet_zaxpy.c b/runtime/parsec/codelets/codelet_zaxpy.c
index ef3e8983ffc8a8af5b0016c517cda621e9849c95..be1c2a24e46bff5fd53593637f5d4bd988038045 100644
--- a/runtime/parsec/codelets/codelet_zaxpy.c
+++ b/runtime/parsec/codelets/codelet_zaxpy.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zaxpy_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_zbuild.c b/runtime/parsec/codelets/codelet_zbuild.c
index 0adbbe29c0f30bbdc80c923f3c08ef404bc82ded..9b6c3f8dc87cc6210979f130dd2c706fde6594bd 100644
--- a/runtime/parsec/codelets/codelet_zbuild.c
+++ b/runtime/parsec/codelets/codelet_zbuild.c
@@ -22,7 +22,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static inline int
 CORE_zbuild_parsec(dague_execution_unit_t    *context,
diff --git a/runtime/parsec/codelets/codelet_zgeadd.c b/runtime/parsec/codelets/codelet_zgeadd.c
index 3f3fcbad85de9d5fcc37d85ce7b5d8662f7a1350..4fdfe8ac1182d499afe27768129d3eb507548d14 100644
--- a/runtime/parsec/codelets/codelet_zgeadd.c
+++ b/runtime/parsec/codelets/codelet_zgeadd.c
@@ -25,7 +25,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zgeadd_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_zgelqt.c b/runtime/parsec/codelets/codelet_zgelqt.c
index eebd02cc0b6c1fd0173ab5e86a5644b575ab8c36..cc98f0c6f16878e1c561297fc4c7bf8a71299cc5 100644
--- a/runtime/parsec/codelets/codelet_zgelqt.c
+++ b/runtime/parsec/codelets/codelet_zgelqt.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /***************************************************************************//**
  *
diff --git a/runtime/parsec/codelets/codelet_zgemm.c b/runtime/parsec/codelets/codelet_zgemm.c
index 5d100cf5d1753f14c92cca2ac9b2a3de594bbbdb..983a5090a7e211e88614579a9b6b0a6ce60e367a 100644
--- a/runtime/parsec/codelets/codelet_zgemm.c
+++ b/runtime/parsec/codelets/codelet_zgemm.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /***************************************************************************//**
  *
diff --git a/runtime/parsec/codelets/codelet_zgeqrt.c b/runtime/parsec/codelets/codelet_zgeqrt.c
index f9d9b55882fbbef50efb7cb49e0ef3756835be16..a0832e2140ff6a605d43e99e7d64c6d9f68fb4df 100644
--- a/runtime/parsec/codelets/codelet_zgeqrt.c
+++ b/runtime/parsec/codelets/codelet_zgeqrt.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /***************************************************************************//**
  *
diff --git a/runtime/parsec/codelets/codelet_zgessm.c b/runtime/parsec/codelets/codelet_zgessm.c
index d06acae872c5f9b5daad13dc0c01842fc16e9bd7..28a588f23e22eaec67ba4c09375889a9d191c073 100644
--- a/runtime/parsec/codelets/codelet_zgessm.c
+++ b/runtime/parsec/codelets/codelet_zgessm.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /***************************************************************************//**
  *
diff --git a/runtime/parsec/codelets/codelet_zgessq.c b/runtime/parsec/codelets/codelet_zgessq.c
index 7f5784c0fac7829286f516c99c12234591a81979..52555cda1ca0633e924972dcae10d32070cbb2a5 100644
--- a/runtime/parsec/codelets/codelet_zgessq.c
+++ b/runtime/parsec/codelets/codelet_zgessq.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zgessq_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_zgetrf.c b/runtime/parsec/codelets/codelet_zgetrf.c
index c5a5d20289f6fa84fbd61f5bb3bbfae2b14b7f9d..c774b4512ce626b26307bd8af5d5ea63fff28675 100644
--- a/runtime/parsec/codelets/codelet_zgetrf.c
+++ b/runtime/parsec/codelets/codelet_zgetrf.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zgetrf_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_zgetrf_incpiv.c b/runtime/parsec/codelets/codelet_zgetrf_incpiv.c
index 775fbc0ab5ffbe829ec46eb28415ec409a418b11..d6575ea16fc6487724bc0fce6416e88c0bbe6202 100644
--- a/runtime/parsec/codelets/codelet_zgetrf_incpiv.c
+++ b/runtime/parsec/codelets/codelet_zgetrf_incpiv.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /***************************************************************************//**
  *
diff --git a/runtime/parsec/codelets/codelet_zgetrf_nopiv.c b/runtime/parsec/codelets/codelet_zgetrf_nopiv.c
index 3b6b7ddc763109865759e9b14a84a28c0993796e..3e8640fa7091e814c75a2187785cf7212fbc567a 100644
--- a/runtime/parsec/codelets/codelet_zgetrf_nopiv.c
+++ b/runtime/parsec/codelets/codelet_zgetrf_nopiv.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /***************************************************************************//**
  *
diff --git a/runtime/parsec/codelets/codelet_zhe2ge.c b/runtime/parsec/codelets/codelet_zhe2ge.c
index 8e16a10e408d0df9de309b4980497461e5e67465..b9300a1e9fcdfe4daa192f453de528577ff8b556 100644
--- a/runtime/parsec/codelets/codelet_zhe2ge.c
+++ b/runtime/parsec/codelets/codelet_zhe2ge.c
@@ -20,7 +20,8 @@
  *
  **/
 
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/parsec/codelets/codelet_zhemm.c b/runtime/parsec/codelets/codelet_zhemm.c
index 628849093029ab9de7d28bb71951663c1eca9403..b6426c1d5af8bda119bf96e2479e3fd5be10df3e 100644
--- a/runtime/parsec/codelets/codelet_zhemm.c
+++ b/runtime/parsec/codelets/codelet_zhemm.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /***************************************************************************//**
  *
diff --git a/runtime/parsec/codelets/codelet_zher2k.c b/runtime/parsec/codelets/codelet_zher2k.c
index ffef4285dd3ead8cd9b33628c1bc80bc265896b9..e854efd0d2406525e9addd90c15fd077e9cf174f 100644
--- a/runtime/parsec/codelets/codelet_zher2k.c
+++ b/runtime/parsec/codelets/codelet_zher2k.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /***************************************************************************//**
  *
diff --git a/runtime/parsec/codelets/codelet_zherfb.c b/runtime/parsec/codelets/codelet_zherfb.c
index 4071608ad805f95937cd86f8ddc33f3994331741..fc1221af93ce1cf403078ea7c2c8f78eb6098054 100644
--- a/runtime/parsec/codelets/codelet_zherfb.c
+++ b/runtime/parsec/codelets/codelet_zherfb.c
@@ -22,7 +22,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static inline int
 CORE_zherfb_parsec(dague_execution_unit_t    *context,
diff --git a/runtime/parsec/codelets/codelet_zherk.c b/runtime/parsec/codelets/codelet_zherk.c
index e97808c90ed3bc542553666f4fb5809c43364752..ab3058548ca31d50de78fb2e3832d8574cbfdfc8 100644
--- a/runtime/parsec/codelets/codelet_zherk.c
+++ b/runtime/parsec/codelets/codelet_zherk.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /***************************************************************************//**
  *
diff --git a/runtime/parsec/codelets/codelet_zhessq.c b/runtime/parsec/codelets/codelet_zhessq.c
index 6e39d809908c2a2c4cfafa474afefef3715e16e0..e0c7122ec0a5a120838aa93a676484e9ee2bd36d 100644
--- a/runtime/parsec/codelets/codelet_zhessq.c
+++ b/runtime/parsec/codelets/codelet_zhessq.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zhessq_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_zlacpy.c b/runtime/parsec/codelets/codelet_zlacpy.c
index 7f287535b355ec862e6da1e1f9afb4b6ff651d0b..30bceac04fd70fc24bdbd0a41ce0ffb536030569 100644
--- a/runtime/parsec/codelets/codelet_zlacpy.c
+++ b/runtime/parsec/codelets/codelet_zlacpy.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /***************************************************************************//**
  *
diff --git a/runtime/parsec/codelets/codelet_zlag2c.c b/runtime/parsec/codelets/codelet_zlag2c.c
index 7b5c30af362dbd10869e20fca08c9761b5d1b18a..70503d8c370fc3656654dad68ce928f0b3990bd5 100644
--- a/runtime/parsec/codelets/codelet_zlag2c.c
+++ b/runtime/parsec/codelets/codelet_zlag2c.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /***************************************************************************//**
  *
diff --git a/runtime/parsec/codelets/codelet_zlange.c b/runtime/parsec/codelets/codelet_zlange.c
index 5d1bd5dd09718f3c87663175e3473fb550b2de03..3db3544c8e4608a081cc7d052c53806bbdc18506 100644
--- a/runtime/parsec/codelets/codelet_zlange.c
+++ b/runtime/parsec/codelets/codelet_zlange.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zlange_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_zlanhe.c b/runtime/parsec/codelets/codelet_zlanhe.c
index fc50a99381508c6e3960d729e90543c619c672ce..d89ca25e3bada92422a784cf3093f63f42d2c2aa 100644
--- a/runtime/parsec/codelets/codelet_zlanhe.c
+++ b/runtime/parsec/codelets/codelet_zlanhe.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zlanhe_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_zlansy.c b/runtime/parsec/codelets/codelet_zlansy.c
index 62cf558513eebb33d6f222a3be6c5bc9689ef3cd..f177a499a5ec129f97d39461126beb555fc1e67d 100644
--- a/runtime/parsec/codelets/codelet_zlansy.c
+++ b/runtime/parsec/codelets/codelet_zlansy.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zlansy_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_zlantr.c b/runtime/parsec/codelets/codelet_zlantr.c
index ed0cb32169f71826d1ce0036ead75f3e8b798e2a..74c28ee21f006434ac0eb2e2a32d53ed079bcc93 100644
--- a/runtime/parsec/codelets/codelet_zlantr.c
+++ b/runtime/parsec/codelets/codelet_zlantr.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zlantr_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_zlascal.c b/runtime/parsec/codelets/codelet_zlascal.c
index eb373c70d90744e16dc6c35876386b449718f05e..c3596615a815f20018039614e084a4b0a520c128 100644
--- a/runtime/parsec/codelets/codelet_zlascal.c
+++ b/runtime/parsec/codelets/codelet_zlascal.c
@@ -29,7 +29,8 @@
  *
  **/
 
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /***************************************************************************//**
  *
diff --git a/runtime/parsec/codelets/codelet_zlaset.c b/runtime/parsec/codelets/codelet_zlaset.c
index 8f81ee9a30ac3adbaeb08d864d88e6aba3182992..51207d2f9c9d4b491541ba365e55c3b1c0ab7ac8 100644
--- a/runtime/parsec/codelets/codelet_zlaset.c
+++ b/runtime/parsec/codelets/codelet_zlaset.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/parsec/codelets/codelet_zlaset2.c b/runtime/parsec/codelets/codelet_zlaset2.c
index 00986ce77734d5bd0d91c05853635320fa5b6afb..8dc8313ae45cb303c4a8a134f54c668fe16c006e 100644
--- a/runtime/parsec/codelets/codelet_zlaset2.c
+++ b/runtime/parsec/codelets/codelet_zlaset2.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /**
  *
diff --git a/runtime/parsec/codelets/codelet_zlatro.c b/runtime/parsec/codelets/codelet_zlatro.c
index 290b8be17b37643be6c18e7c3debb5a725bde0c8..28de87c156bd1220e38b29cfc04191fcd287ba35 100644
--- a/runtime/parsec/codelets/codelet_zlatro.c
+++ b/runtime/parsec/codelets/codelet_zlatro.c
@@ -21,7 +21,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static inline int
 CORE_zlatro_parsec(dague_execution_unit_t    *context,
diff --git a/runtime/parsec/codelets/codelet_zlauum.c b/runtime/parsec/codelets/codelet_zlauum.c
index d11bd483fe9c91d97a38f6fa0b1857d032d0ecc8..d8f769420c147d2b7b8718991c81469c8c43e5bc 100644
--- a/runtime/parsec/codelets/codelet_zlauum.c
+++ b/runtime/parsec/codelets/codelet_zlauum.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /***************************************************************************//**
  *
diff --git a/runtime/parsec/codelets/codelet_zpamm.c b/runtime/parsec/codelets/codelet_zpamm.c
index f8f86af48ae1dfeeb4f23667a2d03e5057e49c51..32bdd22755ab8c0e84d14cdc96afec91f2e471a1 100644
--- a/runtime/parsec/codelets/codelet_zpamm.c
+++ b/runtime/parsec/codelets/codelet_zpamm.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /***************************************************************************//**
  *
diff --git a/runtime/parsec/codelets/codelet_zplghe.c b/runtime/parsec/codelets/codelet_zplghe.c
index 00bc531a33f60f4d199a9c6c196666a08b0d1845..f483d28a281ab49c6e59bb1f5a54acd347b6c058 100644
--- a/runtime/parsec/codelets/codelet_zplghe.c
+++ b/runtime/parsec/codelets/codelet_zplghe.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zplghe_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_zplgsy.c b/runtime/parsec/codelets/codelet_zplgsy.c
index fa4d61fc61fbf57f7e23492f3d79a4857db51c54..39007484b80904a9713c17cd27195d8c81a83b90 100644
--- a/runtime/parsec/codelets/codelet_zplgsy.c
+++ b/runtime/parsec/codelets/codelet_zplgsy.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zplgsy_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_zplrnt.c b/runtime/parsec/codelets/codelet_zplrnt.c
index 52cf2efb8999f9663dfd60d62dd532bd14414160..a2ad71294fc4aeac612424230b44096a91f18861 100644
--- a/runtime/parsec/codelets/codelet_zplrnt.c
+++ b/runtime/parsec/codelets/codelet_zplrnt.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zplrnt_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_zplssq.c b/runtime/parsec/codelets/codelet_zplssq.c
index 935bb1528bce87a3d5cd14e5969966e869814b54..d524bdf2dee43b4f4076d160c6293a8e542c357b 100644
--- a/runtime/parsec/codelets/codelet_zplssq.c
+++ b/runtime/parsec/codelets/codelet_zplssq.c
@@ -21,7 +21,8 @@
  *
  **/
 #include <math.h>
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /*****************************************************************************
  *
diff --git a/runtime/parsec/codelets/codelet_zpotrf.c b/runtime/parsec/codelets/codelet_zpotrf.c
index bd3f02642dc1f0127664dbff167c081a8be2da2f..7189b1cf322532d161e179dd2b75326e39f5f9f1 100644
--- a/runtime/parsec/codelets/codelet_zpotrf.c
+++ b/runtime/parsec/codelets/codelet_zpotrf.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 /***************************************************************************//**
  *
diff --git a/runtime/parsec/codelets/codelet_zssssm.c b/runtime/parsec/codelets/codelet_zssssm.c
index 0e44386e2b30e44c073b37a0288b9ca9ce983b95..05373998b04f5998aed3e476d4325ed2452e0306 100644
--- a/runtime/parsec/codelets/codelet_zssssm.c
+++ b/runtime/parsec/codelets/codelet_zssssm.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zssssm_parsec(dague_execution_unit_t *context, dague_execution_context_t * this_task)
diff --git a/runtime/parsec/codelets/codelet_zsymm.c b/runtime/parsec/codelets/codelet_zsymm.c
index 63eeb66253984c7e5b0788998039d396d49701e6..24ee2e2266c6c94b43393a2c267e99a526b39a0a 100644
--- a/runtime/parsec/codelets/codelet_zsymm.c
+++ b/runtime/parsec/codelets/codelet_zsymm.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zsymm_parsec(dague_execution_unit_t *context, dague_execution_context_t * this_task)
diff --git a/runtime/parsec/codelets/codelet_zsyr2k.c b/runtime/parsec/codelets/codelet_zsyr2k.c
index 72fdbb1fc889f793d06006dbce09a85150efb55f..04f4a02e811b89c7d57bcc2b06979479b54cfe5e 100644
--- a/runtime/parsec/codelets/codelet_zsyr2k.c
+++ b/runtime/parsec/codelets/codelet_zsyr2k.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zsyr2k_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_zsyrk.c b/runtime/parsec/codelets/codelet_zsyrk.c
index 510e096f8d139ba883aa8dbce34e551084e4545c..ccec96554c3b6d73aa8f0e9a3abbc6174dc261e3 100644
--- a/runtime/parsec/codelets/codelet_zsyrk.c
+++ b/runtime/parsec/codelets/codelet_zsyrk.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zsyrk_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_zsyssq.c b/runtime/parsec/codelets/codelet_zsyssq.c
index 5db5be616979cda7e72b2eee1f054fd0fb12e85f..6a4964562e8fc3476fd5e0081af2b661ffcecfeb 100644
--- a/runtime/parsec/codelets/codelet_zsyssq.c
+++ b/runtime/parsec/codelets/codelet_zsyssq.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zsyssq_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_zsytrf_nopiv.c b/runtime/parsec/codelets/codelet_zsytrf_nopiv.c
index 1c70a7c1f433fcdd237e0fdc42e337082479c620..589852cf895b0615c7b05b4a9071fdb1557974c8 100644
--- a/runtime/parsec/codelets/codelet_zsytrf_nopiv.c
+++ b/runtime/parsec/codelets/codelet_zsytrf_nopiv.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zsytrf_nopiv_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_ztile_zero.c b/runtime/parsec/codelets/codelet_ztile_zero.c
index 366777c23cfc3e7abce17b7b2dc886672f76422e..8534663bfa5a1e7cb5cc7b9ece9d3f858153f9ca 100644
--- a/runtime/parsec/codelets/codelet_ztile_zero.c
+++ b/runtime/parsec/codelets/codelet_ztile_zero.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_ztile_zero_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_ztpmqrt.c b/runtime/parsec/codelets/codelet_ztpmqrt.c
index 612e9d54a8de58618269ad065f3416358513734e..e5e1c64f4d814573106f848f3b6ff89359f3d195 100644
--- a/runtime/parsec/codelets/codelet_ztpmqrt.c
+++ b/runtime/parsec/codelets/codelet_ztpmqrt.c
@@ -22,7 +22,8 @@
  * @precisions normal z -> s d c
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_ztpmqrt_parsec(dague_execution_unit_t    *context,
diff --git a/runtime/parsec/codelets/codelet_ztpqrt.c b/runtime/parsec/codelets/codelet_ztpqrt.c
index 6b8a3fe2d2292570b0ca560672ff3e90ab94c055..f88c74a2d93b98912d3947d7a144ece9982a8105 100644
--- a/runtime/parsec/codelets/codelet_ztpqrt.c
+++ b/runtime/parsec/codelets/codelet_ztpqrt.c
@@ -22,7 +22,8 @@
  * @precisions normal z -> s d c
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_ztpqrt_parsec(dague_execution_unit_t    *context,
diff --git a/runtime/parsec/codelets/codelet_ztradd.c b/runtime/parsec/codelets/codelet_ztradd.c
index 6cc12eaa15331e989aba5d952f6160997d64beff..7ff9a1412a5b14998e967ecde82d0791087fdcad 100644
--- a/runtime/parsec/codelets/codelet_ztradd.c
+++ b/runtime/parsec/codelets/codelet_ztradd.c
@@ -24,7 +24,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_ztradd_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_ztrasm.c b/runtime/parsec/codelets/codelet_ztrasm.c
index 91646d1df81ba781d0e23fe496ec3304811e97a1..0ab0002b21c9e09f1c870e73e4f35fd3051e5baa 100644
--- a/runtime/parsec/codelets/codelet_ztrasm.c
+++ b/runtime/parsec/codelets/codelet_ztrasm.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_ztrasm_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_ztrmm.c b/runtime/parsec/codelets/codelet_ztrmm.c
index 8b67404ab5ae582d7dca44fcad976ccc33a52188..0ba484ca03f23f52f05ad0dffec1236df6790a9e 100644
--- a/runtime/parsec/codelets/codelet_ztrmm.c
+++ b/runtime/parsec/codelets/codelet_ztrmm.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_ztrmm_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_ztrsm.c b/runtime/parsec/codelets/codelet_ztrsm.c
index aadddb98c052b92b48f7b879b5b93d94de8248b9..d04856576590c30b636944c79d5fbbf34e0317a9 100644
--- a/runtime/parsec/codelets/codelet_ztrsm.c
+++ b/runtime/parsec/codelets/codelet_ztrsm.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_ztrsm_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_ztrssq.c b/runtime/parsec/codelets/codelet_ztrssq.c
index 0dd120420b6929c3a106b7ad7418d04096dd5d82..85bbe1d908ed96209ed5dbb85094232ff5012c1e 100644
--- a/runtime/parsec/codelets/codelet_ztrssq.c
+++ b/runtime/parsec/codelets/codelet_ztrssq.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_ztrssq_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_ztrtri.c b/runtime/parsec/codelets/codelet_ztrtri.c
index d296e2105f110e0ab0c423ad1010f1a5aef4df44..9b8695510978f594ca9e1a91808f842ffe353a59 100644
--- a/runtime/parsec/codelets/codelet_ztrtri.c
+++ b/runtime/parsec/codelets/codelet_ztrtri.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_ztrtri_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_ztslqt.c b/runtime/parsec/codelets/codelet_ztslqt.c
index bebbb862feea1ef62a3fcc6a7edb64c8bd8e87d1..cb5146acd843c6e8a625050bb39e1e7ee3beaa64 100644
--- a/runtime/parsec/codelets/codelet_ztslqt.c
+++ b/runtime/parsec/codelets/codelet_ztslqt.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_ztslqt_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_ztsmlq.c b/runtime/parsec/codelets/codelet_ztsmlq.c
index eaae120c5608975757f6a67cf51f9d9774cc79c4..c569fbd96be53189776a5ae251e7f498092ef122 100644
--- a/runtime/parsec/codelets/codelet_ztsmlq.c
+++ b/runtime/parsec/codelets/codelet_ztsmlq.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_ztsmlq_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_ztsmlq_hetra1.c b/runtime/parsec/codelets/codelet_ztsmlq_hetra1.c
index 5ec643a18ed0ad4bb8af68967e12f70f86cf7147..691722e3bd2f038b46fc99ecda094a97e2630588 100644
--- a/runtime/parsec/codelets/codelet_ztsmlq_hetra1.c
+++ b/runtime/parsec/codelets/codelet_ztsmlq_hetra1.c
@@ -25,7 +25,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static inline int
 CORE_ztsmlq_hetra1_parsec(dague_execution_unit_t    *context,
diff --git a/runtime/parsec/codelets/codelet_ztsmqr.c b/runtime/parsec/codelets/codelet_ztsmqr.c
index 7369c2002e1d0f9e699b6817348d32ab825ed061..5b7223efdd01e3fd4078197fa42fdb81fce9f029 100644
--- a/runtime/parsec/codelets/codelet_ztsmqr.c
+++ b/runtime/parsec/codelets/codelet_ztsmqr.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_ztsmqr_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_ztsmqr_hetra1.c b/runtime/parsec/codelets/codelet_ztsmqr_hetra1.c
index 72045d8f101e26216933f879b6ad3f75c896c29a..b1a5af94d2766ad77065664fdec9d97e6adf11fd 100644
--- a/runtime/parsec/codelets/codelet_ztsmqr_hetra1.c
+++ b/runtime/parsec/codelets/codelet_ztsmqr_hetra1.c
@@ -25,7 +25,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static inline int
 CORE_ztsmqr_hetra1_parsec(dague_execution_unit_t    *context,
diff --git a/runtime/parsec/codelets/codelet_ztsqrt.c b/runtime/parsec/codelets/codelet_ztsqrt.c
index 22a01de1f13053e3a22a3ebde028d6f74c27806b..39a8f8e9ad6d61b7ccce38455b97972be7ab5bdf 100644
--- a/runtime/parsec/codelets/codelet_ztsqrt.c
+++ b/runtime/parsec/codelets/codelet_ztsqrt.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_ztsqrt_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_ztstrf.c b/runtime/parsec/codelets/codelet_ztstrf.c
index fccfd039759169c5d4da3c4c10d7dcb22de014a1..b6d412ef5973af7fcd0e44d1b73ed15ce4c1564f 100644
--- a/runtime/parsec/codelets/codelet_ztstrf.c
+++ b/runtime/parsec/codelets/codelet_ztstrf.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_ztstrf_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_zttlqt.c b/runtime/parsec/codelets/codelet_zttlqt.c
index cbd733dedbf97b84fa91bb863e4aaa77bfe09bd4..2f49bb9ce3d290d7c6adddc1ec2f3a3891e9303f 100644
--- a/runtime/parsec/codelets/codelet_zttlqt.c
+++ b/runtime/parsec/codelets/codelet_zttlqt.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zttlqt_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_zttmlq.c b/runtime/parsec/codelets/codelet_zttmlq.c
index a12ed573be8703a0c8e6d161ee97e95113492235..d74d593a0775366ecb6a93560dfe02729193f698 100644
--- a/runtime/parsec/codelets/codelet_zttmlq.c
+++ b/runtime/parsec/codelets/codelet_zttmlq.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zttmlq_parsec(dague_execution_unit_t *context, dague_execution_context_t * this_task)
diff --git a/runtime/parsec/codelets/codelet_zttmqr.c b/runtime/parsec/codelets/codelet_zttmqr.c
index 9d66160ef9dc74bb9c2bcce4c949d2c44af14a05..b38c27bc22ab8926ea4bb65721c8c45d8bb827f8 100644
--- a/runtime/parsec/codelets/codelet_zttmqr.c
+++ b/runtime/parsec/codelets/codelet_zttmqr.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zttmqr_parsec(dague_execution_unit_t *context, dague_execution_context_t * this_task)
diff --git a/runtime/parsec/codelets/codelet_zttqrt.c b/runtime/parsec/codelets/codelet_zttqrt.c
index c6a70698289ba35cb05ff3ebf8911ecb1eff9255..2ebd820efa849eec716eb66776d67821761902ba 100644
--- a/runtime/parsec/codelets/codelet_zttqrt.c
+++ b/runtime/parsec/codelets/codelet_zttqrt.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zttqrt_parsec(dague_execution_unit_t *context, dague_execution_context_t * this_task)
diff --git a/runtime/parsec/codelets/codelet_zunmlq.c b/runtime/parsec/codelets/codelet_zunmlq.c
index 8a9142db89605d899476c30b41cbb842f5c3832a..145e632679f268d4401f63b95458126d0102f27b 100644
--- a/runtime/parsec/codelets/codelet_zunmlq.c
+++ b/runtime/parsec/codelets/codelet_zunmlq.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zunmlq_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/codelets/codelet_zunmqr.c b/runtime/parsec/codelets/codelet_zunmqr.c
index c07e46c11c792b11b03a71e4427b6bbcd0341984..a1394dcc11f3ad4a94ba47eeecb891b82b74f458 100644
--- a/runtime/parsec/codelets/codelet_zunmqr.c
+++ b/runtime/parsec/codelets/codelet_zunmqr.c
@@ -20,7 +20,8 @@
  * @precisions normal z -> c d s
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
+#include "chameleon/morse_tasks_z.h"
 
 static int
 CORE_zunmqr_parsec(dague_execution_unit_t *context, dague_execution_context_t *this_task)
diff --git a/runtime/parsec/control/runtime_async.c b/runtime/parsec/control/runtime_async.c
index d101ba7c1d61baee13917fc4f28055df460538f5..8941100d1a5ff3e99eb62207576fae05f6561761 100644
--- a/runtime/parsec/control/runtime_async.c
+++ b/runtime/parsec/control/runtime_async.c
@@ -8,7 +8,7 @@
  *
  **/
 #include <stdlib.h>
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
 
 /*******************************************************************************
  *  Create a sequence
diff --git a/runtime/parsec/control/runtime_context.c b/runtime/parsec/control/runtime_context.c
index aba1e227dca4880c786c977a31126ca600562703..dee863d4f76a8748c41288436f7fc2ecc3f25a56 100644
--- a/runtime/parsec/control/runtime_context.c
+++ b/runtime/parsec/control/runtime_context.c
@@ -8,7 +8,7 @@
  *
  **/
 #include <stdlib.h>
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
 
 /*******************************************************************************
  *  Create new context
diff --git a/runtime/parsec/control/runtime_control.c b/runtime/parsec/control/runtime_control.c
index 9e6c2a3b17e8947349e116b7924dbb756f50967b..14527d2857b25ed2c0f42d014c7d580a06ed7d51 100644
--- a/runtime/parsec/control/runtime_control.c
+++ b/runtime/parsec/control/runtime_control.c
@@ -9,7 +9,7 @@
  **/
 #include <stdio.h>
 #include <stdlib.h>
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
 
 /*******************************************************************************
  * Thread rank.
diff --git a/runtime/parsec/control/runtime_descriptor.c b/runtime/parsec/control/runtime_descriptor.c
index f0790d0d6b2a2246fc4a993a410439ea5737b901..10f107ef070cd7251cb7808ba5bf69f1fdae1824 100644
--- a/runtime/parsec/control/runtime_descriptor.c
+++ b/runtime/parsec/control/runtime_descriptor.c
@@ -8,7 +8,7 @@
  *
  **/
 #include <stdlib.h>
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
 #include <dague/data.h>
 
 void RUNTIME_user_tag_size(int user_tag_width, int user_tag_sep) {
diff --git a/runtime/parsec/control/runtime_options.c b/runtime/parsec/control/runtime_options.c
index b993dcea4a34325cac5a0948a89cb0acd45fc4ec..b9fd469a84262154b5dcfcc3cf65c6e218932de1 100644
--- a/runtime/parsec/control/runtime_options.c
+++ b/runtime/parsec/control/runtime_options.c
@@ -9,7 +9,7 @@
  **/
 #include <stdio.h>
 #include <stdlib.h>
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
 
 void RUNTIME_options_init( MORSE_option_t *options, MORSE_context_t *morse,
                            MORSE_sequence_t *sequence, MORSE_request_t *request )
diff --git a/runtime/parsec/control/runtime_profiling.c b/runtime/parsec/control/runtime_profiling.c
index 1062462ce8a79b7352efe7aa342890033b9c3d49..765621f2b77d32b1a9e66c6a4a2c79751ae90bba 100644
--- a/runtime/parsec/control/runtime_profiling.c
+++ b/runtime/parsec/control/runtime_profiling.c
@@ -7,7 +7,7 @@
  * @copyright (c) 2012-2015 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved.
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
 
 #if defined( _WIN32 ) || defined( _WIN64 )
 #include <windows.h>
diff --git a/runtime/parsec/control/runtime_zlocality.c b/runtime/parsec/control/runtime_zlocality.c
index b1056886018a157431c098011e795a5ea6561ccc..8dc21a47348d293d054edbcd7b9308ebe71e9b23 100644
--- a/runtime/parsec/control/runtime_zlocality.c
+++ b/runtime/parsec/control/runtime_zlocality.c
@@ -7,7 +7,7 @@
  * @copyright (c) 2012-2015 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved.
  *
  **/
-#include "runtime/PaRSEC/include/morse_parsec.h"
+#include "runtime/PaRSEC/include/chameleon_parsec.h"
 
 void RUNTIME_zlocality_allrestrict( uint32_t where )
 {
diff --git a/runtime/parsec/control/runtime_zprofiling.c b/runtime/parsec/control/runtime_zprofiling.c
index b9f052f0632eaf7e493cbe7cdcdd7f99657b080b..1bcf7d0dfd518848f2fe2df0f29737b1b447037a 100644
--- a/runtime/parsec/control/runtime_zprofiling.c
+++ b/runtime/parsec/control/runtime_zprofiling.c
@@ -7,7 +7,7 @@
  * @copyright (c) 2012-2015 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved.
  *
  **/
-#include "runtime/parsec/include/morse_parsec.h"
+#include "chameleon_parsec.h"
 
 void RUNTIME_zdisplay_allprofile()
 {
diff --git a/runtime/parsec/include/morse_parsec.h b/runtime/parsec/include/chameleon_parsec.h
similarity index 78%
rename from runtime/parsec/include/morse_parsec.h
rename to runtime/parsec/include/chameleon_parsec.h
index bdaaece06a48225263d564ce6cfdfac27b629254..0967a72878a88def884ba43dd7563f4b3da59eb4 100644
--- a/runtime/parsec/include/morse_parsec.h
+++ b/runtime/parsec/include/chameleon_parsec.h
@@ -3,16 +3,16 @@
  * @copyright (c) 2009-2015 The University of Tennessee and The University
  *                          of Tennessee Research Foundation.
  *                          All rights reserved.
- * @copyright (c) 2012-2015 Inria. All rights reserved.
- * @copyright (c) 2012-2015 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved.
+ * @copyright (c) 2012-2017 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
+ *                          Univ. Bordeaux. All rights reserved.
  *
  **/
 
 #ifndef _MORSE_PARSEC_H_
 #define _MORSE_PARSEC_H_
 
-#include <dague.h>
-#include <dague/insert_function.h>
+#include <parsec.h>
+#include <parsec/insert_function.h>
 
 #include "control/common.h"