diff --git a/input/drivers/android_input.c b/input/drivers/android_input.c
index d786743345..bafd67cdb1 100644
--- a/input/drivers/android_input.c
+++ b/input/drivers/android_input.c
@@ -895,14 +895,15 @@ static void handle_hotplug(android_input_data_t *android_data,
             params.vid, params.pid);
 
       strlcpy(params.name, name_buf, sizeof(params.name));
-      params.idx = *port;
-      params.vid = vendorId;
-      params.pid = productId;
+
+      params.idx                 = *port;
+      params.vid                 = vendorId;
+      params.pid                 = productId;
       settings->input.pid[*port] = params.pid;
       settings->input.vid[*port] = params.vid;
 
       strlcpy(params.driver, android_joypad.ident, sizeof(params.driver));
-      input_autoconfigure_joypad(&params);
+      input_autoconfigure_connect(&params);
    }
 
    if (!string_is_empty(name_buf))
diff --git a/input/drivers/qnx_input.c b/input/drivers/qnx_input.c
index 7406d7fe8d..76547897ba 100644
--- a/input/drivers/qnx_input.c
+++ b/input/drivers/qnx_input.c
@@ -220,7 +220,7 @@ static void qnx_input_autodetect_gamepad(qnx_input_t *qnx,
 
       strlcpy(params.driver, qnx->joypad->ident, sizeof(params.driver));
 
-      input_autoconfigure_joypad(&params);
+      input_autoconfigure_connect(&params);
 
       controller->port = port;
       qnx->port_device[port] = controller;
diff --git a/input/drivers_hid/iohidmanager_hid.c b/input/drivers_hid/iohidmanager_hid.c
index 27897e2e1f..e69120c825 100644
--- a/input/drivers_hid/iohidmanager_hid.c
+++ b/input/drivers_hid/iohidmanager_hid.c
@@ -309,7 +309,7 @@ static void iohidmanager_hid_device_add_autodetect(unsigned idx,
    strlcpy(params.name, device_name, sizeof(params.name));
    strlcpy(params.driver, driver_name, sizeof(params.driver));
 
-   input_autoconfigure_joypad(&params);
+   input_autoconfigure_connect(&params);
 
    RARCH_LOG("Port %d: %s.\n", idx, device_name);
 }
diff --git a/input/drivers_hid/libusb_hid.c b/input/drivers_hid/libusb_hid.c
index 170a972786..325b8462f7 100644
--- a/input/drivers_hid/libusb_hid.c
+++ b/input/drivers_hid/libusb_hid.c
@@ -150,7 +150,7 @@ static void libusb_hid_device_add_autodetect(unsigned idx,
    strlcpy(params.name, device_name, sizeof(params.name));
    strlcpy(params.driver, driver_name, sizeof(params.driver));
 
-   input_autoconfigure_joypad(&params);
+   input_autoconfigure_connect(&params);
 }
 
 static void libusb_get_description(struct libusb_device *device,
diff --git a/input/drivers_hid/wiiusb_hid.c b/input/drivers_hid/wiiusb_hid.c
index 2ffee90604..8e71f5c3a8 100644
--- a/input/drivers_hid/wiiusb_hid.c
+++ b/input/drivers_hid/wiiusb_hid.c
@@ -152,7 +152,7 @@ static void wiiusb_hid_device_add_autodetect(unsigned idx,
    strlcpy(settings->input.device_names[idx], device_name,
 		sizeof(settings->input.device_names[idx]));
 
-   input_autoconfigure_joypad(&params);
+   input_autoconfigure_connect(&params);
 }
 
 static void wiiusb_get_description(usb_device_entry *device,
diff --git a/input/drivers_joypad/ctr_joypad.c b/input/drivers_joypad/ctr_joypad.c
index 7a140a461b..970b695599 100644
--- a/input/drivers_joypad/ctr_joypad.c
+++ b/input/drivers_joypad/ctr_joypad.c
@@ -44,7 +44,7 @@ static const char *ctr_joypad_name(unsigned pad)
 
 static void ctr_joypad_autodetect_add(unsigned autoconf_pad)
 {
-   settings_t *settings = config_get_ptr();
+   settings_t       *settings = config_get_ptr();
    autoconfig_params_t params = {{0}};
 
    strlcpy(settings->input.device_names[autoconf_pad],
@@ -56,7 +56,7 @@ static void ctr_joypad_autodetect_add(unsigned autoconf_pad)
    strlcpy(params.name, ctr_joypad_name(autoconf_pad), sizeof(params.name));
    strlcpy(params.driver, ctr_joypad.ident, sizeof(params.driver));
 
-   input_autoconfigure_joypad(&params);
+   input_autoconfigure_connect(&params);
 }
 
 static bool ctr_joypad_init(void *data)
diff --git a/input/drivers_joypad/dinput_joypad.c b/input/drivers_joypad/dinput_joypad.c
index 068655d0c9..9a8b517998 100644
--- a/input/drivers_joypad/dinput_joypad.c
+++ b/input/drivers_joypad/dinput_joypad.c
@@ -277,7 +277,7 @@ static BOOL CALLBACK enum_joypad_cb(const DIDEVICEINSTANCE *inst, void *p)
       params.vid = dinput_joypad_vid(g_joypad_cnt);
       params.pid = dinput_joypad_pid(g_joypad_cnt);
 
-      input_autoconfigure_joypad(&params);
+      input_autoconfigure_connect(&params);
 
       settings->input.pid[g_joypad_cnt] = params.pid;
       settings->input.vid[g_joypad_cnt] = params.vid;
diff --git a/input/drivers_joypad/gx_joypad.c b/input/drivers_joypad/gx_joypad.c
index f0babcf07f..e0ee1aa4ae 100644
--- a/input/drivers_joypad/gx_joypad.c
+++ b/input/drivers_joypad/gx_joypad.c
@@ -158,7 +158,7 @@ static void handle_hotplug(unsigned port, uint32_t ptype)
       params.idx = port;
       strlcpy(params.name, gx_joypad_name(port), sizeof(params.name));
       strlcpy(params.driver, gx_joypad.ident, sizeof(params.driver));
-      input_autoconfigure_joypad(&params);
+      input_autoconfigure_connect(&params);
    }
 }
 
diff --git a/input/drivers_joypad/linuxraw_joypad.c b/input/drivers_joypad/linuxraw_joypad.c
index d6e54d3591..263ebd8d65 100644
--- a/input/drivers_joypad/linuxraw_joypad.c
+++ b/input/drivers_joypad/linuxraw_joypad.c
@@ -175,7 +175,7 @@ static void handle_plugged_pad(void)
                /* TODO - implement VID/PID? */
                params.idx = idx;
 
-               input_autoconfigure_joypad(&params);
+               input_autoconfigure_connect(&params);
             }
          }
          /* Sometimes, device will be created before access to it is established. */
