diff --git a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor
index 79f87352..2261bb63 100644
--- a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor
+++ b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor
@@ -350,9 +350,9 @@ else
 <ConfirmProductCheckModalOverlay BodyMessage="" CompanyId="@CompanyId" Products="CheckList" 
                           OnOkClicked="ConfirmProductCheckCallback" @ref="ProductCheckOverlay" />
 
-<CustomerInvoiceModalOverlay CustomerInvoices="CompanyInvoices" @ref="InvoiceOverlay" />
+<CustomerInvoiceListModalOverlay CustomerInvoices="CompanyInvoices" @ref="InvoiceListOverlay" />
 
-<CustomerInventoryModalOverlay CompanyName="@Company.Name" CompanyId="@CompanyId" CountryCode="@Company.CountryCode" 
-                               OnInventorySelected="OnInventoryCallback" Inventory="Inventory"  @ref="InventoryOverlay" />
+<CustomerInventoryListModalOverlay CompanyName="@Company.Name" CompanyId="@CompanyId" CountryCode="@Company.CountryCode" 
+                               OnInventorySelected="OnInventoryCallback" Inventory="Inventory"  @ref="InventoryListOverlay" />
 
 <CustomerActivityListModalOverlay Activities="Activities" CompanyName="@Company.Name" @ref="ActivityListOverlay" />
\ No newline at end of file
diff --git a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs
index d959414d..ec4393f7 100644
--- a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs
+++ b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs
@@ -76,8 +76,8 @@ public partial class AdvisorActivityCreatePage : IDisposable
     private ProductPriceHistoryModal PriceOverlay { get; set; } = new();
     private ConfirmWorkDateModalOverlay WorkDateOverlay { get; set; } = new();
     private ConfirmProductCheckModalOverlay ProductCheckOverlay { get; set; } = new();
-    private CustomerInvoiceModalOverlay InvoiceOverlay { get; set; } = new();
-    private CustomerInventoryModalOverlay InventoryOverlay { get; set; } = new();
+    private CustomerInvoiceListModalOverlay InvoiceListOverlay { get; set; } = new();
+    private CustomerInventoryListModalOverlay InventoryListOverlay { get; set; } = new();
     private CustomerActivityListModalOverlay ActivityListOverlay { get; set; } = new();
     private List<ProductInventoryView> Inventory { get; set; } = new();
     private List<ProductInventoryView> CheckList { get; set; } = new();
