diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 6a508a2917..7c212179d1 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -2826,9 +2826,9 @@ void general_write_handler(void *data)
       case MENU_LABEL_VIDEO_THREADED:
          {
             if (*setting->value.boolean)
-               task_ctl(TASK_CTL_SET_THREADED, NULL);
+               task_queue_ctl(TASK_CTL_SET_THREADED, NULL);
             else
-               task_ctl(TASK_CTL_UNSET_THREADED, NULL);
+               task_queue_ctl(TASK_CTL_UNSET_THREADED, NULL);
          }
          break;
       case MENU_LABEL_INPUT_POLL_TYPE_BEHAVIOR:
diff --git a/runloop.c b/runloop.c
index 6573a891fb..31b9cc39d8 100644
--- a/runloop.c
+++ b/runloop.c
@@ -439,7 +439,7 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data)
    switch (state)
    {
       case RUNLOOP_CTL_DATA_ITERATE:
-         task_ctl(TASK_CTL_CHECK, NULL);
+         task_queue_ctl(TASK_CTL_CHECK, NULL);
          return true;
       case RUNLOOP_CTL_SHADER_DIR_DEINIT:
          shader_dir_free(&runloop_shader_dir);
@@ -973,7 +973,7 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data)
       case RUNLOOP_CTL_TASK_INIT:
          {
             bool threaded_enable = settings->threaded_data_runloop_enable;
-            task_ctl(TASK_CTL_INIT, &threaded_enable);
+            task_queue_ctl(TASK_CTL_INIT, &threaded_enable);
          }
          break;
       case RUNLOOP_CTL_PREPARE_DUMMY:
@@ -1011,7 +1011,7 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data)
       case RUNLOOP_CTL_IS_EXEC:
          return runloop_exec;
       case RUNLOOP_CTL_DATA_DEINIT:
-         task_ctl(TASK_CTL_DEINIT, NULL);
+         task_queue_ctl(TASK_CTL_DEINIT, NULL);
          break;
       case RUNLOOP_CTL_IS_CORE_OPTION_UPDATED:
          if (!runloop_system.core_options)
