diff --git a/Source/Android/assets/Dolphin.ini b/Source/Android/assets/Dolphin.ini
index 944bbf75bb..2dbfe2ba35 100644
--- a/Source/Android/assets/Dolphin.ini
+++ b/Source/Android/assets/Dolphin.ini
@@ -1,8 +1,8 @@
 [General]
-GCMPathes = 0
+ISOPaths = 0
 LastFilename = 
 ShowLag = False
-RecursiveGCMPaths = False
+RecursiveISOPaths = False
 NANDRoot = //sdcard/dolphin-emu/Wii
 WirelessMac = 
 [Core]
@@ -14,7 +14,7 @@ Fastmem = False
 DSPThread = False
 DSPHLE = True
 SkipIdle = True
-DefaultGCM = 
+DefaultISO = 
 DVDRoot = 
 Apploader = 
 EnableCheats = False
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java b/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java
index 1985249718..97400c23b8 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java
@@ -133,7 +133,7 @@ public final class FolderBrowser extends ListFragment
 
 	private void FolderSelected()
 	{
-		String Directories = NativeLibrary.GetConfig("Dolphin.ini", "General", "GCMPathes", "0");
+		String Directories = NativeLibrary.GetConfig("Dolphin.ini", "General", "ISOPaths", "0");
 		int intDirectories = Integer.parseInt(Directories);
 
 		// Check to see if a path set in the Dolphin config
@@ -142,9 +142,9 @@ public final class FolderBrowser extends ListFragment
 		boolean pathNotPresent = true;
 		for (int i = 0; i < intDirectories; i++)
 		{
-			String gcmPath = NativeLibrary.GetConfig("Dolphin.ini", "General", "GCMPath" + i, "");
+			String isoPath = NativeLibrary.GetConfig("Dolphin.ini", "General", "ISOPath" + i, "");
 
-			if (gcmPath.equals(currentDir.getPath()))
+			if (isoPath.equals(currentDir.getPath()))
 			{
 				pathNotPresent = false;
 			}
@@ -157,8 +157,8 @@ public final class FolderBrowser extends ListFragment
 		// User doesn't have this path in the config, so add it.
 		if (pathNotPresent)
 		{
-			NativeLibrary.SetConfig("Dolphin.ini", "General", "GCMPathes", Integer.toString(intDirectories+1));
-			NativeLibrary.SetConfig("Dolphin.ini", "General", "GCMPath" + Integer.toString(intDirectories), currentDir.getPath());
+			NativeLibrary.SetConfig("Dolphin.ini", "General", "ISOPaths", Integer.toString(intDirectories+1));
+			NativeLibrary.SetConfig("Dolphin.ini", "General", "ISOPath" + Integer.toString(intDirectories), currentDir.getPath());
 		}
 
 		((GameListActivity)getActivity()).SwitchPage(0);
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java
index 96020ff0e6..adade82145 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java
@@ -263,16 +263,16 @@ public final class GameListActivity extends Activity
 			builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
 				public void onClick(DialogInterface dialog, int which)
 				{
-					String directories = NativeLibrary.GetConfig("Dolphin.ini", "General", "GCMPathes", "0");
+					String directories = NativeLibrary.GetConfig("Dolphin.ini", "General", "ISOPaths", "0");
 					int intDirs = Integer.parseInt(directories);
 
 					for (int i = 0; i < intDirs; i++)
 					{
-						NativeLibrary.SetConfig("Dolphin.ini", "General", "GCMPath" + i, "");
+						NativeLibrary.SetConfig("Dolphin.ini", "General", "ISOPath" + i, "");
 					}
 
 					// Since we flushed all paths, we signify this in the ini.
-					NativeLibrary.SetConfig("Dolphin.ini", "General", "GCMPathes", "0");
+					NativeLibrary.SetConfig("Dolphin.ini", "General", "ISOPaths", "0");
 
 					// Now finally, clear the game list.
 					((GameListFragment) getFragmentManager().findFragmentById(R.id.content_frame)).clearGameList();
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListFragment.java
index 60e10a3561..7dd5d0e14d 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListFragment.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListFragment.java
@@ -63,7 +63,7 @@ public final class GameListFragment extends ListFragment
 	private void fill()
 	{
 		List<GameListItem> fls = new ArrayList<GameListItem>();
-		String Directories = NativeLibrary.GetConfig("Dolphin.ini", "General", "GCMPathes", "0");
+		String Directories = NativeLibrary.GetConfig("Dolphin.ini", "General", "ISOPaths", "0");
 		int intDirectories = Integer.parseInt(Directories);
 
 		// Extensions to filter by.
@@ -71,7 +71,7 @@ public final class GameListFragment extends ListFragment
 
 		for (int a = 0; a < intDirectories; ++a)
 		{
-			String BrowseDir = NativeLibrary.GetConfig("Dolphin.ini", "General", "GCMPath" + a, "");
+			String BrowseDir = NativeLibrary.GetConfig("Dolphin.ini", "General", "ISOPath" + a, "");
 			File currentDir = new File(BrowseDir);
 			File[] dirs = currentDir.listFiles();
 			try