diff --git a/audio/ext_audio.c b/audio/ext_audio.c
index af1da3be63..e5e3ceaf6e 100644
--- a/audio/ext_audio.c
+++ b/audio/ext_audio.c
@@ -86,7 +86,7 @@ static void *audio_ext_init(const char *device, unsigned rate, unsigned latency)
 
    if (ext->driver->api_version != RARCH_AUDIO_API_VERSION)
    {
-      RARCH_ERR("API mismatch in external audio plugin. SSNES: %d, Plugin: %d ...\n", RARCH_AUDIO_API_VERSION, ext->driver->api_version);
+      RARCH_ERR("API mismatch in external audio plugin. RetroArch: %d, Plugin: %d ...\n", RARCH_AUDIO_API_VERSION, ext->driver->api_version);
       goto error;
    }
 
diff --git a/audio/jack.c b/audio/jack.c
index 348b448f2f..27fd6705e4 100644
--- a/audio/jack.c
+++ b/audio/jack.c
@@ -138,7 +138,7 @@ static void *ja_init(const char *device, unsigned rate, unsigned latency)
    size_t bufsize = 0;
    int parsed = 0;
 
-   jd->client = jack_client_open("SSNES", JackNullOption, NULL);
+   jd->client = jack_client_open("RetroArch", JackNullOption, NULL);
    if (jd->client == NULL)
       goto error;
 
diff --git a/audio/pulse.c b/audio/pulse.c
index 91b667e053..a3ceda31c6 100644
--- a/audio/pulse.c
+++ b/audio/pulse.c
@@ -117,7 +117,7 @@ static void *pulse_init(const char *device, unsigned rate, unsigned latency)
    if (!pa->mainloop)
       goto error;
 
-   pa->context = pa_context_new(pa_threaded_mainloop_get_api(pa->mainloop), "SSNES");
+   pa->context = pa_context_new(pa_threaded_mainloop_get_api(pa->mainloop), "RetroArch");
    if (!pa->context)
       goto error;
 
diff --git a/audio/roar.c b/audio/roar.c
index 3e09f5b860..85b7f4b5f0 100644
--- a/audio/roar.c
+++ b/audio/roar.c
@@ -37,7 +37,7 @@ static void *ra_init(const char *device, unsigned rate, unsigned latency)
       return NULL;
 
    roar_vs_t *vss;
-   if ((vss = roar_vs_new_simple(device, "SSNES", rate, 2, ROAR_CODEC_PCM_S, 16, ROAR_DIR_PLAY, &err)) == NULL)
+   if ((vss = roar_vs_new_simple(device, "RetroArch", rate, 2, ROAR_CODEC_PCM_S, 16, ROAR_DIR_PLAY, &err)) == NULL)
    {
       RARCH_ERR("RoarAudio: \"%s\"\n", roar_vs_strerr(err));
       free(roar);
diff --git a/driver.c b/driver.c
index 233bd4289e..733b79cac7 100644
--- a/driver.c
+++ b/driver.c
@@ -276,7 +276,7 @@ static void init_dsp_plugin(void)
 
    if (g_extern.audio_data.dsp_plugin->api_version != RARCH_DSP_API_VERSION)
    {
-      RARCH_ERR("DSP plugin API mismatch. SSNES: %d, Plugin: %d\n", RARCH_DSP_API_VERSION, g_extern.audio_data.dsp_plugin->api_version);
+      RARCH_ERR("DSP plugin API mismatch. RetroArch: %d, Plugin: %d\n", RARCH_DSP_API_VERSION, g_extern.audio_data.dsp_plugin->api_version);
       goto error;
    }
 
diff --git a/file.c b/file.c
index 4c0700b19e..b6283b109f 100644
--- a/file.c
+++ b/file.c
@@ -349,7 +349,7 @@ static void dump_to_file_desperate(const void *data, size_t size, int type)
       goto error;
 
    char path[PATH_MAX];
-   snprintf(path, sizeof(path), "%s/SSNES-recovery-", base);
+   snprintf(path, sizeof(path), "%s/RetroArch-recovery-", base);
    char timebuf[PATH_MAX];
 
    time_t time_;
diff --git a/gfx/context/sdl_ctx.c b/gfx/context/sdl_ctx.c
index d5a903c3d9..a66b872f9a 100644
--- a/gfx/context/sdl_ctx.c
+++ b/gfx/context/sdl_ctx.c
@@ -175,7 +175,7 @@ bool gfx_ctx_set_video_mode(
       SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 5);
    }
 
