diff --git a/dumux/discretization/fluxvariablesbase.hh b/dumux/discretization/fluxvariablesbase.hh
index 96569e379b6b50c178e5bd8e90e51a973280c654..216edff503ad123ec3d8c3e20dc9cc43f757c716 100644
--- a/dumux/discretization/fluxvariablesbase.hh
+++ b/dumux/discretization/fluxvariablesbase.hh
@@ -31,7 +31,7 @@ namespace Dumux
 namespace Properties
 {
 // forward declaration
-NEW_PROP_TAG(ImplicitMassUpwindWeight);
+NEW_PROP_TAG(ImplicitUpwindWeight);
 }
 
 /*!
@@ -72,7 +72,7 @@ public:
         // retrieve the upwind weight for the mass conservation equations. Use the value
         // specified via the property system as default, and overwrite
         // it by the run-time parameter from the Dune::ParameterTree
-        upwindWeight_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Implicit, MassUpwindWeight);
+        upwindWeight_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Implicit, UpwindWeight);
     }
 
     const Problem& problem() const
diff --git a/dumux/implicit/properties.hh b/dumux/implicit/properties.hh
index 2afd446ae5d06a0bdecac62f4e6a7dd7bafd18c4..8b819e2524363e7f7ff6d877a08d3430d286676c 100644
--- a/dumux/implicit/properties.hh
+++ b/dumux/implicit/properties.hh
@@ -145,6 +145,9 @@ NEW_PROP_TAG(ImplicitMaxTimeStepDivisions);
 //! indicate whether discretization is box or not
 NEW_PROP_TAG(ImplicitIsBox);
 
+//! the upwind weight for the advective term
+NEW_PROP_TAG(ImplicitUpwindWeight);
+
 //! the local fem space used for the AMG backend
 NEW_PROP_TAG(ImplicitLocalFemMap);
 
diff --git a/dumux/implicit/propertydefaults.hh b/dumux/implicit/propertydefaults.hh
index 0ee098fa879ad1038f8302f5cdcaf8a63e858c49..3d6b1977b340ca1c75eaaa8667d7a97ce1eacb7a 100644
--- a/dumux/implicit/propertydefaults.hh
+++ b/dumux/implicit/propertydefaults.hh
@@ -198,6 +198,9 @@ SET_BOOL_PROP(ImplicitBase, EnableEnergyBalance, false);
 
 SET_TYPE_PROP(ImplicitBase, EnergyLocalResidual, EnergyLocalResidual<TypeTag> );
 
+//! Set the upwind weight for the advective term
+SET_SCALAR_PROP(ImplicitBase, ImplicitUpwindWeight, 1.0);
+
 //! vtk output
 SET_BOOL_PROP(ImplicitBase, VtkAddVelocity, false); //!< Don't reconstruct velocity per default
 
diff --git a/dumux/porousmediumflow/1p/implicit/properties.hh b/dumux/porousmediumflow/1p/implicit/properties.hh
index adfc4f2c91c1a1084af3f1946e0fa3a24be74c15..d4a4dbe04693142906f248ea737e1a4a8ef26562 100644
--- a/dumux/porousmediumflow/1p/implicit/properties.hh
+++ b/dumux/porousmediumflow/1p/implicit/properties.hh
@@ -64,8 +64,6 @@ NEW_PROP_TAG(FluidSystem); //!< The type of the fluid system to use
 NEW_PROP_TAG(Fluid); //!< The fluid used for the default fluid system
 NEW_PROP_TAG(FluidState); //!< The type of the fluid state to use
 NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
-NEW_PROP_TAG(ImplicitMassUpwindWeight); //!< Returns weight of the upwind cell when calculating fluxes
-NEW_PROP_TAG(ImplicitMobilityUpwindWeight); //!< Weight for the upwind mobility in the velocity calculation
 NEW_PROP_TAG(SpatialParamsForchCoeff); //!< Property for the forchheimer coefficient
 // \}
 }
diff --git a/dumux/porousmediumflow/1p/implicit/propertydefaults.hh b/dumux/porousmediumflow/1p/implicit/propertydefaults.hh
index 1c8f54aadb2103d0bfa1b3fbdafb3d9ceeea7580..25bc18cfa28b937b3d820b2b9ae4d14f542ae20c 100644
--- a/dumux/porousmediumflow/1p/implicit/propertydefaults.hh
+++ b/dumux/porousmediumflow/1p/implicit/propertydefaults.hh
@@ -78,14 +78,6 @@ SET_TYPE_PROP(OneP, Indices, OnePIndices);
 //! Use ImplicitSpatialParamsOneP by default.
 SET_TYPE_PROP(OneP, SpatialParams, ImplicitSpatialParamsOneP<TypeTag>);
 
-//! The weight of the upwind control volume when calculating
-//! fluxes. Use central differences by default.
-SET_SCALAR_PROP(OneP, ImplicitMassUpwindWeight, 1.0);
-
-//! weight for the upwind mobility in the velocity calculation
-//! fluxes. Use central differences by default.
-SET_SCALAR_PROP(OneP, ImplicitMobilityUpwindWeight, 1.0);
-
 //! The fluid system to use by default
 SET_TYPE_PROP(OneP, FluidSystem, FluidSystems::OneP<typename GET_PROP_TYPE(TypeTag, Scalar), typename GET_PROP_TYPE(TypeTag, Fluid)>);
 
diff --git a/dumux/porousmediumflow/1p2c/implicit/properties.hh b/dumux/porousmediumflow/1p2c/implicit/properties.hh
index 5514ad96c95a4d1095e2d32341e52cb6bdbcccd4..d07d5cde3f3992087b0d179968dd3e47515328b3 100644
--- a/dumux/porousmediumflow/1p2c/implicit/properties.hh
+++ b/dumux/porousmediumflow/1p2c/implicit/properties.hh
@@ -66,8 +66,6 @@ NEW_PROP_TAG(SpatialParams); //!< The type of the spatial parameters
 NEW_PROP_TAG(EffectiveDiffusivityModel); //!< The employed model for the computation of the effective diffusivity
 NEW_PROP_TAG(FluidSystem); //!< Type of the multi-component relations
 NEW_PROP_TAG(FluidState); //!< Type of the fluid state to be used
-NEW_PROP_TAG(ImplicitMassUpwindWeight);   //!< The default value of the upwind weight
-NEW_PROP_TAG(ImplicitMobilityUpwindWeight); //!< Weight for the upwind mobility in the velocity calculation
 NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
 NEW_PROP_TAG(UseMoles); //!< Defines whether mole (true) or mass (false) fractions are used
 NEW_PROP_TAG(SpatialParamsForchCoeff); //!< Property for the forchheimer coefficient
diff --git a/dumux/porousmediumflow/1p2c/implicit/propertydefaults.hh b/dumux/porousmediumflow/1p2c/implicit/propertydefaults.hh
index 9afdc74347d161af013278658e213bbe91a7b595..72a9528388b727f517db567160305e797b974190 100644
--- a/dumux/porousmediumflow/1p2c/implicit/propertydefaults.hh
+++ b/dumux/porousmediumflow/1p2c/implicit/propertydefaults.hh
@@ -83,12 +83,6 @@ SET_PROP(OnePTwoC, FluidState){
         typedef CompositionalFluidState<Scalar, FluidSystem> type;
 };
 
-//! set default upwind weight to 1.0, i.e. fully upwind
-SET_SCALAR_PROP(OnePTwoC, ImplicitMassUpwindWeight, 1.0);
-
-//! weight for the upwind mobility in the velocity calculation
-SET_SCALAR_PROP(OnePTwoC, ImplicitMobilityUpwindWeight, 1.0);
-
 //! Set the indices used by the 1p2c model
 SET_TYPE_PROP(OnePTwoC, Indices, OnePTwoCIndices<TypeTag>);
 //! The spatial parameters to be employed.
diff --git a/dumux/porousmediumflow/2p/implicit/properties.hh b/dumux/porousmediumflow/2p/implicit/properties.hh
index 93adee74c0eabdb6484f6ed9d78c00960e1aecd8..aaa68ec5cbb22a333f8e350f0261d60a770a2e86 100644
--- a/dumux/porousmediumflow/2p/implicit/properties.hh
+++ b/dumux/porousmediumflow/2p/implicit/properties.hh
@@ -65,8 +65,6 @@ NEW_TYPE_TAG(CCTwoPNI, INHERITS_FROM(CCModel, TwoPNI));
 
 NEW_PROP_TAG(NumPhases);   //!< Number of fluid phases in the system
 NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
-NEW_PROP_TAG(ImplicitMassUpwindWeight); //!< The value of the weight of the upwind direction in the mass conservation equations
-NEW_PROP_TAG(ImplicitMobilityUpwindWeight); //!< Weight for the upwind mobility in the velocity calculation
 NEW_PROP_TAG(Formulation);   //!< The formulation of the model
 NEW_PROP_TAG(Indices); //!< Enumerations for the model
 NEW_PROP_TAG(SpatialParams); //!< The type of the spatial parameters
diff --git a/dumux/porousmediumflow/2p/implicit/propertydefaults.hh b/dumux/porousmediumflow/2p/implicit/propertydefaults.hh
index 84cde2a22e21e0a924d1719ea71c0760a0d71dc8..efcf47123a3d6f4ae7e50389f15ab04679798055 100644
--- a/dumux/porousmediumflow/2p/implicit/propertydefaults.hh
+++ b/dumux/porousmediumflow/2p/implicit/propertydefaults.hh
@@ -81,12 +81,6 @@ SET_BOOL_PROP(TwoP, EnableMolecularDiffusion, false);
 //! Isothermal model by default
 SET_BOOL_PROP(TwoP, EnableEnergyBalance, false);
 
-//! the upwind weight for the mass conservation equations.
-SET_SCALAR_PROP(TwoP, ImplicitMassUpwindWeight, 1.0);
-
-//! weight for the upwind mobility in the velocity calculation
-SET_SCALAR_PROP(TwoP, ImplicitMobilityUpwindWeight, 1.0);
-
 //! The indices required by the isothermal 2p model
 SET_TYPE_PROP(TwoP,
               Indices,
diff --git a/dumux/porousmediumflow/2p2c/implicit/properties.hh b/dumux/porousmediumflow/2p2c/implicit/properties.hh
index e2257f82dda1aeb96eb0dad9d51c2d4ec0986bbe..dfd0e89949978795d859826db3983fd94a3bd537 100644
--- a/dumux/porousmediumflow/2p2c/implicit/properties.hh
+++ b/dumux/porousmediumflow/2p2c/implicit/properties.hh
@@ -72,8 +72,6 @@ NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered i
 NEW_PROP_TAG(UseMoles); //!< Defines whether mole (true) or mass (false) fractions are used
 NEW_PROP_TAG(UseConstraintSolver); //!< Determines whether the constraint solver should be used
 
-NEW_PROP_TAG(ImplicitMassUpwindWeight); //!< The value of the upwind weight for the mass conservation equations
-NEW_PROP_TAG(ImplicitMobilityUpwindWeight); //!< Weight for the upwind mobility in the velocity calculation
 NEW_PROP_TAG(ReplaceCompEqIdx); //!< The index of the total mass balance equation,
                                 //!< if one component balance is replaced (ReplaceCompEqIdx < NumComponents)
 NEW_PROP_TAG(BaseFluxVariables); //!< The base flux variables
diff --git a/dumux/porousmediumflow/2p2c/implicit/propertydefaults.hh b/dumux/porousmediumflow/2p2c/implicit/propertydefaults.hh
index 1e6b651330c74521269c645b1bfacde461970cb0..0f6048d86876870f2d2f92e5c1a3c1de44a1e781 100644
--- a/dumux/porousmediumflow/2p2c/implicit/propertydefaults.hh
+++ b/dumux/porousmediumflow/2p2c/implicit/propertydefaults.hh
@@ -144,12 +144,6 @@ SET_TYPE_PROP(TwoPTwoC, PrimaryVariableSwitch, TwoPTwoCPrimaryVariableSwitch<Typ
 //! Use the 2p2c VolumeVariables
 SET_TYPE_PROP(TwoPTwoC, VolumeVariables, TwoPTwoCVolumeVariables<TypeTag>);
 
-//! Set the upwind weight for the mass conservation equations
-SET_SCALAR_PROP(TwoPTwoC, ImplicitMassUpwindWeight, 1.0);
-
-//! Set default mobility upwind weight to 1.0, i.e. fully upwind
-SET_SCALAR_PROP(TwoPTwoC, ImplicitMobilityUpwindWeight, 1.0);
-
 //! Set the indices required by the isothermal 2p2c
 SET_TYPE_PROP(TwoPTwoC, Indices, TwoPTwoCIndices <TypeTag, /*PVOffset=*/0>);
 
