diff --git a/udev/Sony-PlayStation4-DualShock4v2-Controller.cfg b/udev/Sony DualShock 4 Controller.cfg
similarity index 65%
rename from udev/Sony-PlayStation4-DualShock4v2-Controller.cfg
rename to udev/Sony DualShock 4 Controller.cfg
index 236e6512c..568e7e726 100644
--- a/udev/Sony-PlayStation4-DualShock4v2-Controller.cfg
+++ b/udev/Sony DualShock 4 Controller.cfg	
@@ -1,7 +1,20 @@
-input_device = "Sony Interactive Entertainment Wireless Controller"
 input_driver = "udev"
+input_device = "Sony Interactive Entertainment Wireless Controller"
+input_device_display_name = "Sony Interactive Entertainment Wireless Controller (DualShock 4 v2)"
 input_vendor_id = "1356"
 input_product_id = "2508"
+input_device_alt1 = "Wireless Controller"
+input_device_display_name_alt1 = "Wireless Controller (DualShock 4 v2)"
+input_vendor_id_alt1 = "1356"
+input_product_id_alt1 = "2508"
+input_device_alt2 = "Sony Dualshock 4 Wireless - 500 Million Limited Edition"
+input_device_display_name_alt2 = "Sony Dualshock 4 Wireless - 500 Million Limited Edition (DualShock 4 v2)"
+input_vendor_id_alt2 = "1356"
+input_product_id_alt2 = "2508"
+input_device_alt3 = "Sony Computer Entertainment Wireless Controller"
+input_device_display_name_alt3 = "Sony Computer Entertainment Wireless (DualShock 4 v1)"
+input_vendor_id_alt3 = "1356"
+input_product_id_alt3 = "1476"
 input_b_btn = "0"
 input_y_btn = "3"
 input_select_btn = "8"
@@ -27,7 +40,6 @@ input_r_x_minus_axis = "-3"
 input_r_y_plus_axis = "+4"
 input_r_y_minus_axis = "-4"
 input_menu_toggle_btn = "10"
-
 input_b_btn_label = "Cross"
 input_y_btn_label = "Square"
 input_select_btn_label = "Share"
@@ -40,8 +52,8 @@ input_a_btn_label = "Circle"
 input_x_btn_label = "Triangle"
 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_x_plus_axis_label = "Left Analog Right"
