diff --git a/src/drivers/win/directories.cpp b/src/drivers/win/directories.cpp
index 4efb3fd6..042d4316 100644
--- a/src/drivers/win/directories.cpp
+++ b/src/drivers/win/directories.cpp
@@ -59,11 +59,11 @@ void CloseDirectoriesDialog(HWND hwndDlg)
 
 			sprintf(buffer, mask, directory_names[curr_dir]);
 
-			if ( MessageBox(hwndDlg, buffer, "FCE Ultra", MB_ICONERROR | MB_YESNO) == IDYES )
+			if ( MessageBox(hwndDlg, buffer, FCEU_NAME, MB_ICONERROR | MB_YESNO) == IDYES )
 			{
 				if (!CreateDirectory(directory_names[curr_dir], 0))
 				{
-					MessageBox(hwndDlg, "Error: Couldn't create directory. Please choose a different directory.", "FCE Ultra", MB_ICONERROR | MB_OK);
+					MessageBox(hwndDlg, "Error: Couldn't create directory. Please choose a different directory.", FCEU_NAME, MB_ICONERROR | MB_OK);
 					free(buffer);
 					return;
 				}
diff --git a/src/drivers/win/input.cpp b/src/drivers/win/input.cpp
index 43e36f26..30f8a215 100644
--- a/src/drivers/win/input.cpp
+++ b/src/drivers/win/input.cpp
@@ -1260,15 +1260,15 @@ BOOL CALLBACK InputConCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 				break;
 
 			case BTN_PRESET_SET1:
-				MessageBox(0, "Current input configuration has been set as Preset 1.", "FCE Ultra Message", MB_ICONINFORMATION | MB_OK | MB_SETFOREGROUND | MB_TOPMOST);
+				MessageBox(0, "Current input configuration has been set as Preset 1.", FCEU_NAME, MB_ICONINFORMATION | MB_OK | MB_SETFOREGROUND | MB_TOPMOST);
 				memcpy(GamePadPreset1, GamePadConfig, sizeof(GamePadConfig));
 				break;
 			case BTN_PRESET_SET2:
-				MessageBox(0, "Current input configuration has been set as Preset 2.", "FCE Ultra Message", MB_ICONINFORMATION | MB_OK | MB_SETFOREGROUND | MB_TOPMOST);
+				MessageBox(0, "Current input configuration has been set as Preset 2.", FCEU_NAME, MB_ICONINFORMATION | MB_OK | MB_SETFOREGROUND | MB_TOPMOST);
 				memcpy(GamePadPreset2, GamePadConfig, sizeof(GamePadConfig));
 				break;
 			case BTN_PRESET_SET3:
-				MessageBox(0, "Current input configuration has been set as Preset 3.", "FCE Ultra Message", MB_ICONINFORMATION | MB_OK | MB_SETFOREGROUND | MB_TOPMOST);
+				MessageBox(0, "Current input configuration has been set as Preset 3.", FCEU_NAME, MB_ICONINFORMATION | MB_OK | MB_SETFOREGROUND | MB_TOPMOST);
 				memcpy(GamePadPreset3, GamePadConfig, sizeof(GamePadConfig));
 				break;
 
diff --git a/src/drivers/win/main.cpp b/src/drivers/win/main.cpp
index 2e946e06..61c6913d 100644
--- a/src/drivers/win/main.cpp
+++ b/src/drivers/win/main.cpp
@@ -335,7 +335,7 @@ void FCEUD_PrintError(const char *errormsg)
 		ShowCursorAbs(1);
 	}
 
