diff --git a/compute/zgeadd.c b/compute/zgeadd.c
index aebbe1983a760fb557aafee932c3102d18018d76..837077bcca9efac5177550b5c8d46b081f4d3b12 100644
--- a/compute/zgeadd.c
+++ b/compute/zgeadd.c
@@ -244,8 +244,8 @@ int MORSE_zgeadd_Tile(MORSE_enum trans,
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgeadd_Tile_Async( trans, alpha, A, beta, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zgelqf.c b/compute/zgelqf.c
index a5471e2e76ae0216bbce98d193ca07319cc1bad5..51dff3eecf2a422f1502eba53b5742d0ff107869 100644
--- a/compute/zgelqf.c
+++ b/compute/zgelqf.c
@@ -196,7 +196,7 @@ int MORSE_zgelqf_Tile(MORSE_desc_t *A, MORSE_desc_t *T)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgelqf_Tile_Async( A, T, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
+    MORSE_Desc_Flush( A, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zgelqf_param.c b/compute/zgelqf_param.c
index 1a938c6d2cae96ef0a82537ace5655e64b5ad980..50d6773a1fc339fa5abe62491cc4f97dba0add8a 100644
--- a/compute/zgelqf_param.c
+++ b/compute/zgelqf_param.c
@@ -193,7 +193,7 @@ int MORSE_zgelqf_param_Tile(const libhqr_tree_t *qrtree, MORSE_desc_t *A, MORSE_
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgelqf_param_Tile_Async( qrtree, A, TS, TT, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
+    MORSE_Desc_Flush( A, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zgelqs.c b/compute/zgelqs.c
index 7c2b19f2390fd232554d63842ce0cbeafa07c7c6..c75c89a9960ee18f3376246798a26889c769c2cf 100644
--- a/compute/zgelqs.c
+++ b/compute/zgelqs.c
@@ -217,8 +217,8 @@ int MORSE_zgelqs_Tile(MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *B)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgelqs_Tile_Async( A, T, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zgelqs_param.c b/compute/zgelqs_param.c
index c0c7ccc55330bebc3d819ab3e86ac069579257aa..5605e4b355482f3818fb214fdd5fb186322d6214 100644
--- a/compute/zgelqs_param.c
+++ b/compute/zgelqs_param.c
@@ -222,8 +222,8 @@ int MORSE_zgelqs_param_Tile(const libhqr_tree_t *qrtree, MORSE_desc_t *A, MORSE_
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgelqs_param_Tile_Async( qrtree, A, TS, TT, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zgels.c b/compute/zgels.c
index 2f26b7901fd2072fbf1d752dc97159b37e88a69b..f6961f4b66daf7e9e4a4f17f3fb8aa640ea5b29b 100644
--- a/compute/zgels.c
+++ b/compute/zgels.c
@@ -275,8 +275,8 @@ int MORSE_zgels_Tile(MORSE_enum trans, MORSE_desc_t *A,
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgels_Tile_Async( trans, A, T, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zgels_param.c b/compute/zgels_param.c
index 67239b6bba10361788aa3330d94d2ed8e2732e78..baf825f1cc58ac9c557170d43ef73cb7c1b71c27 100644
--- a/compute/zgels_param.c
+++ b/compute/zgels_param.c
@@ -279,8 +279,8 @@ int MORSE_zgels_param_Tile(const libhqr_tree_t *qrtree, MORSE_enum trans, MORSE_
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgels_param_Tile_Async( qrtree, trans, A, TS, TT, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zgemm.c b/compute/zgemm.c
index fc7a79152e2c7ad0255626a71e0163d01a7fd69c..0bf587ed0a8b900068a0eed72cc899690f21d250 100644
--- a/compute/zgemm.c
+++ b/compute/zgemm.c
@@ -316,9 +316,9 @@ int MORSE_zgemm_Tile(MORSE_enum transA, MORSE_enum transB,
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgemm_Tile_Async( transA, transB, alpha, A, B, beta, C, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
-    RUNTIME_desc_flush( C, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
+    MORSE_Desc_Flush( C, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zgeqrf.c b/compute/zgeqrf.c
index 8c9a96a38b6e434bf2f3eef178eacc773727ea66..58dc835fac8603ceed30315ccbba25aaab34585a 100644
--- a/compute/zgeqrf.c
+++ b/compute/zgeqrf.c
@@ -195,7 +195,7 @@ int MORSE_zgeqrf_Tile(MORSE_desc_t *A, MORSE_desc_t *T)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgeqrf_Tile_Async( A, T, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
+    MORSE_Desc_Flush( A, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zgeqrf_param.c b/compute/zgeqrf_param.c
index 839cedd4b03d5e1ae166b8589a7afd69e2b32138..8529280273054fcf3a51dbad960d162ee3e15ce2 100644
--- a/compute/zgeqrf_param.c
+++ b/compute/zgeqrf_param.c
@@ -202,7 +202,7 @@ int MORSE_zgeqrf_param_Tile(const libhqr_tree_t *qrtree, MORSE_desc_t *A, MORSE_
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgeqrf_param_Tile_Async( qrtree, A, TS, TT, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
+    MORSE_Desc_Flush( A, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zgeqrs.c b/compute/zgeqrs.c
index 713e8abb21984fe2eea11966b1bf382b51187072..645fdf119ebf0117e3b0f3056376acc075037e57 100644
--- a/compute/zgeqrs.c
+++ b/compute/zgeqrs.c
@@ -216,9 +216,9 @@ int MORSE_zgeqrs_Tile(MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *B)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgeqrs_Tile_Async( A, T, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( T, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( T, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zgeqrs_param.c b/compute/zgeqrs_param.c
index 3f4e89f0e487ff8b598bd9838f4e1c6ac14429c1..a7331b9e054522cd16b6aacc71db06569ccfb297 100644
--- a/compute/zgeqrs_param.c
+++ b/compute/zgeqrs_param.c
@@ -211,10 +211,10 @@ int MORSE_zgeqrs_param_Tile(const libhqr_tree_t *qrtree, MORSE_desc_t *A, MORSE_
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgeqrs_param_Tile_Async( qrtree, A, TS, TT, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( TS, sequence );
-    RUNTIME_desc_flush( TT, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( TS, sequence );
+    MORSE_Desc_Flush( TT, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zgesv_incpiv.c b/compute/zgesv_incpiv.c
index 53278b297f0a2e3e3e4cda2e79be9b126f9bf490..0bcd721939b247d1f4477dbec3e0bbb262338434 100644
--- a/compute/zgesv_incpiv.c
+++ b/compute/zgesv_incpiv.c
@@ -221,8 +221,8 @@ int MORSE_zgesv_incpiv_Tile(MORSE_desc_t *A, MORSE_desc_t *L, int *IPIV, MORSE_d
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgesv_incpiv_Tile_Async( A, L, IPIV, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zgesv_nopiv.c b/compute/zgesv_nopiv.c
index 442df3b6e61a73cf17943ab83688324a043c9128..93571e422f80931a2dd68cc7e8ba3780e84cf5e4 100644
--- a/compute/zgesv_nopiv.c
+++ b/compute/zgesv_nopiv.c
@@ -213,8 +213,8 @@ int MORSE_zgesv_nopiv_Tile(MORSE_desc_t *A, MORSE_desc_t *B)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgesv_nopiv_Tile_Async( A, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zgetrf_incpiv.c b/compute/zgetrf_incpiv.c
index 9628e1e13d324afbc9aa7e362e514edaaec7a295..949ad8fb478fb6369c05e9e510dadde3cc2b6244 100644
--- a/compute/zgetrf_incpiv.c
+++ b/compute/zgetrf_incpiv.c
@@ -200,7 +200,7 @@ int MORSE_zgetrf_incpiv_Tile(MORSE_desc_t *A, MORSE_desc_t *L, int *IPIV)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgetrf_incpiv_Tile_Async( A, L, IPIV, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
+    MORSE_Desc_Flush( A, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zgetrf_nopiv.c b/compute/zgetrf_nopiv.c
index 919699244dbebb132f82aecc000331130c1eeca3..9de091347a0adcc635a91e1dcbc8b9a857ddf8da 100644
--- a/compute/zgetrf_nopiv.c
+++ b/compute/zgetrf_nopiv.c
@@ -186,7 +186,7 @@ int MORSE_zgetrf_nopiv_Tile(MORSE_desc_t *A)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgetrf_nopiv_Tile_Async( A, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
+    MORSE_Desc_Flush( A, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zgetrs_incpiv.c b/compute/zgetrs_incpiv.c
index b011994af3e426e6f423f191cb7be3a311b6f3c0..1bffb66c0675e41d72488eeee334ec0f6f786e20 100644
--- a/compute/zgetrs_incpiv.c
+++ b/compute/zgetrs_incpiv.c
@@ -225,8 +225,8 @@ int MORSE_zgetrs_incpiv_Tile(MORSE_desc_t *A, MORSE_desc_t *L, int *IPIV, MORSE_
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgetrs_incpiv_Tile_Async( A, L, IPIV, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zgetrs_nopiv.c b/compute/zgetrs_nopiv.c
index 8eff02ea1181a155eebd6f229a8ffdef96dd4dd4..36f4635a2e6c63426601be66476297beef3b8a6a 100644
--- a/compute/zgetrs_nopiv.c
+++ b/compute/zgetrs_nopiv.c
@@ -213,8 +213,8 @@ int MORSE_zgetrs_nopiv_Tile(MORSE_desc_t *A, MORSE_desc_t *B)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zgetrs_nopiv_Tile_Async( A, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zheevd.c b/compute/zheevd.c
index 1c763d06c9ea15f0ce5e0241540cbd5f37eb8887..1d5dd88328ba4e0c76ec83a746d52b930d72f1ed 100644
--- a/compute/zheevd.c
+++ b/compute/zheevd.c
@@ -255,8 +255,8 @@ int MORSE_zheevd_Tile(MORSE_enum jobz, MORSE_enum uplo,
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zheevd_Tile_Async( jobz, uplo, A, W, T, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( T, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( T, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zhemm.c b/compute/zhemm.c
index d004a263f304aeca1aeeaf0090eca5809ce8a9f0..a9d03b1b8062f461c1455d12706490f018da95fb 100644
--- a/compute/zhemm.c
+++ b/compute/zhemm.c
@@ -281,9 +281,9 @@ int MORSE_zhemm_Tile(MORSE_enum side, MORSE_enum uplo,
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zhemm_Tile_Async(side, uplo, alpha, A, B, beta, C, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
-    RUNTIME_desc_flush( C, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
+    MORSE_Desc_Flush( C, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zher2k.c b/compute/zher2k.c
index 6e573292fe9c816c3aa1cc11c62e0c4157f8be0e..85e85217baa404f6135a312d151d94f381b8afba 100644
--- a/compute/zher2k.c
+++ b/compute/zher2k.c
@@ -281,9 +281,9 @@ int MORSE_zher2k_Tile(MORSE_enum uplo, MORSE_enum trans,
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zher2k_Tile_Async( uplo, trans, alpha, A, B, beta, C, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
-    RUNTIME_desc_flush( C, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
+    MORSE_Desc_Flush( C, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zherk.c b/compute/zherk.c
index 035adf2071afdfb103651d2306385f5a3c6562f4..ecac777127e87342c06ef54a510460065a0ddf98 100644
--- a/compute/zherk.c
+++ b/compute/zherk.c
@@ -257,8 +257,8 @@ int MORSE_zherk_Tile(MORSE_enum uplo, MORSE_enum trans,
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zherk_Tile_Async( uplo, trans, alpha, A, beta, C, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( C, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( C, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zlascal.c b/compute/zlascal.c
index 840530e4c12a4f77c4a8cfdfac7c855d6ab76706..4181e8cffef76090aa6bd97b23edf317f8cd264c 100644
--- a/compute/zlascal.c
+++ b/compute/zlascal.c
@@ -189,7 +189,7 @@ int MORSE_zlascal_Tile(MORSE_enum uplo,
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zlascal_Tile_Async( uplo, alpha, A, sequence, &request );
-    RUNTIME_sequence_wait(morse, sequence);
+    morse_sequence_wait(morse, sequence);
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
     return status;
diff --git a/compute/zlauum.c b/compute/zlauum.c
index 3fb93a3fda45ad2e3e9bbae8f4445255376f2af4..a8f489bcb3172e660aa6c7566796a1ee679314a4 100644
--- a/compute/zlauum.c
+++ b/compute/zlauum.c
@@ -197,7 +197,7 @@ int MORSE_zlauum_Tile(MORSE_enum uplo, MORSE_desc_t *A)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zlauum_Tile_Async( uplo, A, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
+    MORSE_Desc_Flush( A, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zposv.c b/compute/zposv.c
index 0131d0dd973e1362108e617952191e0d249885c4..24495f81bd64020a0c6044fde3757f431015cab0 100644
--- a/compute/zposv.c
+++ b/compute/zposv.c
@@ -146,7 +146,7 @@ int MORSE_zposv(MORSE_enum uplo, int N, int NRHS,
     }
 
     /* Set NT & NTRHS */
-    NB    = MORSE_NB;
+    NB = MORSE_NB;
 
     morse_sequence_create(morse, &sequence);
 
@@ -239,8 +239,8 @@ int MORSE_zposv_Tile(MORSE_enum uplo, MORSE_desc_t *A, MORSE_desc_t *B)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zposv_Tile_Async( uplo, A, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zpotrf.c b/compute/zpotrf.c
index 950cb92202026560cbda738c618a6f5a0da10178..8612c11e2a9332eea6b119ab5259705d4f94d3a4 100644
--- a/compute/zpotrf.c
+++ b/compute/zpotrf.c
@@ -209,7 +209,7 @@ int MORSE_zpotrf_Tile(MORSE_enum uplo, MORSE_desc_t *A)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zpotrf_Tile_Async( uplo, A, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
+    MORSE_Desc_Flush( A, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zpotri.c b/compute/zpotri.c
index 8778a473cba8d49163b5aa11fcd4a1f5cfebdfd3..668137a4e9b933a7e2a1d6659854cb0dc1d1d866 100644
--- a/compute/zpotri.c
+++ b/compute/zpotri.c
@@ -197,7 +197,7 @@ int MORSE_zpotri_Tile(MORSE_enum uplo, MORSE_desc_t *A)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zpotri_Tile_Async( uplo, A, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
+    MORSE_Desc_Flush( A, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zpotrimm.c b/compute/zpotrimm.c
index 1850d998cfe244f6840e7dd8378d9a1558f8a2be..a82ed3ebc20bc95dd4e64073f4f75947e1658a56 100644
--- a/compute/zpotrimm.c
+++ b/compute/zpotrimm.c
@@ -219,7 +219,7 @@ int MORSE_zpotrimm_Tile(MORSE_enum uplo, MORSE_desc_t *A, MORSE_desc_t *B, MORSE
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zpotrimm_Tile_Async( uplo, A, B, C, sequence, &request );
-    RUNTIME_desc_flush( C, sequence );
+    MORSE_Desc_Flush( C, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zpotrs.c b/compute/zpotrs.c
index 162c6cb2974d6e1a8cad569e7b02d9d0307c5ad8..bd9e225e5f9ce45b7bf4bf0ab4ed387032c2f2df 100644
--- a/compute/zpotrs.c
+++ b/compute/zpotrs.c
@@ -215,8 +215,8 @@ int MORSE_zpotrs_Tile(MORSE_enum uplo, MORSE_desc_t *A, MORSE_desc_t *B)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zpotrs_Tile_Async( uplo, A, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zsymm.c b/compute/zsymm.c
index d2405343a9b91f44676ba642eaba5af1c436d28a..d84aea2070ca831a55d57b3d1bfc62079c302a48 100644
--- a/compute/zsymm.c
+++ b/compute/zsymm.c
@@ -281,9 +281,9 @@ int MORSE_zsymm_Tile(MORSE_enum side, MORSE_enum uplo,
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zsymm_Tile_Async(side, uplo, alpha, A, B, beta, C, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
-    RUNTIME_desc_flush( C, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
+    MORSE_Desc_Flush( C, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zsyr2k.c b/compute/zsyr2k.c
index 59e6790c51c43fdd3afdc159d9a42c76b1426425..1e94b255f8ef9a3ed5b58455b8f7ccd2f2f0726f 100644
--- a/compute/zsyr2k.c
+++ b/compute/zsyr2k.c
@@ -281,9 +281,9 @@ int MORSE_zsyr2k_Tile(MORSE_enum uplo, MORSE_enum trans,
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zsyr2k_Tile_Async( uplo, trans, alpha, A, B, beta, C, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
-    RUNTIME_desc_flush( C, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
+    MORSE_Desc_Flush( C, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zsyrk.c b/compute/zsyrk.c
index 5cbe299755f62c6c88bd7f260d950813cb52a5d8..6ba756003813ab000b36878a363979f521dfcee4 100644
--- a/compute/zsyrk.c
+++ b/compute/zsyrk.c
@@ -257,8 +257,8 @@ int MORSE_zsyrk_Tile(MORSE_enum uplo, MORSE_enum trans,
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zsyrk_Tile_Async( uplo, trans, alpha, A, beta, C, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( C, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( C, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zsysv.c b/compute/zsysv.c
index 4606240478785a893299cacd4b927b58287dd566..ff0f85f983a78159ef4406143792111175cad9a1 100644
--- a/compute/zsysv.c
+++ b/compute/zsysv.c
@@ -232,8 +232,8 @@ int MORSE_zsysv_Tile(MORSE_enum uplo, MORSE_desc_t *A, MORSE_desc_t *B)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zsysv_Tile_Async( uplo, A, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zsytrf.c b/compute/zsytrf.c
index 1d0875bb0ba85c010d0d894194458ac9d3415471..c3ea5c53a038960dc31cf384a7ce56893e50c5ce 100644
--- a/compute/zsytrf.c
+++ b/compute/zsytrf.c
@@ -198,7 +198,7 @@ int MORSE_zsytrf_Tile(MORSE_enum uplo, MORSE_desc_t *A)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zsytrf_Tile_Async( uplo, A, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
+    MORSE_Desc_Flush( A, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zsytrs.c b/compute/zsytrs.c
index 16812476d27b941bf06d04372a0c915e136713e7..d0225885d43517e8b05d2157a02f286a4bf8d33e 100644
--- a/compute/zsytrs.c
+++ b/compute/zsytrs.c
@@ -211,8 +211,8 @@ int MORSE_zsytrs_Tile(MORSE_enum uplo, MORSE_desc_t *A, MORSE_desc_t *B)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zsytrs_Tile_Async( uplo, A, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/ztile.c b/compute/ztile.c
index a52368eb56116d03eb15e63656cfb83a5352e90b..d2648eed9aa8775a036fc1601149d480c9ac58da 100644
--- a/compute/ztile.c
+++ b/compute/ztile.c
@@ -66,7 +66,7 @@ int MORSE_zLapack_to_Tile(MORSE_Complex64_t *Af77, int LDA, MORSE_desc_t *A)
     MORSE_context_t *morse;
     MORSE_sequence_t *sequence = NULL;
     MORSE_request_t request;
-    MORSE_desc_t B;
+    MORSE_desc_t *B;
     int status;
 
     morse = morse_context_self();
@@ -81,25 +81,21 @@ int MORSE_zLapack_to_Tile(MORSE_Complex64_t *Af77, int LDA, MORSE_desc_t *A)
     }
 
     /* Create the B descriptor to handle the Lapack format matrix */
-    B = morse_desc_init_user(
-        MorseComplexDouble, A->mb, A->nb, A->bsiz,
-        LDA, A->n, 0, 0, A->m, A->n, 1, 1,
-        morse_getaddr_cm, morse_getblkldd_cm, NULL );
-    B.mat  = Af77;
-    B.styp = MorseCM;
-
-    RUNTIME_desc_create( &B );
+    MORSE_Desc_Create_User( &B, Af77, MorseComplexDouble, A->mb, A->nb, A->bsiz,
+                            LDA, A->n, 0, 0, A->m, A->n, 1, 1,
+                            morse_getaddr_cm, morse_getblkldd_cm, NULL );
 
     /* Start the computation */
     morse_sequence_create(morse, &sequence);
 
-    morse_pzlacpy( MorseUpperLower, &B, A, sequence, &request );
+    morse_pzlacpy( MorseUpperLower, B, A, sequence, &request );
 
-    RUNTIME_desc_flush( &B, sequence );
-    RUNTIME_desc_flush(  A, sequence );
+    MORSE_Desc_Flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
     morse_sequence_wait( morse, sequence );
 
-    RUNTIME_desc_destroy( &B );
+    /* Destroy temporary B descriptor */
+    MORSE_Desc_Destroy( &B );
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
@@ -146,7 +142,7 @@ int MORSE_zTile_to_Lapack(MORSE_desc_t *A, MORSE_Complex64_t *Af77, int LDA)
     MORSE_context_t *morse;
     MORSE_sequence_t *sequence = NULL;
     MORSE_request_t request;
-    MORSE_desc_t B;
+    MORSE_desc_t *B;
     int status;
 
     morse = morse_context_self();
@@ -161,25 +157,21 @@ int MORSE_zTile_to_Lapack(MORSE_desc_t *A, MORSE_Complex64_t *Af77, int LDA)
     }
 
     /* Create the B descriptor to handle the Lapack format matrix */
-    B = morse_desc_init_user(
-        MorseComplexDouble, A->mb, A->nb, A->bsiz,
-        LDA, A->n, 0, 0, A->m, A->n, 1, 1,
-        morse_getaddr_cm, morse_getblkldd_cm, NULL );
-    B.mat  = Af77;
-    B.styp = MorseCM;
-
-    RUNTIME_desc_create( &B );
+    MORSE_Desc_Create_User( &B, Af77, MorseComplexDouble, A->mb, A->nb, A->bsiz,
+                            LDA, A->n, 0, 0, A->m, A->n, 1, 1,
+                            morse_getaddr_cm, morse_getblkldd_cm, NULL );
 
     /* Start the computation */
     morse_sequence_create(morse, &sequence);
 
-    morse_pzlacpy( MorseUpperLower, A, &B, sequence, &request );
+    morse_pzlacpy( MorseUpperLower, A, B, sequence, &request );
+
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
-    RUNTIME_desc_flush(  A, sequence );
-    RUNTIME_desc_flush( &B, sequence );
     morse_sequence_wait( morse, sequence );
 
-    RUNTIME_desc_destroy( &B );
+    MORSE_Desc_Destroy( &B );
 
     status = sequence->status;
     morse_sequence_destroy(morse, sequence);
diff --git a/compute/ztpgqrt.c b/compute/ztpgqrt.c
index adf47e86cc28866725afcfbdf031a4b5622fff56..3708e05d589568bcde0435aac42af49da11a84ed 100644
--- a/compute/ztpgqrt.c
+++ b/compute/ztpgqrt.c
@@ -291,8 +291,8 @@ int MORSE_ztpgqrt_Tile( int L,
     }
     morse_sequence_create(morse, &sequence);
     MORSE_ztpgqrt_Tile_Async( L, V1, T1, V2, T2, Q1, Q2, sequence, &request );
-    RUNTIME_desc_flush( Q1, sequence );
-    RUNTIME_desc_flush( Q2, sequence );
+    MORSE_Desc_Flush( Q1, sequence );
+    MORSE_Desc_Flush( Q2, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/ztpqrt.c b/compute/ztpqrt.c
index bdbe287188e78daa8942e4669e6c0aaf4f3cf8a3..caacdc3417ec313ccc7bcc224d19affa7c00026d 100644
--- a/compute/ztpqrt.c
+++ b/compute/ztpqrt.c
@@ -265,8 +265,8 @@ int MORSE_ztpqrt_Tile( int L, MORSE_desc_t *A, MORSE_desc_t *B, MORSE_desc_t *T
     }
     morse_sequence_create(morse, &sequence);
     MORSE_ztpqrt_Tile_Async( L, A, B, T, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/ztradd.c b/compute/ztradd.c
index 2fa56e67a3b7aeb6429e5eab538bdb1a54d1bdb9..bdcc1d7f43268d808c0bd5c196f71be79ee78c4e 100644
--- a/compute/ztradd.c
+++ b/compute/ztradd.c
@@ -260,8 +260,8 @@ int MORSE_ztradd_Tile(MORSE_enum uplo, MORSE_enum trans,
     }
     morse_sequence_create(morse, &sequence);
     MORSE_ztradd_Tile_Async( uplo, trans, alpha, A, beta, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/ztrmm.c b/compute/ztrmm.c
index 268ea9a5fca23ea403cbd6f5088c013efbc6da6d..883e8f7ce6ccab8a23cb83816d48662a40cbe31e 100644
--- a/compute/ztrmm.c
+++ b/compute/ztrmm.c
@@ -282,8 +282,8 @@ int MORSE_ztrmm_Tile(MORSE_enum side, MORSE_enum uplo,
     }
     morse_sequence_create(morse, &sequence);
     MORSE_ztrmm_Tile_Async(side, uplo, transA, diag, alpha, A, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/ztrsm.c b/compute/ztrsm.c
index 8313dcc5f011ca6f8f97d79d74cfbd26c5282bb9..d204af39dba45189c81990d2ce840df41371955a 100644
--- a/compute/ztrsm.c
+++ b/compute/ztrsm.c
@@ -280,8 +280,8 @@ int MORSE_ztrsm_Tile(MORSE_enum side, MORSE_enum uplo,
     }
     morse_sequence_create(morse, &sequence);
     MORSE_ztrsm_Tile_Async(side, uplo, transA, diag, alpha, A, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/ztrsmpl.c b/compute/ztrsmpl.c
index 83195d5c6f9984357589e17d551e860067c5b21b..6887df12a7b5242d004cb25afaf10c36f9f94018 100644
--- a/compute/ztrsmpl.c
+++ b/compute/ztrsmpl.c
@@ -210,8 +210,8 @@ int MORSE_ztrsmpl_Tile(MORSE_desc_t *A, MORSE_desc_t *L, int *IPIV, MORSE_desc_t
     }
     morse_sequence_create(morse, &sequence);
     MORSE_ztrsmpl_Tile_Async( A, L, IPIV, B, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( B, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( B, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/ztrtri.c b/compute/ztrtri.c
index c1864a56f6c94e1c50e20d5b9a572c04919a5bee..eefde0168b3f490e43524bbbb6d7abfcd963fe02 100644
--- a/compute/ztrtri.c
+++ b/compute/ztrtri.c
@@ -216,7 +216,7 @@ int MORSE_ztrtri_Tile(MORSE_enum uplo, MORSE_enum diag, MORSE_desc_t *A)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_ztrtri_Tile_Async( uplo, diag, A, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
+    MORSE_Desc_Flush( A, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zunglq.c b/compute/zunglq.c
index 4dbd23de5766299c462f1d9332cc2546030ebbbf..a6411e8e0dd9117900f0d1b2683660ae712e8749 100644
--- a/compute/zunglq.c
+++ b/compute/zunglq.c
@@ -212,8 +212,8 @@ int MORSE_zunglq_Tile(MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *Q)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zunglq_Tile_Async( A, T, Q, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( Q, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( Q, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zunglq_param.c b/compute/zunglq_param.c
index deec8916a3fb7d2a0cba2e23fa9f153d5aacec4b..2a023a6617409d8f1b1ba67b892e244b13eea37c 100644
--- a/compute/zunglq_param.c
+++ b/compute/zunglq_param.c
@@ -209,8 +209,8 @@ int MORSE_zunglq_param_Tile(const libhqr_tree_t *qrtree, MORSE_desc_t *A, MORSE_
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zunglq_param_Tile_Async( qrtree, A, TS, TT, Q, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( Q, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( Q, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zungqr.c b/compute/zungqr.c
index db36ac1729e59dd135531a4a4b3fd540321f2b1d..9cf2e3491cf1190832cb6477bbca3c92bf2e123a 100644
--- a/compute/zungqr.c
+++ b/compute/zungqr.c
@@ -211,8 +211,8 @@ int MORSE_zungqr_Tile(MORSE_desc_t *A, MORSE_desc_t *T, MORSE_desc_t *Q)
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zungqr_Tile_Async( A, T, Q, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( Q, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( Q, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zungqr_param.c b/compute/zungqr_param.c
index 32bb62d7a2d8d6ba6e5733aabc64ac3f046377ca..d778d48f09e1cc8fa7aa969098efa8d88e813ed6 100644
--- a/compute/zungqr_param.c
+++ b/compute/zungqr_param.c
@@ -210,8 +210,8 @@ int MORSE_zungqr_param_Tile(const libhqr_tree_t *qrtree, MORSE_desc_t *A, MORSE_
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zungqr_param_Tile_Async( qrtree, A, TS, TT, Q, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( Q, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( Q, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zunmlq.c b/compute/zunmlq.c
index 7ba6f30b7dc43fe2b32220747af093237b09ffc8..27f2784e2db5581d2bc2174009afdd237c7ab153 100644
--- a/compute/zunmlq.c
+++ b/compute/zunmlq.c
@@ -264,8 +264,8 @@ int MORSE_zunmlq_Tile(MORSE_enum side, MORSE_enum trans,
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zunmlq_Tile_Async(side, trans, A, T, C, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( C, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( C, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zunmlq_param.c b/compute/zunmlq_param.c
index fce325bd750529f8939031862e20389a76ebddfa..04792920ba342a9ddc2eed76ce9b5d317d990234 100644
--- a/compute/zunmlq_param.c
+++ b/compute/zunmlq_param.c
@@ -263,8 +263,8 @@ int MORSE_zunmlq_param_Tile(const libhqr_tree_t *qrtree, MORSE_enum side, MORSE_
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zunmlq_param_Tile_Async( qrtree, side, trans, A, TS, TT, C, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( C, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( C, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zunmqr.c b/compute/zunmqr.c
index 5013005667dffaa2237d8b64eeecaca8fec9b87f..36a3c277f2bcbfed51336904a252f1511b7ab9d2 100644
--- a/compute/zunmqr.c
+++ b/compute/zunmqr.c
@@ -268,8 +268,8 @@ int MORSE_zunmqr_Tile(MORSE_enum side, MORSE_enum trans,
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zunmqr_Tile_Async(side, trans, A, T, C, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( C, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( C, sequence );
 
     morse_sequence_wait(morse, sequence);
 
diff --git a/compute/zunmqr_param.c b/compute/zunmqr_param.c
index d1f406be28f1d380a2a62d8c7d4150493f9e82be..46233c7a5bb5549f15cf59a6a897f47ca3bde04f 100644
--- a/compute/zunmqr_param.c
+++ b/compute/zunmqr_param.c
@@ -269,8 +269,8 @@ int MORSE_zunmqr_param_Tile(const libhqr_tree_t *qrtree, MORSE_enum side, MORSE_
     }
     morse_sequence_create(morse, &sequence);
     MORSE_zunmqr_param_Tile_Async( qrtree, side, trans, A, TS, TT, C, sequence, &request );
-    RUNTIME_desc_flush( A, sequence );
-    RUNTIME_desc_flush( C, sequence );
+    MORSE_Desc_Flush( A, sequence );
+    MORSE_Desc_Flush( C, sequence );
 
     morse_sequence_wait(morse, sequence);