diff --git a/makefile b/makefile
index 1ffb89ed06ef56d6f8bcf123e2a65b51e03394ca..51b85221f93b4961383de58ba7bb1d4467a6bdc9 100644
--- a/makefile
+++ b/makefile
@@ -62,7 +62,7 @@ base_files := \
 	fftwf_tools \
 	Morton_shuffler \
 	p3DFFT_to_iR \
-	field_solver
+	fluid_solver
 
 #headers := $(patsubst %, ./src/%.hpp, ${base_files})
 src := $(patsubst %, ./src/%.cpp, ${base_files})
diff --git a/src/field_solver.cpp b/src/fluid_solver.cpp
similarity index 98%
rename from src/field_solver.cpp
rename to src/fluid_solver.cpp
index 0cc56657778a09e4b3e9b3ceb41c4beea6ead026..1ea35240f6726cd5ac429a2cd72e4482eb8e420c 100644
--- a/src/field_solver.cpp
+++ b/src/fluid_solver.cpp
@@ -1,4 +1,4 @@
-#include "field_solver.hpp"
+#include "fluid_solver.hpp"
 
 ///*****************************************************************************/
 ///* generic definitions, empty by design                                      */
diff --git a/src/field_solver.hpp b/src/fluid_solver.hpp
similarity index 100%
rename from src/field_solver.hpp
rename to src/fluid_solver.hpp