diff --git a/docs/portsofsnes9x.txt b/docs/portsofsnes9x.txt
index ae324f88..1d5ee76b 100644
--- a/docs/portsofsnes9x.txt
+++ b/docs/portsofsnes9x.txt
@@ -1,8 +1,8 @@
-These are all the known ports of Snes9X to other consoles/handhelds/etc as of
-2011/08/28. They are all supported and welcomed on the official Snes9X site.
+These are all the known ports of Snes9x to other consoles/handhelds/etc as of
+2011/08/28. They are all supported and welcomed on the official Snes9x site.
 
-**If you know of anyone who is currently working on a port of Snes9X, or if you
-have some interest in making a port, please have them go to the Snes9X forums
+**If you know of anyone who is currently working on a port of Snes9x, or if you
+have some interest in making a port, please have them go to the Snes9x forums
 (http://www.snes9x.com/phpbb2/) and have them register an account there. After
 that, speak to Ryan and/or Jerremy so you can be let into the devs area and the
 git so you can have access to the most current code, collaborate with the other
@@ -10,7 +10,7 @@ developers, make the port officialized, etc.**
 
 Ports and how to get them running are as follows:
 
-*PSP Version of Snes9X*
+*PSP Version of Snes9x*
 Name: Snes9X Euphoria
 Latest version: R5 Beta
 Homepage/forum: http://code.google.com/p/snes9x-euphoria/
@@ -48,7 +48,7 @@ Note: as of right now, there is no one to maintain the PSP port; I am leaving
 these instructions up just in case someone wants to take it over, and you can
 use these tips to get other homebrews going.
 
-*Wii/Gamecube version of Snes9X*
+*Wii/Gamecube version of Snes9x*
 Name: Snes9X GX
 Latest Version: 4.2.8
 Homepage/forum: http://code.google.com/p/snes9x-gx
@@ -74,7 +74,7 @@ installer from the Homebrew Channel, and you'll be good to go!
 
 Gamecube: You might need a modchip.
 
-*Android and iOS (Apple iPhone/iPod Touch) version of Snes9X*
+*Android and iOS (Apple iPhone/iPod Touch) version of Snes9x*
 Name: Snes9X EX
 Latest Version: 1.4.2 (iOS); 1.4.7.1 (Android)
 Homepage/forum: http://www.explusalpha.com/home/snes9x-ex
@@ -101,7 +101,7 @@ Hint: a more detailed description of copying your ROMs/saves/etc over to the
 iOS device can be found here:
 http://snes9x.com/phpbb2/viewtopic.php?t=5107
 
-*PS3 version of Snes9X*
+*PS3 version of Snes9x*
 Name: Snes9X PS3
 Latest Version: 4.4.9
 Homepage/forum: https://code.google.com/p/snes9x-ps3/ (although for some
@@ -118,7 +118,7 @@ upgrade or downgrade your PS3’s firmware as needed). After that, it should be
 as simple as copy the emulator, ROMs, saves, etc over to the PS3 and it should
 work :)
 
-*X-Box Version of Snes9X*
+*X-Box Version of Snes9x*
 Name: Snes9xbox
 Latest Version: V2 (V3 should be out soon)
 Homepage/forum: http://forums.xbox-scene.com/index.php?showforum=96
@@ -132,4 +132,4 @@ Really, it's not hard. Read the readme, and use a softmod or modchip and a
 replacement dashboard. After that's installed, it should be as simple as
 copying over the emulator, ROMs, saves, etc to the X-Box and it should work.
 
-Updated most recently by: 2011/11/2 adventure_of_link
\ No newline at end of file
+Updated most recently by: 2011/11/2 adventure_of_link
diff --git a/gtk/po/es.po b/gtk/po/es.po
index b1c163f0..520a738a 100644
--- a/gtk/po/es.po
+++ b/gtk/po/es.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Snes9X\n"
+"Project-Id-Version: Snes9x\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-12-17 19:18-0600\n"
 "PO-Revision-Date: 2017-26-08 02:55-0300\n"
diff --git a/gtk/src/gtk_config.cpp b/gtk/src/gtk_config.cpp
index 949a32f4..24734aef 100644
--- a/gtk/src/gtk_config.cpp
+++ b/gtk/src/gtk_config.cpp
@@ -155,7 +155,7 @@ int Snes9xConfig::load_defaults ()
     use_fences = false;
 #endif
 
-    /* Snes9X Variables */
+    /* Snes9x Variables */
     Settings.MouseMaster = true;
     Settings.SuperScopeMaster = true;
     Settings.JustifierMaster = true;
