diff --git a/runtime/quark/CMakeLists.txt b/runtime/quark/CMakeLists.txt
index fc1882d6e43bb2e684e1742ecbbb33a0780d9584..25fe19568d4c1f9c3d1dfc4b326c001f76bf57ea 100644
--- a/runtime/quark/CMakeLists.txt
+++ b/runtime/quark/CMakeLists.txt
@@ -62,8 +62,8 @@ add_custom_target(runtime_quark_include ALL SOURCES ${RUNTIME_HDRS})
 # -----------------------------------------------------
 set(RUNTIME_COMMON_GENERATED "")
 set(ZSRC
-    control/zprofiling.c
-    control/zlocality.c
+    control/runtime_zprofiling.c
+    control/runtime_zlocality.c
     )
 
 precisions_rules_py(RUNTIME_COMMON_GENERATED "${ZSRC}"
@@ -71,12 +71,12 @@ precisions_rules_py(RUNTIME_COMMON_GENERATED "${ZSRC}"
                     TARGETDIR "control")
 
 set(RUNTIME_COMMON
-    control/async.c
-    control/context.c
-    control/control.c
-    control/descriptor.c
-    control/options.c
-    control/profiling.c
+    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}
     )
diff --git a/runtime/quark/control/async.c b/runtime/quark/control/runtime_async.c
similarity index 84%
rename from runtime/quark/control/async.c
rename to runtime/quark/control/runtime_async.c
index 27e6be3cb6bb57a39ff13b7443cb0da79bb19ef1..8b7fc2c78f4e6d936aa5893c1649fc641f813c33 100644
--- a/runtime/quark/control/async.c
+++ b/runtime/quark/control/runtime_async.c
@@ -10,7 +10,7 @@
 
 /**
  *
- * @file async.c
+ * @file runtime_async.c
  *
  *  MORSE async routines
  *  MORSE is a software package provided by Univ. of Tennessee,
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include "runtime/quark/include/morse_quark.h"
 
-/*******************************************************************************
+/** *****************************************************************************
  *  Create a sequence
  **/
 int RUNTIME_sequence_create(MORSE_context_t *morse, MORSE_sequence_t *sequence)
@@ -41,7 +41,7 @@ int RUNTIME_sequence_create(MORSE_context_t *morse, MORSE_sequence_t *sequence)
     return MORSE_SUCCESS;
 }
 
-/*******************************************************************************
+/** *****************************************************************************
  *  Destroy a sequence
  **/
 int RUNTIME_sequence_destroy(MORSE_context_t *morse, MORSE_sequence_t *sequence)
@@ -50,7 +50,7 @@ int RUNTIME_sequence_destroy(MORSE_context_t *morse, MORSE_sequence_t *sequence)
     return MORSE_SUCCESS;
 }
 
-/*******************************************************************************
+/** *****************************************************************************
  *  Wait for the completion of a sequence
  **/
 int RUNTIME_sequence_wait(MORSE_context_t *morse, MORSE_sequence_t *sequence )
@@ -59,7 +59,7 @@ int RUNTIME_sequence_wait(MORSE_context_t *morse, MORSE_sequence_t *sequence )
     return MORSE_SUCCESS;
 }
 
-/*******************************************************************************
+/** *****************************************************************************
  *  Terminate a sequence
  **/
 void RUNTIME_sequence_flush(void *quark, MORSE_sequence_t *sequence, MORSE_request_t *request, int status)