@@ -195,7 +195,7 @@ static void handle_plugged_pad(void)
                strlcpy(params.driver, linuxraw_joypad.ident, sizeof(params.driver));
                /* TODO - implement VID/PID? */
 
-               input_autoconfigure_joypad(&params);
+               input_autoconfigure_connect(&params);
             }
          }
       }
@@ -254,11 +254,11 @@ static bool linuxraw_joypad_init(void *data)
          strlcpy(params.driver, "linuxraw", sizeof(params.driver));
 
          /* TODO - implement VID/PID? */
-         input_autoconfigure_joypad(&params);
+         input_autoconfigure_connect(&params);
          linuxraw_poll_pad(pad);
       }
       else
-         input_autoconfigure_joypad(&params);
+         input_autoconfigure_connect(&params);
    }
 
    linuxraw_inotify = inotify_init();
diff --git a/input/drivers_joypad/parport_joypad.c b/input/drivers_joypad/parport_joypad.c
index 76180ae0f8..cf201e0e89 100644
--- a/input/drivers_joypad/parport_joypad.c
+++ b/input/drivers_joypad/parport_joypad.c
@@ -307,7 +307,7 @@ static bool parport_joypad_init(void *data)
          }
       }
 
-      input_autoconfigure_joypad(&params);
+      input_autoconfigure_connect(&params);
    }
 
    return true;
