diff --git a/runtime/starpu/codelets/codelet_ztsmqr.c b/runtime/starpu/codelets/codelet_ztsmqr.c
index 314d09c8ace0bff7b68baef9007f59c4bb8b1b79..747ccc5ae39b070070c05d2c75529a738bf77f14 100644
--- a/runtime/starpu/codelets/codelet_ztsmqr.c
+++ b/runtime/starpu/codelets/codelet_ztsmqr.c
@@ -305,7 +305,7 @@ magma_zparfb_gpu(magma_side_t side, magma_trans_t trans,
             transW  = storev == MorseColumnwise ? MagmaConjTrans : MagmaNoTrans;
             transA2 = storev == MorseColumnwise ? MagmaNoTrans : MagmaConjTrans;
 
-            cublasZgemm(lapack_const(transW), 'N',
+            cublasZgemm(lapack_const(transW), lapack_const(MagmaNoTrans),
                         K, N1, M2,
                         zone,
                         (cuDoubleComplex*)V     /* K*M2  */, LDV,
@@ -316,8 +316,8 @@ magma_zparfb_gpu(magma_side_t side, magma_trans_t trans,
             WORKC = NULL;
             if (WORKC == NULL) {
                 /* W = op(T) * W */
-                cublasZtrmm( 'L', 'U',
-                             lapack_const(trans), 'N',
+                cublasZtrmm( lapack_const(MagmaLeft), lapack_const(MagmaUpper),
+                             lapack_const(trans), lapack_const(MagmaNonUnit),
                              K, N2,
                              zone,
                              (cuDoubleComplex*)T, LDT,
@@ -332,7 +332,7 @@ magma_zparfb_gpu(magma_side_t side, magma_trans_t trans,
                 }
 
                 /* A2 = A2 - op(V) * W  */
-                cublasZgemm(lapack_const(transA2), 'N',
+                cublasZgemm(lapack_const(transA2), lapack_const(MagmaNoTrans),
                             M2, N2, K,
                             mzone,
                             (cuDoubleComplex*)V     /* M2*K  */, LDV,
@@ -349,14 +349,14 @@ magma_zparfb_gpu(magma_side_t side, magma_trans_t trans,
                              zzero, WORKC, LDWORKC );
 
                 /* A1 = A1 - opt(T) * W */
-                cublasZgemm( lapack_const(trans), 'N',
+                cublasZgemm( lapack_const(trans), lapack_const(MagmaNoTrans),
                              K, N1, K,
                              mzone, T,    LDT,
                                     WORK, LDWORK,
                              zone,  A1,   LDA1 );
 
                 /* A2 = A2 - Wc * W */
-                cublasZgemm( 'N', 'N',
+                cublasZgemm( lapack_const(MagmaNoTrans), lapack_const(MagmaNoTrans),
                              M2, N2, K,
                              mzone, WORKC, LDWORKC,
                                     WORK,  LDWORK,
@@ -386,7 +386,7 @@ magma_zparfb_gpu(magma_side_t side, magma_trans_t trans,
             transW  = storev == MorseColumnwise ? MagmaNoTrans : MagmaConjTrans;
             transA2 = storev == MorseColumnwise ? MagmaConjTrans : MagmaNoTrans;
 
-            cublasZgemm('N', lapack_const(transW),
+            cublasZgemm(lapack_const(MagmaNoTrans), lapack_const(transW),
                         M1, K, N2,
                         zone,
                         (cuDoubleComplex*)A2    /* M1*N2 */, LDA2,
@@ -397,8 +397,8 @@ magma_zparfb_gpu(magma_side_t side, magma_trans_t trans,
             WORKC = NULL;
             if (WORKC == NULL) {
                 /* W = W * op(T) */
-                cublasZtrmm( 'R', 'U',
-                             lapack_const(trans), 'N',
+                cublasZtrmm( lapack_const(MagmaRight), lapack_const(MagmaUpper),
+                             lapack_const(trans), lapack_const(MagmaNonUnit),
                              M2, K,
                              zone,
                              (cuDoubleComplex*)T, LDT,
@@ -413,7 +413,7 @@ magma_zparfb_gpu(magma_side_t side, magma_trans_t trans,
                 }
 
                 /* A2 = A2 - W * op(V)  */
-                cublasZgemm('N', lapack_const(transA2),
+                cublasZgemm(lapack_const(MagmaNoTrans), lapack_const(transA2),
                             M2, N2, K,
                             mzone,
                             (cuDoubleComplex*)WORK  /* M2*K  */, LDWORK,
@@ -423,7 +423,7 @@ magma_zparfb_gpu(magma_side_t side, magma_trans_t trans,
 
             } else {
                 /* A1 = A1 - W * opt(T) */
-                cublasZgemm( 'N', lapack_const(trans),
+                cublasZgemm( lapack_const(MagmaNoTrans), lapack_const(trans),
                              M1, K, K,
                              mzone, WORK, LDWORK,
                                     T,    LDT,
@@ -437,7 +437,7 @@ magma_zparfb_gpu(magma_side_t side, magma_trans_t trans,
                              zzero, WORKC, LDWORKC );
 
                 /* A2 = A2 - W * Wc */
-                cublasZgemm( 'N', 'N',
+                cublasZgemm( lapack_const(MagmaNoTrans), lapack_const(MagmaNoTrans),
                              M2, N2, K,
                              mzone, WORK,  LDWORK,
                                     WORKC, LDWORKC,