diff --git a/BizHawk.Client.EmuHawk/MainForm.Movie.cs b/BizHawk.Client.EmuHawk/MainForm.Movie.cs
index 6e31bb84c3..3ca164bcd7 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Movie.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Movie.cs
@@ -106,34 +106,23 @@ namespace BizHawk.Client.EmuHawk
 
 		public void SetMainformMovieInfo()
 		{
-			// TODO: this shoudln't be here it is copy paste from MainForm LoadRom
-			string gamename = string.Empty;
-			if (!string.IsNullOrWhiteSpace(Global.Game.Name)) // Prefer Game db name, else use the path
-			{
-				gamename = Global.Game.Name;
-			}
-			else
-			{
-				gamename = Path.GetFileNameWithoutExtension(GlobalWin.MainForm.CurrentlyOpenRom.Split('|').Last());
-			}
-
 			if (Global.MovieSession.Movie.IsPlaying)
 			{
-				Text = DisplayNameForSystem(Global.Game.System) + " - " + gamename + " - " + Path.GetFileName(Global.MovieSession.Movie.Filename);
+				Text = DisplayNameForSystem(Global.Game.System) + " - " + Global.Game.Name + " - " + Path.GetFileName(Global.MovieSession.Movie.Filename);
 				PlayRecordStatusButton.Image = Properties.Resources.Play;
 				PlayRecordStatusButton.ToolTipText = "Movie is in playback mode";
 				PlayRecordStatusButton.Visible = true;
 			}
 			else if (Global.MovieSession.Movie.IsRecording)
 			{
-				Text = DisplayNameForSystem(Global.Game.System) + " - " + gamename + " - " + Path.GetFileName(Global.MovieSession.Movie.Filename);
+				Text = DisplayNameForSystem(Global.Game.System) + " - " + Global.Game.Name + " - " + Path.GetFileName(Global.MovieSession.Movie.Filename);
 				PlayRecordStatusButton.Image = Properties.Resources.RecordHS;
 				PlayRecordStatusButton.ToolTipText = "Movie is in record mode";
 				PlayRecordStatusButton.Visible = true;
 			}
 			else if (!Global.MovieSession.Movie.IsActive)
 			{
-				Text = DisplayNameForSystem(Global.Game.System) + " - " + gamename;
+				Text = DisplayNameForSystem(Global.Game.System) + " - " + Global.Game.Name;
 				PlayRecordStatusButton.Image = Properties.Resources.Blank;
 				PlayRecordStatusButton.ToolTipText = "No movie is active";
 				PlayRecordStatusButton.Visible = false;
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index b1d35941b7..b0df555702 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -3012,17 +3012,7 @@ namespace BizHawk.Client.EmuHawk
 					Global.Game.Status = nes.RomStatus;
 				}
 
-				string gamename = string.Empty;
-				if (!string.IsNullOrWhiteSpace(loader.Game.Name)) // Prefer Game db name, else use the path
-				{
-					gamename = loader.Game.Name;
-				}
-				else
-				{
-					gamename = Path.GetFileNameWithoutExtension(path.Split('|').Last());
-				}
-
-				Text = DisplayNameForSystem(loader.Game.System) + " - " + gamename;
+				Text = DisplayNameForSystem(loader.Game.System) + " - " + Global.Game.Name;
 
 				Global.Rewinder.ResetRewindBuffer();
 
diff --git a/BizHawk.Client.EmuHawk/movie/RecordMovie.cs b/BizHawk.Client.EmuHawk/movie/RecordMovie.cs
index 8d91872771..269baa38fe 100644
--- a/BizHawk.Client.EmuHawk/movie/RecordMovie.cs
+++ b/BizHawk.Client.EmuHawk/movie/RecordMovie.cs
@@ -186,13 +186,7 @@ namespace BizHawk.Client.EmuHawk
 
 		private void RecordMovie_Load(object sender, EventArgs e)
 		{
-			var name = PathManager.FilesystemSafeName(Global.Game);
-			if (string.IsNullOrEmpty(name))
-			{
-				name = Path.GetFileNameWithoutExtension(GlobalWin.MainForm.CurrentlyOpenRom.Split('|').Last());
-			}
-
-			RecordBox.Text = name;
+			RecordBox.Text = PathManager.FilesystemSafeName(Global.Game);
 			StartFromCombo.SelectedIndex = 0;
 			DefaultAuthorCheckBox.Checked = Global.Config.UseDefaultAuthor;
 			if (Global.Config.UseDefaultAuthor)