diff --git a/input/drivers_joypad/linuxraw_joypad.c b/input/drivers_joypad/linuxraw_joypad.c
index d1e8efe853..469040dfb4 100644
--- a/input/drivers_joypad/linuxraw_joypad.c
+++ b/input/drivers_joypad/linuxraw_joypad.c
@@ -91,20 +91,20 @@ static bool linuxraw_joypad_init_pad(const char *path, struct linuxraw_joypad *p
    {
       if (ioctl(pad->fd, JSIOCGNAME(sizeof(settings->input.device_names[0])), pad->ident) >= 0)
       {
-         RARCH_LOG("[Joypad]: Found pad: %s on %s.\n", pad->ident, path);
+         RARCH_LOG("[Device]: Found pad: %s on %s.\n", pad->ident, path);
 
 #ifndef IS_JOYCONFIG
          if (g_hotplug)
          {
             char msg[512];
-            snprintf(msg, sizeof(msg), "Joypad #%u (%s) connected.", (unsigned)(pad - linuxraw_pads), pad->ident);
+            snprintf(msg, sizeof(msg), "Device #%u (%s) connected.", (unsigned)(pad - linuxraw_pads), pad->ident);
             rarch_main_msg_queue_push(msg, 0, 60, false);
          }
 #endif
       }
 
       else
-         RARCH_ERR("[Joypad]: Didn't find ident of %s.\n", path);
+         RARCH_ERR("[Device]: Didn't find ident of %s.\n", path);
 
       struct epoll_event event;
       event.events = EPOLLIN;
@@ -113,7 +113,7 @@ static bool linuxraw_joypad_init_pad(const char *path, struct linuxraw_joypad *p
       return true;
    }
 
-   RARCH_ERR("[Joypad]: Failed to open pad %s (error: %s).\n", path, strerror(errno));
+   RARCH_ERR("[Device]: Failed to open pad %s (error: %s).\n", path, strerror(errno));
    return false;
 }
 
@@ -160,7 +160,7 @@ static void handle_plugged_pad(void)
                }
 #endif
 
-               RARCH_LOG("[Joypad]: Device %s disconnected.\n", linuxraw_pads[idx].ident);
+               RARCH_LOG("[Device]: Device %s disconnected.\n", linuxraw_pads[idx].ident);
                close(linuxraw_pads[idx].fd);
                linuxraw_pads[idx].buttons = 0;
                memset(linuxraw_pads[idx].axes, 0, sizeof(linuxraw_pads[idx].axes));
diff --git a/input/drivers_joypad/sdl_joypad.c b/input/drivers_joypad/sdl_joypad.c
index 44c8a20934..82736f7152 100644
--- a/input/drivers_joypad/sdl_joypad.c
+++ b/input/drivers_joypad/sdl_joypad.c
@@ -145,13 +145,13 @@ static void sdl_pad_connect(unsigned id)
 
    input_config_autoconfigure_joypad(&params);
 
-   RARCH_LOG("[SDL]: Joypad #%u (%04x:%04x) connected: %s.\n", id, vendor,
+   RARCH_LOG("[SDL]: Device #%u (%04x:%04x) connected: %s.\n", id, vendor,
              product, sdl_pad_name(id));
 
 #ifdef HAVE_SDL2
 
    if (pad->controller)
-      RARCH_LOG("[SDL]: Joypad #%u supports game controller api.\n", id);
+      RARCH_LOG("[SDL]: Device #%u supports game controller api.\n", id);
 
    pad->haptic = g_has_haptic ? SDL_HapticOpenFromJoystick(pad->joypad) : NULL;
 
@@ -172,7 +172,7 @@ static void sdl_pad_connect(unsigned id)
       if (SDL_HapticEffectSupported(pad->haptic, &efx) == SDL_FALSE)
       {
          pad->rumble_effect = -2;
-         RARCH_WARN("[SDL]: Joypad #%u does not support rumble.\n", id);
+         RARCH_WARN("[SDL]: Device #%u does not support rumble.\n", id);
       }
    }
 #endif
@@ -184,10 +184,10 @@ static void sdl_pad_connect(unsigned id)
 #ifdef HAVE_SDL2
    pad->num_balls   = SDL_JoystickNumBalls(pad->joypad);
 
