diff --git a/tasks/task_database.c b/tasks/task_database.c
index 530602b374..73d7ce9052 100644
--- a/tasks/task_database.c
+++ b/tasks/task_database.c
@@ -88,7 +88,7 @@ static int zlib_compare_crc32(const char *name, const char *valid_exts,
 }
 #endif
 
-static int database_info_iterate_start(database_info_handle_t *db,
+static int task_database_iterate_start(database_info_handle_t *db,
       const char *name)
 {
    char msg[128] = {0};
@@ -196,7 +196,7 @@ static bool file_get_crc(database_state_handle_t *db_state,
    return 1;
 }
 
-static int database_info_iterate_playlist(
+static int task_database_iterate_playlist(
       database_state_handle_t *db_state,
       database_info_handle_t *db, const char *name)
 {
@@ -254,7 +254,7 @@ static int database_info_list_iterate_end_no_match(
    return 0;
 }
 
-static int database_info_iterate_next(database_info_handle_t *db)
+static int task_database_iterate_next(database_info_handle_t *db)
 {
    db->list_ptr++;
 
@@ -361,7 +361,7 @@ static int database_info_list_iterate_next(
    return 1;
 }
 
-static int database_info_iterate_crc_lookup(
+static int task_database_iterate_crc_lookup(
       database_state_handle_t *db_state,
       database_info_handle_t *db,
       const char *zip_entry)
@@ -418,14 +418,14 @@ static int database_info_iterate_crc_lookup(
    return 0;
 }
 
-static int database_info_iterate_playlist_zip(
+static int task_database_iterate_playlist_zip(
       database_state_handle_t *db_state,
       database_info_handle_t *db, const char *name)
 {
    bool returnerr = true;
 #ifdef HAVE_ZLIB
    if (db_state->crc != 0)
-      return database_info_iterate_crc_lookup(
+      return task_database_iterate_crc_lookup(
             db_state, db, db_state->zip_name);
 
    if (file_archive_parse_file_iterate(&db->state,
@@ -440,7 +440,7 @@ static int database_info_iterate_playlist_zip(
    return 1;
 }
 
-static int database_info_iterate_serial_lookup(
+static int task_database_iterate_serial_lookup(
       database_state_handle_t *db_state,
       database_info_handle_t *db, const char *name)
 {
@@ -497,7 +497,7 @@ static int database_info_iterate_serial_lookup(
    return 0;
 }
 
-static int database_info_iterate(database_state_handle_t *db_state,
+static int task_database_iterate(database_state_handle_t *db_state,
       database_info_handle_t *db)
 {
    const char *name = db ? db->list->elems[db->list_ptr].data : NULL;
@@ -511,13 +511,13 @@ static int database_info_iterate(database_state_handle_t *db_state,
    switch (db->type)
    {
       case DATABASE_TYPE_ITERATE:
-         return database_info_iterate_playlist(db_state, db, name);
+         return task_database_iterate_playlist(db_state, db, name);
       case DATABASE_TYPE_ITERATE_ZIP:
-         return database_info_iterate_playlist_zip(db_state, db, name);
+         return task_database_iterate_playlist_zip(db_state, db, name);
       case DATABASE_TYPE_SERIAL_LOOKUP:
-         return database_info_iterate_serial_lookup(db_state, db, name);
+         return task_database_iterate_serial_lookup(db_state, db, name);
       case DATABASE_TYPE_CRC_LOOKUP:
-         return database_info_iterate_crc_lookup(db_state, db, NULL);
+         return task_database_iterate_crc_lookup(db_state, db, NULL);
       case DATABASE_TYPE_NONE:
       default:
          break;
@@ -526,7 +526,7 @@ static int database_info_iterate(database_state_handle_t *db_state,
    return 0;
 }
 
-static void rarch_main_data_db_cleanup_state(
+static void task_database_cleanup_state(
       database_state_handle_t *db_state)
 {
    if (!db_state)
@@ -537,7 +537,7 @@ static void rarch_main_data_db_cleanup_state(
    db_state->buf = NULL;
 }
 
-static void rarch_dbscan_task_handler(retro_task_t *task)
+static void task_database_handler(retro_task_t *task)
 {
    db_handle_t *db                  = (db_handle_t*)task->state;
    database_info_handle_t  *dbinfo  = db->handle;
@@ -557,20 +557,20 @@ static void rarch_dbscan_task_handler(retro_task_t *task)
          dbinfo->status = DATABASE_STATUS_ITERATE_START;
          break;
       case DATABASE_STATUS_ITERATE_START:
-         rarch_main_data_db_cleanup_state(dbstate);
+         task_database_cleanup_state(dbstate);
          dbstate->list_index  = 0;
          dbstate->entry_index = 0;
-         database_info_iterate_start(dbinfo, name);
+         task_database_iterate_start(dbinfo, name);
          break;
       case DATABASE_STATUS_ITERATE:
-         if (database_info_iterate(&db->state, dbinfo) == 0)
+         if (task_database_iterate(&db->state, dbinfo) == 0)
          {
             dbinfo->status = DATABASE_STATUS_ITERATE_NEXT;
             dbinfo->type   = DATABASE_TYPE_ITERATE;
          }
          break;
       case DATABASE_STATUS_ITERATE_NEXT:
-         if (database_info_iterate_next(dbinfo) == 0)
+         if (task_database_iterate_next(dbinfo) == 0)
          {
             dbinfo->status = DATABASE_STATUS_ITERATE_START;
             dbinfo->type   = DATABASE_TYPE_ITERATE;
@@ -615,7 +615,7 @@ bool rarch_task_push_dbscan(const char *fullpath,
    if (!t || !db)
       goto error;
 
-   t->handler        = rarch_dbscan_task_handler;
+   t->handler        = task_database_handler;
    t->state          = db;
    t->callback       = cb;
 
diff --git a/tasks/task_decompress.c b/tasks/task_decompress.c
index 104725c831..80b97ef0ff 100644
--- a/tasks/task_decompress.c
+++ b/tasks/task_decompress.c
@@ -131,7 +131,7 @@ error:
    return 0;
 }
 
-static void rarch_task_decompress_handler_finished(retro_task_t *task,
+static void task_decompress_handler_finished(retro_task_t *task,
       decompress_state_t *dec)
 {
    task->finished = true;
@@ -158,7 +158,7 @@ static void rarch_task_decompress_handler_finished(retro_task_t *task,
    free(dec);
 }
 
-static void rarch_task_decompress_handler(retro_task_t *task)
+static void task_decompress_handler(retro_task_t *task)
 {
    bool retdec             = false;
    decompress_state_t *dec = (decompress_state_t*)task->state;
@@ -173,11 +173,11 @@ static void rarch_task_decompress_handler(retro_task_t *task)
       task->error = dec->callback_error;
       file_archive_parse_file_iterate_stop(&dec->zlib);
 
-      rarch_task_decompress_handler_finished(task, dec);
+      task_decompress_handler_finished(task, dec);
    }
 }
 
-static void rarch_task_decompress_handler_target_file(retro_task_t *task)
+static void task_decompress_handler_target_file(retro_task_t *task)
 {
    bool retdec;
    decompress_state_t *dec = (decompress_state_t*)task->state;
@@ -192,11 +192,11 @@ static void rarch_task_decompress_handler_target_file(retro_task_t *task)
       task->error = dec->callback_error;
       file_archive_parse_file_iterate_stop(&dec->zlib);
 
-      rarch_task_decompress_handler_finished(task, dec);
+      task_decompress_handler_finished(task, dec);
    }
 }
 
-static void rarch_task_decompress_handler_subdir(retro_task_t *task)
+static void task_decompress_handler_subdir(retro_task_t *task)
 {
    bool retdec;
    decompress_state_t *dec = (decompress_state_t*)task->state;
@@ -211,16 +211,16 @@ static void rarch_task_decompress_handler_subdir(retro_task_t *task)
       task->error = dec->callback_error;
       file_archive_parse_file_iterate_stop(&dec->zlib);
 
-      rarch_task_decompress_handler_finished(task, dec);
+      task_decompress_handler_finished(task, dec);
    }
 }
 
-static bool rarch_task_decompress_finder(
+static bool task_decompress_finder(
       retro_task_t *task, void *user_data)
 {
    decompress_state_t *dec = (decompress_state_t*)task->state;
 
-   if (task->handler != rarch_task_decompress_handler)
+   if (task->handler != task_decompress_handler)
       return false;
 
    return string_is_equal(dec->source_file, (const char*)user_data);
@@ -231,7 +231,7 @@ bool rarch_task_check_decompress(const char *source_file)
    task_finder_data_t find_data;
 
    /* Prepare find parameters */
-   find_data.func = rarch_task_decompress_finder;
+   find_data.func = task_decompress_finder;
    find_data.userdata = (void *)source_file;
 
    /* Return whether decompressing is in progress or not */
@@ -300,17 +300,17 @@ bool rarch_task_push_decompress(
       goto error;
 
    t->state       = s;
-   t->handler     = rarch_task_decompress_handler;
+   t->handler     = task_decompress_handler;
 
    if (!string_is_empty(subdir))
    {
       s->subdir        = strdup(subdir);
-      t->handler       = rarch_task_decompress_handler_subdir;
+      t->handler       = task_decompress_handler_subdir;
    }
    else if (!string_is_empty(target_file))
    {
       s->target_file   = strdup(target_file);
-      t->handler       = rarch_task_decompress_handler_target_file;
+      t->handler       = task_decompress_handler_target_file;
    }
 
    t->callback    = cb;
diff --git a/tasks/task_file_transfer.c b/tasks/task_file_transfer.c
index cf13a6babc..e46ab04624 100644
--- a/tasks/task_file_transfer.c
+++ b/tasks/task_file_transfer.c
@@ -26,7 +26,7 @@
 #include "tasks_internal.h"
 #include "../verbosity.h"
 
-static int rarch_main_data_nbio_iterate_transfer(nbio_handle_t *nbio)
+static int task_file_transfer_iterate_transfer(nbio_handle_t *nbio)
 {
    size_t i;
 
@@ -47,7 +47,7 @@ static int rarch_main_data_nbio_iterate_transfer(nbio_handle_t *nbio)
    return 0;
 }
 
-static int rarch_main_data_nbio_iterate_parse(nbio_handle_t *nbio)
+static int task_file_transfer_iterate_parse(nbio_handle_t *nbio)
 {
    if (!nbio)
       return -1;
@@ -68,11 +68,11 @@ void rarch_task_file_load_handler(retro_task_t *task)
    switch (nbio->status)
    {
       case NBIO_STATUS_TRANSFER_PARSE:
-         rarch_main_data_nbio_iterate_parse(nbio);
+         task_file_transfer_iterate_parse(nbio);
          nbio->status = NBIO_STATUS_TRANSFER_PARSE_FREE;
          break;
       case NBIO_STATUS_TRANSFER:
-         if (rarch_main_data_nbio_iterate_transfer(nbio) == -1)
+         if (task_file_transfer_iterate_transfer(nbio) == -1)
             nbio->status = NBIO_STATUS_TRANSFER_PARSE;
          break;
       case NBIO_STATUS_TRANSFER_PARSE_FREE:
diff --git a/tasks/task_http.c b/tasks/task_http.c
index 64a7c05501..1b25f0b6d7 100644
--- a/tasks/task_http.c
+++ b/tasks/task_http.c
@@ -53,14 +53,14 @@ typedef struct http_handle
    bool error;
 } http_handle_t;
 
-static int rarch_main_data_http_con_iterate_transfer(http_handle_t *http)
+static int task_http_con_iterate_transfer(http_handle_t *http)
 {
    if (!net_http_connection_iterate(http->connection.handle))
       return -1;
    return 0;
 }
 
-static int rarch_main_data_http_conn_iterate_transfer_parse(
+static int task_http_conn_iterate_transfer_parse(
       http_handle_t *http)
 {
    if (net_http_connection_done(http->connection.handle))
@@ -101,14 +101,14 @@ static int cb_http_conn_default(void *data_, size_t len)
 }
 
 /**
- * rarch_main_data_http_iterate_transfer:
+ * task_http_iterate_transfer:
  *
  * Resumes HTTP transfer update.
  *
  * Returns: 0 when finished, -1 when we should continue
  * with the transfer on the next frame.
  **/
-static int rarch_main_data_http_iterate_transfer(retro_task_t *task)
+static int task_http_iterate_transfer(retro_task_t *task)
 {
    http_handle_t *http  = (http_handle_t*)task->state;
    size_t pos  = 0, tot = 0;
@@ -133,15 +133,15 @@ static void rarch_task_http_transfer_handler(retro_task_t *task)
    switch (http->status)
    {
       case HTTP_STATUS_CONNECTION_TRANSFER_PARSE:
-         rarch_main_data_http_conn_iterate_transfer_parse(http);
+         task_http_conn_iterate_transfer_parse(http);
          http->status = HTTP_STATUS_TRANSFER;
          break;
       case HTTP_STATUS_CONNECTION_TRANSFER:
-         if (!rarch_main_data_http_con_iterate_transfer(http))
+         if (!task_http_con_iterate_transfer(http))
             http->status = HTTP_STATUS_CONNECTION_TRANSFER_PARSE;
          break;
       case HTTP_STATUS_TRANSFER:
-         if (!rarch_main_data_http_iterate_transfer(task))
+         if (!task_http_iterate_transfer(task))
             goto task_finished;
          break;
       case HTTP_STATUS_TRANSFER_PARSE:
@@ -311,4 +311,3 @@ task_retriever_info_t *http_task_get_transfer_list(void)
    task_queue_ctl(TASK_QUEUE_CTL_RETRIEVE, &retrieve_data);
    return retrieve_data.list;
 }
-