diff --git a/netplay.cpp b/netplay.cpp
index 04df6984..7fad5807 100644
--- a/netplay.cpp
+++ b/netplay.cpp
@@ -149,7 +149,7 @@ up correctly?");
 #ifdef NP_DEBUG
     printf ("CLIENT: Trying to connect to server @%ld...\n", S9xGetMilliTime () - START);
 #endif
-    S9xNPSetAction ("Trying to connect to Snes9X server...");
+    S9xNPSetAction ("Trying to connect to Snes9x server...");
 
     if (connect (NetPlay.Socket, (struct sockaddr *) &address, sizeof (address)) < 0)
     {
@@ -162,7 +162,7 @@ up correctly?");
         {
             S9xNPSetError ("\
 Connection to remote server socket refused:\n\n\
-Is there actually a Snes9X NetPlay server running\n\
+Is there actually a Snes9x NetPlay server running\n\
 on the remote machine on this port?");
         }
         else
@@ -251,7 +251,7 @@ on the remote machine on this port?");
     if (data [0] != NP_VERSION)
     {
         S9xNPSetError ("\
-The Snes9X NetPlay server implements a different\n\
+The Snes9x NetPlay server implements a different\n\
 version of the protocol. Disconnecting.");
         delete[] data;
 	S9xNPDisconnect ();
@@ -775,7 +775,7 @@ void S9xNPStepJoypadHistory ()
         NetPlay.JoypadReadInd = (NetPlay.JoypadReadInd + 1) % NP_JOYPAD_HIST_SIZE;
         if (NetPlay.FrameCount != NetPlay.Frame [NetPlay.JoypadReadInd])
         {
-            S9xNPSetWarning ("This Snes9X session may be out of sync with the server.");
+            S9xNPSetWarning ("This Snes9x session may be out of sync with the server.");
 #ifdef NP_DEBUG
             printf ("*** CLIENT: client out of sync with server (%d, %d) @%ld\n", NetPlay.FrameCount, NetPlay.Frame [NetPlay.JoypadReadInd], S9xGetMilliTime () - START);
 #endif
diff --git a/win32/CDirectDraw.cpp b/win32/CDirectDraw.cpp
index 1e8ab8fe..4596dfcf 100644
--- a/win32/CDirectDraw.cpp
+++ b/win32/CDirectDraw.cpp
@@ -70,7 +70,7 @@ bool CDirectDraw::Initialize (HWND hWnd)
 	if (!SetDisplayMode (GUI.FullscreenMode.width, GUI.FullscreenMode.height, max(GetFilterScale(GUI.Scale), GetFilterScale(GUI.ScaleHiRes)), GUI.FullscreenMode.depth, GUI.FullscreenMode.rate,
 		TRUE, GUI.DoubleBuffered))
     {
-        MessageBox( GUI.hWnd, Languages[ GUI.Language].errModeDD, TEXT("Snes9X - DirectDraw(7)"), MB_OK | MB_ICONSTOP);
+        MessageBox( GUI.hWnd, Languages[ GUI.Language].errModeDD, TEXT("Snes9x - DirectDraw(7)"), MB_OK | MB_ICONSTOP);
         return (false);
     }
 
@@ -596,7 +596,7 @@ bool CDirectDraw::SetFullscreen(bool fullscreen)
 {
 	if (!SetDisplayMode (GUI.FullscreenMode.width, GUI.FullscreenMode.height, max(GetFilterScale(GUI.Scale), GetFilterScale(GUI.ScaleHiRes)), GUI.FullscreenMode.depth, GUI.FullscreenMode.rate, !fullscreen, GUI.DoubleBuffered))
 	{
-		MessageBox( GUI.hWnd, Languages[ GUI.Language].errModeDD, TEXT("Snes9X - DirectDraw(2)"), MB_OK | MB_ICONSTOP);
+		MessageBox( GUI.hWnd, Languages[ GUI.Language].errModeDD, TEXT("Snes9x - DirectDraw(2)"), MB_OK | MB_ICONSTOP);
 		return false;
 	}
 	return true;
diff --git a/win32/rsrc/snes9x.rc b/win32/rsrc/snes9x.rc
index dd488b02..4fa059d3 100644
--- a/win32/rsrc/snes9x.rc
+++ b/win32/rsrc/snes9x.rc
@@ -819,12 +819,12 @@ BEGIN
         BLOCK "080904b0"
         BEGIN
             VALUE "CompanyName", "http://www.snes9x.com"
-            VALUE "FileDescription", "Snes9X"
+            VALUE "FileDescription", "Snes9x"
             VALUE "FileVersion", "1.58"
-            VALUE "InternalName", "Snes9X"
+            VALUE "InternalName", "Snes9x"
             VALUE "LegalCopyright", "Copyright  1996-2018"
-            VALUE "OriginalFilename", "Snes9X.exe"
-            VALUE "ProductName", "Snes9X SNES Emulator"
+            VALUE "OriginalFilename", "Snes9x.exe"
+            VALUE "ProductName", "Snes9x SNES Emulator"
             VALUE "ProductVersion", "1.58"
         END
     END
diff --git a/win32/win32.cpp b/win32/win32.cpp
index 0eaa8bab..dbf69351 100644
--- a/win32/win32.cpp
+++ b/win32/win32.cpp
@@ -826,7 +826,7 @@ void S9xDetectJoypads()
                                               sizeof( JOYCAPS)) == JOYERR_NOERROR;
 }
 
-void InitSnes9X( void)
+void InitSnes9x( void)
 {
 #ifdef DEBUGGER
 //    extern FILE *trace;
diff --git a/win32/win32_display.cpp b/win32/win32_display.cpp
index 988bda3e..a2466970 100644
--- a/win32/win32_display.cpp
+++ b/win32/win32_display.cpp
@@ -133,7 +133,7 @@ bool WinDisplayReset(void)
 
 		return true;
 	} else {
-		MessageBox (GUI.hWnd, Languages[ GUI.Language].errInitDD, TEXT("Snes9X - Display Failure"), MB_OK | MB_ICONSTOP);
+		MessageBox (GUI.hWnd, Languages[ GUI.Language].errInitDD, TEXT("Snes9x - Display Failure"), MB_OK | MB_ICONSTOP);
 		return false;
 	}
 }
@@ -420,7 +420,7 @@ void RestoreGUIDisplay ()
         (GUI.FullscreenMode.width < 640 || GUI.FullscreenMode.height < 400) &&
         !DirectDraw.SetDisplayMode (640, 480, 1, 0, 60, !GUI.FullScreen, false))
     {
-        MessageBox (GUI.hWnd, Languages[ GUI.Language].errModeDD, TEXT("Snes9X - DirectDraw(1)"), MB_OK | MB_ICONSTOP);
+        MessageBox (GUI.hWnd, Languages[ GUI.Language].errModeDD, TEXT("Snes9x - DirectDraw(1)"), MB_OK | MB_ICONSTOP);
         S9xClearPause (PAUSE_RESTORE_GUI);
         return;
     }
