diff --git a/app/templates/shared/macros/storefront/add-to-cart.html b/app/templates/shared/macros/storefront/add-to-cart.html
index 7d35132e..a17dc1ec 100644
--- a/app/templates/shared/macros/storefront/add-to-cart.html
+++ b/app/templates/shared/macros/storefront/add-to-cart.html
@@ -4,7 +4,7 @@
   Standardized add-to-cart functionality with quantity selector.
 
   Usage:
-    {% from 'shared/macros/shop/add-to-cart.html' import add_to_cart_button, add_to_cart_form %}
+    {% from 'shared/macros/storefront/add-to-cart.html' import add_to_cart_button, add_to_cart_form %}
 #}
 
 
diff --git a/app/templates/shared/macros/storefront/breadcrumbs.html b/app/templates/shared/macros/storefront/breadcrumbs.html
index 0f37893f..bdb8cc21 100644
--- a/app/templates/shared/macros/storefront/breadcrumbs.html
+++ b/app/templates/shared/macros/storefront/breadcrumbs.html
@@ -4,7 +4,7 @@
   Navigation breadcrumb trail for shop pages.
 
   Usage:
-    {% from 'shared/macros/shop/breadcrumbs.html' import shop_breadcrumbs, auto_breadcrumbs %}
+    {% from 'shared/macros/storefront/breadcrumbs.html' import shop_breadcrumbs, auto_breadcrumbs %}
 #}
 
 
diff --git a/app/templates/shared/macros/storefront/category-nav.html b/app/templates/shared/macros/storefront/category-nav.html
index 366ac5bf..f95a5282 100644
--- a/app/templates/shared/macros/storefront/category-nav.html
+++ b/app/templates/shared/macros/storefront/category-nav.html
@@ -4,7 +4,7 @@
   Category browsing sidebar and menu for shop navigation.
 
   Usage:
-    {% from 'shared/macros/shop/category-nav.html' import category_nav, category_tree, category_menu %}
+    {% from 'shared/macros/storefront/category-nav.html' import category_nav, category_tree, category_menu %}
 #}
 
 
diff --git a/app/templates/shared/macros/storefront/filter-sidebar.html b/app/templates/shared/macros/storefront/filter-sidebar.html
index a705ed3b..58d9ef0a 100644
--- a/app/templates/shared/macros/storefront/filter-sidebar.html
+++ b/app/templates/shared/macros/storefront/filter-sidebar.html
@@ -4,7 +4,7 @@
   Product filtering panel for category and search pages.
 
   Usage:
-    {% from 'shared/macros/shop/filter-sidebar.html' import filter_sidebar, filter_group, price_filter, rating_filter %}
+    {% from 'shared/macros/storefront/filter-sidebar.html' import filter_sidebar, filter_group, price_filter, rating_filter %}
 #}
 
 
diff --git a/app/templates/shared/macros/storefront/mini-cart.html b/app/templates/shared/macros/storefront/mini-cart.html
index ba64289c..35a8f41b 100644
--- a/app/templates/shared/macros/storefront/mini-cart.html
+++ b/app/templates/shared/macros/storefront/mini-cart.html
@@ -4,7 +4,7 @@
   Cart preview dropdown and cart item components.
 
   Usage:
-    {% from 'shared/macros/shop/mini-cart.html' import mini_cart, cart_icon_button, cart_item %}
+    {% from 'shared/macros/storefront/mini-cart.html' import mini_cart, cart_icon_button, cart_item %}
 #}
 
 
diff --git a/app/templates/shared/macros/storefront/product-card.html b/app/templates/shared/macros/storefront/product-card.html
index b51141df..0717ce1a 100644
--- a/app/templates/shared/macros/storefront/product-card.html
+++ b/app/templates/shared/macros/storefront/product-card.html
@@ -39,7 +39,7 @@
     }
 
   Usage:
-    {% from 'shared/macros/shop/product-card.html' import product_card %}
+    {% from 'shared/macros/storefront/product-card.html' import product_card %}
 
     <template x-for="product in products" :key="product.id">
         {{ product_card() }}
diff --git a/app/templates/shared/macros/storefront/product-gallery.html b/app/templates/shared/macros/storefront/product-gallery.html
index 799720a0..1a957ff7 100644
--- a/app/templates/shared/macros/storefront/product-gallery.html
+++ b/app/templates/shared/macros/storefront/product-gallery.html
@@ -4,7 +4,7 @@
   Image gallery with thumbnails, zoom, and lightbox for product detail pages.
 
   Usage:
-    {% from 'shared/macros/shop/product-gallery.html' import product_gallery, gallery_thumbnails %}
+    {% from 'shared/macros/storefront/product-gallery.html' import product_gallery, gallery_thumbnails %}
 #}
 
 
diff --git a/app/templates/shared/macros/storefront/product-grid.html b/app/templates/shared/macros/storefront/product-grid.html
index d7a29e7a..96930fe1 100644
--- a/app/templates/shared/macros/storefront/product-grid.html
+++ b/app/templates/shared/macros/storefront/product-grid.html
@@ -19,7 +19,7 @@
     - empty_icon: Icon for empty state (default: 'shopping-bag')
 
   Usage:
-    {% from 'shared/macros/shop/product-grid.html' import product_grid, product_grid_skeleton %}
+    {% from 'shared/macros/storefront/product-grid.html' import product_grid, product_grid_skeleton %}
 
     {{ product_grid() }}
 
