diff --git a/udev/Nintendo Switch - Mega Drive Genesis 3btn Controller.cfg b/udev/Nintendo Switch - Mega Drive Genesis 3btn Controller.cfg
deleted file mode 100644
index ca7df5cc1..000000000
--- a/udev/Nintendo Switch - Mega Drive Genesis 3btn Controller.cfg	
+++ /dev/null
@@ -1,32 +0,0 @@
-input_driver = "udev"
-input_device = "MD/Gen Control Pad"
-
-#These vendor and product ids conflict with the Nintendo Switch SNES Controller
-#input_vendor_id = "1406"
-#input_product_id = "8215"
-
-input_device_display_name = "Nintendo Switch Mega Drive/Genesis 3btn Controller"
-
-input_b_btn = "0"
-input_y_btn = "1"
-input_select_btn = "7"
-input_start_btn = "9"
-input_up_btn = "h0up"
-input_down_btn = "h0down"
-input_left_btn = "h0left"
-input_right_btn = "h0right"
-input_a_btn = "5"
-input_x_btn = "13"
-input_menu_toggle_btn = "12"
-
-input_b_btn_label = "B"
-input_y_btn_label = "A"
-input_select_btn_label = "MODE"
-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 = "C"
-input_x_btn_label = "Screenshot"
-input_menu_toggle_btn_label = "Home"
diff --git a/udev/MD_Gen Control Pad.cfg b/udev/Nintendo Switch - Mega Drive Genesis Controller.cfg
similarity index 70%
rename from udev/MD_Gen Control Pad.cfg
rename to udev/Nintendo Switch - Mega Drive Genesis Controller.cfg
index b6774944d..8eef818ba 100644
--- a/udev/MD_Gen Control Pad.cfg	
+++ b/udev/Nintendo Switch - Mega Drive Genesis Controller.cfg	
@@ -1,33 +1,38 @@
-input_driver = "udev"
-input_device = "MD/Gen Control Pad"
-
-input_vendor_id = "1406"
-input_product_id = "8215"
-
-input_b_btn = "0"
-input_y_btn = "1"
-input_select_btn = "7"
-input_start_btn = "9"
-input_up_btn = "h0up"
-input_down_btn = "h0down"
-input_left_btn = "h0left"
-input_right_btn = "h0right"
-input_a_btn = "5"
-input_x_btn = "2"
-input_l_btn = "6"
-input_r_btn = "4"
-input_menu_toggle_btn = "12"
-
-input_b_btn_label = "B"
-input_y_btn_label = "A"
-input_select_btn_label = "Mode"
-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 = "C"
-input_x_btn_label = "Y"
-input_l_btn_label = "X"
-input_r_btn_label = "Z"
+#This mapping works for both the Nintendo Switch Mega Drive/Genesis 3 button and 6 button controllers
+
+input_driver = "udev"
+input_device = "MD/Gen Control Pad"
+
+#These vendor and product ids conflict with the Nintendo Switch SNES Controller
+#input_vendor_id = "1406"
+#input_product_id = "8215"
+
+input_device_display_name = "Nintendo Switch Mega Drive/Genesis Controller"
+
+input_b_btn = "0"
+input_y_btn = "1"
+input_select_btn = "7"
+input_start_btn = "9"
+input_up_btn = "h0up"
+input_down_btn = "h0down"
+input_left_btn = "h0left"
+input_right_btn = "h0right"
+input_a_btn = "5"
+input_x_btn = "2"
+input_l_btn = "6"
+input_r_btn = "4"
+input_menu_toggle_btn = "12"
+
+input_b_btn_label = "B"
+input_y_btn_label = "A"
+input_select_btn_label = "Mode"
+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 = "C"
+input_x_btn_label = "Y"
+input_l_btn_label = "X"
+input_r_btn_label = "Z"
 input_menu_toggle_btn_label = "Home"