@@ -437,7 +437,7 @@ void RestoreSNESDisplay ()
 
 	if (!DirectDraw.SetFullscreen(GUI.FullScreen))
     {
-        MessageBox (GUI.hWnd, Languages[ GUI.Language].errModeDD, TEXT("Snes9X - DirectDraw(4)"), MB_OK | MB_ICONSTOP);
+        MessageBox (GUI.hWnd, Languages[ GUI.Language].errModeDD, TEXT("Snes9x - DirectDraw(4)"), MB_OK | MB_ICONSTOP);
         return;
     }
 
diff --git a/win32/wlanguage.h b/win32/wlanguage.h
index b1573e97..320fdec6 100644
--- a/win32/wlanguage.h
+++ b/win32/wlanguage.h
@@ -6,13 +6,13 @@
 
 /* This is where all the GUI text strings will eventually end up */
 
-#define WINDOW_TITLE TEXT("Snes9X v%s for Windows")
+#define WINDOW_TITLE TEXT("Snes9x")
 
 // the windows registry is no longer used
-//#define MY_REG_KEY   "Software\\Emulators\\Snes9X"
+//#define MY_REG_KEY   "Software\\Emulators\\Snes9x"
 //#define REG_KEY_VER  "1.31"
 
-#define DISCLAIMER_TEXT        TEXT("Snes9X v%s for Windows.\r\n\
+#define DISCLAIMER_TEXT        TEXT("Snes9x v%s for Windows.\r\n\
 (c) Copyright 1996 - 2002  Gary Henderson and Jerremy Koot (jkoot@snes9x.com)\r\n\
 (c) Copyright 2002 - 2004  Matthew Kendora\r\n\
 (c) Copyright 2002 - 2005  Peter Bortas\r\n\
