diff --git a/database_info.c b/database_info.c
index 76f3a7fad7..b64ab33ad9 100644
--- a/database_info.c
+++ b/database_info.c
@@ -343,7 +343,7 @@ static int database_cursor_close(libretrodb_t *db, libretrodb_cursor_t *cur)
    return 0;
 }
 
-database_info_handle_t *database_info_init(const char *dir,
+database_info_handle_t *database_info_dir_init(const char *dir,
       enum database_type type)
 {
    database_info_handle_t     *db  = (database_info_handle_t*)
@@ -377,7 +377,6 @@ void database_info_free(database_info_handle_t *db)
    string_list_free(db->list);
 }
 
-
 database_info_list_t *database_info_list_new(
       const char *rdb_path, const char *query)
 {
diff --git a/database_info.h b/database_info.h
index 7d69f9cccc..2c8c72bb88 100644
--- a/database_info.h
+++ b/database_info.h
@@ -101,10 +101,10 @@ database_info_list_t *database_info_list_new(const char *rdb_path,
 
 void database_info_list_free(database_info_list_t *list);
 
-database_info_handle_t *database_info_init(const char *dir,
+database_info_handle_t *database_info_dir_init(const char *dir,
       enum database_type type);
 
-void database_info_free(database_info_handle_t *dbl);
+void database_info_free(database_info_handle_t *handle);
 
 int database_info_build_query(
       char *query, size_t len, const char *label, const char *path);
diff --git a/tasks/task_database.c b/tasks/task_database.c
index 39ea0fba1c..2852ba5fe2 100644
--- a/tasks/task_database.c
+++ b/tasks/task_database.c
@@ -330,7 +330,7 @@ static int database_info_poll(db_handle_t *db)
    if (str_list->size > 1)
       strlcpy(elem1, str_list->elems[1].data, sizeof(elem1));
 
-   db->handle = database_info_init(elem0, DATABASE_TYPE_ITERATE);
+   db->handle = database_info_dir_init(elem0, DATABASE_TYPE_ITERATE);
 
    string_list_free(str_list);