diff --git a/dist/info/supafaust_libretro.info b/dist/info/mednafen_supafaust_libretro.info
similarity index 89%
rename from dist/info/supafaust_libretro.info
rename to dist/info/mednafen_supafaust_libretro.info
index 47e219c6..4353c892 100644
--- a/dist/info/supafaust_libretro.info
+++ b/dist/info/mednafen_supafaust_libretro.info
@@ -1,8 +1,8 @@
 # Software Information
-display_name = "Nintendo - SNES / SFC (Supafaust)"
+display_name = "Nintendo - SNES / SFC (Beetle Supafaust)"
 categories = "Emulator"
 authors = "Mednafen team"
-corename = "Supafaust"
+corename = "Beetle Supafaust"
 supported_extensions = "smc|fig|sfc|gd3|gd7|dx2|bsx|swc"
 license = "GPLv2+"
 permissions = ""
diff --git a/recipes/android/cores-android b/recipes/android/cores-android
index 97b724f9..ee68dc26 100644
--- a/recipes/android/cores-android
+++ b/recipes/android/cores-android
@@ -54,7 +54,7 @@ mednafen_pcfx libretro-beetle_pcfx https://github.com/libretro/beetle-pcfx-libre
 mednafen_psx libretro-beetle_psx https://github.com/libretro/beetle-psx-libretro.git master YES GENERIC_JNI Makefile jni HAVE_HW=0
 mednafen_psx_hw libretro-beetle_psx_hw https://github.com/libretro/beetle-psx-libretro.git master YES GENERIC_JNI Makefile jni HAVE_HW=1 APP_PLATFORM=android-24
 mednafen_saturn libretro-beetle_saturn https://github.com/libretro/beetle-saturn-libretro.git master YES GENERIC_JNI Makefile jni
-mednafen_snes libretro-beetle_snes https://github.com/libretro/beetle-bsnes-libretro.git master YES GENERIC_JNI Makefile jni
+mednafen_supafaust libretro-mednafen_supafaust https://github.com/libretro/supafaust.git master YES GENERIC_JNI Makefile jni
 mednafen_supergrafx libretro-beetle_supergrafx https://github.com/libretro/beetle-supergrafx-libretro.git master YES GENERIC_JNI Makefile jni
 mednafen_vb libretro-beetle_vb https://github.com/libretro/beetle-vb-libretro.git master YES GENERIC_JNI Makefile jni
 mednafen_wswan libretro-beetle_wswan https://github.com/libretro/beetle-wswan-libretro.git master YES GENERIC_JNI Makefile jni
diff --git a/recipes/linux/cores-linux-x64-generic b/recipes/linux/cores-linux-x64-generic
index 66a96f0e..c8afb70e 100644
--- a/recipes/linux/cores-linux-x64-generic
+++ b/recipes/linux/cores-linux-x64-generic
@@ -76,7 +76,7 @@ mednafen_pcfx libretro-beetle_pcfx https://github.com/libretro/beetle-pcfx-libre
 mednafen_psx libretro-beetle_psx https://github.com/libretro/beetle-psx-libretro.git master YES GENERIC Makefile . HAVE_LIGHTREC=1
 mednafen_psx_hw libretro-beetle_psx_hw https://github.com/libretro/beetle-psx-libretro.git master YES GENERIC Makefile . HAVE_HW=1 HAVE_LIGHTREC=1
 mednafen_saturn libretro-beetle_saturn https://github.com/libretro/beetle-saturn-libretro.git master YES GENERIC Makefile .
-mednafen_snes libretro-beetle_snes https://github.com/libretro/beetle-bsnes-libretro.git master YES GENERIC Makefile .
+mednafen_supafaust libretro-mednafen_supafaust https://github.com/libretro/supafaust.git master YES GENERIC Makefile .
 mednafen_supergrafx libretro-beetle_supergrafx https://github.com/libretro/beetle-supergrafx-libretro.git master YES GENERIC Makefile .
 mednafen_vb libretro-beetle_vb https://github.com/libretro/beetle-vb-libretro.git master YES GENERIC Makefile .
 mednafen_wswan libretro-beetle_wswan https://github.com/libretro/beetle-wswan-libretro.git master YES GENERIC Makefile .
diff --git a/recipes/windows/cores-windows-x64_seh-generic b/recipes/windows/cores-windows-x64_seh-generic
index cd9f2ba2..55362d64 100644
--- a/recipes/windows/cores-windows-x64_seh-generic
+++ b/recipes/windows/cores-windows-x64_seh-generic
@@ -72,7 +72,7 @@ mednafen_pcfx libretro-beetle_pcfx https://github.com/libretro/beetle-pcfx-libre
 mednafen_psx libretro-beetle_psx https://github.com/libretro/beetle-psx-libretro.git master YES GENERIC Makefile . HAVE_LIGHTREC=1
 mednafen_psx_hw libretro-beetle_psx_hw https://github.com/libretro/beetle-psx-libretro.git master YES GENERIC Makefile . HAVE_LIGHTREC=1 HAVE_HW=1
 mednafen_saturn libretro-beetle_saturn https://github.com/libretro/beetle-saturn-libretro.git master YES GENERIC Makefile .
-mednafen_snes libretro-beetle_snes https://github.com/libretro/beetle-bsnes-libretro.git master YES GENERIC Makefile .
+mednafen_supafaust libretro-mednafen_supafaust https://github.com/libretro/supafaust.git master YES GENERIC Makefile .
 mednafen_supergrafx libretro-beetle_supergrafx https://github.com/libretro/beetle-supergrafx-libretro.git master YES GENERIC Makefile .
 mednafen_vb libretro-beetle_vb https://github.com/libretro/beetle-vb-libretro.git master YES GENERIC Makefile .
 mednafen_wswan libretro-beetle_wswan https://github.com/libretro/beetle-wswan-libretro.git master YES GENERIC Makefile .
diff --git a/recipes/windows/cores-windows-x86_dw2-generic b/recipes/windows/cores-windows-x86_dw2-generic
index cd61dbec..9b34045d 100644
--- a/recipes/windows/cores-windows-x86_dw2-generic
+++ b/recipes/windows/cores-windows-x86_dw2-generic
@@ -70,7 +70,7 @@ mednafen_pcfx libretro-beetle_pcfx https://github.com/libretro/beetle-pcfx-libre
 mednafen_psx libretro-beetle_psx https://github.com/libretro/beetle-psx-libretro.git master YES GENERIC Makefile . HAVE_LIGHTREC=1
 mednafen_psx_hw libretro-beetle_psx_hw https://github.com/libretro/beetle-psx-libretro.git master YES GENERIC Makefile . HAVE_LIGHTREC=1 HAVE_HW=1
 mednafen_saturn libretro-beetle_saturn https://github.com/libretro/beetle-saturn-libretro.git master YES GENERIC Makefile .
-mednafen_snes libretro-beetle_snes https://github.com/libretro/beetle-bsnes-libretro.git master YES GENERIC Makefile .
+mednafen_supafaust libretro-mednafen_supafaust https://github.com/libretro/supafaust.git master YES GENERIC Makefile .
 mednafen_supergrafx libretro-beetle_supergrafx https://github.com/libretro/beetle-supergrafx-libretro.git master YES GENERIC Makefile .
 mednafen_vb libretro-beetle_vb https://github.com/libretro/beetle-vb-libretro.git master YES GENERIC Makefile .
 mednafen_wswan libretro-beetle_wswan https://github.com/libretro/beetle-wswan-libretro.git master YES GENERIC Makefile .