diff --git a/exercises/exercise-grids/CMakeLists.txt b/exercises/exercise-grids/CMakeLists.txt
index b83a9f84e2ddbd78f666d445c103eb269cd5ed20..092f93db3b4e7f24fbdd4d8d913678a43f33b3e0 100644
--- a/exercises/exercise-grids/CMakeLists.txt
+++ b/exercises/exercise-grids/CMakeLists.txt
@@ -1,6 +1,6 @@
# the grid exercise simulation program
dune_add_test(NAME exercise_grids
- SOURCES exercisegrids.cc)
+ SOURCES main.cc)
# add tutorial to the common target
add_dependencies(test_exercises exercise_grids)
diff --git a/exercises/exercise-grids/README.md b/exercises/exercise-grids/README.md
index 08b2a50893a4c5c099f93ee267616a1ebb543e03..4edb8961866e45c106c1ec333a580807640e5e66 100644
--- a/exercises/exercise-grids/README.md
+++ b/exercises/exercise-grids/README.md
@@ -9,8 +9,8 @@ Here we will expand on what we've covered in the basics exercise, and the proble
* Navigate to the directory `dumux-course/exercises/exercise-grids/`
We'll be editing the following files during this exercise:
-* The __input file__: `exercise_grids.input` ,
-* and the __problem file__: `injection2pproblem.hh`
+* The __input file__: `params.input` ,
+* and the __problem file__: `problem.hh`
Currently our grid is defined using the following input parameters in the input file:
diff --git a/exercises/exercise-grids/exercisegrids.cc b/exercises/exercise-grids/main.cc
similarity index 99%
rename from exercises/exercise-grids/exercisegrids.cc
rename to exercises/exercise-grids/main.cc
index 8ffbc32502c704d003b6e939246ed9f1a03e399e..9e094d98dfd66b7a486d4c523c6dd29dbbf0d8b4 100644
--- a/exercises/exercise-grids/exercisegrids.cc
+++ b/exercises/exercise-grids/main.cc
@@ -47,7 +47,7 @@
#include <dumux/io/grid/gridmanager.hh>
// The problem file, where setup-specific boundary and initial conditions are defined.
-#include "injection2pproblem.hh"
+#include "problem.hh"
////////////////////////
// the main function
diff --git a/exercises/exercise-grids/exercise_grids.input b/exercises/exercise-grids/params.input
similarity index 100%
rename from exercises/exercise-grids/exercise_grids.input
rename to exercises/exercise-grids/params.input
diff --git a/exercises/exercise-grids/injection2pproblem.hh b/exercises/exercise-grids/problem.hh
similarity index 97%
rename from exercises/exercise-grids/injection2pproblem.hh
rename to exercises/exercise-grids/problem.hh
index b38ca805e709b709cbc72fffd5a8d93472b8c214..680ea9ab8a6d0c2701f091f1381e5dda663a196f 100644
--- a/exercises/exercise-grids/injection2pproblem.hh
+++ b/exercises/exercise-grids/problem.hh
@@ -32,7 +32,7 @@
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/material/fluidsystems/h2on2.hh>
-#include "injection2pspatialparams.hh"
+#include "spatialparams.hh"
namespace Dumux {
@@ -84,15 +84,15 @@ struct FluidSystem<TypeTag, TTag::Injection2p> { using type = FluidSystems::H2ON
*
* The domain is sized 60 m times 40 m.
*
- * For the mass conservation equation neumann boundary conditions are used on
- * the top, on the bottom and on the right of the domain, while dirichlet conditions
+ * For the mass conservation equation Neumann boundary conditions are used on
+ * the top, on the bottom and on the right of the domain, while Dirichlet conditions
* apply on the left boundary.
*
* Gas is injected at the right boundary from 7 m to 15 m at a rate of
- * 0.001 kg/(s m), the remaining neumann boundaries are no-flow
+ * 0.001 kg/(s m), the remaining Neumann boundaries are no-flow
* boundaries.
*
- * At the dirichlet boundaries a hydrostatic pressure and a gas saturation of zero a
+ * At the Dirichlet boundaries a hydrostatic pressure and a gas saturation of zero a
*
* This problem uses the \ref TwoPModel model.
*/
diff --git a/exercises/exercise-grids/injection2pspatialparams.hh b/exercises/exercise-grids/spatialparams.hh
similarity index 100%
rename from exercises/exercise-grids/injection2pspatialparams.hh
rename to exercises/exercise-grids/spatialparams.hh
diff --git a/exercises/solution/exercise-grids/CMakeLists.txt b/exercises/solution/exercise-grids/CMakeLists.txt
index 7f68884bb8f82bcafd4c95893b7b4b06f8f98cb5..4598aa8ef7595048f272470fcf462160bcc2eef6 100644
--- a/exercises/solution/exercise-grids/CMakeLists.txt
+++ b/exercises/solution/exercise-grids/CMakeLists.txt
@@ -1,6 +1,6 @@
# the grid exercise simulation program
dune_add_test(NAME exercise_grids_solution
- SOURCES exercisegrids_solution.cc)
+ SOURCES main.cc)
# add tutorial to the common target
add_dependencies(test_exercises exercise_grids_solution)
diff --git a/exercises/solution/exercise-grids/exercisegrids_solution.cc b/exercises/solution/exercise-grids/main.cc
similarity index 99%
rename from exercises/solution/exercise-grids/exercisegrids_solution.cc
rename to exercises/solution/exercise-grids/main.cc
index e69194dabf509deffa661997a8af38d0f055b310..ea52463b1f80bacc1506b8adef3511bc124145fd 100644
--- a/exercises/solution/exercise-grids/exercisegrids_solution.cc
+++ b/exercises/solution/exercise-grids/main.cc
@@ -47,7 +47,7 @@
#include <dumux/io/grid/gridmanager.hh>
// The problem file, where setup-specific boundary and initial conditions are defined.
-#include "injection2pproblem.hh"
+#include "problem.hh"
////////////////////////
// the main function
diff --git a/exercises/solution/exercise-grids/exercise_grids_solution.input b/exercises/solution/exercise-grids/params.input
similarity index 100%
rename from exercises/solution/exercise-grids/exercise_grids_solution.input
rename to exercises/solution/exercise-grids/params.input
diff --git a/exercises/solution/exercise-grids/injection2pproblem.hh b/exercises/solution/exercise-grids/problem.hh
similarity index 97%
rename from exercises/solution/exercise-grids/injection2pproblem.hh
rename to exercises/solution/exercise-grids/problem.hh
index b51f4f8c88dd9453278c01878fedd1aa3da3bcba..3b4d250b3cac9829ef8cc32d1eec95b7374a87c0 100644
--- a/exercises/solution/exercise-grids/injection2pproblem.hh
+++ b/exercises/solution/exercise-grids/problem.hh
@@ -32,7 +32,7 @@
#include <dumux/porousmediumflow/problem.hh>
#include <dumux/material/fluidsystems/h2on2.hh>
-#include "injection2pspatialparams.hh"
+#include "spatialparams.hh"
namespace Dumux {
@@ -92,15 +92,15 @@ struct FluidSystem<TypeTag, TTag::Injection2p> { using type = FluidSystems::H2ON
*
* The domain is sized 60 m times 40 m.
*
- * For the mass conservation equation neumann boundary conditions are used on
- * the top, on the bottom and on the right of the domain, while dirichlet conditions
+ * For the mass conservation equation Neumann boundary conditions are used on
+ * the top, on the bottom and on the right of the domain, while Dirichlet conditions
* apply on the left boundary.
*
* Gas is injected at the right boundary from 7 m to 15 m at a rate of
- * 0.001 kg/(s m), the remaining neumann boundaries are no-flow
+ * 0.001 kg/(s m), the remaining Neumann boundaries are no-flow
* boundaries.
*
- * At the dirichlet boundaries a hydrostatic pressure and a gas saturation of zero a
+ * At the Dirichlet boundaries a hydrostatic pressure and a gas saturation of zero a
*
* This problem uses the \ref TwoPModel model.
*/
@@ -203,7 +203,7 @@ public:
}
/*!
- * \brief Evaluate the boundary conditions for a neumann
+ * \brief Evaluate the boundary conditions for a Neumann
* boundary segment.
*
* \param globalPos The position of the integration point of the boundary segment.
diff --git a/exercises/solution/exercise-grids/injection2pspatialparams.hh b/exercises/solution/exercise-grids/spatialparams.hh
similarity index 100%
rename from exercises/solution/exercise-grids/injection2pspatialparams.hh
rename to exercises/solution/exercise-grids/spatialparams.hh