diff --git a/dumux/discretization/CMakeLists.txt b/dumux/discretization/CMakeLists.txt
index 5c7624912611589e7dfa12d1b8463bfd181d8952..9798db6b0b663f39cfee92e6e53a12e8fae8d172 100644
--- a/dumux/discretization/CMakeLists.txt
+++ b/dumux/discretization/CMakeLists.txt
@@ -4,6 +4,9 @@ add_subdirectory(staggered)
 
 install(FILES
 basefvgridgeometry.hh
+box.hh
+ccmpfa.hh
+cctpfa.hh
 checkoverlapsize.hh
 elementsolution.hh
 evalgradients.hh
@@ -14,6 +17,7 @@ fvproperties.hh
 localview.hh
 method.hh
 scvandscvfiterators.hh
+staggered.hh
 subcontrolvolumebase.hh
 subcontrolvolumefacebase.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/discretization)
diff --git a/dumux/discretization/box/properties.hh b/dumux/discretization/box.hh
similarity index 98%
rename from dumux/discretization/box/properties.hh
rename to dumux/discretization/box.hh
index ce2a57f18193e9094ee5a78bfc0548759b61cdff..c5e368fad0d49a109d329c84728e6ccd0945b3a0 100644
--- a/dumux/discretization/box/properties.hh
+++ b/dumux/discretization/box.hh
@@ -23,8 +23,8 @@
  * \brief Defines a type tag and some properties for models using the box scheme.
  */
 
-#ifndef DUMUX_BOX_PROPERTIES_HH
-#define DUMUX_BOX_PROPERTIES_HH
+#ifndef DUMUX_DISCRETIZTAION_BOX_HH
+#define DUMUX_DISCRETIZTAION_BOX_HH
 
 #include <dune/common/fvector.hh>
 #include <dune/geometry/multilineargeometry.hh>
diff --git a/dumux/discretization/box/CMakeLists.txt b/dumux/discretization/box/CMakeLists.txt
index 4f630fb250f56e08e2e80065051ae6592f3dabdd..8cf53bd605b75c3bb15a29666c994d4e84c0ace1 100644
--- a/dumux/discretization/box/CMakeLists.txt
+++ b/dumux/discretization/box/CMakeLists.txt
@@ -1,22 +1,14 @@
 install(FILES
 boxgeometryhelper.hh
-darcyslaw.hh
-effectivestresslaw.hh
 elementboundarytypes.hh
 elementfluxvariablescache.hh
 elementsolution.hh
 elementvolumevariables.hh
-fickslaw.hh
 fluxvariablescache.hh
-fourierslaw.hh
-fourierslawnonequilibrium.hh
 fvelementgeometry.hh
 fvgridgeometry.hh
 gridfluxvariablescache.hh
 gridvolumevariables.hh
-hookeslaw.hh
-maxwellstefanslaw.hh
-properties.hh
 scvftoscvboundarytypes.hh
 subcontrolvolume.hh
 subcontrolvolumeface.hh
diff --git a/dumux/discretization/cellcentered/mpfa/properties.hh b/dumux/discretization/ccmpfa.hh
similarity index 98%
rename from dumux/discretization/cellcentered/mpfa/properties.hh
rename to dumux/discretization/ccmpfa.hh
index 44180aba17a4cf5b986ddce8404b2b8dd7e53066..fca287b2ddc184edf5f6a3bce9efe57a693feac7 100644
--- a/dumux/discretization/cellcentered/mpfa/properties.hh
+++ b/dumux/discretization/ccmpfa.hh
@@ -18,12 +18,12 @@
  *****************************************************************************/
 /*!
  * \file
- * \ingroup CCMpfaDiscretization
+ * \ingroup Discretization
  * \brief Properties for all models using cell-centered finite volume scheme with mpfa
  * \note Inherit from these properties to use a cell-centered finite volume scheme with mpfa
  */
-#ifndef DUMUX_CC_MPFA_PROPERTIES_HH
-#define DUMUX_CC_MPFA_PROPERTIES_HH
+#ifndef DUMUX_DISCRETIZATION_CC_MPFA_HH
+#define DUMUX_DISCRETIZATION_CC_MPFA_HH
 
 #include <dune/common/reservedvector.hh>
 
diff --git a/dumux/discretization/cellcentered/tpfa/properties.hh b/dumux/discretization/cctpfa.hh
similarity index 97%
rename from dumux/discretization/cellcentered/tpfa/properties.hh
rename to dumux/discretization/cctpfa.hh
index e96067e70f0ff259959c23e6ddef42119791ab60..674fd4c945859cc8a2c824f214a8799119edf155 100644
--- a/dumux/discretization/cellcentered/tpfa/properties.hh
+++ b/dumux/discretization/cctpfa.hh
@@ -18,13 +18,13 @@
  *****************************************************************************/
 /*!
  * \file
- * \ingroup CCTpfaDiscretization
+ * \ingroup Discretization
  * \brief Properties for all models using cell-centered finite volume scheme with TPFA
  * \note Inherit from these properties to use a cell-centered finite volume scheme with TPFA
  */
 
-#ifndef DUMUX_CC_TPFA_PROPERTIES_HH
-#define DUMUX_CC_TPFA_PROPERTIES_HH
+#ifndef DUMUX_DISCRETIZATION_CC_TPFA_HH
+#define DUMUX_DISCRETIZATION_CC_TPFA_HH
 
 #include <dumux/common/properties.hh>
 #include <dumux/common/boundaryflag.hh>
diff --git a/dumux/discretization/cellcentered/mpfa/CMakeLists.txt b/dumux/discretization/cellcentered/mpfa/CMakeLists.txt
index 51527f79f90d7a6cb5c54a78d5cc0ceb6fd90bd7..6d3ad060ea51c1d0f9bd36ef7caa178df91e94e3 100644
--- a/dumux/discretization/cellcentered/mpfa/CMakeLists.txt
+++ b/dumux/discretization/cellcentered/mpfa/CMakeLists.txt
@@ -3,13 +3,10 @@ add_subdirectory(omethod)
 install(FILES
 computetransmissibility.hh
 connectivitymap.hh
-darcyslaw.hh
 dualgridindexset.hh
 elementfluxvariablescache.hh
 elementvolumevariables.hh
-fickslaw.hh
 fluxvariablescachefiller.hh
-fourierslaw.hh
 fvelementgeometry.hh
 fvgridgeometry.hh
 fvgridgeometrytraits.hh
@@ -22,7 +19,6 @@ interactionvolumedatahandle.hh
 localassemblerbase.hh
 localfacedata.hh
 methods.hh
-properties.hh
 subcontrolvolumeface.hh
 tensorlambdafactory.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/discretization/cellcentered/mpfa)
diff --git a/dumux/discretization/cellcentered/tpfa/CMakeLists.txt b/dumux/discretization/cellcentered/tpfa/CMakeLists.txt
index c6f84ae16454af9b7294079e4e1a168037d69008..92498024bd602ae82958e232a297a4711dfc0af6 100644
--- a/dumux/discretization/cellcentered/tpfa/CMakeLists.txt
+++ b/dumux/discretization/cellcentered/tpfa/CMakeLists.txt
@@ -1,18 +1,12 @@
 install(FILES
 computetransmissibility.hh
-darcyslaw.hh
 elementfluxvariablescache.hh
 elementvolumevariables.hh
-fickslaw.hh
 fluxvariablescachefiller.hh
-forchheimerslaw.hh
-fourierslaw.hh
 fourierslawnonequilibrium.hh
 fvelementgeometry.hh
 fvgridgeometry.hh
 gridfluxvariablescache.hh
 gridvolumevariables.hh
-maxwellstefanslaw.hh
-properties.hh
 subcontrolvolumeface.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/discretization/cellcentered/tpfa)
diff --git a/dumux/discretization/staggered/properties.hh b/dumux/discretization/staggered.hh
similarity index 98%
rename from dumux/discretization/staggered/properties.hh
rename to dumux/discretization/staggered.hh
index 763bfc7fcafa273f15bea4b5a506b8b8e1701b75..cf27c9d6ecc8de312e85f66fcc5ea4e19e8f5727 100644
--- a/dumux/discretization/staggered/properties.hh
+++ b/dumux/discretization/staggered.hh
@@ -17,16 +17,15 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
  *****************************************************************************/
 /*!
- * \ingroup StaggeredDiscretization
  * \file
- *
+ * \ingroup Discretization
  * \brief Defines a type tag and some properties for models using the staggered scheme.
           This scheme features degrees of freedom at the elements' centers and intersections (faces).
  * TODO: detailed documentation and figures
  */
 
-#ifndef DUMUX_STAGGERD_PROPERTIES_HH
-#define DUMUX_STAGGERD_PROPERTIES_HH
+#ifndef DUMUX_DISCRETIZATION_STAGGERD_HH
+#define DUMUX_DISCRETIZATION_STAGGERD_HH
 
 #include <dumux/common/properties.hh>
 
diff --git a/dumux/discretization/staggered/CMakeLists.txt b/dumux/discretization/staggered/CMakeLists.txt
index 910de10785f40496f9aee680b7a5f788ec2ff42a..2a08c01ea914c73b51b9c9b5cf26c510abb0f13b 100644
--- a/dumux/discretization/staggered/CMakeLists.txt
+++ b/dumux/discretization/staggered/CMakeLists.txt
@@ -10,6 +10,5 @@ fvgridgeometry.hh
 gridfacevariables.hh
 gridfluxvariablescache.hh
 gridvariables.hh
-properties.hh
 subcontrolvolumeface.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/discretization/staggered)
diff --git a/dumux/discretization/staggered/freeflow/CMakeLists.txt b/dumux/discretization/staggered/freeflow/CMakeLists.txt
index 89e3125719b871dec9f8184460127ae46d95117b..1466dd1a47266e5674458647833559a611f708ad 100644
--- a/dumux/discretization/staggered/freeflow/CMakeLists.txt
+++ b/dumux/discretization/staggered/freeflow/CMakeLists.txt
@@ -3,11 +3,8 @@ boundarytypes.hh
 connectivitymap.hh
 elementvolumevariables.hh
 facevariables.hh
-fickslaw.hh
-fourierslaw.hh
 fvgridgeometrytraits.hh
 gridvolumevariables.hh
-maxwellstefanslaw.hh
 properties.hh
 staggeredgeometryhelper.hh
 subcontrolvolumeface.hh
