diff --git a/cmake_modules/morse_cmake b/cmake_modules/morse_cmake
index b7da24add9005551062a55389609e915ce2c442b..12dc2c776ffc08ba79fc5bd31061b71adaaf4e37 160000
--- a/cmake_modules/morse_cmake
+++ b/cmake_modules/morse_cmake
@@ -1 +1 @@
-Subproject commit b7da24add9005551062a55389609e915ce2c442b
+Subproject commit 12dc2c776ffc08ba79fc5bd31061b71adaaf4e37
diff --git a/hipblas/compute/hip_zgemm.c b/hipblas/compute/hip_zgemm.c
index 8afd4b869f15431cae942946e1e565086b0349d5..ed42fa7b8cde3133edcc82bc06c590c9311f011a 100644
--- a/hipblas/compute/hip_zgemm.c
+++ b/hipblas/compute/hip_zgemm.c
@@ -24,11 +24,11 @@
 int
 HIP_zgemm( cham_trans_t transa, cham_trans_t transb,
            int m, int n, int k,
-           const hipDoubleComplex *alpha,
-           const hipDoubleComplex *A, int lda,
-           const hipDoubleComplex *B, int ldb,
-           const hipDoubleComplex *beta,
-           hipDoubleComplex *C, int ldc,
+           const hipblasDoubleComplex *alpha,
+           const hipblasDoubleComplex *A, int lda,
+           const hipblasDoubleComplex *B, int ldb,
+           const hipblasDoubleComplex *beta,
+           hipblasDoubleComplex *C, int ldc,
            hipblasHandle_t handle )
 {
     hipblasStatus_t rc;
diff --git a/hipblas/compute/hip_zhemm.c b/hipblas/compute/hip_zhemm.c
index 30d722430f1660fc470380358237f7b43fa3b165..1d69367839189685c80681f1ae25698cae1b6ab1 100644
--- a/hipblas/compute/hip_zhemm.c
+++ b/hipblas/compute/hip_zhemm.c
@@ -23,11 +23,11 @@
 int
 HIP_zhemm( cham_side_t side, cham_uplo_t uplo,
            int m, int n,
-           const hipDoubleComplex *alpha,
-           const hipDoubleComplex *A, int lda,
-           const hipDoubleComplex *B, int ldb,
-           const hipDoubleComplex *beta,
-           hipDoubleComplex *C, int ldc,
+           const hipblasDoubleComplex *alpha,
+           const hipblasDoubleComplex *A, int lda,
+           const hipblasDoubleComplex *B, int ldb,
+           const hipblasDoubleComplex *beta,
+           hipblasDoubleComplex *C, int ldc,
            hipblasHandle_t handle )
 {
     hipblasStatus_t rc;
diff --git a/hipblas/compute/hip_zher2k.c b/hipblas/compute/hip_zher2k.c
index 601df7fe38fab3009b3fb60a37228c50839077e6..fc245eb3e62d9fb91fa9f4b1a11c3f71490e1890 100644
--- a/hipblas/compute/hip_zher2k.c
+++ b/hipblas/compute/hip_zher2k.c
@@ -23,11 +23,11 @@
 int
 HIP_zher2k( cham_uplo_t uplo, cham_trans_t trans,
             int n, int k,
-            const hipDoubleComplex *alpha,
-            const hipDoubleComplex *A, int lda,
-            const hipDoubleComplex *B, int ldb,
+            const hipblasDoubleComplex *alpha,
+            const hipblasDoubleComplex *A, int lda,
+            const hipblasDoubleComplex *B, int ldb,
             const double *beta,
-            hipDoubleComplex *C, int ldc,
+            hipblasDoubleComplex *C, int ldc,
             hipblasHandle_t handle )
 {
     hipblasStatus_t rc;
diff --git a/hipblas/compute/hip_zherk.c b/hipblas/compute/hip_zherk.c
index 56693b30767031443f99b8f1993f64710e9a3317..c31247546e40e6e470b2f9422ecdd9119a6ce37e 100644
--- a/hipblas/compute/hip_zherk.c
+++ b/hipblas/compute/hip_zherk.c
@@ -24,9 +24,9 @@ int
 HIP_zherk( cham_uplo_t uplo, cham_trans_t trans,
            int n, int k,
            const double *alpha,
-           const hipDoubleComplex *A, int lda,
+           const hipblasDoubleComplex *A, int lda,
            const double *beta,
-           hipDoubleComplex *B, int ldb,
+           hipblasDoubleComplex *B, int ldb,
            hipblasHandle_t handle )
 {
     hipblasStatus_t rc;
diff --git a/hipblas/compute/hip_zsymm.c b/hipblas/compute/hip_zsymm.c
index 146412570c0fcb0a1bb3d2a1c57438c25d0e2962..3c25f9073f2d543a3572df89d9deec0f50edf76a 100644
--- a/hipblas/compute/hip_zsymm.c
+++ b/hipblas/compute/hip_zsymm.c
@@ -23,11 +23,11 @@
 int
 HIP_zsymm( cham_side_t side, cham_uplo_t uplo,
             int m, int n,
-            const hipDoubleComplex *alpha,
-            const hipDoubleComplex *A, int lda,
-            const hipDoubleComplex *B, int ldb,
-            const hipDoubleComplex *beta,
-            hipDoubleComplex *C, int ldc,
+            const hipblasDoubleComplex *alpha,
+            const hipblasDoubleComplex *A, int lda,
+            const hipblasDoubleComplex *B, int ldb,
+            const hipblasDoubleComplex *beta,
+            hipblasDoubleComplex *C, int ldc,
             hipblasHandle_t handle )
 {
     hipblasStatus_t rc;
diff --git a/hipblas/compute/hip_zsyr2k.c b/hipblas/compute/hip_zsyr2k.c
index 5bef9817e5a6951bfc4cbd301f2b3e4b4111db7e..6da295381217246465b2a3b3d4b26c24b5e2b006 100644
--- a/hipblas/compute/hip_zsyr2k.c
+++ b/hipblas/compute/hip_zsyr2k.c
@@ -23,11 +23,11 @@
 int
 HIP_zsyr2k( cham_uplo_t uplo, cham_trans_t trans,
             int n, int k,
-            const hipDoubleComplex *alpha,
-            const hipDoubleComplex *A, int lda,
-            const hipDoubleComplex *B, int ldb,
-            const hipDoubleComplex *beta,
-            hipDoubleComplex *C, int ldc,
+            const hipblasDoubleComplex *alpha,
+            const hipblasDoubleComplex *A, int lda,
+            const hipblasDoubleComplex *B, int ldb,
+            const hipblasDoubleComplex *beta,
+            hipblasDoubleComplex *C, int ldc,
             hipblasHandle_t handle )
 {
     hipblasStatus_t rc;
diff --git a/hipblas/compute/hip_zsyrk.c b/hipblas/compute/hip_zsyrk.c
index 44838f78bed6ee161288976ed621f4276b600955..63b87ac14558abf6887f87a709aa8af6f36663ef 100644
--- a/hipblas/compute/hip_zsyrk.c
+++ b/hipblas/compute/hip_zsyrk.c
@@ -23,10 +23,10 @@
 int
 HIP_zsyrk( cham_uplo_t uplo, cham_trans_t trans,
            int n, int k,
-           const hipDoubleComplex *alpha,
-           const hipDoubleComplex *A, int lda,
-           const hipDoubleComplex *beta,
-           hipDoubleComplex *B, int ldb,
+           const hipblasDoubleComplex *alpha,
+           const hipblasDoubleComplex *A, int lda,
+           const hipblasDoubleComplex *beta,
+           hipblasDoubleComplex *B, int ldb,
            hipblasHandle_t handle )
 {
     hipblasStatus_t rc;
diff --git a/hipblas/compute/hip_ztrmm.c b/hipblas/compute/hip_ztrmm.c
index 9cc52790420eb2cb9593d3ddbef21bd41e5cd292..f281385ab1e26c66f7579cb5172d4eb9afdc02b2 100644
--- a/hipblas/compute/hip_ztrmm.c
+++ b/hipblas/compute/hip_ztrmm.c
@@ -24,9 +24,9 @@ int
 HIP_ztrmm( cham_side_t side, cham_uplo_t uplo,
            cham_trans_t transa, cham_diag_t diag,
            int m, int n,
-           const hipDoubleComplex *alpha,
-           const hipDoubleComplex *A, int lda,
-           hipDoubleComplex *B, int ldb,
+           const hipblasDoubleComplex *alpha,
+           const hipblasDoubleComplex *A, int lda,
+           hipblasDoubleComplex *B, int ldb,
            hipblasHandle_t handle )
 {
     hipblasStatus_t rc;
diff --git a/hipblas/compute/hip_ztrsm.c b/hipblas/compute/hip_ztrsm.c
index cba7629c396f56c119a54d88076f55e526089f7f..d2d939e837c6578bdbc2acb159b426b1ef8d3b0b 100644
--- a/hipblas/compute/hip_ztrsm.c
+++ b/hipblas/compute/hip_ztrsm.c
@@ -25,9 +25,9 @@ int
 HIP_ztrsm( cham_side_t side, cham_uplo_t uplo,
            cham_trans_t transa, cham_diag_t diag,
            int m, int n,
-           const hipDoubleComplex *alpha,
-           const hipDoubleComplex *A, int lda,
-           hipDoubleComplex *B, int ldb,
+           const hipblasDoubleComplex *alpha,
+           const hipblasDoubleComplex *A, int lda,
+           hipblasDoubleComplex *B, int ldb,
            hipblasHandle_t handle )
 {
     hipblasStatus_t rc;
diff --git a/hipblas/include/hipblas/hipblas_z.h b/hipblas/include/hipblas/hipblas_z.h
index 647a0a7e5b68e8afa198b289a667eb0038e286cd..3e4509a3c17d8912ceee284c04b35e676be56a2a 100644
--- a/hipblas/include/hipblas/hipblas_z.h
+++ b/hipblas/include/hipblas/hipblas_z.h
@@ -25,14 +25,14 @@
 /**
  *  Declarations of hip kernels - alphabetical order
  */
-int HIP_zgemm(  cham_trans_t transa, cham_trans_t transb, int m, int n, int k, const hipDoubleComplex *alpha, const hipDoubleComplex *A, int lda, const hipDoubleComplex *B, int ldb, const hipDoubleComplex *beta, hipDoubleComplex *C, int ldc, hipblasHandle_t handle );
-int HIP_zhemm(  cham_side_t side, cham_uplo_t uplo, int m, int n, const hipDoubleComplex *alpha, const hipDoubleComplex *A, int lda, const hipDoubleComplex *B, int ldb, const hipDoubleComplex *beta, hipDoubleComplex *C, int ldc, hipblasHandle_t handle );
-int HIP_zher2k( cham_uplo_t uplo, cham_trans_t trans, int n, int k, const hipDoubleComplex *alpha, const hipDoubleComplex *A, int lda, const hipDoubleComplex *B, int ldb, const double *beta, hipDoubleComplex *C, int ldc, hipblasHandle_t handle );
-int HIP_zherk(  cham_uplo_t uplo, cham_trans_t trans, int n, int k, const double *alpha, const hipDoubleComplex *A, int lda, const double *beta, hipDoubleComplex *B, int ldb, hipblasHandle_t handle );
-int HIP_zsymm(  cham_side_t side, cham_uplo_t uplo, int m, int n, const hipDoubleComplex *alpha, const hipDoubleComplex *A, int lda, const hipDoubleComplex *B, int ldb, const hipDoubleComplex *beta, hipDoubleComplex *C, int ldc, hipblasHandle_t handle );
-int HIP_zsyr2k( cham_uplo_t uplo, cham_trans_t trans, int n, int k, const hipDoubleComplex *alpha, const hipDoubleComplex *A, int lda, const hipDoubleComplex *B, int ldb, const hipDoubleComplex *beta, hipDoubleComplex *C, int ldc, hipblasHandle_t handle );
-int HIP_zsyrk(  cham_uplo_t uplo, cham_trans_t trans, int n, int k, const hipDoubleComplex *alpha, const hipDoubleComplex *A, int lda, const hipDoubleComplex *beta, hipDoubleComplex *C, int ldc, hipblasHandle_t handle );
-int HIP_ztrmm(  cham_side_t side, cham_uplo_t uplo, cham_trans_t transa, cham_diag_t diag, int m, int n, const hipDoubleComplex *alpha, const hipDoubleComplex *A, int lda, hipDoubleComplex *B, int ldb, hipblasHandle_t handle );
-int HIP_ztrsm(  cham_side_t side, cham_uplo_t uplo, cham_trans_t transa, cham_diag_t diag, int m, int n, const hipDoubleComplex *alpha, const hipDoubleComplex *A, int lda, hipDoubleComplex *B, int ldb, hipblasHandle_t handle );
+int HIP_zgemm(  cham_trans_t transa, cham_trans_t transb, int m, int n, int k, const hipblasDoubleComplex *alpha, const hipblasDoubleComplex *A, int lda, const hipblasDoubleComplex *B, int ldb, const hipblasDoubleComplex *beta, hipblasDoubleComplex *C, int ldc, hipblasHandle_t handle );
+int HIP_zhemm(  cham_side_t side, cham_uplo_t uplo, int m, int n, const hipblasDoubleComplex *alpha, const hipblasDoubleComplex *A, int lda, const hipblasDoubleComplex *B, int ldb, const hipblasDoubleComplex *beta, hipblasDoubleComplex *C, int ldc, hipblasHandle_t handle );
+int HIP_zher2k( cham_uplo_t uplo, cham_trans_t trans, int n, int k, const hipblasDoubleComplex *alpha, const hipblasDoubleComplex *A, int lda, const hipblasDoubleComplex *B, int ldb, const double *beta, hipblasDoubleComplex *C, int ldc, hipblasHandle_t handle );
+int HIP_zherk(  cham_uplo_t uplo, cham_trans_t trans, int n, int k, const double *alpha, const hipblasDoubleComplex *A, int lda, const double *beta, hipblasDoubleComplex *B, int ldb, hipblasHandle_t handle );
+int HIP_zsymm(  cham_side_t side, cham_uplo_t uplo, int m, int n, const hipblasDoubleComplex *alpha, const hipblasDoubleComplex *A, int lda, const hipblasDoubleComplex *B, int ldb, const hipblasDoubleComplex *beta, hipblasDoubleComplex *C, int ldc, hipblasHandle_t handle );
+int HIP_zsyr2k( cham_uplo_t uplo, cham_trans_t trans, int n, int k, const hipblasDoubleComplex *alpha, const hipblasDoubleComplex *A, int lda, const hipblasDoubleComplex *B, int ldb, const hipblasDoubleComplex *beta, hipblasDoubleComplex *C, int ldc, hipblasHandle_t handle );
+int HIP_zsyrk(  cham_uplo_t uplo, cham_trans_t trans, int n, int k, const hipblasDoubleComplex *alpha, const hipblasDoubleComplex *A, int lda, const hipblasDoubleComplex *beta, hipblasDoubleComplex *C, int ldc, hipblasHandle_t handle );
+int HIP_ztrmm(  cham_side_t side, cham_uplo_t uplo, cham_trans_t transa, cham_diag_t diag, int m, int n, const hipblasDoubleComplex *alpha, const hipblasDoubleComplex *A, int lda, hipblasDoubleComplex *B, int ldb, hipblasHandle_t handle );
+int HIP_ztrsm(  cham_side_t side, cham_uplo_t uplo, cham_trans_t transa, cham_diag_t diag, int m, int n, const hipblasDoubleComplex *alpha, const hipblasDoubleComplex *A, int lda, hipblasDoubleComplex *B, int ldb, hipblasHandle_t handle );
 
 #endif /* _hipblas_z_h_ */
diff --git a/runtime/starpu/codelets/codelet_zgemm.c b/runtime/starpu/codelets/codelet_zgemm.c
index bd0823a6f425e600243e83e1e51794d70209f08b..549c609ecf392fc5bb199a27fecfc85a7f5f1b54 100644
--- a/runtime/starpu/codelets/codelet_zgemm.c
+++ b/runtime/starpu/codelets/codelet_zgemm.c
@@ -114,10 +114,10 @@ cl_zgemm_hip_func( void *descr[], void *cl_arg )
     HIP_zgemm(
         clargs->transA, clargs->transB,
         clargs->m, clargs->n, clargs->k,
-        (hipDoubleComplex*)&(clargs->alpha),
+        (hipblasDoubleComplex*)&(clargs->alpha),
         tileA->mat, tileA->ld,
         tileB->mat, tileB->ld,
-        (hipDoubleComplex*)&(clargs->beta),
+        (hipblasDoubleComplex*)&(clargs->beta),
         tileC->mat, tileC->ld,
         handle );
 
diff --git a/runtime/starpu/codelets/codelet_zhemm.c b/runtime/starpu/codelets/codelet_zhemm.c
index cff474bbf6c75e4fdb1108895d6ee76e8a72f0e8..de82bcce360c5d20759b66ff53316b54e361a496 100644
--- a/runtime/starpu/codelets/codelet_zhemm.c
+++ b/runtime/starpu/codelets/codelet_zhemm.c
@@ -108,10 +108,10 @@ cl_zhemm_hip_func( void *descr[], void *cl_arg )
     HIP_zhemm(
         clargs->side, clargs->uplo,
         clargs->m, clargs->n,
-        (hipDoubleComplex*)&(clargs->alpha),
+        (hipblasDoubleComplex*)&(clargs->alpha),
         tileA->mat, tileA->ld,
         tileB->mat, tileB->ld,
-        (hipDoubleComplex*)&(clargs->beta),
+        (hipblasDoubleComplex*)&(clargs->beta),
         tileC->mat, tileC->ld,
         handle );
 }
diff --git a/runtime/starpu/codelets/codelet_zher2k.c b/runtime/starpu/codelets/codelet_zher2k.c
index fa102852615bac660a9ea9f40367faa10cfc4f3a..91f5587d2f1fc7313880bb808b67c97f441fd141 100644
--- a/runtime/starpu/codelets/codelet_zher2k.c
+++ b/runtime/starpu/codelets/codelet_zher2k.c
@@ -85,7 +85,7 @@ static void cl_zher2k_hip_func(void *descr[], void *cl_arg)
     cham_trans_t trans;
     int n;
     int k;
-    hipDoubleComplex alpha;
+    hipblasDoubleComplex alpha;
     CHAM_tile_t *tileA;
     CHAM_tile_t *tileB;
     double beta;
diff --git a/runtime/starpu/codelets/codelet_zsymm.c b/runtime/starpu/codelets/codelet_zsymm.c
index 54750f0b3f7de2f76083163b9a881db77d8066e3..3000eb17d8f5795faa57ba48eef9c01a6c32a58b 100644
--- a/runtime/starpu/codelets/codelet_zsymm.c
+++ b/runtime/starpu/codelets/codelet_zsymm.c
@@ -109,10 +109,10 @@ cl_zsymm_hip_func( void *descr[], void *cl_arg )
     HIP_zsymm(
         clargs->side, clargs->uplo,
         clargs->m, clargs->n,
-        (hipDoubleComplex*)&(clargs->alpha),
+        (hipblasDoubleComplex*)&(clargs->alpha),
         tileA->mat, tileA->ld,
         tileB->mat, tileB->ld,
-        (hipDoubleComplex*)&(clargs->beta),
+        (hipblasDoubleComplex*)&(clargs->beta),
         tileC->mat, tileC->ld,
         handle );
 }
diff --git a/runtime/starpu/codelets/codelet_zsyr2k.c b/runtime/starpu/codelets/codelet_zsyr2k.c
index 7d5ce81aadff62dd3866bee1a4ee9ecc63b354a0..a45544cce313c669c3b5e310a2d6ad2eb04c41bd 100644
--- a/runtime/starpu/codelets/codelet_zsyr2k.c
+++ b/runtime/starpu/codelets/codelet_zsyr2k.c
@@ -85,10 +85,10 @@ static void cl_zsyr2k_hip_func(void *descr[], void *cl_arg)
     cham_trans_t trans;
     int n;
     int k;
-    hipDoubleComplex alpha;
+    hipblasDoubleComplex alpha;
     CHAM_tile_t *tileA;
     CHAM_tile_t *tileB;
-    hipDoubleComplex beta;
+    hipblasDoubleComplex beta;
     CHAM_tile_t *tileC;
 
     tileA = cti_interface_get(descr[0]);
diff --git a/runtime/starpu/codelets/codelet_zsyrk.c b/runtime/starpu/codelets/codelet_zsyrk.c
index d9b7e84fd00336b445a05eeac648957f61eb51e7..4df1a23030b6fc74f5816197878a5854c07be3c0 100644
--- a/runtime/starpu/codelets/codelet_zsyrk.c
+++ b/runtime/starpu/codelets/codelet_zsyrk.c
@@ -90,9 +90,9 @@ cl_zsyrk_hip_func(void *descr[], void *cl_arg)
 
     HIP_zsyrk(
         clargs->uplo, clargs->trans, clargs->n, clargs->k,
-        (hipDoubleComplex*)&(clargs->alpha),
+        (hipblasDoubleComplex*)&(clargs->alpha),
         tileA->mat, tileA->ld,
-        (hipDoubleComplex*)&(clargs->beta),
+        (hipblasDoubleComplex*)&(clargs->beta),
         tileC->mat, tileC->ld,
         handle );
 }
diff --git a/runtime/starpu/codelets/codelet_ztrmm.c b/runtime/starpu/codelets/codelet_ztrmm.c
index 3bb14d38bef1119024293da7ecdfb6f58a67c12f..ec98d97574cb16d54704264a14d9120e5571a979 100644
--- a/runtime/starpu/codelets/codelet_ztrmm.c
+++ b/runtime/starpu/codelets/codelet_ztrmm.c
@@ -90,7 +90,7 @@ cl_ztrmm_hip_func(void *descr[], void *cl_arg)
     HIP_ztrmm(
         clargs->side, clargs->uplo, clargs->transA, clargs->diag,
         clargs->m, clargs->n,
-        (hipDoubleComplex*)&(clargs->alpha),
+        (hipblasDoubleComplex*)&(clargs->alpha),
         tileA->mat, tileA->ld,
         tileB->mat, tileB->ld,
         handle );
diff --git a/runtime/starpu/codelets/codelet_ztrsm.c b/runtime/starpu/codelets/codelet_ztrsm.c
index 19e83c01a0010bcd1d495932ab7c67e1ac3dc139..d4c063b0d3069276c251e0f47f33556c0cb11ab2 100644
--- a/runtime/starpu/codelets/codelet_ztrsm.c
+++ b/runtime/starpu/codelets/codelet_ztrsm.c
@@ -93,7 +93,7 @@ cl_ztrsm_hip_func(void *descr[], void *cl_arg)
     HIP_ztrsm(
         clargs->side, clargs->uplo, clargs->transA, clargs->diag,
         clargs->m, clargs->n,
-        (hipDoubleComplex*)&(clargs->alpha),
+        (hipblasDoubleComplex*)&(clargs->alpha),
         tileA->mat, tileA->ld,
         tileB->mat, tileB->ld,
         handle );