diff --git a/dumux/freeflow/stokes/stokesproperties.hh b/dumux/freeflow/stokes/stokesproperties.hh
index c489819ef02c098e11cfb64c05b29587de2b4564..ba561cf07d5db3e3a943067e5d8c817b8a237bbb 100644
--- a/dumux/freeflow/stokes/stokesproperties.hh
+++ b/dumux/freeflow/stokes/stokesproperties.hh
@@ -51,12 +51,12 @@ NEW_TYPE_TAG(BoxStokes, INHERITS_FROM(BoxModel));
 // Property tags
 //////////////////////////////////////////////////////////////////
 
-//NEW_PROP_TAG(Soil); //!< The type of the soil properties object
 NEW_PROP_TAG(EnableGravity); //!< Returns whether gravity is considered in the problem
 NEW_PROP_TAG(MassUpwindWeight); //!< The value of the upwind parameter for the mobility
-NEW_PROP_TAG(StokesIndices); //!< Enumerations for the Stokes models
+NEW_PROP_TAG(StokesIndices); //!< DEPRECATED Enumerations for the Stokes models
+NEW_PROP_TAG(Indices); //!< Enumerations for the model
 NEW_PROP_TAG(Fluid);
-NEW_PROP_TAG(FluidSystem);
+NEW_PROP_TAG(FluidSystem); //!< The employed fluid system
 NEW_PROP_TAG(FluidState);
 NEW_PROP_TAG(StabilizationAlpha); //!< The parameter for the stabilization
 NEW_PROP_TAG(StabilizationBeta); //!< The parameter for the stabilization at boundaries
diff --git a/dumux/freeflow/stokes/stokespropertydefaults.hh b/dumux/freeflow/stokes/stokespropertydefaults.hh
index fb0703d4e521f343ee9edd87a605e6cdc83dc277..19674c17cf132166577e9a1100aec75f636ef30a 100644
--- a/dumux/freeflow/stokes/stokespropertydefaults.hh
+++ b/dumux/freeflow/stokes/stokespropertydefaults.hh
@@ -110,7 +110,7 @@ public:
     typedef FluidSystems::OneP<Scalar, Fluid> type;
 };
 
-//! The fluid that is used in the single-phase fluidsystem.
+//! The fluid that is used in the single-phase fluidsystem
 SET_PROP(BoxStokes, Fluid)
 { private:
     typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
@@ -118,7 +118,11 @@ public:
     typedef Dumux::LiquidPhase<Scalar, Dumux::NullComponent<Scalar> > type;
 };
 
-SET_TYPE_PROP(BoxStokes, StokesIndices, StokesCommonIndices<TypeTag>);
+//! Set the indices used by the Stokes model
+SET_TYPE_PROP(BoxStokes, Indices, StokesCommonIndices<TypeTag>);
+
+//! DEPRECATED Set the indices used by the Stokes model
+SET_TYPE_PROP(BoxStokes, StokesIndices, typename GET_PROP_TYPE(TypeTag, Indices));
 
 //! Choose the type of the employed fluid state.
 SET_PROP(BoxStokes, FluidState)
diff --git a/dumux/freeflow/stokes/stokesvolumevariables.hh b/dumux/freeflow/stokes/stokesvolumevariables.hh
index 4b576385db27459047b32ff1c953306f5a2cc91d..b0ddca47cc6611e242010807094ad3a55cc20c89 100644
--- a/dumux/freeflow/stokes/stokesvolumevariables.hh
+++ b/dumux/freeflow/stokes/stokesvolumevariables.hh
@@ -52,7 +52,7 @@ class StokesVolumeVariables : public BoxVolumeVariables<TypeTag>
 
     typedef typename GridView::template Codim<0>::Entity Element;
     typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) Implementation;
-    typedef typename GET_PROP_TYPE(TypeTag, StokesIndices) Indices;
+    typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
 
     enum {
         dim = GridView::dimension,
diff --git a/dumux/freeflow/stokes2c/stokes2cproperties.hh b/dumux/freeflow/stokes2c/stokes2cproperties.hh
index a2f2b58644f75b36be4831678e18d304bf264f83..9b905a7890dd5f34b6864946d2b8709a72b49c81 100644
--- a/dumux/freeflow/stokes2c/stokes2cproperties.hh
+++ b/dumux/freeflow/stokes2c/stokes2cproperties.hh
@@ -50,7 +50,7 @@ NEW_TYPE_TAG(BoxStokes2c, INHERITS_FROM(BoxStokes));
 // Property tags
 //////////////////////////////////////////////////////////////////
 
-NEW_PROP_TAG(Stokes2cIndices); //!< Enumerations for the compositional stokes models
+NEW_PROP_TAG(Stokes2cIndices); //!< DEPRECATED Enumerations for the compositional stokes models
 NEW_PROP_TAG(NumComponents); //!< Number of components
 
 }