diff --git a/dumux/discretization/staggered/freeflow/properties.hh b/dumux/discretization/staggered/freeflow/properties.hh
index 463ad490d5204f009d090211e49a416c09207a9d..c28bcb619d2ad0c4f3fd991b5df01438f9de4998 100644
--- a/dumux/discretization/staggered/freeflow/properties.hh
+++ b/dumux/discretization/staggered/freeflow/properties.hh
@@ -32,7 +32,7 @@
 #include <dumux/common/intersectionmapper.hh>
 #include <dumux/common/defaultmappertraits.hh>
 
-#include <dumux/discretization/staggered/properties.hh>
+#include <dumux/discretization/staggered.hh>
 #include <dumux/discretization/staggered/fvgridgeometry.hh>
 #include <dumux/freeflow/properties.hh>
 
diff --git a/dumux/flux/CMakeLists.txt b/dumux/flux/CMakeLists.txt
index fdfac891368f08c3f0f0599e13a91b3eccfaf83e..22381d1d23be3452ab6b860fa8d15468dc7d8cd2 100644
--- a/dumux/flux/CMakeLists.txt
+++ b/dumux/flux/CMakeLists.txt
@@ -1,3 +1,8 @@
+add_subdirectory(box)
+add_subdirectory(ccmpfa)
+add_subdirectory(cctpfa)
+add_subdirectory(staggered)
+
 install(FILES
 darcyslaw.hh
 effectivestresslaw.hh
diff --git a/dumux/flux/box/CMakeLists.txt b/dumux/flux/box/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d18c5bb99a612eac026d862924b5aeb52261faed
--- /dev/null
+++ b/dumux/flux/box/CMakeLists.txt
@@ -0,0 +1,9 @@
+install(FILES
+darcyslaw.hh
+effectivestresslaw.hh
+fickslaw.hh
+fourierslaw.hh
+fourierslawnonequilibrium.hh
+hookeslaw.hh
+maxwellstefanslaw.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/flux/box)
diff --git a/dumux/discretization/box/darcyslaw.hh b/dumux/flux/box/darcyslaw.hh
similarity index 100%
rename from dumux/discretization/box/darcyslaw.hh
rename to dumux/flux/box/darcyslaw.hh
diff --git a/dumux/discretization/box/effectivestresslaw.hh b/dumux/flux/box/effectivestresslaw.hh
similarity index 100%
rename from dumux/discretization/box/effectivestresslaw.hh
rename to dumux/flux/box/effectivestresslaw.hh
diff --git a/dumux/discretization/box/fickslaw.hh b/dumux/flux/box/fickslaw.hh
similarity index 100%
rename from dumux/discretization/box/fickslaw.hh
rename to dumux/flux/box/fickslaw.hh
diff --git a/dumux/discretization/box/fourierslaw.hh b/dumux/flux/box/fourierslaw.hh
similarity index 100%
rename from dumux/discretization/box/fourierslaw.hh
rename to dumux/flux/box/fourierslaw.hh
diff --git a/dumux/discretization/box/fourierslawnonequilibrium.hh b/dumux/flux/box/fourierslawnonequilibrium.hh
similarity index 100%
rename from dumux/discretization/box/fourierslawnonequilibrium.hh
rename to dumux/flux/box/fourierslawnonequilibrium.hh
diff --git a/dumux/discretization/box/hookeslaw.hh b/dumux/flux/box/hookeslaw.hh
similarity index 100%
rename from dumux/discretization/box/hookeslaw.hh
rename to dumux/flux/box/hookeslaw.hh
diff --git a/dumux/discretization/box/maxwellstefanslaw.hh b/dumux/flux/box/maxwellstefanslaw.hh
similarity index 100%
rename from dumux/discretization/box/maxwellstefanslaw.hh
rename to dumux/flux/box/maxwellstefanslaw.hh
diff --git a/dumux/flux/ccmpfa/CMakeLists.txt b/dumux/flux/ccmpfa/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..013e86ce5a9a7eea87059e3a8ec6aca9a8ebefa7
--- /dev/null
+++ b/dumux/flux/ccmpfa/CMakeLists.txt
@@ -0,0 +1,5 @@
+install(FILES
+darcyslaw.hh
+fickslaw.hh
+fourierslaw.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/flux/ccmpfa)
diff --git a/dumux/discretization/cellcentered/mpfa/darcyslaw.hh b/dumux/flux/ccmpfa/darcyslaw.hh
similarity index 100%
rename from dumux/discretization/cellcentered/mpfa/darcyslaw.hh
rename to dumux/flux/ccmpfa/darcyslaw.hh
diff --git a/dumux/discretization/cellcentered/mpfa/fickslaw.hh b/dumux/flux/ccmpfa/fickslaw.hh
similarity index 100%
rename from dumux/discretization/cellcentered/mpfa/fickslaw.hh
rename to dumux/flux/ccmpfa/fickslaw.hh
diff --git a/dumux/discretization/cellcentered/mpfa/fourierslaw.hh b/dumux/flux/ccmpfa/fourierslaw.hh
similarity index 100%
rename from dumux/discretization/cellcentered/mpfa/fourierslaw.hh
rename to dumux/flux/ccmpfa/fourierslaw.hh
diff --git a/dumux/flux/cctpfa/CMakeLists.txt b/dumux/flux/cctpfa/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..a199c1b8ad34a42ce25f73fb863999db52a67ba0
--- /dev/null
+++ b/dumux/flux/cctpfa/CMakeLists.txt
@@ -0,0 +1,7 @@
+install(FILES
+darcyslaw.hh
+fickslaw.hh
+forchheimerslaw.hh
+fourierslaw.hh
+maxwellstefanslaw.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/flux/cctpfa)
diff --git a/dumux/discretization/cellcentered/tpfa/darcyslaw.hh b/dumux/flux/cctpfa/darcyslaw.hh
similarity index 100%
rename from dumux/discretization/cellcentered/tpfa/darcyslaw.hh
rename to dumux/flux/cctpfa/darcyslaw.hh
diff --git a/dumux/discretization/cellcentered/tpfa/fickslaw.hh b/dumux/flux/cctpfa/fickslaw.hh
similarity index 100%
rename from dumux/discretization/cellcentered/tpfa/fickslaw.hh
rename to dumux/flux/cctpfa/fickslaw.hh
diff --git a/dumux/discretization/cellcentered/tpfa/forchheimerslaw.hh b/dumux/flux/cctpfa/forchheimerslaw.hh
similarity index 99%
rename from dumux/discretization/cellcentered/tpfa/forchheimerslaw.hh
rename to dumux/flux/cctpfa/forchheimerslaw.hh
index d8445cf06379a8332505c3fa544aae20daab0806..a53b5d02dbf8fd32aadadde4d602c4b1dbb1474a 100644
--- a/dumux/discretization/cellcentered/tpfa/forchheimerslaw.hh
+++ b/dumux/flux/cctpfa/forchheimerslaw.hh
@@ -33,7 +33,7 @@
 #include <dumux/common/typetraits/typetraits.hh>
 
 #include <dumux/discretization/method.hh>
-#include <dumux/discretization/cellcentered/tpfa/darcyslaw.hh>
+#include <dumux/flux/cctpfa/darcyslaw.hh>
 
 namespace Dumux {
 
diff --git a/dumux/discretization/cellcentered/tpfa/fourierslaw.hh b/dumux/flux/cctpfa/fourierslaw.hh
similarity index 100%
rename from dumux/discretization/cellcentered/tpfa/fourierslaw.hh
rename to dumux/flux/cctpfa/fourierslaw.hh
diff --git a/dumux/discretization/cellcentered/tpfa/maxwellstefanslaw.hh b/dumux/flux/cctpfa/maxwellstefanslaw.hh
similarity index 100%
rename from dumux/discretization/cellcentered/tpfa/maxwellstefanslaw.hh
rename to dumux/flux/cctpfa/maxwellstefanslaw.hh
diff --git a/dumux/flux/darcyslaw.hh b/dumux/flux/darcyslaw.hh
index 939686a6cedf397bed691c6670045bfbf2af03d4..5fb0fb85623f454581306c0576faf7ff4966420b 100644
--- a/dumux/flux/darcyslaw.hh
+++ b/dumux/flux/darcyslaw.hh
@@ -48,8 +48,8 @@ using DarcysLaw = DarcysLawImplementation<TypeTag, GetPropType<TypeTag, Properti
 
 } // end namespace Dumux
 
-#include <dumux/discretization/box/darcyslaw.hh>
-#include <dumux/discretization/cellcentered/tpfa/darcyslaw.hh>
-#include <dumux/discretization/cellcentered/mpfa/darcyslaw.hh>
+#include <dumux/flux/box/darcyslaw.hh>
+#include <dumux/flux/cctpfa/darcyslaw.hh>
+#include <dumux/flux/ccmpfa/darcyslaw.hh>
 
 #endif
diff --git a/dumux/flux/effectivestresslaw.hh b/dumux/flux/effectivestresslaw.hh
index 755845377e960d5bd587f733e8cad5a703a7e03c..687140b078102041b52e11affdcd5bd60a56f88e 100644
--- a/dumux/flux/effectivestresslaw.hh
+++ b/dumux/flux/effectivestresslaw.hh
@@ -40,6 +40,6 @@ class EffectiveStressLaw;
 
 } // end namespace Dumux
 
-#include <dumux/discretization/box/effectivestresslaw.hh>
+#include <dumux/flux/box/effectivestresslaw.hh>
 
 #endif
diff --git a/dumux/flux/fickslaw.hh b/dumux/flux/fickslaw.hh
index 3a40c70a4c5062bfd056867f72f9d328dbef7062..73a73c9769ba1fc65fc9a42a0467859f7ef6e3f3 100644
--- a/dumux/flux/fickslaw.hh
+++ b/dumux/flux/fickslaw.hh
@@ -44,9 +44,9 @@ using FicksLaw = FicksLawImplementation<TypeTag, GetPropType<TypeTag, Properties
 
 } // end namespace Dumux
 
-#include <dumux/discretization/cellcentered/tpfa/fickslaw.hh>
-#include <dumux/discretization/cellcentered/mpfa/fickslaw.hh>
-#include <dumux/discretization/box/fickslaw.hh>
-#include <dumux/discretization/staggered/freeflow/fickslaw.hh>
+#include <dumux/flux/cctpfa/fickslaw.hh>
+#include <dumux/flux/ccmpfa/fickslaw.hh>
+#include <dumux/flux/box/fickslaw.hh>
+#include <dumux/flux/staggered/freeflow/fickslaw.hh>
 
 #endif
