diff --git a/android/phoenix/res/values/strings.xml b/android/phoenix/res/values/strings.xml
index a3927dafdc..f8907d16c2 100644
--- a/android/phoenix/res/values/strings.xml
+++ b/android/phoenix/res/values/strings.xml
@@ -132,10 +132,10 @@
     <string name="overlay_opacity">Overlay opacity</string>
     <string name="overlay_opacity_desc">Set the opacity of the touch overlay.</string>
     <string name="custom_binds">Custom Binds</string>
-    <string name="player_1_custom_binds">Player 1 Custom Binds</string>
-    <string name="player_2_custom_binds">Player 2 Custom Binds</string>
-    <string name="player_3_custom_binds">Player 3 Custom Binds</string>
-    <string name="player_4_custom_binds">Player 4 Custom Binds</string>
+    <string name="player_1_custom_binds">User 1 Custom Binds</string>
+    <string name="player_2_custom_binds">User 2 Custom Binds</string>
+    <string name="player_3_custom_binds">User 3 Custom Binds</string>
+    <string name="player_4_custom_binds">User 4 Custom Binds</string>
     <string name="up_button">Up Button</string>
     <string name="down_button">Down Button</string>
     <string name="left_button">Left Button</string>
diff --git a/config.def.h b/config.def.h
index 3808386c79..a50927a78a 100644
--- a/config.def.h
+++ b/config.def.h
@@ -575,7 +575,7 @@ static const bool pause_nonactive = false;
 static const unsigned autosave_interval = 0;
 
 /* When being client over netplay, use keybinds for 
- * player 1 rather than player 2. */
+ * user 1 rather than user 2. */
 static const bool netplay_client_swap_input = true;
 
 /* On save state load, block SRAM from being overwritten.
diff --git a/docs/retroarch-joyconfig.1 b/docs/retroarch-joyconfig.1
index 9d18ebef02..76dfe90cfb 100644
--- a/docs/retroarch-joyconfig.1
+++ b/docs/retroarch-joyconfig.1
@@ -13,20 +13,20 @@ retroarch-joyconfig \- Tool to configure joypad bindings for \fBretroarch\fR.
 .SH "DESCRIPTION"
 
 \fBretroarch-joyconfig is a simple tool that allows updating or creating a configuration file for \fBretroarch\fR.
-It reads in necessary joypad bindings for a certain player and joypad.
+It reads in necessary joypad bindings for a certain user and joypad.
 
 .SH "EXAMPLE COMMANDLINES"
 
 .TP
-\fBConfigure joypad for player 1, using first joypad. Configuration is dumped to a file.\fR
+\fBConfigure joypad for user 1, using first joypad. Configuration is dumped to a file.\fR
 retroarch-joyconfig -p 1 -j 0 -o inputconfig.cfg
 
 .TP
-\fBConfigure joypad for player 1, using first joypad. Update retroarch.cfg directly.\fR
+\fBConfigure joypad for user 1, using first joypad. Update retroarch.cfg directly.\fR
 retroarch-joyconfig -p 1 -j 0 -i retroarch.cfg -o retroarch.cfg
 
 .TP
-\fBConfigure joypad for player 1, using first joypad. Configuration is dumped to stdout.\fR
+\fBConfigure joypad for user 1, using first joypad. Configuration is dumped to stdout.\fR
 retroarch-joyconfig -p 1 -j 0
 
 .TP
@@ -37,8 +37,8 @@ retroarch-joyconfig -j 0 -a ~/.config/retroarch/autoconfig/pad.cfg
 
 .TP
 \fB--player PLAYER, -p PLAYER\fR
-Configuration will be done for the SNES player PLAYER. This can be from 1 up to and including 5 (multitap).
-Default is configuration for player 1.
+Configuration will be done for the user PLAYER. This can be from 1 up to and including 5 (multitap).
+Default is configuration for user 1.
 
 .TP
 \fB--joypad PAD, -j PAD\fR
diff --git a/docs/retroarch.1 b/docs/retroarch.1
index 4f0f23097c..a69de52df4 100644
--- a/docs/retroarch.1
+++ b/docs/retroarch.1
@@ -171,11 +171,11 @@ Activates verbose logging.
 
 .TP
 \fB--host, -H\fR
-Be the host of netplay. Waits until a player connects. The host will always assume player 1.
+Be the host of netplay. Waits until a user connects. The host will always assume user 1.
 
 .TP
 \fB--connect SERVER, -C SERVER\fR
-Connect to a host of netplay. Will always assume player 2.
+Connect to a host of netplay. Will always assume user 2.
 
 .TP
 \fB--frames FRAMES, -F FRAMES\fR
@@ -192,7 +192,7 @@ If netplay is used, it will go into a spectator mode.
 Spectator mode allows one host to live stream game playback to multiple clients.
 Essentially, clients receive a live streamed BSV movie file.
 Clients can connect and disconnect at any time.
-Clients thus cannot interact as player 2.
+Clients thus cannot interact as user 2.
 For spectating mode to work, both host and clients will need to use this flag.
 
 .TP
@@ -208,7 +208,7 @@ The available commands are listed if "COMMAND" is invalid.
 .TP
 \fB--nick NICK\fR
 Pick a nickname for use with netplay.
-This is purely cosmetic, and only serves to help players identify each other.
+This is purely cosmetic, and only serves to help users identify each other.
 
 .TP
 \fB--ups PATCH, -U PATCH\fR
diff --git a/input/input_common.h b/input/input_common.h
index d50a5ba75b..8342d4d093 100644
--- a/input/input_common.h
+++ b/input/input_common.h
@@ -116,7 +116,7 @@ void input_get_bind_string(char *buf, const struct retro_keybind *bind,
 void input_translate_rk_to_str(enum retro_key key, char *buf, size_t size);
 enum retro_key input_translate_str_to_rk(const char *str);
 
-const char *input_config_get_prefix(unsigned player, bool meta);
+const char *input_config_get_prefix(unsigned user, bool meta);
 
 /* Returns RARCH_BIND_LIST_END on not found. */
 unsigned input_translate_str_to_bind_id(const char *str);