diff --git a/apple/common/RAModuleInfo.m b/apple/common/RAModuleInfo.m
index 581bd0d116..8a1cbf6984 100644
--- a/apple/common/RAModuleInfo.m
+++ b/apple/common/RAModuleInfo.m
@@ -26,7 +26,7 @@ NSArray* apple_get_modules()
 {
    if (!moduleList)
    {   
-      coreList = get_core_info_list(apple_platform.coreDirectory.UTF8String);
+      coreList = core_info_list_new(apple_platform.coreDirectory.UTF8String);
       
       if (!coreList)
          return nil;
@@ -182,4 +182,4 @@ static NSString* build_string_pair(NSString* stringA, NSString* stringB)
 
 @end
 
-#endif
\ No newline at end of file
+#endif
diff --git a/blackberry-qnx/bb10/src/RetroArch-Cascades.cpp b/blackberry-qnx/bb10/src/RetroArch-Cascades.cpp
index e57e8a68ad..c2e14a16dc 100644
--- a/blackberry-qnx/bb10/src/RetroArch-Cascades.cpp
+++ b/blackberry-qnx/bb10/src/RetroArch-Cascades.cpp
@@ -87,7 +87,7 @@ RetroArch::RetroArch()
          //Get core DropDown reference to populate it in C++
          coreSelection = mAppPane->findChild<DropDown*>("dropdown_core");
          connect(coreSelection, SIGNAL(selectedValueChanged(QVariant)), this, SLOT(onCoreSelected(QVariant)));
-         core_info_list = get_core_info_list(g_settings.libretro);
+         core_info_list = core_info_list_new(g_settings.libretro);
          populateCores(core_info_list);
 
          Application::instance()->setScene(mAppPane);
@@ -112,7 +112,7 @@ RetroArch::RetroArch()
 
 RetroArch::~RetroArch()
 {
-   free_core_info_list(core_info_list);
+   core_info_list_free(core_info_list);
 }
 
 void RetroArch::aboutToQuit()
diff --git a/core_info.c b/core_info.c
index d10584bcc9..d7e8c5d593 100644
--- a/core_info.c
+++ b/core_info.c
@@ -19,7 +19,7 @@
 #include "file_ext.h"
 #include "config.def.h"
 
-core_info_list_t *get_core_info_list(const char *modules_path)
+core_info_list_t *core_info_list_new(const char *modules_path)
 {
    struct string_list *contents = dir_list_new(modules_path, EXT_EXECUTABLES, false);
 
@@ -84,11 +84,11 @@ core_info_list_t *get_core_info_list(const char *modules_path)
 error:
    if (contents)
       dir_list_free(contents);
-   free_core_info_list(core_info_list);
+   core_info_list_free(core_info_list);
    return NULL;
 }
 
-void free_core_info_list(core_info_list_t *core_info_list)
+void core_info_list_free(core_info_list_t *core_info_list)
 {
    if (!core_info_list)
       return;
@@ -106,7 +106,7 @@ void free_core_info_list(core_info_list_t *core_info_list)
    free(core_info_list);
 }
 
-bool does_core_support_file(core_info_t *core, const char *path)
+bool core_info_list_does_support_file(core_info_t *core, const char *path)
 {
    if (!path || !core || !core->supported_extensions_list)
       return false;
diff --git a/core_info.h b/core_info.h
index 3f68b2fa69..4148f0db59 100644
--- a/core_info.h
+++ b/core_info.h
@@ -37,10 +37,10 @@ typedef struct {
    size_t count;
 } core_info_list_t;
 
-core_info_list_t *get_core_info_list(const char *modules_path);
-void free_core_info_list(core_info_list_t *core_info_list);
+core_info_list_t *core_info_list_new(const char *modules_path);
+void core_info_list_free(core_info_list_t *core_info_list);
 
-bool does_core_support_file(core_info_t *core, const char *path);
+bool core_info_list_does_support_file(core_info_t *core, const char *path);
 
 #ifdef __cplusplus
 }