diff --git a/src/components/organisms/Newsletter.svelte b/src/components/organisms/NewsletterModule.svelte
similarity index 100%
rename from src/components/organisms/Newsletter.svelte
rename to src/components/organisms/NewsletterModule.svelte
diff --git a/src/components/organisms/Shop.svelte b/src/components/organisms/ShopModule.svelte
similarity index 100%
rename from src/components/organisms/Shop.svelte
rename to src/components/organisms/ShopModule.svelte
diff --git a/src/routes/[country]/[location]/index.svelte b/src/routes/[country]/[location]/index.svelte
index d0f7c34..edf403f 100644
--- a/src/routes/[country]/[location]/index.svelte
+++ b/src/routes/[country]/[location]/index.svelte
@@ -15,7 +15,7 @@
     import Button from '$components/atoms/Button.svelte'
     import IconEarth from '$components/atoms/IconEarth.svelte'
     import Image from '$components/atoms/Image.svelte'
-    import Newsletter from '$components/organisms/Newsletter.svelte'
+    import NewsletterModule from '$components/organisms/NewsletterModule.svelte'
 
     export let location: any
     export let photos: any[]
@@ -327,7 +327,7 @@
                 </div>
 
                 {#if ended}
-                    <Newsletter theme="light" />
+                    <NewsletterModule theme="light" />
                 {/if}
             </div>
         </section>
diff --git a/src/routes/__error.svelte b/src/routes/__error.svelte
index 8f8c9a8..f57b6f7 100644
--- a/src/routes/__error.svelte
+++ b/src/routes/__error.svelte
@@ -8,8 +8,8 @@
     import Heading from '$components/molecules/Heading.svelte'
     import InteractiveGlobe from '$components/organisms/InteractiveGlobe.svelte'
     import Locations from '$components/organisms/Locations.svelte'
-    import Shop from '$components/organisms/Shop.svelte'
-    import Newsletter from '$components/organisms/Newsletter.svelte'
+    import ShopModule from '$components/organisms/ShopModule.svelte'
+    import NewsletterModule from '$components/organisms/NewsletterModule.svelte'
 
     export let status: number
 
@@ -65,8 +65,8 @@
     <div class="grid-modules">
         <div class="container grid">
             <div class="wrap">
-                <Shop />
-                <Newsletter />
+                <ShopModule />
+                <NewsletterModule />
             </div>
         </div>
     </div>
diff --git a/src/routes/index.svelte b/src/routes/index.svelte
index 02f954e..fb67251 100644
--- a/src/routes/index.svelte
+++ b/src/routes/index.svelte
@@ -18,8 +18,8 @@
     import InteractiveGlobe from '$components/organisms/InteractiveGlobe.svelte'
     import Collage from '$components/organisms/Collage.svelte'
     import Locations from '$components/organisms/Locations.svelte'
-    import Shop from '$components/organisms/Shop.svelte'
-    import Newsletter from '$components/organisms/Newsletter.svelte'
+    import ShopModule from '$components/organisms/ShopModule.svelte'
+    import NewsletterModule from '$components/organisms/NewsletterModule.svelte'
 
     export let photos: any
 
@@ -139,8 +139,8 @@
     <div class="grid-modules">
         <div class="container grid">
             <div class="wrap">
-                <Shop />
-                <Newsletter />
+                <ShopModule />
+                <NewsletterModule />
             </div>
         </div>
     </div>
diff --git a/src/routes/locations.svelte b/src/routes/locations.svelte
index 4211a8b..0db6774 100644
--- a/src/routes/locations.svelte
+++ b/src/routes/locations.svelte
@@ -5,8 +5,8 @@
     import PageTransition from '$components/PageTransition.svelte'
     import InteractiveGlobe from '$components/organisms/InteractiveGlobe.svelte'
     import Locations from '$components/organisms/Locations.svelte'
-    import Shop from '$components/organisms/Shop.svelte'
-    import Newsletter from '$components/organisms/Newsletter.svelte'
+    import ShopModule from '$components/organisms/ShopModule.svelte'
+    import NewsletterModule from '$components/organisms/NewsletterModule.svelte'
     import Heading from '$components/molecules/Heading.svelte'
 
     const { locations }: any = getContext('global')
@@ -30,8 +30,8 @@
 
     <section class="grid-modules grid">
             <div class="wrap">
-                <Shop />
-                <Newsletter />
+                <ShopModule />
+                <NewsletterModule />
             </div>
     </section>
 </PageTransition>
\ No newline at end of file
diff --git a/src/routes/photos.svelte b/src/routes/photos.svelte
index c81c102..d512a87 100644
--- a/src/routes/photos.svelte
+++ b/src/routes/photos.svelte
@@ -21,8 +21,8 @@
     import DiscoverText from '$components/atoms/DiscoverText.svelte'
     import PostCard from '$components/molecules/PostCard.svelte'
     import Select from '$components/molecules/Select.svelte'
-    import Shop from '$components/organisms/Shop.svelte'
-    import Newsletter from '$components/organisms/Newsletter.svelte'
+    import ShopModule from '$components/organisms/ShopModule.svelte'
+    import NewsletterModule from '$components/organisms/NewsletterModule.svelte'
 
     export let photos: any[]
     export let totalPhotos: number
@@ -486,8 +486,8 @@
 
             <div class="grid-modules">
                 <div class="wrap">
-                    <Shop />
-                    <Newsletter theme="light" />
+                    <ShopModule />
+                    <NewsletterModule theme="light" />
                 </div>
             </div>
         </div>