diff --git a/exercises/exercise-fractures/README.md b/exercises/exercise-fractures/README.md
index 067ac67f0c181a22cab57b71e3ccae5b8235a044..a31fe60b538ed997ac89b743bb685382777f3a76 100644
--- a/exercises/exercise-fractures/README.md
+++ b/exercises/exercise-fractures/README.md
@@ -69,7 +69,7 @@ From the matrix side, the coupling works a bit different. Since the fracture dom
 // create the type tag node for the matrix sub-problem
 // Create new type tags
 namespace TTag {
-struct MatrixProblemTypeTag { using InheritsFrom = std::tuple<CCTpfaFacetCouplingModel, TwoP>; };
+struct MatrixProblem { using InheritsFrom = std::tuple<CCTpfaFacetCouplingModel, TwoP>; };
 } // end namespace TTag
 ```
 
diff --git a/exercises/exercise-fractures/exercise_fractures.cc b/exercises/exercise-fractures/exercise_fractures.cc
index 55ebc0d96369e9647767bda8ea8e6a53f27b7752..b52e3c9c00ff66be1068d7f0c8e474864fa832ce 100644
--- a/exercises/exercise-fractures/exercise_fractures.cc
+++ b/exercises/exercise-fractures/exercise_fractures.cc
@@ -50,8 +50,8 @@
 
 // Define some types for this test  so that we can set them as properties below and
 // reuse them again in the main function with only one single definition of them here
-using MatrixTypeTag = Dumux::Properties::TTag::MatrixProblemTypeTag;
-using FractureTypeTag = Dumux::Properties::TTag::FractureProblemTypeTag;
+using MatrixTypeTag = Dumux::Properties::TTag::MatrixProblem;
+using FractureTypeTag = Dumux::Properties::TTag::FractureProblem;
 using MatrixFVGridGeometry = Dumux::GetPropType<MatrixTypeTag, Dumux::Properties::FVGridGeometry>;
 using FractureFVGridGeometry = Dumux::GetPropType<FractureTypeTag, Dumux::Properties::FVGridGeometry>;
 using TheMultiDomainTraits = Dumux::MultiDomainTraits<MatrixTypeTag, FractureTypeTag>;
@@ -63,10 +63,10 @@ namespace Dumux {
 namespace Properties {
 
 template<class TypeTag>
-struct CouplingManager<TypeTag, TTag::MatrixProblemTypeTag> { using type = TheCouplingManager; };
+struct CouplingManager<TypeTag, TTag::MatrixProblem> { using type = TheCouplingManager; };
 
 template<class TypeTag>
-struct CouplingManager<TypeTag, TTag::FractureProblemTypeTag> { using type = TheCouplingManager; };
+struct CouplingManager<TypeTag, TTag::FractureProblem> { using type = TheCouplingManager; };
 
 } // end namespace Properties
 } // end namespace Dumux
diff --git a/exercises/exercise-fractures/fractureproblem.hh b/exercises/exercise-fractures/fractureproblem.hh
index 68153d271483efc1a4a2b959e3011453f39313b5..38caa0cd591ac0786ddb84a21102dbd9428d0feb 100644
--- a/exercises/exercise-fractures/fractureproblem.hh
+++ b/exercises/exercise-fractures/fractureproblem.hh
@@ -51,20 +51,20 @@ namespace Properties {
 
 // Create new type tag node
 namespace TTag {
-struct FractureProblemTypeTag { using InheritsFrom = std::tuple<CCTpfaModel, TwoP>; };
+struct FractureProblem { using InheritsFrom = std::tuple<CCTpfaModel, TwoP>; };
 } // end namespace TTag
 
 // Set the grid type
 template<class TypeTag>
-struct Grid<TypeTag, TTag::FractureProblemTypeTag> { using type = Dune::FoamGrid<1, 2>; };
+struct Grid<TypeTag, TTag::FractureProblem> { using type = Dune::FoamGrid<1, 2>; };
 
 // Set the problem type
 template<class TypeTag>
-struct Problem<TypeTag, TTag::FractureProblemTypeTag> { using type = FractureSubProblem<TypeTag>; };
+struct Problem<TypeTag, TTag::FractureProblem> { using type = FractureSubProblem<TypeTag>; };
 
 // set the spatial params
 template<class TypeTag>
-struct SpatialParams<TypeTag, TTag::FractureProblemTypeTag>
+struct SpatialParams<TypeTag, TTag::FractureProblem>
 {
     using type = FractureSpatialParams< GetPropType<TypeTag, Properties::FVGridGeometry>,
                                         GetPropType<TypeTag, Properties::Scalar> >;
@@ -72,7 +72,7 @@ struct SpatialParams<TypeTag, TTag::FractureProblemTypeTag>
 
 // the fluid system
 template<class TypeTag>
-struct FluidSystem<TypeTag, TTag::FractureProblemTypeTag>
+struct FluidSystem<TypeTag, TTag::FractureProblem>
 {
     using type = Dumux::FluidSystems::H2ON2< GetPropType<TypeTag, Properties::Scalar>,
                                              FluidSystems::H2ON2DefaultPolicy</*fastButSimplifiedRelations=*/true> >;
diff --git a/exercises/exercise-fractures/matrixproblem.hh b/exercises/exercise-fractures/matrixproblem.hh
index 854902ae7cbc8aae170be0d2d8d9b0d1d637aa76..7c475d979197ed4c24fbe0fa8d0488b6752af000 100644
--- a/exercises/exercise-fractures/matrixproblem.hh
+++ b/exercises/exercise-fractures/matrixproblem.hh
@@ -59,20 +59,20 @@ namespace Properties {
 
 // create the type tag node
 namespace TTag {
-struct MatrixProblemTypeTag { using InheritsFrom = std::tuple<CCTpfaFacetCouplingModel, TwoP>; };
+struct MatrixProblem { using InheritsFrom = std::tuple<CCTpfaFacetCouplingModel, TwoP>; };
 } // end namespace TTag
 
 // Set the grid type
 template<class TypeTag>
-struct Grid<TypeTag, TTag::MatrixProblemTypeTag> { using type = Dune::ALUGrid<2, 2, Dune::simplex, Dune::conforming>; };
+struct Grid<TypeTag, TTag::MatrixProblem> { using type = Dune::ALUGrid<2, 2, Dune::simplex, Dune::conforming>; };
 
 // Set the problem type
 template<class TypeTag>
-struct Problem<TypeTag, TTag::MatrixProblemTypeTag> { using type = MatrixSubProblem<TypeTag>; };
+struct Problem<TypeTag, TTag::MatrixProblem> { using type = MatrixSubProblem<TypeTag>; };
 
 // set the spatial params
 template<class TypeTag>
-struct SpatialParams<TypeTag, TTag::MatrixProblemTypeTag>
+struct SpatialParams<TypeTag, TTag::MatrixProblem>
 {
     using type = MatrixSpatialParams< GetPropType<TypeTag, Properties::FVGridGeometry>,
                                       GetPropType<TypeTag, Properties::Scalar> >;
@@ -80,7 +80,7 @@ struct SpatialParams<TypeTag, TTag::MatrixProblemTypeTag>
 
 // the fluid system
 template<class TypeTag>
-struct FluidSystem<TypeTag, TTag::MatrixProblemTypeTag>
+struct FluidSystem<TypeTag, TTag::MatrixProblem>
 {
     using type = Dumux::FluidSystems::H2ON2< GetPropType<TypeTag, Properties::Scalar>,
                                              FluidSystems::H2ON2DefaultPolicy</*fastButSimplifiedRelations=*/true> >;
diff --git a/exercises/solution/exercise-fractures/exercise_fractures.cc b/exercises/solution/exercise-fractures/exercise_fractures.cc
index 55ebc0d96369e9647767bda8ea8e6a53f27b7752..b52e3c9c00ff66be1068d7f0c8e474864fa832ce 100644
--- a/exercises/solution/exercise-fractures/exercise_fractures.cc
+++ b/exercises/solution/exercise-fractures/exercise_fractures.cc
@@ -50,8 +50,8 @@
 
 // Define some types for this test  so that we can set them as properties below and
 // reuse them again in the main function with only one single definition of them here
-using MatrixTypeTag = Dumux::Properties::TTag::MatrixProblemTypeTag;
-using FractureTypeTag = Dumux::Properties::TTag::FractureProblemTypeTag;
+using MatrixTypeTag = Dumux::Properties::TTag::MatrixProblem;
+using FractureTypeTag = Dumux::Properties::TTag::FractureProblem;
 using MatrixFVGridGeometry = Dumux::GetPropType<MatrixTypeTag, Dumux::Properties::FVGridGeometry>;
 using FractureFVGridGeometry = Dumux::GetPropType<FractureTypeTag, Dumux::Properties::FVGridGeometry>;
 using TheMultiDomainTraits = Dumux::MultiDomainTraits<MatrixTypeTag, FractureTypeTag>;
@@ -63,10 +63,10 @@ namespace Dumux {
 namespace Properties {
 
 template<class TypeTag>
-struct CouplingManager<TypeTag, TTag::MatrixProblemTypeTag> { using type = TheCouplingManager; };
+struct CouplingManager<TypeTag, TTag::MatrixProblem> { using type = TheCouplingManager; };
 
 template<class TypeTag>
-struct CouplingManager<TypeTag, TTag::FractureProblemTypeTag> { using type = TheCouplingManager; };
+struct CouplingManager<TypeTag, TTag::FractureProblem> { using type = TheCouplingManager; };
 
 } // end namespace Properties
 } // end namespace Dumux
diff --git a/exercises/solution/exercise-fractures/fractureproblem.hh b/exercises/solution/exercise-fractures/fractureproblem.hh
index 4250c83a61865155240db1823af2b56f541d1d88..2fc8aaa92e269b3add24b5ff7beb81b445a55812 100644
--- a/exercises/solution/exercise-fractures/fractureproblem.hh
+++ b/exercises/solution/exercise-fractures/fractureproblem.hh
@@ -51,20 +51,20 @@ namespace Properties {
 
 // Create new type tag node
 namespace TTag {
-struct FractureProblemTypeTag { using InheritsFrom = std::tuple<CCTpfaModel, TwoP>; };
+struct FractureProblem { using InheritsFrom = std::tuple<CCTpfaModel, TwoP>; };
 } // end namespace TTag
 
 // Set the grid type
 template<class TypeTag>
-struct Grid<TypeTag, TTag::FractureProblemTypeTag> { using type = Dune::FoamGrid<1, 2>; };
+struct Grid<TypeTag, TTag::FractureProblem> { using type = Dune::FoamGrid<1, 2>; };
 
 // Set the problem type
 template<class TypeTag>
-struct Problem<TypeTag, TTag::FractureProblemTypeTag> { using type = FractureSubProblem<TypeTag>; };
+struct Problem<TypeTag, TTag::FractureProblem> { using type = FractureSubProblem<TypeTag>; };
 
 // set the spatial params
 template<class TypeTag>
-struct SpatialParams<TypeTag, TTag::FractureProblemTypeTag>
+struct SpatialParams<TypeTag, TTag::FractureProblem>
 {
     using type = FractureSpatialParams< GetPropType<TypeTag, Properties::FVGridGeometry>,
                                         GetPropType<TypeTag, Properties::Scalar> >;
@@ -72,7 +72,7 @@ struct SpatialParams<TypeTag, TTag::FractureProblemTypeTag>
 
 // the fluid system
 template<class TypeTag>
-struct FluidSystem<TypeTag, TTag::FractureProblemTypeTag>
+struct FluidSystem<TypeTag, TTag::FractureProblem>
 {
     using type = Dumux::FluidSystems::H2ON2< GetPropType<TypeTag, Properties::Scalar>,
                                              FluidSystems::H2ON2DefaultPolicy</*fastButSimplifiedRelations=*/true> >;
diff --git a/exercises/solution/exercise-fractures/matrixproblem.hh b/exercises/solution/exercise-fractures/matrixproblem.hh
index 0c91909a1ae09048dd6b27812878fe1acdef33c9..ab15c84c0d76df612e5c5da4ffb7417bfd2dde9a 100644
--- a/exercises/solution/exercise-fractures/matrixproblem.hh
+++ b/exercises/solution/exercise-fractures/matrixproblem.hh
@@ -59,20 +59,20 @@ namespace Properties {
 
 // create the type tag node
 namespace TTag {
-struct MatrixProblemTypeTag { using InheritsFrom = std::tuple<CCTpfaFacetCouplingModel, TwoP>; };
+struct MatrixProblem { using InheritsFrom = std::tuple<CCTpfaFacetCouplingModel, TwoP>; };
 } // end namespace TTag
 
 // Set the grid type
 template<class TypeTag>
-struct Grid<TypeTag, TTag::MatrixProblemTypeTag> { using type = Dune::ALUGrid<2, 2, Dune::simplex, Dune::conforming>; };
+struct Grid<TypeTag, TTag::MatrixProblem> { using type = Dune::ALUGrid<2, 2, Dune::simplex, Dune::conforming>; };
 
 // Set the problem type
 template<class TypeTag>
-struct Problem<TypeTag, TTag::MatrixProblemTypeTag> { using type = MatrixSubProblem<TypeTag>; };
+struct Problem<TypeTag, TTag::MatrixProblem> { using type = MatrixSubProblem<TypeTag>; };
 
 // set the spatial params
 template<class TypeTag>
-struct SpatialParams<TypeTag, TTag::MatrixProblemTypeTag>
+struct SpatialParams<TypeTag, TTag::MatrixProblem>
 {
     using type = MatrixSpatialParams< GetPropType<TypeTag, Properties::FVGridGeometry>,
                                       GetPropType<TypeTag, Properties::Scalar> >;
@@ -80,7 +80,7 @@ struct SpatialParams<TypeTag, TTag::MatrixProblemTypeTag>
 
 // the fluid system
 template<class TypeTag>
-struct FluidSystem<TypeTag, TTag::MatrixProblemTypeTag>
+struct FluidSystem<TypeTag, TTag::MatrixProblem>
 {
     using type = Dumux::FluidSystems::H2ON2< GetPropType<TypeTag, Properties::Scalar>,
                                              FluidSystems::H2ON2DefaultPolicy</*fastButSimplifiedRelations=*/true> >;