@@ -41,7 +41,7 @@
     empty_message='Try adjusting your filters or search terms',
     empty_icon='shopping-bag'
 ) %}
-{% from 'shared/macros/shop/product-card.html' import product_card %}
+{% from 'shared/macros/storefront/product-card.html' import product_card %}
 
 {% set cols = columns if columns else {'sm': 2, 'md': 3, 'lg': 4} %}
 {% set gaps = {'sm': 'gap-3', 'md': 'gap-4', 'lg': 'gap-6'} %}
diff --git a/app/templates/shared/macros/storefront/product-info.html b/app/templates/shared/macros/storefront/product-info.html
index a7fa18a4..cee4bcb0 100644
--- a/app/templates/shared/macros/storefront/product-info.html
+++ b/app/templates/shared/macros/storefront/product-info.html
@@ -4,7 +4,7 @@
   Product details section for product detail pages.
 
   Usage:
-    {% from 'shared/macros/shop/product-info.html' import product_info, product_price, product_rating, stock_status %}
+    {% from 'shared/macros/storefront/product-info.html' import product_info, product_price, product_rating, stock_status %}
 #}
 
 
diff --git a/app/templates/shared/macros/storefront/product-tabs.html b/app/templates/shared/macros/storefront/product-tabs.html
index 28094940..cd3fddfb 100644
--- a/app/templates/shared/macros/storefront/product-tabs.html
+++ b/app/templates/shared/macros/storefront/product-tabs.html
@@ -4,7 +4,7 @@
   Tabbed content sections for product detail pages.
 
   Usage:
-    {% from 'shared/macros/shop/product-tabs.html' import product_tabs, tab_description, tab_specifications, tab_reviews %}
+    {% from 'shared/macros/storefront/product-tabs.html' import product_tabs, tab_description, tab_specifications, tab_reviews %}
 #}
 
 
diff --git a/app/templates/shared/macros/storefront/reviews.html b/app/templates/shared/macros/storefront/reviews.html
index b240899f..d91ff5d8 100644
--- a/app/templates/shared/macros/storefront/reviews.html
+++ b/app/templates/shared/macros/storefront/reviews.html
@@ -4,10 +4,10 @@
   Product review display and submission components.
 
   Usage:
-    {% from 'shared/macros/shop/reviews.html' import review_list, review_card, review_form, review_summary %}
+    {% from 'shared/macros/storefront/reviews.html' import review_list, review_card, review_form, review_summary %}
 #}
 
-{% from 'shared/macros/shop/star-rating.html' import star_rating, rating_input, rating_summary %}
+{% from 'shared/macros/storefront/star-rating.html' import star_rating, rating_input, rating_summary %}
 
 
 {#
diff --git a/app/templates/shared/macros/storefront/search-bar.html b/app/templates/shared/macros/storefront/search-bar.html
index a8a3fdb3..bebf6bd8 100644
--- a/app/templates/shared/macros/storefront/search-bar.html
+++ b/app/templates/shared/macros/storefront/search-bar.html
@@ -4,7 +4,7 @@
   Product search with autocomplete and suggestions for shop pages.
 
   Usage:
-    {% from 'shared/macros/shop/search-bar.html' import search_bar, search_autocomplete, mobile_search %}
+    {% from 'shared/macros/storefront/search-bar.html' import search_bar, search_autocomplete, mobile_search %}
 #}
 
 
diff --git a/app/templates/shared/macros/storefront/star-rating.html b/app/templates/shared/macros/storefront/star-rating.html
index 536fe06b..2a653873 100644
--- a/app/templates/shared/macros/storefront/star-rating.html
+++ b/app/templates/shared/macros/storefront/star-rating.html
@@ -4,7 +4,7 @@
   Reusable star rating display and input for product reviews.
 
   Usage:
-    {% from 'shared/macros/shop/star-rating.html' import star_rating, rating_input, rating_summary %}
+    {% from 'shared/macros/storefront/star-rating.html' import star_rating, rating_input, rating_summary %}
 #}
 
 
diff --git a/app/templates/shared/macros/storefront/trust-badges.html b/app/templates/shared/macros/storefront/trust-badges.html
index b7cb423c..13b72654 100644
--- a/app/templates/shared/macros/storefront/trust-badges.html
+++ b/app/templates/shared/macros/storefront/trust-badges.html
@@ -4,7 +4,7 @@
   Trust signals and security indicators for e-commerce.
 
   Usage:
-    {% from 'shared/macros/shop/trust-badges.html' import trust_badges, trust_banner, payment_icons, guarantee_badge %}
+    {% from 'shared/macros/storefront/trust-badges.html' import trust_badges, trust_banner, payment_icons, guarantee_badge %}
 #}
 
 
diff --git a/app/templates/shared/macros/storefront/variant-selector.html b/app/templates/shared/macros/storefront/variant-selector.html
index a4e04007..a7faa813 100644
--- a/app/templates/shared/macros/storefront/variant-selector.html
+++ b/app/templates/shared/macros/storefront/variant-selector.html
@@ -4,7 +4,7 @@
   Product variant selection (size, color, etc.) for product detail pages.
 
   Usage:
-    {% from 'shared/macros/shop/variant-selector.html' import variant_selector, size_selector, color_swatches %}
+    {% from 'shared/macros/storefront/variant-selector.html' import variant_selector, size_selector, color_swatches %}
 #}