diff --git a/core/modules/system/templates/block--system-branding-block.html.twig b/core/modules/system/templates/block--system-branding-block.html.twig
index 2b8879b..a3ff863 100644
--- a/core/modules/system/templates/block--system-branding-block.html.twig
+++ b/core/modules/system/templates/block--system-branding-block.html.twig
@@ -9,22 +9,24 @@
  *
  * Available variables:
  * - content: The block contents, containing:
- *   - site_logo: Logo for site as defined in Appearance or theme settings. Only
- *     available if enabled in the block settings.
+ *   - site_logo: Logo for site as defined in Appearance or theme settings.
+ *     Only available if enabled in the block settings.
  *   - site_name: Name for site as defined in Site information settings.
+ *     Only available if enabled in the block settings.
  *   - site_slogan: Slogan for site as defined in Site information settings.
+ *     Only available if enabled in the block settings.
  *
  * @ingroup themeable
  */
 #}
 {% block content %}
   {# Workaround for https://drupal.org/node/953034 #}
-  {% set logo %}{{ render_var(content.site_logo) }}{% endset %}
+  {% set site_logo %}{{ render_var(content.site_logo) }}{% endset %}
   {% set site_name %}{{ render_var(content.site_name) }}{% endset %}
-  {% set slogan %}{{ render_var(content.site_slogan) }}{% endset %}
-  {% if logo %}
+  {% set site_slogan %}{{ render_var(content.site_slogan) }}{% endset %}
+  {% if site_logo %}
     <a href="{{ url('<front>') }}" title="{{ 'Home'|t }}" rel="home" class="site-logo">
-      {{ logo }}
+      {{ site_logo }}
     </a>
   {% endif %}
   {% if site_name %}
@@ -32,7 +34,7 @@
       <a href="{{ url('<front>') }}" title="{{ 'Home'|t }}" rel="home">{{ site_name|e }}</a>
     </div>
   {% endif %}
-  {% if slogan %}
-    <div class="site-slogan">{{ slogan }}</div>
+  {% if site_slogan %}
+    <div class="site-slogan">{{ site_slogan }}</div>
   {% endif %}
 {% endblock %}
diff --git a/core/themes/bartik/templates/block--system-branding-block.html.twig b/core/themes/bartik/templates/block--system-branding-block.html.twig
index b1a5313..af5db5d 100644
--- a/core/themes/bartik/templates/block--system-branding-block.html.twig
+++ b/core/themes/bartik/templates/block--system-branding-block.html.twig
@@ -9,22 +9,24 @@
  *
  * Available variables:
  * - content: The block contents, containing:
- *   - site_logo: Logo for site as defined in Appearance or theme settings. Only
- *     available if enabled in the block settings.
+ *   - site_logo: Logo for site as defined in Appearance or theme settings.
+ *     Only available if enabled in the block settings.
  *   - site_name: Name for site as defined in Site information settings.
+ *     Only available if enabled in the block settings.
  *   - site_slogan: Slogan for site as defined in Site information settings.
+ *     Only available if enabled in the block settings.
  *
  * @ingroup themeable
  */
 #}
 {% block content %}
   {# Workaround for https://drupal.org/node/953034 #}
-  {% set logo %}{{ render_var(content.site_logo) }}{% endset %}
+  {% set site_logo %}{{ render_var(content.site_logo) }}{% endset %}
   {% set site_name %}{{ render_var(content.site_name) }}{% endset %}
-  {% set slogan %}{{ render_var(content.site_slogan) }}{% endset %}
-  {% if logo %}
+  {% set site_slogan %}{{ render_var(content.site_slogan) }}{% endset %}
+  {% if site_logo %}
     <a href="{{ url('<front>') }}" title="{{ 'Home'|t }}" rel="home" class="site-logo">
-      {{ logo }}
+      {{ site_logo }}
     </a>
   {% endif %}
   {% if site_name or slogan %}
@@ -34,8 +36,8 @@
           <a href="{{ url('<front>') }}" title="{{ 'Home'|t }}" rel="home">{{ site_name|e }}</a>
         </strong>
       {% endif %}
-      {% if slogan %}
-        <div class="site-slogan">{{ slogan }}</div>
+      {% if site_slogan %}
+        <div class="site-slogan">{{ site_slogan }}</div>
       {% endif %}
     </div>
   {% endif %}