diff --git a/android/Sony_DualShock_4_Controller.cfg b/android/Sony_DualShock_4_Controller.cfg
deleted file mode 100644
index c3a82b6c9..000000000
--- a/android/Sony_DualShock_4_Controller.cfg
+++ /dev/null
@@ -1,56 +0,0 @@
-input_driver = "android"
-input_device = "Sony Computer Entertainment Wireless Controller"
-input_device_display_name = "Sony DualShock 4 Controller"
-input_vendor_id = "1356"
-input_product_id = "1476"
-input_b_btn = "96"
-input_y_btn = "99"
-input_select_btn = "4"
-input_start_btn = "108"
-input_up_btn = "h0up"
-input_down_btn = "h0down"
-input_left_btn = "h0left"
-input_right_btn = "h0right"
-input_a_btn = "97"
-input_x_btn = "100"
-input_l_btn = "102"
-input_r_btn = "103"
-input_l2_btn = "104"
-input_r2_btn = "105"
-input_l3_btn = "106"
-input_r3_btn = "107"
-input_l_x_plus_axis = "+0"
-input_l_x_minus_axis = "-0"
-input_l_y_plus_axis = "+1"
-input_l_y_minus_axis = "-1"
-input_r_x_plus_axis = "+2"
-input_r_x_minus_axis = "-2"
-input_r_y_plus_axis = "+3"
-input_r_y_minus_axis = "-3"
-input_menu_toggle_btn = "109"
-
-input_b_btn_label = "Cross"
-input_y_btn_label = "Square"
-input_select_btn_label = "Share"
-input_start_btn_label = "Options"
-input_up_btn_label = "D-Pad Up"
-input_down_btn_label = "D-Pad Down"
-input_left_btn_label = "D-Pad Left"
-input_right_btn_label = "D-Pad Right"
-input_a_btn_label = "Circle"
-input_x_btn_label = "Triangle"
-input_l_btn_label = "L1"
-input_r_btn_label = "R1"
-input_l2_btn_label = "L2"
-input_r2_btn_label = "R2"
-input_l3_btn_label = "L3"
-input_r3_btn_label = "R3"
-input_l_x_plus_axis_label = "Left Analog X+"
-input_l_x_minus_axis_label = "Left Analog X-"
-input_l_y_plus_axis_label = "Left Analog Y+"
-input_l_y_minus_axis_label = "Left Analog Y-"
-input_r_x_plus_axis_label = "Right Analog X+"
-input_r_x_minus_axis_label = "Right Analog X-"
-input_r_y_plus_axis_label = "Right Analog Y+"
-input_r_y_minus_axis_label = "Right Analog Y-"
-input_menu_toggle_label = "Touchpad"
diff --git a/android/Sony_DualShock_4_Controller_v2.cfg b/android/Wireless Controller.cfg
similarity index 54%
rename from android/Sony_DualShock_4_Controller_v2.cfg
rename to android/Wireless Controller.cfg
index 35838fddb..10d09d3c5 100644
--- a/android/Sony_DualShock_4_Controller_v2.cfg
+++ b/android/Wireless Controller.cfg	
@@ -1,57 +1,59 @@
 input_driver = "android"
-input_device = "Sony Interactive Entertainment Wireless Controller"
-input_device_display_name = "Sony DualShock 4 Controller (v2)"
+input_device = "Wireless Controller"
+input_device_display_name = "Wireless Controller (DualShock 4 v2)"
 input_vendor_id = "1356"
 input_product_id = "2508"
-
+input_device_alt1 = "Sony Computer Entertainment Wireless Controller"
+input_device_display_name_alt1 = "Sony Computer Entertainment Wireless Controller (DualShock 4 v1)"
+input_vendor_id_alt1 = "1356"
+input_product_id_alt1 = "1476"
+input_b_btn = "96"
+input_y_btn = "99"
+input_select_btn = "109"
+input_start_btn = "108"
 input_up_btn = "h0up"
 input_down_btn = "h0down"
 input_left_btn = "h0left"
 input_right_btn = "h0right"
-input_b_btn = "96"
 input_a_btn = "97"
-input_y_btn = "99"
 input_x_btn = "100"
-input_select_btn = "109"
-input_start_btn = "108"
 input_l_btn = "102"
 input_r_btn = "103"
-input_l2_axis = "104"
-input_r2_axis = "105"
+input_l2_axis = "+6"
+input_r2_axis = "+7"
 input_l3_btn = "106"
 input_r3_btn = "107"
-input_l_y_minus_axis = "-1"
-input_l_y_plus_axis = "+1"
-input_l_x_minus_axis = "-0"
 input_l_x_plus_axis = "+0"
-input_r_y_minus_axis = "-3"
-input_r_y_plus_axis = "+3"
-input_r_x_minus_axis = "-2"
+input_l_x_minus_axis = "-0"
+input_l_y_plus_axis = "+1"
+input_l_y_minus_axis = "-1"
 input_r_x_plus_axis = "+2"
+input_r_x_minus_axis = "-2"
+input_r_y_plus_axis = "+3"
+input_r_y_minus_axis = "-3"
 input_menu_toggle_btn = "110"
-
+input_b_btn_label = "Cross"
+input_y_btn_label = "Square"
+input_select_btn_label = "Share"
+input_start_btn_label = "Options"
 input_up_btn_label = "D-Pad Up"
 input_down_btn_label = "D-Pad Down"
 input_left_btn_label = "D-Pad Left"
 input_right_btn_label = "D-Pad Right"
-input_b_btn_label = "Cross"
 input_a_btn_label = "Circle"
-input_y_btn_label = "Square"
 input_x_btn_label = "Triangle"
-input_select_btn_label = "Share"
-input_start_btn_label = "Options"
 input_l_btn_label = "L1"
 input_r_btn_label = "R1"
-input_l2_axis_label = "L2"
-input_r2_axis_label = "R2"
+input_l2_axis_label = "L2 Trigger"
+input_r2_axis_label = "R2 Trigger"
 input_l3_btn_label = "L3"
 input_r3_btn_label = "R3"
-input_l_y_minus_axis_label = "Left Analog Y-"
-input_l_y_plus_axis_label = "Left Analog Y+"
-input_l_x_minus_axis_label = "Left Analog X-"
-input_l_x_plus_axis_label = "Left Analog X+"
-input_r_y_minus_axis_label = "Right Analog Y-"
-input_r_y_plus_axis_label = "Right Analog Y+"
-input_r_x_minus_axis_label = "Right Analog X-"
-input_r_x_plus_axis_label = "Right Analog X+"
-input_menu_toggle_btn_label = "PS button"
+input_l_x_plus_axis_label = "Left Analog X+ (Right)"
+input_l_x_minus_axis_label = "Left Analog X- (Left)"
+input_l_y_plus_axis_label = "Left Analog Y+ (Down)"
+input_l_y_minus_axis_label = "Left Analog Y- (Up)"
+input_r_x_plus_axis_label = "Right Analog X+ (Right)"
+input_r_x_minus_axis_label = "Right Analog X- (Left)"
+input_r_y_plus_axis_label = "Right Analog Y+ (Down)"
+input_r_y_minus_axis_label = "Right Analog Y- (Up)"
+input_menu_toggle_btn_label = "PS"