diff --git a/input/drivers_joypad/ps3_joypad.c b/input/drivers_joypad/ps3_joypad.c
index 4f8cdf01cc..1950473d3a 100644
--- a/input/drivers_joypad/ps3_joypad.c
+++ b/input/drivers_joypad/ps3_joypad.c
@@ -54,7 +54,7 @@ static void ps3_joypad_autodetect_add(unsigned autoconf_pad)
    strlcpy(params.name, ps3_joypad_name(autoconf_pad), sizeof(params.name));
    strlcpy(params.driver, ps3_joypad.ident, sizeof(params.driver));
 
-   input_autoconfigure_joypad(&params);
+   input_autoconfigure_connect(&params);
 }
 
 static bool ps3_joypad_init(void *data)
diff --git a/input/drivers_joypad/psp_joypad.c b/input/drivers_joypad/psp_joypad.c
index f3e6edd483..66184d937e 100644
--- a/input/drivers_joypad/psp_joypad.c
+++ b/input/drivers_joypad/psp_joypad.c
@@ -83,7 +83,8 @@ static void psp_joypad_autodetect_add(unsigned autoconf_pad)
    params.idx = autoconf_pad;
    strlcpy(params.name, psp_joypad_name(autoconf_pad), sizeof(params.name));
    strlcpy(params.driver, psp_joypad.ident, sizeof(params.driver));
-   input_autoconfigure_joypad(&params);
+
+   input_autoconfigure_connect(&params);
 }
 
 static bool psp_joypad_init(void *data)
diff --git a/input/drivers_joypad/qnx_joypad.c b/input/drivers_joypad/qnx_joypad.c
index f12501f857..30c9646458 100644
--- a/input/drivers_joypad/qnx_joypad.c
+++ b/input/drivers_joypad/qnx_joypad.c
@@ -44,7 +44,7 @@ static bool qnx_joypad_init(void *data)
       strlcpy(params.name,   qnx_joypad_name(autoconf_pad), sizeof(params.name));
       strlcpy(params.driver, qnx_joypad.ident, sizeof(params.driver));
 
-      input_autoconfigure_joypad(&params);
+      input_autoconfigure_connect(&params);
    }
 
    return true;
diff --git a/input/drivers_joypad/sdl_joypad.c b/input/drivers_joypad/sdl_joypad.c
index b88b3cd1e8..fa761c93c3 100644
--- a/input/drivers_joypad/sdl_joypad.c
+++ b/input/drivers_joypad/sdl_joypad.c
@@ -144,13 +144,14 @@ static void sdl_pad_connect(unsigned id)
    product    = guid_ptr[1];
 #endif
 #endif
-   params.idx = id;
-   strlcpy(params.name, sdl_pad_name(id), sizeof(params.name));
-   params.vid = vendor;
-   params.pid = product;
+   strlcpy(params.name,   sdl_pad_name(id), sizeof(params.name));
    strlcpy(params.driver, sdl_joypad.ident, sizeof(params.driver));
 
-   input_autoconfigure_joypad(&params);
+   params.idx = id;
+   params.vid = vendor;
+   params.pid = product;
+
+   input_autoconfigure_connect(&params);
 
    RARCH_LOG("[SDL]: Device #%u (%04x:%04x) connected: %s.\n", id, vendor,
              product, sdl_pad_name(id));
