diff --git a/gfx/font_driver.c b/gfx/font_driver.c
index 08d468b46c..532abc5bcf 100644
--- a/gfx/font_driver.c
+++ b/gfx/font_driver.c
@@ -73,7 +73,7 @@ int font_renderer_create_default(
          return 1;
       }
       else
-         RARCH_ERR("Failed to create rendering backend: %s.\n",
+         RARCH_ERR("[Font]: Failed to create rendering backend: %s.\n",
                font_backends[i]->ident);
    }
 
@@ -1226,7 +1226,7 @@ void font_driver_init_osd(
          video_info->font_size, threading_hint, is_threaded, api);
 
    if (!video_font_driver)
-      RARCH_ERR("[font]: Failed to initialize OSD font.\n");
+      RARCH_ERR("[Font]: Failed to initialize OSD font.\n");
 }
 
 void font_driver_free_osd(void)
diff --git a/gfx/video_shader_parse.c b/gfx/video_shader_parse.c
index c227bc1579..2c0cbc3752 100644
--- a/gfx/video_shader_parse.c
+++ b/gfx/video_shader_parse.c
@@ -92,7 +92,7 @@ static enum gfx_wrap_type wrap_str_to_mode(const char *wrap_mode)
    else if (string_is_equal(wrap_mode, "mirrored_repeat"))
       return RARCH_WRAP_MIRRORED_REPEAT;
 
-   RARCH_WARN("Invalid wrapping type %s. Valid ones are: clamp_to_border"
+   RARCH_WARN("[Shaders]: Invalid wrapping type %s. Valid ones are: clamp_to_border"
          " (default), clamp_to_edge, repeat and mirrored_repeat. Falling back to default.\n",
          wrap_mode);
    return RARCH_WRAP_DEFAULT;
@@ -146,7 +146,7 @@ static bool video_shader_parse_pass(config_file_t *conf,
    snprintf(shader_name, sizeof(shader_name), "shader%u", i);
    if (!config_get_path(conf, shader_name, tmp_path, path_size))
    {
-      RARCH_ERR("Couldn't parse shader source (%s).\n", shader_name);
+      RARCH_ERR("[Shaders]: Couldn't parse shader source (%s).\n", shader_name);
       free(tmp_path);
       return false;
    }
@@ -230,7 +230,7 @@ static bool video_shader_parse_pass(config_file_t *conf,
          scale->type_x = RARCH_SCALE_ABSOLUTE;
       else
       {
-         RARCH_ERR("Invalid attribute.\n");
+         RARCH_ERR("[Shaders]: Invalid attribute.\n");
          return false;
       }
    }
@@ -245,7 +245,7 @@ static bool video_shader_parse_pass(config_file_t *conf,
          scale->type_y = RARCH_SCALE_ABSOLUTE;
       else
       {
-         RARCH_ERR("Invalid attribute.\n");
+         RARCH_ERR("[Shaders]: Invalid attribute.\n");
          return false;
       }
    }
@@ -347,7 +347,7 @@ static bool video_shader_parse_textures(config_file_t *conf,
 
       if (!config_get_array(conf, id, tmp_path, path_size))
       {
-         RARCH_ERR("Cannot find path to texture \"%s\" ...\n", id);
+         RARCH_ERR("[Shaders]: Cannot find path to texture \"%s\" ...\n", id);
          free(textures);
          return false;
       }
@@ -559,7 +559,7 @@ bool video_shader_resolve_parameters(config_file_t *conf,
 
          param->pass     = i;
 
-         RARCH_LOG("Found #pragma parameter %s (%s) %f %f %f %f in pass %d\n",
+         RARCH_LOG("[Shaders]: Found #pragma parameter %s (%s) %f %f %f %f in pass %d\n",
                param->desc,    param->id,      param->initial,
                param->minimum, param->maximum, param->step, param->pass);
          param->current  = param->initial;
@@ -824,13 +824,13 @@ bool video_shader_read_conf_preset(config_file_t *conf,
 
    if (!config_get_uint(conf, "shaders", &shaders))
    {
-      RARCH_ERR("Cannot find \"shaders\" param.\n");
+      RARCH_ERR("[Shaders]: Cannot find \"shaders\" param.\n");
       return false;
    }
 
    if (!shaders)
    {
-      RARCH_ERR("Need to define at least 1 shader.\n");
+      RARCH_ERR("[Shaders]: Need to define at least 1 shader.\n");
       return false;
    }