diff --git a/exercises/exercise-biomineralization/CMakeLists.txt b/exercises/exercise-biomineralization/CMakeLists.txt
index 1a3e189d1f40b109e14552370b8c1ddca00e916e..67e8dc13e54ba9a6b78e29bc6e60a09515ce539d 100644
--- a/exercises/exercise-biomineralization/CMakeLists.txt
+++ b/exercises/exercise-biomineralization/CMakeLists.txt
@@ -1,6 +1,6 @@
 # executables for exercisebiomin
 dune_add_test(NAME exercise_biomin
-              SOURCES exercisebiomin.cc
+              SOURCES main.cc
               CMD_ARGS -TimeLoop.TEnd 1e5)
 
 # add tutorial to the common target
diff --git a/exercises/exercise-biomineralization/README.md b/exercises/exercise-biomineralization/README.md
index 6980306bbcd7a64c8b0ae3596b6e92b24b109cfc..329fc5318d9d062e2e38889ae3858ace3ebb0d2e 100644
--- a/exercises/exercise-biomineralization/README.md
+++ b/exercises/exercise-biomineralization/README.md
@@ -19,8 +19,8 @@ Disclaimer: Please note, that this is not a realistic scenario. One does not wan
 ### 1. Getting familiar with the code
 
 Locate all the files you will need for this exercise
-* The __main file__ : `exercisebiomin.cc`
-* The __input file__: `exercisebiomin.input`
+* The __main file__ : `main.cc`
+* The __input file__: `params.input`
 * The __problem file__ : `biominproblem.hh`
 * The __spatial parameters file__: `biominspatialparams.hh`
 
