diff --git a/demo/all-together-demo-extended-with-windows.scad b/demo/all-together-demo-extended-with-windows.scad
index 1e4dbe8..1f10de4 100644
--- a/demo/all-together-demo-extended-with-windows.scad
+++ b/demo/all-together-demo-extended-with-windows.scad
@@ -9,7 +9,7 @@ use <frames/pieces/side-trapezoid.scad>
 use <frames/pieces/front-or-back-aux-and-neutrik.scad>
 use <frames/pieces/front-or-back-windowed-horiz-stripes.scad>
 use <panels/inset/lever-and-dir_arc-plus-w-30mm-panel.scad>
-use <panels/inset/sega-2p-nine-plus-control-panel-with-mount.scad>
+use <panels/inset/sega-2p-nine-plus-aux-button-with-mount.scad>
 use <misc/decorative-plate-24mm-button.scad>
 use <misc/decorative-plate-dir_arc-plus-w-30mm-and-sega-2p-nine.scad>
 use <misc/dustwasher-lsx-nobi.scad>
@@ -21,7 +21,7 @@ frame_side_color       = "#8E9089";
 top_deco_color         = "#8E9089";
 
 color(top_panel_color) translate([-panel_x/2, 0, frame_z/2-panel_z+0.01]) lever_and_dir_arc_w_30mm_panel();
-color(top_panel_color) translate([panel_x/2, 0, frame_z/2-panel_z+0.01]) sega_2p_nine_plus_control_panel_with_mount();
+color(top_panel_color) translate([panel_x/2, 0, frame_z/2-panel_z+0.01]) sega_2p_nine_plus_aux_button_with_mount();
 color(frame_side_color) translate([-frame_x/2+4, 0, -2.5]) side_trapezoid_frame_piece();
 color(frame_side_color) translate([frame_x/2-4, 0, -2.5]) mirror([1, 0, 0]) side_trapezoid_frame_piece();
 color(frame_top_bottom_color) translate([-frame_x/2+4, 0, -2.5])  horiz_striped_windowed_front_or_back_frame_piece();
diff --git a/demo/all-together-demo-extended.scad b/demo/all-together-demo-extended.scad
index 2f5edb0..971fbfc 100644
--- a/demo/all-together-demo-extended.scad
+++ b/demo/all-together-demo-extended.scad
@@ -9,7 +9,7 @@ use <frames/pieces/front-or-back-trapezoid.scad>
 use <frames/pieces/side-trapezoid-extended-to-front-trapezoid.scad>
 use <frames/pieces/front-or-back-aux-and-neutrik.scad>
 use <panels/inset/lever-and-dir_arc-plus-w-30mm-panel.scad>
-use <panels/inset/sega-2p-nine-plus-control-panel-with-mount.scad>
+use <panels/inset/sega-2p-nine-plus-aux-button-with-mount.scad>
 use <misc/decorative-plate-24mm-button.scad>
 use <misc/decorative-plate-dir_arc-plus-w-30mm-and-sega-2p-nine.scad>
 use <misc/dustwasher-lsx-nobi.scad>
@@ -22,7 +22,7 @@ frame_side_color       = "red";
 top_deco_color         = "white";
 
 color(top_panel_color) translate([-panel_x/2, 0, frame_z/2-panel_z+0.01]) lever_and_dir_arc_w_30mm_panel();
-color(top_panel_color) translate([panel_x/2, 0, frame_z/2-panel_z+0.01]) sega_2p_nine_plus_control_panel_with_mount();
+color(top_panel_color) translate([panel_x/2, 0, frame_z/2-panel_z+0.01]) sega_2p_nine_plus_aux_button_with_mount();
 color(frame_side_color) translate([-frame_x/2+4, 0, -2.5]) side_trapezoid_extended_to_front_frame_piece();
 color(frame_side_color) translate([frame_x/2-4, 0, -2.5]) mirror([1, 0, 0]) side_trapezoid_extended_to_front_frame_piece();
 color(frame_front_color) translate([-frame_x/2+4, 0, -2.5])  front_or_back_trapezoid_frame_piece();