diff --git a/dumux/porousmediumflow/2pnc/implicit/properties.hh b/dumux/porousmediumflow/2pnc/implicit/properties.hh
index 7c3be2d952f58ef6db463054cc5f9f27701763c1..148632e8b57e9a9b6bf1f5b591115c61f460307d 100644
--- a/dumux/porousmediumflow/2pnc/implicit/properties.hh
+++ b/dumux/porousmediumflow/2pnc/implicit/properties.hh
@@ -73,8 +73,6 @@ NEW_PROP_TAG(EffectiveDiffusivityModel); //!< The employed model for the computa
 
 NEW_PROP_TAG(ReplaceCompEqIdx); //!< The index of the total mass balance equation, if one component balance is replaced (ReplaceCompEqIdx < NumComponents)
 NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
-NEW_PROP_TAG(ImplicitMassUpwindWeight); //!< The value of the upwind weight for the mass conservation equations
-NEW_PROP_TAG(ImplicitMobilityUpwindWeight); //!< The value of the upwind parameter for the mobility
 NEW_PROP_TAG(BaseFluxVariables); //! The base flux variables
 }
 }
diff --git a/dumux/porousmediumflow/2pnc/implicit/propertydefaults.hh b/dumux/porousmediumflow/2pnc/implicit/propertydefaults.hh
index a5d97e9585bac09acf717e54a9b6a2996a2e085d..7fb042c2639dc6f50a00ce3cf5ddafecbf0488ee 100644
--- a/dumux/porousmediumflow/2pnc/implicit/propertydefaults.hh
+++ b/dumux/porousmediumflow/2pnc/implicit/propertydefaults.hh
@@ -166,12 +166,6 @@ SET_TYPE_PROP(TwoPNC, PrimaryVariableSwitch, TwoPNCPrimaryVariableSwitch<TypeTag
 //! the VolumeVariables property
 SET_TYPE_PROP(TwoPNC, VolumeVariables, TwoPNCVolumeVariables<TypeTag>);
 
-//! the upwind weight for the mass conservation equations.
-SET_SCALAR_PROP(TwoPNC, ImplicitMassUpwindWeight, 1.0);
-
-//! Set default mobility upwind weight to 1.0, i.e. fully upwind
-SET_SCALAR_PROP(TwoPNC, ImplicitMobilityUpwindWeight, 1.0);
-
 //! The indices required by the isothermal 2pnc model
 SET_TYPE_PROP(TwoPNC, Indices, TwoPNCIndices <TypeTag, /*PVOffset=*/0>);
 
diff --git a/dumux/porousmediumflow/3p/implicit/properties.hh b/dumux/porousmediumflow/3p/implicit/properties.hh
index 892b056ac87706d1bcc7900892fb934215ead9a3..a7c8830ca2c3407a14a59542cad0035bb806575d 100644
--- a/dumux/porousmediumflow/3p/implicit/properties.hh
+++ b/dumux/porousmediumflow/3p/implicit/properties.hh
@@ -64,8 +64,6 @@ NEW_PROP_TAG(MaterialLaw);   //!< The material law which ought to be used (extra
 NEW_PROP_TAG(MaterialLawParams); //!< The parameters of the material law (extracted from the spatial parameters)
 
 NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
-NEW_PROP_TAG(ImplicitMassUpwindWeight); //!< The value of the upwind parameter for the mobility
-NEW_PROP_TAG(ImplicitMobilityUpwindWeight); //!< Weight for the upwind mobility in the velocity calculation
 NEW_PROP_TAG(SpatialParamsForchCoeff); //!< Property for the forchheimer coefficient
 }
 }