diff --git a/udev/Sony-PlayStation4-DualShock4-Controller-Bluetooth.cfg b/udev/Sony-PlayStation4-DualShock4-Controller-Bluetooth.cfg
deleted file mode 100644
index 7b227a0fa..000000000
--- a/udev/Sony-PlayStation4-DualShock4-Controller-Bluetooth.cfg
+++ /dev/null
@@ -1,55 +0,0 @@
-input_driver = "udev"
-input_device = "Wireless Controller"
-input_vendor_id = "1356"
-input_product_id = "1476"
-input_b_btn = "0"
-input_y_btn = "3"
-input_select_btn = "8"
-input_start_btn = "9"
-input_up_btn = "h0up"
-input_down_btn = "h0down"
-input_left_btn = "h0left"
-input_right_btn = "h0right"
-input_a_btn = "1"
-input_x_btn = "2"
-input_l_btn = "4"
-input_r_btn = "5"
-input_l2_btn = "6"
-input_r2_btn = "7"
-input_l3_btn = "11"
-input_r3_btn = "12"
-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 = "+3"
-input_r_x_minus_axis = "-3"
-input_r_y_plus_axis = "+4"
-input_r_y_minus_axis = "-4"
-input_menu_toggle_btn = "10"
-
-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 Right"
-input_l_x_minus_axis_label = "Left Analog Left"
-input_l_y_plus_axis_label = "Left Analog Down"
-input_l_y_minus_axis_label = "Left Analog Up"
-input_r_x_plus_axis_label = "Right Analog Right"
-input_r_x_minus_axis_label = "Right Analog Left"
-input_r_y_plus_axis_label = "Right Analog Down"
-input_r_y_minus_axis_label = "Right Analog Up"
-input_menu_toggle_btn_label = "PS"
diff --git a/udev/Sony-PlayStation4-DualShock4-Controller.cfg b/udev/Sony-PlayStation4-DualShock4-Controller.cfg
deleted file mode 100644
index dde4f9219..000000000
--- a/udev/Sony-PlayStation4-DualShock4-Controller.cfg
+++ /dev/null
@@ -1,65 +0,0 @@
-# IMPORTANT NOTICE !!!
-#
-# This profile uses the native official kernel module "hid_sony" which is maintained and has been present for a fairly long time now
-# The userspace tool "ds4drv" mapped this differently, but "ds4drv" has been deprecated since 2017
-# Sadly there is currently no way for retroarch to tell which of the kernel module or the userspace tool is in use
-# Because of this, we must consider the user is using the modern recommended method here
-# Users that would still be using "ds4drv" should migrate to the modern method
-#
-# FOR CONSISTENCY'S SAKE, PLEASE DON'T REVERT THIS TO THE DS4DRV WAY ANYMORE !!!
-
-input_driver = "udev"
-input_device = "Sony Computer Entertainment Wireless Controller"
-input_vendor_id = "1356"
-input_product_id = "1476"
-input_b_btn = "0"
-input_y_btn = "3"
-input_select_btn = "8"
-input_start_btn = "9"
-input_up_btn = "h0up"
-input_down_btn = "h0down"
-input_left_btn = "h0left"
-input_right_btn = "h0right"
-input_a_btn = "1"
-input_x_btn = "2"
-input_l_btn = "4"
-input_r_btn = "5"
-input_l2_axis = "+2"
-input_r2_axis = "+5"
-input_l3_btn = "11"
-input_r3_btn = "12"
-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 = "+3"
-input_r_x_minus_axis = "-3"
-input_r_y_plus_axis = "+4"
-input_r_y_minus_axis = "-4"
-input_menu_toggle_btn = "10"
-
-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_axis_label = "L2"
-input_r2_axis_label = "R2"
-input_l3_btn_label = "L3"
-input_r3_btn_label = "R3"
-input_l_x_plus_axis_label = "Left Analog Right"
-input_l_x_minus_axis_label = "Left Analog Left"
-input_l_y_plus_axis_label = "Left Analog Down"
-input_l_y_minus_axis_label = "Left Analog Up"
-input_r_x_plus_axis_label = "Right Analog Right"
-input_r_x_minus_axis_label = "Right Analog Left"
-input_r_y_plus_axis_label = "Right Analog Down"
-input_r_y_minus_axis_label = "Right Analog Up"
-input_menu_toggle_btn_label = "PS"
diff --git a/udev/Sony_PlayStation4_Dualshock4_500-Million_Limited_Edition.cfg b/udev/Sony_PlayStation4_Dualshock4_500-Million_Limited_Edition.cfg
deleted file mode 100644
index 61f0affb8..000000000
--- a/udev/Sony_PlayStation4_Dualshock4_500-Million_Limited_Edition.cfg
+++ /dev/null
@@ -1,55 +0,0 @@
-input_driver = "udev"
-input_device = "Sony Dualshock 4 Wireless - 500 Million Limited Edition"
-input_vendor_id = "1356"
-input_product_id = "2508"
-input_a_btn = "2"
-input_b_btn = "1"
-input_select_btn = "8"
-input_start_btn = "9"
-input_x_btn = "3"
-input_y_btn = "0"
-input_l_btn = "4"
-input_l2_btn = "6"
-input_l3_btn = "10"
-input_r_btn = "5"
-input_r2_btn = "7"
-input_r3_btn = "11"
-input_up_btn = "h0up"
-input_down_btn = "h0down"
-input_left_btn = "h0left"
-input_right_btn = "h0right"
-input_l_x_minus_axis = "-0"
-input_l_x_plus_axis = "+0"
-input_l_y_minus_axis = "-1"
-input_l_y_plus_axis = "+1"
-input_r_x_minus_axis = "-2"
-input_r_x_plus_axis = "+2"
-input_r_y_minus_axis = "-5"
-input_r_y_plus_axis = "+5"
-input_menu_toggle_btn = "12"
-
-input_a_btn_label = "Circle"
-input_b_btn_label = "Cross"
-input_x_btn_label = "Triangle"
-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_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 Right"
-input_l_x_minus_axis_label = "Left Analog Left"
-input_l_y_plus_axis_label = "Left Analog Down"
-input_l_y_minus_axis_label = "Left Analog Up"
-input_r_x_plus_axis_label = "Right Analog Right"
-input_r_x_minus_axis_label = "Right Analog Left"
-input_r_y_plus_axis_label = "Right Analog Down"
-input_r_y_minus_axis_label = "Right Analog Up"
-input_menu_toggle_btn_label = "PS"