diff --git a/src/Resources/views/storefront/component/listing/filter-panel.html.twig b/src/Resources/views/storefront/component/listing/filter-panel.html.twig
index 69c36ab..0084c56 100644
--- a/src/Resources/views/storefront/component/listing/filter-panel.html.twig
+++ b/src/Resources/views/storefront/component/listing/filter-panel.html.twig
@@ -1,3 +1,3 @@
-{% extends "@Storefront/storefront/component/listing/filter-panel.html.twig" %}
+{% sw_extends "@Storefront/storefront/component/listing/filter-panel.html.twig" %}
 
 {% block component_filter_panel %}{% endblock %}
diff --git a/src/Resources/views/storefront/component/pagination.html.twig b/src/Resources/views/storefront/component/pagination.html.twig
index 7e16d75..9e806ad 100644
--- a/src/Resources/views/storefront/component/pagination.html.twig
+++ b/src/Resources/views/storefront/component/pagination.html.twig
@@ -1,4 +1,4 @@
-{% extends "@Storefront/storefront/component/pagination.html.twig" %}
+{% sw_extends "@Storefront/storefront/component/pagination.html.twig" %}
 
 {% block component_pagination_first_link %}
     <i class="fa-solid fa-angles-left"></i>
diff --git a/src/Resources/views/storefront/component/product/card/action.html.twig b/src/Resources/views/storefront/component/product/card/action.html.twig
index 3af12dd..458c7c4 100644
--- a/src/Resources/views/storefront/component/product/card/action.html.twig
+++ b/src/Resources/views/storefront/component/product/card/action.html.twig
@@ -1,4 +1,4 @@
-{% extends "@Storefront/storefront/component/product/card/action.html.twig" %}
+{% sw_extends "@Storefront/storefront/component/product/card/action.html.twig" %}
 
 {% block page_product_detail_product_buy_button %}
     <button class="btn btn-block btn-buy"
diff --git a/src/Resources/views/storefront/component/product/listing.html.twig b/src/Resources/views/storefront/component/product/listing.html.twig
index bb1f1fc..febd6bd 100644
--- a/src/Resources/views/storefront/component/product/listing.html.twig
+++ b/src/Resources/views/storefront/component/product/listing.html.twig
@@ -1,4 +1,4 @@
-{% extends "@Storefront/storefront/component/product/listing.html.twig" %}
+{% sw_extends "@Storefront/storefront/component/product/listing.html.twig" %}
 
 {% block element_product_listing_pagination_nav_actions %}
     <div class="cms-element-product-listing-actions row justify-content-center">
diff --git a/src/Resources/views/storefront/element/cms-element-image-gallery.html.twig b/src/Resources/views/storefront/element/cms-element-image-gallery.html.twig
index b5b49e3..2339477 100644
--- a/src/Resources/views/storefront/element/cms-element-image-gallery.html.twig
+++ b/src/Resources/views/storefront/element/cms-element-image-gallery.html.twig
@@ -1,3 +1 @@
-{% extends "@Storefront/storefront/element/cms-element-image-gallery.html.twig" %}
-
-
+{% sw_extends "@Storefront/storefront/element/cms-element-image-gallery.html.twig" %}
diff --git a/src/Resources/views/storefront/layout/header/logo.html.twig b/src/Resources/views/storefront/layout/header/logo.html.twig
index 6b22eb8..e384aaa 100644
--- a/src/Resources/views/storefront/layout/header/logo.html.twig
+++ b/src/Resources/views/storefront/layout/header/logo.html.twig
@@ -1,4 +1,4 @@
-{% extends "@Storefront/storefront/layout/header/logo.html.twig" %}
+{% sw_extends "@Storefront/storefront/layout/header/logo.html.twig" %}
 
 {% block layout_header_logo_image %}
     <picture class="header-logo-picture">
diff --git a/src/Resources/views/storefront/page/product-detail/headline.html.twig b/src/Resources/views/storefront/page/product-detail/headline.html.twig
index d048a6a..bb12f67 100644
--- a/src/Resources/views/storefront/page/product-detail/headline.html.twig
+++ b/src/Resources/views/storefront/page/product-detail/headline.html.twig
@@ -1,4 +1,4 @@
-{% extends "@Storefront/storefront/page/product-detail/headline.html.twig" %}
+{% sw_extends "@Storefront/storefront/page/product-detail/headline.html.twig" %}
 
 {% block page_product_detail_headline_inner %}
     <h1 class="w-100">{{ page.product.translated.name }}</h1>