diff --git a/examples/p4est_2d_dgsem/elixir_advection_nonconforming__unstructured.jl b/examples/p4est_2d_dgsem/elixir_advection_nonconforming_unstructured.jl
similarity index 100%
rename from examples/p4est_2d_dgsem/elixir_advection_nonconforming__unstructured.jl
rename to examples/p4est_2d_dgsem/elixir_advection_nonconforming_unstructured.jl
diff --git a/examples/p4est_3d_dgsem/elixir_advection_amr_p4est_unstructured_curved.jl b/examples/p4est_3d_dgsem/elixir_advection_amr_unstructured_curved.jl
similarity index 100%
rename from examples/p4est_3d_dgsem/elixir_advection_amr_p4est_unstructured_curved.jl
rename to examples/p4est_3d_dgsem/elixir_advection_amr_unstructured_curved.jl
diff --git a/examples/p4est_3d_dgsem/elixir_advection_p4est_unstructured_curved.jl b/examples/p4est_3d_dgsem/elixir_advection_unstructured_curved.jl
similarity index 100%
rename from examples/p4est_3d_dgsem/elixir_advection_p4est_unstructured_curved.jl
rename to examples/p4est_3d_dgsem/elixir_advection_unstructured_curved.jl
diff --git a/examples/tree_2d_dgsem/elixir_advection_parallelogram.jl b/examples/structured_2d_dgsem/elixir_advection_parallelogram.jl
similarity index 100%
rename from examples/tree_2d_dgsem/elixir_advection_parallelogram.jl
rename to examples/structured_2d_dgsem/elixir_advection_parallelogram.jl
diff --git a/examples/tree_2d_dgsem/elixir_advection_rotated.jl b/examples/structured_2d_dgsem/elixir_advection_rotated.jl
similarity index 100%
rename from examples/tree_2d_dgsem/elixir_advection_rotated.jl
rename to examples/structured_2d_dgsem/elixir_advection_rotated.jl
diff --git a/examples/tree_2d_dgsem/elixir_advection_waving_flag.jl b/examples/structured_2d_dgsem/elixir_advection_waving_flag.jl
similarity index 100%
rename from examples/tree_2d_dgsem/elixir_advection_waving_flag.jl
rename to examples/structured_2d_dgsem/elixir_advection_waving_flag.jl
diff --git a/examples/tree_2d_dgsem/elixir_euler_source_terms_parallelogram.jl b/examples/structured_2d_dgsem/elixir_euler_source_terms_parallelogram.jl
similarity index 100%
rename from examples/tree_2d_dgsem/elixir_euler_source_terms_parallelogram.jl
rename to examples/structured_2d_dgsem/elixir_euler_source_terms_parallelogram.jl
diff --git a/examples/tree_2d_dgsem/elixir_euler_source_terms_rotated.jl b/examples/structured_2d_dgsem/elixir_euler_source_terms_rotated.jl
similarity index 100%
rename from examples/tree_2d_dgsem/elixir_euler_source_terms_rotated.jl
rename to examples/structured_2d_dgsem/elixir_euler_source_terms_rotated.jl
diff --git a/examples/tree_2d_dgsem/elixir_euler_source_terms_waving_flag.jl b/examples/structured_2d_dgsem/elixir_euler_source_terms_waving_flag.jl
similarity index 100%
rename from examples/tree_2d_dgsem/elixir_euler_source_terms_waving_flag.jl
rename to examples/structured_2d_dgsem/elixir_euler_source_terms_waving_flag.jl
diff --git a/test/test_examples_2d_p4est.jl b/test/test_examples_2d_p4est.jl
index 22db64f6083..e871cf9e535 100644
--- a/test/test_examples_2d_p4est.jl
+++ b/test/test_examples_2d_p4est.jl
@@ -15,14 +15,14 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "p4est_
       linf = [6.437440532947036e-5])
   end
 
-  @trixi_testset "elixir_advection_non_conforming_flag.jl" begin
-    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_non_conforming_flag.jl"),
+  @trixi_testset "elixir_advection_nonconforming.jl" begin
+    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_nonconforming.jl"),
       l2   = [2.58174252995893e-5],
       linf = [2.65115939055204e-4])
   end
 
-  @trixi_testset "elixir_advection_non_conforming_flag_unstructured.jl" begin
-    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_non_conforming_flag_unstructured.jl"),
+  @trixi_testset "elixir_advection_nonconforming_unstructured.jl" begin
+    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_nonconforming_unstructured.jl"),
       l2   = [3.038384623519386e-3],
       linf = [6.324792487776842e-2])
   end
diff --git a/test/test_examples_3d_curved.jl b/test/test_examples_3d_curved.jl
index c832da14d70..fa91fe38568 100644
--- a/test/test_examples_3d_curved.jl
+++ b/test/test_examples_3d_curved.jl
@@ -9,66 +9,66 @@ include("test_trixi.jl")
 EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "structured_3d_dgsem")
 
 @testset "Curved mesh" begin
-  @trixi_testset "elixir_advection_basic_curved.jl" begin
-    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_basic_curved.jl"),
+  @trixi_testset "elixir_advection_basic.jl" begin
+    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_basic.jl"),
       l2   = [0.00013446460962856976],
       linf = [0.0012577781391462928])
   end
 
-  @trixi_testset "elixir_advection_free_stream_curved.jl" begin
-    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_free_stream_curved.jl"),
+  @trixi_testset "elixir_advection_free_stream.jl" begin
+    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_free_stream.jl"),
       l2   = [1.830875777528287e-14],
       linf = [7.491784970170556e-13],
       atol = 8e-13, # required to make tests pass on Windows
       )
   end
 
