diff --git a/experimental/AcousticSolver.hpp b/experimental/AcousticSolver.hpp
deleted file mode 100644
index e03a8e2a6fc547cd30b4050fac66761596fb4eeb..0000000000000000000000000000000000000000
--- a/experimental/AcousticSolver.hpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef ACOUSTIC_SOLVER_HPP
-#define ACOUSTIC_SOLVER_HPP
-
-namespace RawKokkosAcousticSolver
-{
-  void SodAcousticSolver(const long int& nj);
-}
-
-#endif // ACOUSTIC_SOLVER_HPP
diff --git a/experimental/CMakeLists.txt b/experimental/CMakeLists.txt
index 895dbde643b787f919aa60e9fe8a215497dd0d4b..30584083c0339ba99d4dd97fe02ea784b8e312fb 100644
--- a/experimental/CMakeLists.txt
+++ b/experimental/CMakeLists.txt
@@ -1,7 +1,6 @@
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-#add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../packages/kokkos EXCLUDE_FROM_ALL)
 include_directories(${Kokkos_INCLUDE_DIRS_RET})
 include_directories(${PASTIS_SOURCE_DIR}/packages/rang/include)
 
@@ -9,7 +8,7 @@ include_directories(${PASTIS_SOURCE_DIR}/packages/rang/include)
 
 add_library(
   PastisExperimental
-  AcousticSolver.cpp
+  RawKokkosAcousticSolver.cpp
   )
 
 
diff --git a/experimental/AcousticSolver.cpp b/experimental/RawKokkosAcousticSolver.cpp
similarity index 98%
rename from experimental/AcousticSolver.cpp
rename to experimental/RawKokkosAcousticSolver.cpp
index 02bc5dcf3f0bca5f72daffe04f91dc149b2a525f..77b68454c72d6bb461d2338f96279b81177a2447 100644
--- a/experimental/AcousticSolver.cpp
+++ b/experimental/RawKokkosAcousticSolver.cpp
@@ -1,8 +1,8 @@
-#include <AcousticSolver.hpp>
+#include <RawKokkosAcousticSolver.hpp>
 #include <Kokkos_Core.hpp>
 #include <rang.hpp>
 
-namespace RawKokkosAcousticSolver
+namespace RawKokkos
 {
 
 inline double e(double rho, double p, double gamma)
@@ -114,7 +114,7 @@ void computeExplicitFluxes(const Kokkos::View<double*>& xr,
 }
 
 
-void SodAcousticSolver(const long int& nj)
+void AcousticSolver(const long int& nj)
 {
   Kokkos::View<double*> xj("xj", nj);
   Kokkos::View<double*> rhoj("rhoj", nj);
diff --git a/experimental/RawKokkosAcousticSolver.hpp b/experimental/RawKokkosAcousticSolver.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..e9c36ff437a7ef0f0c28c72e93b0a367d8142185
--- /dev/null
+++ b/experimental/RawKokkosAcousticSolver.hpp
@@ -0,0 +1,9 @@
+#ifndef RAW_KOKKOS_ACOUSTIC_SOLVER_HPP
+#define RAW_KOKKOS_ACOUSTIC_SOLVER_HPP
+
+namespace RawKokkos
+{
+  void AcousticSolver(const long int& nj);
+}
+
+#endif // RAW_KOKKOS_ACOUSTIC_SOLVER_HPP
diff --git a/main.cpp b/main.cpp
index 89356a5c50d5761760894d67d40123f3d09209b8..ee597d14fc257f02d98f576a9b985754e4201210 100644
--- a/main.cpp
+++ b/main.cpp
@@ -6,7 +6,7 @@
 #include <SignalManager.hpp>
 #include <ConsoleManager.hpp>
 
-#include <AcousticSolver.hpp>
+#include <RawKokkosAcousticSolver.hpp>
 
 #include <CLI/CLI.hpp>
 #include <cassert>
@@ -75,7 +75,7 @@ int main(int argc, char *argv[])
 
   Kokkos::Timer timer;
   timer.reset();
-  RawKokkosAcousticSolver::SodAcousticSolver(number);
+  RawKokkos::AcousticSolver(number);
   double count_time = timer.seconds();
   std::cout << "* Execution time: " << rang::style::bold << count_time << rang::style::reset << '\n';