@@ -22,21 +22,21 @@
 (c) Copyright 2006 - 2007  nitsuja\r\n\
 (c) Copyright 2009 - 2018  BearOso, OV2\r\n\r\n\
 Windows Port Authors: Matthew Kendora, funkyass, nitsuja, Nach, blip, OV2.\r\n\r\n\
-Snes9X is a Super Nintendo Entertainment System\r\n\
+Snes9x is a Super Nintendo Entertainment System\r\n\
 emulator that allows you to play most games designed\r\n\
 for the SNES on your PC.\r\n\r\n\
 Please visit http://www.snes9x.com for\r\n\
-up-to-the-minute information and help on Snes9X.\r\n\r\n\
-Nintendo is a trade mark.")
+up-to-the-minute information and help on Snes9x.\r\n\r\n\
+Nintendo is a trademark.")
 
 
 #define APP_NAME TEXT("Snes9x")
 // possible global strings
 #define SNES9X_INFO TEXT("Snes9x: Information")
 #define SNES9X_WARN TEXT("Snes9x: WARNING!")
-#define SNES9X_DXS TEXT("Snes9X: DirectSound")
-#define SNES9X_SNDQ TEXT("Snes9X: Sound CPU Question")
-#define SNES9X_NP_ERROR TEXT("Snes9X: NetPlay Error")
+#define SNES9X_DXS TEXT("Snes9x: DirectSound")
+#define SNES9X_SNDQ TEXT("Snes9x: Sound CPU Question")
+#define SNES9X_NP_ERROR TEXT("Snes9x: NetPlay Error")
 #define BUTTON_OK TEXT("&OK")
 #define BUTTON_CANCEL TEXT("&Cancel")
 
diff --git a/win32/wsnes9x.cpp b/win32/wsnes9x.cpp
index 3b7664af..3914302b 100644
--- a/win32/wsnes9x.cpp
+++ b/win32/wsnes9x.cpp
@@ -427,7 +427,7 @@ static uint32 FrameTimings[] = {
 	4000, 4000, 8333, 11667, 16667, 20000, 33333, 66667, 133333, 300000, 500000, 1000000, 1000000
 };
 
-// Languages supported by Snes9X: Windows
+// Languages supported by Snes9x: Windows
 // 0 - English [Default]
 struct sLanguages Languages[] = {
 	{ IDR_MENU_US,
@@ -435,7 +435,7 @@ struct sLanguages Languages[] = {
 		TEXT("DirectDraw failed to set the selected display mode!"),
 		TEXT("DirectSound failed to initialize; no sound will be played."),
 		TEXT("These settings won't take effect until you restart the emulator."),
-		TEXT("The frame timer failed to initialize, please do NOT select the automatic framerate option or Snes9X will crash!")}
+		TEXT("The frame timer failed to initialize, please do NOT select the automatic framerate option or Snes9x will crash!")}
 };
 
 struct OpenMovieParams
@@ -685,7 +685,15 @@ static void CenterCursor()
 void S9xRestoreWindowTitle ()
 {
     TCHAR buf [100];
-    _stprintf (buf, WINDOW_TITLE, TEXT(VERSION));
+    if (Memory.ROMFilename[0])
+    {
+        char drive[_MAX_DRIVE + 1], dir[_MAX_DIR + 1], def[_MAX_FNAME + 1], ext[_MAX_EXT + 1];
+        _splitpath(Memory.ROMFilename, drive, dir, def, ext);
+        _stprintf(buf, TEXT("%s - %s"), (wchar_t *)Utf8ToWide(def), WINDOW_TITLE);
+    }
+    else
+        _stprintf(buf, WINDOW_TITLE);
+
     SetWindowText (GUI.hWnd, buf);
 }
 
@@ -2569,7 +2577,7 @@ BOOL WinInit( HINSTANCE hInstance)
     wndclass.hIconSm = NULL;
     wndclass.hCursor = NULL;
     wndclass.lpszMenuName = NULL;
-    wndclass.lpszClassName = TEXT("Snes9X: WndClass");
+    wndclass.lpszClassName = TEXT("Snes9x: WndClass");
 	wndclass.hbrBackground=(HBRUSH)GetStockObject(BLACK_BRUSH);
 
     GUI.hInstance = hInstance;