diff --git a/dumux/flux/forchheimerslaw.hh b/dumux/flux/forchheimerslaw.hh
index ea82cd9bf4e74777f99119822d86c41ad4217033..a90788ff46be1fa57e6f46cef0d3ea49606cc8b2 100644
--- a/dumux/flux/forchheimerslaw.hh
+++ b/dumux/flux/forchheimerslaw.hh
@@ -50,6 +50,6 @@ using ForchheimersLaw = ForchheimersLawImplementation<TypeTag, GetPropType<TypeT
 
 } // end namespace Dumux
 
-#include <dumux/discretization/cellcentered/tpfa/forchheimerslaw.hh>
+#include <dumux/flux/cctpfa/forchheimerslaw.hh>
 
 #endif
diff --git a/dumux/flux/fourierslaw.hh b/dumux/flux/fourierslaw.hh
index 4c6858f7379fb8398c69da550899a361941b3b7c..d9d6a4ac8d1ce06c93f330753ae2dbc4c0700a79 100644
--- a/dumux/flux/fourierslaw.hh
+++ b/dumux/flux/fourierslaw.hh
@@ -45,9 +45,9 @@ using FouriersLaw = FouriersLawImplementation<TypeTag, GetPropType<TypeTag, Prop
 
 } // end namespace Dumux
 
-#include <dumux/discretization/cellcentered/tpfa/fourierslaw.hh>
-#include <dumux/discretization/cellcentered/mpfa/fourierslaw.hh>
-#include <dumux/discretization/box/fourierslaw.hh>
-#include <dumux/discretization/staggered/freeflow/fourierslaw.hh>
+#include <dumux/flux/cctpfa/fourierslaw.hh>
+#include <dumux/flux/ccmpfa/fourierslaw.hh>
+#include <dumux/flux/box/fourierslaw.hh>
+#include <dumux/flux/staggered/freeflow/fourierslaw.hh>
 
 #endif
diff --git a/dumux/flux/fourierslawnonequilibrium.hh b/dumux/flux/fourierslawnonequilibrium.hh
index ad6822283a5826727ca3837d65dd69c2d2a1f91f..9abd4f120f938726872478465152b1f4c47f67c4 100644
--- a/dumux/flux/fourierslawnonequilibrium.hh
+++ b/dumux/flux/fourierslawnonequilibrium.hh
@@ -44,6 +44,6 @@ using FouriersLawNonEquilibrium = FouriersLawNonEquilibriumImplementation<TypeTa
 } // end namespace Dumux
 
 #include <dumux/discretization/cellcentered/tpfa/fourierslawnonequilibrium.hh>
-#include <dumux/discretization/box/fourierslawnonequilibrium.hh>
+#include <dumux/flux/box/fourierslawnonequilibrium.hh>
 
 #endif
diff --git a/dumux/flux/hookeslaw.hh b/dumux/flux/hookeslaw.hh
index 726495d30da718de84351201ca8e08ac0d22e95c..46d98749632c1318fa4c714075e7924675fc862e 100644
--- a/dumux/flux/hookeslaw.hh
+++ b/dumux/flux/hookeslaw.hh
@@ -40,6 +40,6 @@ class HookesLaw;
 
 } // end namespace Dumux
 
-#include <dumux/discretization/box/hookeslaw.hh>
+#include <dumux/flux/box/hookeslaw.hh>
 
 #endif
diff --git a/dumux/flux/maxwellstefanslaw.hh b/dumux/flux/maxwellstefanslaw.hh
index 3c79e3988497f9851c3d1269d1975e2618a6f7e3..e4cb4a02bd54185cf8c6295b69b1ee7b183a52a1 100644
--- a/dumux/flux/maxwellstefanslaw.hh
+++ b/dumux/flux/maxwellstefanslaw.hh
@@ -43,8 +43,8 @@ using MaxwellStefansLaw = MaxwellStefansLawImplementation<TypeTag, GetPropType<T
 
 } // end namespace
 
-#include <dumux/discretization/cellcentered/tpfa/maxwellstefanslaw.hh>
-#include <dumux/discretization/box/maxwellstefanslaw.hh>
-#include <dumux/discretization/staggered/freeflow/maxwellstefanslaw.hh>
+#include <dumux/flux/cctpfa/maxwellstefanslaw.hh>
+#include <dumux/flux/box/maxwellstefanslaw.hh>
+#include <dumux/flux/staggered/freeflow/maxwellstefanslaw.hh>
 
 #endif
diff --git a/dumux/flux/staggered/CMakeLists.txt b/dumux/flux/staggered/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..8bc99771f7b17cc2f1607df67fd118f3d23f3a85
--- /dev/null
+++ b/dumux/flux/staggered/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(freeflow)
diff --git a/dumux/flux/staggered/freeflow/CMakeLists.txt b/dumux/flux/staggered/freeflow/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ca2e03c44276a3e7a2e891e0af547810fd534e2d
--- /dev/null
+++ b/dumux/flux/staggered/freeflow/CMakeLists.txt
@@ -0,0 +1,5 @@
+install(FILES
+fickslaw.hh
+fourierslaw.hh
+maxwellstefanslaw.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/flux/staggered/freeflow)
diff --git a/dumux/discretization/staggered/freeflow/fickslaw.hh b/dumux/flux/staggered/freeflow/fickslaw.hh
similarity index 100%
rename from dumux/discretization/staggered/freeflow/fickslaw.hh
rename to dumux/flux/staggered/freeflow/fickslaw.hh
diff --git a/dumux/discretization/staggered/freeflow/fourierslaw.hh b/dumux/flux/staggered/freeflow/fourierslaw.hh
similarity index 100%
rename from dumux/discretization/staggered/freeflow/fourierslaw.hh
rename to dumux/flux/staggered/freeflow/fourierslaw.hh
diff --git a/dumux/discretization/staggered/freeflow/maxwellstefanslaw.hh b/dumux/flux/staggered/freeflow/maxwellstefanslaw.hh
similarity index 100%
rename from dumux/discretization/staggered/freeflow/maxwellstefanslaw.hh
rename to dumux/flux/staggered/freeflow/maxwellstefanslaw.hh
diff --git a/dumux/multidomain/facet/box/darcyslaw.hh b/dumux/multidomain/facet/box/darcyslaw.hh
index 9d155d1d7483b70a35d3746c0518bda8e09e1f58..d747097b2e89c033d3bee9c0b9de383160e4fe99 100644
--- a/dumux/multidomain/facet/box/darcyslaw.hh
+++ b/dumux/multidomain/facet/box/darcyslaw.hh
@@ -32,7 +32,7 @@
 #include <dumux/common/properties.hh>
 
 #include <dumux/discretization/method.hh>