-   RARCH_LOG("[SDL]: Joypad #%u has: %u axes, %u buttons, %u hats and %u trackballs.\n",
+   RARCH_LOG("[SDL]: Device #%u has: %u axes, %u buttons, %u hats and %u trackballs.\n",
              id, pad->num_axes, pad->num_buttons, pad->num_hats, pad->num_balls);
 #else
-   RARCH_LOG("[SDL]: Joypad #%u has: %u axes, %u buttons, %u hats.\n",
+   RARCH_LOG("[SDL]: Device #%u has: %u axes, %u buttons, %u hats.\n",
              id, pad->num_axes, pad->num_buttons, pad->num_hats);
 #endif
 }
diff --git a/input/input_joypad.c b/input/input_joypad.c
index ee5d7850c1..3711bffb46 100644
--- a/input/input_joypad.c
+++ b/input/input_joypad.c
@@ -26,7 +26,7 @@
 
 /**
  * input_joypad_name:  
- * @drv                     : Joypad driver handle.
+ * @drv                     : Input device driver handle.
  * @port                    : Joystick number.
  *
  * Gets name of the joystick (@port).
@@ -43,7 +43,7 @@ const char *input_joypad_name(const rarch_joypad_driver_t *drv,
 
 /**
  * input_joypad_set_rumble:
- * @drv                     : Joypad driver handle.
+ * @drv                     : Input device driver handle.
  * @port                    : User number.
  * @effect                  : Rumble effect to set.
  * @strength                : Strength of rumble effect.
@@ -69,7 +69,7 @@ bool input_joypad_set_rumble(const rarch_joypad_driver_t *drv,
 
 /**
  * input_joypad_is_pressed:
- * @drv                     : Joypad driver handle.
+ * @drv                     : Input device driver handle.
  * @port                    : User number.
  * @binds                   : Binds of user.
  * @key                     : Identifier of key.
@@ -120,7 +120,7 @@ bool input_joypad_pressed(
 
 /**
  * input_joypad_analog:
- * @drv                     : Joypad driver handle.
+ * @drv                     : Input device driver handle.
  * @port                    : User number.
  * @idx                     : Analog key index.
  *                            E.g.: 
@@ -198,7 +198,7 @@ int16_t input_joypad_analog(const rarch_joypad_driver_t *drv,
 
 /**
  * input_joypad_axis_raw:  
- * @drv                     : Joypad driver handle.
+ * @drv                     : Input device driver handle.
  * @port                    : Joystick number.
  * @axis                    : Identifier of axis.
  *
@@ -219,7 +219,7 @@ int16_t input_joypad_axis_raw(const rarch_joypad_driver_t *drv,
 
 /**
  * input_joypad_button_raw:
- * @drv                     : Joypad driver handle.
+ * @drv                     : Input device driver handle.
  * @port                    : Joystick number.
  * @button                  : Identifier of key.
  *
diff --git a/input/input_joypad.h b/input/input_joypad.h
index 79f5fdc144..bd14e4cde6 100644
--- a/input/input_joypad.h
+++ b/input/input_joypad.h
@@ -70,7 +70,7 @@ static INLINE void input_conv_analog_id_to_bind_id(unsigned idx, unsigned ident,
 
 /**
  * input_joypad_pressed:
- * @drv                     : Joypad driver handle.
+ * @drv                     : Input device driver handle.
  * @port                    : User number.
  * @binds                   : Binds of user.
  * @key                     : Identifier of key.
@@ -86,7 +86,7 @@ bool input_joypad_pressed(const rarch_joypad_driver_t *driver,
 
 /**
  * input_joypad_analog:
- * @drv                     : Joypad driver handle.
+ * @drv                     : Input device driver handle.
  * @port                    : User number.
  * @idx                     : Analog key index.
  *                            E.g.: 
@@ -109,7 +109,7 @@ int16_t input_joypad_analog(const rarch_joypad_driver_t *driver,
 
 /**
  * input_joypad_set_rumble:
- * @drv                     : Joypad driver handle.
+ * @drv                     : Input device driver handle.
  * @port                    : User number.
  * @effect                  : Rumble effect to set.
  * @strength                : Strength of rumble effect.
@@ -123,7 +123,7 @@ bool input_joypad_set_rumble(const rarch_joypad_driver_t *driver,
 
 /**
  * input_joypad_axis_raw:  
- * @drv                     : Joypad driver handle.
+ * @drv                     : Input device driver handle.
  * @port                    : Joystick number.
  * @axis                    : Identifier of axis.
  *
@@ -138,7 +138,7 @@ int16_t input_joypad_axis_raw(const rarch_joypad_driver_t *driver,
 
 /**
  * input_joypad_button_raw:
- * @drv                     : Joypad driver handle.
+ * @drv                     : Input device driver handle.
  * @port                    : Joystick number.
  * @button                  : Identifier of key.
  *
@@ -156,7 +156,7 @@ bool input_joypad_hat_raw(const rarch_joypad_driver_t *driver,
 
 /**
  * input_joypad_name:  
- * @drv                     : Joypad driver handle.
+ * @drv                     : Input device driver handle.
  * @port                    : Joystick number.
  *
  * Gets name of the joystick (@port).
diff --git a/retroarch.cfg b/retroarch.cfg
index e2c1c4b9d8..0187dc6cd1 100644
--- a/retroarch.cfg
+++ b/retroarch.cfg
@@ -329,7 +329,7 @@
 # Input driver. Depending on video driver, it might force a different input driver.
 # input_driver = sdl
 
-# Joypad driver. (Valid: linuxraw, sdl, dinput)
+# Input device driver. (Valid: linuxraw, sdl, dinput)
 # input_joypad_driver =
 
 # Path to input remapping file.
@@ -447,7 +447,7 @@
 # input_player7_joypad_index = 6
 # input_player8_joypad_index = 7
 
-# Joypad buttons.
+# Input device buttons.
 # Figure these out by using RetroArch-Phoenix or retroarch-joyconfig.
 # You can use joypad hats with hnxx, where n is the hat, and xx is a string representing direction. 
 # E.g. "h0up"