diff --git a/demo/all-together-demo.scad b/demo/all-together-demo.scad
index 5e2fe76..d1c704f 100644
--- a/demo/all-together-demo.scad
+++ b/demo/all-together-demo.scad
@@ -9,7 +9,7 @@ use <frames/pieces/side.scad>
 use <frames/pieces/front-or-back.scad>
 use <frames/pieces/front-or-back-aux-and-neutrik.scad>
 use <panels/inset/lever-and-dir_arc-plus-w-30mm-panel.scad>
-use <panels/inset/sega-2p-nine-plus-control-panel-with-mount.scad>
+use <panels/inset/sega-2p-nine-plus-aux-button-with-mount.scad>
 use <misc/decorative-plate-24mm-button.scad>
 use <misc/decorative-plate-dir_arc-plus-w-30mm-and-sega-2p-nine.scad>
 use <misc/dustwasher-lsx-nobi.scad>
@@ -21,7 +21,7 @@ top_deco_color = "white";
 brace_color    = "gray";
 
 color(panel_color) translate([-panel_x/2, 0, frame_z/2-panel_z/2+0.001]) lever_and_dir_arc_w_30mm_panel();
-color(panel_color) translate([panel_x/2, 0, frame_z/2-panel_z/2+0.001]) sega_2p_nine_plus_control_panel_with_mount();
+color(panel_color) translate([panel_x/2, 0, frame_z/2-panel_z/2+0.001]) sega_2p_nine_plus_aux_button_with_mount();
 color(base_color) translate([panel_x/2, 0, 0]) rotate([0, 180, 0]) side_frame_piece();
 color(base_color) translate([-panel_x/2, 0, 0]) side_frame_piece();
 color(base_color) translate([panel_x/2, 0, 0]) front_or_back_frame_piece();
diff --git a/demo/blown-up-demo.scad b/demo/blown-up-demo.scad
index 84bcda1..b260ab5 100644
--- a/demo/blown-up-demo.scad
+++ b/demo/blown-up-demo.scad
@@ -10,14 +10,14 @@ use <frames/pieces/side.scad>
 use <frames/pieces/front-or-back.scad>
 use <frames/pieces/front-or-back-aux-and-neutrik.scad>
 use <panels/overhang/left-lever-and-dir_arc-plus-w-30mm-panel.scad>
-use <panels/overhang/right-sega-2p-nine-plus-control-panel-with-mount.scad>
+use <panels/overhang/right-sega-2p-nine-plus-aux-button-with-mount.scad>
 use <panels/overhang/left-or-right-panel.scad>
 use <misc/decorative-plate-24mm-button.scad>
 use <misc/decorative-plate-dir_arc-plus-w-30mm-and-sega-2p-nine.scad>
 use <misc/dustwasher-lsx-nobi.scad>
 
 color("#C12E1F") translate([-panel_x/2-25, 0, frame_z/2+75]) lever_and_dir_arc_w_30mm_left_overhang_panel();
-color("#C12E1F") translate([panel_x/2+25, 0, frame_z/2+75]) sega_2p_nine_plus_control_right_overhang_panel_with_mount();
+color("#C12E1F") translate([panel_x/2+25, 0, frame_z/2+75]) sega_2p_nine_plus_aux_button_right_overhang_panel_with_mount();
 color("black") translate([-frame_x/2+5-25, -55, -2.5]) front_or_back_frame_piece();
 color("black") rotate([0, 180, 0]) translate([-frame_x/2+5-25, -55, -2.5]) front_or_back_frame_piece();
 color("black") translate([-frame_x/2+5-50, 0, -2.5]) side_frame_piece();
diff --git a/src/panels/inset/sega-2p-nine-plus-control-panel-with-mount.scad b/src/panels/inset/sega-2p-nine-plus-aux-button-with-mount.scad
similarity index 56%
rename from src/panels/inset/sega-2p-nine-plus-control-panel-with-mount.scad
rename to src/panels/inset/sega-2p-nine-plus-aux-button-with-mount.scad
index ad5ab4e..13f7191 100644
--- a/src/panels/inset/sega-2p-nine-plus-control-panel-with-mount.scad
+++ b/src/panels/inset/sega-2p-nine-plus-aux-button-with-mount.scad
@@ -5,11 +5,11 @@
 
 include <parameters.scad>
 include <components.scad>