-#include <dumux/discretization/box/darcyslaw.hh>
+#include <dumux/flux/box/darcyslaw.hh>
 
 namespace Dumux {
 
diff --git a/dumux/multidomain/facet/box/properties.hh b/dumux/multidomain/facet/box/properties.hh
index e2b63e8147b4315b7874a76fca39bfcaf47e5625..a85251349c1883214b7a83c1b4d10c01fd43a5df 100644
--- a/dumux/multidomain/facet/box/properties.hh
+++ b/dumux/multidomain/facet/box/properties.hh
@@ -30,7 +30,7 @@
 #define DUMUX_FACETCOUPLING_BOX_PROPERTIES_HH
 
 #include <dumux/common/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/box.hh>
 
 #include <dumux/multidomain/facet/box/darcyslaw.hh>
 #include <dumux/multidomain/facet/box/elementboundarytypes.hh>
diff --git a/dumux/multidomain/facet/cellcentered/tpfa/darcyslaw.hh b/dumux/multidomain/facet/cellcentered/tpfa/darcyslaw.hh
index c88447ff54c21076b21e87180714e4c641e1c802..7beb7afe80ebe771766f66a4e3c1618df0a9b6c1 100644
--- a/dumux/multidomain/facet/cellcentered/tpfa/darcyslaw.hh
+++ b/dumux/multidomain/facet/cellcentered/tpfa/darcyslaw.hh
@@ -36,7 +36,7 @@
 
 #include <dumux/discretization/method.hh>
 #include <dumux/discretization/cellcentered/tpfa/computetransmissibility.hh>
-#include <dumux/discretization/cellcentered/tpfa/darcyslaw.hh>
+#include <dumux/flux/cctpfa/darcyslaw.hh>
 
 namespace Dumux {
 
diff --git a/dumux/multidomain/facet/cellcentered/tpfa/properties.hh b/dumux/multidomain/facet/cellcentered/tpfa/properties.hh
index 77e9811263200964295315709d1e50e54b471c3d..1871cae4e60917f85a3405da1bcb84f5f8f5accf 100644
--- a/dumux/multidomain/facet/cellcentered/tpfa/properties.hh
+++ b/dumux/multidomain/facet/cellcentered/tpfa/properties.hh
@@ -30,7 +30,7 @@
 #define DUMUX_FACETCOUPLING_CC_TPFA_PROPERTIES_HH
 
 #include <dumux/common/properties.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
 #include <dumux/multidomain/facet/cellcentered/upwindscheme.hh>
 #include <dumux/multidomain/facet/cellcentered/localresidual.hh>
 #include <dumux/multidomain/facet/cellcentered/tpfa/darcyslaw.hh>
diff --git a/dumux/porousmediumflow/boxdfm/model.hh b/dumux/porousmediumflow/boxdfm/model.hh
index 971d986416cbce709b7072fab65bb0713c0a3631..47290a86d45edf8d0143b8507519afbbddf39e89 100644
--- a/dumux/porousmediumflow/boxdfm/model.hh
+++ b/dumux/porousmediumflow/boxdfm/model.hh
@@ -26,7 +26,7 @@
 #ifndef DUMUX_POROUSMEDIUMFLOW_BOXDFM_MODEL_HH
 #define DUMUX_POROUSMEDIUMFLOW_BOXDFM_MODEL_HH
 
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/box.hh>
 
 #include "fvgridgeometry.hh"
 #include "fluxvariablescache.hh"
diff --git a/test/geomechanics/elastic/problem.hh b/test/geomechanics/elastic/problem.hh
index 981ebb1cef109db56b965ca2ff01f185cd35d80d..f9af970083db6fa0a6f6939bd0c426ce16d32c80 100644
--- a/test/geomechanics/elastic/problem.hh
+++ b/test/geomechanics/elastic/problem.hh
@@ -26,7 +26,7 @@
 #include <dune/common/fmatrix.hh>
 #include <dune/grid/yaspgrid.hh>
 
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/box.hh>
 #include <dumux/geomechanics/elastic/model.hh>
 #include <dumux/geomechanics/fvproblem.hh>
 
diff --git a/test/geomechanics/poroelastic/problem.hh b/test/geomechanics/poroelastic/problem.hh
index 498f346f9c97dffc5bec8d137fd72f3297375661..0d58bb010beb9a7f8aede9b34a2e2a0c25c0cd58 100644
--- a/test/geomechanics/poroelastic/problem.hh
+++ b/test/geomechanics/poroelastic/problem.hh
@@ -26,7 +26,7 @@
 #include <dune/common/fmatrix.hh>
 #include <dune/grid/yaspgrid.hh>
 
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/box.hh>
 #include <dumux/geomechanics/poroelastic/model.hh>
 #include <dumux/geomechanics/fvproblem.hh>
 
diff --git a/test/multidomain/boundary/darcydarcy/1p_1p/main.cc b/test/multidomain/boundary/darcydarcy/1p_1p/main.cc
index f17ef17321489a5821986213f822e56aeee78d70..a0edd16e182cdbb1867740402e42b214bfa2d90b 100644
--- a/test/multidomain/boundary/darcydarcy/1p_1p/main.cc
+++ b/test/multidomain/boundary/darcydarcy/1p_1p/main.cc
@@ -43,7 +43,7 @@
 #include <dumux/porousmediumflow/1p/model.hh>
 #include <dumux/material/components/simpleh2o.hh>
 #include <dumux/material/fluidsystems/1pliquid.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
 #include <dumux/discretization/cellcentered/tpfa/fvgridgeometry.hh>
 
 #include <dumux/multidomain/traits.hh>
diff --git a/test/multidomain/boundary/darcydarcy/1p_2p/main.cc b/test/multidomain/boundary/darcydarcy/1p_2p/main.cc
index ac0d68bb7f57fa496529608ccb6acdf3adfda5c1..18abd947992eac6a08740c9ae97776aaf3fe99a0 100644
--- a/test/multidomain/boundary/darcydarcy/1p_2p/main.cc
+++ b/test/multidomain/boundary/darcydarcy/1p_2p/main.cc
@@ -47,7 +47,7 @@
 #include <dumux/material/fluidsystems/1pliquid.hh>
 #include <dumux/material/fluidsystems/1pgas.hh>
 #include <dumux/material/fluidsystems/2pimmiscible.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
 #include <dumux/discretization/cellcentered/tpfa/fvgridgeometry.hh>
 
 #include <dumux/multidomain/traits.hh>
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh
index 8058b8a3097bc6403bbfab94cc91f4bc02e1a53d..a1fc82cc6b0ef10f0cf2181ecd6c26ed09de3b12 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh
@@ -26,7 +26,7 @@
 
 #include <dune/grid/yaspgrid.hh>
 
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
 #include <dumux/flux/maxwellstefanslaw.hh>
 
 #include <dumux/porousmediumflow/1pnc/model.hh>
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_darcy.hh
index c9aefa3b2ea914e6bf6799d249210cae3e7459d0..37c6d01e310e5d0c3fcf0f4c5c30042dc9f2fa51 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/problem_darcy.hh
@@ -26,7 +26,7 @@
 
 #include <dune/grid/yaspgrid.hh>
 
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
 
 #include <dumux/porousmediumflow/1pnc/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh
index daf3a931a7aa2662052cd74a427d847e8fbfa53f..4bf6c021ba894d472964b45fb35f41ff064c9374 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh
@@ -26,7 +26,7 @@
 
 #include <dune/grid/yaspgrid.hh>
 
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
 #include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
 
 #include <dumux/porousmediumflow/2p2c/model.hh>
diff --git a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh
index b7ff675023a320053420f0191111b7db8344980c..8ff5494634edfcd887c730d47d5d13c70bf5837f 100644
--- a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh
@@ -26,7 +26,7 @@
 
 #include <dune/grid/yaspgrid.hh>
 
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
 #include <dumux/flux/maxwellstefanslaw.hh>
 
 #include <dumux/porousmediumflow/1pnc/model.hh>
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p_1p/problem_darcy.hh
index 0f1139b784bb7d805fa7af4978d4c6f9f07602dd..6e33c2d4962a20699dabd967c9da713823a3585f 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/problem_darcy.hh
@@ -26,7 +26,7 @@
 
 #include <dune/grid/yaspgrid.hh>
 
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
 
 #include <dumux/porousmediumflow/1p/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh
index b0ec0359ff8a5c739f730e81ca88da9b06578ad2..f8bc8e5e6f08d76003c2095cedc31164522351dd 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh
+++ b/test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh
@@ -26,7 +26,7 @@
 
 #include <dune/grid/yaspgrid.hh>
 
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
 
 #include <dumux/porousmediumflow/2p/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
diff --git a/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_root.hh b/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_root.hh
index 9192403e9fd7507388f6585f43324d824d5d48f9..7e53cae545aff820e6ebe747f16bb7da8b739c79 100644
--- a/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_root.hh
+++ b/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_root.hh
@@ -29,7 +29,7 @@
 
 #include <dumux/common/parameters.hh>
 #include <dumux/common/properties.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
 
 #include <dumux/porousmediumflow/1pnc/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
diff --git a/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_soil.hh b/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_soil.hh
index 72b8e7756abc46afe1b2c049c9f30e8cf26bd75b..b82c8a25b1792a1ad9c23a004182601991b2f5ab 100644
--- a/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_soil.hh
+++ b/test/multidomain/embedded/1d3d/1p2c_richards2c/problem_soil.hh
@@ -34,7 +34,7 @@
 #include <dumux/common/math.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/properties.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
 
 #include <dumux/porousmediumflow/richardsnc/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
diff --git a/test/multidomain/embedded/1d3d/1p_1p/problem_bloodflow.hh b/test/multidomain/embedded/1d3d/1p_1p/problem_bloodflow.hh
index 0799bb275a68d0b74b1b12b81ca897d67fb50661..bdb25cfdde36830f8323847577b41144fe7cc9b7 100644
--- a/test/multidomain/embedded/1d3d/1p_1p/problem_bloodflow.hh
+++ b/test/multidomain/embedded/1d3d/1p_1p/problem_bloodflow.hh
@@ -29,8 +29,8 @@
 
 #include <dumux/common/parameters.hh>
 #include <dumux/common/properties.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/box.hh>
 
 #include <dumux/porousmediumflow/1p/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
diff --git a/test/multidomain/embedded/1d3d/1p_1p/problem_tissue.hh b/test/multidomain/embedded/1d3d/1p_1p/problem_tissue.hh
index f7824c6f4519b8fe960fca0fcd0526bc9208231f..11a17d3c2d7495c2f3f381cb0a9dc0afe8b8b7ab 100644
--- a/test/multidomain/embedded/1d3d/1p_1p/problem_tissue.hh
+++ b/test/multidomain/embedded/1d3d/1p_1p/problem_tissue.hh
@@ -34,8 +34,8 @@
 #include <dumux/common/math.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/properties.hh>
-#include <dumux/discretization/box/properties.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/box.hh>
+#include <dumux/discretization/cctpfa.hh>
 
 #include <dumux/porousmediumflow/1p/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
diff --git a/test/multidomain/embedded/1d3d/1p_richards/problem_root.hh b/test/multidomain/embedded/1d3d/1p_richards/problem_root.hh
index b07cc4dc73b48e82c4d19f081f4cfcd10babbb8c..bcc08fd943421e2d7635553f43d4e2658a77b7ef 100644
--- a/test/multidomain/embedded/1d3d/1p_richards/problem_root.hh
+++ b/test/multidomain/embedded/1d3d/1p_richards/problem_root.hh
@@ -29,7 +29,7 @@
 
 #include <dumux/common/parameters.hh>
 #include <dumux/common/properties.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
 
 #include <dumux/porousmediumflow/1p/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
diff --git a/test/multidomain/embedded/1d3d/1p_richards/problem_soil.hh b/test/multidomain/embedded/1d3d/1p_richards/problem_soil.hh
index f744f79f38253c248c1d5093c402eff93023d44f..1d3e8534947af086fbba8c15f1b1b910997bdc9e 100644
--- a/test/multidomain/embedded/1d3d/1p_richards/problem_soil.hh
+++ b/test/multidomain/embedded/1d3d/1p_richards/problem_soil.hh
@@ -32,8 +32,8 @@
 #include <dumux/common/math.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/properties.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/box.hh>
 
 #include <dumux/porousmediumflow/richards/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
diff --git a/test/multidomain/embedded/2d3d/1p_1p/problem_fracture.hh b/test/multidomain/embedded/2d3d/1p_1p/problem_fracture.hh
index 9b7a9c2422e320267fbafaee9b8bc31bebb91b1d..fba401ebc3678c6d85588f43c23bdeb34a5f37dd 100644
--- a/test/multidomain/embedded/2d3d/1p_1p/problem_fracture.hh
+++ b/test/multidomain/embedded/2d3d/1p_1p/problem_fracture.hh
@@ -28,7 +28,7 @@
 
 #include <dumux/common/parameters.hh>
 #include <dumux/common/properties.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
 
 #include <dumux/porousmediumflow/1p/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
diff --git a/test/multidomain/embedded/2d3d/1p_1p/problem_matrix.hh b/test/multidomain/embedded/2d3d/1p_1p/problem_matrix.hh
index ef126cc38f3aaee0bbce63201aa4d887c1c0b4db..391e912cd3d89f10f9c57c9a2af3f64cc022aae5 100644
--- a/test/multidomain/embedded/2d3d/1p_1p/problem_matrix.hh
+++ b/test/multidomain/embedded/2d3d/1p_1p/problem_matrix.hh
@@ -32,7 +32,7 @@
 #include <dumux/common/math.hh>
 #include <dumux/common/parameters.hh>
 #include <dumux/common/properties.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
 
 #include <dumux/porousmediumflow/1p/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
diff --git a/test/multidomain/facet/1p_1p/analytical/problem_lowdim.hh b/test/multidomain/facet/1p_1p/analytical/problem_lowdim.hh
index 9a7c8549d3e4f8852fd942b48b79b98e96ebac15..c81cc0fcbf0492193cc284797fce25b7b258e754 100644
--- a/test/multidomain/facet/1p_1p/analytical/problem_lowdim.hh
+++ b/test/multidomain/facet/1p_1p/analytical/problem_lowdim.hh
@@ -30,8 +30,8 @@
 #include <dumux/material/components/constant.hh>
 #include <dumux/material/fluidsystems/1pliquid.hh>
 
-#include <dumux/discretization/box/properties.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/box.hh>
+#include <dumux/discretization/cctpfa.hh>
 
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/porousmediumflow/1p/model.hh>
diff --git a/test/multidomain/facet/1p_1p/threedomain/problem_edge.hh b/test/multidomain/facet/1p_1p/threedomain/problem_edge.hh
index 72a029d3f4695b55192d50d16a949e2ed1e13dcc..72412e24a3b03cf2d7860b52c37642dab47ef273 100644
--- a/test/multidomain/facet/1p_1p/threedomain/problem_edge.hh
+++ b/test/multidomain/facet/1p_1p/threedomain/problem_edge.hh
@@ -31,7 +31,7 @@
 #include <dumux/material/components/constant.hh>
 #include <dumux/material/fluidsystems/1pliquid.hh>
 
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
 
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/porousmediumflow/1p/model.hh>
diff --git a/test/multidomain/facet/tracer_tracer/problem_1p_lowdim.hh b/test/multidomain/facet/tracer_tracer/problem_1p_lowdim.hh
index 80f5cbfe2a89e9f236dfa185c2d35251195047fd..8afc84717e6cbec7cfd4a159ae5b878daa83a487 100644
--- a/test/multidomain/facet/tracer_tracer/problem_1p_lowdim.hh
+++ b/test/multidomain/facet/tracer_tracer/problem_1p_lowdim.hh
@@ -31,8 +31,8 @@
 #include <dumux/material/components/simpleh2o.hh>
 #include <dumux/material/fluidsystems/1pliquid.hh>
 
-#include <dumux/discretization/box/properties.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/box.hh>
+#include <dumux/discretization/cctpfa.hh>
 
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/porousmediumflow/1p/model.hh>
diff --git a/test/multidomain/facet/tracer_tracer/problem_tracer_lowdim.hh b/test/multidomain/facet/tracer_tracer/problem_tracer_lowdim.hh
index 232cb32b77238bedd346609fa1455603405bdbcd..ac758e3ffa083405af18f1f7a7830ce386543831 100644
--- a/test/multidomain/facet/tracer_tracer/problem_tracer_lowdim.hh
+++ b/test/multidomain/facet/tracer_tracer/problem_tracer_lowdim.hh
@@ -26,8 +26,8 @@
 
 #include <dune/foamgrid/foamgrid.hh>
 
-#include <dumux/discretization/box/properties.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/box.hh>
+#include <dumux/discretization/cctpfa.hh>
 
 #include <dumux/porousmediumflow/tracer/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
diff --git a/test/multidomain/poromechanics/el1p/problem_1p.hh b/test/multidomain/poromechanics/el1p/problem_1p.hh
index 3822c8017229f17724d3901635c3d192e2688dce..bb8e5b5392eb379d6f418072c2f8e2a2058d742c 100644
--- a/test/multidomain/poromechanics/el1p/problem_1p.hh
+++ b/test/multidomain/poromechanics/el1p/problem_1p.hh
@@ -29,7 +29,7 @@
 
 #include <dune/grid/yaspgrid.hh>
 
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
 #include <dumux/porousmediumflow/1p/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
diff --git a/test/multidomain/poromechanics/el1p/problem_poroelastic.hh b/test/multidomain/poromechanics/el1p/problem_poroelastic.hh
index d89f8747ebecaff6fb3e736b5b50dc105ec23bfd..00350771ef41322d0dc108858addce331789c10c 100644
--- a/test/multidomain/poromechanics/el1p/problem_poroelastic.hh
+++ b/test/multidomain/poromechanics/el1p/problem_poroelastic.hh
@@ -28,7 +28,7 @@
 
 #include <dune/common/fmatrix.hh>
 
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/box.hh>
 #include <dumux/geomechanics/poroelastic/model.hh>
 #include <dumux/geomechanics/fvproblem.hh>
 
diff --git a/test/multidomain/poromechanics/el2p/problem_2p.hh b/test/multidomain/poromechanics/el2p/problem_2p.hh
index 3ccf7be9c8e36f65929be25553b092fe64ec70b0..50c5b8f46394469529607a1c9fb5a490e52bfdf4 100644
--- a/test/multidomain/poromechanics/el2p/problem_2p.hh
+++ b/test/multidomain/poromechanics/el2p/problem_2p.hh
@@ -29,7 +29,7 @@
 
 #include <dune/grid/yaspgrid.hh>
 
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
 #include <dumux/porousmediumflow/2p/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
diff --git a/test/multidomain/poromechanics/el2p/problem_poroelastic.hh b/test/multidomain/poromechanics/el2p/problem_poroelastic.hh
index 6cc32b9e94acaeabe7bdfa13540b8d1e0728dcc9..e9e6d0ef509cd0113ce79f7741bbc86401823aea 100644
--- a/test/multidomain/poromechanics/el2p/problem_poroelastic.hh
+++ b/test/multidomain/poromechanics/el2p/problem_poroelastic.hh
@@ -28,7 +28,7 @@
 
 #include <dune/common/fmatrix.hh>
 
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/box.hh>
 #include <dumux/geomechanics/poroelastic/model.hh>
 #include <dumux/geomechanics/fvproblem.hh>
 
diff --git a/test/porousmediumflow/1p/implicit/compressible/instationary/problem.hh b/test/porousmediumflow/1p/implicit/compressible/instationary/problem.hh
index d5c6db8f7b5038b445f0887bde2b0b45859b63a9..7a42415146aa92e2f016a36ac69d77fe5c5fe8b8 100644
--- a/test/porousmediumflow/1p/implicit/compressible/instationary/problem.hh
+++ b/test/porousmediumflow/1p/implicit/compressible/instationary/problem.hh
@@ -30,9 +30,9 @@
 #include <dumux/material/components/tabulatedcomponent.hh>
 #include <dumux/material/fluidsystems/1pliquid.hh>
 
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/cellcentered/mpfa/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/ccmpfa.hh>
+#include <dumux/discretization/box.hh>
 
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/porousmediumflow/1p/model.hh>
diff --git a/test/porousmediumflow/1p/implicit/compressible/stationary/problem.hh b/test/porousmediumflow/1p/implicit/compressible/stationary/problem.hh
index d5c6db8f7b5038b445f0887bde2b0b45859b63a9..7a42415146aa92e2f016a36ac69d77fe5c5fe8b8 100644
--- a/test/porousmediumflow/1p/implicit/compressible/stationary/problem.hh
+++ b/test/porousmediumflow/1p/implicit/compressible/stationary/problem.hh
@@ -30,9 +30,9 @@
 #include <dumux/material/components/tabulatedcomponent.hh>
 #include <dumux/material/fluidsystems/1pliquid.hh>
 
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/cellcentered/mpfa/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/ccmpfa.hh>
+#include <dumux/discretization/box.hh>
 
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/porousmediumflow/1p/model.hh>
diff --git a/test/porousmediumflow/1p/implicit/fracture2d3d/problem.hh b/test/porousmediumflow/1p/implicit/fracture2d3d/problem.hh
index 7d890ae9961fc80b48a5c5358f20525b87536d11..c0a14a025a1a54ac6adda3d83807d36c26c10cdc 100644
--- a/test/porousmediumflow/1p/implicit/fracture2d3d/problem.hh
+++ b/test/porousmediumflow/1p/implicit/fracture2d3d/problem.hh
@@ -34,9 +34,9 @@
 #include <dumux/material/fluidsystems/1pliquid.hh>
 #include <dumux/porousmediumflow/1p/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
-#include <dumux/discretization/box/properties.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/cellcentered/mpfa/properties.hh>
+#include <dumux/discretization/box.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/ccmpfa.hh>
 
 #include "spatialparams.hh"
 
diff --git a/test/porousmediumflow/1p/implicit/incompressible/problem.hh b/test/porousmediumflow/1p/implicit/incompressible/problem.hh
index 3a7305f72c6a410537e6959c6eaaf4c71d2b8cc7..ca33f521e8d82da0bb6682fac03e366ee5235bdc 100644
--- a/test/porousmediumflow/1p/implicit/incompressible/problem.hh
+++ b/test/porousmediumflow/1p/implicit/incompressible/problem.hh
@@ -30,9 +30,9 @@
 #include <dune/grid/yaspgrid.hh>
 
 #include <dumux/common/quad.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/cellcentered/mpfa/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/ccmpfa.hh>
+#include <dumux/discretization/box.hh>
 
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/porousmediumflow/1p/model.hh>
diff --git a/test/porousmediumflow/1p/implicit/isothermal/problem.hh b/test/porousmediumflow/1p/implicit/isothermal/problem.hh
index e9731dcf1ac52e2c0ccbff7a4ea1a3f968596de0..3132427edcf485cb2fd21a39491cddc661820343 100644
--- a/test/porousmediumflow/1p/implicit/isothermal/problem.hh
+++ b/test/porousmediumflow/1p/implicit/isothermal/problem.hh
@@ -27,9 +27,9 @@
 
 #include <dune/grid/yaspgrid.hh>
 
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/cellcentered/mpfa/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/ccmpfa.hh>
+#include <dumux/discretization/box.hh>
 #include <dumux/porousmediumflow/1p/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/material/components/simpleh2o.hh>
diff --git a/test/porousmediumflow/1p/implicit/network1d3d/problem.hh b/test/porousmediumflow/1p/implicit/network1d3d/problem.hh
index ec9c9d44ad8e20d8405953a53e9a31421ee11f32..8d51942436f29c405bc26ef00e8333ca413a3130 100644
--- a/test/porousmediumflow/1p/implicit/network1d3d/problem.hh
+++ b/test/porousmediumflow/1p/implicit/network1d3d/problem.hh
@@ -33,8 +33,8 @@
 #endif
 
 #include <dumux/common/reorderingdofmapper.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/box.hh>
 #include <dumux/discretization/method.hh>
 #include <dumux/discretization/elementsolution.hh>
 #include <dumux/porousmediumflow/1p/model.hh>
diff --git a/test/porousmediumflow/1p/implicit/nonisothermal/problem_conduction.hh b/test/porousmediumflow/1p/implicit/nonisothermal/problem_conduction.hh
index 4832387ea2434ed0c95d72b751672d713e4b203c..014bc55e206c5be246a0c0e1e2d2392f8f2925ee 100644
--- a/test/porousmediumflow/1p/implicit/nonisothermal/problem_conduction.hh
+++ b/test/porousmediumflow/1p/implicit/nonisothermal/problem_conduction.hh
@@ -29,10 +29,10 @@
 #include <dune/grid/yaspgrid.hh>
 
 #include <dumux/discretization/elementsolution.hh>
-#include <dumux/discretization/box/properties.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/cellcentered/mpfa/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/box.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/ccmpfa.hh>
+#include <dumux/discretization/box.hh>
 #include <dumux/porousmediumflow/1p/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/material/components/h2o.hh>
diff --git a/test/porousmediumflow/1p/implicit/nonisothermal/problem_convection.hh b/test/porousmediumflow/1p/implicit/nonisothermal/problem_convection.hh
index 5ea307daa65ab2451bced6903c6ea7a91da53637..415dd6d97ce274222f7ef28948b4e0b7518ca5d5 100644
--- a/test/porousmediumflow/1p/implicit/nonisothermal/problem_convection.hh
+++ b/test/porousmediumflow/1p/implicit/nonisothermal/problem_convection.hh
@@ -30,9 +30,9 @@
 #include <dune/grid/yaspgrid.hh>
 
 #include <dumux/discretization/elementsolution.hh>
-#include <dumux/discretization/box/properties.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/cellcentered/mpfa/properties.hh>
+#include <dumux/discretization/box.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/ccmpfa.hh>
 #include <dumux/porousmediumflow/1p/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/material/components/h2o.hh>
diff --git a/test/porousmediumflow/1p/implicit/periodicbc/problem.hh b/test/porousmediumflow/1p/implicit/periodicbc/problem.hh
index 2f8485d7731d9adc6e77c11823ddd27a8ca8b3a7..02ffbef3c7204cba2deb36cd42e9f80ed71fd3e6 100644
--- a/test/porousmediumflow/1p/implicit/periodicbc/problem.hh
+++ b/test/porousmediumflow/1p/implicit/periodicbc/problem.hh
@@ -31,9 +31,9 @@
 #include <dune/alugrid/grid.hh>
 #endif
 
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/cellcentered/mpfa/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/ccmpfa.hh>
+#include <dumux/discretization/box.hh>
 
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/porousmediumflow/1p/model.hh>
diff --git a/test/porousmediumflow/1p/implicit/pointsources/timeindependent/problem.hh b/test/porousmediumflow/1p/implicit/pointsources/timeindependent/problem.hh
index 5ca3fcf30d0783b6388c78548db0192a31f7d66e..f17d5034fed13d143aa684d4860098d95fd98364 100644
--- a/test/porousmediumflow/1p/implicit/pointsources/timeindependent/problem.hh
+++ b/test/porousmediumflow/1p/implicit/pointsources/timeindependent/problem.hh
@@ -27,8 +27,8 @@
 
 #include <dune/grid/yaspgrid.hh>
 
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/box.hh>
 #include <dumux/porousmediumflow/1p/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/material/components/simpleh2o.hh>
diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/problem.hh b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/problem.hh
index 7ccf14b58a62793c58ef5626e19741af71ee1734..9249dcdb129ed7b2f716a6d842e6a8c5932bc6e0 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/problem.hh
+++ b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/problem.hh
@@ -30,9 +30,9 @@
 #endif
 #include <dune/grid/yaspgrid.hh>
 
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/cellcentered/mpfa/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/ccmpfa.hh>
+#include <dumux/discretization/box.hh>
 #include <dumux/discretization/evalsolution.hh>
 #include <dumux/discretization/evalgradients.hh>
 #include <dumux/porousmediumflow/1pnc/model.hh>
diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/problem.hh b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/problem.hh
index a115a67767f2a2ae455785ac8856efa0a179a0b6..9cde2056554d8eb565ab42816cefbdfc18a7706d 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/problem.hh
+++ b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/problem.hh
@@ -25,7 +25,7 @@
 #ifndef DUMUX_SALTWATERINTRUSION_TEST_PROBLEM_HH
 #define DUMUX_SALTWATERINTRUSION_TEST_PROBLEM_HH
 
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/box.hh>
 #include <dumux/porousmediumflow/1pnc/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/problem.hh b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/problem.hh
index a772552d040ae48d1ac6d914081a6c073cba40bf..0a4e64bfeed350a79d8405917133560e0c92a99e 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/problem.hh
+++ b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/problem.hh
@@ -31,9 +31,9 @@
 #include <dune/grid/yaspgrid.hh>
 
 #include <dumux/discretization/elementsolution.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/cellcentered/mpfa/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/ccmpfa.hh>
+#include <dumux/discretization/box.hh>
 #include <dumux/porousmediumflow/1pnc/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/problem.hh b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/problem.hh
index e4c1343b07090fb868a726bd41585ec1d58d7a32..d29c0dd644347b6c8d9f42b943286942155bb014 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/problem.hh
+++ b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/problem.hh
@@ -31,9 +31,9 @@
 #include <dune/grid/yaspgrid.hh>
 
 #include <dumux/discretization/elementsolution.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/cellcentered/mpfa/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/ccmpfa.hh>
+#include <dumux/discretization/box.hh>
 #include <dumux/porousmediumflow/1pnc/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/problem.hh b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/problem.hh
index 0f1d55713150089c1be5b7d6ef17c968c06afd81..0606c2bf86a7118ea591e52d39b591388962b93a 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/problem.hh
+++ b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/problem.hh
@@ -31,9 +31,9 @@
 #include <dune/grid/yaspgrid.hh>
 
 #include <dumux/discretization/elementsolution.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/cellcentered/mpfa/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/ccmpfa.hh>
+#include <dumux/discretization/box.hh>
 #include <dumux/porousmediumflow/1pnc/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
diff --git a/test/porousmediumflow/1pnc/implicit/nonequilibrium/problem.hh b/test/porousmediumflow/1pnc/implicit/nonequilibrium/problem.hh
index 0c6d12bfcf4f45c18fb5d63dab32de89775deb7a..2f4cb6cf66f2d99aef46409d39f611937cd5e6c5 100644
--- a/test/porousmediumflow/1pnc/implicit/nonequilibrium/problem.hh
+++ b/test/porousmediumflow/1pnc/implicit/nonequilibrium/problem.hh
@@ -31,9 +31,9 @@
 #include <dune/grid/yaspgrid.hh>
 
 #include <dumux/discretization/elementsolution.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/cellcentered/mpfa/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/ccmpfa.hh>
+#include <dumux/discretization/box.hh>
 #include <dumux/porousmediumflow/1pnc/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
diff --git a/test/porousmediumflow/1pncmin/implicit/nonisothermal/problem.hh b/test/porousmediumflow/1pncmin/implicit/nonisothermal/problem.hh
index 87a9626973073e6b7ac83c2a8ff6c32b70779681..e2b95d941bb79ab37813e7440ec6e77e0d4be26a 100644
--- a/test/porousmediumflow/1pncmin/implicit/nonisothermal/problem.hh
+++ b/test/porousmediumflow/1pncmin/implicit/nonisothermal/problem.hh
@@ -28,9 +28,9 @@
 
 #include <dumux/porousmediumflow/1pncmin/model.hh>
 #include <dumux/discretization/elementsolution.hh>
-#include <dumux/discretization/box/properties.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/cellcentered/mpfa/properties.hh>
+#include <dumux/discretization/box.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/ccmpfa.hh>
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/material/fluidsystems/1padapter.hh>
 #include <dumux/material/fluidsystems/h2on2.hh>
diff --git a/test/porousmediumflow/2p/implicit/cornerpoint/problem.hh b/test/porousmediumflow/2p/implicit/cornerpoint/problem.hh
index 3802455deb069944d5c1232dbeeb98dc035dd8a4..f8604623413eaeddb94925d09afefb9aa3da8f10 100644
--- a/test/porousmediumflow/2p/implicit/cornerpoint/problem.hh
+++ b/test/porousmediumflow/2p/implicit/cornerpoint/problem.hh
@@ -26,7 +26,7 @@
 #if HAVE_OPM_GRID
 #include <opm/grid/CpGrid.hpp>
 
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
 
 #include <dumux/material/components/trichloroethene.hh>
 #include <dumux/material/components/simpleh2o.hh>
diff --git a/test/porousmediumflow/2p/implicit/fracture/problem.hh b/test/porousmediumflow/2p/implicit/fracture/problem.hh
index 4e2b9dae796f8876ae3ad50326dd5230babf8705..04872ec898d580b64d60be1cd6a4797dcab955bd 100644
--- a/test/porousmediumflow/2p/implicit/fracture/problem.hh
+++ b/test/porousmediumflow/2p/implicit/fracture/problem.hh
@@ -37,9 +37,9 @@
 #include <dumux/porousmediumflow/2p/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/cellcentered/mpfa/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/ccmpfa.hh>
+#include <dumux/discretization/box.hh>
 
 #include "spatialparams.hh"
 
diff --git a/test/porousmediumflow/2p/implicit/incompressible/problem.hh b/test/porousmediumflow/2p/implicit/incompressible/problem.hh
index 37a9705c5360cb384dfdc1590d10f40a57929762..911628aa7737a8df40b29af4260f22e77ca7f8fa 100644
--- a/test/porousmediumflow/2p/implicit/incompressible/problem.hh
+++ b/test/porousmediumflow/2p/implicit/incompressible/problem.hh
@@ -25,9 +25,9 @@
 
 #include <dune/grid/yaspgrid.hh>
 
-#include <dumux/discretization/box/properties.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/cellcentered/mpfa/properties.hh>
+#include <dumux/discretization/box.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/ccmpfa.hh>
 
 #include <dumux/material/components/trichloroethene.hh>
 #include <dumux/material/components/simpleh2o.hh>
diff --git a/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh b/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh
index 7451308d2644aeb8acc8d5b5a89436c8a3df5f39..74393a2a07ca6a8e78a644557736840e845fcf28 100644
--- a/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh
+++ b/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh
@@ -39,8 +39,8 @@
 #include <dumux/porousmediumflow/2p/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
-#include <dumux/discretization/box/properties.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/box.hh>
+#include <dumux/discretization/cctpfa.hh>
 
 #include <dumux/material/fluidsystems/h2on2.hh>
 #include <dumux/material/components/n2.hh>
diff --git a/test/porousmediumflow/2p1c/implicit/problem.hh b/test/porousmediumflow/2p1c/implicit/problem.hh
index 22688b0fe1d767e78877a23f7ff66a9e78d928ed..5895554e71c632f8d22d939bfa2a2d1e230af16e 100644
--- a/test/porousmediumflow/2p1c/implicit/problem.hh
+++ b/test/porousmediumflow/2p1c/implicit/problem.hh
@@ -27,8 +27,8 @@
 
 #include <dune/grid/yaspgrid.hh>
 
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/box.hh>
 #include <dumux/porousmediumflow/2p1c/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
diff --git a/test/porousmediumflow/2p2c/implicit/injection/problem.hh b/test/porousmediumflow/2p2c/implicit/injection/problem.hh
index d106ae7aaf7532c0f0a2de85851452936e4b28ce..1f191562125fcd3eb8905b84b9da2c5a790b267b 100644
--- a/test/porousmediumflow/2p2c/implicit/injection/problem.hh
+++ b/test/porousmediumflow/2p2c/implicit/injection/problem.hh
@@ -27,9 +27,9 @@
 #include <dune/grid/yaspgrid.hh>
 
 #include <dumux/discretization/cellcentered/mpfa/omethod/staticinteractionvolume.hh>
-#include <dumux/discretization/cellcentered/mpfa/properties.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/ccmpfa.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/box.hh>
 
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/porousmediumflow/2p2c/model.hh>
diff --git a/test/porousmediumflow/2p2c/implicit/mpnccomparison/problem.hh b/test/porousmediumflow/2p2c/implicit/mpnccomparison/problem.hh
index f88362760c72f65237b1b37252bf09690d22036b..9e14737f17401777d1c9565d21d2a20dff536aeb 100644
--- a/test/porousmediumflow/2p2c/implicit/mpnccomparison/problem.hh
+++ b/test/porousmediumflow/2p2c/implicit/mpnccomparison/problem.hh
@@ -26,8 +26,8 @@
 
 #include <dune/common/parametertreeparser.hh>
 
-#include <dumux/discretization/box/properties.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/box.hh>
+#include <dumux/discretization/cctpfa.hh>
 
 #include <dumux/porousmediumflow/2p2c/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
diff --git a/test/porousmediumflow/2p2c/implicit/waterair/problem.hh b/test/porousmediumflow/2p2c/implicit/waterair/problem.hh
index 63f84cd0aeed698f119b702531c1a322a7c4603d..c7ac4eb806075e7e6596175180aa4ea71b2d7f6f 100644
--- a/test/porousmediumflow/2p2c/implicit/waterair/problem.hh
+++ b/test/porousmediumflow/2p2c/implicit/waterair/problem.hh
@@ -27,8 +27,8 @@
 
 #include <dune/grid/yaspgrid.hh>
 
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/box.hh>
 #include <dumux/discretization/method.hh>
 
 #include <dumux/material/components/n2.hh>
diff --git a/test/porousmediumflow/2pnc/implicit/diffusion/problem.hh b/test/porousmediumflow/2pnc/implicit/diffusion/problem.hh
index 6f2eb406e5a48f3e877c2b4808d2463f65e604e4..e9e62021219dc87207b5feccc3a5eb318612f669 100644
--- a/test/porousmediumflow/2pnc/implicit/diffusion/problem.hh
+++ b/test/porousmediumflow/2pnc/implicit/diffusion/problem.hh
@@ -26,8 +26,8 @@
 
 #include <dune/grid/yaspgrid.hh>
 
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/cellcentered/mpfa/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/ccmpfa.hh>
 #include <dumux/porousmediumflow/2pnc/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/material/fluidsystems/h2on2.hh>
diff --git a/test/porousmediumflow/2pnc/implicit/fuelcell/problem.hh b/test/porousmediumflow/2pnc/implicit/fuelcell/problem.hh
index 1e85ea47efbc3d48b8efe39a63579bfebcd0200a..b17d584b450fd7732cf8dbc07b9624e6afcf8ee6 100644
--- a/test/porousmediumflow/2pnc/implicit/fuelcell/problem.hh
+++ b/test/porousmediumflow/2pnc/implicit/fuelcell/problem.hh
@@ -27,8 +27,8 @@
 #include <dune/grid/yaspgrid.hh>
 
 #include <dumux/discretization/elementsolution.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/box.hh>
 #include <dumux/porousmediumflow/2pnc/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/material/fluidsystems/h2on2o2.hh>
diff --git a/test/porousmediumflow/2pncmin/implicit/problem.hh b/test/porousmediumflow/2pncmin/implicit/problem.hh
index ca1f36d1c0e2d71306f742b8bf0d389c23d4a0c2..2d3e0cbe69ea7b00158192215a44c1b18ec69781 100644
--- a/test/porousmediumflow/2pncmin/implicit/problem.hh
+++ b/test/porousmediumflow/2pncmin/implicit/problem.hh
@@ -28,8 +28,8 @@
 
 #include <dumux/discretization/elementsolution.hh>
 #include <dumux/discretization/method.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/box.hh>
 #include <dumux/porousmediumflow/2pncmin/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/material/fluidsystems/brineair.hh>
diff --git a/test/porousmediumflow/3p/implicit/conduction/problem.hh b/test/porousmediumflow/3p/implicit/conduction/problem.hh
index ea2b28c56eccbc86b887692c4033c4dda2ba0024..15facae0f0c8c220fa5416e51d5a8dbb97f63d11 100644
--- a/test/porousmediumflow/3p/implicit/conduction/problem.hh
+++ b/test/porousmediumflow/3p/implicit/conduction/problem.hh
@@ -29,9 +29,9 @@
 #include <dune/grid/yaspgrid.hh>
 
 #include <dumux/discretization/elementsolution.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/cellcentered/mpfa/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/ccmpfa.hh>
+#include <dumux/discretization/box.hh>
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/porousmediumflow/3p/model.hh>
 #include <dumux/material/fluidsystems/h2oairmesitylene.hh>
diff --git a/test/porousmediumflow/3p/implicit/convection/problem.hh b/test/porousmediumflow/3p/implicit/convection/problem.hh
index b9a84467fd38a60bf9264aecb81426bdc8407c24..22167a025c851a737213a8402407bcf17fda284f 100644
--- a/test/porousmediumflow/3p/implicit/convection/problem.hh
+++ b/test/porousmediumflow/3p/implicit/convection/problem.hh
@@ -29,9 +29,9 @@
 #include <dune/grid/yaspgrid.hh>
 
 #include <dumux/discretization/elementsolution.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/cellcentered/mpfa/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/ccmpfa.hh>
+#include <dumux/discretization/box.hh>
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/porousmediumflow/3p/model.hh>
 #include <dumux/material/fluidsystems/h2oairmesitylene.hh>
diff --git a/test/porousmediumflow/3p/implicit/infiltration/problem.hh b/test/porousmediumflow/3p/implicit/infiltration/problem.hh
index ed553db10a755c993dfa7392028acacb034dea3e..8cce2fb07c47a64d75ba6dccdb656910f45c8290 100644
--- a/test/porousmediumflow/3p/implicit/infiltration/problem.hh
+++ b/test/porousmediumflow/3p/implicit/infiltration/problem.hh
@@ -27,8 +27,8 @@
 
 #include <dune/grid/yaspgrid.hh>
 
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/box.hh>
 #include <dumux/discretization/method.hh>
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/porousmediumflow/3p/model.hh>
diff --git a/test/porousmediumflow/3p3c/implicit/columnxylol/problem.hh b/test/porousmediumflow/3p3c/implicit/columnxylol/problem.hh
index cf55fc0c230ec8c85fcc1e0c9161fcb82f6f0f51..af87708cf0eb4839c058e141673c669cba1207f0 100644
--- a/test/porousmediumflow/3p3c/implicit/columnxylol/problem.hh
+++ b/test/porousmediumflow/3p3c/implicit/columnxylol/problem.hh
@@ -32,8 +32,8 @@
 #include <dumux/material/solidsystems/inertsolidphase.hh>
 #include <dumux/material/components/constant.hh>
 
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/box.hh>
 #include <dumux/porousmediumflow/3p3c/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
diff --git a/test/porousmediumflow/3p3c/implicit/infiltration/problem.hh b/test/porousmediumflow/3p3c/implicit/infiltration/problem.hh
index 9f0719f8394e66ad3a0fcd7a371148f56f239181..bc1b92553b886b67434e08b2ea85defd4c37c5ca 100644
--- a/test/porousmediumflow/3p3c/implicit/infiltration/problem.hh
+++ b/test/porousmediumflow/3p3c/implicit/infiltration/problem.hh
@@ -27,8 +27,8 @@
 
 #include <dune/grid/yaspgrid.hh>
 
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/box.hh>
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/porousmediumflow/3p3c/model.hh>
 #include <dumux/material/fluidsystems/h2oairmesitylene.hh>
diff --git a/test/porousmediumflow/3p3c/implicit/kuevette/problem.hh b/test/porousmediumflow/3p3c/implicit/kuevette/problem.hh
index d1571223c4bd9a588c3c8bffb8152ea080e1f28f..6ee4aebb8df1beda8e4c4b9206a7f4f5daacb3fe 100644
--- a/test/porousmediumflow/3p3c/implicit/kuevette/problem.hh
+++ b/test/porousmediumflow/3p3c/implicit/kuevette/problem.hh
@@ -31,8 +31,8 @@
 
 #include <dumux/material/fluidsystems/h2oairmesitylene.hh>
 #include <dumux/material/components/constant.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/box.hh>
 #include <dumux/porousmediumflow/3p3c/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
diff --git a/test/porousmediumflow/3pwateroil/implicit/problem.hh b/test/porousmediumflow/3pwateroil/implicit/problem.hh
index d4d3d0a47ac1c558f2723c5702b2bc56fab85540..33eeffb4d3277b0642a26a385aa20b82bdeb5d4b 100644
--- a/test/porousmediumflow/3pwateroil/implicit/problem.hh
+++ b/test/porousmediumflow/3pwateroil/implicit/problem.hh
@@ -28,7 +28,7 @@
 
 #include <dumux/porousmediumflow/problem.hh>
 
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/box.hh>
 #include <dumux/porousmediumflow/3pwateroil/model.hh>
 
 #include <dumux/material/fluidsystems/h2oheavyoil.hh>
diff --git a/test/porousmediumflow/co2/implicit/problem.hh b/test/porousmediumflow/co2/implicit/problem.hh
index 7dcd7ae8f564f9d18cb0f29625b47db94eeec37c..76940e2247e8ff7258ad0b2d73b0765792b90f81 100644
--- a/test/porousmediumflow/co2/implicit/problem.hh
+++ b/test/porousmediumflow/co2/implicit/problem.hh
@@ -28,8 +28,8 @@
 #include <dune/alugrid/grid.hh>
 #endif
 
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/box.hh>
 
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/porousmediumflow/co2/model.hh>
diff --git a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/problem.hh b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/problem.hh
index 95f3300f22b4a38b84e1f7adcabe24ea9193d019..b3523a1fec36c2dee698cab44ffd86ff11175d54 100644
--- a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/problem.hh
+++ b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/problem.hh
@@ -27,8 +27,8 @@
 #include <dune/common/parametertreeparser.hh>
 #include <dune/grid/yaspgrid.hh>
 
-#include <dumux/discretization/box/properties.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/box.hh>
+#include <dumux/discretization/cctpfa.hh>
 
 #include <dumux/porousmediumflow/mpnc/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
diff --git a/test/porousmediumflow/mpnc/implicit/kinetic/problem.hh b/test/porousmediumflow/mpnc/implicit/kinetic/problem.hh
index 2a42d3be90d330e84d0c7a4f8791bf72f63818f3..a0be7fbc7f71fbc85110546a4185912e59d7d33d 100644
--- a/test/porousmediumflow/mpnc/implicit/kinetic/problem.hh
+++ b/test/porousmediumflow/mpnc/implicit/kinetic/problem.hh
@@ -42,7 +42,7 @@
 #include <dune/grid/yaspgrid.hh>
 
 #include <dumux/common/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/box.hh>
 
 #include <dumux/porousmediumflow/mpnc/model.hh>
 #include <dumux/porousmediumflow/mpnc/pressureformulation.hh>
diff --git a/test/porousmediumflow/mpnc/implicit/obstacle/problem.hh b/test/porousmediumflow/mpnc/implicit/obstacle/problem.hh
index 88da81bf1bbbe0dcfa26448131cc69ff6d1ab056..506609021bff149d0a081b6959c8a350fbe41172 100644
--- a/test/porousmediumflow/mpnc/implicit/obstacle/problem.hh
+++ b/test/porousmediumflow/mpnc/implicit/obstacle/problem.hh
@@ -29,8 +29,8 @@
 #include <dune/common/parametertreeparser.hh>
 #include <dune/grid/yaspgrid.hh>
 
-#include <dumux/discretization/box/properties.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/box.hh>
+#include <dumux/discretization/cctpfa.hh>
 
 #include <dumux/porousmediumflow/mpnc/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
diff --git a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/problem.hh b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/problem.hh
index fc783a2bdb134c7004d2c86fc113567105b74fb1..23848626df975390ff730c9d9a4997fec71ff226 100644
--- a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/problem.hh
+++ b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/problem.hh
@@ -29,7 +29,7 @@
 
 #include <dune/grid/onedgrid.hh>
 
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/box.hh>
 
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/porousmediumflow/mpnc/model.hh>
diff --git a/test/porousmediumflow/richards/implicit/analytical/problem.hh b/test/porousmediumflow/richards/implicit/analytical/problem.hh
index 0f5320d3db5bd5facd0006ebebb94b9337ba9b21..fde587fc3d34f4c67f830f2d469bcfadb8078c79 100644
--- a/test/porousmediumflow/richards/implicit/analytical/problem.hh
+++ b/test/porousmediumflow/richards/implicit/analytical/problem.hh
@@ -32,8 +32,8 @@
 #include <dune/geometry/quadraturerules.hh>
 #include <dune/grid/yaspgrid.hh>
 
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/box.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 #include <dumux/porousmediumflow/richards/model.hh>
diff --git a/test/porousmediumflow/richards/implicit/lens/problem.hh b/test/porousmediumflow/richards/implicit/lens/problem.hh
index 39a5bde706db6b36b4731f0143bdea10b191f497..26722e5dd428f8d9bc73d853614be54afbe5a672 100644
--- a/test/porousmediumflow/richards/implicit/lens/problem.hh
+++ b/test/porousmediumflow/richards/implicit/lens/problem.hh
@@ -34,8 +34,8 @@
 #include <dune/grid/uggrid.hh>
 #endif
 
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/box.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 #include <dumux/porousmediumflow/richards/model.hh>
diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/conduction/problem.hh b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/problem.hh
index 155242acfffcb4b3d84a53cf38de8282d2cd60f3..3804c2ed9f6edee39d2f8a48cbed033e9bf9c2b0 100644
--- a/test/porousmediumflow/richards/implicit/nonisothermal/conduction/problem.hh
+++ b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/problem.hh
@@ -29,8 +29,8 @@
 #include <dune/grid/yaspgrid.hh>
 
 #include <dumux/discretization/elementsolution.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/box.hh>
 
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/porousmediumflow/richards/model.hh>
diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/convection/problem.hh b/test/porousmediumflow/richards/implicit/nonisothermal/convection/problem.hh
index 58d78298dead178d982489b9a6de078f1da06463..07c7dbea84da3897c43336de857df2cade03b40e 100644
--- a/test/porousmediumflow/richards/implicit/nonisothermal/convection/problem.hh
+++ b/test/porousmediumflow/richards/implicit/nonisothermal/convection/problem.hh
@@ -30,8 +30,8 @@
 #include <dune/grid/yaspgrid.hh>
 
 #include <dumux/discretization/elementsolution.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/box.hh>
 
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/porousmediumflow/richards/model.hh>
diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/problem.hh b/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/problem.hh
index acd40bc083d395ae4eb4508f07b8232479f5eb36..00f99352afa20cdce1a5b37113244fa79302f3ae 100644
--- a/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/problem.hh
+++ b/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/problem.hh
@@ -29,8 +29,8 @@
 #include <dune/grid/yaspgrid.hh>
 
 #include <dumux/discretization/elementsolution.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/box.hh>
 
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/porousmediumflow/richards/model.hh>
diff --git a/test/porousmediumflow/richardsnc/implicit/problem.hh b/test/porousmediumflow/richardsnc/implicit/problem.hh
index 4a85d77a29a07ba6aa9444fe3b3495dbd11f03dd..0ec6ecd6bf811925ca0d454f5e6926d30e0a10ed 100644
--- a/test/porousmediumflow/richardsnc/implicit/problem.hh
+++ b/test/porousmediumflow/richardsnc/implicit/problem.hh
@@ -28,8 +28,8 @@
 
 #include <dune/grid/yaspgrid.hh>
 
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/box.hh>
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/porousmediumflow/richardsnc/model.hh>
 
diff --git a/test/porousmediumflow/tracer/1ptracer/problem_1p.hh b/test/porousmediumflow/tracer/1ptracer/problem_1p.hh
index 7cd357c640c695934a36ecc1c1496bf4f6a0fb3c..4965c07633ae3d46fe93e37bfc023e903a071440 100644
--- a/test/porousmediumflow/tracer/1ptracer/problem_1p.hh
+++ b/test/porousmediumflow/tracer/1ptracer/problem_1p.hh
@@ -26,7 +26,7 @@
 
 #include <dune/grid/yaspgrid.hh>
 
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
 #include <dumux/porousmediumflow/1p/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/material/components/simpleh2o.hh>
diff --git a/test/porousmediumflow/tracer/1ptracer/problem_tracer.hh b/test/porousmediumflow/tracer/1ptracer/problem_tracer.hh
index a5b95f469d5e2dc43c2107dbd6a82e4b8aa0f66f..74dfbcf800d35b0ac45a56f10141cdeccd82e3f0 100644
--- a/test/porousmediumflow/tracer/1ptracer/problem_tracer.hh
+++ b/test/porousmediumflow/tracer/1ptracer/problem_tracer.hh
@@ -27,7 +27,7 @@
 
 #include <dune/grid/yaspgrid.hh>
 
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cctpfa.hh>
 #include <dumux/porousmediumflow/tracer/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/material/fluidsystems/base.hh>
diff --git a/test/porousmediumflow/tracer/constvel/problem.hh b/test/porousmediumflow/tracer/constvel/problem.hh
index 1a382be3bce2f39bc770faee5bb42d6c5e3b0edb..91e33ca1155ad20e0c0aef5cb5d501c322321379 100644
--- a/test/porousmediumflow/tracer/constvel/problem.hh
+++ b/test/porousmediumflow/tracer/constvel/problem.hh
@@ -27,9 +27,9 @@
 
 #include <dune/grid/yaspgrid.hh>
 
-#include <dumux/discretization/box/properties.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
-#include <dumux/discretization/cellcentered/mpfa/properties.hh>
+#include <dumux/discretization/box.hh>
+#include <dumux/discretization/cctpfa.hh>
+#include <dumux/discretization/ccmpfa.hh>
 #include <dumux/porousmediumflow/tracer/model.hh>
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/material/fluidsystems/base.hh>
diff --git a/test/porousmediumflow/tracer/multicomp/problem.hh b/test/porousmediumflow/tracer/multicomp/problem.hh
index 121cfbc2ceb1ad8856112c2424612ad77ebd51f3..5a20ad8594293f0c31efb3986449bee6af6e4bd6 100644
--- a/test/porousmediumflow/tracer/multicomp/problem.hh
+++ b/test/porousmediumflow/tracer/multicomp/problem.hh
@@ -28,8 +28,8 @@
 #include <dune/grid/yaspgrid.hh>
 
 #include <dumux/discretization/elementsolution.hh>
-#include <dumux/discretization/box/properties.hh>
-#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/box.hh>
+#include <dumux/discretization/cctpfa.hh>
 
 #include <dumux/porousmediumflow/tracer/model.hh>
 #include <dumux/porousmediumflow/problem.hh>