diff --git a/core/themes/bartik/templates/block--search-form-block.html.twig b/core/themes/bartik/templates/block--search-form-block.html.twig
index b196d43..3c262d3 100644
--- a/core/themes/bartik/templates/block--search-form-block.html.twig
+++ b/core/themes/bartik/templates/block--search-form-block.html.twig
@@ -1,4 +1,4 @@
-{% extends "@classy/block--search-form-block.html.twig" %}
+{% extends "@classy/search/block--search-form-block.html.twig" %}
 {#
 /**
  * @file
diff --git a/core/themes/bartik/templates/block--system-menu-block.html.twig b/core/themes/bartik/templates/block--system-menu-block.html.twig
index 65ab19b..7934001 100644
--- a/core/themes/bartik/templates/block--system-menu-block.html.twig
+++ b/core/themes/bartik/templates/block--system-menu-block.html.twig
@@ -1,4 +1,4 @@
-{% extends "@system/block--system-menu-block.html.twig" %}
+{% extends "@classy/system/block--system-menu-block.html.twig" %}
 {#
 /**
  * @file