diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 7b35fca..a0037dc 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -706,10 +706,9 @@ function system_theme_suggestions_field(array $variables) {
   $element = $variables['element'];
 
   $suggestions[] = 'field__' . $element['#field_type'];
-  $suggestions[] = 'field__' . $element['#field_name'];
-  $suggestions[] = 'field__' . $element['#entity_type'] . '__' . $element['#bundle'];
-  $suggestions[] = 'field__' . $element['#entity_type'] . '__' . $element['#field_name'];
-  $suggestions[] = 'field__' . $element['#entity_type'] . '__' . $element['#field_name'] . '__' . $element['#bundle'];
+  $suggestions[] = 'field__' . $element['#field_type'] . '__' . $element['#field_name'];
+  $suggestions[] = 'field__' . $element['#field_type'] . '__' . $element['#field_name'] . '__' .  $element['#entity_type'];
+  $suggestions[] = 'field__' . $element['#field_type'] . '__' . $element['#field_name'] . '__' .  $element['#entity_type'] . '__' . $element['#bundle'];
 
   return $suggestions;
 }