diff --git a/dumux/porousmediumflow/3p/implicit/propertydefaults.hh b/dumux/porousmediumflow/3p/implicit/propertydefaults.hh
index 77d87fd261f62fd5b69015cff67631aa7193adeb..fb26cf8843967781cb5909c9221a98be26bbdc5f 100644
--- a/dumux/porousmediumflow/3p/implicit/propertydefaults.hh
+++ b/dumux/porousmediumflow/3p/implicit/propertydefaults.hh
@@ -95,12 +95,6 @@ SET_TYPE_PROP(ThreeP, Model, ThreePModel<TypeTag>);
 //! the VolumeVariables property
 SET_TYPE_PROP(ThreeP, VolumeVariables, ThreePVolumeVariables<TypeTag>);
 
-//! the upwind factor for the mobility.
-SET_SCALAR_PROP(ThreeP, ImplicitMassUpwindWeight, 1.0);
-
-//! set default mobility upwind weight to 1.0, i.e. fully upwind
-SET_SCALAR_PROP(ThreeP, ImplicitMobilityUpwindWeight, 1.0);
-
 //! The indices required by the isothermal 3p model
 SET_TYPE_PROP(ThreeP, Indices, ThreePIndices<TypeTag,/*PVOffset=*/0>);
 
diff --git a/dumux/porousmediumflow/3p3c/implicit/properties.hh b/dumux/porousmediumflow/3p3c/implicit/properties.hh
index 455c109c3c1a6424141e0111f70176909eba49e1..3c74683eb3821c7cf5936f8abb8d35615ae54201 100644
--- a/dumux/porousmediumflow/3p3c/implicit/properties.hh
+++ b/dumux/porousmediumflow/3p3c/implicit/properties.hh
@@ -70,8 +70,6 @@ NEW_PROP_TAG(MaterialLawParams); //!< The parameters of the material law (extrac
 NEW_PROP_TAG(EffectiveDiffusivityModel); //!< The employed model for the computation of the effective diffusivity
 
 NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