diff --git a/tasks/task_database.c b/tasks/task_database.c
index b46f3e7601..6e9707288b 100644
--- a/tasks/task_database.c
+++ b/tasks/task_database.c
@@ -607,7 +607,7 @@ bool rarch_task_push_dbscan(const char *fullpath,
    if (db->handle)
       db->handle->status = DATABASE_STATUS_ITERATE_BEGIN;
 
-   task_ctl(TASK_CTL_PUSH, t);
+   task_queue_ctl(TASK_CTL_PUSH, t);
 
    return true;
 
diff --git a/tasks/task_decompress.c b/tasks/task_decompress.c
index 372b9f8add..9d2555e0aa 100644
--- a/tasks/task_decompress.c
+++ b/tasks/task_decompress.c
@@ -266,7 +266,7 @@ bool rarch_task_push_decompress(
    find_data.func     = rarch_task_decompress_finder;
    find_data.userdata = (void*)source_file;
 
-   if (task_ctl(TASK_CTL_FIND, &find_data))
+   if (task_queue_ctl(TASK_CTL_FIND, &find_data))
    {
       RARCH_LOG("[decompress] File '%s' already being decompressed.\n",
             source_file);
@@ -313,7 +313,7 @@ bool rarch_task_push_decompress(
 
    t->title       = strdup(tmp);
 
-   task_ctl(TASK_CTL_PUSH, t);
+   task_queue_ctl(TASK_CTL_PUSH, t);
 
    return true;
 
diff --git a/tasks/task_file_transfer.c b/tasks/task_file_transfer.c
index 23c3c9348e..a2b5bde551 100644
--- a/tasks/task_file_transfer.c
+++ b/tasks/task_file_transfer.c
@@ -364,7 +364,7 @@ bool rarch_task_push_image_load(const char *fullpath,
    t->callback = cb;
    t->user_data = user_data;
 
-   task_ctl(TASK_CTL_PUSH, t);
+   task_queue_ctl(TASK_CTL_PUSH, t);
 #endif
    return true;
 }
diff --git a/tasks/task_http.c b/tasks/task_http.c
index 2dc6737b3c..4382f07313 100644
--- a/tasks/task_http.c
+++ b/tasks/task_http.c
@@ -226,7 +226,7 @@ bool rarch_task_push_http_transfer(const char *url, const char *type,
    find_data.userdata = (void*)url;
 
    /* Concurrent download of the same file is not allowed */
-   if (task_ctl(TASK_CTL_FIND, &find_data))
+   if (task_queue_ctl(TASK_CTL_FIND, &find_data))
    {
       RARCH_LOG("[http] '%s'' is already being downloaded.\n", url);
       return false;
@@ -265,7 +265,7 @@ bool rarch_task_push_http_transfer(const char *url, const char *type,
 
    t->title                = strdup(tmp);
 
-   task_ctl(TASK_CTL_PUSH, t);
+   task_queue_ctl(TASK_CTL_PUSH, t);
 
    return true;
 
diff --git a/tasks/task_overlay.c b/tasks/task_overlay.c
index 7fad1a2d29..c05ed016a5 100644
--- a/tasks/task_overlay.c
+++ b/tasks/task_overlay.c
@@ -732,7 +732,7 @@ static bool rarch_task_push_overlay_load(const char *overlay_path,
    t->callback              = cb;
    t->user_data             = user_data;
 
-   task_ctl(TASK_CTL_PUSH, t);
+   task_queue_ctl(TASK_CTL_PUSH, t);
 
    return true;
 error:
diff --git a/tasks/tasks.c b/tasks/tasks.c
index 5f7ffbd272..f0130529b4 100644
--- a/tasks/tasks.c
+++ b/tasks/tasks.c
@@ -330,7 +330,7 @@ static struct retro_task_impl impl_threaded = {
 };
 #endif
 
-bool task_ctl(enum task_ctl_state state, void *data)
+bool task_queue_ctl(enum task_queue_ctl_state state, void *data)
 {
    static struct retro_task_impl *impl_current = NULL;
    static bool task_threaded_enable            = false;
@@ -358,7 +358,7 @@ bool task_ctl(enum task_ctl_state state, void *data)
 #ifdef HAVE_THREADS
             if (*boolean_val)
             {
-               task_ctl(TASK_CTL_SET_THREADED, NULL);
+               task_queue_ctl(TASK_CTL_SET_THREADED, NULL);
                impl_current = &impl_threaded;
             }
 #endif
@@ -377,13 +377,13 @@ bool task_ctl(enum task_ctl_state state, void *data)
          {
 #ifdef HAVE_THREADS
             bool current_threaded = (impl_current == &impl_threaded);
-            bool want_threaded    = task_ctl(TASK_CTL_IS_THREADED, NULL);
+            bool want_threaded    = task_queue_ctl(TASK_CTL_IS_THREADED, NULL);
 
             if (want_threaded != current_threaded)
-               task_ctl(TASK_CTL_DEINIT, NULL);
+               task_queue_ctl(TASK_CTL_DEINIT, NULL);
 
             if (!impl_current)
-               task_ctl(TASK_CTL_INIT, NULL);
+               task_queue_ctl(TASK_CTL_INIT, NULL);
 #endif
 
             impl_current->gather();
diff --git a/tasks/tasks.h b/tasks/tasks.h
index 9f594d2c4c..e3a75599a5 100644
--- a/tasks/tasks.h
+++ b/tasks/tasks.h
@@ -24,7 +24,7 @@
 extern "C" {
 #endif
 
-enum task_ctl_state
+enum task_queue_ctl_state
 {
    TASK_CTL_NONE = 0,
 
@@ -140,7 +140,7 @@ typedef struct task_finder_data
 
 void push_task_progress(retro_task_t *task);
 
-bool task_ctl(enum task_ctl_state state, void *data);
+bool task_queue_ctl(enum task_queue_ctl_state state, void *data);
 
 #ifdef __cplusplus
 }