diff --git a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemBrandingBlock.php b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemBrandingBlock.php
index 6a6f930..8e861ec 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/Block/SystemBrandingBlock.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/Block/SystemBrandingBlock.php
@@ -69,6 +69,7 @@ public function defaultConfiguration() {
       'site_logo' => TRUE,
       'site_name' => TRUE,
       'site_slogan' => TRUE,
+      'label_display' => FALSE,
     );
   }
 
diff --git a/core/modules/system/templates/branding.html.twig b/core/modules/system/templates/branding.html.twig
index d72276b..f134aab 100644
--- a/core/modules/system/templates/branding.html.twig
+++ b/core/modules/system/templates/branding.html.twig
@@ -12,11 +12,11 @@
  */
 #}
 {% if use_site_logo %}
-  <a href="{{ url('<front>') }}" rel="home" class="site__logo" title="{{ 'Home'|t }}"><img src="{{ site_logo.url }}" alt="{{ 'Home'|t }}" /></a>
+  <a href="{{ url('<front>') }}" rel="home" class="site-logo" title="{{ 'Home'|t }}"><img src="{{ site_logo.url }}" alt="{{ 'Home'|t }}" /></a>
 {% endif %}
 {% if use_site_name %}
-  <h1 class="site__name"><a href="{{ url('<front>') }}" rel="home" title="{{ 'Home'|t }}">{{ site_name|e|t }}</a></h1>
+  <h1 class="site-name"><a href="{{ url('<front>') }}" rel="home" title="{{ 'Home'|t }}">{{ site_name|e|t }}</a></h1>
 {% endif %}
 {% if use_site_slogan %}
-  <p class="site__slogan">{{ site_slogan|t }}</p>
+  <p class="site-slogan">{{ site_slogan|t }}</p>
 {% endif %}