-	MessageBox(0, errormsg, "FCE Ultra Error", MB_ICONERROR | MB_OK | MB_SETFOREGROUND | MB_TOPMOST);
+	MessageBox(0, errormsg, FCEU_NAME" Error", MB_ICONERROR | MB_OK | MB_SETFOREGROUND | MB_TOPMOST);
 	
 	if(fullscreen)
 	{
diff --git a/src/drivers/win/palette.cpp b/src/drivers/win/palette.cpp
index 562b6f91..e7822484 100644
--- a/src/drivers/win/palette.cpp
+++ b/src/drivers/win/palette.cpp
@@ -22,7 +22,7 @@ int LoadPaletteFile()
 	memset(&ofn, 0, sizeof(ofn));
 	ofn.lStructSize = sizeof(ofn);
 	ofn.hInstance = fceu_hInstance;
-	ofn.lpstrTitle = "FCE Ultra Open Palette File...";
+	ofn.lpstrTitle = FCEU_NAME" Open Palette File...";
 	ofn.lpstrFilter = filter;
 	nameo[0] = 0;
 	ofn.lpstrFile = nameo;
diff --git a/src/drivers/win/state.cpp b/src/drivers/win/state.cpp
index 259e4862..4444c163 100644
--- a/src/drivers/win/state.cpp
+++ b/src/drivers/win/state.cpp
@@ -5,7 +5,7 @@
 **/
 void FCEUD_SaveStateAs()
 {
-	const char filter[] = "FCE Ultra Save State(*.fc?)\0*.fc?\0";
+	const char filter[] = FCEU_NAME" Save State(*.fc?)\0*.fc?\0";
 	char nameo[2048];
 	OPENFILENAME ofn;
 
@@ -30,7 +30,7 @@ void FCEUD_SaveStateAs()
 **/
 void FCEUD_LoadStateFrom()
 {
-	const char filter[]="FCE Ultra Save State(*.fc?)\0*.fc?\0";
+	const char filter[]= FCEU_NAME" Save State(*.fc?)\0*.fc?\0";
 	char nameo[2048];
 	OPENFILENAME ofn;
 
diff --git a/src/drivers/win/window.cpp b/src/drivers/win/window.cpp
index cbc093e1..bf9c1e6b 100644
--- a/src/drivers/win/window.cpp
+++ b/src/drivers/win/window.cpp
@@ -606,7 +606,7 @@ void LoadNewGamey(HWND hParent, const char *initialdir)
 
 	ofn.lStructSize=sizeof(ofn);
 	ofn.hInstance=fceu_hInstance;
-	ofn.lpstrTitle="FCE Ultra Open File...";
+	ofn.lpstrTitle=FCEU_NAME" Open File...";
 	ofn.lpstrFilter=filter;
 	nameo[0]=0;
 	ofn.hwndOwner=hParent;
@@ -1408,7 +1408,7 @@ int CreateMainWindow()
 	hAppWnd = CreateWindowEx(
 		0,
 		"FCEULTRA",
-		"FCE Ultra",
+		FCEU_NAME,
 		WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS,  /* Style */
 		MainWindow_wndx,
 		MainWindow_wndy,
diff --git a/src/types.h b/src/types.h
index 63c2df5f..2a8bb083 100644
--- a/src/types.h
+++ b/src/types.h
@@ -26,7 +26,7 @@
 #include <iosfwd>
 
 #define FCEU_VERSION_NUMERIC 20000
-#define FCEU_NAME "FCE Ultra"
+#define FCEU_NAME "FCEUX"
 #define FCEU_VERSION_STRING "2.0.0"
 #define FCEU_NAME_AND_VERSION FCEU_NAME " " FCEU_VERSION_STRING
 
diff --git a/vc8/upload.bat b/vc8/upload.bat
index 42ba8407..cc7fa8d6 100644
--- a/vc8/upload.bat
+++ b/vc8/upload.bat
@@ -1,2 +1,2 @@
 pscp -pw zzzap333 fceux.zip fceux@www.pi-r-squared.com:web/zip/fceux.zip
-pscp -pw zzzap333 luapack.zip fceux@www.pi-r-squared.com:web/lua/luapack.zip
\ No newline at end of file
+pscp -pw zzzap333 luapack.zip fceux@www.pi-r-squared.com:web/luapack/luapack.zip
\ No newline at end of file