diff --git a/input/apple_joypad_ps3.c b/input/apple_joypad_ps3.c
index 07df538639..77b10d76aa 100644
--- a/input/apple_joypad_ps3.c
+++ b/input/apple_joypad_ps3.c
@@ -163,7 +163,7 @@ static void hidpad_ps3_set_rumble(void *data,
    }
 }
 
-pad_connection_interface_t apple_pad_ps3 = {
+pad_connection_interface_t pad_connection_ps3 = {
    hidpad_ps3_connect,
    hidpad_ps3_disconnect,
    hidpad_ps3_packet_handler,
diff --git a/input/apple_joypad_ps4.c b/input/apple_joypad_ps4.c
index 2a7becb4df..3ef1b621df 100644
--- a/input/apple_joypad_ps4.c
+++ b/input/apple_joypad_ps4.c
@@ -171,7 +171,7 @@ static void hidpad_ps4_set_rumble(void *data,
 #endif
 }
 
-pad_connection_interface_t apple_pad_ps4 = {
+pad_connection_interface_t pad_connection_ps4 = {
    hidpad_ps4_connect,
    hidpad_ps4_disconnect,
    hidpad_ps4_packet_handler,
diff --git a/input/apple_joypad_wii.c b/input/apple_joypad_wii.c
index b8802ebde2..56b3931bde 100644
--- a/input/apple_joypad_wii.c
+++ b/input/apple_joypad_wii.c
@@ -116,7 +116,7 @@ static void hidpad_wii_set_rumble(void *data,
    (void)strength;
 }
 
-pad_connection_interface_t apple_pad_wii = {
+pad_connection_interface_t pad_connection_wii = {
    hidpad_wii_connect,
    hidpad_wii_disconnect,
    hidpad_wii_packet_handler,
diff --git a/input/joypad_connection.c b/input/joypad_connection.c
index 1e845aba9d..b6f09141d6 100644
--- a/input/joypad_connection.c
+++ b/input/joypad_connection.c
@@ -59,12 +59,12 @@ int32_t pad_connection_connect(const char* name, void *data)
          pad_connection_interface_t *iface;
       } pad_map[] = 
       {
-         { "Nintendo RVL-CNT-01",         &apple_pad_wii },
+         { "Nintendo RVL-CNT-01",         &pad_connection_wii },
 #if 0
-         { "Nintendo RVL-CNT-01-UC",   &apple_pad_wii_u },
-         { "Wireless Controller",         &apple_pad_ps4 },
+         { "Nintendo RVL-CNT-01-UC",   &pad_connection_wii_u },
+         { "Wireless Controller",         &pad_connection_ps4 },
 #endif
-         { "PLAYSTATION(R)3 Controller",  &apple_pad_ps3 },
+         { "PLAYSTATION(R)3 Controller",  &pad_connection_ps3 },
          { 0, 0}
       };
 
diff --git a/input/joypad_connection.h b/input/joypad_connection.h
index 6b25b7efda..0beeb38f17 100644
--- a/input/joypad_connection.h
+++ b/input/joypad_connection.h
@@ -31,8 +31,8 @@ typedef struct pad_connection_interface
    int16_t  (*get_axis)(void *data, unsigned axis);
 } pad_connection_interface_t;
 
-extern pad_connection_interface_t apple_pad_wii;
-extern pad_connection_interface_t apple_pad_ps3;
+extern pad_connection_interface_t pad_connection_wii;
+extern pad_connection_interface_t pad_connection_ps3;
 
 int32_t pad_connection_connect(const char* name, void *data);