diff --git a/src/BizHawk.Client.Common/savestates/SavestateManager.cs b/src/BizHawk.Client.Common/savestates/SavestateFile.cs
similarity index 94%
rename from src/BizHawk.Client.Common/savestates/SavestateManager.cs
rename to src/BizHawk.Client.Common/savestates/SavestateFile.cs
index 91dc5cbf41..c3793e92cf 100644
--- a/src/BizHawk.Client.Common/savestates/SavestateManager.cs
+++ b/src/BizHawk.Client.Common/savestates/SavestateFile.cs
@@ -7,9 +7,12 @@ using BizHawk.Emulation.Common;
 
 namespace BizHawk.Client.Common
 {
-	public static class SavestateManager
+	/// <summary>
+	/// Represents an aggregated savestate file that includes core, movie, and other related data
+	/// </summary>
+	public static class SavestateFile
 	{
-		public static void SaveStateFile(IEmulator emulator, string filename, SaveStateConfig config)
+		public static void Create(IEmulator emulator, string filename, SaveStateConfig config)
 		{
 			var core = emulator.AsStatable();
 
@@ -96,7 +99,7 @@ namespace BizHawk.Client.Common
 			}
 		}
 
-		public static bool LoadStateFile(IEmulator emulator, string path)
+		public static bool Load(IEmulator emulator, string path)
 		{
 			var core = emulator.AsStatable();
 
diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs
index 1256ebf7d0..25b8f01da3 100644
--- a/src/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/src/BizHawk.Client.EmuHawk/MainForm.cs
@@ -3983,7 +3983,7 @@ namespace BizHawk.Client.EmuHawk
 				return;
 			}
 
-			if (SavestateManager.LoadStateFile(Emulator, path))
+			if (SavestateFile.Load(Emulator, path))
 			{
 				GlobalWin.OSD.ClearGuiText();
 				ClientApi.OnStateLoaded(this, userFriendlyStateName);
@@ -4060,7 +4060,7 @@ namespace BizHawk.Client.EmuHawk
 
 			try
 			{
-				SavestateManager.SaveStateFile(Emulator, path, Config.Savestates);
+				SavestateFile.Create(Emulator, path, Config.Savestates);
 
 				ClientApi.OnStateSaved(this, userFriendlyStateName);