diff --git a/subentity.module b/subentity.module
index bd7ebd8c875a0b85e56f1865874c0489d0685d69..91a19ac54de09ceeeeb0ae22eb034a43854e4d0c 100644
--- a/subentity.module
+++ b/subentity.module
@@ -63,19 +63,17 @@ function subentity_theme_suggestions_alter(array &$suggestions, array $variables
   if (isset($variables['elements']['#' . $hook]) && $variables['elements']['#' . $hook] instanceof SubEntityBase) {
     $subentity = $variables['elements']['#' . $hook];
 
-    $suggestions[] = 'subentity__' . $hook;
     if (!empty($variables['elements']['#view_mode'])) {
       $view_mode = $variables['elements']['#view_mode'];
 
-      $suggestions[] = 'subentity__' . $view_mode;
-      $suggestions[] = 'subentity__' . $hook . '__' . $view_mode;
+      $suggestions[] = $hook . '__' . $view_mode;
     }
     if ($subentity->bundle() !== 'subentity') {
       $bundle = $subentity->bundle();
 
-      $suggestions[] = 'subentity__' . $hook . '__' . $bundle;
+      $suggestions[] = $hook . '__' . $bundle;
       if (!empty($view_mode)) {
-        $suggestions[] = 'subentity__' . $hook . '__' . $bundle . '__' . $view_mode;
+        $suggestions[] = $hook . '__' . $bundle . '__' . $view_mode;
       }
     }
   }