diff --git a/include/evalhyd/determinist.hpp b/include/evalhyd/determinist.hpp
index 7bb8068c212b1c8ca47cfd2544e4ae22a2176493..da8e65902a8db1041e3819ae3ec2282da98f1de1 100644
--- a/include/evalhyd/determinist.hpp
+++ b/include/evalhyd/determinist.hpp
@@ -6,7 +6,7 @@
 #include <xtensor/xexpression.hpp>
 
 #include "utils.hpp"
-#include "deterministic/evaluator.hpp"
+#include "determinist/evaluator.hpp"
 
 namespace eh = evalhyd;
 
diff --git a/include/evalhyd/deterministic/evaluator.hpp b/include/evalhyd/determinist/evaluator.hpp
similarity index 100%
rename from include/evalhyd/deterministic/evaluator.hpp
rename to include/evalhyd/determinist/evaluator.hpp
diff --git a/include/evalhyd/probabilist.hpp b/include/evalhyd/probabilist.hpp
index 340573eb61018d5a3573b5f0234111ff0984cb2c..65be0d0334bc461694d95d427f60686ce7825331 100644
--- a/include/evalhyd/probabilist.hpp
+++ b/include/evalhyd/probabilist.hpp
@@ -8,7 +8,7 @@
 #include <xtensor/xview.hpp>
 
 #include "utils.hpp"
-#include "probabilistic/evaluator.h"
+#include "probabilist/evaluator.h"
 
 namespace eh = evalhyd;
 
diff --git a/include/evalhyd/probabilistic/evaluator.h b/include/evalhyd/probabilist/evaluator.h
similarity index 100%
rename from include/evalhyd/probabilistic/evaluator.h
rename to include/evalhyd/probabilist/evaluator.h
diff --git a/include/evalhyd/probabilistic/evaluator_brier.cpp b/include/evalhyd/probabilist/evaluator_brier.cpp
similarity index 100%
rename from include/evalhyd/probabilistic/evaluator_brier.cpp
rename to include/evalhyd/probabilist/evaluator_brier.cpp
diff --git a/include/evalhyd/probabilistic/evaluator_elements.cpp b/include/evalhyd/probabilist/evaluator_elements.cpp
similarity index 100%
rename from include/evalhyd/probabilistic/evaluator_elements.cpp
rename to include/evalhyd/probabilist/evaluator_elements.cpp
diff --git a/include/evalhyd/probabilistic/evaluator_utils.cpp b/include/evalhyd/probabilist/evaluator_utils.cpp
similarity index 100%
rename from include/evalhyd/probabilistic/evaluator_utils.cpp
rename to include/evalhyd/probabilist/evaluator_utils.cpp
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index a238623fbf6f4db52591c8872918b881594b8918..7029a2259e595e82cbd203e8b7981549c954735f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -27,12 +27,12 @@ add_executable(
         test_determinist.cpp
         ../include/evalhyd/utils.hpp
         ../include/evalhyd/determinist.hpp
-        ../include/evalhyd/deterministic/evaluator.hpp
+        ../include/evalhyd/determinist/evaluator.hpp
         test_probabilist.cpp
         ../include/evalhyd/probabilist.hpp
-        ../include/evalhyd/probabilistic/evaluator.h
-        ../include/evalhyd/probabilistic/evaluator_brier.cpp
-        ../include/evalhyd/probabilistic/evaluator_elements.cpp
-        ../include/evalhyd/probabilistic/evaluator_utils.cpp
+        ../include/evalhyd/probabilist/evaluator.h
+        ../include/evalhyd/probabilist/evaluator_brier.cpp
+        ../include/evalhyd/probabilist/evaluator_elements.cpp
+        ../include/evalhyd/probabilist/evaluator_utils.cpp
 )
 target_link_libraries(evalhyd_tests gtest gtest_main)