diff --git a/zurb_foundation.theme b/zurb_foundation.theme
index dee70885a31306f0341ec5780ad7492a68f51fef..d84f58aaa703813a646563af936ce3cb2698e85f 100644
--- a/zurb_foundation.theme
+++ b/zurb_foundation.theme
@@ -376,7 +376,7 @@ function zurb_foundation_preprocess_html(&$variables) {
  */
 function zurb_foundation_preprocess_node(&$variables) {
   // Add node--node_type--view_mode.html.twig suggestions
-  $variables['theme_hook_suggestions'][] = 'node__' . $variables['elements']['#node']->type . '__' . $variables['view_mode'];
+  $variables['theme_hook_suggestions'][] = 'node__' . $variables['elements']['#node']->bundle() . '__' . $variables['view_mode'];
 
   // Add node--view_mode.html.twig suggestions
   $variables['theme_hook_suggestions'][] = 'node__' . $variables['view_mode'];
@@ -426,7 +426,7 @@ function zurb_foundation_preprocess_page(&$variables) {
 
   // Add page--node_type.html.twig suggestions
   if (!empty($variables['node'])) {
-    $variables['theme_hook_suggestions'][] = 'page__' . $variables['node']->type;
+    $variables['theme_hook_suggestions'][] = 'page__' . $variables['node']->bundle();
   }
 
   $variables['logo_img'] = '';