diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt
index ef03b7528e..cea59cacad 100644
--- a/.github/actions/spell-check/expect.txt
+++ b/.github/actions/spell-check/expect.txt
@@ -1025,8 +1025,6 @@ MYICON
 NAMECHANGE
 namespaceanddescendants
 nao
-Navigatable
-NavigatablePage
 NCACTIVATE
 ncc
 NCCALCSIZE
diff --git a/.github/actions/spell-check/patterns.txt b/.github/actions/spell-check/patterns.txt
index b07bd558db..255a7f984c 100644
--- a/.github/actions/spell-check/patterns.txt
+++ b/.github/actions/spell-check/patterns.txt
@@ -260,3 +260,7 @@ Process Process
 # ZoomIt menu items with accelerator keys
 E&xit
 St&yle
+
+# This matches a relative clause where the relative pronoun "that" is omitted.
+# Example: "Gets or sets the window the TitleBar should configure."
+\bthe\s+\w+\s+the\b
diff --git a/src/settings-ui/Settings.UI/Helpers/NavigatablePage.cs b/src/settings-ui/Settings.UI/Helpers/NavigablePage.cs
similarity index 98%
rename from src/settings-ui/Settings.UI/Helpers/NavigatablePage.cs
rename to src/settings-ui/Settings.UI/Helpers/NavigablePage.cs
index b52972c68e..3ddceb6311 100644
--- a/src/settings-ui/Settings.UI/Helpers/NavigatablePage.cs
+++ b/src/settings-ui/Settings.UI/Helpers/NavigablePage.cs
@@ -14,14 +14,14 @@ using Windows.UI;
 
 namespace Microsoft.PowerToys.Settings.UI.Helpers;
 