diff --git a/dumux/freeflow/stokes2c/stokes2cpropertydefaults.hh b/dumux/freeflow/stokes2c/stokes2cpropertydefaults.hh
index e4660e3fe72629600504fadf6bcbdecbe5e9ff41..820e9e2c84e95055fa9556489fbeca4d4ca17b92 100644
--- a/dumux/freeflow/stokes2c/stokes2cpropertydefaults.hh
+++ b/dumux/freeflow/stokes2c/stokes2cpropertydefaults.hh
@@ -72,10 +72,11 @@ SET_TYPE_PROP(BoxStokes2c, VolumeVariables, Stokes2cVolumeVariables<TypeTag>);
 //! the FluxVariables property
 SET_TYPE_PROP(BoxStokes2c, FluxVariables, Stokes2cFluxVariables<TypeTag>);
 
-//! the Indices for the Stokes2c model
-SET_TYPE_PROP(BoxStokes2c,
-              Stokes2cIndices,
-              Stokes2cCommonIndices<TypeTag>);
+//! Set the Indices for the Stokes2c model.
+SET_TYPE_PROP(BoxStokes2c, Indices, Stokes2cCommonIndices<TypeTag>);
+
+//! DEPRECATED Set the Indices for the Stokes2c model.
+SET_TYPE_PROP(BoxStokes2c, Stokes2cIndices, typename GET_PROP_TYPE(TypeTag, Indices));
 
 //! Set the number of components to 2
 SET_INT_PROP(BoxStokes2c, NumComponents, 2);
diff --git a/dumux/freeflow/stokes2c/stokes2cvolumevariables.hh b/dumux/freeflow/stokes2c/stokes2cvolumevariables.hh
index 121505a00ab4f43847edee2e17450652aa113b04..c4bdbf2663658d296c1c99dabec1f43674338162 100644
--- a/dumux/freeflow/stokes2c/stokes2cvolumevariables.hh
+++ b/dumux/freeflow/stokes2c/stokes2cvolumevariables.hh
@@ -54,7 +54,7 @@ class Stokes2cVolumeVariables : public StokesVolumeVariables<TypeTag>
     typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
     typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
     typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
-    typedef typename GET_PROP_TYPE(TypeTag, Stokes2cIndices) Indices;
+    typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
 
     enum {
         lCompIdx = Indices::lCompIdx,
diff --git a/dumux/freeflow/stokes2cni/stokes2cniproperties.hh b/dumux/freeflow/stokes2cni/stokes2cniproperties.hh
index 0bb67fb9c64354754e94c58e8ebef2985a5f57f0..aa2fe4e35fc235f36464263e05cadc516eb35692 100644
--- a/dumux/freeflow/stokes2cni/stokes2cniproperties.hh
+++ b/dumux/freeflow/stokes2cni/stokes2cniproperties.hh
@@ -49,7 +49,7 @@ NEW_TYPE_TAG(BoxStokes2cni, INHERITS_FROM(BoxStokes2c));
 // Property tags
 //////////////////////////////////////////////////////////////////
 
-NEW_PROP_TAG(Stokes2cniIndices); //!< Enumerations for the compositional Stokes models
+NEW_PROP_TAG(Stokes2cniIndices); //!< DEPRECATED Enumerations for the compositional Stokes models
 NEW_PROP_TAG(NumComponents); //!< Number of components
 }
 
diff --git a/dumux/freeflow/stokes2cni/stokes2cnipropertydefaults.hh b/dumux/freeflow/stokes2cni/stokes2cnipropertydefaults.hh
index ed53da135a45e543319130f031ef35c3ddba5095..f4424cf87a944a4ca2c974af634b0f0ef0720db5 100644
--- a/dumux/freeflow/stokes2cni/stokes2cnipropertydefaults.hh
+++ b/dumux/freeflow/stokes2cni/stokes2cnipropertydefaults.hh
@@ -70,10 +70,11 @@ SET_TYPE_PROP(BoxStokes2cni, VolumeVariables, Stokes2cniVolumeVariables<TypeTag>
 //! the FluxVariables property
 SET_TYPE_PROP(BoxStokes2cni, FluxVariables, Stokes2cniFluxVariables<TypeTag>);
 
-// the indices for the Stokes2cni model
-SET_TYPE_PROP(BoxStokes2cni,
-              Stokes2cniIndices,
-              Stokes2cniCommonIndices<TypeTag>);
+// Set the indices for the Stokes2cni model
+SET_TYPE_PROP(BoxStokes2cni, Indices, Stokes2cniCommonIndices<TypeTag>);
+
+// DEPRECATED Set the indices for the Stokes2cni model
+SET_TYPE_PROP(BoxStokes2cni, Stokes2cniIndices,  typename GET_PROP_TYPE(TypeTag, Indices));
 }
 }
 #endif
diff --git a/dumux/freeflow/stokes2cni/stokes2cnivolumevariables.hh b/dumux/freeflow/stokes2cni/stokes2cnivolumevariables.hh
index cb8dd3ee3ea863f54c7fd2176891dd76186b3af7..02c854a656f10596ad5fd13a250eb2408b77405b 100644
--- a/dumux/freeflow/stokes2cni/stokes2cnivolumevariables.hh
+++ b/dumux/freeflow/stokes2cni/stokes2cnivolumevariables.hh
@@ -53,7 +53,7 @@ class Stokes2cniVolumeVariables : public Stokes2cVolumeVariables<TypeTag>
     typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
     typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
 
-    typedef typename GET_PROP_TYPE(TypeTag, Stokes2cniIndices) Indices;
+    typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
     enum { phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIndex) };
     enum { energyIdx = Indices::energyIdx };