@@ -179,7 +179,7 @@ public partial class AdvisorActivityCreatePage : IDisposable
     {
         Logger.LogDebug("ShowInventoryOverlay - wait for inventory");
         
-        InventoryOverlay.Show();
+        InventoryListOverlay.Show();
         
         Inventory = await HistoryRepo.FetchInventory(CompanyId);
         
@@ -198,7 +198,7 @@ public partial class AdvisorActivityCreatePage : IDisposable
     {
         Logger.LogDebug("ShowInvoiceOverlay - wait for invoices");
         
-        InvoiceOverlay.Show();
+        InvoiceListOverlay.Show();
         CompanyInvoices = await FetchCompanyInvoices();
         await Task.Delay(500);
     }
diff --git a/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor b/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor
index 08891c4a..8bc6700e 100644
--- a/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor
+++ b/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor
@@ -34,7 +34,7 @@
 
 <CustomerInventoryListComponent OnReorderSelected="OnReorderCallback" CompanyId="@CompanyId" Inventory="@Inventory"/>
 
-<InventoryReorderModalOverlay OnSelected="@OnSelectedItem" CompanyId="@CompanyId" SalesItem="@SalesItem" @ref="InventoryOverlay"/>
+<CustomerInventoryReorderModalOverlay OnSelected="@OnSelectedItem" CompanyId="@CompanyId" SalesItem="@SalesItem" @ref="CustomerInventoryReorderOverlay"/>
 
 @if (Working)
 {
diff --git a/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor.cs
index 726978de..5c969cc4 100644
--- a/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor.cs
+++ b/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor.cs
@@ -44,7 +44,7 @@ public partial class AdvisorCustomerInventoryListPage : IDisposable
     private CompanyDto Company { get; set; } = new();
     private bool Working { get; set; } = true;
     private SalesItemView SalesItem { get; set; } = new();
-    private InventoryReorderModalOverlay InventoryOverlay { get; set; } = new();
+    private CustomerInventoryReorderModalOverlay CustomerInventoryReorderOverlay { get; set; } = new();
     private List<ProductInventoryView> Inventory { get; set; } = new();
 
 
@@ -65,7 +65,7 @@ public partial class AdvisorCustomerInventoryListPage : IDisposable
     {
         // fetch item from http repo
         SalesItem = await Catalog.GetSalesItemSku(Company.CountryCode.ToLower(), sku);
-        InventoryOverlay.Show();
+        CustomerInventoryReorderOverlay.Show();
     }    
     
     private async Task OnSelectedItem(DraftItem draftItem)
diff --git a/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor b/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor
index 6fa6ca85..48aeb824 100644
--- a/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor
+++ b/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor
@@ -33,7 +33,7 @@
         </div>
     </div>
     <CustomerInvoiceListComponent OnShowInvoice="CallInvoiceModal" CompanyId="@_companyId" InvoiceList="@CompanyInvoices.Invoices"/>
-    <InvoiceViewModalOverlay CompanyId="@_companyId" InvoiceId="@InvoiceId" @ref="InvoiceView" />
+    <CustomerInvoiceViewModalOverlay CompanyId="@_companyId" InvoiceId="@InvoiceId" @ref="CustomerInvoiceView" />
 }
 
 @if (Working)
diff --git a/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor.cs
index 4bf3ef09..0ecc83b7 100644
--- a/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor.cs
+++ b/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor.cs
@@ -23,7 +23,7 @@ public partial class AdvisorCustomerInvoiceListPage : IDisposable
     [Inject] private ILogger<AdvisorCustomerInvoiceListPage> Logger { get; set; }
     private InvoiceListView CompanyInvoices { get; set; } = new();
     private CompanyDto Company { get; set; } = new();
-    private InvoiceViewModalOverlay InvoiceView { get; set; } = new();
+    private CustomerInvoiceViewModalOverlay CustomerInvoiceView { get; set; } = new();
     private string InvoiceId { get; set; } = "";
     private bool Working { get; set; }
     private bool AllSet { get; set; }
@@ -63,7 +63,7 @@ public partial class AdvisorCustomerInvoiceListPage : IDisposable
     private void CallInvoiceModal(string invoiceId)
     {
         InvoiceId = invoiceId;
-        InvoiceView.Show();
+        CustomerInvoiceView.Show();
     }
     
     private async Task<InvoiceListView> FetchCompanyInvoices()
diff --git a/Wonky.Client/Shared/CustomerInventoryModalOverlay.razor b/Wonky.Client/Shared/CustomerInventoryListModalOverlay.razor
similarity index 83%
rename from Wonky.Client/Shared/CustomerInventoryModalOverlay.razor
rename to Wonky.Client/Shared/CustomerInventoryListModalOverlay.razor
index 308d2ad5..b4b6d514 100644
--- a/Wonky.Client/Shared/CustomerInventoryModalOverlay.razor
+++ b/Wonky.Client/Shared/CustomerInventoryListModalOverlay.razor
@@ -17,4 +17,4 @@
 {
     <div class="modal-backdrop fade show"></div>
 }
-<InventoryReorderModalOverlay CompanyId="@CompanyId" SalesItem="SalesItem" OnSelected="OnInventorySelected" @ref="InventoryOverlay" />
\ No newline at end of file
+<CustomerInventoryReorderModalOverlay CompanyId="@CompanyId" SalesItem="SalesItem" OnSelected="OnInventorySelected" @ref="CustomerInventoryReorderOverlay" />
\ No newline at end of file
diff --git a/Wonky.Client/Shared/CustomerInventoryModalOverlay.razor.cs b/Wonky.Client/Shared/CustomerInventoryListModalOverlay.razor.cs
similarity index 86%
rename from Wonky.Client/Shared/CustomerInventoryModalOverlay.razor.cs
rename to Wonky.Client/Shared/CustomerInventoryListModalOverlay.razor.cs
index 83720d24..fedce643 100644
--- a/Wonky.Client/Shared/CustomerInventoryModalOverlay.razor.cs
+++ b/Wonky.Client/Shared/CustomerInventoryListModalOverlay.razor.cs
@@ -9,11 +9,11 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Shared;
 
-public partial class CustomerInventoryModalOverlay : IDisposable
+public partial class CustomerInventoryListModalOverlay : IDisposable
 {
     [Inject] private HttpInterceptorService Interceptor { get; set; }
     [Inject] private ICountryCatalogRepository Catalog { get; set; }
-    [Inject] private ILogger<CustomerInventoryModalOverlay> Logger { get; set; }
+    [Inject] private ILogger<CustomerInventoryListModalOverlay> Logger { get; set; }
     
     [Parameter] public string CompanyName { get; set; } = "";
     [Parameter] public string CompanyId { get; set; } = "";
@@ -28,7 +28,7 @@ public partial class CustomerInventoryModalOverlay : IDisposable
     private List<ProductInventoryView> _inventory { get; set; } = new();
     private DraftItem DraftItem { get; set; } = new();
     private SalesItemView SalesItem { get; set; } = new();
-    private InventoryReorderModalOverlay InventoryOverlay { get; set; } = new();
+    private CustomerInventoryReorderModalOverlay CustomerInventoryReorderOverlay { get; set; } = new();
 
     protected override void OnInitialized()
     {
@@ -40,7 +40,7 @@ public partial class CustomerInventoryModalOverlay : IDisposable
     private async Task OnReorderCallback(string sku)
     {
         SalesItem = await Catalog.GetSalesItemSku(CountryCode.ToLower(), sku);
-        InventoryOverlay.Show();
+        CustomerInventoryReorderOverlay.Show();
     }    
     
     private async Task OnSelectedItem(DraftItem draftItem)
diff --git a/Wonky.Client/Shared/InventoryReorderModalOverlay.razor b/Wonky.Client/Shared/CustomerInventoryReorderModalOverlay.razor
similarity index 100%
rename from Wonky.Client/Shared/InventoryReorderModalOverlay.razor
rename to Wonky.Client/Shared/CustomerInventoryReorderModalOverlay.razor
diff --git a/Wonky.Client/Shared/InventoryReorderModalOverlay.razor.cs b/Wonky.Client/Shared/CustomerInventoryReorderModalOverlay.razor.cs
similarity index 98%
rename from Wonky.Client/Shared/InventoryReorderModalOverlay.razor.cs
rename to Wonky.Client/Shared/CustomerInventoryReorderModalOverlay.razor.cs
index 10f20509..3807faa4 100644
--- a/Wonky.Client/Shared/InventoryReorderModalOverlay.razor.cs
+++ b/Wonky.Client/Shared/CustomerInventoryReorderModalOverlay.razor.cs
@@ -25,7 +25,7 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Shared;
 
-public partial class InventoryReorderModalOverlay
+public partial class CustomerInventoryReorderModalOverlay
 {
     [Parameter] public string CompanyId { get; set; } = "";
     [Parameter] public SalesItemView SalesItem { get; set; } = new();
diff --git a/Wonky.Client/Shared/CustomerInvoiceModalOverlay.razor b/Wonky.Client/Shared/CustomerInvoiceListModalOverlay.razor
similarity index 88%
rename from Wonky.Client/Shared/CustomerInvoiceModalOverlay.razor
rename to Wonky.Client/Shared/CustomerInvoiceListModalOverlay.razor
index 7dffa315..7c65843b 100644
--- a/Wonky.Client/Shared/CustomerInvoiceModalOverlay.razor
+++ b/Wonky.Client/Shared/CustomerInvoiceListModalOverlay.razor
@@ -16,7 +16,7 @@
                     </div>
                 </div>
                 <CustomerInvoiceListComponent OnShowInvoice="@CallInvoiceModal" CompanyId="@Company.CompanyId" InvoiceList="@Invoices"/>
-                <InvoiceViewModalOverlay CompanyId="@Company.CompanyId" InvoiceId="@InvoiceId" @ref="InvoiceView" />
+                <CustomerInvoiceViewModalOverlay CompanyId="@Company.CompanyId" InvoiceId="@InvoiceId" @ref="CustomerInvoiceView" />
             </div>
         </div>
     </div>
diff --git a/Wonky.Client/Shared/CustomerInvoiceModalOverlay.razor.cs b/Wonky.Client/Shared/CustomerInvoiceListModalOverlay.razor.cs
similarity index 83%
rename from Wonky.Client/Shared/CustomerInvoiceModalOverlay.razor.cs
rename to Wonky.Client/Shared/CustomerInvoiceListModalOverlay.razor.cs
index 00445c0f..1050170f 100644
--- a/Wonky.Client/Shared/CustomerInvoiceModalOverlay.razor.cs
+++ b/Wonky.Client/Shared/CustomerInvoiceListModalOverlay.razor.cs
@@ -6,12 +6,12 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Shared;
 
-public partial class CustomerInvoiceModalOverlay
+public partial class CustomerInvoiceListModalOverlay
 {
     [Parameter] public InvoiceListView CustomerInvoices { get; set; } = new();
 
-    [Inject] private ILogger<CustomerInvoiceModalOverlay> Logger { get; set; }
-    private InvoiceViewModalOverlay InvoiceView { get; set; } = new();
+    [Inject] private ILogger<CustomerInvoiceListModalOverlay> Logger { get; set; }
+    private CustomerInvoiceViewModalOverlay CustomerInvoiceView { get; set; } = new();
     private string InvoiceId { get; set; } = "";
     private string _modalDisplay = "";
     private bool _showBackdrop;
@@ -35,7 +35,7 @@ public partial class CustomerInvoiceModalOverlay
     private void CallInvoiceModal(string invoiceId)
     {
         InvoiceId = invoiceId;
-        InvoiceView.Show();
+        CustomerInvoiceView.Show();
     }
 
     public void Show()
diff --git a/Wonky.Client/Shared/InvoiceViewModalOverlay.razor b/Wonky.Client/Shared/CustomerInvoiceViewModalOverlay.razor
similarity index 100%
rename from Wonky.Client/Shared/InvoiceViewModalOverlay.razor
rename to Wonky.Client/Shared/CustomerInvoiceViewModalOverlay.razor
diff --git a/Wonky.Client/Shared/InvoiceViewModalOverlay.razor.cs b/Wonky.Client/Shared/CustomerInvoiceViewModalOverlay.razor.cs
similarity index 96%
rename from Wonky.Client/Shared/InvoiceViewModalOverlay.razor.cs
rename to Wonky.Client/Shared/CustomerInvoiceViewModalOverlay.razor.cs
index 5a14283b..d6159ebb 100644
--- a/Wonky.Client/Shared/InvoiceViewModalOverlay.razor.cs
+++ b/Wonky.Client/Shared/CustomerInvoiceViewModalOverlay.razor.cs
@@ -25,7 +25,7 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Shared;
 
-public partial class InvoiceViewModalOverlay : IDisposable
+public partial class CustomerInvoiceViewModalOverlay : IDisposable
 {
     [Parameter] public string CompanyId { get; set; } = "";
     [Parameter] public string InvoiceId { get; set; } = "";