diff --git a/source/menu.cpp b/source/menu.cpp
index 25a70bc..99a3a9d 100644
--- a/source/menu.cpp
+++ b/source/menu.cpp
@@ -1431,12 +1431,12 @@ static int MenuGame()
 		}
 		else if (GCSettings.AutoSave == 2)
 		{
-			if (WindowPrompt("Save", "Save Snapshot?", "Save", "Don't Save") )
+			if (WindowPrompt("Save", "Save State?", "Save", "Don't Save") )
 				SaveBatteryOrStateAuto(FILE_SNAPSHOT, NOTSILENT); // save state
 		}
 		else if (GCSettings.AutoSave == 3)
 		{
-			if (WindowPrompt("Save", "Save SRAM and Snapshot?", "Save", "Don't Save") )
+			if (WindowPrompt("Save", "Save SRAM and State?", "Save", "Don't Save") )
 			{
 				SaveBatteryOrStateAuto(FILE_SRAM, NOTSILENT); // save battery
 				SaveBatteryOrStateAuto(FILE_SNAPSHOT, NOTSILENT); // save state
@@ -1809,7 +1809,7 @@ static int MenuGameSaves(int action)
 				if(result)
 					menu = MENU_EXIT;
 			}
-			else if(action == 2) // delete SRAM/Snapshot
+			else if(action == 2) // delete SRAM/State
 			{
 				if (WindowPrompt("Delete File", "Delete this save file? Deleted files can not be restored.", "OK", "Cancel"))
 				{
@@ -1853,7 +1853,7 @@ static int MenuGameSaves(int action)
 						menu = MENU_GAME_SAVE;
 					}
 				}
-				else if(ret == -1) // new Snapshot
+				else if(ret == -1) // new State
 				{
 					for(i=1; i < 100; i++)
 						if(saves.files[FILE_SNAPSHOT][i] == 0)
@@ -1866,7 +1866,7 @@ static int MenuGameSaves(int action)
 						menu = MENU_GAME_SAVE;
 					}
 				}
-				else // overwrite SRAM/Snapshot
+				else // overwrite SRAM/State
 				{
 					MakeFilePath(filepath, saves.type[ret], saves.filename[ret]);
 					switch(saves.type[ret])
@@ -3683,11 +3683,11 @@ static int MenuSettingsFile()
 			
 			if (GCSettings.AutoLoad == 0) sprintf (options.value[7],"Off");
 			else if (GCSettings.AutoLoad == 1) sprintf (options.value[7],"SRAM");
-			else if (GCSettings.AutoLoad == 2) sprintf (options.value[7],"Snapshot");
+			else if (GCSettings.AutoLoad == 2) sprintf (options.value[7],"State");
 
 			if (GCSettings.AutoSave == 0) sprintf (options.value[8],"Off");
 			else if (GCSettings.AutoSave == 1) sprintf (options.value[8],"SRAM");
-			else if (GCSettings.AutoSave == 2) sprintf (options.value[8],"Snapshot");
+			else if (GCSettings.AutoSave == 2) sprintf (options.value[8],"State");
 			else if (GCSettings.AutoSave == 3) sprintf (options.value[8],"Both");
 
 			if (GCSettings.AppendAuto == 0) sprintf (options.value[9],"Off");