diff --git a/README.md b/README.md
index d300e28dff..297e235e58 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,13 @@
 # RetroArch
 
-RetroArch is the reference frontend for the libretro API, an API which attempts to generalize
-a retro gaming system, such as emulators and game engines.
-Popular examples include SNES, NES, GameBoy, Arcade machines, Quake, DOOM, etc.
-Emulator and game cores are instantiated as dynamic libraries.
+RetroArch is the reference frontend for the libretro API.
+Popular examples of implementations for this API includes videogame system emulators and game engines, but also
+more generalized 3D programs.
+These programs are instantiated as dynamic libraries. We refer to these as "libretro cores".
 
 ## libretro
 
-[libretro](http://libretro.com) is an API that exposes the core of a retro gaming system.
+[libretro](http://libretro.com) is an API that exposes generic audio/video/input callbacks.
 A frontend for libretro (such as RetroArch) handles video output, audio output, input and application lifecycle.
 A libretro core written in portable C or C++ can run seamlessly on many platforms with very little/no porting effort.
 
diff --git a/android/phoenix/res/values/strings.xml b/android/phoenix/res/values/strings.xml
index 45aef0eefa..a7bb3a879b 100644
--- a/android/phoenix/res/values/strings.xml
+++ b/android/phoenix/res/values/strings.xml
@@ -13,10 +13,10 @@
 
     <!-- Main Menu Strings -->
     <string name="mainmenu_title">RetroArch - Main Menu</string>
-    <string name="tv_mode">Resume Game</string>
+    <string name="tv_mode">Resume Content</string>
     <string name="load_core">Load Core</string>
-    <string name="load_game">Load Game</string>
-    <string name="load_game_history">Load Game (History)</string>
+    <string name="load_game">Load Content</string>
+    <string name="load_game_history">Load Content (History)</string>
     <string name="settings">Settings</string>
     <string name="help">Help</string>
     <string name="about">About</string>
@@ -47,7 +47,7 @@
     <string name="refresh_rate_measured_to">Refresh rate measured to: %1$s Hz.</string>
 
     <!-- History Selection Class -->
-    <string name="recently_played_games">Recently played games</string>
+    <string name="recently_played_games">Recently run content</string>
     <string name="loading_gamepath">Loading [%1$s]…</string>
     
     <!-- Key Bind Preference Class -->
@@ -57,7 +57,7 @@
     <!-- Main Menu Class -->
     <string name="no_core">No core</string>
     <string name="welcome_to_retroarch">Welcome to RetroArch</string>
-    <string name="welcome_to_retroarch_desc">This is your first time starting up RetroArch. RetroArch will now be preconfigured for the best possible gameplay experience.</string>
+    <string name="welcome_to_retroarch_desc">This is your first time starting up RetroArch. RetroArch will now be preconfigured for the best possible user experience.</string>
     <string name="gpl_waiver">GPL waiver</string>
     <string name="gpl_waiver_desc">Copyright © 2010–2013 RetroArch Team.\n\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version.\n\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License along with this program; if not, see www.gnu.org/licenses.\n\nAdditional permission under GNU GPL version 3 section 7\n\nIf you modify this Program, or any covered work, by linking or combining it with any non-GPL libretro core, containing parts covered by the terms of the core\'s license, the licensors of this Program grant you additional permission to convey the resulting work.</string>
     <string name="detect_device_msg_ouya">The ideal configuration options for your device will now be preconfigured.\n\nNOTE: For optimal performance, turn off Google Account sync, GPS and Wi-Fi in your Android settings menu.</string>
diff --git a/apple/common/setting_data.c b/apple/common/setting_data.c
index 97fab8f967..a05e73f19a 100644
--- a/apple/common/setting_data.c
+++ b/apple/common/setting_data.c
@@ -368,8 +368,8 @@ const rarch_setting_t* setting_data_get_list()
          CONFIG_PATH(g_settings.screenshot_directory, "screenshot_directory", "Screenshot Directory", DEFAULT_ME_YO)
          CONFIG_PATH(g_settings.cheat_database, "cheat_database_path", "Cheat Database", DEFAULT_ME_YO)
          CONFIG_PATH(g_settings.cheat_settings_path, "cheat_settings_path", "Cheat Settings", DEFAULT_ME_YO)
-         CONFIG_PATH(g_settings.game_history_path, "game_history_path", "Game History Path", DEFAULT_ME_YO)
-         CONFIG_UINT(g_settings.game_history_size, "game_history_size", "Game History Size", game_history_size)
+         CONFIG_PATH(g_settings.game_history_path, "game_history_path", "Content History Path", DEFAULT_ME_YO)
+         CONFIG_UINT(g_settings.game_history_size, "game_history_size", "Content History Size", game_history_size)
 
          #ifdef HAVE_RGUI
             CONFIG_PATH(g_settings.rgui_browser_directory, "rgui_browser_directory", "Browser Directory", DEFAULT_ME_YO)