diff --git a/core_info.c b/core_info.c
index e6bf8e4595..c8a7e9e0ad 100644
--- a/core_info.c
+++ b/core_info.c
@@ -58,18 +58,19 @@ core_info_list_t *core_info_list_new(const char *modules_path)
       path_remove_extension(info_path_base);
 
 #if defined(RARCH_MOBILE) || defined(RARCH_CONSOLE)
+      // Android libs are deployed with a prefix 'lib' (libretro_*.so, etc)
+      // Non-Android Libs (mobile/console) are deployed with a system name suffix (*_ios.dylib, *_qnx.so, etc).
 #ifdef ANDROID
-      // Android libs have to be prefixed with 'lib' - so cores begin with 'libretro_' prefix 
       char *substr = strstr(info_path_base, "libretro_");
-      if (substr)
-         *substr = '\0';
-      strlcat(info_path_base, "_libretro", sizeof(info_path_base));
 #else
-      // Libs are deployed with a suffix (*_ios.dylib, *_qnx.so, etc).
       char *substr = strrchr(info_path_base, '_');
+#endif
       if (substr)
          *substr = '\0';
 #endif
+
+#ifdef ANDROID
+      strlcat(info_path_base, "_libretro", sizeof(info_path_base));
 #endif
       strlcat(info_path_base, ".info", sizeof(info_path_base));