diff --git a/input/drivers_joypad/udev_joypad.c b/input/drivers_joypad/udev_joypad.c
index c876e0d076..d57609ab38 100644
--- a/input/drivers_joypad/udev_joypad.c
+++ b/input/drivers_joypad/udev_joypad.c
@@ -282,15 +282,17 @@ static int udev_add_pad(struct udev_device *dev, unsigned p, int fd, const char
 
    if (!string_is_empty(pad->ident))
    {
-      params.idx = p;
       strlcpy(params.name, pad->ident, sizeof(params.name));
-      params.vid = pad->vid;
-      params.pid = pad->pid;
+
+      params.idx             = p;
+      params.vid             = pad->vid;
+      params.pid             = pad->pid;
       settings->input.pid[p] = params.pid;
       settings->input.vid[p] = params.vid;
+
       strlcpy(settings->input.device_names[p], params.name, sizeof(settings->input.device_names[p]));
       strlcpy(params.driver, udev_joypad.ident, sizeof(params.driver));
-      input_autoconfigure_joypad(&params);
+      input_autoconfigure_connect(&params);
 
       ret = 1;
    }
diff --git a/input/drivers_joypad/wiiu_joypad.c b/input/drivers_joypad/wiiu_joypad.c
index 02beb01fd9..0fdaf9a1e8 100644
--- a/input/drivers_joypad/wiiu_joypad.c
+++ b/input/drivers_joypad/wiiu_joypad.c
@@ -63,7 +63,7 @@ static void wiiu_joypad_autodetect_add(unsigned autoconf_pad)
    strlcpy(params.name, wiiu_joypad_name(autoconf_pad), sizeof(params.name));
    strlcpy(params.driver, wiiu_joypad.ident, sizeof(params.driver));
 
-   input_autoconfigure_joypad(&params);
+   input_autoconfigure_connect(&params);
 }
 
 static bool wiiu_joypad_button(unsigned port_num, uint16_t key)
diff --git a/input/drivers_joypad/xdk_joypad.c b/input/drivers_joypad/xdk_joypad.c
index c18bf6cdac..6ba0315f0d 100644
--- a/input/drivers_joypad/xdk_joypad.c
+++ b/input/drivers_joypad/xdk_joypad.c
@@ -55,7 +55,7 @@ static void xdk_joypad_autodetect_add(unsigned autoconf_pad)
    params.idx = autoconf_pad;
    strlcpy(params.name, xdk_joypad_name(autoconf_pad), sizeof(params.name));
    strlcpy(params.driver, xdk_joypad.ident, sizeof(params.driver));
-   input_autoconfigure_joypad(&params);
+   input_autoconfigure_connect(&params);
 }
 
 static bool xdk_joypad_init(void *data)
diff --git a/input/drivers_joypad/xinput_joypad.c b/input/drivers_joypad/xinput_joypad.c
index 71c145a080..df03433ce4 100644
--- a/input/drivers_joypad/xinput_joypad.c
+++ b/input/drivers_joypad/xinput_joypad.c
@@ -268,7 +268,7 @@ static bool xinput_joypad_init(void *data)
          params.idx = autoconf_pad;
          strlcpy(params.name, xinput_joypad_name(autoconf_pad), sizeof(params.name));
          strlcpy(params.driver, xinput_joypad.ident, sizeof(params.driver));
-         input_autoconfigure_joypad(&params);
+         input_autoconfigure_connect(&params);
       }
    }
 
diff --git a/input/input_autodetect.c b/input/input_autodetect.c
index 1a44b002d6..809102d139 100644
--- a/input/input_autodetect.c
+++ b/input/input_autodetect.c
@@ -295,7 +295,7 @@ static bool input_autoconfigure_joypad_init(autoconfig_params_t *params)
    return true;
 }
 
-bool input_autoconfigure_joypad(autoconfig_params_t *params)
+bool input_autoconfigure_connect(autoconfig_params_t *params)
 {
    char msg[255];
 
diff --git a/input/input_autodetect.h b/input/input_autodetect.h
index 3d6360a9a0..5957f23bd0 100644
--- a/input/input_autodetect.h
+++ b/input/input_autodetect.h
@@ -32,7 +32,7 @@ typedef struct autoconfig_params
    int32_t pid;
 } autoconfig_params_t;
 
-bool input_autoconfigure_joypad(autoconfig_params_t *params);
+bool input_autoconfigure_connect(autoconfig_params_t *params);
 
 void input_autoconfigure_disconnect(unsigned i, const char *ident);