@@ -2583,7 +2591,7 @@ BOOL WinInit( HINSTANCE hInstance)
 	GUI.hMenu = LoadMenu(GUI.hInstance, MAKEINTRESOURCE(IDR_MENU_US));
     if (GUI.hMenu == NULL)
 	{
-		MessageBox (NULL, TEXT("Failed to initialize the menu.\nThis could indicate a failure of your operating system;\ntry closing some other windows or programs, or restart your computer, before opening Snes9x again.\nOr, if you compiled this program yourself, ensure that Snes9x was built with the proper resource files."), TEXT("Snes9X - Menu Initialization Failure"), MB_OK | MB_ICONSTOP);
+		MessageBox (NULL, TEXT("Failed to initialize the menu.\nThis could indicate a failure of your operating system;\ntry closing some other windows or programs, or restart your computer, before opening Snes9x again.\nOr, if you compiled this program yourself, ensure that Snes9x was built with the proper resource files."), TEXT("Snes9x - Menu Initialization Failure"), MB_OK | MB_ICONSTOP);
 //        return FALSE; // disabled: try to function without the menu
 	}
 #ifdef DEBUGGER
@@ -2596,7 +2604,7 @@ BOOL WinInit( HINSTANCE hInstance)
 #endif
 
     TCHAR buf [100];
-    _stprintf (buf, WINDOW_TITLE, TEXT(VERSION));
+    _stprintf (buf, WINDOW_TITLE);
 
     DWORD dwExStyle;
     DWORD dwStyle;
@@ -2611,7 +2619,7 @@ BOOL WinInit( HINSTANCE hInstance)
     AdjustWindowRectEx (&rect, dwStyle, FALSE, dwExStyle);
     if ((GUI.hWnd = CreateWindowEx (
         dwExStyle,
-        TEXT("Snes9X: WndClass"),
+        TEXT("Snes9x: WndClass"),
         buf,
         WS_CLIPSIBLINGS |
         WS_CLIPCHILDREN |
@@ -3269,8 +3277,8 @@ int WINAPI WinMain(
 
 	RestoreMainWinPos();
 
-	void InitSnes9X (void);
-	InitSnes9X ();
+	void InitSnes9x (void);
+	InitSnes9x ();
 
 	if(GUI.FullScreen) {
 		GUI.FullScreen = false;
@@ -3315,7 +3323,7 @@ int WINAPI WinMain(
 
     if (GUI.hFrameTimer == 0)
     {
-        MessageBox( GUI.hWnd, Languages[ GUI.Language].errFrameTimer, TEXT("Snes9X - Frame Timer"), MB_OK | MB_ICONINFORMATION);
+        MessageBox( GUI.hWnd, Languages[ GUI.Language].errFrameTimer, TEXT("Snes9x - Frame Timer"), MB_OK | MB_ICONINFORMATION);
     }
 
 	if (rom_filename)
@@ -3635,8 +3643,8 @@ void CheckDirectoryIsWritable (const char *filename)
     FILE *fs = fopen (filename, "w+");
 
     if (fs == NULL)
-	MessageBox (GUI.hWnd, TEXT("The folder where Snes9X saves emulated save RAM files and\ngame save positions (freeze files) is currently set to a\nread-only folder.\n\nIf you do not change the game save folder, Snes9X will be\nunable to save your progress in this game. Change the folder\nfrom the Settings Dialog available from the Options menu.\n\nThe default save folder is called Saves, if no value is set.\n"),
-							 TEXT("Snes9X: Unable to save file warning"),
+	MessageBox (GUI.hWnd, TEXT("The folder where Snes9x saves emulated save RAM files and\ngame save positions (freeze files) is currently set to a\nread-only folder.\n\nIf you do not change the game save folder, Snes9x will be\nunable to save your progress in this game. Change the folder\nfrom the Settings Dialog available from the Options menu.\n\nThe default save folder is called Saves, if no value is set.\n"),
+							 TEXT("Snes9x: Unable to save file warning"),
 							 MB_OK | MB_ICONINFORMATION);
     else
     {
@@ -3988,6 +3996,7 @@ static bool LoadROM(const TCHAR *filename, const TCHAR *filename2 /*= NULL*/) {
 		GUI.CursorTimer = 60;
 	}
 	Settings.Paused = false;
+    S9xRestoreWindowTitle();
 
 	return !Settings.StopEmulation;
 }
diff --git a/win32/wsnes9x.h b/win32/wsnes9x.h
index 2b897b28..ed522248 100644
--- a/win32/wsnes9x.h
+++ b/win32/wsnes9x.h
@@ -5,7 +5,7 @@
 \*****************************************************************************/
 
 /*****************************************************************************/
-/*  Snes9X: Win32                                                            */
+/*  Snes9x: Win32                                                            */
 /*****************************************************************************/
 #if !defined(SNES9X_H_INCLUDED)
 #define SNES9X_H_INCLUDED