diff --git a/compute/zbuild.c b/compute/zbuild.c
index f0f5063bb7b1ea6ead4897a6644cbe05f5d25e57..140ad65fe3fe486b4e2b2d802bb5c4dff441997b 100644
--- a/compute/zbuild.c
+++ b/compute/zbuild.c
@@ -135,7 +135,7 @@ int MORSE_zbuild( MORSE_enum uplo, int M, int N,
 
     /* Submit the matrix conversion back */
     morse_ztile2lap( morse, &descAl, &descAt,
-                     MorseUpperLower, sequence, &request );
+                     uplo, sequence, &request );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zheevd.c b/compute/zheevd.c
index 756390496027575bc77cca6842d174c96b0da632..3bc25f3f3ba0cd196549f96004b4acba240eaee6 100644
--- a/compute/zheevd.c
+++ b/compute/zheevd.c
@@ -153,7 +153,7 @@ int MORSE_zheevd(MORSE_enum jobz, MORSE_enum uplo, int N,
     morse_sequence_create(morse, &sequence);
 
     /* Submit the matrix conversion */
-    morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
+    morse_zlap2tile( morse, &descAl, &descAt, uplo,
                      A, NB, NB, LDA, N, N, N, sequence, &request );
 
     /* Call the tile interface */
@@ -161,7 +161,7 @@ int MORSE_zheevd(MORSE_enum jobz, MORSE_enum uplo, int N,
 
     /* Submit the matrix conversion back */
     morse_ztile2lap( morse, &descAl, &descAt,
-                     MorseUpperLower, sequence, &request );
+                     uplo, sequence, &request );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zhemm.c b/compute/zhemm.c
index 7a6854430703f982a95685c03aed0e31253a7859..57098b8209eaf9e4fcd76a117e0af751624bf307 100644
--- a/compute/zhemm.c
+++ b/compute/zhemm.c
@@ -176,11 +176,11 @@ int MORSE_zhemm(MORSE_enum side, MORSE_enum uplo, int M, int N,
     morse_sequence_create(morse, &sequence);
 
     /* Submit the matrix conversion */
-    morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
+    morse_zlap2tile( morse, &descAl, &descAt, uplo,
                      A, NB, NB, LDA, Am, Am, Am, sequence, &request );
-    morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
+    morse_zlap2tile( morse, &descBl, &descBt, uplo,
                      B, NB, NB, LDB, N, M,  N, sequence, &request );
-    morse_zlap2tile( morse, &descCl, &descCt, MorseUpperLower,
+    morse_zlap2tile( morse, &descCl, &descCt, uplo,
                      C, NB, NB, LDC, N, M,  N, sequence, &request );
 
     /* Call the tile interface */
@@ -188,7 +188,7 @@ int MORSE_zhemm(MORSE_enum side, MORSE_enum uplo, int M, int N,
 
     /* Submit the matrix conversion back */
     morse_ztile2lap( morse, &descCl, &descCt,
-                     MorseUpperLower, sequence, &request );
+                     uplo, sequence, &request );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zher2k.c b/compute/zher2k.c
index 397c48207f293acc9b4e877cd37da98d105825d5..9f88e2053b4ba54a23e0b94f44b3e8a147a3f178 100644
--- a/compute/zher2k.c
+++ b/compute/zher2k.c
@@ -181,11 +181,11 @@ int MORSE_zher2k(MORSE_enum uplo, MORSE_enum trans, int N, int K,
     morse_sequence_create(morse, &sequence);
 
     /* Submit the matrix conversion */
-    morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
+    morse_zlap2tile( morse, &descAl, &descAt, uplo,
                      A, NB, NB, LDA, An, Am, An, sequence, &request );
-    morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
+    morse_zlap2tile( morse, &descBl, &descBt, uplo,
                      B, NB, NB, LDB, An, Am, An, sequence, &request );
-    morse_zlap2tile( morse, &descCl, &descCt, MorseUpperLower,
+    morse_zlap2tile( morse, &descCl, &descCt, uplo,
                      C, NB, NB, LDC, N, N,  N, sequence, &request );
 
     /* Call the tile interface */
@@ -193,7 +193,7 @@ int MORSE_zher2k(MORSE_enum uplo, MORSE_enum trans, int N, int K,
 
     /* Submit the matrix conversion back */
     morse_ztile2lap( morse, &descCl, &descCt,
-                     MorseUpperLower, sequence, &request );
+                     uplo, sequence, &request );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zherk.c b/compute/zherk.c
index 25723c78f45d3cc839b51445be8d7222b35a9dbe..cda0eda2b11d963d6b60534ed69e217ca165d5be 100644
--- a/compute/zherk.c
+++ b/compute/zherk.c
@@ -166,9 +166,9 @@ int MORSE_zherk(MORSE_enum uplo, MORSE_enum trans, int N, int K,
     morse_sequence_create(morse, &sequence);
 
     /* Submit the matrix conversion */
-    morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
+    morse_zlap2tile( morse, &descAl, &descAt, uplo,
                      A, NB, NB, LDA, An, Am, An, sequence, &request );
-    morse_zlap2tile( morse, &descCl, &descCt, MorseUpperLower,
+    morse_zlap2tile( morse, &descCl, &descCt, uplo,
                      C, NB, NB, LDC, N, N,  N, sequence, &request );
 
     /* Call the tile interface */
@@ -176,7 +176,7 @@ int MORSE_zherk(MORSE_enum uplo, MORSE_enum trans, int N, int K,
 
     /* Submit the matrix conversion back */
     morse_ztile2lap( morse, &descCl, &descCt,
-                     MorseUpperLower, sequence, &request );
+                     uplo, sequence, &request );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zhetrd.c b/compute/zhetrd.c
index 00e971adf8b66affc692139a14ae6acba2bbf77c..d29be08b2b510766c65c46f5ee6c55c47af26889 100644
--- a/compute/zhetrd.c
+++ b/compute/zhetrd.c
@@ -167,7 +167,7 @@ int MORSE_zhetrd(MORSE_enum jobz, MORSE_enum uplo, int N,
     morse_sequence_create(morse, &sequence);
 
     /* Submit the matrix conversion */
-    morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
+    morse_zlap2tile( morse, &descAl, &descAt, uplo,
                      A, NB, NB, LDA, N, N, N, sequence, &request );
 
     /* Call the tile interface */
@@ -175,7 +175,7 @@ int MORSE_zhetrd(MORSE_enum jobz, MORSE_enum uplo, int N,
 
     /* Submit the matrix conversion back */
     morse_ztile2lap( morse, &descAl, &descAt,
-                     MorseUpperLower, sequence, &request );
+                     uplo, sequence, &request );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zlacpy.c b/compute/zlacpy.c
index b71c9cc25a7cb7644b5c0af4dfe56c16dace337f..75885a39323ea2676693ec62ebe6dc4f2fba8473 100644
--- a/compute/zlacpy.c
+++ b/compute/zlacpy.c
@@ -132,9 +132,9 @@ int MORSE_zlacpy(MORSE_enum uplo, int M, int N,
     morse_sequence_create(morse, &sequence);
 
     /* Submit the matrix conversion */
-    morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
+    morse_zlap2tile( morse, &descAl, &descAt, uplo,
                      A, NB, NB, LDA, N, M, N, sequence, &request );
-    morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
+    morse_zlap2tile( morse, &descBl, &descBt, uplo,
                      B, NB, NB, LDB, N, M, N, sequence, &request );
 
     /* Call the tile interface */
@@ -142,7 +142,7 @@ int MORSE_zlacpy(MORSE_enum uplo, int M, int N,
 
     /* Submit the matrix conversion back */
     morse_ztile2lap( morse, &descBl, &descBt,
-                     MorseUpperLower, sequence, &request );
+                     uplo, sequence, &request );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zlanhe.c b/compute/zlanhe.c
index c3f6baa893e92350f756727a6c35546c1d912b71..cad3fcdac8e2a725370fcb3420efc5fd24b19e67 100644
--- a/compute/zlanhe.c
+++ b/compute/zlanhe.c
@@ -135,7 +135,7 @@ double MORSE_zlanhe(MORSE_enum norm, MORSE_enum uplo, int N,
     morse_sequence_create(morse, &sequence);
 
     /* Submit the matrix conversion */
-    morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
+    morse_zlap2tile( morse, &descAl, &descAt, uplo,
                      A, NB, NB, LDA, N, N, N, sequence, &request );
 
     /* Call the tile interface */
@@ -143,7 +143,7 @@ double MORSE_zlanhe(MORSE_enum norm, MORSE_enum uplo, int N,
 
     /* Submit the matrix conversion back */
     morse_ztile2lap( morse, &descAl, &descAt,
-                     MorseUpperLower, sequence, &request );
+                     uplo, sequence, &request );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zlansy.c b/compute/zlansy.c
index 00c4ace1c45d35f00c7b1376ce5373e9d8fb789a..16c8fd40ddfbd541aa12e57d61d83145c1f92007 100644
--- a/compute/zlansy.c
+++ b/compute/zlansy.c
@@ -135,7 +135,7 @@ double MORSE_zlansy(MORSE_enum norm, MORSE_enum uplo, int N,
     morse_sequence_create(morse, &sequence);
 
     /* Submit the matrix conversion */
-    morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
+    morse_zlap2tile( morse, &descAl, &descAt, uplo,
                      A, NB, NB, LDA, N, N, N, sequence, &request );
 
     /* Call the tile interface */
diff --git a/compute/zlantr.c b/compute/zlantr.c
index 148c9577af2288e8b1c0d88a6a2ac77652f632ae..51b0539a3395164d7d969a6668df871cd4eb444f 100644
--- a/compute/zlantr.c
+++ b/compute/zlantr.c
@@ -155,7 +155,7 @@ double MORSE_zlantr(MORSE_enum norm, MORSE_enum uplo, MORSE_enum diag,
     morse_sequence_create(morse, &sequence);
 
     /* Submit the matrix conversion */
-    morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
+    morse_zlap2tile( morse, &descAl, &descAt, uplo,
                      A, NB, NB, LDA, N, M, N, sequence, &request );
 
     /* Call the tile interface */
diff --git a/compute/zlascal.c b/compute/zlascal.c
index 1aec814eea5a21e84dff6b9a00f870027b7b9c6f..4fe78a6dbaa98c3b140b9c4ef38cd8c1b0f73a5c 100644
--- a/compute/zlascal.c
+++ b/compute/zlascal.c
@@ -114,7 +114,7 @@ int MORSE_zlascal(MORSE_enum uplo, int M, int N,
     morse_sequence_create(morse, &sequence);
 
     /* Submit the matrix conversion */
-    morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
+    morse_zlap2tile( morse, &descAl, &descAt, uplo,
                      A, NB, NB, LDA, N, M, N, sequence, &request );
 
     /* Call the tile interface */
@@ -122,7 +122,7 @@ int MORSE_zlascal(MORSE_enum uplo, int M, int N,
 
     /* Submit the matrix conversion back */
     morse_ztile2lap( morse, &descAl, &descAt,
-                     MorseUpperLower, sequence, &request );
+                     uplo, sequence, &request );
     RUNTIME_sequence_wait(morse, sequence);
     morse_ztile2lap_cleanup( morse, &descAl, &descAt );
 
diff --git a/compute/zlaset.c b/compute/zlaset.c
index 604bec3caa8ec022d774cd5ae9d6c22a8f7e6354..3799aaf4e16d7672a42d89524f1761233d811130 100644
--- a/compute/zlaset.c
+++ b/compute/zlaset.c
@@ -128,7 +128,7 @@ int MORSE_zlaset(MORSE_enum uplo, int M, int N,
     morse_sequence_create(morse, &sequence);
 
     /* Submit the matrix conversion */
-    morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
+    morse_zlap2tile( morse, &descAl, &descAt, uplo,
                      A, NB, NB, LDA, N, M, N, sequence, &request );
 
     /* Call the tile interface */
diff --git a/compute/zlauum.c b/compute/zlauum.c
index b980f6f2c9b5262484608e6a15216dcb6aad3ebe..12661efe0f89da90d82e00db6962765d6b8493e1 100644
--- a/compute/zlauum.c
+++ b/compute/zlauum.c
@@ -122,7 +122,7 @@ int MORSE_zlauum(MORSE_enum uplo, int N,
     morse_sequence_create(morse, &sequence);
 
     /* Submit the matrix conversion */
-    morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
+    morse_zlap2tile( morse, &descAl, &descAt, uplo,
                      A, NB, NB, LDA, N, N, N, sequence, &request );
 
     /* Call the tile interface */
@@ -130,7 +130,7 @@ int MORSE_zlauum(MORSE_enum uplo, int N,
 
     /* Submit the matrix conversion back */
     morse_ztile2lap( morse, &descAl, &descAt,
-                     MorseUpperLower, sequence, &request );
+                     uplo, sequence, &request );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zposv.c b/compute/zposv.c
index 05d3a256cbd3412e9ced28d2be98e61355a54f4d..76032a3da05b930e3e2f04d25d581b04347f7c65 100644
--- a/compute/zposv.c
+++ b/compute/zposv.c
@@ -151,9 +151,9 @@ int MORSE_zposv(MORSE_enum uplo, int N, int NRHS,
     morse_sequence_create(morse, &sequence);
 
     /* Submit the matrix conversion */
-    morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
+    morse_zlap2tile( morse, &descAl, &descAt, uplo,
                      A, NB, NB, LDA, N, N, N, sequence, &request );
-    morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
+    morse_zlap2tile( morse, &descBl, &descBt, uplo,
                      B, NB, NB, LDB, NRHS, N, NRHS, sequence, &request );
 
     /* Call the tile interface */
@@ -161,9 +161,9 @@ int MORSE_zposv(MORSE_enum uplo, int N, int NRHS,
 
     /* Submit the matrix conversion back */
     morse_ztile2lap( morse, &descAl, &descAt,
-                     MorseUpperLower, sequence, &request );
+                     uplo, sequence, &request );
     morse_ztile2lap( morse, &descBl, &descBt,
-                     MorseUpperLower, sequence, &request );
+                     uplo, sequence, &request );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zpotri.c b/compute/zpotri.c
index 05c0c54ab2c6d788dd293eb18ec838402e4ceec7..542ad704ce11a95306f73e53137ed239fd9d12e6 100644
--- a/compute/zpotri.c
+++ b/compute/zpotri.c
@@ -119,7 +119,7 @@ int MORSE_zpotri(MORSE_enum uplo, int N,
     morse_sequence_create(morse, &sequence);
 
     /* Submit the matrix conversion */
-    morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
+    morse_zlap2tile( morse, &descAl, &descAt, uplo,
                      A, NB, NB, LDA, N, N, N, sequence, &request );
 
     /* Call the tile interface */
@@ -127,7 +127,7 @@ int MORSE_zpotri(MORSE_enum uplo, int N,
 
     /* Submit the matrix conversion back */
     morse_ztile2lap( morse, &descAl, &descAt,
-                     MorseUpperLower, sequence, &request );
+                     uplo, sequence, &request );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zpotrimm.c b/compute/zpotrimm.c
index 7dd2970fd2e96058fb9b3615484e9d93954bef32..2aab20b737f1f334d1c5bd5346ee1715a373ad3c 100644
--- a/compute/zpotrimm.c
+++ b/compute/zpotrimm.c
@@ -131,11 +131,11 @@ int MORSE_zpotrimm(MORSE_enum uplo, int N,
     morse_sequence_create(morse, &sequence);
 
     /* Submit the matrix conversion */
-    morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
+    morse_zlap2tile( morse, &descAl, &descAt, uplo,
                      A, NB, NB, LDA, N, N, N, sequence, &request );
-    morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
+    morse_zlap2tile( morse, &descBl, &descBt, uplo,
                      B, NB, NB, LDB, N, N, N, sequence, &request );
-    morse_zlap2tile( morse, &descCl, &descCt, MorseUpperLower,
+    morse_zlap2tile( morse, &descCl, &descCt, uplo,
                      C, NB, NB, LDC, N, N, N, sequence, &request );
 
     /* Call the tile interface */
@@ -143,11 +143,11 @@ int MORSE_zpotrimm(MORSE_enum uplo, int N,
 
     /* Submit the matrix conversion back */
     morse_ztile2lap( morse, &descAl, &descAt,
-                     MorseUpperLower, sequence, &request );
+                     uplo, sequence, &request );
     morse_ztile2lap( morse, &descBl, &descBt,
-                     MorseUpperLower, sequence, &request );
+                     uplo, sequence, &request );
     morse_ztile2lap( morse, &descCl, &descCt,
-                     MorseUpperLower, sequence, &request );
+                     uplo, sequence, &request );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zpotrs.c b/compute/zpotrs.c
index 23258099ad1832a631d91e59f5263684ea5f52b0..8d841fec458ed20e3ef0e232fa8d902885a05b61 100644
--- a/compute/zpotrs.c
+++ b/compute/zpotrs.c
@@ -135,9 +135,9 @@ int MORSE_zpotrs(MORSE_enum uplo, int N, int NRHS,
     morse_sequence_create(morse, &sequence);
 
     /* Submit the matrix conversion */
-    morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
+    morse_zlap2tile( morse, &descAl, &descAt, uplo,
                      A, NB, NB, LDA, N, N, N, sequence, &request );
-    morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
+    morse_zlap2tile( morse, &descBl, &descBt, uplo,
                      B, NB, NB, LDB, NRHS, N, NRHS, sequence, &request );
 
     /* Call the tile interface */
@@ -145,7 +145,7 @@ int MORSE_zpotrs(MORSE_enum uplo, int N, int NRHS,
 
     /* Submit the matrix conversion back */
     morse_ztile2lap( morse, &descBl, &descBt,
-                     MorseUpperLower, sequence, &request );
+                     uplo, sequence, &request );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zsymm.c b/compute/zsymm.c
index 1fb6dcf2b8254de7d4494ee6c9399e5220b8da90..d7826a9a620a20d5a93056276a767bf4c1c42f52 100644
--- a/compute/zsymm.c
+++ b/compute/zsymm.c
@@ -176,11 +176,11 @@ int MORSE_zsymm(MORSE_enum side, MORSE_enum uplo, int M, int N,
     morse_sequence_create(morse, &sequence);
 
     /* Submit the matrix conversion */
-    morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
+    morse_zlap2tile( morse, &descAl, &descAt, uplo,
                      A, NB, NB, LDA, Am, Am, Am, sequence, &request );
-    morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
+    morse_zlap2tile( morse, &descBl, &descBt, uplo,
                      B, NB, NB, LDB, N, M,  N, sequence, &request );
-    morse_zlap2tile( morse, &descCl, &descCt, MorseUpperLower,
+    morse_zlap2tile( morse, &descCl, &descCt, uplo,
                      C, NB, NB, LDC, N, M,  N, sequence, &request );
 
     /* Call the tile interface */
@@ -188,7 +188,7 @@ int MORSE_zsymm(MORSE_enum side, MORSE_enum uplo, int M, int N,
 
     /* Submit the matrix conversion back */
     morse_ztile2lap( morse, &descCl, &descCt,
-                     MorseUpperLower, sequence, &request );
+                     uplo, sequence, &request );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zsyr2k.c b/compute/zsyr2k.c
index 1462e9e02ff99f7a4602b39247caa22af1a0caa5..88020a26bb659d746c145d45cc785fd9ba05b406 100644
--- a/compute/zsyr2k.c
+++ b/compute/zsyr2k.c
@@ -181,11 +181,11 @@ int MORSE_zsyr2k(MORSE_enum uplo, MORSE_enum trans, int N, int K,
     morse_sequence_create(morse, &sequence);
 
     /* Submit the matrix conversion */
-    morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
+    morse_zlap2tile( morse, &descAl, &descAt, uplo,
                      A, NB, NB, LDA, An, Am, An, sequence, &request );
-    morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
+    morse_zlap2tile( morse, &descBl, &descBt, uplo,
                      B, NB, NB, LDB, An, Am, An, sequence, &request );
-    morse_zlap2tile( morse, &descCl, &descCt, MorseUpperLower,
+    morse_zlap2tile( morse, &descCl, &descCt, uplo,
                      C, NB, NB, LDC, N, N,  N, sequence, &request );
 
     /* Call the tile interface */
@@ -193,7 +193,7 @@ int MORSE_zsyr2k(MORSE_enum uplo, MORSE_enum trans, int N, int K,
 
     /* Submit the matrix conversion back */
     morse_ztile2lap( morse, &descCl, &descCt,
-                     MorseUpperLower, sequence, &request );
+                     uplo, sequence, &request );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zsyrk.c b/compute/zsyrk.c
index a25615ae3072d9cacda9e062438bc3c438a32aa5..237164df295eed8b3dfcfc9d3f8efe95103bc4b2 100644
--- a/compute/zsyrk.c
+++ b/compute/zsyrk.c
@@ -166,9 +166,9 @@ int MORSE_zsyrk(MORSE_enum uplo, MORSE_enum trans, int N, int K,
     morse_sequence_create(morse, &sequence);
 
     /* Submit the matrix conversion */
-    morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
+    morse_zlap2tile( morse, &descAl, &descAt, uplo,
                      A, NB, NB, LDA, An, Am, An, sequence, &request );
-    morse_zlap2tile( morse, &descCl, &descCt, MorseUpperLower,
+    morse_zlap2tile( morse, &descCl, &descCt, uplo,
                      C, NB, NB, LDC, N, N,  N, sequence, &request );
 
     /* Call the tile interface */
@@ -176,7 +176,7 @@ int MORSE_zsyrk(MORSE_enum uplo, MORSE_enum trans, int N, int K,
 
     /* Submit the matrix conversion back */
     morse_ztile2lap( morse, &descCl, &descCt,
-                     MorseUpperLower, sequence, &request );
+                     uplo, sequence, &request );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zsysv.c b/compute/zsysv.c
index cc56ebaa2ca2caa2a3dc86e0d73be73d6f44c948..fa5c0153899c18541b23edf1d4e0ed1adc677853 100644
--- a/compute/zsysv.c
+++ b/compute/zsysv.c
@@ -148,9 +148,9 @@ int MORSE_zsysv(MORSE_enum uplo, int N, int NRHS,
     morse_sequence_create(morse, &sequence);
 
     /* Submit the matrix conversion */
-    morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
+    morse_zlap2tile( morse, &descAl, &descAt, uplo,
                      A, NB, NB, LDA, N, N, N, sequence, &request );
-    morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
+    morse_zlap2tile( morse, &descBl, &descBt, uplo,
                      B, NB, NB, LDB, NRHS, N, NRHS, sequence, &request );
 
     /* Call the tile interface */
@@ -158,9 +158,9 @@ int MORSE_zsysv(MORSE_enum uplo, int N, int NRHS,
 
     /* Submit the matrix conversion back */
     morse_ztile2lap( morse, &descAl, &descAt,
-                     MorseUpperLower, sequence, &request );
+                     uplo, sequence, &request );
     morse_ztile2lap( morse, &descBl, &descBt,
-                     MorseUpperLower, sequence, &request );
+                     uplo, sequence, &request );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zsytrf.c b/compute/zsytrf.c
index c4e013a4e68b214436c67ed0d14183bea289f403..34df2fcee86e3fd1491f69ed7e26d8e70e4f231e 100644
--- a/compute/zsytrf.c
+++ b/compute/zsytrf.c
@@ -123,7 +123,7 @@ int MORSE_zsytrf(MORSE_enum uplo, int N,
     morse_sequence_create(morse, &sequence);
 
     /* Submit the matrix conversion */
-    morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
+    morse_zlap2tile( morse, &descAl, &descAt, uplo,
                      A, NB, NB, LDA, N, N, N, sequence, &request );
 
     /* Call the tile interface */
@@ -131,7 +131,7 @@ int MORSE_zsytrf(MORSE_enum uplo, int N,
 
     /* Submit the matrix conversion back */
     morse_ztile2lap( morse, &descAl, &descAt,
-                     MorseUpperLower, sequence, &request );
+                     uplo, sequence, &request );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zsytrs.c b/compute/zsytrs.c
index fd970720b3891e600feead3a6979f12d75710258..201561ad876c9c39c17274d4b808dc4d07250fdc 100644
--- a/compute/zsytrs.c
+++ b/compute/zsytrs.c
@@ -134,9 +134,9 @@ int MORSE_zsytrs(MORSE_enum uplo, int N, int NRHS,
     morse_sequence_create(morse, &sequence);
 
     /* Submit the matrix conversion */
-    morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
+    morse_zlap2tile( morse, &descAl, &descAt, uplo,
                      A, NB, NB, LDA, N, N, N, sequence, &request );
-    morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
+    morse_zlap2tile( morse, &descBl, &descBt, uplo,
                      B, NB, NB, LDB, NRHS, N, NRHS, sequence, &request );
 
     /* Call the tile interface */
@@ -144,7 +144,7 @@ int MORSE_zsytrs(MORSE_enum uplo, int N, int NRHS,
 
     /* Submit the matrix conversion back */
     morse_ztile2lap( morse, &descBl, &descBt,
-                     MorseUpperLower, sequence, &request );
+                     uplo, sequence, &request );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/ztradd.c b/compute/ztradd.c
index a540f8aeb8c4bb58408d4e002d2450aea7fb0ff6..6883d04bde22ce323247175d4f2d655c4aa7a84b 100644
--- a/compute/ztradd.c
+++ b/compute/ztradd.c
@@ -165,9 +165,9 @@ int MORSE_ztradd(MORSE_enum uplo, MORSE_enum trans, int M, int N,
     morse_sequence_create(morse, &sequence);
 
     /* Submit the matrix conversion */
-    morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
+    morse_zlap2tile( morse, &descAl, &descAt, uplo,
                      A, NB, NB, LDA, An, Am, An, sequence, &request );
-    morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
+    morse_zlap2tile( morse, &descBl, &descBt, uplo,
                      B, NB, NB, LDB, N, M, N, sequence, &request );
 
     /* Call the tile interface */
@@ -175,7 +175,7 @@ int MORSE_ztradd(MORSE_enum uplo, MORSE_enum trans, int M, int N,
 
     /* Submit the matrix conversion back */
     morse_ztile2lap( morse, &descBl, &descBt,
-                     MorseUpperLower, sequence, &request );
+                     uplo, sequence, &request );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/ztrmm.c b/compute/ztrmm.c
index 680230233616f0ae5fcf70e3d225af6499706db4..20f8c23305089164cd2c3c2cbde0d1efadd1db74 100644
--- a/compute/ztrmm.c
+++ b/compute/ztrmm.c
@@ -179,9 +179,9 @@ int MORSE_ztrmm(MORSE_enum side, MORSE_enum uplo,
     morse_sequence_create(morse, &sequence);
 
     /* Submit the matrix conversion */
-    morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
+    morse_zlap2tile( morse, &descAl, &descAt, uplo,
                      A, NB, NB, LDA, NA, NA, NA, sequence, &request );
-    morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
+    morse_zlap2tile( morse, &descBl, &descBt, uplo,
                      B, NB, NB, LDB, NRHS, N,  NRHS, sequence, &request );
 
     /* Call the tile interface */
@@ -189,7 +189,7 @@ int MORSE_ztrmm(MORSE_enum side, MORSE_enum uplo,
 
     /* Submit the matrix conversion back */
     morse_ztile2lap( morse, &descBl, &descBt,
-                     MorseUpperLower, sequence, &request );
+                     uplo, sequence, &request );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/ztrsm.c b/compute/ztrsm.c
index 81de93126d84fd3f01f5c4bb0b3ffca420861aac..f58707ef320734c6afaffedd132e2de22cd44159 100644
--- a/compute/ztrsm.c
+++ b/compute/ztrsm.c
@@ -177,9 +177,9 @@ int MORSE_ztrsm(MORSE_enum side, MORSE_enum uplo,
     morse_sequence_create(morse, &sequence);
 
     /* Submit the matrix conversion */
-    morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
+    morse_zlap2tile( morse, &descAl, &descAt, uplo,
                      A, NB, NB, LDA, NA, NA, NA, sequence, &request );
-    morse_zlap2tile( morse, &descBl, &descBt, MorseUpperLower,
+    morse_zlap2tile( morse, &descBl, &descBt, uplo,
                      B, NB, NB, LDB, NRHS, N,  NRHS, sequence, &request );
 
     /* Call the tile interface */
@@ -187,7 +187,7 @@ int MORSE_ztrsm(MORSE_enum side, MORSE_enum uplo,
 
     /* Submit the matrix conversion back */
     morse_ztile2lap( morse, &descBl, &descBt,
-                     MorseUpperLower, sequence, &request );
+                     uplo, sequence, &request );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/ztrtri.c b/compute/ztrtri.c
index 9d7c2eeae1fb16e75d8870937df6c41bad32545c..f1f9ed70e6f86f882deb9de35c97e8e998fb948d 100644
--- a/compute/ztrtri.c
+++ b/compute/ztrtri.c
@@ -131,7 +131,7 @@ int MORSE_ztrtri(MORSE_enum uplo, MORSE_enum diag, int N,
     morse_sequence_create(morse, &sequence);
 
     /* Submit the matrix conversion */
-    morse_zlap2tile( morse, &descAl, &descAt, MorseUpperLower,
+    morse_zlap2tile( morse, &descAl, &descAt, uplo,
                      A, NB, NB, LDA, N, N, N, sequence, &request );
 
     /* Call the tile interface */
@@ -139,7 +139,7 @@ int MORSE_ztrtri(MORSE_enum uplo, MORSE_enum diag, int N,
 
     /* Submit the matrix conversion back */
     morse_ztile2lap( morse, &descAl, &descAt,
-                     MorseUpperLower, sequence, &request );
+                     uplo, sequence, &request );
 
     morse_sequence_wait(morse, sequence);