-   g_window = SDL_CreateWindow("SSNES", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
+   g_window = SDL_CreateWindow("RetroArch", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
       width, height, SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN | (fullscreen ? SDL_WINDOW_FULLSCREEN : resizable));
    if (!g_window)
    {
diff --git a/gfx/py_state/py_state.c b/gfx/py_state/py_state.c
index 9c58638222..e64987268a 100644
--- a/gfx/py_state/py_state.c
+++ b/gfx/py_state/py_state.c
@@ -102,67 +102,67 @@ static PyObject *py_read_input_meta(PyObject *self, PyObject *args)
    return PyBool_FromLong(ret);
 }
 
-static PyMethodDef SNESMethods[] = {
+static PyMethodDef RarchMethods[] = {
    { "read_wram",    py_read_wram,              METH_VARARGS, "Read WRAM from system." },
    { "input",        py_read_input,             METH_VARARGS, "Read input state from system." },
    { "input_meta",   py_read_input_meta,        METH_VARARGS, "Read RetroArch specific input." },
    { NULL, NULL, 0, NULL }
 };
 
-#define DECL_ATTR_SNES(attr) PyObject_SetAttrString(mod, #attr, PyLong_FromLong(RETRO_DEVICE_ID_JOYPAD_##attr))
-#define DECL_ATTR_SSNES(attr) PyObject_SetAttrString(mod, #attr, PyLong_FromLong(RARCH_##attr))
+#define DECL_ATTR_RETRO(attr) PyObject_SetAttrString(mod, #attr, PyLong_FromLong(RETRO_DEVICE_ID_JOYPAD_##attr))
+#define DECL_ATTR_RARCH(attr) PyObject_SetAttrString(mod, #attr, PyLong_FromLong(RARCH_##attr))
 static void py_set_attrs(PyObject *mod)
 {
-   DECL_ATTR_SNES(B);
-   DECL_ATTR_SNES(Y);
-   DECL_ATTR_SNES(SELECT);
-   DECL_ATTR_SNES(START);
-   DECL_ATTR_SNES(UP);
-   DECL_ATTR_SNES(DOWN);
-   DECL_ATTR_SNES(LEFT);
-   DECL_ATTR_SNES(RIGHT);
-   DECL_ATTR_SNES(A);
-   DECL_ATTR_SNES(X);
-   DECL_ATTR_SNES(L);
-   DECL_ATTR_SNES(R);
-   DECL_ATTR_SNES(L2);
-   DECL_ATTR_SNES(R2);
-   DECL_ATTR_SNES(L3);
-   DECL_ATTR_SNES(R3);
+   DECL_ATTR_RETRO(B);
+   DECL_ATTR_RETRO(Y);
+   DECL_ATTR_RETRO(SELECT);
+   DECL_ATTR_RETRO(START);
+   DECL_ATTR_RETRO(UP);
+   DECL_ATTR_RETRO(DOWN);
+   DECL_ATTR_RETRO(LEFT);
+   DECL_ATTR_RETRO(RIGHT);
+   DECL_ATTR_RETRO(A);
+   DECL_ATTR_RETRO(X);
+   DECL_ATTR_RETRO(L);
+   DECL_ATTR_RETRO(R);
+   DECL_ATTR_RETRO(L2);
+   DECL_ATTR_RETRO(R2);
+   DECL_ATTR_RETRO(L3);
+   DECL_ATTR_RETRO(R3);
 
-   DECL_ATTR_SSNES(FAST_FORWARD_KEY);
-   DECL_ATTR_SSNES(FAST_FORWARD_HOLD_KEY);
-   DECL_ATTR_SSNES(LOAD_STATE_KEY);
-   DECL_ATTR_SSNES(SAVE_STATE_KEY);
-   DECL_ATTR_SSNES(FULLSCREEN_TOGGLE_KEY);
-   DECL_ATTR_SSNES(QUIT_KEY);
-   DECL_ATTR_SSNES(STATE_SLOT_PLUS);
-   DECL_ATTR_SSNES(STATE_SLOT_MINUS);
-   DECL_ATTR_SSNES(AUDIO_INPUT_RATE_PLUS);
-   DECL_ATTR_SSNES(AUDIO_INPUT_RATE_MINUS);
-   DECL_ATTR_SSNES(REWIND);
-   DECL_ATTR_SSNES(MOVIE_RECORD_TOGGLE);
-   DECL_ATTR_SSNES(PAUSE_TOGGLE);
-   DECL_ATTR_SSNES(FRAMEADVANCE);
-   DECL_ATTR_SSNES(RESET);
-   DECL_ATTR_SSNES(SHADER_NEXT);
-   DECL_ATTR_SSNES(SHADER_PREV);
-   DECL_ATTR_SSNES(CHEAT_INDEX_PLUS);
-   DECL_ATTR_SSNES(CHEAT_INDEX_MINUS);
-   DECL_ATTR_SSNES(CHEAT_TOGGLE);
-   DECL_ATTR_SSNES(SCREENSHOT);
-   DECL_ATTR_SSNES(DSP_CONFIG);
-   DECL_ATTR_SSNES(MUTE);
+   DECL_ATTR_RARCH(FAST_FORWARD_KEY);
+   DECL_ATTR_RARCH(FAST_FORWARD_HOLD_KEY);
+   DECL_ATTR_RARCH(LOAD_STATE_KEY);
+   DECL_ATTR_RARCH(SAVE_STATE_KEY);
+   DECL_ATTR_RARCH(FULLSCREEN_TOGGLE_KEY);
+   DECL_ATTR_RARCH(QUIT_KEY);
+   DECL_ATTR_RARCH(STATE_SLOT_PLUS);
+   DECL_ATTR_RARCH(STATE_SLOT_MINUS);
+   DECL_ATTR_RARCH(AUDIO_INPUT_RATE_PLUS);
+   DECL_ATTR_RARCH(AUDIO_INPUT_RATE_MINUS);
+   DECL_ATTR_RARCH(REWIND);
+   DECL_ATTR_RARCH(MOVIE_RECORD_TOGGLE);
+   DECL_ATTR_RARCH(PAUSE_TOGGLE);
+   DECL_ATTR_RARCH(FRAMEADVANCE);
+   DECL_ATTR_RARCH(RESET);
+   DECL_ATTR_RARCH(SHADER_NEXT);
+   DECL_ATTR_RARCH(SHADER_PREV);
+   DECL_ATTR_RARCH(CHEAT_INDEX_PLUS);
+   DECL_ATTR_RARCH(CHEAT_INDEX_MINUS);
+   DECL_ATTR_RARCH(CHEAT_TOGGLE);
+   DECL_ATTR_RARCH(SCREENSHOT);
+   DECL_ATTR_RARCH(DSP_CONFIG);
+   DECL_ATTR_RARCH(MUTE);
 }
 
-static PyModuleDef SNESModule = {
-   PyModuleDef_HEAD_INIT, "snes", NULL, -1, SNESMethods,
+static PyModuleDef RarchModule = {
+   PyModuleDef_HEAD_INIT, "rarch", NULL, -1, RarchMethods,
    NULL, NULL, NULL, NULL
 };
 
-static PyObject* PyInit_SNES(void)
+static PyObject* PyInit_Retro(void)
 {
-   PyObject *mod = PyModule_Create(&SNESModule);
+   PyObject *mod = PyModule_Create(&RarchModule);
    if (!mod)
       return NULL;
 
@@ -238,7 +238,7 @@ static char *align_program(const char *program)
 py_state_t *py_state_new(const char *script, unsigned is_file, const char *pyclass)
 {
    RARCH_LOG("Initializing Python runtime ...\n");
-   PyImport_AppendInittab("snes", &PyInit_SNES);
+   PyImport_AppendInittab("rarch", &PyInit_Retro);
    Py_Initialize();
    RARCH_LOG("Initialized Python runtime.\n");
 
diff --git a/patch.c b/patch.c
index 3d57300d9f..4355f4642b 100644
--- a/patch.c
+++ b/patch.c
@@ -14,7 +14,7 @@
  */
 
 // BPS/UPS/IPS implementation from bSNES (nall::).
-// Modified for SSNES.
+// Modified for RetroArch.
 
 #include "patch.h"
 #include "hash.h"