diff -u b/core/includes/theme.inc b/core/includes/theme.inc
--- b/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -2426,9 +2426,9 @@
   // Add default CSS classes. Since there can be many fields rendered on a page,
   // save some overhead by calling strtr() directly instead of
   // drupal_html_class().
+  $variables['entity_type'] = strtr($element['#entity_type'], '_', '-');
   $variables['field_name'] = strtr($element['#field_name'], '_', '-');
   $variables['field_type'] = strtr($element['#field_type'], '_', '-');
-  $variables['field_label'] = strtr($element['#label_display'], '_', '-');
   $variables['attributes']['class'] = array(
     'field-name--' . $variables['field_name'],
     'field-type--' . $variables['field_type'],
diff -u b/core/modules/system/templates/field.html.twig b/core/modules/system/templates/field.html.twig
--- b/core/modules/system/templates/field.html.twig
+++ b/core/modules/system/templates/field.html.twig
@@ -30,28 +30,29 @@
  */
 #}
 {% if multiple %}
-  {# multiple value field  #}
+  {# field is a multiple value #}
   {% if label_hidden %}
-    <div class="field field--multiple field__items {{ attributes.class }}" {{ content_attributes }}>
+    <div class="field field--multiple field-items {{ attributes.class }}" {{ content_attributes }}>
       {% for delta, item in items %}
         <div class="field__item"{{ item_attributes[delta] }}>{{ item }}</div>
       {% endfor %}
       </div>
     </div>
+
   {% else %}
-  {# multiple value with label #}
+  {# if the field is a multiple values with the labels #}
     <div class="field field--multiple {{ attributes.class }}"{{ attributes }}>
       <div class="field__label"{{ title_attributes }}>{{ label }}</div>
-      <div class="field__items"{{ content_attributes }}>
+      <div class="field-items"{{ content_attributes }}>
         {% for delta, item in items %}
           <div class="field__item"{{ item_attributes[delta] }}>{{ item }}</div>
         {% endfor %}
       </div>
     </div>
   {% endif %}
-  {# end of multiple field  #}
+  {# end of multiples  #}
 {% else %}
-  {# single value field #}
+  {# single value #}
   {% for delta, item in items %}
     {% if label_hidden %}
       {# single value no label#}
@@ -62,7 +63,7 @@
         <div class="field__label"{{ title_attributes }}>{{ label }}</div>
-        <div class="field__item" {{ content_attributes }} {{ item_attributes[delta] }}>{{ item }}</div>
+        <div class="field__item" {{ content_attributes }} {{ item_attributes[delta] }}>WTF {{ item }}</div>
       </div>
     {% endif %}
   {% endfor %}
-  {# end single value field #}
+  {# end single value #}
 {% endif %}