diff --git a/templates/_partials/modal-filters.tpl b/templates/_partials/modal-filters.tpl
index 6b2092a1..0f9c2c10 100644
--- a/templates/_partials/modal-filters.tpl
+++ b/templates/_partials/modal-filters.tpl
@@ -11,7 +11,7 @@
     data-bs-dismiss="offcanvas"
     aria-label="Close"
   >
-      {l s='Show results' d='Shop.Istheme'}
+      {l s='Show results' d='Shop.Falcon.Global'}
   </button>
 {/block}
 
diff --git a/templates/checkout/_partials/cart-summary.tpl b/templates/checkout/_partials/cart-summary.tpl
index 4af83995..d1a5e1c9 100644
--- a/templates/checkout/_partials/cart-summary.tpl
+++ b/templates/checkout/_partials/cart-summary.tpl
@@ -26,7 +26,7 @@
 
   <div class="card-header">
     <p class="card-title mb-0 h4">
-      {l s='Summary' d='Shop.Istheme'}
+      {l s='Summary' d='Shop.Falcon.Checkout'}
     </p>
   </div>
   <div class="card-body">
diff --git a/templates/checkout/cart.tpl b/templates/checkout/cart.tpl
index 81115c35..bac30bf0 100644
--- a/templates/checkout/cart.tpl
+++ b/templates/checkout/cart.tpl
@@ -65,7 +65,7 @@
 
             <div class="card-header">
               <p class="cart-title h4 mb-0">
-                {l s='Summary' d='Shop.Istheme'}
+                {l s='Summary' d='Shop.Falcon.Checkout'}
               </p>
             </div>
 
diff --git a/templates/checkout/order-confirmation.tpl b/templates/checkout/order-confirmation.tpl
index f0fb6faa..454e50f7 100644
--- a/templates/checkout/order-confirmation.tpl
+++ b/templates/checkout/order-confirmation.tpl
@@ -83,7 +83,7 @@
 
     <div class="col-sm-6 col-12 card">
       <div class="card-header">
-        <h3 class="h5 mb-0 card-title">{l s='Order subtotals' d='Shop.Istheme'}</h3>
+        <h3 class="h5 mb-0 card-title">{l s='Order subtotals' d='Shop.Falcon.Checkout'}</h3>
       </div>
 
       <div class="card-body">
diff --git a/templates/customer/_partials/account-transformation-form.tpl b/templates/customer/_partials/account-transformation-form.tpl
index 3869a4b8..64d5cf46 100644
--- a/templates/customer/_partials/account-transformation-form.tpl
+++ b/templates/customer/_partials/account-transformation-form.tpl
@@ -2,7 +2,7 @@
   <div class="card">
    <div class="card-header">
       <h5 class="card-title mb-0">
-        {l s='Registration' d='Shop.Istheme'}
+        {l s='Registration' d='Shop.Falcon.Customeraccount'}
       </h5>
     </div>
 
diff --git a/templates/customer/_partials/order-detail-no-return.tpl b/templates/customer/_partials/order-detail-no-return.tpl
index 512ad6be..f1d0b4c9 100644
--- a/templates/customer/_partials/order-detail-no-return.tpl
+++ b/templates/customer/_partials/order-detail-no-return.tpl
@@ -49,7 +49,7 @@
 
     <div class="col-sm-6 col-12 card mb-0">
       <div class="card-header">
-        <h3 class="h5 mb-0 card-title">{l s='Order subtotals' d='Shop.Istheme'}</h3>
+        <h3 class="h5 mb-0 card-title">{l s='Order subtotals' d='Shop.Falcon.Customeraccount'}</h3>
       </div>
 
       <div class="card-body">
diff --git a/templates/customer/_partials/order-detail-return.tpl b/templates/customer/_partials/order-detail-return.tpl
index 0f17c6a2..c28f94df 100644
--- a/templates/customer/_partials/order-detail-return.tpl
+++ b/templates/customer/_partials/order-detail-return.tpl
@@ -49,7 +49,7 @@
 
     <div class="col-sm-6 col-12 card mb-0">
       <div class="card-header">
-        <h3 class="h5 mb-0 card-title">{l s='Order subtotals' d='Shop.Istheme'}</h3>
+        <h3 class="h5 mb-0 card-title">{l s='Order subtotals' d='Shop.Falcon.Customeraccount'}</h3>
       </div>
 
       <div class="card-body">
diff --git a/templates/customer/authentication.tpl b/templates/customer/authentication.tpl
index 275a61fc..06f4c545 100644
--- a/templates/customer/authentication.tpl
+++ b/templates/customer/authentication.tpl
@@ -25,7 +25,7 @@
 {extends file='page.tpl'}
 
 {block name='page_title'}
-  {l s='Login and registration' d='Shop.Istheme'}
+  {l s='Login and registration' d='Shop.Falcon.Customeraccount'}
 {/block}
 
 {block name='page_content'}
@@ -36,7 +36,7 @@
         <section class="col-md-6 col-12 user-form__block">
           <div class="user-form__content card-body h-100 bg-light d-flex flex-column">
             <h4 class="text-center h3 mb-3">
-              {l s='Login' d='Shop.Istheme'}
+              {l s='Login' d='Shop.Falcon.Customeraccount'}
             </h4>
             {render file='customer/_partials/login-form.tpl' ui=$login_form}
             {block name='display_after_login_form'}
@@ -50,19 +50,19 @@
       <div class="user-form__block  col-md-6 col-12">
         <div class="user-form__content card-body h-100 d-flex flex-column">
           <h4 class="text-center h3 mb-3">
-            {l s='Registration' d='Shop.Istheme'}
+            {l s='Registration' d='Shop.Falcon.Customeraccount'}
           </h4>
 
           <p class="mb-4 text-muted">
-            {l s='Creating an account is simple, and thanks to this you will complete the order faster! Additionally, you have the option of tracking your order and viewing purchase history.' d='Shop.Istheme'}
+            {l s='Creating an account is simple, and thanks to this you will complete the order faster! Additionally, you have the option of tracking your order and viewing purchase history.' d='Shop.Falcon.Customeraccount'}
           </p>
 
           <div class="mt-auto text-center">
             <a href="{$urls.pages.register}" class="btn btn-primary d-none d-md-inline-block">
-              {l s='I want to create an account' d='Shop.Istheme'}
+              {l s='I want to create an account' d='Shop.Falcon.Customeraccount'}
             </a>
             <a href="{$urls.pages.register}" class="btn btn-primary text-center w-100 d-block d-md-none">
-              {l s='I want to create an account' d='Shop.Istheme'}
+              {l s='I want to create an account' d='Shop.Falcon.Customeraccount'}
             </a>
           </div>