-public abstract partial class NavigatablePage : Page
+public abstract partial class NavigablePage : Page
 {
     private const int ExpandWaitDuration = 500;
     private const int AnimationDuration = 2000;
 
     private NavigationParams _pendingNavigationParams;
 
-    public NavigatablePage()
+    public NavigablePage()
     {
         Loaded += OnPageLoaded;
     }
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml
index 58552b1c00..28a28bf0b5 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.AdvancedPastePage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -12,7 +12,7 @@
     x:Name="RootPage"
     AutomationProperties.LandmarkType="Main"
     mc:Ignorable="d">
-    <local:NavigatablePage.Resources>
+    <local:NavigablePage.Resources>
         <ResourceDictionary>
             <ResourceDictionary.ThemeDictionaries>
                 <ResourceDictionary x:Key="Default">
@@ -38,7 +38,7 @@
                 </StackPanel>
             </DataTemplate>
         </ResourceDictionary>
-    </local:NavigatablePage.Resources>
+    </local:NavigablePage.Resources>
     <Grid>
         <controls:SettingsPageControl x:Uid="AdvancedPaste" ModuleImageSource="ms-appx:///Assets/Settings/Modules/AdvancedPaste.png">
             <controls:SettingsPageControl.ModuleContent>
@@ -425,4 +425,4 @@
             </StackPanel>
         </ContentDialog>
     </Grid>
-</local:NavigatablePage>
+</local:NavigablePage>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml.cs
index 095cb7167f..f5a38ec337 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml.cs
@@ -15,7 +15,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class AdvancedPastePage : NavigatablePage, IRefreshablePage
+    public sealed partial class AdvancedPastePage : NavigablePage, IRefreshablePage
     {
         private AdvancedPasteViewModel ViewModel { get; set; }
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml
index 0bd34a3d57..a5fec151fb 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.AlwaysOnTopPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -136,4 +136,4 @@
             <controls:PageLink x:Uid="LearnMore_AlwaysOnTop" Link="https://aka.ms/PowerToysOverview_AlwaysOnTop" />
         </controls:SettingsPageControl.PrimaryLinks>
     </controls:SettingsPageControl>
-</local:NavigatablePage>
+</local:NavigablePage>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml.cs
index d82ccb1917..c5d99e8e98 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml.cs
@@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class AlwaysOnTopPage : NavigatablePage, IRefreshablePage
+    public sealed partial class AlwaysOnTopPage : NavigablePage, IRefreshablePage
     {
         private AlwaysOnTopViewModel ViewModel { get; set; }
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml
index 5ccd1e4413..aa061fa4ba 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.AwakePage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -14,9 +14,9 @@
     AutomationProperties.LandmarkType="Main"
     mc:Ignorable="d">
 
-    <local:NavigatablePage.Resources>
+    <local:NavigablePage.Resources>
         <converters:AwakeModeToIntConverter x:Key="AwakeModeToIntConverter" />
-    </local:NavigatablePage.Resources>
+    </local:NavigablePage.Resources>
 
     <controls:SettingsPageControl
         x:Uid="Awake"
@@ -119,4 +119,4 @@
             <controls:PageLink x:Uid="SecondaryLink_Awake" Link="https://awake.den.dev" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
-</local:NavigatablePage>
+</local:NavigablePage>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml.cs
index cd085a2053..c8cca0c1b3 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml.cs
@@ -17,7 +17,7 @@ using PowerToys.GPOWrapper;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class AwakePage : NavigatablePage, IRefreshablePage
+    public sealed partial class AwakePage : NavigablePage, IRefreshablePage
     {
         private readonly string _appName = "Awake";
         private readonly SettingsUtils _settingsUtils;
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdNotFoundPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdNotFoundPage.xaml
index aad05be69e..27a2c8cb7f 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdNotFoundPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdNotFoundPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.CmdNotFoundPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -170,4 +170,4 @@
             <controls:PageLink x:Uid="LearnMore_CmdNotFound" Link="https://aka.ms/PowerToysOverview_CmdNotFound" />
         </controls:SettingsPageControl.PrimaryLinks>
     </controls:SettingsPageControl>
-</local:NavigatablePage>
+</local:NavigablePage>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdNotFoundPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdNotFoundPage.xaml.cs
index 6f406d669c..43b6dd74fe 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdNotFoundPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdNotFoundPage.xaml.cs
@@ -8,7 +8,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class CmdNotFoundPage : NavigatablePage
+    public sealed partial class CmdNotFoundPage : NavigablePage
     {
         private CmdNotFoundViewModel ViewModel { get; set; }
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml
index 23b41af139..8aa159c5a2 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.CmdPalPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -52,4 +52,4 @@
             <controls:PageLink x:Uid="LearnMore_CmdPal" Link="https://aka.ms/PowerToysOverview_CmdPal" />
         </controls:SettingsPageControl.PrimaryLinks>
     </controls:SettingsPageControl>
-</local:NavigatablePage>
+</local:NavigablePage>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml.cs
index 1cc7e411d3..145fc9b592 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml.cs
@@ -13,7 +13,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class CmdPalPage : NavigatablePage, IRefreshablePage
+    public sealed partial class CmdPalPage : NavigablePage, IRefreshablePage
     {
         private CmdPalViewModel ViewModel { get; set; }
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml
index 66b5c2d404..319a783759 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.ColorPickerPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -232,4 +232,4 @@
             <controls:PageLink Link="https://medium.com/@Niels9001/a-fluent-color-meter-for-powertoys-20407ededf0c" Text="Niels Laute's UX concept" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
-</local:NavigatablePage>
\ No newline at end of file
+</local:NavigablePage>
\ No newline at end of file
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml.cs
index b80b35028f..9e0ba6be07 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml.cs
@@ -15,7 +15,7 @@ using Microsoft.Windows.ApplicationModel.Resources;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class ColorPickerPage : NavigatablePage, IRefreshablePage
+    public sealed partial class ColorPickerPage : NavigablePage, IRefreshablePage
     {
         public ColorPickerViewModel ViewModel { get; set; }
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/CropAndLockPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/CropAndLockPage.xaml
index 704db65d56..d6e0558c18 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/CropAndLockPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/CropAndLockPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.CropAndLockPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -66,4 +66,4 @@
             <controls:PageLink Link="https://github.com/kevinguo305" Text="Kevin Guo" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
-</local:NavigatablePage>
+</local:NavigablePage>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/CropAndLockPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/CropAndLockPage.xaml.cs
index de03d90635..67ef238645 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/CropAndLockPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/CropAndLockPage.xaml.cs
@@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class CropAndLockPage : NavigatablePage, IRefreshablePage
+    public sealed partial class CropAndLockPage : NavigablePage, IRefreshablePage
     {
         private CropAndLockViewModel ViewModel { get; set; }
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml
index c65a84ea62..2d19726f10 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.DashboardPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -14,7 +14,7 @@
     AutomationProperties.LandmarkType="Main"
     DataContext="DashboardViewModel"
     mc:Ignorable="d">
-    <local:NavigatablePage.Resources>
+    <local:NavigablePage.Resources>
         <converters:ModuleItemTemplateSelector
             x:Key="ModuleItemTemplateSelector"
             ActivationTemplate="{StaticResource ModuleItemActivationTemplate}"
@@ -74,7 +74,7 @@
                     TextWrapping="WrapWholeWords" />
             </Grid>
         </DataTemplate>
-    </local:NavigatablePage.Resources>
+    </local:NavigablePage.Resources>
     <Grid Margin="16,0,0,0" RowSpacing="12">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
@@ -363,4 +363,4 @@
             </VisualStateGroup>
         </VisualStateManager.VisualStateGroups>
     </Grid>
-</local:NavigatablePage>
+</local:NavigablePage>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml.cs
index 66f89abec4..a06e5838a4 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml.cs
@@ -20,7 +20,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
     /// <summary>
     /// Dashboard Settings Page.
     /// </summary>
-    public sealed partial class DashboardPage : NavigatablePage, IRefreshablePage
+    public sealed partial class DashboardPage : NavigablePage, IRefreshablePage
     {
         /// <summary>
         /// Gets or sets view model.
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/EnvironmentVariablesPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/EnvironmentVariablesPage.xaml
index 12c0d04f45..b8b1f54e56 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/EnvironmentVariablesPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/EnvironmentVariablesPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.EnvironmentVariablesPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -53,4 +53,4 @@
             <controls:PageLink x:Uid="LearnMore_EnvironmentVariables" Link="https://aka.ms/PowerToysOverview_EnvironmentVariables" />
         </controls:SettingsPageControl.PrimaryLinks>
     </controls:SettingsPageControl>
-</local:NavigatablePage>
+</local:NavigablePage>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/EnvironmentVariablesPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/EnvironmentVariablesPage.xaml.cs
index 57512856e8..0772869249 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/EnvironmentVariablesPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/EnvironmentVariablesPage.xaml.cs
@@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class EnvironmentVariablesPage : NavigatablePage, IRefreshablePage
+    public sealed partial class EnvironmentVariablesPage : NavigablePage, IRefreshablePage
     {
         private EnvironmentVariablesViewModel ViewModel { get; }
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml
index f028ba55a1..9c3e4be919 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.FancyZonesPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -299,4 +299,4 @@
             <controls:PageLink x:Uid="LearnMore_FancyZones" Link="https://aka.ms/PowerToysOverview_FancyZones" />
         </controls:SettingsPageControl.PrimaryLinks>
     </controls:SettingsPageControl>
-</local:NavigatablePage>
\ No newline at end of file
+</local:NavigablePage>
\ No newline at end of file
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml.cs
index 93296699f6..e1d7f7ea4b 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml.cs
@@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class FancyZonesPage : NavigatablePage, IRefreshablePage
+    public sealed partial class FancyZonesPage : NavigablePage, IRefreshablePage
     {
         private FancyZonesViewModel ViewModel { get; set; }
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml
index 7f3741df41..0aac4c411a 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.FileLocksmithPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -53,4 +53,4 @@
             <controls:PageLink x:Uid="LearnMore_FileLocksmith" Link="https://aka.ms/PowerToysOverview_FileLocksmith" />
         </controls:SettingsPageControl.PrimaryLinks>
     </controls:SettingsPageControl>
-</local:NavigatablePage>
+</local:NavigablePage>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml.cs
index 3e0a642718..6020917b69 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml.cs
@@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class FileLocksmithPage : NavigatablePage, IRefreshablePage
+    public sealed partial class FileLocksmithPage : NavigablePage, IRefreshablePage
     {
         private FileLocksmithViewModel ViewModel { get; set; }
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
index 7658d11237..e06d367941 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.GeneralPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -12,10 +12,10 @@
     AutomationProperties.LandmarkType="Main"
     mc:Ignorable="d">
 
-    <local:NavigatablePage.Resources>
+    <local:NavigablePage.Resources>
         <converters:UpdateStateToBoolConverter x:Key="UpdateStateToBoolConverter" />
         <converters:StringToInfoBarSeverityConverter x:Key="StringToInfoBarSeverityConverter" />
-    </local:NavigatablePage.Resources>
+    </local:NavigablePage.Resources>
 
     <controls:SettingsPageControl x:Uid="General" ModuleImageSource="ms-appx:///Assets/Settings/Modules/PT.png">
         <controls:SettingsPageControl.ModuleContent>
@@ -517,4 +517,4 @@
             <controls:PageLink x:Uid="OpenSource_Notice" Link="https://github.com/microsoft/PowerToys/blob/main/NOTICE.md" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
-</local:NavigatablePage>
+</local:NavigablePage>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml.cs
index 1d6f83a7e0..56eb73c6ef 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml.cs
@@ -19,7 +19,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
     /// <summary>
     /// General Settings Page.
     /// </summary>
-    public sealed partial class GeneralPage : NavigatablePage, IRefreshablePage
+    public sealed partial class GeneralPage : NavigablePage, IRefreshablePage
     {
         private static DateTime OkToHideBackupAndRestoreMessageTime { get; set; }
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml
index 9800fb60a3..e5a2d29dcd 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.HostsPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -86,4 +86,4 @@
             <controls:PageLink x:Uid="LearnMore_Hosts" Link="https://aka.ms/PowerToysOverview_HostsFileEditor" />
         </controls:SettingsPageControl.PrimaryLinks>
     </controls:SettingsPageControl>
-</local:NavigatablePage>
+</local:NavigablePage>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml.cs
index 9c3f883bbd..72de0843d1 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml.cs
@@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class HostsPage : NavigatablePage, IRefreshablePage
+    public sealed partial class HostsPage : NavigablePage, IRefreshablePage
     {
         private HostsViewModel ViewModel { get; }
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml
index fa4526bae0..a8fc6b1e8a 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.ImageResizerPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -14,7 +14,7 @@
     x:Name="RootPage"
     AutomationProperties.LandmarkType="Main"
     mc:Ignorable="d">
-    <local:NavigatablePage.Resources>
+    <local:NavigablePage.Resources>
         <converters:ImageResizerFitToStringConverter x:Key="ImageResizerFitToStringConverter" />
         <converters:ImageResizerFitToIntConverter x:Key="ImageResizerFitToIntConverter" />
         <converters:ImageResizerUnitToStringConverter x:Key="ImageResizerUnitToStringConverter" />
@@ -27,7 +27,7 @@
             x:Key="BoolToComboBoxIndexConverter"
             FalseValue="1"
             TrueValue="0" />
-    </local:NavigatablePage.Resources>
+    </local:NavigablePage.Resources>
     <controls:SettingsPageControl x:Uid="ImageResizer" ModuleImageSource="ms-appx:///Assets/Settings/Modules/ImageResizer.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}">
@@ -303,4 +303,4 @@
             <controls:PageLink Link="https://github.com/bricelam/ImageResizer/" Text="Brice Lambson's ImageResizer" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
-</local:NavigatablePage>
\ No newline at end of file
+</local:NavigablePage>
\ No newline at end of file
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml.cs
index 12763c0899..18e1aacc15 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml.cs
@@ -14,7 +14,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class ImageResizerPage : NavigatablePage, IRefreshablePage
+    public sealed partial class ImageResizerPage : NavigablePage, IRefreshablePage
     {
         public ImageResizerViewModel ViewModel { get; set; }
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml
index 188d75314d..fdcfbde924 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.KeyboardManagerPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -13,7 +13,7 @@
     AutomationProperties.LandmarkType="Main"
     mc:Ignorable="d">
 
-    <local:NavigatablePage.Resources>
+    <local:NavigablePage.Resources>
         <tkconverters:CollectionVisibilityConverter x:Key="CollectionVisibilityConverter" />
         <Style x:Name="KeysListViewContainerStyle" TargetType="ListViewItem">
             <Setter Property="IsTabStop" Value="False" />
@@ -51,7 +51,7 @@
                 Height="56">
 
         </DataTemplate>-->
-    </local:NavigatablePage.Resources>
+    </local:NavigablePage.Resources>
 
     <controls:SettingsPageControl x:Uid="KeyboardManager" ModuleImageSource="ms-appx:///Assets/Settings/Modules/KBM.png">
         <controls:SettingsPageControl.ModuleContent>
@@ -235,4 +235,4 @@
             <controls:PageLink x:Uid="LearnMore_KBM" Link="https://aka.ms/PowerToysOverview_KeyboardManager" />
         </controls:SettingsPageControl.PrimaryLinks>
     </controls:SettingsPageControl>
-</local:NavigatablePage>
+</local:NavigablePage>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml.cs
index 9b4165cee7..e32f5aa9cb 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml.cs
@@ -18,7 +18,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
     /// <summary>
     /// An empty page that can be used on its own or navigated to within a Frame.
     /// </summary>
-    public sealed partial class KeyboardManagerPage : NavigatablePage, IRefreshablePage
+    public sealed partial class KeyboardManagerPage : NavigablePage, IRefreshablePage
     {
         private const string PowerToyName = "Keyboard Manager";
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml
index c063ae94d7..4416ec3ee0 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.MeasureToolPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -108,4 +108,4 @@
             <controls:PageLink x:Uid="Attribution_Rooler" Link="https://github.com/peteblois/rooler" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
-</local:NavigatablePage>
+</local:NavigablePage>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml.cs
index 238084653b..bf516b557b 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml.cs
@@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class MeasureToolPage : NavigatablePage, IRefreshablePage
+    public sealed partial class MeasureToolPage : NavigablePage, IRefreshablePage
     {
         private MeasureToolViewModel ViewModel { get; set; }
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml
index c92350f39b..4144abef1e 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.MouseUtilsPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -13,13 +13,13 @@
     xmlns:ui="using:CommunityToolkit.WinUI"
     AutomationProperties.LandmarkType="Main"
     mc:Ignorable="d">
-    <local:NavigatablePage.Resources>
+    <local:NavigablePage.Resources>
         <converters:IndexBitFieldToVisibilityConverter x:Key="IndexBitFieldToVisibilityConverter" />
         <tkconverters:BoolToVisibilityConverter
             x:Key="BoolToInvertedVisibilityConverter"
             FalseValue="Visible"
             TrueValue="Collapsed" />
-    </local:NavigatablePage.Resources>
+    </local:NavigablePage.Resources>
     <controls:SettingsPageControl x:Uid="MouseUtils" ModuleImageSource="ms-appx:///Assets/Settings/Modules/MouseUtils.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
@@ -423,4 +423,4 @@
             <controls:PageLink Link="https://michael-clayton.com/projects/fancymouse" Text="Michael Clayton's Mouse Jump (FancyMouse)" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
-</local:NavigatablePage>
+</local:NavigablePage>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml.cs
index d7edadef7f..e07795ac6a 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml.cs
@@ -12,7 +12,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class MouseUtilsPage : NavigatablePage, IRefreshablePage
+    public sealed partial class MouseUtilsPage : NavigablePage, IRefreshablePage
     {
         private MouseUtilsViewModel ViewModel { get; set; }
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml
index 4bc61f60ab..cc47dd5808 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.MouseWithoutBordersPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -11,13 +11,13 @@
     xmlns:ui="using:CommunityToolkit.WinUI"
     AutomationProperties.LandmarkType="Main"
     mc:Ignorable="d">
-    <local:NavigatablePage.Resources>
+    <local:NavigablePage.Resources>
         <converters:BoolToVisibilityConverter x:Key="negativeBoolToVisibilityConverter" />
         <converters:BoolToObjectConverter
             x:Key="OneRowMatrixBoolToNumberOfRowsConverter"
             FalseValue="2"
             TrueValue="4" />
-    </local:NavigatablePage.Resources>
+    </local:NavigablePage.Resources>
     <controls:SettingsPageControl x:Uid="MouseWithoutBorders" ModuleImageSource="ms-appx:///Assets/Settings/Modules/MouseWithoutBorders.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel Orientation="Vertical">
@@ -524,4 +524,4 @@
             <controls:PageLink Link="https://github.com/microsoft/PowerToys/blob/main/COMMUNITY.md#mouse-without-borders-original-contributors" Text="Truong Do (Đỗ Đức Trường) and other original contributors" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
-</local:NavigatablePage>
+</local:NavigablePage>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml.cs
index 7d26003d4d..296a9a3deb 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml.cs
@@ -21,7 +21,7 @@ using static Microsoft.PowerToys.Settings.UI.ViewModels.MouseWithoutBordersViewM
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class MouseWithoutBordersPage : NavigatablePage, IRefreshablePage
+    public sealed partial class MouseWithoutBordersPage : NavigablePage, IRefreshablePage
     {
         private const string MouseWithoutBordersDragDropCheckString = "MWB Device Drag Drop";
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/NewPlusPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/NewPlusPage.xaml
index c5cbd30341..2a3c57ede5 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/NewPlusPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/NewPlusPage.xaml
@@ -1,4 +1,4 @@
-<helper:NavigatablePage
+<helper:NavigablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.NewPlusPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -215,4 +215,4 @@
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
 
-</helper:NavigatablePage>
+</helper:NavigablePage>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/NewPlusPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/NewPlusPage.xaml.cs
index 8195d4014b..daa4dca2b5 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/NewPlusPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/NewPlusPage.xaml.cs
@@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class NewPlusPage : NavigatablePage, IRefreshablePage
+    public sealed partial class NewPlusPage : NavigablePage, IRefreshablePage
     {
         private NewPlusViewModel ViewModel { get; set; }
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PeekPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PeekPage.xaml
index 052f9f7c51..f988f8917d 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PeekPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PeekPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.PeekPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -104,4 +104,4 @@
             <controls:PageLink x:Uid="LearnMore_Peek" Link="https://aka.ms/PowerToysOverview_Peek" />
         </controls:SettingsPageControl.PrimaryLinks>
     </controls:SettingsPageControl>
-</local:NavigatablePage>
+</local:NavigablePage>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PeekPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/PeekPage.xaml.cs
index d4e115db9c..1a845e25ec 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PeekPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PeekPage.xaml.cs
@@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class PeekPage : NavigatablePage, IRefreshablePage
+    public sealed partial class PeekPage : NavigablePage, IRefreshablePage
     {
         private PeekViewModel ViewModel { get; set; }
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml
index 37b99fbb14..b29c282527 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.PowerAccentPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -11,7 +11,7 @@
     xmlns:ui="using:CommunityToolkit.WinUI"
     AutomationProperties.LandmarkType="Main"
     mc:Ignorable="d">
-    <local:NavigatablePage.Resources>
+    <local:NavigablePage.Resources>
         <CollectionViewSource
             x:Name="LanguagesCustomViewSource"
             IsSourceGrouped="True"
@@ -19,7 +19,7 @@
         <DataTemplate x:Key="LanguageViewTemplate" x:DataType="Lib:PowerAccentLanguageModel">
             <TextBlock Text="{x:Bind Language}" />
         </DataTemplate>
-    </local:NavigatablePage.Resources>
+    </local:NavigablePage.Resources>
 
     <controls:SettingsPageControl
         x:Uid="QuickAccent"
@@ -241,4 +241,4 @@
             <controls:PageLink Link="https://github.com/damienleroy/PowerAccent" Text="Damien Leroy's PowerAccent" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
-</local:NavigatablePage>
+</local:NavigablePage>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml.cs
index d5232dd49b..fa666dd242 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml.cs
@@ -11,7 +11,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class PowerAccentPage : NavigatablePage, IRefreshablePage
+    public sealed partial class PowerAccentPage : NavigablePage, IRefreshablePage
     {
         private PowerAccentViewModel ViewModel { get; set; }
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml
index 6625753015..f2fde82e12 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.PowerLauncherPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -15,7 +15,7 @@
     AutomationProperties.LandmarkType="Main"
     mc:Ignorable="d">
 
-    <local:NavigatablePage.Resources>
+    <local:NavigablePage.Resources>
         <Style x:Key="OptionSeparator" TargetType="Rectangle">
             <Setter Property="Height" Value="1" />
             <Setter Property="HorizontalAlignment" Value="Stretch" />
@@ -304,7 +304,7 @@
         <DataTemplate x:Key="EmptyTemplate" x:DataType="viewModels:PluginAdditionalOptionViewModel">
             <StackPanel HorizontalAlignment="Stretch" Orientation="Vertical" />
         </DataTemplate>
-    </local:NavigatablePage.Resources>
+    </local:NavigablePage.Resources>
 
     <controls:SettingsPageControl x:Uid="PowerLauncher" ModuleImageSource="ms-appx:///Assets/Settings/Modules/Run.png">
         <controls:SettingsPageControl.ModuleContent>
@@ -816,4 +816,4 @@
             <controls:PageLink Link="https://github.com/betsegaw/windowwalker/" Text="Beta Tadele's Window Walker" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
-</local:NavigatablePage>
+</local:NavigablePage>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml.cs
index 737a828152..c734535d49 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml.cs
@@ -15,7 +15,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class PowerLauncherPage : NavigatablePage, IRefreshablePage
+    public sealed partial class PowerLauncherPage : NavigablePage, IRefreshablePage
     {
         public PowerLauncherViewModel ViewModel { get; set; }
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml
index 971af90d0e..7fae01e5e5 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.PowerOcrPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -79,4 +79,4 @@
             <controls:PageLink Link="https://github.com/TheJoeFin/Text-Grab" Text="Based upon Joseph Finney's Text Grab" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
-</local:NavigatablePage>
+</local:NavigablePage>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml.cs
index 16091e635d..27769b92ce 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml.cs
@@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class PowerOcrPage : NavigatablePage, IRefreshablePage
+    public sealed partial class PowerOcrPage : NavigablePage, IRefreshablePage
     {
         private PowerOcrViewModel ViewModel { get; set; }
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerPreviewPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerPreviewPage.xaml
index 3d38216bfe..a6b44dfdf7 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerPreviewPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerPreviewPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.PowerPreviewPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -289,4 +289,4 @@
             <controls:PageLink Link="https://www.pedrolamas.com" Text="Pedro Lamas's work on G-Code, Binary G-Code, STL, and QOI" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
-</local:NavigatablePage>
+</local:NavigablePage>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerPreviewPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerPreviewPage.xaml.cs
index 37d28a1bea..9d56c686e3 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerPreviewPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerPreviewPage.xaml.cs
@@ -12,7 +12,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
     /// <summary>
     /// An empty page that can be used on its own or navigated to within a Frame.
     /// </summary>
-    public sealed partial class PowerPreviewPage : NavigatablePage
+    public sealed partial class PowerPreviewPage : NavigablePage
     {
         public PowerPreviewViewModel ViewModel { get; set; }
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml
index 56817c5305..5002b97420 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.PowerRenamePage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -100,4 +100,4 @@
             <controls:PageLink Link="https://github.com/chrdavis/SmartRename" Text="Chris Davis's SmartRenamer" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
-</local:NavigatablePage>
+</local:NavigablePage>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml.cs
index b5866f8089..d97b83c499 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml.cs
@@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class PowerRenamePage : NavigatablePage, IRefreshablePage
+    public sealed partial class PowerRenamePage : NavigablePage, IRefreshablePage
     {
         private PowerRenameViewModel ViewModel { get; set; }
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/RegistryPreviewPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/RegistryPreviewPage.xaml
index 0eb1052b2e..57340c4cfa 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/RegistryPreviewPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/RegistryPreviewPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.RegistryPreviewPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -57,4 +57,4 @@
             <controls:PageLink x:Uid="LearnMore_RegistryPreview" Link="https://aka.ms/PowerToysOverview_RegistryPreview" />
         </controls:SettingsPageControl.PrimaryLinks>
     </controls:SettingsPageControl>
-</local:NavigatablePage>
+</local:NavigablePage>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/RegistryPreviewPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/RegistryPreviewPage.xaml.cs
index c86812e395..8c1ed319a3 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/RegistryPreviewPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/RegistryPreviewPage.xaml.cs
@@ -8,7 +8,7 @@ using Microsoft.PowerToys.Settings.UI.ViewModels;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class RegistryPreviewPage : NavigatablePage, IRefreshablePage
+    public sealed partial class RegistryPreviewPage : NavigablePage, IRefreshablePage
     {
         private RegistryPreviewViewModel ViewModel { get; set; }
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml
index 5800340678..b2465da218 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.ShortcutGuidePage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -136,4 +136,4 @@
             <controls:PageLink x:Uid="LearnMore_ShortcutGuide" Link="https://aka.ms/PowerToysOverview_ShortcutGuide" />
         </controls:SettingsPageControl.PrimaryLinks>
     </controls:SettingsPageControl>
-</local:NavigatablePage>
\ No newline at end of file
+</local:NavigablePage>
\ No newline at end of file
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml.cs
index 9873bfad20..ffca0184c7 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml.cs
@@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class ShortcutGuidePage : NavigatablePage, IRefreshablePage
+    public sealed partial class ShortcutGuidePage : NavigablePage, IRefreshablePage
     {
         private ShortcutGuideViewModel ViewModel { get; set; }
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/WorkspacesPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/WorkspacesPage.xaml
index b8e213a32a..8aeaa29221 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/WorkspacesPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/WorkspacesPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.WorkspacesPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -57,4 +57,4 @@
             <controls:PageLink x:Uid="LearnMore_Workspaces" Link="https://aka.ms/PowerToysOverview_Workspaces" />
         </controls:SettingsPageControl.PrimaryLinks>
     </controls:SettingsPageControl>
-</local:NavigatablePage>
+</local:NavigablePage>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/WorkspacesPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/WorkspacesPage.xaml.cs
index af06f58fc5..0b0ca571c4 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/WorkspacesPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/WorkspacesPage.xaml.cs
@@ -9,7 +9,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class WorkspacesPage : NavigatablePage, IRefreshablePage
+    public sealed partial class WorkspacesPage : NavigablePage, IRefreshablePage
     {
         private WorkspacesViewModel ViewModel { get; set; }
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/ZoomItPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/ZoomItPage.xaml
index 344299d709..87c1bb505d 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ZoomItPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ZoomItPage.xaml
@@ -1,4 +1,4 @@
-<local:NavigatablePage
+<local:NavigablePage
     x:Class="Microsoft.PowerToys.Settings.UI.Views.ZoomItPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -12,10 +12,10 @@
     AutomationProperties.LandmarkType="Main"
     mc:Ignorable="d">
 
-    <local:NavigatablePage.Resources>
+    <local:NavigablePage.Resources>
         <converters:ZoomItInitialZoomConverter x:Key="ZoomItInitialZoomConverter" />
         <converters:ZoomItTypeSpeedSliderConverter x:Key="ZoomItTypeSpeedSliderConverter" />
-    </local:NavigatablePage.Resources>
+    </local:NavigablePage.Resources>
 
     <controls:SettingsPageControl
         x:Uid="ZoomIt"
@@ -275,4 +275,4 @@
             <controls:PageLink Link="https://learn.microsoft.com/en-us/sysinternals/downloads/zoomit" Text="Sysinternals Zoomit by Mark Russinovich, Alex Mihaiuc, John Stephens" />
         </controls:SettingsPageControl.SecondaryLinks>
     </controls:SettingsPageControl>
-</local:NavigatablePage>
+</local:NavigablePage>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/ZoomItPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/ZoomItPage.xaml.cs
index 2e984b2804..9018eb64e8 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ZoomItPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ZoomItPage.xaml.cs
@@ -12,7 +12,7 @@ using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class ZoomItPage : NavigatablePage, IRefreshablePage
+    public sealed partial class ZoomItPage : NavigablePage, IRefreshablePage
     {
         private ZoomItViewModel ViewModel { get; set; }