diff --git a/demo/all-together-demo-extended.scad b/demo/all-together-demo-extended.scad
index 3ccdc8f..a84a8fe 100644
--- a/demo/all-together-demo-extended.scad
+++ b/demo/all-together-demo-extended.scad
@@ -5,13 +5,13 @@
 
 include <parameters.scad>
 include <components.scad>
-use <frames/pieces/front-or-back-aux-and-neutrik.scad>
-use <frames/pieces/front-or-back-trapezoid.scad>
 use <frames/pieces/side-trapezoid-extended-to-front-trapezoid.scad>
-use <panels/inset/lever-and-dir_arc-plus-w-30mm-panel-with-oled.scad>
-use <panels/inset/sega-2p-nine-plus-aux-button-with-mount.scad>
+use <frames/pieces/front-or-back-trapezoid.scad>
+use <frames/pieces/front-or-back-aux-and-neutrik.scad>
+use <panels/inset/lever-and-ergo-wasd-five-panel-with-oled.scad>
+use <panels/inset/ergo-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/decorative-plate-ergo-wasd-five-30mm-and-ergo-nine-30mm.scad>
 use <misc/dustwasher-lsx-nobi.scad>
 
 top_panel_color        = "#0086D6";
@@ -21,17 +21,17 @@ frame_back_color       = "white";
 frame_side_color       = "yellow";
 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_with_oled();
-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();
-color(frame_front_color) translate([frame_x/2-4, 0, -2.5])  front_or_back_trapezoid_frame_piece();
-color(frame_back_color) translate([-frame_x/2+4, 0, -2.5]) rotate([180, 0, 0]) front_or_back_aux_and_neutrik_frame_piece();
-color(frame_back_color) translate([frame_x/2-4, 0, -2.5]) rotate([180, 180, 0]) front_or_back_aux_and_neutrik_frame_piece();
-color(bottom_panel_color) translate([-panel_x/2, 0, -5-frame_z/2+5]) panel();
-color(bottom_panel_color) translate([panel_x/2, 0, -5-frame_z/2+5]) panel();
+color(top_panel_color) translate([-panel_x/2, 0, frame_z/2-panel_z/2+0.001]) lever_and_ergo_wasd_five_panel_with_oled();
+color(top_panel_color) translate([panel_x/2, 0, frame_z/2-panel_z/2+0.001]) ergo_nine_plus_aux_button_panel_with_mount();
+color(frame_side_color) translate([-frame_x/2+4, 0, 0]) side_trapezoid_extended_to_front_frame_piece();
+color(frame_side_color) translate([frame_x/2-4, 0, 0]) mirror([1, 0, 0]) side_trapezoid_extended_to_front_frame_piece();
+color(frame_front_color) translate([-frame_x/2+4, 0, 0])  front_or_back_trapezoid_frame_piece();
+color(frame_front_color) translate([frame_x/2-4, 0, 0])  front_or_back_trapezoid_frame_piece();
+color(frame_back_color) translate([-frame_x/2+4, 0, 0]) rotate([180, 0, 0]) front_or_back_aux_and_neutrik_frame_piece();
+color(frame_back_color) translate([frame_x/2-4, 0, 0]) rotate([180, 180, 0]) front_or_back_aux_and_neutrik_frame_piece();
+/* color(bottom_panel_color) translate([-panel_x/2, 0, -5-frame_z/2+5]) panel(); */
+/* color(bottom_panel_color) translate([panel_x/2, 0, -5-frame_z/2+5]) panel(); */
 
-color(top_deco_color) translate([0, 0, 3+frame_z/2-panel_z]) dir_arc_plus_w_30mm_and_sega_2p_nine_decorative_plate();
-color(top_deco_color) translate([-170, 20, 3+frame_z/2-panel_z]) rotate([180, 0, 0]) lsx_nobi_dustwasher();
-color(top_deco_color) translate([panel_x-24, 30, 3+frame_z/2-panel_z]) button_24mm_decorative_plate();
+color(top_deco_color) translate([0, 0, 4+frame_z/2-panel_z/2+0.001]) ergo_wasd_five_30mm_and_ergo_nine_30mm_decorative_plate();
+color(top_deco_color) translate([-170, 25, 4+frame_z/2-panel_z/2+0.001]) lsx_nobi_dustwasher();
+color(top_deco_color) translate([panel_x-24, 30, 4+frame_z/2-panel_z/2+0.001]) button_24mm_decorative_plate();
diff --git a/demo/all-together-demo.scad b/demo/all-together-demo.scad
index 0ac6e3d..bd581f9 100644
--- a/demo/all-together-demo.scad
+++ b/demo/all-together-demo.scad
@@ -8,10 +8,10 @@ include <components.scad>
 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-aux-button-with-mount.scad>
+use <panels/inset/lever-and-ergo-wasd-five-panel-with-oled.scad>
+use <panels/inset/ergo-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/decorative-plate-ergo-wasd-five-30mm-and-ergo-nine-30mm.scad>
 use <misc/dustwasher-lsx-nobi.scad>
 
 panel_color    = "red";
@@ -19,17 +19,17 @@ base_color     = "gray";
 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_aux_button_with_mount();
+color(panel_color) translate([-panel_x/2, 0, frame_z/2-panel_z/2+0.001]) lever_and_ergo_wasd_five_panel_with_oled();
+color(panel_color) translate([panel_x/2, 0, frame_z/2-panel_z/2+0.001]) ergo_nine_plus_aux_button_panel_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();
 color(base_color) translate([-panel_x/2, 0, 0]) front_or_back_frame_piece();
 color(base_color) translate([panel_x/2, 0, 0]) rotate([180, 180, 0]) front_or_back_aux_and_neutrik_frame_piece();
 color(base_color) translate([-panel_x/2, 0, 0]) rotate([180, 0, 0]) front_or_back_aux_and_neutrik_frame_piece();
-color(base_color) translate([-panel_x/2, 0, -frame_z/2+panel_z/2]) panel();
-color(base_color) translate([panel_x/2, 0, -frame_z/2+panel_z/2]) panel();
+/* color(base_color) translate([-panel_x/2, 0, -frame_z/2+panel_z/2]) panel(); */
+/* color(base_color) translate([panel_x/2, 0, -frame_z/2+panel_z/2]) panel(); */
 
-color(top_deco_color) translate([0, 0, 4+frame_z/2-panel_z/2+0.001]) dir_arc_plus_w_30mm_and_sega_2p_nine_decorative_plate();
-color(top_deco_color) translate([-170, 20, 4+frame_z/2-panel_z/2+0.001]) lsx_nobi_dustwasher();
+color(top_deco_color) translate([0, 0, 4+frame_z/2-panel_z/2+0.001]) ergo_wasd_five_30mm_and_ergo_nine_30mm_decorative_plate();
+color(top_deco_color) translate([-170, 25, 4+frame_z/2-panel_z/2+0.001]) lsx_nobi_dustwasher();
 color(top_deco_color) translate([panel_x-24, 30, 4+frame_z/2-panel_z/2+0.001]) button_24mm_decorative_plate();