-NEW_PROP_TAG(ImplicitMassUpwindWeight); //!< The value of the upwind parameter for the mobility
-NEW_PROP_TAG(ImplicitMobilityUpwindWeight); //!< Weight for the upwind mobility in the velocity calculation
 NEW_PROP_TAG(UseConstraintSolver); //!< Determines whether a constraint solver should be used explicitly
 NEW_PROP_TAG(SpatialParamsForchCoeff); //!< Property for the forchheimer coefficient
 NEW_PROP_TAG(TauTortuosity); //!< Tortuosity value (tau) used in macroscopic diffusion
diff --git a/dumux/porousmediumflow/3p3c/implicit/propertydefaults.hh b/dumux/porousmediumflow/3p3c/implicit/propertydefaults.hh
index ceb02ffa820b603add92c2b81a5bb3cf5adcafc7..c739811cb214161592682f7f9a7146a3138cb714 100644
--- a/dumux/porousmediumflow/3p3c/implicit/propertydefaults.hh
+++ b/dumux/porousmediumflow/3p3c/implicit/propertydefaults.hh
@@ -132,12 +132,6 @@ SET_TYPE_PROP(ThreePThreeC, PrimaryVariableSwitch, ThreePThreeCPrimaryVariableSw
 //! the VolumeVariables property
 SET_TYPE_PROP(ThreePThreeC, VolumeVariables, ThreePThreeCVolumeVariables<TypeTag>);
 
-//! the upwind factor for the mobility.
-SET_SCALAR_PROP(ThreePThreeC, ImplicitMassUpwindWeight, 1.0);
-
-//! set default mobility upwind weight to 1.0, i.e. fully upwind
-SET_SCALAR_PROP(ThreePThreeC, ImplicitMobilityUpwindWeight, 1.0);
-
 //! Determines whether a constraint solver should be used explicitly
 SET_BOOL_PROP(ThreePThreeC, UseConstraintSolver, false);
 
diff --git a/dumux/porousmediumflow/nonisothermal/implicit/properties.hh b/dumux/porousmediumflow/nonisothermal/implicit/properties.hh
index 24533faf8069b10e07ea66135b9c4289574d29da..23dc38a2c5ee547475c7879fcce47b95a0cfe463 100644
--- a/dumux/porousmediumflow/nonisothermal/implicit/properties.hh
+++ b/dumux/porousmediumflow/nonisothermal/implicit/properties.hh
@@ -61,7 +61,6 @@ NEW_PROP_TAG(NiOutputLevel);
 // forward declaration of other property tags
 NEW_PROP_TAG(Indices);
 NEW_PROP_TAG(NumPhases);
-NEW_PROP_TAG(ImplicitMassUpwindWeight);
 NEW_PROP_TAG(FluidSystem);
 
 }
