diff --git a/dumux/common/properties/grid.hh b/dumux/common/properties/grid.hh
index 2ab818bf02e53d8ee94a7b7aadb0faf454e65f21..97a97fa946be1e2d58eb0822ea11cf572e37268e 100644
--- a/dumux/common/properties/grid.hh
+++ b/dumux/common/properties/grid.hh
@@ -46,7 +46,7 @@ private:
     using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
     using GlobalPosition = typename Dune::FieldVector<typename GridView::ctype, GridView::dimensionworld>;
 public:
-    using type = PointSource<GlobalPosition, SourceValues>;
+    using type = Dumux::PointSource<GlobalPosition, SourceValues>;
 };
 
 //! Use the point source helper using the bounding box tree as a default
diff --git a/dumux/discretization/fvproperties.hh b/dumux/discretization/fvproperties.hh
index 4fdee202d0a8ca409af7b0720d62476b2ffc5839..477ecf134a321490415dc0a7c36fef4eb20edef8 100644
--- a/dumux/discretization/fvproperties.hh
+++ b/dumux/discretization/fvproperties.hh
@@ -61,7 +61,7 @@ SET_BOOL_PROP(FiniteVolumeModel, EnableGridVolumeVariablesCache, false);
 SET_BOOL_PROP(FiniteVolumeModel, EnableGridFluxVariablesCache, false);
 
 //! Boundary types at a single degree of freedom
-SET_TYPE_PROP(FiniteVolumeModel, BoundaryTypes, BoundaryTypes<GET_PROP_TYPE(TypeTag, ModelTraits)::numEq()>);
+SET_TYPE_PROP(FiniteVolumeModel, BoundaryTypes, Dumux::BoundaryTypes<GET_PROP_TYPE(TypeTag, ModelTraits)::numEq()>);
 
 // TODO: bundle SolutionVector, JacobianMatrix
 //       in LinearAlgebra traits
diff --git a/dumux/discretization/staggered/properties.hh b/dumux/discretization/staggered/properties.hh
index 16716412153d4c49b99f89e781c272656f817ac8..af5112ad1eac8e71efdad9d5aa3e58a9567171fe 100644
--- a/dumux/discretization/staggered/properties.hh
+++ b/dumux/discretization/staggered/properties.hh
@@ -90,7 +90,7 @@ SET_PROP(StaggeredModel, StaggeredFaceSolution)
 private:
     using FaceSolutionVector = typename GET_PROP_TYPE(TypeTag, FaceSolutionVector);
 public:
-    using type = StaggeredFaceSolution<FaceSolutionVector>;
+    using type = Dumux::StaggeredFaceSolution<FaceSolutionVector>;
 };
 
 //! Set the grid variables (volume, flux and face variables)
@@ -124,7 +124,7 @@ SET_TYPE_PROP(StaggeredModel,
                                 GET_PROP_VALUE(TypeTag, NumEqFace)>);
 
 //! Boundary types at a single degree of freedom
-SET_TYPE_PROP(StaggeredModel, BoundaryTypes, BoundaryTypes<GET_PROP_TYPE(TypeTag, ModelTraits)::numEq()>);
+SET_TYPE_PROP(StaggeredModel, BoundaryTypes, Dumux::BoundaryTypes<GET_PROP_TYPE(TypeTag, ModelTraits)::numEq()>);
 
 // TODO: bundle SolutionVector, JacobianMatrix
 //       in LinearAlgebra traits
diff --git a/dumux/porousmediumflow/nonequilibrium/model.hh b/dumux/porousmediumflow/nonequilibrium/model.hh
index ee1030843dec7f313f120e6597b72bd49b8bb65e..b4ba31ed5bf5f81c9dc95299236e9f88b8294da5 100644
--- a/dumux/porousmediumflow/nonequilibrium/model.hh
+++ b/dumux/porousmediumflow/nonequilibrium/model.hh
@@ -144,7 +144,7 @@ public:
 SET_PROP(NonEquilibrium, NusseltFormulation)
 {
 public:
-    static constexpr NusseltFormulation value = NusseltFormulation::WakaoKaguei;
+    static constexpr Dumux::NusseltFormulation value = Dumux::NusseltFormulation::WakaoKaguei;
 };
 
 /*!
@@ -154,7 +154,7 @@ public:
 SET_PROP(NonEquilibrium, SherwoodFormulation)
 {
 public:
-    static constexpr SherwoodFormulation value = SherwoodFormulation::WakaoKaguei;
+    static constexpr Dumux::SherwoodFormulation value = Dumux::SherwoodFormulation::WakaoKaguei;
 };
 
 } //end namespace Properties
diff --git a/dumux/porousmediumflow/properties.hh b/dumux/porousmediumflow/properties.hh
index d775eabd73a83efa1969c8e21108bc8270677b63..cb82f244994cb40e218e1b337466f7f62ee3b80b 100644
--- a/dumux/porousmediumflow/properties.hh
+++ b/dumux/porousmediumflow/properties.hh
@@ -71,7 +71,7 @@ SET_BOOL_PROP(PorousMediumFlow, SolutionDependentMolecularDiffusion, true);
 SET_BOOL_PROP(PorousMediumFlow, SolutionDependentHeatConduction, true);
 
 //! The default implementation of the energy balance equation for flow problems in porous media.
-SET_TYPE_PROP(PorousMediumFlow, EnergyLocalResidual, EnergyLocalResidual<TypeTag> );
+SET_TYPE_PROP(PorousMediumFlow, EnergyLocalResidual, Dumux::EnergyLocalResidual<TypeTag> );
 
 //! Velocity output
 SET_TYPE_PROP(PorousMediumFlow, VelocityOutput,
diff --git a/dumux/porousmediumflow/sequential/properties.hh b/dumux/porousmediumflow/sequential/properties.hh
index 29ccbaf3ccbadb4d837ce83311015eab5fcb974c..7afae15dc4a6b9fe95ddde9d97e9e008a453eaf4 100644
--- a/dumux/porousmediumflow/sequential/properties.hh
+++ b/dumux/porousmediumflow/sequential/properties.hh
@@ -214,7 +214,7 @@ SET_TYPE_PROP(SequentialModel,  Variables, VariableClass<TypeTag>);
 SET_TYPE_PROP(SequentialModel,  PrimaryVariables, typename GET_PROP(TypeTag, SolutionTypes)::PrimaryVariables);
 
 //! Set the default type for the time manager
-SET_TYPE_PROP(SequentialModel, TimeManager, TimeManager<TypeTag>);
+SET_TYPE_PROP(SequentialModel, TimeManager, Dumux::TimeManager<TypeTag>);
 
 /*!
  * \brief Boundary types at a single degree of freedom.
@@ -223,7 +223,7 @@ SET_PROP(SequentialModel, BoundaryTypes)
 { private:
     enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
 public:
-    using type = BoundaryTypes<numEq>;
+    using type = Dumux::BoundaryTypes<numEq>;
 };
 
 //! do not specific any model-specific default parameters here