diff --git a/360/frontend-xdk/menu.cpp b/360/frontend-xdk/menu.cpp
index 53182c7546..23749a6fb5 100644
--- a/360/frontend-xdk/menu.cpp
+++ b/360/frontend-xdk/menu.cpp
@@ -523,7 +523,7 @@ HRESULT CRetroArchMain::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
GetChildById(L"XuiBtnQuit", &m_quit);
GetChildById(L"XuiTxtTitle", &m_title);
GetChildById(L"XuiTxtCoreText", &m_core);
- GetChildById(L"XuiBtnLibsnesCore", &m_change_libretro_core);
+ GetChildById(L"XuiBtnLibretroCore", &m_change_libretro_core);
char core_text[256];
snprintf(core_text, sizeof(core_text), "%s (v%s)", id, info.library_version);
diff --git a/360/media/hd/rarch_main.xui b/360/media/hd/rarch_main.xui
index 42328264c9..88fd775461 100644
--- a/360/media/hd/rarch_main.xui
+++ b/360/media/hd/rarch_main.xui
@@ -43,7 +43,7 @@
30.799988
38.127960,196.615982,0.000000
XuiBtnControls
-XuiBtnLibsnesCore
+XuiBtnLibretroCore
Settings
@@ -54,7 +54,7 @@
30.799988
38.327736,287.007996,0.000000
245.162109,-84.153275,0.000000
-XuiBtnLibsnesCore
+XuiBtnLibretroCore
XuiBtnRomBrowser
Quit
@@ -103,7 +103,7 @@
-XuiBtnLibsnesCore
+XuiBtnLibretroCore
488.312012
30.799988
38.127960,241.615982,0.000000
diff --git a/360/media/sd/rarch_main.xui b/360/media/sd/rarch_main.xui
index 05cee67d85..3df91c28f5 100644
--- a/360/media/sd/rarch_main.xui
+++ b/360/media/sd/rarch_main.xui
@@ -43,7 +43,7 @@
30.799988
38.127960,196.615982,0.000000
XuiBtnControls
-XuiBtnLibsnesCore
+XuiBtnLibretroCore
Settings
@@ -54,7 +54,7 @@
30.799988
38.327736,287.007996,0.000000
245.162109,-84.153275,0.000000
-XuiBtnLibsnesCore
+XuiBtnLibretroCore
XuiBtnRomBrowser
Quit
@@ -103,7 +103,7 @@
-XuiBtnLibsnesCore
+XuiBtnLibretroCore
488.312012
30.799988
38.127960,241.615982,0.000000
diff --git a/console/retroarch_console_input.h b/console/retroarch_console_input.h
index 9d3c46cf00..adb8959596 100644
--- a/console/retroarch_console_input.h
+++ b/console/retroarch_console_input.h
@@ -129,6 +129,6 @@ enum xdk360_device_id
#endif
extern uint64_t rarch_default_keybind_lut[RARCH_FIRST_META_KEY];
-extern char rarch_default_libsnes_keybind_name_lut[RARCH_FIRST_META_KEY][256];
+extern char rarch_default_libretro_keybind_name_lut[RARCH_FIRST_META_KEY][256];
#endif
diff --git a/console/test.c b/console/test.c
index b1192a9c39..730294f222 100644
--- a/console/test.c
+++ b/console/test.c
@@ -13,9 +13,9 @@
* If not, see .
*/
-// Test module to check re-entrancy of libsnes implementations.
+// Test module to check re-entrancy of libretro implementations.
// Reruns RetroArch main loop with all roms defined on command-line
-// to check if libsnes can load multiple roms after each other.
+// to check if libretro can load multiple roms after each other.
#include "../getopt_rarch.h"
#include "../general.h"
diff --git a/netplay.c b/netplay.c
index 26bfac9440..4c4705e5a5 100644
--- a/netplay.c
+++ b/netplay.c
@@ -568,7 +568,7 @@ static bool get_info(netplay_t *handle)
if (implementation_magic_value() != ntohl(header[1]))
{
- RARCH_ERR("Implementations differ, make sure you're using exact same libsnes implementations and RetroArch version.\n");
+ RARCH_ERR("Implementations differ, make sure you're using exact same libretro implementations and RetroArch version.\n");
return false;
}
diff --git a/pandora/retroarch/retroarch.cfg b/pandora/retroarch/retroarch.cfg
index 1c6ebdf4a4..eb16eeaf35 100644
--- a/pandora/retroarch/retroarch.cfg
+++ b/pandora/retroarch/retroarch.cfg
@@ -142,7 +142,7 @@ video_font_size = 10
# Used to calculate a suitable audio input rate.
# video_refresh_rate = 59.95
-# Allows libsnes cores to set rotation modes.
+# Allows libretro cores to set rotation modes.
# Setting this to false will honor, but ignore this request.
# This is useful for vertically oriented games where one manually rotates the monitor.
# video_allow_rotate = true
@@ -233,7 +233,7 @@ input_player1_down = down
# input_player3_joypad_index = 2
# input_player4_joypad_index = 3
# input_player5_joypad_index = 4
-# Player 6-8 is not directly expected by libsnes API, but we'll futureproof it.
+# Player 6-8 is not directly expected by libretro API, but we'll futureproof it.
# input_player6_joypad_index = 5
# input_player7_joypad_index = 6
# input_player8_joypad_index = 7
@@ -338,7 +338,7 @@ input_player1_down = down
#### Misc
# Enable rewinding. This will take a performance hit when playing, so it is disabled by default.
-# Do note that rewinding will only work properly when using bSNES libsnes core atm.
+# Do note that rewinding will only work properly when using bSNES libretro core atm.
# rewind_enable = false
# Rewinding buffer size in megabytes. Bigger rewinding buffer means you can rewind longer.
diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index bbddef8494..696f8b9f77 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -22,7 +22,7 @@ if [ "$HAVE_RPI" = 'yes' ]; then
fi
if [ "$LIBRETRO" ]; then
- echo "Explicit libsnes used, disabling dynamic libsnes loading ..."
+ echo "Explicit libretro used, disabling dynamic libretro loading ..."
HAVE_DYNAMIC='no'
else LIBRETRO="-lretro"
fi
diff --git a/qb/config.params.sh b/qb/config.params.sh
index 2b66c17e00..02e524d574 100644
--- a/qb/config.params.sh
+++ b/qb/config.params.sh
@@ -1,4 +1,4 @@
-HAVE_DYNAMIC=yes # Disable dynamic loading of libsnes library
+HAVE_DYNAMIC=yes # Disable dynamic loading of libretro library
HAVE_LIBRETRO= # libretro library used
HAVE_THREADS=auto # Threading support
HAVE_FFMPEG=auto # Enable FFmpeg recording support
diff --git a/record/ffemu.c b/record/ffemu.c
index 67b77f6938..6e812a5dd2 100644
--- a/record/ffemu.c
+++ b/record/ffemu.c
@@ -475,7 +475,7 @@ bool ffemu_push_video(ffemu_t *handle, const struct ffemu_video_data *data)
slock_lock(handle->lock);
- // Tightly pack our frame to conserve memory. libsnes tends to use a very large pitch.
+ // Tightly pack our frame to conserve memory. libretro tends to use a very large pitch.
struct ffemu_video_data attr_data = *data;
if (attr_data.is_dupe)
diff --git a/retroarch.cfg b/retroarch.cfg
index 4d7730b41c..274141ea65 100644
--- a/retroarch.cfg
+++ b/retroarch.cfg
@@ -134,7 +134,7 @@
# Used to calculate a suitable audio input rate.
# video_refresh_rate = 59.95
-# Allows libsnes cores to set rotation modes.
+# Allows libretro cores to set rotation modes.
# Setting this to false will honor, but ignore this request.
# This is useful for vertically oriented games where one manually rotates the monitor.
# video_allow_rotate = true
@@ -222,13 +222,13 @@
# input_player3_joypad_index = 2
# input_player4_joypad_index = 3
# input_player5_joypad_index = 4
-# Player 6-8 is not directly expected by libsnes API, but we'll futureproof it.
+# Player 6-8 is not directly expected by libretro API, but we'll futureproof it.
# input_player6_joypad_index = 5
# input_player7_joypad_index = 6
# input_player8_joypad_index = 7
# Joypad buttons.
-# Figure these out by using RetroArch-Phoenix or ssnes-joyconfig.
+# Figure these out by using RetroArch-Phoenix or retroarch-joyconfig.
# You can use joypad hats with hnxx, where n is the hat, and xx is a string representing direction.
# E.g. "h0up"
# input_player1_a_btn =
@@ -327,7 +327,7 @@
#### Misc
# Enable rewinding. This will take a performance hit when playing, so it is disabled by default.
-# Do note that rewinding will only work properly when using bSNES libsnes core atm.
+# Do note that rewinding will only work properly when using bSNES libretro core atm.
# rewind_enable = false
# Rewinding buffer size in megabytes. Bigger rewinding buffer means you can rewind longer.