diff --git a/Wonky.Client/Components/CompanySearchDropdown.razor b/Wonky.Client/Components/CompanySearchComponent.razor
similarity index 100%
rename from Wonky.Client/Components/CompanySearchDropdown.razor
rename to Wonky.Client/Components/CompanySearchComponent.razor
diff --git a/Wonky.Client/Components/CompanySearchDropdown.razor.cs b/Wonky.Client/Components/CompanySearchComponent.razor.cs
similarity index 97%
rename from Wonky.Client/Components/CompanySearchDropdown.razor.cs
rename to Wonky.Client/Components/CompanySearchComponent.razor.cs
index 5115e89b..4bbdeb6d 100644
--- a/Wonky.Client/Components/CompanySearchDropdown.razor.cs
+++ b/Wonky.Client/Components/CompanySearchComponent.razor.cs
@@ -22,7 +22,7 @@ using Wonky.Client.Services;
 
 namespace Wonky.Client.Components;
 
-public partial class CompanySearchDropdown : IDisposable
+public partial class CompanySearchComponent : IDisposable
 {
     [Inject] private ILocalStorageService LocalStorage { get; set; }
     [Inject] private UserPreferenceService UserPreferenceService { get; set; }
diff --git a/Wonky.Client/Components/CompanySortDropdown.razor b/Wonky.Client/Components/CompanySortComponent.razor
similarity index 100%
rename from Wonky.Client/Components/CompanySortDropdown.razor
rename to Wonky.Client/Components/CompanySortComponent.razor
diff --git a/Wonky.Client/Components/CompanySortDropdown.razor.cs b/Wonky.Client/Components/CompanySortComponent.razor.cs
similarity index 97%
rename from Wonky.Client/Components/CompanySortDropdown.razor.cs
rename to Wonky.Client/Components/CompanySortComponent.razor.cs
index df2623f2..4ff9a92b 100644
--- a/Wonky.Client/Components/CompanySortDropdown.razor.cs
+++ b/Wonky.Client/Components/CompanySortComponent.razor.cs
@@ -21,7 +21,7 @@ using Wonky.Client.Services;
 
 namespace Wonky.Client.Components
 {
-    public partial class CompanySortDropdown : IDisposable
+    public partial class CompanySortComponent : IDisposable
     {
         [Inject] private ILocalStorageService LocalStorage { get; set; }
         [Inject] private UserPreferenceService UserPreferenceService { get; set; }
diff --git a/Wonky.Client/Components/CompanyTable.razor b/Wonky.Client/Components/CompanyTableComponent.razor
similarity index 100%
rename from Wonky.Client/Components/CompanyTable.razor
rename to Wonky.Client/Components/CompanyTableComponent.razor
diff --git a/Wonky.Client/Components/CompanyTable.razor.cs b/Wonky.Client/Components/CompanyTableComponent.razor.cs
similarity index 97%
rename from Wonky.Client/Components/CompanyTable.razor.cs
rename to Wonky.Client/Components/CompanyTableComponent.razor.cs
index 62599b07..a9056310 100644
--- a/Wonky.Client/Components/CompanyTable.razor.cs
+++ b/Wonky.Client/Components/CompanyTableComponent.razor.cs
@@ -24,7 +24,7 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Components
 {
-    public partial class CompanyTable
+    public partial class CompanyTableComponent
     {
         [Parameter] public List<CompanyDto> Companies { get; set; } = new(); 
         [Parameter] public EventCallback<string> OnDelete { get; set; }
diff --git a/Wonky.Client/Components/ItemGroupDropdown.razor b/Wonky.Client/Components/ItemGroupComponent.razor
similarity index 100%
rename from Wonky.Client/Components/ItemGroupDropdown.razor
rename to Wonky.Client/Components/ItemGroupComponent.razor
diff --git a/Wonky.Client/Components/ItemGroupDropdown.razor.cs b/Wonky.Client/Components/ItemGroupComponent.razor.cs
similarity index 97%
rename from Wonky.Client/Components/ItemGroupDropdown.razor.cs
rename to Wonky.Client/Components/ItemGroupComponent.razor.cs
index 99218039..9fe0f6d4 100644
--- a/Wonky.Client/Components/ItemGroupDropdown.razor.cs
+++ b/Wonky.Client/Components/ItemGroupComponent.razor.cs
@@ -20,7 +20,7 @@ using Wonky.Client.Services;
 
 namespace Wonky.Client.Components;
 
-public partial class ItemGroupDropdown
+public partial class ItemGroupComponent
 {
     [Inject] private ILocalStorageService LocalStorage { get; set; }
     [Inject] private UserPreferenceService UserPreferenceService { get; set; }
diff --git a/Wonky.Client/Components/ItemSearchDropdown.razor b/Wonky.Client/Components/ItemSearchComponent.razor
similarity index 100%
rename from Wonky.Client/Components/ItemSearchDropdown.razor
rename to Wonky.Client/Components/ItemSearchComponent.razor
diff --git a/Wonky.Client/Components/ItemSearchDropdown.razor.cs b/Wonky.Client/Components/ItemSearchComponent.razor.cs
similarity index 97%
rename from Wonky.Client/Components/ItemSearchDropdown.razor.cs
rename to Wonky.Client/Components/ItemSearchComponent.razor.cs
index 063e1b61..5b64e86a 100644
--- a/Wonky.Client/Components/ItemSearchDropdown.razor.cs
+++ b/Wonky.Client/Components/ItemSearchComponent.razor.cs
@@ -19,7 +19,7 @@ using Wonky.Client.Services;
 
 namespace Wonky.Client.Components;
 
-public partial class ItemSearchDropdown : IDisposable
+public partial class ItemSearchComponent : IDisposable
 {
     [Inject] private ILocalStorageService LocalStorage { get; set; }
     [Inject] private UserPreferenceService UserPreferenceService { get; set; }
diff --git a/Wonky.Client/Components/ItemSortDropdown.razor b/Wonky.Client/Components/ItemSortComponent.razor
similarity index 100%
rename from Wonky.Client/Components/ItemSortDropdown.razor
rename to Wonky.Client/Components/ItemSortComponent.razor
diff --git a/Wonky.Client/Components/ItemSortDropdown.razor.cs b/Wonky.Client/Components/ItemSortComponent.razor.cs
similarity index 97%
rename from Wonky.Client/Components/ItemSortDropdown.razor.cs
rename to Wonky.Client/Components/ItemSortComponent.razor.cs
index ef997346..c8d84d75 100644
--- a/Wonky.Client/Components/ItemSortDropdown.razor.cs
+++ b/Wonky.Client/Components/ItemSortComponent.razor.cs
@@ -19,7 +19,7 @@ using Wonky.Client.Services;
 
 namespace Wonky.Client.Components;
 
-public partial class ItemSortDropdown : IDisposable
+public partial class ItemSortComponent : IDisposable
 {
     [Inject] private ILocalStorageService LocalStorage { get; set; }
     [Inject] private UserPreferenceService UserPreferenceService { get; set; }
diff --git a/Wonky.Client/Components/ItemTable.razor b/Wonky.Client/Components/ItemTableComponent.razor
similarity index 100%
rename from Wonky.Client/Components/ItemTable.razor
rename to Wonky.Client/Components/ItemTableComponent.razor
diff --git a/Wonky.Client/Components/ItemTable.razor.cs b/Wonky.Client/Components/ItemTableComponent.razor.cs
similarity index 96%
rename from Wonky.Client/Components/ItemTable.razor.cs
rename to Wonky.Client/Components/ItemTableComponent.razor.cs
index 2fc85eaf..81ed3e2f 100644
--- a/Wonky.Client/Components/ItemTable.razor.cs
+++ b/Wonky.Client/Components/ItemTableComponent.razor.cs
@@ -21,7 +21,7 @@ using Wonky.Entity.Views;
 
 namespace Wonky.Client.Components;
 
-public partial class ItemTable
+public partial class ItemTableComponent
 {
     [Parameter] public List<NgSalesItemView> SalesItems { get; set; } = new();
     [Inject] private IToastService ToastService { get; set; }
diff --git a/Wonky.Client/Components/ItemTable.razor.css b/Wonky.Client/Components/ItemTableComponent.razor.css
similarity index 100%
rename from Wonky.Client/Components/ItemTable.razor.css
rename to Wonky.Client/Components/ItemTableComponent.razor.css
diff --git a/Wonky.Client/Components/PageSizeDropdown.razor b/Wonky.Client/Components/PageSizeComponent.razor
similarity index 100%
rename from Wonky.Client/Components/PageSizeDropdown.razor
rename to Wonky.Client/Components/PageSizeComponent.razor
diff --git a/Wonky.Client/Components/PageSizeDropdown.razor.cs b/Wonky.Client/Components/PageSizeComponent.razor.cs
similarity index 97%
rename from Wonky.Client/Components/PageSizeDropdown.razor.cs
rename to Wonky.Client/Components/PageSizeComponent.razor.cs
index 7d731182..4c0102a8 100644
--- a/Wonky.Client/Components/PageSizeDropdown.razor.cs
+++ b/Wonky.Client/Components/PageSizeComponent.razor.cs
@@ -21,7 +21,7 @@ using Wonky.Client.Services;
 
 namespace Wonky.Client.Components
 {
-    public partial class PageSizeDropdown : IDisposable
+    public partial class PageSizeComponent : IDisposable
     {
         [Inject] private ILocalStorageService LocalStorage { get; set; }
         [Inject] private UserPreferenceService UserPreferenceService { get; set; }
diff --git a/Wonky.Client/Components/PageSizeDropdown.razor.css b/Wonky.Client/Components/PageSizeComponent.razor.css
similarity index 100%
rename from Wonky.Client/Components/PageSizeDropdown.razor.css
rename to Wonky.Client/Components/PageSizeComponent.razor.css
diff --git a/Wonky.Client/Components/Pagination.razor b/Wonky.Client/Components/PaginationComponent.razor
similarity index 100%
rename from Wonky.Client/Components/Pagination.razor
rename to Wonky.Client/Components/PaginationComponent.razor
diff --git a/Wonky.Client/Components/Pagination.razor.cs b/Wonky.Client/Components/PaginationComponent.razor.cs
similarity index 97%
rename from Wonky.Client/Components/Pagination.razor.cs
rename to Wonky.Client/Components/PaginationComponent.razor.cs
index e8976382..0afe5c39 100644
--- a/Wonky.Client/Components/Pagination.razor.cs
+++ b/Wonky.Client/Components/PaginationComponent.razor.cs
@@ -21,7 +21,7 @@ using Wonky.Entity.Requests;
 
 namespace Wonky.Client.Components
 {
-    public partial class Pagination
+    public partial class PaginationComponent
     {
         [Parameter] public MetaData MetaData { get; set; } = new();
         [Parameter] public int Spread { get; set; }
diff --git a/Wonky.Client/Components/RegInfoCompany.razor b/Wonky.Client/Components/VatInfoComponent.razor
similarity index 100%
rename from Wonky.Client/Components/RegInfoCompany.razor
rename to Wonky.Client/Components/VatInfoComponent.razor
diff --git a/Wonky.Client/Components/RegInfoCompany.razor.cs b/Wonky.Client/Components/VatInfoComponent.razor.cs
similarity index 97%
rename from Wonky.Client/Components/RegInfoCompany.razor.cs
rename to Wonky.Client/Components/VatInfoComponent.razor.cs
index eec2a3d2..23b3eef1 100644
--- a/Wonky.Client/Components/RegInfoCompany.razor.cs
+++ b/Wonky.Client/Components/VatInfoComponent.razor.cs
@@ -20,7 +20,7 @@ using Wonky.Entity.Requests;
 
 namespace Wonky.Client.Components;
 
-public partial class RegInfoCompany
+public partial class VatInfoComponent
 {
     [Inject] public VatInfoLookupService VatInfoLookupService { get; set; } = null!;
     [Parameter] public string VatNumber { get; set; } = "";
diff --git a/Wonky.Client/Pages/ActivityCreate.razor b/Wonky.Client/Pages/ActivityCreate.razor
index 4538eea8..f426dc8e 100644
--- a/Wonky.Client/Pages/ActivityCreate.razor
+++ b/Wonky.Client/Pages/ActivityCreate.razor
@@ -144,25 +144,25 @@ else
             <div class="accordion-body">
                 <div class="row mb-1">
                     <div class="col">
-                        <ItemGroupDropdown OnChanged="SetItemGroup"/>
+                        <ItemGroupComponent OnChanged="SetItemGroup"/>
                     </div>
                     <div class="col">
-                        <ItemSearchDropdown OnChanged="SetSearchCol"/>
+                        <ItemSearchComponent OnChanged="SetSearchCol"/>
                     </div>
                     <div class="col">
                         <SearchPhrase OnChanged="SetSearchPhrase"/>
                     </div>
                     <div class="col">
-                        <ItemSortDropdown OnChanged="SetSortCol"/>
+                        <ItemSortComponent OnChanged="SetSortCol"/>
                     </div>
                     <div class="col">
-                        <PageSizeDropdown OnChanged="SetPageSize"></PageSizeDropdown>
+                        <PageSizeComponent OnChanged="SetPageSize"></PageSizeComponent>
                     </div>
                 </div>
             </div>
             <div class="row">
                 <div class="col">
-                    <Pagination MetaData="MetaData" Spread="2" SelectedPage="SelectedPage"></Pagination>
+                    <PaginationComponent MetaData="MetaData" Spread="2" SelectedPage="SelectedPage"></PaginationComponent>
                 </div>
             </div>
             @if (SalesItems.Any())
diff --git a/Wonky.Client/Pages/CompanyList.razor b/Wonky.Client/Pages/CompanyList.razor
index cf1aefe8..c274ef75 100644
--- a/Wonky.Client/Pages/CompanyList.razor
+++ b/Wonky.Client/Pages/CompanyList.razor
@@ -24,22 +24,22 @@
 <div class="container">
     <div class="row mb-3">
         <div class="col-md-3">
-            <CompanySearchDropdown OnChanged="SetSearchCol"/>
+            <CompanySearchComponent OnChanged="SetSearchCol"/>
         </div>
         <div class="col-md-3">
             <SearchPhrase SavedSearch="@_savedSearch" OnChanged="SetSearchPhrase"/>
         </div>
         <div class="col-md-3">
-            <CompanySortDropdown OnChanged="SetSortCol"/>
+            <CompanySortComponent OnChanged="SetSortCol"/>
         </div>
         <div class="col-md-3">
-            <PageSizeDropdown OnChanged="SetPageSize"></PageSizeDropdown>
+            <PageSizeComponent OnChanged="SetPageSize"></PageSizeComponent>
         </div>
     </div>
 </div>
 <div class="row mb-3">
     <div class="col-md-6">
-        <Pagination MetaData="MetaData" Spread="2" SelectedPage="SelectedPage"></Pagination>
+        <PaginationComponent MetaData="MetaData" Spread="2" SelectedPage="SelectedPage"></PaginationComponent>
     </div>
     <div class="col-md-3">
     </div>
@@ -48,4 +48,4 @@
     </div>
 </div>
 
-<CompanyTable Companies="Companies" OnDelete="DeleteCompany"></CompanyTable>
\ No newline at end of file
+<CompanyTableComponent Companies="Companies" OnDelete="DeleteCompany"></CompanyTableComponent>
\ No newline at end of file
diff --git a/Wonky.Client/Pages/ItemCatalog.razor b/Wonky.Client/Pages/ItemCatalog.razor
index 48bdb9e9..461745c4 100644
--- a/Wonky.Client/Pages/ItemCatalog.razor
+++ b/Wonky.Client/Pages/ItemCatalog.razor
@@ -23,28 +23,28 @@
 
 <div class="row mb-3">
     <div class="col">
-        <ItemGroupDropdown OnChanged="SetItemGroup"/>
+        <ItemGroupComponent OnChanged="SetItemGroup"/>
     </div>
     <div class="col">
-        <ItemSearchDropdown OnChanged="SetSearchCol"/>
+        <ItemSearchComponent OnChanged="SetSearchCol"/>
     </div>
     <div class="col">
         <SearchPhrase OnChanged="SetSearchPhrase"/>
     </div>
     <div class="col">
-        <ItemSortDropdown OnChanged="SetSortCol"/>
+        <ItemSortComponent OnChanged="SetSortCol"/>
     </div>
     <div class="col-md-2">
-        <PageSizeDropdown OnChanged="SetPageSize"></PageSizeDropdown>
+        <PageSizeComponent OnChanged="SetPageSize"></PageSizeComponent>
     </div>
 </div>
 <div class="row">
     <div class="col">
-        <Pagination MetaData="MetaData" Spread="2" SelectedPage="SelectedPage"></Pagination>
+        <PaginationComponent MetaData="MetaData" Spread="2" SelectedPage="SelectedPage"></PaginationComponent>
     </div>
 </div>
 <div class="row">
     <div class="col">
-        <ItemTable SalesItems="SalesItems"></ItemTable>
+        <ItemTableComponent SalesItems="SalesItems"></ItemTableComponent>
     </div>
 </div>
\ No newline at end of file