\ No newline at end of file
diff --git a/udev/N64 Controller.cfg b/udev/Nintendo Switch - N64 Controller.cfg
similarity index 55%
rename from udev/N64 Controller.cfg
rename to udev/Nintendo Switch - N64 Controller.cfg
index d816c69bd..4190cd51d 100644
--- a/udev/N64 Controller.cfg	
+++ b/udev/Nintendo Switch - N64 Controller.cfg	
@@ -1,47 +1,50 @@
-input_driver = "udev"
-input_device = "N64 Controller"
-input_vendor_id = "1406"
-input_product_id = "8217"
-
-input_b_btn = "1"
-input_a_btn = "0"
-input_y_btn = "0"
-input_start_btn = "9"
-input_select_btn = "10"
-input_up_btn = "h0up"
-input_down_btn = "h0down"
-input_left_btn = "h0left"
-input_right_btn = "h0right"
-input_l_btn = "4"
-input_r_btn = "5"
-input_l2_btn = "6"
-input_r_x_plus_btn = "8"
-input_r_x_minus_btn = "3"
-input_r_y_plus_btn = "7"
-input_r_y_minus_btn = "2"
-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_menu_toggle_btn = "12"
-
-input_b_btn_label = "A"
-input_y_btn_label = "B"
-input_start_btn_label = "Start"
-input_select_btn_label = "ZR"
-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 = "L"
-input_r_btn_label = "R"
-input_l2_btn_label = "Z"
-input_r_x_plus_btn_label = "C Right"
-input_r_x_minus_btn_label = "C Left"
-input_r_y_minus_btn_label = "C Up"
-input_r_y_plus_btn_label = "C Down"
-input_l_x_plus_axis_label = "Joystick Right"
-input_l_x_minus_axis_label = "Joystick Left"
-input_l_y_plus_axis_label = "Joystick Down"
-input_l_y_minus_axis_label = "Joystick Up"
-input_menu_toggle_btn_label = "Home"
\ No newline at end of file
+input_driver = "udev"
+input_device = "N64 Controller"
+input_vendor_id = "1406"
+input_product_id = "8217"
+
+input_device_display_name = "Nintendo Switch N64 Controller"
+
+input_b_btn = "0"
+input_select_btn = "13"
+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_l_btn = "4"
+input_r_btn = "5"
+input_l2_btn = "6"
+input_r2_btn = "10"
+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_btn = "8"
+input_r_x_minus_btn = "3"
+input_r_y_plus_btn = "7"
+input_r_y_minus_btn = "2"
+input_menu_toggle_btn = "12"
+
+input_b_btn_label = "B"
+input_select_btn_label = "Screenshot"
+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 = "A"
+input_l_btn_label = "L"
+input_r_btn_label = "R"
+input_l2_btn_label = "Z"
+input_r2_btn_label = "ZR"
+input_l_x_plus_axis_label = "Joystick X+ (Right)"
+input_l_x_minus_axis_label = "Joystick X- (Left)"
+input_l_y_plus_axis_label = "Joystick Y+ (Down)"
+input_l_y_minus_axis_label = "Joystick Y- (Up)"
+input_r_x_plus_btn_label = "C-Right"
+input_r_x_minus_btn_label = "C-Left"
+input_r_y_plus_btn_label = "C-Down"
+input_r_y_minus_btn_label = "C-Up"
+input_menu_toggle_btn_label = "Home"
diff --git a/udev/SNES Controller.cfg b/udev/Nintendo Switch - SNES Controller.cfg
similarity index 96%
rename from udev/SNES Controller.cfg
rename to udev/Nintendo Switch - SNES Controller.cfg
index 1010dda76..c6a407d33 100644
--- a/udev/SNES Controller.cfg	
+++ b/udev/Nintendo Switch - SNES Controller.cfg	
@@ -1,7 +1,7 @@
 input_driver = "udev"
 input_device = "SNES Controller"
 
-#These vendor and product ids conflict with the Nintendo Switch Mega Drive/Genesis 3btn Controller
+#These vendor and product ids conflict with the Nintendo Switch Mega Drive/Genesis Controller
 #input_vendor_id = "1406"
 #input_product_id = "8215"