diff --git a/test/porousmediumflow/2p/implicit/test_fracture_cc2p.input b/test/porousmediumflow/2p/implicit/test_fracture_cc2p.input
index d41c1738d16eb6ab3b1b7ba363b26733d623038e..ec55ea7fdcfe1912a922b61641746105ecc7ec18 100644
--- a/test/porousmediumflow/2p/implicit/test_fracture_cc2p.input
+++ b/test/porousmediumflow/2p/implicit/test_fracture_cc2p.input
@@ -9,4 +9,4 @@ File = grids/fracture.msh
 Name = fracturecc # name passed to the output routines
 
 [Implicit]
-MassUpwindWeight = 1.0
+UpwindWeight = 1.0
diff --git a/test/porousmediumflow/2p/implicit/test_fracture_ccmpfa2p.input b/test/porousmediumflow/2p/implicit/test_fracture_ccmpfa2p.input
index 79fa9b882291540394339b877d0a066b63a223c9..f47ac9508b5b64b29192d6a08ee26801fd7484cc 100644
--- a/test/porousmediumflow/2p/implicit/test_fracture_ccmpfa2p.input
+++ b/test/porousmediumflow/2p/implicit/test_fracture_ccmpfa2p.input
@@ -9,4 +9,4 @@ File = grids/fracture.msh
 Name = fractureccmpfa # name passed to the output routines
 
 [Implicit]
-MassUpwindWeight = 1.0
+UpwindWeight = 1.0