-use <sega-2p-nine-plus-control-panel.scad>
+use <sega-2p-nine-plus-aux-button.scad>
 
-module sega_2p_nine_plus_control_panel_with_mount() {
-	sega_2p_nine_plus_control_panel();
+module sega_2p_nine_plus_aux_button_with_mount() {
+	sega_2p_nine_plus_aux_button();
 	translate([30, -50, -(panel_z/2) - 3]) pcb_mount();
 }
 
-sega_2p_nine_plus_control_panel_with_mount();
+sega_2p_nine_plus_aux_button_with_mount();
diff --git a/src/panels/inset/sega-2p-nine-plus-control-panel.scad b/src/panels/inset/sega-2p-nine-plus-aux-button.scad
similarity index 77%
rename from src/panels/inset/sega-2p-nine-plus-control-panel.scad
rename to src/panels/inset/sega-2p-nine-plus-aux-button.scad
index db8ccf6..31e27b7 100644
--- a/src/panels/inset/sega-2p-nine-plus-control-panel.scad
+++ b/src/panels/inset/sega-2p-nine-plus-aux-button.scad
@@ -6,7 +6,7 @@
 include <parameters.scad>
 include <components.scad>
 
-module sega_2p_nine_plus_control_panel() {
+module sega_2p_nine_plus_aux_button() {
 	difference() {
 		panel();
 		sega_2p_nine();
@@ -14,4 +14,4 @@ module sega_2p_nine_plus_control_panel() {
 	}
 }
 
-sega_2p_nine_plus_control_panel();
+sega_2p_nine_plus_aux_button();
diff --git a/src/panels/overhang/right-sega-2p-nine-plus-control-panel-with-mount.scad b/src/panels/overhang/right-sega-2p-nine-plus-aux-button-with-mount.scad
similarity index 50%
rename from src/panels/overhang/right-sega-2p-nine-plus-control-panel-with-mount.scad
rename to src/panels/overhang/right-sega-2p-nine-plus-aux-button-with-mount.scad
index e288f4b..7e5a228 100644
--- a/src/panels/overhang/right-sega-2p-nine-plus-control-panel-with-mount.scad
+++ b/src/panels/overhang/right-sega-2p-nine-plus-aux-button-with-mount.scad
@@ -5,11 +5,11 @@
 
 include <parameters.scad>
 include <components.scad>
-use <right-sega-2p-nine-plus-control-panel.scad>
+use <right-sega-2p-nine-plus-aux-button.scad>
 
-module sega_2p_nine_plus_control_right_overhang_panel_with_mount() {
-	sega_2p_nine_plus_control_right_overhang_panel();
+module sega_2p_nine_plus_aux_button_right_overhang_panel_with_mount() {
+	sega_2p_nine_plus_aux_button_right_overhang_panel();
 	translate([30, -50, -(panel_z/2) - 3]) pcb_mount();
 }
 
-sega_2p_nine_plus_control_right_overhang_panel_with_mount();
+sega_2p_nine_plus_aux_button_right_overhang_panel_with_mount();
diff --git a/src/panels/overhang/right-sega-2p-nine-plus-control-panel.scad b/src/panels/overhang/right-sega-2p-nine-plus-aux-button.scad
similarity index 74%
rename from src/panels/overhang/right-sega-2p-nine-plus-control-panel.scad
rename to src/panels/overhang/right-sega-2p-nine-plus-aux-button.scad
index d2e5b43..06bfbaf 100644
--- a/src/panels/overhang/right-sega-2p-nine-plus-control-panel.scad
+++ b/src/panels/overhang/right-sega-2p-nine-plus-aux-button.scad
@@ -6,7 +6,7 @@
 include <parameters.scad>
 include <components.scad>
 
-module sega_2p_nine_plus_control_right_overhang_panel() {
+module sega_2p_nine_plus_aux_button_right_overhang_panel() {
 	difference() {
 		panel_with_raised_overhang();
 		sega_2p_nine();
@@ -15,4 +15,4 @@ module sega_2p_nine_plus_control_right_overhang_panel() {
 	}
 }
 
-sega_2p_nine_plus_control_right_overhang_panel();
+sega_2p_nine_plus_aux_button_right_overhang_panel();