diff --git a/runtime/quark/control/context.c b/runtime/quark/control/runtime_context.c
similarity index 98%
rename from runtime/quark/control/context.c
rename to runtime/quark/control/runtime_context.c
index f679ca456715eb41ec5504b9e82fbd264b308b49..1352ad5116896473853d25fe836e591b274d3026 100644
--- a/runtime/quark/control/context.c
+++ b/runtime/quark/control/runtime_context.c
@@ -10,7 +10,7 @@
 
 /**
  *
- * @file context.c
+ * @file runtime_context.c
  *
  *  MORSE auxiliary routines
  *  MORSE is a software package provided by Univ. of Tennessee,
diff --git a/runtime/quark/control/control.c b/runtime/quark/control/runtime_control.c
similarity index 98%
rename from runtime/quark/control/control.c
rename to runtime/quark/control/runtime_control.c
index 1e7722dd26d0486558909fb48620abfe39559a70..73f3cbe2061c58b2bba01c0b951eb10efeb0efa3 100644
--- a/runtime/quark/control/control.c
+++ b/runtime/quark/control/runtime_control.c
@@ -10,7 +10,7 @@
 
 /**
  *
- * @file control.c
+ * @file runtime_control.c
  *
  *  MORSE auxiliary routines
  *  MORSE is a software package provided by Univ. of Tennessee,
diff --git a/runtime/quark/control/descriptor.c b/runtime/quark/control/runtime_descriptor.c
similarity index 97%
rename from runtime/quark/control/descriptor.c
rename to runtime/quark/control/runtime_descriptor.c
index 9de35f812679447b3b3d595d563abfb679d125d2..0044b6e2731d4e34411caeab2451ebdf8b569f7b 100644
--- a/runtime/quark/control/descriptor.c
+++ b/runtime/quark/control/runtime_descriptor.c
@@ -10,7 +10,7 @@
 
 /**
  *
- * @file descriptor.c
+ * @file runtime_descriptor.c
  *
  *  MORSE auxiliary routines
  *  MORSE is a software package provided by Univ. of Tennessee,
diff --git a/runtime/quark/control/options.c b/runtime/quark/control/runtime_options.c
similarity index 98%
rename from runtime/quark/control/options.c
rename to runtime/quark/control/runtime_options.c
index 58cd6d32299fd3ca0de1af88ce18358078893161..9cd642706f563cf659449ff84dcff0448ff0c3b5 100644
--- a/runtime/quark/control/options.c
+++ b/runtime/quark/control/runtime_options.c
@@ -10,7 +10,7 @@
 
 /**
  *
- * @file options.c
+ * @file runtime_options.c
  *
  *  MORSE auxiliary routines
  *  MORSE is a software package provided by Univ. of Tennessee,
diff --git a/runtime/quark/control/profiling.c b/runtime/quark/control/runtime_profiling.c
similarity index 98%
rename from runtime/quark/control/profiling.c
rename to runtime/quark/control/runtime_profiling.c
index 4665ef93b7ce52e83a05fa4291b50a5888edd305..76afcc2671faa9172673931eb8eda80df0ad95b4 100644
--- a/runtime/quark/control/profiling.c
+++ b/runtime/quark/control/runtime_profiling.c
@@ -10,7 +10,7 @@
 
 /**
  *
- * @file profiling.c
+ * @file runtime_profiling.c
  *
  *  MORSE auxiliary routines
  *  MORSE is a software package provided by Univ. of Tennessee,
diff --git a/runtime/quark/control/zlocality.c b/runtime/quark/control/runtime_zlocality.c
similarity index 97%
rename from runtime/quark/control/zlocality.c
rename to runtime/quark/control/runtime_zlocality.c
index 25f0676ba34a4a3bc566c3611a69e4545cef56e4..1cf57754bb7df00416b329094c38b4c81a03a9b7 100644
--- a/runtime/quark/control/zlocality.c
+++ b/runtime/quark/control/runtime_zlocality.c
@@ -10,7 +10,7 @@
 
 /**
  *
- *  @file zlocality.c
+ *  @file runtime_zlocality.c
  *
  *  MORSE codelets kernel
  *  MORSE is a software package provided by Univ. of Tennessee,
diff --git a/runtime/quark/control/zprofiling.c b/runtime/quark/control/runtime_zprofiling.c
similarity index 97%
rename from runtime/quark/control/zprofiling.c
rename to runtime/quark/control/runtime_zprofiling.c
index f1bf673aed62d67543a82bce58ccc6de6bae358e..29fdb7797fe2b8a5ae29d1b824bdaa0a6ff742dd 100644
--- a/runtime/quark/control/zprofiling.c
+++ b/runtime/quark/control/runtime_zprofiling.c
@@ -10,7 +10,7 @@
 
 /**
  *
- *  @file zprofiling.c
+ *  @file runtime_zprofiling.c
  *
  *  MORSE codelets kernel
  *  MORSE is a software package provided by Univ. of Tennessee,