diff --git a/exercises/exercise-basic/CMakeLists.txt b/exercises/exercise-basic/CMakeLists.txt
index a7e6b6a8dceba7d5ffb3947ffc47d584aa953639..7431c9aa03950b2e83e95da36957fb15daa65daf 100644
--- a/exercises/exercise-basic/CMakeLists.txt
+++ b/exercises/exercise-basic/CMakeLists.txt
@@ -10,7 +10,7 @@ dune_add_test(NAME exercise_basic_2p2c
 
 # here, add the two-phase non-isothermal simulation program
 
-# add tutorial to the common target
+# add exercise to the common target
 add_dependencies(test_exercises exercise_basic_2p exercise_basic_2p2c)
 
 # add a symlink for the input file
diff --git a/exercises/exercise-basic/exercise_basic.cc b/exercises/exercise-basic/exercise_basic.cc
index 3bf3e8d87c4cc32d2f4db34d9ecef6ade0aee790..0a8b4e5707d5a75875ba35de62ceec5bcf9377cb 100644
--- a/exercises/exercise-basic/exercise_basic.cc
+++ b/exercises/exercise-basic/exercise_basic.cc
@@ -18,7 +18,7 @@
  *****************************************************************************/
 /*!
  * \file
- * \brief The main file for the two-phase porousmediumflow problem of exercise 1
+ * \brief The main file for the two-phase porousmediumflow problem of exercise-basic
  */
 #include <config.h>
 
diff --git a/exercises/exercise-basic/exercise_basic_2p.cc b/exercises/exercise-basic/exercise_basic_2p.cc
index fbefdd1eae0db5ea4225dd120be224f7cf86f615..88f18f84da4bccded1a97b48ccf2bab040369909 100644
--- a/exercises/exercise-basic/exercise_basic_2p.cc
+++ b/exercises/exercise-basic/exercise_basic_2p.cc
@@ -18,7 +18,7 @@
  *****************************************************************************/
 /*!
  * \file
- * \brief The main file for the two-phase porousmediumflow problem of exercise 1
+ * \brief The main file for the two-phase porousmediumflow problem of exercise-basic
  */
 #include <config.h>
 
diff --git a/exercises/exercise-basic/exercise_basic_2p2c.cc b/exercises/exercise-basic/exercise_basic_2p2c.cc
index f24009436f37aa1199b4cddacefa4189bdbb12b8..b4359b9ea717c3b3a01ae3ba0601ecda031f64e5 100644
--- a/exercises/exercise-basic/exercise_basic_2p2c.cc
+++ b/exercises/exercise-basic/exercise_basic_2p2c.cc
@@ -18,7 +18,7 @@
  *****************************************************************************/
 /*!
  * \file
- * \brief The main file for the 2p2c porousmediumflow problem in exercise1
+ * \brief The main file for the 2p2c porousmediumflow problem in exercise-basic
  */
 #include <config.h>
 
diff --git a/exercises/exercise-basic/injection2p2cproblem.hh b/exercises/exercise-basic/injection2p2cproblem.hh
index 12535cbe8f06d2247e79993414171414740f7151..c5a123e1b71477c01850e4476efbdc377947e2f2 100644
--- a/exercises/exercise-basic/injection2p2cproblem.hh
+++ b/exercises/exercise-basic/injection2p2cproblem.hh
@@ -19,7 +19,7 @@
 /*!
  * \file
  *
- * \brief The two-phase porousmediumflow problem for exercise 1
+ * \brief The two-phase porousmediumflow problem for exercise-basic
  */
 #ifndef DUMUX_EX1_INJECTION_2P2C_PROBLEM_HH
 #define DUMUX_EX1_INJECTION_2P2C_PROBLEM_HH
diff --git a/exercises/exercise-basic/injection2pniproblem.hh b/exercises/exercise-basic/injection2pniproblem.hh
index d89fa7f1c4ca1abcf7096a16fbe76859c8531314..e4512e242f7d07d233535531eb6adb203f5f9b66 100644
--- a/exercises/exercise-basic/injection2pniproblem.hh
+++ b/exercises/exercise-basic/injection2pniproblem.hh
@@ -19,7 +19,7 @@
 /*!
  * \file
  *
- * \brief The two-phase nonisothermal porousmediumflow problem for exercise 1
+ * \brief The two-phase nonisothermal porousmediumflow problem for exercise-basic
  */
 
 #ifndef DUMUX_EX1_INJECTION_PROBLEM_2PNI_HH
diff --git a/exercises/exercise-basic/injection2pproblem.hh b/exercises/exercise-basic/injection2pproblem.hh
index f9f585e86ca311f5079a9e978a5b307c047b13fc..e289798ccfda8972f0345a7e96fe2085291d531e 100644
--- a/exercises/exercise-basic/injection2pproblem.hh
+++ b/exercises/exercise-basic/injection2pproblem.hh
@@ -19,7 +19,7 @@
 /*!
  * \file
  *
- * \brief The two-phase porousmediumflow problem for exercise 1
+ * \brief The two-phase porousmediumflow problem for exercise-basic
  */
 
 #ifndef DUMUX_EX1_INJECTION_PROBLEM_2P_HH
diff --git a/exercises/solution/exercise-basic/CMakeLists.txt b/exercises/solution/exercise-basic/CMakeLists.txt
index 5d2a43bdb4bd3c90129f0633527859f810c42952..c4ddb03c7cfc499e3eac94ebb57cd589146b9334 100644
--- a/exercises/solution/exercise-basic/CMakeLists.txt
+++ b/exercises/solution/exercise-basic/CMakeLists.txt
@@ -4,7 +4,7 @@ dune_add_test(NAME exercise_basic_2pni
               CMD_ARGS exercise_basic.input)
 
 
-# add tutorial to the common target
+# add exercise to the common target
 add_dependencies(test_exercises exercise_basic_2pni)
 
 # add a symlink for the input file
diff --git a/exercises/solution/exercise-basic/exercise_basic_2pni.cc b/exercises/solution/exercise-basic/exercise_basic_2pni.cc
index 68f9d3b50ffa07c4aedf2e9843174da557e1544d..c772513cb855bb999ad5e85713ff964a383fcf63 100644
--- a/exercises/solution/exercise-basic/exercise_basic_2pni.cc
+++ b/exercises/solution/exercise-basic/exercise_basic_2pni.cc
@@ -18,7 +18,7 @@
  *****************************************************************************/
 /*!
  * \file
- * \brief The solution main file for the two-phase porousmediumflow problem of exercise 1
+ * \brief The solution main file for the two-phase porousmediumflow problem of exercise-basic
  */
 #include <config.h>
 
diff --git a/exercises/solution/exercise-basic/injection2pniproblem.hh b/exercises/solution/exercise-basic/injection2pniproblem.hh
index 6cc7132b280e6408639f2eeffd114e39a2bd624d..24bdce9a499b4595536016f6c75fa1453218ddd7 100644
--- a/exercises/solution/exercise-basic/injection2pniproblem.hh
+++ b/exercises/solution/exercise-basic/injection2pniproblem.hh
@@ -19,7 +19,7 @@
 /*!
  * \file
  *
- * \brief The two-phase nonisothermal porousmediumflow problem for exercise 1
+ * \brief The solution of the two-phase nonisothermal porousmediumflow problem for exercise-basic
  */
 
 #ifndef DUMUX_EX1_INJECTION_PROBLEM_2PNI_HH