diff --git a/udev/Microsoft_X-Box_pad_v2_US.cfg b/udev/Microsoft X-Box pad (US).cfg
similarity index 85%
rename from udev/Microsoft_X-Box_pad_v2_US.cfg
rename to udev/Microsoft X-Box pad (US).cfg
index 6299816cf..e0b94c781 100644
--- a/udev/Microsoft_X-Box_pad_v2_US.cfg
+++ b/udev/Microsoft X-Box pad (US).cfg	
@@ -1,12 +1,12 @@
 input_driver = "udev"
 input_device = "Microsoft X-Box pad v2 (US)"
-input_device_display_name = "Xbox Controller"
-
-# Hex vid:pid is found using "dmesg -w" or "tail -f /var/log/syslog" and converted to Decimal using http://www.binaryhexconverter.com/hex-to-decimal-converter
-# Hex vid:pid = 045e:0289 -> Decimal vid:pid = 1118:649
+input_device_display_name = "Xbox Controller (v2)"
 input_vendor_id = "1118"
 input_product_id = "649"
-
+input_device_alt1 = "Microsoft X-Box pad v1 (US)"
+input_device_display_name_alt1 = "Xbox Controller (v1)"
+input_vendor_id_al1 = "1118"
+input_product_id_alt1 = "514"
 input_b_btn = "0"
 input_y_btn = "3"
 input_select_btn = "6"
@@ -31,7 +31,6 @@ 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_b_btn_label = "A"
 input_y_btn_label = "X"
 input_select_btn_label = "Back"
diff --git a/udev/Microsoft_X-Box_pad_v1_US.cfg b/udev/Microsoft_X-Box_pad_v1_US.cfg
deleted file mode 100644
index 27b6b673e..000000000
--- a/udev/Microsoft_X-Box_pad_v1_US.cfg
+++ /dev/null
@@ -1,58 +0,0 @@
-input_driver = "udev"
-input_device = "Microsoft X-Box pad v1 (US)"
-input_device_display_name = "Xbox Controller"
-
-# Hex vid:pid is found using "dmesg -w" or "tail -f /var/log/syslog" and converted to Decimal using http://www.binaryhexconverter.com/hex-to-decimal-converter
-# Hex vid:pid = 045e:0202 -> Decimal vid:pid = 1118:514
-input_vendor_id = "1118"
-input_product_id = "514"
-
-input_b_btn = "0"
-input_y_btn = "3"
-input_select_btn = "6"
-input_start_btn = "7"
-input_up_btn = "h0up"
-input_down_btn = "h0down"
-input_left_btn = "h0left"
-input_right_btn = "h0right"
-input_a_btn = "1"
-input_x_btn = "4"
-input_l_btn = "5"
-input_r_btn = "2"
-input_l2_axis = "+2"
-input_r2_axis = "+5"
-input_l3_btn = "8"
-input_r3_btn = "9"
-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_b_btn_label = "A"
-input_y_btn_label = "X"
-input_select_btn_label = "Back"
-input_start_btn_label = "Start"
-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 = "B"
-input_x_btn_label = "Y"
-input_l_btn_label = "White"
-input_r_btn_label = "Black"
-input_l2_axis_label = "Left Trigger"
-input_r2_axis_label = "Right Trigger"
-input_l3_btn_label = "Left Stick"
-input_r3_btn_label = "Right Stick"
-input_l_x_plus_axis_label = "Left Stick Right"
-input_l_x_minus_axis_label = "Left Stick Left"
-input_l_y_plus_axis_label = "Left Stick Down"
-input_l_y_minus_axis_label = "Left Stick Up"
-input_r_x_plus_axis_label = "Right Stick Right"
-input_r_x_minus_axis_label = "Right Stick Left"
-input_r_y_plus_axis_label = "Right Stick Down"
-input_r_y_minus_axis_label = "Right Stick Up"