diff --git a/exercises/exercise-biomineralization/biominproblem.hh b/exercises/exercise-biomineralization/biominproblem.hh
index ab0a787a766dc45440aef3740a0b43cce6b794d9..7eed331b0b6ec1696a812a07a6e120ec641fca18 100644
--- a/exercises/exercise-biomineralization/biominproblem.hh
+++ b/exercises/exercise-biomineralization/biominproblem.hh
@@ -48,7 +48,7 @@ namespace Dumux {
 #include <dumux/material/components/co2tables.inc>
 
 template <class TypeTag>
-class ExerciseFourBioMinProblem;
+class BioMinProblem;
 
 namespace Properties {
 //! Create new type tag for the problem
@@ -60,7 +60,7 @@ struct ExerciseFourBioMinCCTpfa { using InheritsFrom = std::tuple<ExerciseFourBi
 
 //! Set the problem property
 template<class TypeTag>
-struct Problem<TypeTag, TTag::ExerciseFourBioMin> { using type = ExerciseFourBioMinProblem<TypeTag>; };
+struct Problem<TypeTag, TTag::ExerciseFourBioMin> { using type = BioMinProblem<TypeTag>; };
 
 //! Set grid and the grid creator to be used
 template<class TypeTag>
@@ -106,7 +106,7 @@ struct EnableGridFluxVariablesCache<TypeTag, TTag::ExerciseFourBioMin> { static
  * \brief Problem biomineralization (MICP) in an experimental setup.
  */
 template <class TypeTag>
-class ExerciseFourBioMinProblem : public PorousMediumFlowProblem<TypeTag>
+class BioMinProblem : public PorousMediumFlowProblem<TypeTag>
 {
     using ParentType = PorousMediumFlowProblem<TypeTag>;
 
@@ -166,7 +166,7 @@ class ExerciseFourBioMinProblem : public PorousMediumFlowProblem<TypeTag>
      * \param fvGridGeometry The finite volume grid geometry
      */
 public:
-    ExerciseFourBioMinProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
+    BioMinProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
     : ParentType(fvGridGeometry)
     {
         name_           = getParam<std::string>("Problem.Name");
diff --git a/exercises/exercise-biomineralization/exercisebiomin.cc b/exercises/exercise-biomineralization/main.cc
similarity index 100%
rename from exercises/exercise-biomineralization/exercisebiomin.cc
rename to exercises/exercise-biomineralization/main.cc
diff --git a/exercises/exercise-biomineralization/exercise_biomin.input b/exercises/exercise-biomineralization/params.input
similarity index 100%
rename from exercises/exercise-biomineralization/exercise_biomin.input
rename to exercises/exercise-biomineralization/params.input
diff --git a/exercises/solution/exercise-biomineralization/CMakeLists.txt b/exercises/solution/exercise-biomineralization/CMakeLists.txt
index fe0a3993557dc1bfb4bf66dcfa8ba99e61d5d219..035fe93ddb8db1c0e90b41afee4385ebead46b0c 100644
--- a/exercises/solution/exercise-biomineralization/CMakeLists.txt
+++ b/exercises/solution/exercise-biomineralization/CMakeLists.txt
@@ -1,6 +1,6 @@
 # executables for exercisebiomin
 dune_add_test(NAME exercise_biomin_solution
-              SOURCES exercisebiomin.cc
+              SOURCES main.cc
               CMD_ARGS -TimeLoop.TEnd 1e5)
 
 # add tutorial to the common target
diff --git a/exercises/solution/exercise-biomineralization/biominproblem.hh b/exercises/solution/exercise-biomineralization/biominproblem.hh
index 756b7537a8113f4ea2b741ce50d3c901234f5290..94857d1de1f70d639fb1fc1013550ffeddd00236 100644
--- a/exercises/solution/exercise-biomineralization/biominproblem.hh
+++ b/exercises/solution/exercise-biomineralization/biominproblem.hh
@@ -49,7 +49,7 @@ namespace Dumux {
 #include <dumux/material/components/co2tables.inc>
 
 template <class TypeTag>
-class ExerciseFourBioMinProblem;
+class BioMinProblem;
 
 namespace Properties {
 //! Create new type tag for the problem
@@ -61,7 +61,7 @@ struct ExerciseFourBioMinCCTpfa { using InheritsFrom = std::tuple<ExerciseFourBi
 
 //! Set the problem property
 template<class TypeTag>
-struct Problem<TypeTag, TTag::ExerciseFourBioMin> { using type = ExerciseFourBioMinProblem<TypeTag>; };
+struct Problem<TypeTag, TTag::ExerciseFourBioMin> { using type = BioMinProblem<TypeTag>; };
 
 //! Set grid and the grid creator to be used
 template<class TypeTag>
@@ -108,7 +108,7 @@ struct EnableGridFluxVariablesCache<TypeTag, TTag::ExerciseFourBioMin> { static
  * \brief Problem biomineralization (MICP) in an experimental setup.
  */
 template <class TypeTag>
-class ExerciseFourBioMinProblem : public PorousMediumFlowProblem<TypeTag>
+class BioMinProblem : public PorousMediumFlowProblem<TypeTag>
 {
     using ParentType = PorousMediumFlowProblem<TypeTag>;
 
@@ -169,7 +169,7 @@ class ExerciseFourBioMinProblem : public PorousMediumFlowProblem<TypeTag>
      * \param fvGridGeometry The finite volume grid geometry
      */
 public:
-    ExerciseFourBioMinProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
+    BioMinProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
     : ParentType(fvGridGeometry)
     {
         name_           = getParam<std::string>("Problem.Name");
diff --git a/exercises/solution/exercise-biomineralization/exercisebiomin.cc b/exercises/solution/exercise-biomineralization/main.cc
similarity index 100%
rename from exercises/solution/exercise-biomineralization/exercisebiomin.cc
rename to exercises/solution/exercise-biomineralization/main.cc
diff --git a/exercises/solution/exercise-biomineralization/exercisebiomin_solution.input b/exercises/solution/exercise-biomineralization/params.input
similarity index 100%
rename from exercises/solution/exercise-biomineralization/exercisebiomin_solution.input
rename to exercises/solution/exercise-biomineralization/params.input