diff --git a/command.c b/command.c
index 8f9e77e321..6b9301f9d3 100644
--- a/command.c
+++ b/command.c
@@ -214,7 +214,7 @@ static bool cmd_set_shader(const char *arg)
    if (ext)
    {
       if (strcmp(ext, ".shader") == 0)
-         type = RARCH_SHADER_BSNES;
+         type = RARCH_SHADER_GLSL;
       else if (strcmp(ext, ".cg") == 0 || strcmp(ext, ".cgp") == 0)
          type = RARCH_SHADER_CG;
    }
diff --git a/console/rmenu/rmenu.c b/console/rmenu/rmenu.c
index 7af144e103..e786d3e034 100644
--- a/console/rmenu/rmenu.c
+++ b/console/rmenu/rmenu.c
@@ -618,7 +618,7 @@ void browser_render(void *data)
 unsigned get_shader_type(void)
 {
 #if defined(HAVE_GLSL)
-   return RARCH_SHADER_BSNES;
+   return RARCH_SHADER_GLSL;
 #elif defined(HAVE_CG)
    return RARCH_SHADER_CG;
 #elif defined(HAVE_HLSL)
diff --git a/driver.h b/driver.h
index 6a92c8dc4d..81b93732a8 100644
--- a/driver.h
+++ b/driver.h
@@ -131,7 +131,7 @@ enum rarch_shader_type
 {
    RARCH_SHADER_CG,
    RARCH_SHADER_HLSL,
-   RARCH_SHADER_BSNES,
+   RARCH_SHADER_GLSL,
    RARCH_SHADER_AUTO,
    RARCH_SHADER_NONE
 };
diff --git a/gfx/gl.c b/gfx/gl.c
index ad17e4399d..eeb5352e64 100644
--- a/gfx/gl.c
+++ b/gfx/gl.c
@@ -209,7 +209,7 @@ static bool gl_shader_init(void *data) // We always need a shader alive in GLES2
 {
    gl_t *gl = (gl_t*)data;
    const char *shader_path = NULL;
-   if ((g_settings.video.shader_type == RARCH_SHADER_AUTO || g_settings.video.shader_type == RARCH_SHADER_BSNES)
+   if ((g_settings.video.shader_type == RARCH_SHADER_AUTO || g_settings.video.shader_type == RARCH_SHADER_GLSL)
          && *g_settings.video.bsnes_shader_path)
       shader_path = g_settings.video.bsnes_shader_path;
 
@@ -256,7 +256,7 @@ static bool gl_shader_init(void *data)
 #endif
 
 #ifdef HAVE_GLSL
-      case RARCH_SHADER_BSNES:
+      case RARCH_SHADER_GLSL:
          backend     = &gl_glsl_backend;
          shader_path = g_settings.video.bsnes_shader_path;
          break;
@@ -1726,7 +1726,7 @@ static bool gl_set_shader(void *data, enum rarch_shader_type type, const char *p
    switch (type)
    {
 #ifdef HAVE_GLSL
-      case RARCH_SHADER_BSNES:
+      case RARCH_SHADER_GLSL:
          if (mask & (1ULL << RARCH_SHADER_MULTIPASS))
          {
             if (!gl_glsl_init(path))
diff --git a/retroarch.c b/retroarch.c
index 6c63fa4ff4..a8a6b72825 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2327,7 +2327,7 @@ static void check_shader_dir(void)
       if (ext)
       {
          if (strcmp(ext, ".shader") == 0)
-            type = RARCH_SHADER_BSNES;
+            type = RARCH_SHADER_GLSL;
          else if (strcmp(ext, ".cg") == 0 || strcmp(ext, ".cgp") == 0)
             type = RARCH_SHADER_CG;
       }
diff --git a/settings.c b/settings.c
index 28b287ba62..dfe944806e 100644
--- a/settings.c
+++ b/settings.c
@@ -419,7 +419,7 @@ bool config_load_file(const char *path)
       if (strcmp("cg", tmp_str) == 0)
          g_settings.video.shader_type = RARCH_SHADER_CG;
       else if (strcmp("bsnes", tmp_str) == 0)
-         g_settings.video.shader_type = RARCH_SHADER_BSNES;
+         g_settings.video.shader_type = RARCH_SHADER_GLSL;
       else if (strcmp("auto", tmp_str) == 0)
          g_settings.video.shader_type = RARCH_SHADER_AUTO;
       else if (strcmp("none", tmp_str) == 0)