diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index fb24e9c..fc27d0e 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -16,13 +16,13 @@ jobs:
 
     - name: Install WASM tools
       run: dotnet workload install wasm-tools
-  
+
     - name: Publish
-      run: dotnet publish DotnetEventViewer --configuration Release -o publish
+      run: dotnet publish DotnetEventsViewer --configuration Release -o publish
 
     - name: Change base href
-      run: sed -i 's/<base href="\/" \/>/<base href="\/dotnet-event-viewer\/" \/>/g' publish/wwwroot/index.html
- 
+      run: sed -i 's/<base href="\/" \/>/<base href="\/dotnet-events-viewer\/" \/>/g' publish/wwwroot/index.html
+
     - name: Setup GitHub Pages
       uses: actions/configure-pages@v5
 
diff --git a/DotnetEventsViewer.sln b/DotnetEventsViewer.sln
index a666c0c..1ca777a 100644
--- a/DotnetEventsViewer.sln
+++ b/DotnetEventsViewer.sln
@@ -5,7 +5,7 @@ VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventPipe", "EventPipe\EventPipe.csproj", "{2D12A7D8-1159-46A4-A908-74A7801B1908}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotnetEventViewer", "DotnetEventViewer\DotnetEventViewer.csproj", "{BEB973B8-6DF4-4582-8849-BDF119703EB2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotnetEventsViewer", "DotnetEventsViewer\DotnetEventsViewer.csproj", "{BEB973B8-6DF4-4582-8849-BDF119703EB2}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventPipe.Test", "EventPipe.Test\EventPipe.Test.csproj", "{C90A60F8-CE55-464A-B9FE-A073F28D8334}"
 EndProject
diff --git a/DotnetEventsViewer/CallTree/CallTreeNode.cs b/DotnetEventsViewer/CallTree/CallTreeNode.cs
index 4cf8acb..b6fd62d 100644
--- a/DotnetEventsViewer/CallTree/CallTreeNode.cs
+++ b/DotnetEventsViewer/CallTree/CallTreeNode.cs
@@ -1,7 +1,7 @@
-using DotnetEventViewer.CallTree.CountAggregators;
+using DotnetEventsViewer.CallTree.CountAggregators;
 using EventPipe;
 
-namespace DotnetEventViewer.CallTree;
+namespace DotnetEventsViewer.CallTree;
 
 public class CallTreeNode
 {
diff --git a/DotnetEventsViewer/CallTree/CountAggregators/AllocationSizeAggregator.cs b/DotnetEventsViewer/CallTree/CountAggregators/AllocationSizeAggregator.cs
index 42ea6cb..aca4e71 100644
--- a/DotnetEventsViewer/CallTree/CountAggregators/AllocationSizeAggregator.cs
+++ b/DotnetEventsViewer/CallTree/CountAggregators/AllocationSizeAggregator.cs
@@ -1,7 +1,7 @@
-using DotnetEventViewer.Models;
+using DotnetEventsViewer.Models;
 using EventPipe;
 
-namespace DotnetEventViewer.CallTree.CountAggregators;
+namespace DotnetEventsViewer.CallTree.CountAggregators;
 
 internal class AllocationSizeAggregator : ICallTreeCountAggregator
 {
diff --git a/DotnetEventsViewer/CallTree/CountAggregators/ContentionDurationAggregator.cs b/DotnetEventsViewer/CallTree/CountAggregators/ContentionDurationAggregator.cs
index 41d1c4d..cb5aa80 100644
--- a/DotnetEventsViewer/CallTree/CountAggregators/ContentionDurationAggregator.cs
+++ b/DotnetEventsViewer/CallTree/CountAggregators/ContentionDurationAggregator.cs
@@ -1,6 +1,6 @@
-using DotnetEventViewer.Models;
+using DotnetEventsViewer.Models;
 
-namespace DotnetEventViewer.CallTree.CountAggregators;
+namespace DotnetEventsViewer.CallTree.CountAggregators;
 
 internal class ContentionDurationAggregator : SynchronousDurationAggregator
 {
diff --git a/DotnetEventsViewer/CallTree/CountAggregators/EventsCountAggregator.cs b/DotnetEventsViewer/CallTree/CountAggregators/EventsCountAggregator.cs
index c965727..3dd932c 100644
--- a/DotnetEventsViewer/CallTree/CountAggregators/EventsCountAggregator.cs
+++ b/DotnetEventsViewer/CallTree/CountAggregators/EventsCountAggregator.cs
@@ -1,7 +1,7 @@
-using DotnetEventViewer.Models;
+using DotnetEventsViewer.Models;
 using EventPipe;
 
-namespace DotnetEventViewer.CallTree.CountAggregators;
+namespace DotnetEventsViewer.CallTree.CountAggregators;
 
 internal class EventsCountAggregator : ICallTreeCountAggregator
 {
diff --git a/DotnetEventsViewer/CallTree/CountAggregators/FieldCorrelationDurationAggregator.cs b/DotnetEventsViewer/CallTree/CountAggregators/FieldCorrelationDurationAggregator.cs
index 0cb31fa..00b6779 100644
--- a/DotnetEventsViewer/CallTree/CountAggregators/FieldCorrelationDurationAggregator.cs
+++ b/DotnetEventsViewer/CallTree/CountAggregators/FieldCorrelationDurationAggregator.cs
@@ -1,7 +1,7 @@
-using DotnetEventViewer.Models;
+using DotnetEventsViewer.Models;
 using EventPipe;
 
-namespace DotnetEventViewer.CallTree.CountAggregators;
+namespace DotnetEventsViewer.CallTree.CountAggregators;
 
 internal abstract class FieldCorrelationDurationAggregator : ICallTreeCountAggregator
 {
diff --git a/DotnetEventsViewer/CallTree/CountAggregators/ICallTreeCountAggregator.cs b/DotnetEventsViewer/CallTree/CountAggregators/ICallTreeCountAggregator.cs
index 8497961..f0fe912 100644
--- a/DotnetEventsViewer/CallTree/CountAggregators/ICallTreeCountAggregator.cs
+++ b/DotnetEventsViewer/CallTree/CountAggregators/ICallTreeCountAggregator.cs
@@ -1,6 +1,6 @@
-using DotnetEventViewer.Models;
+using DotnetEventsViewer.Models;
 
-namespace DotnetEventViewer.CallTree.CountAggregators;
+namespace DotnetEventsViewer.CallTree.CountAggregators;
 
 /// <summary>
 /// Adds metadata (e.g. events count) to a <see cref="CallTreeNode"/>.
diff --git a/DotnetEventsViewer/CallTree/CountAggregators/ICallTreeCountAggregatorProcessor.cs b/DotnetEventsViewer/CallTree/CountAggregators/ICallTreeCountAggregatorProcessor.cs
index 483fa5b..fe8a28d 100644
--- a/DotnetEventsViewer/CallTree/CountAggregators/ICallTreeCountAggregatorProcessor.cs
+++ b/DotnetEventsViewer/CallTree/CountAggregators/ICallTreeCountAggregatorProcessor.cs
@@ -1,6 +1,6 @@
 using EventPipe;
 
-namespace DotnetEventViewer.CallTree.CountAggregators;
+namespace DotnetEventsViewer.CallTree.CountAggregators;
 
 public interface ICallTreeCountAggregatorProcessor
 {
diff --git a/DotnetEventsViewer/CallTree/CountAggregators/SynchronousDurationAggregator.cs b/DotnetEventsViewer/CallTree/CountAggregators/SynchronousDurationAggregator.cs
index ea57152..fbd524d 100644
--- a/DotnetEventsViewer/CallTree/CountAggregators/SynchronousDurationAggregator.cs
+++ b/DotnetEventsViewer/CallTree/CountAggregators/SynchronousDurationAggregator.cs
@@ -1,7 +1,7 @@
-using DotnetEventViewer.Models;
+using DotnetEventsViewer.Models;
 using EventPipe;
 
-namespace DotnetEventViewer.CallTree.CountAggregators;
+namespace DotnetEventsViewer.CallTree.CountAggregators;
 
 internal abstract class SynchronousDurationAggregator : ICallTreeCountAggregator
 {
diff --git a/DotnetEventsViewer/CallTree/CountAggregators/TaskDurationAggregator.cs b/DotnetEventsViewer/CallTree/CountAggregators/TaskDurationAggregator.cs
index 37d994a..d124583 100644
--- a/DotnetEventsViewer/CallTree/CountAggregators/TaskDurationAggregator.cs
+++ b/DotnetEventsViewer/CallTree/CountAggregators/TaskDurationAggregator.cs
@@ -1,6 +1,6 @@
-using DotnetEventViewer.Models;
+using DotnetEventsViewer.Models;
 
-namespace DotnetEventViewer.CallTree.CountAggregators;
+namespace DotnetEventsViewer.CallTree.CountAggregators;
 
 internal class TaskDurationAggregator : FieldCorrelationDurationAggregator
 {
diff --git a/DotnetEventsViewer/CallTree/CountAggregators/TaskWaitDurationAggregator.cs b/DotnetEventsViewer/CallTree/CountAggregators/TaskWaitDurationAggregator.cs
index db33364..49ddb46 100644
--- a/DotnetEventsViewer/CallTree/CountAggregators/TaskWaitDurationAggregator.cs
+++ b/DotnetEventsViewer/CallTree/CountAggregators/TaskWaitDurationAggregator.cs
@@ -1,6 +1,6 @@
-using DotnetEventViewer.Models;
+using DotnetEventsViewer.Models;
 
-namespace DotnetEventViewer.CallTree.CountAggregators;
+namespace DotnetEventsViewer.CallTree.CountAggregators;
 
 internal class TaskWaitDurationAggregator : FieldCorrelationDurationAggregator
 {
diff --git a/DotnetEventsViewer/CallTree/CountAggregators/WaitHandleWaitDurationAggregator.cs b/DotnetEventsViewer/CallTree/CountAggregators/WaitHandleWaitDurationAggregator.cs
index e970956..8259dc2 100644
--- a/DotnetEventsViewer/CallTree/CountAggregators/WaitHandleWaitDurationAggregator.cs
+++ b/DotnetEventsViewer/CallTree/CountAggregators/WaitHandleWaitDurationAggregator.cs
@@ -1,6 +1,6 @@
-using DotnetEventViewer.Models;
+using DotnetEventsViewer.Models;
 
-namespace DotnetEventViewer.CallTree.CountAggregators;
+namespace DotnetEventsViewer.CallTree.CountAggregators;
 
 internal class WaitHandleWaitDurationAggregator : SynchronousDurationAggregator
 {
diff --git a/DotnetEventsViewer/Components/CallTreeView.razor b/DotnetEventsViewer/Components/CallTreeView.razor
index ca24d21..62a5866 100644
--- a/DotnetEventsViewer/Components/CallTreeView.razor
+++ b/DotnetEventsViewer/Components/CallTreeView.razor
@@ -1,5 +1,5 @@
-@using DotnetEventViewer.CallTree
-@using DotnetEventViewer.CallTree.CountAggregators
+@using DotnetEventsViewer.CallTree
+@using DotnetEventsViewer.CallTree.CountAggregators
 @using EventPipe
 
 @if (_tree != null && Aggregator != null)
diff --git a/DotnetEventsViewer/Components/QueryBuilder.razor b/DotnetEventsViewer/Components/QueryBuilder.razor
index e8307c0..fd925c2 100644
--- a/DotnetEventsViewer/Components/QueryBuilder.razor
+++ b/DotnetEventsViewer/Components/QueryBuilder.razor
@@ -1,9 +1,9 @@
 @using System.Text.RegularExpressions
-@using DotnetEventViewer.CallTree.CountAggregators
-@using DotnetEventViewer.Models
-@using DotnetEventViewer.Querying
-@using DotnetEventViewer.Querying.Operators
-@using DotnetEventViewer.State
+@using DotnetEventsViewer.CallTree.CountAggregators
+@using DotnetEventsViewer.Models
+@using DotnetEventsViewer.Querying
+@using DotnetEventsViewer.Querying.Operators
+@using DotnetEventsViewer.State
 @using EventPipe
 
 @inject StateContainer State
diff --git a/DotnetEventsViewer/Components/TraceMetadata.razor b/DotnetEventsViewer/Components/TraceMetadata.razor
index 3524f5f..8345d82 100644
--- a/DotnetEventsViewer/Components/TraceMetadata.razor
+++ b/DotnetEventsViewer/Components/TraceMetadata.razor
@@ -1,4 +1,4 @@
-@using DotnetEventViewer.State
+@using DotnetEventsViewer.State
 
 @inject StateContainer State
 
diff --git a/DotnetEventsViewer/CustomIcons.cs b/DotnetEventsViewer/CustomIcons.cs
index 72f6418..eb30361 100644
--- a/DotnetEventsViewer/CustomIcons.cs
+++ b/DotnetEventsViewer/CustomIcons.cs
@@ -1,6 +1,6 @@
 using Microsoft.FluentUI.AspNetCore.Components;
 
-namespace DotnetEventViewer;
+namespace DotnetEventsViewer;
 
 internal static class CustomIcons
 {
diff --git a/DotnetEventsViewer/Layout/MainLayout.razor b/DotnetEventsViewer/Layout/MainLayout.razor
index e1b0072..e2f50c8 100644
--- a/DotnetEventsViewer/Layout/MainLayout.razor
+++ b/DotnetEventsViewer/Layout/MainLayout.razor
@@ -1,16 +1,16 @@
-@using DotnetEventViewer.Components
+@using DotnetEventsViewer.Components
 
 @inherits LayoutComponentBase
 
 <FluentLayout>
     <FluentHeader>
-        .NET Event Viewer
+        .NET Events Viewer
         <FluentSpacer />
         <TraceMetadata />
         <FluentAnchor Appearance="Appearance.Hypertext"
-                      Href="https://github.com/verdie-g/dotnet-event-viewer"
+                      Href="https://github.com/verdie-g/dotnet-events-viewer"
                       Target="_blank"
-                      title=".NET Event Viewer on GitHub"
+                      title=".NET Events Viewer on GitHub"
                       Style="margin-left: 8px">
             <FluentIcon Value="@(new CustomIcons.GitHub())" Color="Color.Fill" Width="24px" />
         </FluentAnchor>
diff --git a/DotnetEventsViewer/Layout/NavMenu.razor b/DotnetEventsViewer/Layout/NavMenu.razor
index d9bbd05..16c549e 100644
--- a/DotnetEventsViewer/Layout/NavMenu.razor
+++ b/DotnetEventsViewer/Layout/NavMenu.razor
@@ -1,5 +1,5 @@
 <nav>
-    <FluentNavMenu Width="250" Collapsible="true" Expanded="false" Title="Event Views">
+    <FluentNavMenu Width="250" Collapsible="true" Expanded="false" Title="Events Viewer">
         <FluentNavLink Href="list" Icon="@(new Icons.Filled.Size20.AppsList())" IconColor="Color.Accent">List View</FluentNavLink>
         <FluentNavLink Href="tree" Icon="@(new Icons.Filled.Size24.CubeTree())" IconColor="Color.Accent">Tree View</FluentNavLink>
         <FluentNavLink Href="./" Icon="@(new Icons.Regular.Size20.ArrowExit())" IconColor="Color.Accent" Match="NavLinkMatch.All">Close Trace</FluentNavLink>
diff --git a/DotnetEventsViewer/Models/EventKey.cs b/DotnetEventsViewer/Models/EventKey.cs
index c8879e5..c777258 100644
--- a/DotnetEventsViewer/Models/EventKey.cs
+++ b/DotnetEventsViewer/Models/EventKey.cs
@@ -1,6 +1,6 @@
 using EventPipe;
 
-namespace DotnetEventViewer.Models;
+namespace DotnetEventsViewer.Models;
 
 public record EventKey(string ProviderName, string EventName, int EventId)
 {
diff --git a/DotnetEventsViewer/Models/KnownProviders.cs b/DotnetEventsViewer/Models/KnownProviders.cs
index 942c137..121d6ca 100644
--- a/DotnetEventsViewer/Models/KnownProviders.cs
+++ b/DotnetEventsViewer/Models/KnownProviders.cs
@@ -1,4 +1,4 @@
-namespace DotnetEventViewer.Models;
+namespace DotnetEventsViewer.Models;
 
 internal static class KnownProviders
 {
diff --git a/DotnetEventsViewer/Models/TraceExtraMetadata.cs b/DotnetEventsViewer/Models/TraceExtraMetadata.cs
index b65583f..7e37b76 100644
--- a/DotnetEventsViewer/Models/TraceExtraMetadata.cs
+++ b/DotnetEventsViewer/Models/TraceExtraMetadata.cs
@@ -1,4 +1,4 @@
-namespace DotnetEventViewer.Models;
+namespace DotnetEventsViewer.Models;
 
 public record TraceExtraMetadata(
     string Filename,
diff --git a/DotnetEventsViewer/Pages/EventsList.razor b/DotnetEventsViewer/Pages/EventsList.razor
index 41b570f..4d4ce98 100644
--- a/DotnetEventsViewer/Pages/EventsList.razor
+++ b/DotnetEventsViewer/Pages/EventsList.razor
@@ -1,9 +1,9 @@
 @page "/list"
 
 @using EventPipe
-@using DotnetEventViewer.Components
-@using DotnetEventViewer.Querying
-@using DotnetEventViewer.State
+@using DotnetEventsViewer.Components
+@using DotnetEventsViewer.Querying
+@using DotnetEventsViewer.State
 
 @inject StateContainer State
 @inject IDialogService DialogService;
diff --git a/DotnetEventsViewer/Pages/EventsTree.razor b/DotnetEventsViewer/Pages/EventsTree.razor
index 7c77313..84765d8 100644
--- a/DotnetEventsViewer/Pages/EventsTree.razor
+++ b/DotnetEventsViewer/Pages/EventsTree.razor
@@ -1,10 +1,10 @@
 @page "/tree"
 
-@using DotnetEventViewer.CallTree
-@using DotnetEventViewer.CallTree.CountAggregators
-@using DotnetEventViewer.Components
-@using DotnetEventViewer.Querying
-@using DotnetEventViewer.State
+@using DotnetEventsViewer.CallTree
+@using DotnetEventsViewer.CallTree.CountAggregators
+@using DotnetEventsViewer.Components
+@using DotnetEventsViewer.Querying
+@using DotnetEventsViewer.State
 
 @inject StateContainer State
 
diff --git a/DotnetEventsViewer/Pages/Home.razor b/DotnetEventsViewer/Pages/Home.razor
index 6829854..dd95018 100644
--- a/DotnetEventsViewer/Pages/Home.razor
+++ b/DotnetEventsViewer/Pages/Home.razor
@@ -1,8 +1,8 @@
 @page "/"
-@using DotnetEventViewer.State
+@using DotnetEventsViewer.State
 @using EventPipe
-@using DotnetEventViewer.Models
-@using DotnetEventViewer.Querying
+@using DotnetEventsViewer.Models
+@using DotnetEventsViewer.Querying
 
 @layout HomeLayout
 
@@ -10,9 +10,9 @@
 @inject NavigationManager NavigationManager
 @inject IMessageService MessageService
 
-<PageTitle>.NET Event Viewer</PageTitle>
+<PageTitle>.NET Events Viewer</PageTitle>
 
-<h1>.NET Event Viewer</h1>
+<h1>.NET Events Viewer</h1>
 
 <p>
     This project is a modern <a href="https://github.com/microsoft/perfview" target="_blank">PerfView</a> alternative to
@@ -22,7 +22,7 @@
 
 <p>
     This analysis tool is compiled to WebAssembly, ensuring that everything runs within your browser, and trace files
-    remain confined to it. You can check out the code on <a href="https://github.com/verdie-g/dotnet-event-viewer" target="_blank">GitHub</a>.
+    remain confined to it. You can check out the code on <a href="https://github.com/verdie-g/dotnet-events-viewer" target="_blank">GitHub</a>.
 </p>
 
 <FluentMessageBarProvider Section="FileUploadError" />
diff --git a/DotnetEventsViewer/Program.cs b/DotnetEventsViewer/Program.cs
index b60d68c..d6cc503 100644
--- a/DotnetEventsViewer/Program.cs
+++ b/DotnetEventsViewer/Program.cs
@@ -1,5 +1,5 @@
-using DotnetEventViewer;
-using DotnetEventViewer.State;
+using DotnetEventsViewer;
+using DotnetEventsViewer.State;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.FluentUI.AspNetCore.Components;
diff --git a/DotnetEventsViewer/Querying/Field.cs b/DotnetEventsViewer/Querying/Field.cs
index b624654..e28b206 100644
--- a/DotnetEventsViewer/Querying/Field.cs
+++ b/DotnetEventsViewer/Querying/Field.cs
@@ -1,6 +1,6 @@
 using EventPipe;
 
-namespace DotnetEventViewer.Querying;
+namespace DotnetEventsViewer.Querying;
 
 public class Field(string name, TypeCode type, Func<Event, object?> selector, EventMetadata? associatedEventMetadata = null)
 {
diff --git a/DotnetEventsViewer/Querying/Filter.cs b/DotnetEventsViewer/Querying/Filter.cs
index 59bd4cd..7863776 100644
--- a/DotnetEventsViewer/Querying/Filter.cs
+++ b/DotnetEventsViewer/Querying/Filter.cs
@@ -1,6 +1,6 @@
-using DotnetEventViewer.Querying.Operators;
+using DotnetEventsViewer.Querying.Operators;
 
-namespace DotnetEventViewer.Querying;
+namespace DotnetEventsViewer.Querying;
 
 internal class Filter(Field field, IOperator @operator, string value)
 {
diff --git a/DotnetEventsViewer/Querying/Operators/EqualOperator.cs b/DotnetEventsViewer/Querying/Operators/EqualOperator.cs
index 53f2a0e..bc7d435 100644
--- a/DotnetEventsViewer/Querying/Operators/EqualOperator.cs
+++ b/DotnetEventsViewer/Querying/Operators/EqualOperator.cs
@@ -1,6 +1,6 @@
 using EventPipe;
 
-namespace DotnetEventViewer.Querying.Operators;
+namespace DotnetEventsViewer.Querying.Operators;
 
 internal class EqualOperator : IOperator
 {
diff --git a/DotnetEventsViewer/Querying/Operators/GreaterOperator.cs b/DotnetEventsViewer/Querying/Operators/GreaterOperator.cs
index e5a86aa..3f51d93 100644
--- a/DotnetEventsViewer/Querying/Operators/GreaterOperator.cs
+++ b/DotnetEventsViewer/Querying/Operators/GreaterOperator.cs
@@ -1,6 +1,6 @@
 using EventPipe;
 
-namespace DotnetEventViewer.Querying.Operators;
+namespace DotnetEventsViewer.Querying.Operators;
 
 internal class GreaterOperator : IOperator
 {
diff --git a/DotnetEventsViewer/Querying/Operators/GreaterOrEqualOperator.cs b/DotnetEventsViewer/Querying/Operators/GreaterOrEqualOperator.cs
index 4731349..3c8fdd5 100644
--- a/DotnetEventsViewer/Querying/Operators/GreaterOrEqualOperator.cs
+++ b/DotnetEventsViewer/Querying/Operators/GreaterOrEqualOperator.cs
@@ -1,6 +1,6 @@
 using EventPipe;
 
-namespace DotnetEventViewer.Querying.Operators;
+namespace DotnetEventsViewer.Querying.Operators;
 
 internal class GreaterOrEqualOperator : IOperator
 {
diff --git a/DotnetEventsViewer/Querying/Operators/IOperator.cs b/DotnetEventsViewer/Querying/Operators/IOperator.cs
index 23d9823..4dc0094 100644
--- a/DotnetEventsViewer/Querying/Operators/IOperator.cs
+++ b/DotnetEventsViewer/Querying/Operators/IOperator.cs
@@ -1,4 +1,4 @@
-namespace DotnetEventViewer.Querying.Operators;
+namespace DotnetEventsViewer.Querying.Operators;
 
 internal interface IOperator
 {
diff --git a/DotnetEventsViewer/Querying/Operators/LessOperator.cs b/DotnetEventsViewer/Querying/Operators/LessOperator.cs
index b1bffc3..acd295c 100644
--- a/DotnetEventsViewer/Querying/Operators/LessOperator.cs
+++ b/DotnetEventsViewer/Querying/Operators/LessOperator.cs
@@ -1,6 +1,6 @@
 using EventPipe;
 
-namespace DotnetEventViewer.Querying.Operators;
+namespace DotnetEventsViewer.Querying.Operators;
 
 internal class LessOperator : IOperator
 {
diff --git a/DotnetEventsViewer/Querying/Operators/LessOrEqualOperator.cs b/DotnetEventsViewer/Querying/Operators/LessOrEqualOperator.cs
index ac1e9cf..8fb89b8 100644
--- a/DotnetEventsViewer/Querying/Operators/LessOrEqualOperator.cs
+++ b/DotnetEventsViewer/Querying/Operators/LessOrEqualOperator.cs
@@ -1,6 +1,6 @@
 using EventPipe;
 
-namespace DotnetEventViewer.Querying.Operators;
+namespace DotnetEventsViewer.Querying.Operators;
 
 internal class LessOrEqualOperator : IOperator
 {
diff --git a/DotnetEventsViewer/Querying/Operators/MatchOperator.cs b/DotnetEventsViewer/Querying/Operators/MatchOperator.cs
index d8659e8..1400c49 100644
--- a/DotnetEventsViewer/Querying/Operators/MatchOperator.cs
+++ b/DotnetEventsViewer/Querying/Operators/MatchOperator.cs
@@ -1,7 +1,7 @@
 using System.Text.RegularExpressions;
 using EventPipe;
 
-namespace DotnetEventViewer.Querying.Operators;
+namespace DotnetEventsViewer.Querying.Operators;
 
 internal class MatchOperator : IOperator
 {
diff --git a/DotnetEventsViewer/Querying/Operators/NotEqualOperator.cs b/DotnetEventsViewer/Querying/Operators/NotEqualOperator.cs
index 353be23..1d24b71 100644
--- a/DotnetEventsViewer/Querying/Operators/NotEqualOperator.cs
+++ b/DotnetEventsViewer/Querying/Operators/NotEqualOperator.cs
@@ -1,6 +1,6 @@
 using EventPipe;
 
-namespace DotnetEventViewer.Querying.Operators;
+namespace DotnetEventsViewer.Querying.Operators;
 
 internal class NotEqualOperator : IOperator
 {
diff --git a/DotnetEventsViewer/Querying/Operators/NotMatchOperator.cs b/DotnetEventsViewer/Querying/Operators/NotMatchOperator.cs
index f62a602..030d02e 100644
--- a/DotnetEventsViewer/Querying/Operators/NotMatchOperator.cs
+++ b/DotnetEventsViewer/Querying/Operators/NotMatchOperator.cs
@@ -1,7 +1,7 @@
 using System.Text.RegularExpressions;
 using EventPipe;
 
-namespace DotnetEventViewer.Querying.Operators;
+namespace DotnetEventsViewer.Querying.Operators;
 
 internal class NotMatchOperator : IOperator
 {
diff --git a/DotnetEventsViewer/Querying/Query.cs b/DotnetEventsViewer/Querying/Query.cs
index 33e88d4..96a60a7 100644
--- a/DotnetEventsViewer/Querying/Query.cs
+++ b/DotnetEventsViewer/Querying/Query.cs
@@ -1,7 +1,7 @@
-using DotnetEventViewer.CallTree.CountAggregators;
-using DotnetEventViewer.Models;
+using DotnetEventsViewer.CallTree.CountAggregators;
+using DotnetEventsViewer.Models;
 
-namespace DotnetEventViewer.Querying;
+namespace DotnetEventsViewer.Querying;
 
 internal class Query
 {
diff --git a/DotnetEventsViewer/Querying/QueryResult.cs b/DotnetEventsViewer/Querying/QueryResult.cs
index 1722c33..0dc48c0 100644
--- a/DotnetEventsViewer/Querying/QueryResult.cs
+++ b/DotnetEventsViewer/Querying/QueryResult.cs
@@ -1,7 +1,7 @@
-using DotnetEventViewer.CallTree.CountAggregators;
+using DotnetEventsViewer.CallTree.CountAggregators;
 using EventPipe;
 
-namespace DotnetEventViewer.Querying;
+namespace DotnetEventsViewer.Querying;
 
 public class QueryResult(
     IReadOnlyList<Event> filteredEvents,
diff --git a/DotnetEventsViewer/Querying/QueryType.cs b/DotnetEventsViewer/Querying/QueryType.cs
index d9c40ca..6e56a8b 100644
--- a/DotnetEventsViewer/Querying/QueryType.cs
+++ b/DotnetEventsViewer/Querying/QueryType.cs
@@ -1,4 +1,4 @@
-namespace DotnetEventViewer.Querying;
+namespace DotnetEventsViewer.Querying;
 
 /// <summary>
 /// An enum to give to the QueryBuilder to enable page-specific inputs.
diff --git a/DotnetEventsViewer/State/StateContainer.cs b/DotnetEventsViewer/State/StateContainer.cs
index d28b80d..72fdce0 100644
--- a/DotnetEventsViewer/State/StateContainer.cs
+++ b/DotnetEventsViewer/State/StateContainer.cs
@@ -1,8 +1,8 @@
-using DotnetEventViewer.Models;
-using DotnetEventViewer.Querying;
+using DotnetEventsViewer.Models;
+using DotnetEventsViewer.Querying;
 using EventPipe;
 
-namespace DotnetEventViewer.State;
+namespace DotnetEventsViewer.State;
 
 internal class StateContainer
 {
diff --git a/DotnetEventsViewer/_Imports.razor b/DotnetEventsViewer/_Imports.razor
index 1bf2287..5d350f8 100644
--- a/DotnetEventsViewer/_Imports.razor
+++ b/DotnetEventsViewer/_Imports.razor
@@ -7,5 +7,5 @@
 @using Microsoft.AspNetCore.Components.WebAssembly.Http
 @using Microsoft.FluentUI.AspNetCore.Components
 @using Microsoft.JSInterop
-@using DotnetEventViewer
-@using DotnetEventViewer.Layout
\ No newline at end of file
+@using DotnetEventsViewer
+@using DotnetEventsViewer.Layout
\ No newline at end of file
diff --git a/DotnetEventsViewer/wwwroot/index.html b/DotnetEventsViewer/wwwroot/index.html
index 982dde3..31f992f 100644
--- a/DotnetEventsViewer/wwwroot/index.html
+++ b/DotnetEventsViewer/wwwroot/index.html
@@ -6,12 +6,12 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="description" content=".NET performance analysis tool to inspect nettrace files generated with dotnet-trace.">
     <meta name="google-site-verification" content="trQFVZIpfTqHPQ2K4Gzq5sXf_ONII3cYrG_1qsLTtog" />
-    <title>DotnetEventViewer</title>
+    <title>.NET Events Viewer</title>
     <base href="/" />
     <link href="_content/Microsoft.FluentUI.AspNetCore.Components/css/reboot.css" rel="stylesheet" />
     <link rel="stylesheet" href="css/app.css" />
     <link rel="icon" type="image/png" href="favicon.ico" />
-    <link href="DotnetEventViewer.styles.css" rel="stylesheet" />
+    <link href="DotnetEventsViewer.styles.css" rel="stylesheet" />
 </head>
 
 <body>
diff --git a/README.md b/README.md
index da7a35f..203b9d8 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# .NET Event Viewer
+# .NET Events Viewer
 
 This tool is a modern alternative to [PerfView](https://github.com/microsoft/perfview) to analyze nettrace files collected
 from the .NET runtime's [EventPipe](https://learn.microsoft.com/en-us/dotnet/core/diagnostics/eventpipe) or through the tool