diff --git a/exercises/exercise-properties/CMakeLists.txt b/exercises/exercise-properties/CMakeLists.txt
index d700163f5401ed4ba4adf7d9d434e7a969a50b5f..0cc953b240e1125797b72a761dfda59febb70588 100644
--- a/exercises/exercise-properties/CMakeLists.txt
+++ b/exercises/exercise-properties/CMakeLists.txt
@@ -1,11 +1,11 @@
 # the compositional two-phase simulation program
-dune_add_test(NAME exercise2
-              SOURCES exercise2.cc
+dune_add_test(NAME exercise_properties
+              SOURCES exercise_properties.cc
               COMPILE_DEFINITIONS TYPETAG=Injection2p2pcCCProblem
-              CMD_ARGS exercise2.input)
+              CMD_ARGS exercise_properties.input)
 
 # add tutorial to the common target
-add_dependencies(test_exercises exercise2)
+add_dependencies(test_exercises exercise_properties)
 
 # add a symlink for the input file
-dune_symlink_to_source_files(FILES "exercise2.input")
+dune_symlink_to_source_files(FILES "exercise_properties.input")
diff --git a/exercises/exercise-properties/exercise2.cc b/exercises/exercise-properties/exercise_properties.cc
similarity index 100%
rename from exercises/exercise-properties/exercise2.cc
rename to exercises/exercise-properties/exercise_properties.cc
diff --git a/exercises/exercise-properties/exercise2.input b/exercises/exercise-properties/exercise_properties.input
similarity index 100%
rename from exercises/exercise-properties/exercise2.input
rename to exercises/exercise-properties/exercise_properties.input
diff --git a/exercises/solution/CMakeLists.txt b/exercises/solution/CMakeLists.txt
index 385db3ffd1e7e781da307c2d34d22919439da59d..50ac3c623f92d870c3ae0bafb54df8d4b3863476 100644
--- a/exercises/solution/CMakeLists.txt
+++ b/exercises/solution/CMakeLists.txt
@@ -1,7 +1,6 @@
-add_subdirectory(ex2)
-
 add_subdirectory(exercise-basic)
 add_subdirectory(exercise-fluidsystem)
 add_subdirectory(exercise-grids)
 add_subdirectory(exercise-mainfile)
+add_subdirectory(exercise-properties)
 add_subdirectory(exercise-runtimeparams)
diff --git a/exercises/solution/ex2/CMakeLists.txt b/exercises/solution/ex2/CMakeLists.txt
deleted file mode 100644
index fe1e87464e3d126605f090e6b72ad21ae636f920..0000000000000000000000000000000000000000
--- a/exercises/solution/ex2/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# the compositional two-phase simulation program
-dune_add_test(NAME exercise2_solution
-              SOURCES exercise2_solution.cc
-              CMD_ARGS exercise2.input -Problem.OnlyPlotMaterialLaws false)
-
-# add tutorial to the common target
-add_dependencies(test_exercises exercise2_solution)
-
-# add a symlink for the input file
-dune_symlink_to_source_files(FILES "exercise2.input")
diff --git a/exercises/solution/exercise-properties/CMakeLists.txt b/exercises/solution/exercise-properties/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..fec78d7b59a171f11db667127c99f82ffa95773b
--- /dev/null
+++ b/exercises/solution/exercise-properties/CMakeLists.txt
@@ -0,0 +1,10 @@
+# the compositional two-phase simulation program
+dune_add_test(NAME exercise_properties_solution
+              SOURCES exercise_properties_solution.cc
+              CMD_ARGS exercise_properties.input -Problem.OnlyPlotMaterialLaws false)
+
+# add tutorial to the common target
+add_dependencies(test_exercises exercise_properties_solution)
+
+# add a symlink for the input file
+dune_symlink_to_source_files(FILES "exercise_properties_solution.input")
diff --git a/exercises/solution/ex2/exercise2_solution.cc b/exercises/solution/exercise-properties/exercise_properties_solution.cc
similarity index 100%
rename from exercises/solution/ex2/exercise2_solution.cc
rename to exercises/solution/exercise-properties/exercise_properties_solution.cc
diff --git a/exercises/solution/ex2/exercise2.input b/exercises/solution/exercise-properties/exercise_properties_solution.input
similarity index 100%
rename from exercises/solution/ex2/exercise2.input
rename to exercises/solution/exercise-properties/exercise_properties_solution.input
diff --git a/exercises/solution/ex2/injection2p2cproblem.hh b/exercises/solution/exercise-properties/injection2p2cproblem.hh
similarity index 100%
rename from exercises/solution/ex2/injection2p2cproblem.hh
rename to exercises/solution/exercise-properties/injection2p2cproblem.hh
diff --git a/exercises/solution/ex2/injection2p2cspatialparams.hh b/exercises/solution/exercise-properties/injection2p2cspatialparams.hh
similarity index 100%
rename from exercises/solution/ex2/injection2p2cspatialparams.hh
rename to exercises/solution/exercise-properties/injection2p2cspatialparams.hh
diff --git a/exercises/solution/ex2/mylocalresidual.hh b/exercises/solution/exercise-properties/mylocalresidual.hh
similarity index 100%
rename from exercises/solution/ex2/mylocalresidual.hh
rename to exercises/solution/exercise-properties/mylocalresidual.hh
diff --git a/exercises/solution/ex2/mymateriallaw.hh b/exercises/solution/exercise-properties/mymateriallaw.hh
similarity index 100%
rename from exercises/solution/ex2/mymateriallaw.hh
rename to exercises/solution/exercise-properties/mymateriallaw.hh