-  @trixi_testset "elixir_advection_nonperiodic_curved.jl" begin
-    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_nonperiodic_curved.jl"),
+  @trixi_testset "elixir_advection_nonperiodic.jl" begin
+    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_nonperiodic.jl"),
       l2   = [6.522004549411137e-5],
       linf = [0.005554857853361295])
   end
 
-  @trixi_testset "elixir_advection_restart_curved.jl" begin
-    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_restart_curved.jl"),
+  @trixi_testset "elixir_advection_restart.jl" begin
+    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_advection_restart.jl"),
       l2   = [0.0281388160824776],
       linf = [0.08740635193023694])
   end
 
-  @trixi_testset "elixir_euler_source_terms_curved.jl" begin
-    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms_curved.jl"),
+  @trixi_testset "elixir_euler_source_terms.jl" begin
+    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_source_terms.jl"),
       l2   = [0.01032310150257373, 0.009728768969448439, 0.009728768969448494, 0.009728768969448388, 0.015080412597559597],
       linf = [0.034894790428615874, 0.033835365548322116, 0.033835365548322116, 0.03383536554832034, 0.06785765131417065])
   end
 
-  @trixi_testset "elixir_euler_free_stream_curved.jl" begin
-    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_free_stream_curved.jl"),
+  @trixi_testset "elixir_euler_free_stream.jl" begin
+    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_free_stream.jl"),
       l2   = [2.8815700334367128e-15, 9.361915278236651e-15, 9.95614203619935e-15, 1.6809941842374106e-14, 1.4815037041566735e-14],
       linf = [4.1300296516055823e-14, 2.0444756998472258e-13, 1.0133560657266116e-13, 2.0627943797535409e-13, 2.8954616482224083e-13])
   end
 
-  @trixi_testset "elixir_euler_free_stream_curved.jl with FluxRotated(flux_lax_friedrichs)" begin
-    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_free_stream_curved.jl"),
+  @trixi_testset "elixir_euler_free_stream.jl with FluxRotated(flux_lax_friedrichs)" begin
+    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_free_stream.jl"),
       surface_flux=FluxRotated(flux_lax_friedrichs),
       l2   = [2.8815700334367128e-15, 9.361915278236651e-15, 9.95614203619935e-15, 1.6809941842374106e-14, 1.4815037041566735e-14],
       linf = [4.1300296516055823e-14, 2.0444756998472258e-13, 1.0133560657266116e-13, 2.0627943797535409e-13, 2.8954616482224083e-13])
   end
 
-  @trixi_testset "elixir_euler_nonperiodic_curved.jl" begin
-    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_nonperiodic_curved.jl"),
+  @trixi_testset "elixir_euler_nonperiodic.jl" begin
+    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_nonperiodic.jl"),
       l2   = [0.0018268326813744103, 0.001745601029521995, 0.001745601029521962, 0.0017456010295218891, 0.003239834454817457],
       linf = [0.014660503198892005, 0.01506958815284798, 0.01506958815283821, 0.015069588152864632, 0.02700205515651044])
   end
 
-  @trixi_testset "elixir_euler_ec_curved.jl" begin
-    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_ec_curved.jl"),
+  @trixi_testset "elixir_euler_ec.jl" begin
+    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_euler_ec.jl"),
       l2   = [0.011367083018614027, 0.007022020327490176, 0.006759580335962235, 0.006820337637760632, 0.02912659127566544],
       linf = [0.2761764220925329, 0.20286331858055706, 0.18763944865434593, 0.19313636558790004, 0.707563913727584],
       tspan = (0.0, 0.25))
   end
 
-  @trixi_testset "elixir_mhd_ec_curved.jl" begin
-    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_ec_curved.jl"),
+  @trixi_testset "elixir_mhd_ec.jl" begin
+    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_ec.jl"),
       l2   = [0.009004021452004856, 0.007143957956917952, 0.006973755636325691, 0.0069016516181158,
               0.033006366599547275, 0.0031996515755530752, 0.0030752688029571135, 0.0030711742765310865,
               4.411700983795491e-5],
@@ -78,8 +78,8 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "struct
       tspan = (0.0, 0.25))
   end
 
-  @trixi_testset "elixir_mhd_alfven_wave_curved.jl" begin
-    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_alfven_wave_curved.jl"),
+  @trixi_testset "elixir_mhd_alfven_wave.jl" begin
+    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_alfven_wave.jl"),
       l2   = [0.003015476175153681, 0.00145499403283373, 0.0009125744757935803, 0.0017703080480578979,
               0.0013046447673965966, 0.0014564863387645508, 0.0013332311430907598, 0.001647832598455728,
               0.0013647609788548722],
@@ -88,8 +88,8 @@ EXAMPLES_DIR = joinpath(pathof(Trixi) |> dirname |> dirname, "examples", "struct
               0.01888303191983353])
   end
 
-  @trixi_testset "elixir_mhd_alfven_wave_curved.jl with flux_lax_friedrichs" begin
-    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_alfven_wave_curved.jl"),
+  @trixi_testset "elixir_mhd_alfven_wave.jl with flux_lax_friedrichs" begin
+    @test_trixi_include(joinpath(EXAMPLES_DIR, "elixir_mhd_alfven_wave.jl"),
       l2   = [0.003096205134732006, 0.0014592894240925266, 0.000907526173067474, 0.001821970949880564,
               0.001289067735865978, 0.0014595578872467106, 0.0013269375784248857, 0.0016998139907659089,
               0.0013685168042016343],