diff --git a/src/Trixi.jl b/src/Trixi.jl
index 3c16752afa8..3a882d0962c 100644
--- a/src/Trixi.jl
+++ b/src/Trixi.jl
@@ -181,7 +181,7 @@ export flux, flux_central, flux_lax_friedrichs, flux_hll, flux_hllc, flux_hlle,
        flux_chan_etal, flux_nonconservative_chan_etal, flux_winters_etal,
        hydrostatic_reconstruction_audusse_etal, flux_nonconservative_audusse_etal,
        FluxPlusDissipation, DissipationGlobalLaxFriedrichs, DissipationLocalLaxFriedrichs,
-       FluxLaxFriedrichs, max_abs_speed_naive, max_abs_speeds,
+       FluxLaxFriedrichs, max_abs_speed_naive,
        FluxHLL, min_max_speed_naive, min_max_speed_davis, min_max_speed_einfeldt,
        FluxLMARS,
        FluxRotated,
@@ -216,11 +216,10 @@ export initial_condition_eoc_test_coupled_euler_gravity,
        source_terms_eoc_test_coupled_euler_gravity, source_terms_eoc_test_euler
 
 export cons2cons, cons2prim, prim2cons, cons2macroscopic, cons2state, cons2mean,
-       cons2entropy, entropy2cons, cons2entropy_guermond_etal
+       cons2entropy, entropy2cons
 export density, pressure, density_pressure, velocity, global_mean_vars,
        equilibrium_distribution, waterheight_pressure
-export entropy, entropy_math, entropy_thermodynamic, entropy_guermond_etal,
-       energy_total, energy_kinetic, energy_internal, energy_magnetic,
+export entropy, energy_total, energy_kinetic, energy_internal, energy_magnetic,
        cross_helicity,
        enstrophy
 export lake_at_rest_error
diff --git a/test/test_type.jl b/test/test_type.jl
index bccbb50a4db..de02ec47110 100644
--- a/test/test_type.jl
+++ b/test/test_type.jl
@@ -90,7 +90,7 @@ isdir(outdir) && rm(outdir, recursive = true)
                       RealT
             end
 
-            @test eltype(@inferred max_abs_speeds(u, equations)) == RealT
+            @test eltype(@inferred Trixi.max_abs_speeds(u, equations)) == RealT
             @test eltype(@inferred cons2prim(u, equations)) == RealT
             @test eltype(@inferred prim2cons(u, equations)) == RealT
             @test eltype(@inferred cons2entropy(u, equations)) == RealT
@@ -177,7 +177,7 @@ isdir(outdir) && rm(outdir, recursive = true)
                                                           equations)) ==
                   RealT
 
-            @test eltype(@inferred max_abs_speeds(u, equations)) == RealT
+            @test eltype(@inferred Trixi.max_abs_speeds(u, equations)) == RealT
             @test eltype(@inferred cons2prim(u, equations)) == RealT
             @test eltype(@inferred prim2cons(u, equations)) == RealT
             @test eltype(@inferred cons2entropy(u, equations)) == RealT
@@ -343,18 +343,19 @@ isdir(outdir) && rm(outdir, recursive = true)
                       RealT
             end
 
-            @test eltype(@inferred max_abs_speeds(u, equations)) == RealT
+            @test eltype(@inferred Trixi.max_abs_speeds(u, equations)) == RealT
             @test eltype(@inferred cons2prim(u, equations)) == RealT
             @test eltype(@inferred prim2cons(u, equations)) == RealT
             @test eltype(@inferred cons2entropy(u, equations)) == RealT
             @test eltype(@inferred entropy2cons(u, equations)) == RealT
-            @test eltype(@inferred cons2entropy_guermond_etal(u, equations)) == RealT
+            @test eltype(@inferred Trixi.entropy_guermond_etal(u, equations)) == RealT
+            @test eltype(@inferred Trixi.cons2entropy_guermond_etal(u, equations)) == RealT
             @test eltype(@inferred density(u, equations)) == RealT
             @test eltype(@inferred pressure(u, equations)) == RealT
             @test eltype(@inferred density_pressure(u, equations)) == RealT
             @test eltype(@inferred entropy(cons, equations)) == RealT
-            @test eltype(@inferred entropy_math(cons, equations)) == RealT
-            @test eltype(@inferred entropy_thermodynamic(cons, equations)) == RealT
+            @test eltype(@inferred Trixi.entropy_math(cons, equations)) == RealT
+            @test eltype(@inferred Trixi.entropy_thermodynamic(cons, equations)) == RealT
             @test eltype(@inferred energy_internal(cons, equations)) == RealT
             # TODO: test `gradient_conservative`, not necessary but good to have
         end
@@ -482,7 +483,7 @@ isdir(outdir) && rm(outdir, recursive = true)
                                                               equations)) == RealT
             end
 
-            @test eltype(@inferred max_abs_speeds(u, equations)) == RealT
+            @test eltype(@inferred Trixi.max_abs_speeds(u, equations)) == RealT
             @test eltype(@inferred cons2prim(u, equations)) == RealT
             @test eltype(@inferred prim2cons(u, equations)) == RealT
             @test eltype(@inferred cons2entropy(u, equations)) == RealT
@@ -491,8 +492,8 @@ isdir(outdir) && rm(outdir, recursive = true)
             @test eltype(@inferred pressure(u, equations)) == RealT
             @test eltype(@inferred density_pressure(u, equations)) == RealT
             @test eltype(@inferred entropy(cons, equations)) == RealT
-            @test eltype(@inferred entropy_math(cons, equations)) == RealT
-            @test eltype(@inferred entropy_thermodynamic(cons, equations)) == RealT
+            @test eltype(@inferred Trixi.entropy_math(cons, equations)) == RealT
+            @test eltype(@inferred Trixi.entropy_thermodynamic(cons, equations)) == RealT
             @test eltype(@inferred energy_internal(cons, equations)) == RealT
         end
     end