diff --git a/Harmonia.WinUI/Session/ApplicationSession.cs b/Harmonia.WinUI/Session/ApplicationSession.cs
index 0731796..eed406c 100644
--- a/Harmonia.WinUI/Session/ApplicationSession.cs
+++ b/Harmonia.WinUI/Session/ApplicationSession.cs
@@ -2,9 +2,9 @@
 
 public partial class ApplicationSession
 {
-    public WindowSession Window { get; set; } = new();
-    public NavigationSession Navigation { get; set; } = new();
-    public AudioLibrarySession Library { get; set; } = new();
-    public AudioPlayerSession Player { get; set; } = new();
-    public PlaylistSession Playlist { get; set; } = new();
+    public WindowState Window { get; set; } = new();
+    public NavigationState Navigation { get; set; } = new();
+    public AudioLibraryState Library { get; set; } = new();
+    public AudioPlayerState Player { get; set; } = new();
+    public PlaylistState Playlist { get; set; } = new();
 }
\ No newline at end of file
diff --git a/Harmonia.WinUI/Session/AudioLibrarySession.cs b/Harmonia.WinUI/Session/AudioLibraryState.cs
similarity index 81%
rename from Harmonia.WinUI/Session/AudioLibrarySession.cs
rename to Harmonia.WinUI/Session/AudioLibraryState.cs
index 1171597..20c9818 100644
--- a/Harmonia.WinUI/Session/AudioLibrarySession.cs
+++ b/Harmonia.WinUI/Session/AudioLibraryState.cs
@@ -1,6 +1,6 @@
 namespace Harmonia.WinUI.Session;
 
-public partial class AudioLibrarySession
+public partial class AudioLibraryState
 {
     public string? FlexViewType { get; set; }
     public string? LibraryViewType { get; set; }
diff --git a/Harmonia.WinUI/Session/AudioPlayerSession.cs b/Harmonia.WinUI/Session/AudioPlayerState.cs
similarity index 90%
rename from Harmonia.WinUI/Session/AudioPlayerSession.cs
rename to Harmonia.WinUI/Session/AudioPlayerState.cs
index 519a3e5..2f9d113 100644
--- a/Harmonia.WinUI/Session/AudioPlayerSession.cs
+++ b/Harmonia.WinUI/Session/AudioPlayerState.cs
@@ -1,6 +1,6 @@
 namespace Harmonia.WinUI.Session;
 
-public partial class AudioPlayerSession
+public partial class AudioPlayerState
 {
     public string? PlaylistUID { get; set; }
     public string? PlaylistSongUID { get; set; }
diff --git a/Harmonia.WinUI/Session/NavigationSession.cs b/Harmonia.WinUI/Session/NavigationState.cs
similarity index 68%
rename from Harmonia.WinUI/Session/NavigationSession.cs
rename to Harmonia.WinUI/Session/NavigationState.cs
index e6a6cf3..fbbf58f 100644
--- a/Harmonia.WinUI/Session/NavigationSession.cs
+++ b/Harmonia.WinUI/Session/NavigationState.cs
@@ -1,6 +1,6 @@
 namespace Harmonia.WinUI.Session;
 
-public partial class NavigationSession
+public partial class NavigationState
 {
     public string? CurrentPage { get; set; }
 }
\ No newline at end of file
diff --git a/Harmonia.WinUI/Session/PlaylistSession.cs b/Harmonia.WinUI/Session/PlaylistState.cs
similarity index 70%
rename from Harmonia.WinUI/Session/PlaylistSession.cs
rename to Harmonia.WinUI/Session/PlaylistState.cs
index 7497902..892591d 100644
--- a/Harmonia.WinUI/Session/PlaylistSession.cs
+++ b/Harmonia.WinUI/Session/PlaylistState.cs
@@ -1,6 +1,6 @@
 namespace Harmonia.WinUI.Session;
 
-public partial class PlaylistSession
+public partial class PlaylistState
 {
     public string? OpenPlaylistUID { get; set; }
 }
\ No newline at end of file
diff --git a/Harmonia.WinUI/Session/WindowSession.cs b/Harmonia.WinUI/Session/WindowState.cs
similarity index 70%
rename from Harmonia.WinUI/Session/WindowSession.cs
rename to Harmonia.WinUI/Session/WindowState.cs
index 893e427..7423dd2 100644
--- a/Harmonia.WinUI/Session/WindowSession.cs
+++ b/Harmonia.WinUI/Session/WindowState.cs
@@ -1,6 +1,6 @@
 namespace Harmonia.WinUI.Session;
 
-public partial class WindowSession
+public partial class WindowState
 {
     public bool IsMaximized { get; set; }
 }
\ No newline at end of file